Commit 14016899 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: (28 commits)
  Blackfin arch: SPI_MMC is now mainlined MMC_SPI
  Blackfin arch: disable legacy /proc/scsi/ support by default
  Blackfin arch: remove duplicated ANOMALY_05000448 ifdef check
  Blackfin arch: add stubs for anomalies 447 and 448
  Blackfin arch: cleanup bfin_sport.h header and export it to userspace
  Blackfin arch: fix bug - gdb signull case make trunk kernel panic frequently
  Blackfin arch: remove spurious dash when dcache is off
  Blackfin arch: mark init_pda as __init as only __init funcs all it
  Blackfin arch: fix bug - On bf548-ezkit, ethernet fails to work after wakeup from "mem"
  Blackfin arch: Random read/write errors are a bad thing
  Blackfin arch: update default kernel config, select KSZ8893M driver for BF518
  Blackfin arch: Fix bug - KGDB single step into the middle of a 4 bytes instruction on bf561 after soft bp is hit
  Blackfin arch: Fix bug - make ksz8893m driver available when bfin_mac is enabled
  Blackfin arch: make sure people do not set the kernel load address too high
  Blackfin arch: fix bug - The SPORT_HYS bit is not set for BF561 0.5
  Blackfin arch: update anomaly sheets to match latest public info
  Blackfin arch: Fix BUG - kernel fails to build in pm.c when allow wakeup fromi standby by GPIO
  Blackfin arch: PM_BFIN_WAKE_GP: update help
  Blackfin arch: fix bug - kgdb fails to continue after setting breakpoint on bf561-ezkit kernel with smp patch
  Blackfin arch: Enable Write Back Cache on all Blackfin Boards
  ...
parents 5dc18f51 f3f704d3

arch/blackfin/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,7 @@ endchoice 


config PM_WAKEUP_BY_GPIO

	bool "Allow Wakeup from Standby by GPIO"

	depends on PM && !BF54x



config PM_WAKEUP_GPIO_NUMBER

	int "GPIO number"
@@ -1168,6 +1169,12 @@ config PM_BFIN_WAKE_GP 
	default n

	help

	  Enable General-Purpose Wake-Up (Voltage Regulator Power-Up)

	  (all processors, except ADSP-BF549). This option sets

	  the general-purpose wake-up enable (GPWE) control bit to enable

	  wake-up upon detection of an active low signal on the /GPW (PH7) pin.

	  On ADSP-BF549 this option enables the the same functionality on the

	  /MRXON pin also PH7.



endmenu



menu "CPU Frequency scaling"

arch/blackfin/Kconfig.debug

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ config DEBUG_STACK_USAGE 
config HAVE_ARCH_KGDB

	def_bool y



config KGDB_TESTCASE

	tristate "KGDB: for test case in expect"

	default n

	help

	  This is a kgdb test case for automated testing.



config DEBUG_VERBOSE

	bool "Verbose fault messages"

	default y

arch/blackfin/configs/BF518F-EZBRD_defconfig

+59 −4
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28-rc2

# Fri Jan  9 17:58:41 2009

# Linux kernel version: 2.6.28

# Fri Feb 20 10:01:44 2009

#

# CONFIG_MMU is not set

# CONFIG_FPU is not set
@@ -133,10 +133,15 @@ CONFIG_BF518=y 
# CONFIG_BF538 is not set

# CONFIG_BF539 is not set

# CONFIG_BF542 is not set

# CONFIG_BF542M is not set

# CONFIG_BF544 is not set

# CONFIG_BF544M is not set

# CONFIG_BF547 is not set

# CONFIG_BF547M is not set

# CONFIG_BF548 is not set

# CONFIG_BF548M is not set

# CONFIG_BF549 is not set

# CONFIG_BF549M is not set

# CONFIG_BF561 is not set

CONFIG_BF_REV_MIN=0

CONFIG_BF_REV_MAX=2
@@ -426,7 +431,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_NET_DSA is not set

CONFIG_NET_DSA=y

# CONFIG_NET_DSA_TAG_DSA is not set

