Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91525300 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 991dee59 9c5e710b

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -758,22 +758,20 @@ S: Supported 


BLACKFIN RTC DRIVER

P:	Mike Frysinger

M:	michael.frysinger@analog.com

M:	vapier.adi@gmail.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

W:	http://blackfin.uclinux.org

S:	Supported



BLACKFIN SERIAL DRIVER

P:	Aubrey Li

M:	aubrey.li@analog.com

P:	Sonic Zhang

M:	sonic.zhang@analog.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

W:	http://blackfin.uclinux.org

S:	Supported



BLACKFIN WATCHDOG DRIVER

P:	Mike Frysinger

M:	michael.frysinger@analog.com

M:	vapier.adi@gmail.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

W:	http://blackfin.uclinux.org

arch/blackfin/Kconfig

+51 −80
Original line number Diff line number Diff line
@@ -85,11 +85,26 @@ config BF522 
	help

	  BF522 Processor Support.



config BF523

	bool "BF523"

	help

	  BF523 Processor Support.



config BF524

	bool "BF524"

	help

	  BF524 Processor Support.



config BF525

	bool "BF525"

	help

	  BF525 Processor Support.



config BF526

	bool "BF526"

	help

	  BF526 Processor Support.



config BF527

	bool "BF527"

	help
@@ -198,7 +213,7 @@ endchoice 


config BF52x

	bool

	depends on (BF522 || BF525 || BF527)

	depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)

	default y



config BF53x
@@ -253,11 +268,6 @@ config MEM_MT48LC32M16A2TG_75 
	depends on (BFIN527_EZKIT)

	default y



config BFIN_SHARED_FLASH_ENET

	bool

	depends on (BFIN533_STAMP)

	default y



source "arch/blackfin/mach-bf527/Kconfig"

source "arch/blackfin/mach-bf533/Kconfig"

source "arch/blackfin/mach-bf561/Kconfig"
@@ -317,7 +327,7 @@ config VCO_MULT 
	range 1 64

	default "22" if BFIN533_EZKIT

	default "45" if BFIN533_STAMP

	default "20" if (BFIN537_STAMP || BFIN527_EZKIT)

	default "20" if (BFIN537_STAMP || BFIN527_EZKIT || BFIN548_EZKIT)

	default "22" if BFIN533_BLUETECHNIX_CM

	default "20" if BFIN537_BLUETECHNIX_CM

	default "20" if BFIN561_BLUETECHNIX_CM
@@ -354,7 +364,7 @@ config SCLK_DIV 
	range 1 15

	default 5 if BFIN533_EZKIT

	default 5 if BFIN533_STAMP

	default 4 if (BFIN537_STAMP || BFIN527_EZKIT)

	default 4 if (BFIN537_STAMP || BFIN527_EZKIT || BFIN548_EZKIT)

	default 5 if BFIN533_BLUETECHNIX_CM

	default 4 if BFIN537_BLUETECHNIX_CM

	default 4 if BFIN561_BLUETECHNIX_CM
@@ -371,7 +381,10 @@ config SCLK_DIV 
config MAX_VCO_HZ

	int

	default 600000000 if BF522

	default 400000000 if BF523

	default 400000000 if BF524

	default 600000000 if BF525

	default 400000000 if BF526

	default 600000000 if BF527

	default 400000000 if BF531

	default 400000000 if BF532
@@ -383,6 +396,8 @@ config MAX_VCO_HZ 
	default 533333333 if BF539

	default 600000000 if BF542

	default 533333333 if BF544

	default 600000000 if BF547

	default 600000000 if BF548

	default 533333333 if BF549

	default 600000000 if BF561
@@ -409,6 +424,7 @@ config MEM_SIZE 
	default  32 if BFIN533_EZKIT

	default  64 if BFIN527_EZKIT

	default  64 if BFIN537_STAMP

	default  64 if BFIN548_EZKIT

	default  64 if BFIN561_EZKIT

	default 128 if BFIN533_STAMP

	default  64 if PNAV10
