Skip to content

Commit 9152530

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (54 commits) MAINTIANERS: just use Mike gmail e-mail for contact and pawn the serial driver off onto Sonic [Blackfin] arch: remove old I2C BF54x porting. [Blackfin] arch: Add the semtimedop syscall. Upstream uClibc doesn't compile without it. [Blackfin] arch: fix bug kernel boot message: memory information is not reasonable [Blackfin] arch: use common flash driver to setup partitions rather than the bf5xx-flash driver [Blackfin] arch: Fix bug - kernel build with Debug option enabled fails to boot up [Blackfin] arch: Fix bug Only RTC interrupt can wake up deeper sleep core. [Blackfin] arch: Add proper SW System Reset delay sequence [Blackfin] arch: Update copyright date [Blackfin] arch: GPIO API cleanup and anomaly update [Blackfin] arch: Fix BUG gpio_direction_output API is not compatitable with GENERIC_GPIO API interface [Blackfin] arch: Initial checkin of the memory protection support. [Blackfin] arch: set_bfin_dma_config shouldnt set SYNC or RESTART by default - add argument or option [Blackfin] arch: Add some comments - fix semicolons [Blackfin] arch: move all code related to CPLB handling into a new subdirectory under kernel/ [Blackfin] arch: print out list of modules if kernel is crashing and tell people if the kernel is tainted [Blackfin] arch: enable generic GPIO based I2C driver in STAMP-BF533, EZKIT-BF533 and EZKIT-BF561 boards [Blackfin] arch: Don't oops_in_progress if single step is comming from the kernel [Blackfin] arch: Fix BUG - kernel sometimes would stuck with KEYBOARD_GPIO on [Blackfin] arch: update to latest anomaly sheets ...
2 parents 991dee5 + 9c5e710 commit 9152530

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+2763
-760
lines changed

‎MAINTAINERS

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -758,22 +758,20 @@ S: Supported
758758

759759
BLACKFIN RTC DRIVER
760760
P: Mike Frysinger
761-
M: michael.frysinger@analog.com
762761
M: vapier.adi@gmail.com
763762
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
764763
W: http://blackfin.uclinux.org
765764
S: Supported
766765

767766
BLACKFIN SERIAL DRIVER
768-
P: Aubrey Li
769-
M: aubrey.li@analog.com
767+
P: Sonic Zhang
768+
M: sonic.zhang@analog.com
770769
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
771770
W: http://blackfin.uclinux.org
772771
S: Supported
773772

774773
BLACKFIN WATCHDOG DRIVER
775774
P: Mike Frysinger
776-
M: michael.frysinger@analog.com
777775
M: vapier.adi@gmail.com
778776
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
779777
W: http://blackfin.uclinux.org

‎arch/blackfin/Kconfig

Lines changed: 51 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,26 @@ config BF522
8585
help
8686
BF522 Processor Support.
8787

88+
config BF523
89+
bool "BF523"
90+
help
91+
BF523 Processor Support.
92+
93+
config BF524
94+
bool "BF524"
95+
help
96+
BF524 Processor Support.
97+
8898
config BF525
8999
bool "BF525"
90100
help
91101
BF525 Processor Support.
92102

103+
config BF526
104+
bool "BF526"
105+
help
106+
BF526 Processor Support.
107+
93108
config BF527
94109
bool "BF527"
95110
help
@@ -198,7 +213,7 @@ endchoice
198213

199214
config BF52x
200215
bool
201-
depends on (BF522 || BF525 || BF527)
216+
depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)
202217
default y
203218

204219
config BF53x
@@ -253,11 +268,6 @@ config MEM_MT48LC32M16A2TG_75
253268
depends on (BFIN527_EZKIT)
254269
default y
255270