# CONFIG_NET_DSA_TAG_EDSA is not set

# CONFIG_NET_DSA_TAG_TRAILER is not set

CONFIG_NET_DSA_TAG_STPID=y

# CONFIG_NET_DSA_MV88E6XXX is not set

# CONFIG_NET_DSA_MV88E6060 is not set

# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set

# CONFIG_NET_DSA_MV88E6131 is not set

# CONFIG_NET_DSA_MV88E6123_61_65 is not set

CONFIG_NET_DSA_KSZ8893M=y

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set
@@ -529,6 +544,8 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y 
#

# Self-contained MTD device drivers

#

# CONFIG_MTD_DATAFLASH is not set

# CONFIG_MTD_M25P80 is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set
@@ -561,7 +578,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 
# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_C2PORT is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -607,6 +626,7 @@ CONFIG_BFIN_RX_DESC_NUM=20 
# CONFIG_SMC91X is not set

# CONFIG_SMSC911X is not set

# CONFIG_DM9000 is not set

# CONFIG_ENC28J60 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -764,7 +784,23 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 
# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y



#

# SPI Master Controller Drivers

#

CONFIG_SPI_BFIN=y

# CONFIG_SPI_BFIN_LOCK is not set

# CONFIG_SPI_BITBANG is not set



#

# SPI Protocol Masters

#

# CONFIG_SPI_AT25 is not set

# CONFIG_SPI_SPIDEV is not set

# CONFIG_SPI_TLE62X0 is not set

CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y

# CONFIG_GPIOLIB is not set

# CONFIG_W1 is not set
@@ -788,8 +824,10 @@ CONFIG_BFIN_WDT=y 
# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_REGULATOR is not set



#

# Multimedia devices
@@ -861,10 +899,18 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set



#

# SPI RTC drivers

#

# CONFIG_RTC_DRV_M41T94 is not set

# CONFIG_RTC_DRV_DS1305 is not set

# CONFIG_RTC_DRV_DS1390 is not set

# CONFIG_RTC_DRV_MAX6902 is not set

# CONFIG_RTC_DRV_R9701 is not set

# CONFIG_RTC_DRV_RS5C348 is not set

# CONFIG_RTC_DRV_DS3234 is not set



#

# Platform RTC drivers
@@ -1062,12 +1108,20 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_FAULT_INJECTION is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y



#

# Tracers

#

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

# CONFIG_DEBUG_STACKOVERFLOW is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_KGDB_TESTCASE is not set

CONFIG_DEBUG_VERBOSE=y

CONFIG_DEBUG_MMRS=y

# CONFIG_DEBUG_HWERR is not set
@@ -1100,6 +1154,7 @@ CONFIG_CRYPTO=y 
#

# CONFIG_CRYPTO_FIPS is not set

# CONFIG_CRYPTO_MANAGER is not set

# CONFIG_CRYPTO_MANAGER2 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_CRYPTD is not set

arch/blackfin/configs/BF527-EZKIT_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -327,8 +327,8 @@ CONFIG_BFIN_ICACHE=y 
CONFIG_BFIN_DCACHE=y

# CONFIG_BFIN_DCACHE_BANKA is not set

# CONFIG_BFIN_ICACHE_LOCK is not set

# CONFIG_BFIN_WB is not set

CONFIG_BFIN_WT=y

CONFIG_BFIN_WB=y

# CONFIG_BFIN_WT is not set

# CONFIG_MPU is not set



#

arch/blackfin/configs/BF533-EZKIT_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ CONFIG_BFIN_ICACHE=y 
CONFIG_BFIN_DCACHE=y

# CONFIG_BFIN_DCACHE_BANKA is not set

# CONFIG_BFIN_ICACHE_LOCK is not set

# CONFIG_BFIN_WB is not set

CONFIG_BFIN_WT=y

CONFIG_BFIN_WB=y

# CONFIG_BFIN_WT is not set

# CONFIG_MPU is not set



#

CRA Git | Maintained and supported by SUSTech CRA and CCSE