@@ -416,6 +432,7 @@ config MEM_SIZE 


config MEM_ADD_WIDTH

	int "SDRAM Memory Address Width"

	depends on (!BF54x)

	default  9 if BFIN533_EZKIT

	default  9 if BFIN561_EZKIT

	default  9 if H8606_HVSISTEMAS
@@ -424,6 +441,19 @@ config MEM_ADD_WIDTH 
	default 11 if BFIN533_STAMP

	default 10 if PNAV10





choice

	prompt "DDR SDRAM Chip Type"

	depends on BFIN548_EZKIT

	default MEM_MT46V32M16_5B



config MEM_MT46V32M16_6T

        bool "MT46V32M16_6T"



config MEM_MT46V32M16_5B

        bool "MT46V32M16_5B"

endchoice



config ENET_FLASH_PIN

	int "PF port/pin used for flash and ethernet sharing"

	depends on (BFIN533_STAMP)
@@ -448,40 +478,6 @@ config BOOT_LOAD 
	  memory region is used to capture NULL pointer references as well

	  as some core kernel functions.



comment "LED Status Indicators"

	depends on (BFIN533_STAMP || BFIN533_BLUETECHNIX_CM)



config BFIN_ALIVE_LED

	bool "Enable Board Alive"

	depends on (BFIN533_STAMP || BFIN533_BLUETECHNIX_CM)

	default n

	help

	  Blink the LEDs you select when the kernel is running.  Helps detect

	  a hung kernel.



config BFIN_ALIVE_LED_NUM

	int "LED"

	depends on BFIN_ALIVE_LED

	range 1 3 if BFIN533_STAMP

	default "3" if BFIN533_STAMP

	help

	  Select the LED (marked on the board) for you to blink.



config BFIN_IDLE_LED

	bool "Enable System Load/Idle LED"

	depends on (BFIN533_STAMP || BFIN533_BLUETECHNIX_CM)

	default n

	help

	  Blinks the LED you select when to determine kernel load.



config BFIN_IDLE_LED_NUM

	int "LED"

	depends on BFIN_IDLE_LED

	range 1 3 if BFIN533_STAMP

	default "2" if BFIN533_STAMP

	help

	  Select the LED (marked on the board) for you to blink.



choice

	prompt "Blackfin Exception Scratch Register"

	default BFIN_SCRATCH_REG_RETN
@@ -528,41 +524,6 @@ config BFIN_SCRATCH_REG_CYCLES 


endchoice



#

# Sorry - but you need to put the hex address here -

#



# Flag Data register

config BFIN_ALIVE_LED_PORT

	hex

	default 0xFFC00700 if (BFIN533_STAMP)



# Peripheral Flag Direction Register

config BFIN_ALIVE_LED_DPORT

	hex

	default 0xFFC00730 if (BFIN533_STAMP)



config BFIN_ALIVE_LED_PIN

	hex

	default 0x04 if (BFIN533_STAMP && BFIN_ALIVE_LED_NUM = 1)

	default 0x08 if (BFIN533_STAMP && BFIN_ALIVE_LED_NUM = 2)

	default 0x10 if (BFIN533_STAMP && BFIN_ALIVE_LED_NUM = 3)



config BFIN_IDLE_LED_PORT

	hex

	default 0xFFC00700 if (BFIN533_STAMP)



# Peripheral Flag Direction Register

config BFIN_IDLE_LED_DPORT

	hex

	default 0xFFC00730 if (BFIN533_STAMP)



config BFIN_IDLE_LED_PIN

	hex

	default 0x04 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 1)

	default 0x08 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 2)

	default 0x10 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 3)



endmenu
@@ -799,6 +760,15 @@ config L1_MAX_PIECE 
	  Set the max memory pieces for the L1 SRAM allocation algorithm.

	  Min value is 16. Max value is 1024.