256-
config BFIN_SHARED_FLASH_ENET
257-
bool
258-
depends on (BFIN533_STAMP)
259-
default y
260-
261271
source "arch/blackfin/mach-bf527/Kconfig"
262272
source "arch/blackfin/mach-bf533/Kconfig"
263273
source "arch/blackfin/mach-bf561/Kconfig"
@@ -317,7 +327,7 @@ config VCO_MULT
317327
range 1 64
318328
default "22" if BFIN533_EZKIT
319329
default "45" if BFIN533_STAMP
320-
default "20" if (BFIN537_STAMP || BFIN527_EZKIT)
330+
default "20" if (BFIN537_STAMP || BFIN527_EZKIT || BFIN548_EZKIT)
321331
default "22" if BFIN533_BLUETECHNIX_CM
322332
default "20" if BFIN537_BLUETECHNIX_CM
323333
default "20" if BFIN561_BLUETECHNIX_CM
@@ -354,7 +364,7 @@ config SCLK_DIV
354364
range 1 15
355365
default 5 if BFIN533_EZKIT
356366
default 5 if BFIN533_STAMP
357-
default 4 if (BFIN537_STAMP || BFIN527_EZKIT)
367+
default 4 if (BFIN537_STAMP || BFIN527_EZKIT || BFIN548_EZKIT)
358368
default 5 if BFIN533_BLUETECHNIX_CM
359369
default 4 if BFIN537_BLUETECHNIX_CM
360370
default 4 if BFIN561_BLUETECHNIX_CM
@@ -371,7 +381,10 @@ config SCLK_DIV
371381
config MAX_VCO_HZ
372382
int
373383
default 600000000 if BF522
384+
default 400000000 if BF523
385+
default 400000000 if BF524
374386
default 600000000 if BF525
387+
default 400000000 if BF526
375388
default 600000000 if BF527
376389
default 400000000 if BF531
377390
default 400000000 if BF532
@@ -383,6 +396,8 @@ config MAX_VCO_HZ
383396
default 533333333 if BF539
384397
default 600000000 if BF542
385398
default 533333333 if BF544
399+
default 600000000 if BF547
400+
default 600000000 if BF548
386401
default 533333333 if BF549
387402
default 600000000 if BF561
388403

@@ -409,13 +424,15 @@ config MEM_SIZE
409424
default 32 if BFIN533_EZKIT
410425
default 64 if BFIN527_EZKIT
411426
default 64 if BFIN537_STAMP
427+
default 64 if BFIN548_EZKIT
412428
default 64 if BFIN561_EZKIT
413429
default 128 if BFIN533_STAMP
414430
default 64 if PNAV10
415431
default 32 if H8606_HVSISTEMAS
416432

417433
config MEM_ADD_WIDTH
418434
int "SDRAM Memory Address Width"
435+
depends on (!BF54x)
419436
default 9 if BFIN533_EZKIT
420437
default 9 if BFIN561_EZKIT
421438
default 9 if H8606_HVSISTEMAS
@@ -424,6 +441,19 @@ config MEM_ADD_WIDTH
424441
default 11 if BFIN533_STAMP
425442
default 10 if PNAV10
426443

444+
445+
choice
446+
prompt "DDR SDRAM Chip Type"
447+
depends on BFIN548_EZKIT
448+
default MEM_MT46V32M16_5B
449+
450+
config MEM_MT46V32M16_6T
451+
bool "MT46V32M16_6T"
452+
453+
config MEM_MT46V32M16_5B
454+
bool "MT46V32M16_5B"
455+
endchoice
456+
427457
config ENET_FLASH_PIN
428458
int "PF port/pin used for flash and ethernet sharing"
429459
depends on (BFIN533_STAMP)
@@ -448,40 +478,6 @@ config BOOT_LOAD
448478
memory region is used to capture NULL pointer references as well
449479
as some core kernel functions.
450480

451-
comment "LED Status Indicators"
452-
depends on (BFIN533_STAMP || BFIN533_BLUETECHNIX_CM)
453-
454-
config BFIN_ALIVE_LED
455-
bool "Enable Board Alive"
456-
depends on (BFIN533_STAMP || BFIN533_BLUETECHNIX_CM)
457-
default n
458-
help
459-
Blink the LEDs you select when the kernel is running. Helps detect
460-
a hung kernel.
461-
462-
config BFIN_ALIVE_LED_NUM
463-
int "LED"
464-
depends on BFIN_ALIVE_LED
465-
range 1 3 if BFIN533_STAMP
466-
default "3" if BFIN533_STAMP
467-
help
468-
Select the LED (marked on the board) for you to blink.
469-
470-
config BFIN_IDLE_LED
471-
bool "Enable System Load/Idle LED"
472-
depends on (BFIN533_STAMP || BFIN533_BLUETECHNIX_CM)
473-
default n
474-
help
475-
Blinks the LED you select when to determine kernel load.
476-
477-
config BFIN_IDLE_LED_NUM
478-
int "LED"
479-
depends on BFIN_IDLE_LED
480-
range 1 3 if BFIN533_STAMP
481-
default "2" if BFIN533_STAMP
482-
help
483-
Select the LED (marked on the board) for you to blink.
484-
485481
choice
486482
prompt "Blackfin Exception Scratch Register"
487483
default BFIN_SCRATCH_REG_RETN
@@ -528,41 +524,6 @@ config BFIN_SCRATCH_REG_CYCLES
528524