config MPU

	bool "Enable the memory protection unit (EXPERIMENTAL)"

	default n

	help

	  Use the processor's MPU to protect applications from accessing

	  memory they do not own.  This comes at a performance penalty

	  and is recommended only for debugging.



comment "Asynchonous Memory Configuration"



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


config C_CDPRIO

	bool "DMA has priority over core for ext. accesses"

	depends on !BF54x

	default n



config C_B0PEN
@@ -949,8 +918,10 @@ endchoice 
config PM_WAKEUP_SIC_IWR

	hex "Wakeup Events (SIC_IWR)"

	depends on PM_WAKEUP_GPIO_BY_SIC_IWR

	default 0x80000000 if (BF537 || BF536 || BF534)

	default 0x100000 if (BF533 || BF532 || BF531)

	default 0x8 if (BF537 || BF536 || BF534)

	default 0x80 if (BF533 || BF532 || BF531)

	default 0x80 if (BF54x)

	default 0x80 if (BF52x)



config PM_WAKEUP_GPIO_NUMBER

	int "Wakeup GPIO number"

arch/blackfin/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ KBUILD_DEFCONFIG := BF537-STAMP_defconfig 


# setup the machine name and the machine dependent settings

machine-$(CONFIG_BF522) := bf527

machine-$(CONFIG_BF523) := bf527

machine-$(CONFIG_BF524) := bf527

machine-$(CONFIG_BF525) := bf527

machine-$(CONFIG_BF526) := bf527

machine-$(CONFIG_BF527) := bf527

machine-$(CONFIG_BF531) := bf533

machine-$(CONFIG_BF532) := bf533
@@ -39,7 +42,10 @@ MACHINE := $(machine-y) 
export MACHINE



cpu-$(CONFIG_BF522) := bf522

cpu-$(CONFIG_BF523) := bf523

cpu-$(CONFIG_BF524) := bf524

cpu-$(CONFIG_BF525) := bf525

cpu-$(CONFIG_BF526) := bf526

cpu-$(CONFIG_BF527) := bf527

cpu-$(CONFIG_BF531) := bf531

cpu-$(CONFIG_BF532) := bf532
@@ -76,6 +82,12 @@ core-y += arch/$(ARCH)/mach-$(MACHINE)/ 
core-y   += arch/$(ARCH)/mach-$(MACHINE)/boards/

endif



ifeq ($(CONFIG_MPU),y)

core-y	+= arch/$(ARCH)/kernel/cplb-mpu/

else

core-y	+= arch/$(ARCH)/kernel/cplb-nompu/

endif



libs-y   += arch/$(ARCH)/lib/



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

arch/blackfin/configs/BF527-EZKIT_defconfig

+9 −8
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.22.12

# Linux kernel version: 2.6.22.14

# Thu Nov 29 17:32:47 2007

#

# CONFIG_MMU is not set

# CONFIG_FPU is not set
@@ -153,8 +154,8 @@ CONFIG_BFIN527_EZKIT=y 
CONFIG_BF527_SPORT0_PORTG=y

CONFIG_BF527_SPORT0_TSCLK_PG10=y

# CONFIG_BF527_SPORT0_TSCLK_PG14 is not set

# CONFIG_BF527_UART1_PORTF is not set

CONFIG_BF527_UART1_PORTG=y

CONFIG_BF527_UART1_PORTF=y

# CONFIG_BF527_UART1_PORTG is not set

# CONFIG_BF527_NAND_D_PORTF is not set

CONFIG_BF527_NAND_D_PORTH=y
@@ -232,7 +233,7 @@ CONFIG_CLKIN_HZ=25000000 
# CONFIG_BFIN_KERNEL_CLOCK is not set

CONFIG_MAX_VCO_HZ=600000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MAX_SCLK_HZ=133000000

CONFIG_MAX_SCLK_HZ=133333333

CONFIG_MIN_SCLK_HZ=27000000



#
@@ -626,8 +627,8 @@ CONFIG_BFIN_MAC_RMII=y 
# CONFIG_SMSC911X is not set

# CONFIG_DM9000 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y

# CONFIG_AX88180 is not set

CONFIG_NETDEV_10000=y



#

# Wireless LAN
@@ -1183,7 +1184,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" 
#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set
@@ -1208,7 +1209,7 @@ CONFIG_ACCESS_CHECK=y 
# CONFIG_KEYS is not set

CONFIG_SECURITY=y

# CONFIG_SECURITY_NETWORK is not set

CONFIG_SECURITY_CAPABILITIES=y

CONFIG_SECURITY_CAPABILITIES=m



#

# Cryptographic options
@@ -1219,7 +1220,7 @@ CONFIG_SECURITY_CAPABILITIES=y 
# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_CRC_CCITT is not set

CONFIG_CRC_CCITT=m

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

arch/blackfin/configs/BF533-EZKIT_defconfig

+8 −9
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.22.12

# Linux kernel version: 2.6.22.16

#

# CONFIG_MMU is not set

# CONFIG_FPU is not set
@@ -115,7 +115,10 @@ CONFIG_PREEMPT_VOLUNTARY=y 
# Processor and Board Settings

#

# CONFIG_BF522 is not set

# CONFIG_BF523 is not set

# CONFIG_BF524 is not set

# CONFIG_BF525 is not set

# CONFIG_BF526 is not set

# CONFIG_BF527 is not set

# CONFIG_BF531 is not set

# CONFIG_BF532 is not set
@@ -194,7 +197,7 @@ CONFIG_CLKIN_HZ=27000000 
# CONFIG_BFIN_KERNEL_CLOCK is not set

CONFIG_MAX_VCO_HZ=750000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MAX_SCLK_HZ=133000000

CONFIG_MAX_SCLK_HZ=133333333

CONFIG_MIN_SCLK_HZ=27000000



#
@@ -267,6 +270,7 @@ CONFIG_BFIN_DCACHE=y 
# CONFIG_BFIN_WB is not set

CONFIG_BFIN_WT=y

CONFIG_L1_MAX_PIECE=16

# CONFIG_MPU is not set



#

# Asynchonous Memory Configuration
@@ -321,7 +325,7 @@ CONFIG_PM=y 
CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y

# CONFIG_PM_WAKEUP_BY_GPIO is not set

# CONFIG_PM_WAKEUP_GPIO_API is not set

CONFIG_PM_WAKEUP_SIC_IWR=0x100000

CONFIG_PM_WAKEUP_SIC_IWR=0x80



#

# CPU Frequency scaling
@@ -510,7 +514,6 @@ CONFIG_MTD_CFI_I2=y 
# CONFIG_MTD_CFI_INTELEXT is not set

# CONFIG_MTD_CFI_AMDSTD is not set

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_MW320D=m

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=m

# CONFIG_MTD_ABSENT is not set
@@ -520,9 +523,6 @@ CONFIG_MTD_ROM=m 
#

CONFIG_MTD_COMPLEX_MAPPINGS=y

# CONFIG_MTD_PHYSMAP is not set

CONFIG_MTD_BF5xx=m

CONFIG_BFIN_FLASH_SIZE=0x400000

CONFIG_EBIU_FLASH_BASE=0x20000000

# CONFIG_MTD_UCLINUX is not set

# CONFIG_MTD_PLATRAM is not set
@@ -610,8 +610,8 @@ CONFIG_SMC91X=y 
# CONFIG_SMSC911X is not set

# CONFIG_DM9000 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y

# CONFIG_AX88180 is not set

CONFIG_NETDEV_10000=y



#

# Wireless LAN
@@ -680,7 +680,6 @@ CONFIG_INPUT_EVDEV=m 
CONFIG_BFIN_SPORT=y

# CONFIG_BFIN_TIMER_LATENCY is not set

# CONFIG_AD5304 is not set

# CONFIG_BF5xx_FBDMA is not set

# CONFIG_VT is not set

# CONFIG_SERIAL_NONSTANDARD is not set