529525
endchoice
530526

531-
#
532-
# Sorry - but you need to put the hex address here -
533-
#
534-
535-
# Flag Data register
536-
config BFIN_ALIVE_LED_PORT
537-
hex
538-
default 0xFFC00700 if (BFIN533_STAMP)
539-
540-
# Peripheral Flag Direction Register
541-
config BFIN_ALIVE_LED_DPORT
542-
hex
543-
default 0xFFC00730 if (BFIN533_STAMP)
544-
545-
config BFIN_ALIVE_LED_PIN
546-
hex
547-
default 0x04 if (BFIN533_STAMP && BFIN_ALIVE_LED_NUM = 1)
548-
default 0x08 if (BFIN533_STAMP && BFIN_ALIVE_LED_NUM = 2)
549-
default 0x10 if (BFIN533_STAMP && BFIN_ALIVE_LED_NUM = 3)
550-
551-
config BFIN_IDLE_LED_PORT
552-
hex
553-
default 0xFFC00700 if (BFIN533_STAMP)
554-
555-
# Peripheral Flag Direction Register
556-
config BFIN_IDLE_LED_DPORT
557-
hex
558-
default 0xFFC00730 if (BFIN533_STAMP)
559-
560-
config BFIN_IDLE_LED_PIN
561-
hex
562-
default 0x04 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 1)
563-
default 0x08 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 2)
564-
default 0x10 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 3)
565-
566527
endmenu
567528

568529

@@ -799,6 +760,15 @@ config L1_MAX_PIECE
799760
Set the max memory pieces for the L1 SRAM allocation algorithm.
800761
Min value is 16. Max value is 1024.
801762

763+
764+
config MPU
765+
bool "Enable the memory protection unit (EXPERIMENTAL)"
766+
default n
767+
help
768+
Use the processor's MPU to protect applications from accessing
769+
memory they do not own. This comes at a performance penalty
770+
and is recommended only for debugging.
771+
802772
comment "Asynchonous Memory Configuration"
803773

804774
menu "EBIU_AMGCTL Global Control"
@@ -808,7 +778,6 @@ config C_AMCKEN
808778

809779
config C_CDPRIO
810780
bool "DMA has priority over core for ext. accesses"
811-
depends on !BF54x
812781
default n
813782

814783
config C_B0PEN
@@ -949,8 +918,10 @@ endchoice
949918
config PM_WAKEUP_SIC_IWR
950919
hex "Wakeup Events (SIC_IWR)"
951920
depends on PM_WAKEUP_GPIO_BY_SIC_IWR
952-
default 0x80000000 if (BF537 || BF536 || BF534)
953-
default 0x100000 if (BF533 || BF532 || BF531)
921+
default 0x8 if (BF537 || BF536 || BF534)
922+
default 0x80 if (BF533 || BF532 || BF531)
923+
default 0x80 if (BF54x)
924+
default 0x80 if (BF52x)
954925

955926
config PM_WAKEUP_GPIO_NUMBER
956927
int "Wakeup GPIO number"

‎arch/blackfin/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ KBUILD_DEFCONFIG := BF537-STAMP_defconfig
2121

2222
# setup the machine name and the machine dependent settings
2323
machine-$(CONFIG_BF522) := bf527
24+
machine-$(CONFIG_BF523) := bf527
25+
machine-$(CONFIG_BF524) := bf527
2426
machine-$(CONFIG_BF525) := bf527
27+
machine-$(CONFIG_BF526) := bf527
2528
machine-$(CONFIG_BF527) := bf527
2629
machine-$(CONFIG_BF531) := bf533
2730
machine-$(CONFIG_BF532) := bf533
@@ -39,7 +42,10 @@ MACHINE := $(machine-y)
3942
export MACHINE
4043

4144
cpu-$(CONFIG_BF522) := bf522
45+
cpu-$(CONFIG_BF523) := bf523
46+
cpu-$(CONFIG_BF524) := bf524
4247
cpu-$(CONFIG_BF525) := bf525
48+
cpu-$(CONFIG_BF526) := bf526
4349
cpu-$(CONFIG_BF527) := bf527
4450
cpu-$(CONFIG_BF531) := bf531
4551
cpu-$(CONFIG_BF532) := bf532
@@ -76,6 +82,12 @@ core-y += arch/$(ARCH)/mach-$(MACHINE)/
7682
core-y += arch/$(ARCH)/mach-$(MACHINE)/boards/
7783
endif
7884

85+
ifeq ($(CONFIG_MPU),y)
86+
core-y += arch/$(ARCH)/kernel/cplb-mpu/
87+
else
88+
core-y += arch/$(ARCH)/kernel/cplb-nompu/
89+
endif
90+
7991
libs-y += arch/$(ARCH)/lib/
8092

8193
drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/

‎arch/blackfin/configs/BF527-EZKIT_defconfig

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.22.12
3+
# Linux kernel version: 2.6.22.14
4+
# Thu Nov 29 17:32:47 2007
45
#
56
# CONFIG_MMU is not set
67
# CONFIG_FPU is not set
@@ -153,8 +154,8 @@ CONFIG_BFIN527_EZKIT=y
153154
CONFIG_BF527_SPORT0_PORTG=y
154155
CONFIG_BF527_SPORT0_TSCLK_PG10=y
155156
# CONFIG_BF527_SPORT0_TSCLK_PG14 is not set
156-
# CONFIG_BF527_UART1_PORTF is not set
157-
CONFIG_BF527_UART1_PORTG=y
157+
CONFIG_BF527_UART1_PORTF=y
158+
# CONFIG_BF527_UART1_PORTG is not set
158159
# CONFIG_BF527_NAND_D_PORTF is not set
159160
CONFIG_BF527_NAND_D_PORTH=y
160161

@@ -232,7 +233,7 @@ CONFIG_CLKIN_HZ=25000000
232233
# CONFIG_BFIN_KERNEL_CLOCK is not set
233234
CONFIG_MAX_VCO_HZ=600000000
234235
CONFIG_MIN_VCO_HZ=50000000
235-
CONFIG_MAX_SCLK_HZ=133000000
236+
CONFIG_MAX_SCLK_HZ=133333333
236237
CONFIG_MIN_SCLK_HZ=27000000
237238

238239
#
@@ -626,8 +627,8 @@ CONFIG_BFIN_MAC_RMII=y
626627
# CONFIG_SMSC911X is not set
627628
# CONFIG_DM9000 is not set
628629
CONFIG_NETDEV_1000=y
629-
CONFIG_NETDEV_10000=y
630630
# CONFIG_AX88180 is not set
631+
CONFIG_NETDEV_10000=y
631632

632633
#
633634
# Wireless LAN
@@ -1183,7 +1184,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
11831184
#
11841185
# CONFIG_PRINTK_TIME is not set
11851186
CONFIG_ENABLE_MUST_CHECK=y
1186-
CONFIG_MAGIC_SYSRQ=y
1187+
# CONFIG_MAGIC_SYSRQ is not set
11871188
# CONFIG_UNUSED_SYMBOLS is not set
11881189
CONFIG_DEBUG_FS=y
11891190
# CONFIG_HEADERS_CHECK is not set
@@ -1208,7 +1209,7 @@ CONFIG_ACCESS_CHECK=y
12081209
# CONFIG_KEYS is not set
12091210
CONFIG_SECURITY=y
12101211
# CONFIG_SECURITY_NETWORK is not set
1211-
CONFIG_SECURITY_CAPABILITIES=y
1212+
CONFIG_SECURITY_CAPABILITIES=m
12121213

12131214
#
12141215
# Cryptographic options
@@ -1219,7 +1220,7 @@ CONFIG_SECURITY_CAPABILITIES=y
12191220
# Library routines
12201221
#
12211222
CONFIG_BITREVERSE=y
1222-
# CONFIG_CRC_CCITT is not set
1223+
CONFIG_CRC_CCITT=m
12231224
# CONFIG_CRC16 is not set
12241225
# CONFIG_CRC_ITU_T is not set
12251226
CONFIG_CRC32=y

0 commit comments

Comments
 (0)