aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 16:55:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 16:55:49 -0400
commit0151f94f2e61c39858e714a5d92244b0e5a7fdf5 (patch)
tree2506632249220ce509ecacde35c630d74ffb2031 /arch/blackfin
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
parentd6879c585b7f8c2f3eb2f7e7beac806af4e9755c (diff)
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: Blackfin arch: be less noisy when gets a gpio conflict after kernel has booted Blackfin arch: add RSI's definitions to bf514 and bf516 Blackfin arch: add link-time asserts to make sure on-chip regions dont overflow Blackfin arch: sport spi needs 6 gpio pins Blackfin arch: add sport-spi related resource stuff to board file Blackfin arch: Blacklist Hibernate (PM_SUSPEND_MEM) on BF561 as well Blackfin arch: Privide BF537-STAMP platform data of ADP5520 Multifunction driver Blackfin arch: enable the platfrom PATA driver with CF Cards Blackfin arch: clean up sports header file Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x Blackfin arch: bf51x processors also have 8 timers Blackfin arch: add a check to make sure only Blackfin GPIOs may generate IRQs Blackfin arch: update default kernel configuration Blackfin arch: include linux headers that this one uses definitions from fro sport drivers
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/configs/BF518F-EZBRD_defconfig42
-rw-r--r--arch/blackfin/configs/BF526-EZBRD_defconfig140
-rw-r--r--arch/blackfin/configs/BF527-EZKIT_defconfig150
-rw-r--r--arch/blackfin/configs/BF533-EZKIT_defconfig54
-rw-r--r--arch/blackfin/configs/BF533-STAMP_defconfig100
-rw-r--r--arch/blackfin/configs/BF537-STAMP_defconfig97
-rw-r--r--arch/blackfin/configs/BF538-EZKIT_defconfig101
-rw-r--r--arch/blackfin/configs/BF548-EZKIT_defconfig163
-rw-r--r--arch/blackfin/configs/BF561-EZKIT_defconfig54
-rw-r--r--arch/blackfin/configs/BlackStamp_defconfig4
-rw-r--r--arch/blackfin/configs/CM-BF527_defconfig6
-rw-r--r--arch/blackfin/configs/CM-BF533_defconfig4
-rw-r--r--arch/blackfin/configs/CM-BF537E_defconfig4
-rw-r--r--arch/blackfin/configs/CM-BF537U_defconfig4
-rw-r--r--arch/blackfin/configs/CM-BF548_defconfig4
-rw-r--r--arch/blackfin/configs/CM-BF561_defconfig4
-rw-r--r--arch/blackfin/configs/H8606_defconfig4
-rw-r--r--arch/blackfin/configs/IP0X_defconfig4
-rw-r--r--arch/blackfin/configs/PNAV-10_defconfig39
-rw-r--r--arch/blackfin/configs/SRV1_defconfig4
-rw-r--r--arch/blackfin/configs/TCM-BF537_defconfig6
-rw-r--r--arch/blackfin/include/asm/bfin5xx_spi.h2
-rw-r--r--arch/blackfin/include/asm/bfin_sport.h9
-rw-r--r--arch/blackfin/include/asm/gpio.h7
-rw-r--r--arch/blackfin/include/asm/gptimers.h6
-rw-r--r--arch/blackfin/kernel/bfin_gpio.c78
-rw-r--r--arch/blackfin/kernel/vmlinux.lds.S4
-rw-r--r--arch/blackfin/mach-bf518/include/mach/blackfin.h2
-rw-r--r--arch/blackfin/mach-bf518/include/mach/cdefBF514.h67
-rw-r--r--arch/blackfin/mach-bf518/include/mach/cdefBF516.h67
-rw-r--r--arch/blackfin/mach-bf518/include/mach/defBF514.h135
-rw-r--r--arch/blackfin/mach-bf518/include/mach/defBF516.h135
-rw-r--r--arch/blackfin/mach-bf527/include/mach/blackfin.h2
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c235
-rw-r--r--arch/blackfin/mach-bf548/include/mach/blackfin.h2
-rw-r--r--arch/blackfin/mach-common/pm.c2
36 files changed, 1204 insertions, 537 deletions
diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig
index 281f4b60e603..c121d6e6e2b8 100644
--- a/arch/blackfin/configs/BF518F-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig
@@ -1,7 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.28.7
4# Fri Feb 20 10:01:44 2009
5# 4#
6# CONFIG_MMU is not set 5# CONFIG_MMU is not set
7# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -43,7 +42,7 @@ CONFIG_LOG_BUF_SHIFT=14
43CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
48CONFIG_UID16=y 47CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -56,13 +55,13 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 60CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
63CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
64CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
65CONFIG_AIO=y 64# CONFIG_AIO is not set
66CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLAB=y 66CONFIG_SLAB=y
68# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -314,7 +313,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
314# CONFIG_PHYS_ADDR_T_64BIT is not set 313# CONFIG_PHYS_ADDR_T_64BIT is not set
315CONFIG_ZONE_DMA_FLAG=1 314CONFIG_ZONE_DMA_FLAG=1
316CONFIG_VIRT_TO_BUS=y 315CONFIG_VIRT_TO_BUS=y
317CONFIG_BFIN_GPTIMERS=y 316CONFIG_BFIN_GPTIMERS=m
318# CONFIG_DMA_UNCACHED_4M is not set 317# CONFIG_DMA_UNCACHED_4M is not set
319# CONFIG_DMA_UNCACHED_2M is not set 318# CONFIG_DMA_UNCACHED_2M is not set
320CONFIG_DMA_UNCACHED_1M=y 319CONFIG_DMA_UNCACHED_1M=y
@@ -375,7 +374,6 @@ CONFIG_BINFMT_ZFLAT=y
375# 374#
376# CONFIG_PM is not set 375# CONFIG_PM is not set
377CONFIG_ARCH_SUSPEND_POSSIBLE=y 376CONFIG_ARCH_SUSPEND_POSSIBLE=y
378# CONFIG_PM_WAKEUP_BY_GPIO is not set
379 377
380# 378#
381# CPU Frequency scaling 379# CPU Frequency scaling
@@ -634,6 +632,7 @@ CONFIG_BFIN_RX_DESC_NUM=20
634# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 632# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
635# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 633# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
636# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 634# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
635# CONFIG_B44 is not set
637# CONFIG_NETDEV_1000 is not set 636# CONFIG_NETDEV_1000 is not set
638# CONFIG_NETDEV_10000 is not set 637# CONFIG_NETDEV_10000 is not set
639 638
@@ -793,6 +792,7 @@ CONFIG_SPI_MASTER=y
793# 792#
794CONFIG_SPI_BFIN=y 793CONFIG_SPI_BFIN=y
795# CONFIG_SPI_BFIN_LOCK is not set 794# CONFIG_SPI_BFIN_LOCK is not set
795# CONFIG_SPI_BFIN_SPORT is not set
796# CONFIG_SPI_BITBANG is not set 796# CONFIG_SPI_BITBANG is not set
797 797
798# 798#
@@ -816,6 +816,12 @@ CONFIG_WATCHDOG=y
816# 816#
817# CONFIG_SOFT_WATCHDOG is not set 817# CONFIG_SOFT_WATCHDOG is not set
818CONFIG_BFIN_WDT=y 818CONFIG_BFIN_WDT=y
819CONFIG_SSB_POSSIBLE=y
820
821#
822# Sonics Silicon Backplane
823#
824# CONFIG_SSB is not set
819 825
820# 826#
821# Multifunction device drivers 827# Multifunction device drivers
@@ -865,7 +871,26 @@ CONFIG_DUMMY_CONSOLE=y
865# CONFIG_SOUND is not set 871# CONFIG_SOUND is not set
866# CONFIG_HID_SUPPORT is not set 872# CONFIG_HID_SUPPORT is not set
867# CONFIG_USB_SUPPORT is not set 873# CONFIG_USB_SUPPORT is not set
868# CONFIG_MMC is not set 874CONFIG_MMC=y
875# CONFIG_MMC_DEBUG is not set
876# CONFIG_MMC_UNSAFE_RESUME is not set
877
878#
879# MMC/SD/SDIO Card Drivers
880#
881CONFIG_MMC_BLOCK=y
882CONFIG_MMC_BLOCK_BOUNCE=y
883# CONFIG_SDIO_UART is not set
884# CONFIG_MMC_TEST is not set
885
886#
887# MMC/SD/SDIO Host Controller Drivers
888#
889# CONFIG_MMC_SDHCI is not set
890CONFIG_SDH_BFIN=m
891CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND=y
892CONFIG_SDH_BFIN_ENABLE_SDIO_IRQ=y
893# CONFIG_MMC_SPI is not set
869# CONFIG_MEMSTICK is not set 894# CONFIG_MEMSTICK is not set
870# CONFIG_NEW_LEDS is not set 895# CONFIG_NEW_LEDS is not set
871# CONFIG_ACCESSIBILITY is not set 896# CONFIG_ACCESSIBILITY is not set
@@ -1121,7 +1146,6 @@ CONFIG_HAVE_ARCH_KGDB=y
1121# CONFIG_KGDB is not set 1146# CONFIG_KGDB is not set
1122# CONFIG_DEBUG_STACKOVERFLOW is not set 1147# CONFIG_DEBUG_STACKOVERFLOW is not set
1123# CONFIG_DEBUG_STACK_USAGE is not set 1148# CONFIG_DEBUG_STACK_USAGE is not set
1124# CONFIG_KGDB_TESTCASE is not set
1125CONFIG_DEBUG_VERBOSE=y 1149CONFIG_DEBUG_VERBOSE=y
1126CONFIG_DEBUG_MMRS=y 1150CONFIG_DEBUG_MMRS=y
1127# CONFIG_DEBUG_HWERR is not set 1151# CONFIG_DEBUG_HWERR is not set
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig
index 8e2b855b8db7..3e562b2775d4 100644
--- a/arch/blackfin/configs/BF526-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -42,7 +42,7 @@ CONFIG_LOG_BUF_SHIFT=14
42CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
43CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
46CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
47CONFIG_UID16=y 47CONFIG_UID16=y
48CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -55,13 +55,13 @@ CONFIG_BUG=y
55# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
56CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
57CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
58CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
59CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
60CONFIG_EPOLL=y 60CONFIG_EPOLL=y
61CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
62CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
63CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
64CONFIG_AIO=y 64# CONFIG_AIO is not set
65CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
66CONFIG_SLAB=y 66CONFIG_SLAB=y
67# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -132,15 +132,20 @@ CONFIG_BF526=y
132# CONFIG_BF538 is not set 132# CONFIG_BF538 is not set
133# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
134# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
135# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
136# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
137# CONFIG_BF548 is not set 140# CONFIG_BF548 is not set
141# CONFIG_BF548M is not set
138# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
139# CONFIG_BF561 is not set 144# CONFIG_BF561 is not set
140CONFIG_BF_REV_MIN=0 145CONFIG_BF_REV_MIN=0
141CONFIG_BF_REV_MAX=2 146CONFIG_BF_REV_MAX=2
142CONFIG_BF_REV_0_0=y 147# CONFIG_BF_REV_0_0 is not set
143# CONFIG_BF_REV_0_1 is not set 148CONFIG_BF_REV_0_1=y
144# CONFIG_BF_REV_0_2 is not set 149# CONFIG_BF_REV_0_2 is not set
145# CONFIG_BF_REV_0_3 is not set 150# CONFIG_BF_REV_0_3 is not set
146# CONFIG_BF_REV_0_4 is not set 151# CONFIG_BF_REV_0_4 is not set
@@ -313,7 +318,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
313# CONFIG_PHYS_ADDR_T_64BIT is not set 318# CONFIG_PHYS_ADDR_T_64BIT is not set
314CONFIG_ZONE_DMA_FLAG=1 319CONFIG_ZONE_DMA_FLAG=1
315CONFIG_VIRT_TO_BUS=y 320CONFIG_VIRT_TO_BUS=y
316CONFIG_BFIN_GPTIMERS=y 321CONFIG_BFIN_GPTIMERS=m
317# CONFIG_DMA_UNCACHED_4M is not set 322# CONFIG_DMA_UNCACHED_4M is not set
318# CONFIG_DMA_UNCACHED_2M is not set 323# CONFIG_DMA_UNCACHED_2M is not set
319CONFIG_DMA_UNCACHED_1M=y 324CONFIG_DMA_UNCACHED_1M=y
@@ -374,7 +379,6 @@ CONFIG_BINFMT_ZFLAT=y
374# 379#
375# CONFIG_PM is not set 380# CONFIG_PM is not set
376CONFIG_ARCH_SUSPEND_POSSIBLE=y 381CONFIG_ARCH_SUSPEND_POSSIBLE=y
377# CONFIG_PM_WAKEUP_BY_GPIO is not set
378 382
379# 383#
380# CPU Frequency scaling 384# CPU Frequency scaling
@@ -583,7 +587,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
583# CONFIG_BLK_DEV_HD is not set 587# CONFIG_BLK_DEV_HD is not set
584CONFIG_MISC_DEVICES=y 588CONFIG_MISC_DEVICES=y
585# CONFIG_EEPROM_93CX6 is not set 589# CONFIG_EEPROM_93CX6 is not set
590# CONFIG_ICS932S401 is not set
586# CONFIG_ENCLOSURE_SERVICES is not set 591# CONFIG_ENCLOSURE_SERVICES is not set
592# CONFIG_C2PORT is not set
587CONFIG_HAVE_IDE=y 593CONFIG_HAVE_IDE=y
588# CONFIG_IDE is not set 594# CONFIG_IDE is not set
589 595
@@ -637,6 +643,7 @@ CONFIG_BFIN_MAC_RMII=y
637# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 643# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
638# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 644# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
639# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 645# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
646# CONFIG_B44 is not set
640CONFIG_NETDEV_1000=y 647CONFIG_NETDEV_1000=y
641# CONFIG_AX88180 is not set 648# CONFIG_AX88180 is not set
642CONFIG_NETDEV_10000=y 649CONFIG_NETDEV_10000=y
@@ -815,6 +822,7 @@ CONFIG_SPI_MASTER=y
815# 822#
816CONFIG_SPI_BFIN=y 823CONFIG_SPI_BFIN=y
817# CONFIG_SPI_BFIN_LOCK is not set 824# CONFIG_SPI_BFIN_LOCK is not set
825# CONFIG_SPI_BFIN_SPORT is not set
818# CONFIG_SPI_BITBANG is not set 826# CONFIG_SPI_BITBANG is not set
819 827
820# 828#
@@ -838,6 +846,7 @@ CONFIG_HWMON=y
838# CONFIG_SENSORS_ADM1029 is not set 846# CONFIG_SENSORS_ADM1029 is not set
839# CONFIG_SENSORS_ADM1031 is not set 847# CONFIG_SENSORS_ADM1031 is not set
840# CONFIG_SENSORS_ADM9240 is not set 848# CONFIG_SENSORS_ADM9240 is not set
849# CONFIG_SENSORS_ADT7462 is not set
841# CONFIG_SENSORS_ADT7470 is not set 850# CONFIG_SENSORS_ADT7470 is not set
842# CONFIG_SENSORS_ADT7473 is not set 851# CONFIG_SENSORS_ADT7473 is not set
843# CONFIG_SENSORS_ATXP1 is not set 852# CONFIG_SENSORS_ATXP1 is not set
@@ -896,6 +905,12 @@ CONFIG_BFIN_WDT=y
896# USB-based Watchdog Cards 905# USB-based Watchdog Cards
897# 906#
898# CONFIG_USBPCWATCHDOG is not set 907# CONFIG_USBPCWATCHDOG is not set
908CONFIG_SSB_POSSIBLE=y
909
910#
911# Sonics Silicon Backplane
912#
913# CONFIG_SSB is not set
899 914
900# 915#
901# Multifunction device drivers 916# Multifunction device drivers
@@ -904,8 +919,10 @@ CONFIG_BFIN_WDT=y
904# CONFIG_MFD_SM501 is not set 919# CONFIG_MFD_SM501 is not set
905# CONFIG_HTC_PASIC3 is not set 920# CONFIG_HTC_PASIC3 is not set
906# CONFIG_MFD_TMIO is not set 921# CONFIG_MFD_TMIO is not set
922# CONFIG_PMIC_DA903X is not set
907# CONFIG_MFD_WM8400 is not set 923# CONFIG_MFD_WM8400 is not set
908# CONFIG_MFD_WM8350_I2C is not set 924# CONFIG_MFD_WM8350_I2C is not set
925# CONFIG_REGULATOR is not set
909 926
910# 927#
911# Multimedia devices 928# Multimedia devices
@@ -940,55 +957,7 @@ CONFIG_BFIN_WDT=y
940# Console display driver support 957# Console display driver support
941# 958#
942CONFIG_DUMMY_CONSOLE=y 959CONFIG_DUMMY_CONSOLE=y
943CONFIG_SOUND=m 960# CONFIG_SOUND is not set
944CONFIG_SOUND_OSS_CORE=y
945CONFIG_SND=m
946CONFIG_SND_TIMER=m
947CONFIG_SND_PCM=m
948# CONFIG_SND_SEQUENCER is not set
949CONFIG_SND_OSSEMUL=y
950CONFIG_SND_MIXER_OSS=m
951CONFIG_SND_PCM_OSS=m
952CONFIG_SND_PCM_OSS_PLUGINS=y
953# CONFIG_SND_DYNAMIC_MINORS is not set
954CONFIG_SND_SUPPORT_OLD_API=y
955CONFIG_SND_VERBOSE_PROCFS=y
956# CONFIG_SND_VERBOSE_PRINTK is not set
957# CONFIG_SND_DEBUG is not set
958CONFIG_SND_DRIVERS=y
959# CONFIG_SND_DUMMY is not set
960# CONFIG_SND_MTPAV is not set
961# CONFIG_SND_SERIAL_U16550 is not set
962# CONFIG_SND_MPU401 is not set
963CONFIG_SND_SPI=y
964
965#
966# ALSA Blackfin devices
967#
968# CONFIG_SND_BLACKFIN_AD1836 is not set
969# CONFIG_SND_BFIN_AD73322 is not set
970CONFIG_SND_USB=y
971# CONFIG_SND_USB_AUDIO is not set
972# CONFIG_SND_USB_CAIAQ is not set
973CONFIG_SND_SOC=m
974CONFIG_SND_SOC_AC97_BUS=y
975CONFIG_SND_BF5XX_I2S=m
976CONFIG_SND_BF5XX_SOC_SSM2602=m
977# CONFIG_SND_BF5XX_SOC_AD73311 is not set
978CONFIG_SND_BF5XX_AC97=m
979CONFIG_SND_BF5XX_MMAP_SUPPORT=y
980# CONFIG_SND_BF5XX_MULTICHAN_SUPPORT is not set
981CONFIG_SND_BF5XX_SOC_SPORT=m
982CONFIG_SND_BF5XX_SOC_I2S=m
983CONFIG_SND_BF5XX_SOC_AC97=m
984CONFIG_SND_BF5XX_SOC_AD1980=m
985CONFIG_SND_BF5XX_SPORT_NUM=0
986# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
987# CONFIG_SND_SOC_ALL_CODECS is not set
988CONFIG_SND_SOC_AD1980=m
989CONFIG_SND_SOC_SSM2602=m
990# CONFIG_SOUND_PRIME is not set
991CONFIG_AC97_BUS=m
992CONFIG_HID_SUPPORT=y 961CONFIG_HID_SUPPORT=y
993CONFIG_HID=y 962CONFIG_HID=y
994# CONFIG_HID_DEBUG is not set 963# CONFIG_HID_DEBUG is not set
@@ -1063,13 +1032,15 @@ CONFIG_USB_MUSB_HDRC=y
1063CONFIG_USB_MUSB_SOC=y 1032CONFIG_USB_MUSB_SOC=y
1064 1033
1065# 1034#
1066# Blackfin high speed USB support 1035# Blackfin high speed USB Support
1067# 1036#
1068CONFIG_USB_MUSB_HOST=y 1037CONFIG_USB_MUSB_HOST=y
1069# CONFIG_USB_MUSB_PERIPHERAL is not set 1038# CONFIG_USB_MUSB_PERIPHERAL is not set
1070# CONFIG_USB_MUSB_OTG is not set 1039# CONFIG_USB_MUSB_OTG is not set
1040# CONFIG_USB_GADGET_MUSB_HDRC is not set
1071CONFIG_USB_MUSB_HDRC_HCD=y 1041CONFIG_USB_MUSB_HDRC_HCD=y
1072CONFIG_MUSB_PIO_ONLY=y 1042CONFIG_MUSB_PIO_ONLY=y
1043CONFIG_MUSB_DMA_POLL=y
1073# CONFIG_USB_MUSB_DEBUG is not set 1044# CONFIG_USB_MUSB_DEBUG is not set
1074 1045
1075# 1046#
@@ -1081,18 +1052,33 @@ CONFIG_MUSB_PIO_ONLY=y
1081# CONFIG_USB_TMC is not set 1052# CONFIG_USB_TMC is not set
1082 1053
1083# 1054#
1084# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1055# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1085# 1056#
1086 1057
1087# 1058#
1088# may also be needed; see USB_STORAGE Help for more information 1059# see USB_STORAGE Help for more information
1089# 1060#
1061CONFIG_USB_STORAGE=m
1062# CONFIG_USB_STORAGE_DEBUG is not set
1063# CONFIG_USB_STORAGE_DATAFAB is not set
1064# CONFIG_USB_STORAGE_FREECOM is not set
1065# CONFIG_USB_STORAGE_ISD200 is not set
1066# CONFIG_USB_STORAGE_DPCM is not set
1067# CONFIG_USB_STORAGE_USBAT is not set
1068# CONFIG_USB_STORAGE_SDDR09 is not set
1069# CONFIG_USB_STORAGE_SDDR55 is not set
1070# CONFIG_USB_STORAGE_JUMPSHOT is not set
1071# CONFIG_USB_STORAGE_ALAUDA is not set
1072# CONFIG_USB_STORAGE_ONETOUCH is not set
1073# CONFIG_USB_STORAGE_KARMA is not set
1074# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1090# CONFIG_USB_LIBUSUAL is not set 1075# CONFIG_USB_LIBUSUAL is not set
1091 1076
1092# 1077#
1093# USB Imaging devices 1078# USB Imaging devices
1094# 1079#
1095# CONFIG_USB_MDC800 is not set 1080# CONFIG_USB_MDC800 is not set
1081# CONFIG_USB_MICROTEK is not set
1096 1082
1097# 1083#
1098# USB port drivers 1084# USB port drivers
@@ -1124,6 +1110,30 @@ CONFIG_MUSB_PIO_ONLY=y
1124# CONFIG_USB_ISIGHTFW is not set 1110# CONFIG_USB_ISIGHTFW is not set
1125# CONFIG_USB_VST is not set 1111# CONFIG_USB_VST is not set
1126# CONFIG_USB_GADGET is not set 1112# CONFIG_USB_GADGET is not set
1113# CONFIG_USB_GADGET_AT91 is not set
1114# CONFIG_USB_GADGET_ATMEL_USBA is not set
1115# CONFIG_USB_GADGET_FSL_USB2 is not set
1116# CONFIG_USB_GADGET_LH7A40X is not set
1117# CONFIG_USB_GADGET_OMAP is not set
1118# CONFIG_USB_GADGET_PXA25X is not set
1119# CONFIG_USB_GADGET_PXA27X is not set
1120# CONFIG_USB_GADGET_S3C2410 is not set
1121# CONFIG_USB_GADGET_M66592 is not set
1122# CONFIG_USB_GADGET_AMD5536UDC is not set
1123# CONFIG_USB_GADGET_FSL_QE is not set
1124# CONFIG_USB_GADGET_NET2272 is not set
1125# CONFIG_USB_GADGET_NET2280 is not set
1126# CONFIG_USB_GADGET_GOKU is not set
1127# CONFIG_USB_GADGET_DUMMY_HCD is not set
1128# CONFIG_USB_ZERO is not set
1129# CONFIG_USB_AUDIO is not set
1130# CONFIG_USB_ETH is not set
1131# CONFIG_USB_GADGETFS is not set
1132# CONFIG_USB_FILE_STORAGE is not set
1133# CONFIG_USB_G_SERIAL is not set
1134# CONFIG_USB_MIDI_GADGET is not set
1135# CONFIG_USB_G_PRINTER is not set
1136# CONFIG_USB_CDC_COMPOSITE is not set
1127# CONFIG_MMC is not set 1137# CONFIG_MMC is not set
1128# CONFIG_MEMSTICK is not set 1138# CONFIG_MEMSTICK is not set
1129# CONFIG_NEW_LEDS is not set 1139# CONFIG_NEW_LEDS is not set
@@ -1158,12 +1168,14 @@ CONFIG_RTC_INTF_DEV=y
1158# CONFIG_RTC_DRV_M41T80 is not set 1168# CONFIG_RTC_DRV_M41T80 is not set
1159# CONFIG_RTC_DRV_S35390A is not set 1169# CONFIG_RTC_DRV_S35390A is not set
1160# CONFIG_RTC_DRV_FM3130 is not set 1170# CONFIG_RTC_DRV_FM3130 is not set
1171# CONFIG_RTC_DRV_RX8581 is not set
1161 1172
1162# 1173#
1163# SPI RTC drivers 1174# SPI RTC drivers
1164# 1175#
1165# CONFIG_RTC_DRV_M41T94 is not set 1176# CONFIG_RTC_DRV_M41T94 is not set
1166# CONFIG_RTC_DRV_DS1305 is not set 1177# CONFIG_RTC_DRV_DS1305 is not set
1178# CONFIG_RTC_DRV_DS1390 is not set
1167# CONFIG_RTC_DRV_MAX6902 is not set 1179# CONFIG_RTC_DRV_MAX6902 is not set
1168# CONFIG_RTC_DRV_R9701 is not set 1180# CONFIG_RTC_DRV_R9701 is not set
1169# CONFIG_RTC_DRV_RS5C348 is not set 1181# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1384,6 +1396,13 @@ CONFIG_DEBUG_INFO=y
1384# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1396# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1385# CONFIG_FAULT_INJECTION is not set 1397# CONFIG_FAULT_INJECTION is not set
1386CONFIG_SYSCTL_SYSCALL_CHECK=y 1398CONFIG_SYSCTL_SYSCALL_CHECK=y
1399
1400#
1401# Tracers
1402#
1403# CONFIG_SCHED_TRACER is not set
1404# CONFIG_CONTEXT_SWITCH_TRACER is not set
1405# CONFIG_BOOT_TRACER is not set
1387# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1406# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1388# CONFIG_SAMPLES is not set 1407# CONFIG_SAMPLES is not set
1389CONFIG_HAVE_ARCH_KGDB=y 1408CONFIG_HAVE_ARCH_KGDB=y
@@ -1423,6 +1442,7 @@ CONFIG_CRYPTO=y
1423# 1442#
1424# CONFIG_CRYPTO_FIPS is not set 1443# CONFIG_CRYPTO_FIPS is not set
1425# CONFIG_CRYPTO_MANAGER is not set 1444# CONFIG_CRYPTO_MANAGER is not set
1445# CONFIG_CRYPTO_MANAGER2 is not set
1426# CONFIG_CRYPTO_GF128MUL is not set 1446# CONFIG_CRYPTO_GF128MUL is not set
1427# CONFIG_CRYPTO_NULL is not set 1447# CONFIG_CRYPTO_NULL is not set
1428# CONFIG_CRYPTO_CRYPTD is not set 1448# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig
index a50050f17706..911b5dba1dbc 100644
--- a/arch/blackfin/configs/BF527-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -36,14 +36,13 @@ CONFIG_IKCONFIG_PROC=y
36CONFIG_LOG_BUF_SHIFT=14 36CONFIG_LOG_BUF_SHIFT=14
37# CONFIG_CGROUPS is not set 37# CONFIG_CGROUPS is not set
38# CONFIG_GROUP_SCHED is not set 38# CONFIG_GROUP_SCHED is not set
39# CONFIG_SYSFS_DEPRECATED is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 39# CONFIG_SYSFS_DEPRECATED_V2 is not set
41# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
42# CONFIG_NAMESPACES is not set 41# CONFIG_NAMESPACES is not set
43CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
48CONFIG_UID16=y 47CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -56,13 +55,13 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 60CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
63CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
64CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
65CONFIG_AIO=y 64# CONFIG_AIO is not set
66CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLAB=y 66CONFIG_SLAB=y
68# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -133,15 +132,20 @@ CONFIG_BF527=y
133# CONFIG_BF538 is not set 132# CONFIG_BF538 is not set
134# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
135# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
136# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
137# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
138# CONFIG_BF548 is not set 140# CONFIG_BF548 is not set
141# CONFIG_BF548M is not set
139# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
140# CONFIG_BF561 is not set 144# CONFIG_BF561 is not set
141CONFIG_BF_REV_MIN=0 145CONFIG_BF_REV_MIN=0
142CONFIG_BF_REV_MAX=2 146CONFIG_BF_REV_MAX=2
143CONFIG_BF_REV_0_0=y 147# CONFIG_BF_REV_0_0 is not set
144# CONFIG_BF_REV_0_1 is not set 148CONFIG_BF_REV_0_1=y
145# CONFIG_BF_REV_0_2 is not set 149# CONFIG_BF_REV_0_2 is not set
146# CONFIG_BF_REV_0_3 is not set 150# CONFIG_BF_REV_0_3 is not set
147# CONFIG_BF_REV_0_4 is not set 151# CONFIG_BF_REV_0_4 is not set
@@ -314,7 +318,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
314# CONFIG_PHYS_ADDR_T_64BIT is not set 318# CONFIG_PHYS_ADDR_T_64BIT is not set
315CONFIG_ZONE_DMA_FLAG=1 319CONFIG_ZONE_DMA_FLAG=1
316CONFIG_VIRT_TO_BUS=y 320CONFIG_VIRT_TO_BUS=y
317CONFIG_BFIN_GPTIMERS=y 321CONFIG_BFIN_GPTIMERS=m
318# CONFIG_DMA_UNCACHED_4M is not set 322# CONFIG_DMA_UNCACHED_4M is not set
319# CONFIG_DMA_UNCACHED_2M is not set 323# CONFIG_DMA_UNCACHED_2M is not set
320CONFIG_DMA_UNCACHED_1M=y 324CONFIG_DMA_UNCACHED_1M=y
@@ -375,7 +379,6 @@ CONFIG_BINFMT_ZFLAT=y
375# 379#
376# CONFIG_PM is not set 380# CONFIG_PM is not set
377CONFIG_ARCH_SUSPEND_POSSIBLE=y 381CONFIG_ARCH_SUSPEND_POSSIBLE=y
378# CONFIG_PM_WAKEUP_BY_GPIO is not set
379 382
380# 383#
381# CPU Frequency scaling 384# CPU Frequency scaling
@@ -626,7 +629,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
626# CONFIG_BLK_DEV_HD is not set 629# CONFIG_BLK_DEV_HD is not set
627CONFIG_MISC_DEVICES=y 630CONFIG_MISC_DEVICES=y
628# CONFIG_EEPROM_93CX6 is not set 631# CONFIG_EEPROM_93CX6 is not set
632# CONFIG_ICS932S401 is not set
629# CONFIG_ENCLOSURE_SERVICES is not set 633# CONFIG_ENCLOSURE_SERVICES is not set
634# CONFIG_C2PORT is not set
630CONFIG_HAVE_IDE=y 635CONFIG_HAVE_IDE=y
631# CONFIG_IDE is not set 636# CONFIG_IDE is not set
632 637
@@ -681,6 +686,7 @@ CONFIG_BFIN_MAC_RMII=y
681# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 686# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
682# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 687# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
683# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 688# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
689# CONFIG_B44 is not set
684CONFIG_NETDEV_1000=y 690CONFIG_NETDEV_1000=y
685# CONFIG_AX88180 is not set 691# CONFIG_AX88180 is not set
686CONFIG_NETDEV_10000=y 692CONFIG_NETDEV_10000=y
@@ -755,8 +761,8 @@ CONFIG_INPUT_MISC=y
755# CONFIG_SPI_ADC_BF533 is not set 761# CONFIG_SPI_ADC_BF533 is not set
756# CONFIG_BF5xx_PPIFCD is not set 762# CONFIG_BF5xx_PPIFCD is not set
757# CONFIG_BFIN_SIMPLE_TIMER is not set 763# CONFIG_BFIN_SIMPLE_TIMER is not set
758# CONFIG_BF5xx_PPI is not set 764CONFIG_BF5xx_PPI=m
759# CONFIG_BFIN_SPORT is not set 765CONFIG_BFIN_SPORT=m
760# CONFIG_BFIN_TIMER_LATENCY is not set 766# CONFIG_BFIN_TIMER_LATENCY is not set
761# CONFIG_TWI_LCD is not set 767# CONFIG_TWI_LCD is not set
762CONFIG_BFIN_DMA_INTERFACE=m 768CONFIG_BFIN_DMA_INTERFACE=m
@@ -859,6 +865,7 @@ CONFIG_SPI_MASTER=y
859# 865#
860CONFIG_SPI_BFIN=y 866CONFIG_SPI_BFIN=y
861# CONFIG_SPI_BFIN_LOCK is not set 867# CONFIG_SPI_BFIN_LOCK is not set
868# CONFIG_SPI_BFIN_SPORT is not set
862# CONFIG_SPI_BITBANG is not set 869# CONFIG_SPI_BITBANG is not set
863 870
864# 871#
@@ -871,60 +878,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
871# CONFIG_GPIOLIB is not set 878# CONFIG_GPIOLIB is not set
872# CONFIG_W1 is not set 879# CONFIG_W1 is not set
873# CONFIG_POWER_SUPPLY is not set 880# CONFIG_POWER_SUPPLY is not set
874CONFIG_HWMON=y 881# CONFIG_HWMON is not set
875# CONFIG_HWMON_VID is not set
876# CONFIG_SENSORS_AD7414 is not set
877# CONFIG_SENSORS_AD7418 is not set
878# CONFIG_SENSORS_ADCXX is not set
879# CONFIG_SENSORS_ADM1021 is not set
880# CONFIG_SENSORS_ADM1025 is not set
881# CONFIG_SENSORS_ADM1026 is not set
882# CONFIG_SENSORS_ADM1029 is not set
883# CONFIG_SENSORS_ADM1031 is not set
884# CONFIG_SENSORS_ADM9240 is not set
885# CONFIG_SENSORS_ADT7470 is not set
886# CONFIG_SENSORS_ADT7473 is not set
887# CONFIG_SENSORS_ATXP1 is not set
888# CONFIG_SENSORS_DS1621 is not set
889# CONFIG_SENSORS_F71805F is not set
890# CONFIG_SENSORS_F71882FG is not set
891# CONFIG_SENSORS_F75375S is not set
892# CONFIG_SENSORS_GL518SM is not set
893# CONFIG_SENSORS_GL520SM is not set
894# CONFIG_SENSORS_IT87 is not set
895# CONFIG_SENSORS_LM63 is not set
896# CONFIG_SENSORS_LM70 is not set
897# CONFIG_SENSORS_LM75 is not set
898# CONFIG_SENSORS_LM77 is not set
899# CONFIG_SENSORS_LM78 is not set
900# CONFIG_SENSORS_LM80 is not set
901# CONFIG_SENSORS_LM83 is not set
902# CONFIG_SENSORS_LM85 is not set
903# CONFIG_SENSORS_LM87 is not set
904# CONFIG_SENSORS_LM90 is not set
905# CONFIG_SENSORS_LM92 is not set
906# CONFIG_SENSORS_LM93 is not set
907# CONFIG_SENSORS_MAX1111 is not set
908# CONFIG_SENSORS_MAX1619 is not set
909# CONFIG_SENSORS_MAX6650 is not set
910# CONFIG_SENSORS_PC87360 is not set
911# CONFIG_SENSORS_PC87427 is not set
912# CONFIG_SENSORS_DME1737 is not set
913# CONFIG_SENSORS_SMSC47M1 is not set
914# CONFIG_SENSORS_SMSC47M192 is not set
915# CONFIG_SENSORS_SMSC47B397 is not set
916# CONFIG_SENSORS_ADS7828 is not set
917# CONFIG_SENSORS_THMC50 is not set
918# CONFIG_SENSORS_VT1211 is not set
919# CONFIG_SENSORS_W83781D is not set
920# CONFIG_SENSORS_W83791D is not set
921# CONFIG_SENSORS_W83792D is not set
922# CONFIG_SENSORS_W83793 is not set
923# CONFIG_SENSORS_W83L785TS is not set
924# CONFIG_SENSORS_W83L786NG is not set
925# CONFIG_SENSORS_W83627HF is not set
926# CONFIG_SENSORS_W83627EHF is not set
927# CONFIG_HWMON_DEBUG_CHIP is not set
928# CONFIG_THERMAL is not set 882# CONFIG_THERMAL is not set
929# CONFIG_THERMAL_HWMON is not set 883# CONFIG_THERMAL_HWMON is not set
930CONFIG_WATCHDOG=y 884CONFIG_WATCHDOG=y
@@ -940,6 +894,12 @@ CONFIG_BFIN_WDT=y
940# USB-based Watchdog Cards 894# USB-based Watchdog Cards
941# 895#
942# CONFIG_USBPCWATCHDOG is not set 896# CONFIG_USBPCWATCHDOG is not set
897CONFIG_SSB_POSSIBLE=y
898
899#
900# Sonics Silicon Backplane
901#
902# CONFIG_SSB is not set
943 903
944# 904#
945# Multifunction device drivers 905# Multifunction device drivers
@@ -948,8 +908,10 @@ CONFIG_BFIN_WDT=y
948# CONFIG_MFD_SM501 is not set 908# CONFIG_MFD_SM501 is not set
949# CONFIG_HTC_PASIC3 is not set 909# CONFIG_HTC_PASIC3 is not set
950# CONFIG_MFD_TMIO is not set 910# CONFIG_MFD_TMIO is not set
911# CONFIG_PMIC_DA903X is not set
951# CONFIG_MFD_WM8400 is not set 912# CONFIG_MFD_WM8400 is not set
952# CONFIG_MFD_WM8350_I2C is not set 913# CONFIG_MFD_WM8350_I2C is not set
914# CONFIG_REGULATOR is not set
953 915
954# 916#
955# Multimedia devices 917# Multimedia devices
@@ -1000,6 +962,7 @@ CONFIG_FB_BFIN_T350MCQB=y
1000# CONFIG_FB_S1D13XXX is not set 962# CONFIG_FB_S1D13XXX is not set
1001# CONFIG_FB_VIRTUAL is not set 963# CONFIG_FB_VIRTUAL is not set
1002# CONFIG_FB_METRONOME is not set 964# CONFIG_FB_METRONOME is not set
965# CONFIG_FB_MB862XX is not set
1003CONFIG_BACKLIGHT_LCD_SUPPORT=y 966CONFIG_BACKLIGHT_LCD_SUPPORT=y
1004CONFIG_LCD_CLASS_DEVICE=m 967CONFIG_LCD_CLASS_DEVICE=m
1005CONFIG_LCD_LTV350QV=m 968CONFIG_LCD_LTV350QV=m
@@ -1152,13 +1115,15 @@ CONFIG_USB_MUSB_HDRC=y
1152CONFIG_USB_MUSB_SOC=y 1115CONFIG_USB_MUSB_SOC=y
1153 1116
1154# 1117#
1155# Blackfin high speed USB support 1118# Blackfin high speed USB Support
1156# 1119#
1157CONFIG_USB_MUSB_HOST=y 1120CONFIG_USB_MUSB_HOST=y
1158# CONFIG_USB_MUSB_PERIPHERAL is not set 1121# CONFIG_USB_MUSB_PERIPHERAL is not set
1159# CONFIG_USB_MUSB_OTG is not set 1122# CONFIG_USB_MUSB_OTG is not set
1123# CONFIG_USB_GADGET_MUSB_HDRC is not set
1160CONFIG_USB_MUSB_HDRC_HCD=y 1124CONFIG_USB_MUSB_HDRC_HCD=y
1161CONFIG_MUSB_PIO_ONLY=y 1125CONFIG_MUSB_PIO_ONLY=y
1126CONFIG_MUSB_DMA_POLL=y
1162# CONFIG_USB_MUSB_DEBUG is not set 1127# CONFIG_USB_MUSB_DEBUG is not set
1163 1128
1164# 1129#
@@ -1170,18 +1135,33 @@ CONFIG_MUSB_PIO_ONLY=y
1170# CONFIG_USB_TMC is not set 1135# CONFIG_USB_TMC is not set
1171 1136
1172# 1137#
1173# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1138# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1174# 1139#
1175 1140
1176# 1141#
1177# may also be needed; see USB_STORAGE Help for more information 1142# see USB_STORAGE Help for more information
1178# 1143#
1144CONFIG_USB_STORAGE=m
1145# CONFIG_USB_STORAGE_DEBUG is not set
1146# CONFIG_USB_STORAGE_DATAFAB is not set
1147# CONFIG_USB_STORAGE_FREECOM is not set
1148# CONFIG_USB_STORAGE_ISD200 is not set
1149# CONFIG_USB_STORAGE_DPCM is not set
1150# CONFIG_USB_STORAGE_USBAT is not set
1151# CONFIG_USB_STORAGE_SDDR09 is not set
1152# CONFIG_USB_STORAGE_SDDR55 is not set
1153# CONFIG_USB_STORAGE_JUMPSHOT is not set
1154# CONFIG_USB_STORAGE_ALAUDA is not set
1155# CONFIG_USB_STORAGE_ONETOUCH is not set
1156# CONFIG_USB_STORAGE_KARMA is not set
1157# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1179# CONFIG_USB_LIBUSUAL is not set 1158# CONFIG_USB_LIBUSUAL is not set
1180 1159
1181# 1160#
1182# USB Imaging devices 1161# USB Imaging devices
1183# 1162#
1184# CONFIG_USB_MDC800 is not set 1163# CONFIG_USB_MDC800 is not set
1164# CONFIG_USB_MICROTEK is not set
1185 1165
1186# 1166#
1187# USB port drivers 1167# USB port drivers
@@ -1213,6 +1193,30 @@ CONFIG_MUSB_PIO_ONLY=y
1213# CONFIG_USB_ISIGHTFW is not set 1193# CONFIG_USB_ISIGHTFW is not set
1214# CONFIG_USB_VST is not set 1194# CONFIG_USB_VST is not set
1215# CONFIG_USB_GADGET is not set 1195# CONFIG_USB_GADGET is not set
1196# CONFIG_USB_GADGET_AT91 is not set
1197# CONFIG_USB_GADGET_ATMEL_USBA is not set
1198# CONFIG_USB_GADGET_FSL_USB2 is not set
1199# CONFIG_USB_GADGET_LH7A40X is not set
1200# CONFIG_USB_GADGET_OMAP is not set
1201# CONFIG_USB_GADGET_PXA25X is not set
1202# CONFIG_USB_GADGET_PXA27X is not set
1203# CONFIG_USB_GADGET_S3C2410 is not set
1204# CONFIG_USB_GADGET_M66592 is not set
1205# CONFIG_USB_GADGET_AMD5536UDC is not set
1206# CONFIG_USB_GADGET_FSL_QE is not set
1207# CONFIG_USB_GADGET_NET2272 is not set
1208# CONFIG_USB_GADGET_NET2280 is not set
1209# CONFIG_USB_GADGET_GOKU is not set
1210# CONFIG_USB_GADGET_DUMMY_HCD is not set
1211# CONFIG_USB_ZERO is not set
1212# CONFIG_USB_AUDIO is not set
1213# CONFIG_USB_ETH is not set
1214# CONFIG_USB_GADGETFS is not set
1215# CONFIG_USB_FILE_STORAGE is not set
1216# CONFIG_USB_G_SERIAL is not set
1217# CONFIG_USB_MIDI_GADGET is not set
1218# CONFIG_USB_G_PRINTER is not set
1219# CONFIG_USB_CDC_COMPOSITE is not set
1216# CONFIG_MMC is not set 1220# CONFIG_MMC is not set
1217# CONFIG_MEMSTICK is not set 1221# CONFIG_MEMSTICK is not set
1218# CONFIG_NEW_LEDS is not set 1222# CONFIG_NEW_LEDS is not set
@@ -1247,12 +1251,14 @@ CONFIG_RTC_INTF_DEV=y
1247# CONFIG_RTC_DRV_M41T80 is not set 1251# CONFIG_RTC_DRV_M41T80 is not set
1248# CONFIG_RTC_DRV_S35390A is not set 1252# CONFIG_RTC_DRV_S35390A is not set
1249# CONFIG_RTC_DRV_FM3130 is not set 1253# CONFIG_RTC_DRV_FM3130 is not set
1254# CONFIG_RTC_DRV_RX8581 is not set
1250 1255
1251# 1256#
1252# SPI RTC drivers 1257# SPI RTC drivers
1253# 1258#
1254# CONFIG_RTC_DRV_M41T94 is not set 1259# CONFIG_RTC_DRV_M41T94 is not set
1255# CONFIG_RTC_DRV_DS1305 is not set 1260# CONFIG_RTC_DRV_DS1305 is not set
1261# CONFIG_RTC_DRV_DS1390 is not set
1256# CONFIG_RTC_DRV_MAX6902 is not set 1262# CONFIG_RTC_DRV_MAX6902 is not set
1257# CONFIG_RTC_DRV_R9701 is not set 1263# CONFIG_RTC_DRV_R9701 is not set
1258# CONFIG_RTC_DRV_RS5C348 is not set 1264# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1473,6 +1479,13 @@ CONFIG_DEBUG_INFO=y
1473# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1479# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1474# CONFIG_FAULT_INJECTION is not set 1480# CONFIG_FAULT_INJECTION is not set
1475# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1481# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1482
1483#
1484# Tracers
1485#
1486# CONFIG_SCHED_TRACER is not set
1487# CONFIG_CONTEXT_SWITCH_TRACER is not set
1488# CONFIG_BOOT_TRACER is not set
1476# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1489# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1477# CONFIG_SAMPLES is not set 1490# CONFIG_SAMPLES is not set
1478CONFIG_HAVE_ARCH_KGDB=y 1491CONFIG_HAVE_ARCH_KGDB=y
@@ -1512,6 +1525,7 @@ CONFIG_CRYPTO=y
1512# 1525#
1513# CONFIG_CRYPTO_FIPS is not set 1526# CONFIG_CRYPTO_FIPS is not set
1514# CONFIG_CRYPTO_MANAGER is not set 1527# CONFIG_CRYPTO_MANAGER is not set
1528# CONFIG_CRYPTO_MANAGER2 is not set
1515# CONFIG_CRYPTO_GF128MUL is not set 1529# CONFIG_CRYPTO_GF128MUL is not set
1516# CONFIG_CRYPTO_NULL is not set 1530# CONFIG_CRYPTO_NULL is not set
1517# CONFIG_CRYPTO_CRYPTD is not set 1531# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index 0a2a00d63887..4c41e03efe0f 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -36,14 +36,13 @@ CONFIG_IKCONFIG_PROC=y
36CONFIG_LOG_BUF_SHIFT=14 36CONFIG_LOG_BUF_SHIFT=14
37# CONFIG_CGROUPS is not set 37# CONFIG_CGROUPS is not set
38# CONFIG_GROUP_SCHED is not set 38# CONFIG_GROUP_SCHED is not set
39# CONFIG_SYSFS_DEPRECATED is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 39# CONFIG_SYSFS_DEPRECATED_V2 is not set
41# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
42# CONFIG_NAMESPACES is not set 41# CONFIG_NAMESPACES is not set
43CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
48CONFIG_UID16=y 47CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -56,13 +55,13 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 60CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
63CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
64CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
65CONFIG_AIO=y 64# CONFIG_AIO is not set
66CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLAB=y 66CONFIG_SLAB=y
68# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -133,10 +132,15 @@ CONFIG_BF533=y
133# CONFIG_BF538 is not set 132# CONFIG_BF538 is not set
134# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
135# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
136# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
137# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
138# CONFIG_BF548 is not set 140# CONFIG_BF548 is not set
141# CONFIG_BF548M is not set
139# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
140# CONFIG_BF561 is not set 144# CONFIG_BF561 is not set
141CONFIG_BF_REV_MIN=3 145CONFIG_BF_REV_MIN=3
142CONFIG_BF_REV_MAX=6 146CONFIG_BF_REV_MAX=6
@@ -157,7 +161,6 @@ CONFIG_BFIN533_EZKIT=y
157# CONFIG_BFIN533_BLUETECHNIX_CM is not set 161# CONFIG_BFIN533_BLUETECHNIX_CM is not set
158# CONFIG_H8606_HVSISTEMAS is not set 162# CONFIG_H8606_HVSISTEMAS is not set
159# CONFIG_BFIN532_IP0X is not set 163# CONFIG_BFIN532_IP0X is not set
160# CONFIG_GENERIC_BF533_BOARD is not set
161 164
162# 165#
163# BF533/2/1 Specific Configuration 166# BF533/2/1 Specific Configuration
@@ -277,7 +280,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
277# CONFIG_PHYS_ADDR_T_64BIT is not set 280# CONFIG_PHYS_ADDR_T_64BIT is not set
278CONFIG_ZONE_DMA_FLAG=1 281CONFIG_ZONE_DMA_FLAG=1
279CONFIG_VIRT_TO_BUS=y 282CONFIG_VIRT_TO_BUS=y
280# CONFIG_BFIN_GPTIMERS is not set 283CONFIG_BFIN_GPTIMERS=m
281# CONFIG_DMA_UNCACHED_4M is not set 284# CONFIG_DMA_UNCACHED_4M is not set
282# CONFIG_DMA_UNCACHED_2M is not set 285# CONFIG_DMA_UNCACHED_2M is not set
283CONFIG_DMA_UNCACHED_1M=y 286CONFIG_DMA_UNCACHED_1M=y
@@ -575,6 +578,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
575CONFIG_MISC_DEVICES=y 578CONFIG_MISC_DEVICES=y
576# CONFIG_EEPROM_93CX6 is not set 579# CONFIG_EEPROM_93CX6 is not set
577# CONFIG_ENCLOSURE_SERVICES is not set 580# CONFIG_ENCLOSURE_SERVICES is not set
581# CONFIG_C2PORT is not set
578CONFIG_HAVE_IDE=y 582CONFIG_HAVE_IDE=y
579# CONFIG_IDE is not set 583# CONFIG_IDE is not set
580 584
@@ -608,6 +612,7 @@ CONFIG_SMC91X=y
608# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 612# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
609# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 613# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
610# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 614# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
615# CONFIG_B44 is not set
611CONFIG_NETDEV_1000=y 616CONFIG_NETDEV_1000=y
612# CONFIG_AX88180 is not set 617# CONFIG_AX88180 is not set
613CONFIG_NETDEV_10000=y 618CONFIG_NETDEV_10000=y
@@ -714,6 +719,7 @@ CONFIG_SPI_MASTER=y
714# 719#
715CONFIG_SPI_BFIN=y 720CONFIG_SPI_BFIN=y
716# CONFIG_SPI_BFIN_LOCK is not set 721# CONFIG_SPI_BFIN_LOCK is not set
722# CONFIG_SPI_BFIN_SPORT is not set
717# CONFIG_SPI_BITBANG is not set 723# CONFIG_SPI_BITBANG is not set
718 724
719# 725#
@@ -726,22 +732,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
726# CONFIG_GPIOLIB is not set 732# CONFIG_GPIOLIB is not set
727# CONFIG_W1 is not set 733# CONFIG_W1 is not set
728# CONFIG_POWER_SUPPLY is not set 734# CONFIG_POWER_SUPPLY is not set
729CONFIG_HWMON=y 735# CONFIG_HWMON is not set
730# CONFIG_HWMON_VID is not set
731# CONFIG_SENSORS_ADCXX is not set
732# CONFIG_SENSORS_F71805F is not set
733# CONFIG_SENSORS_F71882FG is not set
734# CONFIG_SENSORS_IT87 is not set
735# CONFIG_SENSORS_LM70 is not set
736# CONFIG_SENSORS_MAX1111 is not set
737# CONFIG_SENSORS_PC87360 is not set
738# CONFIG_SENSORS_PC87427 is not set
739# CONFIG_SENSORS_SMSC47M1 is not set
740# CONFIG_SENSORS_SMSC47B397 is not set
741# CONFIG_SENSORS_VT1211 is not set
742# CONFIG_SENSORS_W83627HF is not set
743# CONFIG_SENSORS_W83627EHF is not set
744# CONFIG_HWMON_DEBUG_CHIP is not set
745# CONFIG_THERMAL is not set 736# CONFIG_THERMAL is not set
746# CONFIG_THERMAL_HWMON is not set 737# CONFIG_THERMAL_HWMON is not set
747CONFIG_WATCHDOG=y 738CONFIG_WATCHDOG=y
@@ -752,6 +743,12 @@ CONFIG_WATCHDOG=y
752# 743#
753# CONFIG_SOFT_WATCHDOG is not set 744# CONFIG_SOFT_WATCHDOG is not set
754CONFIG_BFIN_WDT=y 745CONFIG_BFIN_WDT=y
746CONFIG_SSB_POSSIBLE=y
747
748#
749# Sonics Silicon Backplane
750#
751# CONFIG_SSB is not set
755 752
756# 753#
757# Multifunction device drivers 754# Multifunction device drivers
@@ -760,7 +757,7 @@ CONFIG_BFIN_WDT=y
760# CONFIG_MFD_SM501 is not set 757# CONFIG_MFD_SM501 is not set
761# CONFIG_HTC_PASIC3 is not set 758# CONFIG_HTC_PASIC3 is not set
762# CONFIG_MFD_TMIO is not set 759# CONFIG_MFD_TMIO is not set
763# CONFIG_MFD_WM8400 is not set 760# CONFIG_REGULATOR is not set
764 761
765# 762#
766# Multimedia devices 763# Multimedia devices
@@ -826,6 +823,7 @@ CONFIG_RTC_INTF_DEV=y
826# 823#
827# CONFIG_RTC_DRV_M41T94 is not set 824# CONFIG_RTC_DRV_M41T94 is not set
828# CONFIG_RTC_DRV_DS1305 is not set 825# CONFIG_RTC_DRV_DS1305 is not set
826# CONFIG_RTC_DRV_DS1390 is not set
829# CONFIG_RTC_DRV_MAX6902 is not set 827# CONFIG_RTC_DRV_MAX6902 is not set
830# CONFIG_RTC_DRV_R9701 is not set 828# CONFIG_RTC_DRV_R9701 is not set
831# CONFIG_RTC_DRV_RS5C348 is not set 829# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1046,6 +1044,13 @@ CONFIG_DEBUG_INFO=y
1046# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1044# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1047# CONFIG_FAULT_INJECTION is not set 1045# CONFIG_FAULT_INJECTION is not set
1048# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1046# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1047
1048#
1049# Tracers
1050#
1051# CONFIG_SCHED_TRACER is not set
1052# CONFIG_CONTEXT_SWITCH_TRACER is not set
1053# CONFIG_BOOT_TRACER is not set
1049# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1054# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1050# CONFIG_SAMPLES is not set 1055# CONFIG_SAMPLES is not set
1051CONFIG_HAVE_ARCH_KGDB=y 1056CONFIG_HAVE_ARCH_KGDB=y
@@ -1084,6 +1089,7 @@ CONFIG_CRYPTO=y
1084# 1089#
1085# CONFIG_CRYPTO_FIPS is not set 1090# CONFIG_CRYPTO_FIPS is not set
1086# CONFIG_CRYPTO_MANAGER is not set 1091# CONFIG_CRYPTO_MANAGER is not set
1092# CONFIG_CRYPTO_MANAGER2 is not set
1087# CONFIG_CRYPTO_GF128MUL is not set 1093# CONFIG_CRYPTO_GF128MUL is not set
1088# CONFIG_CRYPTO_NULL is not set 1094# CONFIG_CRYPTO_NULL is not set
1089# CONFIG_CRYPTO_CRYPTD is not set 1095# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index eb027587a355..9c482cd1b343 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -36,14 +36,13 @@ CONFIG_IKCONFIG_PROC=y
36CONFIG_LOG_BUF_SHIFT=14 36CONFIG_LOG_BUF_SHIFT=14
37# CONFIG_CGROUPS is not set 37# CONFIG_CGROUPS is not set
38# CONFIG_GROUP_SCHED is not set 38# CONFIG_GROUP_SCHED is not set
39# CONFIG_SYSFS_DEPRECATED is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 39# CONFIG_SYSFS_DEPRECATED_V2 is not set
41# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
42# CONFIG_NAMESPACES is not set 41# CONFIG_NAMESPACES is not set
43CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
48CONFIG_UID16=y 47CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -56,13 +55,13 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 60CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
63CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
64CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
65CONFIG_AIO=y 64# CONFIG_AIO is not set
66CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLAB=y 66CONFIG_SLAB=y
68# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -133,10 +132,15 @@ CONFIG_BF533=y
133# CONFIG_BF538 is not set 132# CONFIG_BF538 is not set
134# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
135# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
136# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
137# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
138# CONFIG_BF548 is not set 140# CONFIG_BF548 is not set
141# CONFIG_BF548M is not set
139# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
140# CONFIG_BF561 is not set 144# CONFIG_BF561 is not set
141CONFIG_BF_REV_MIN=3 145CONFIG_BF_REV_MIN=3
142CONFIG_BF_REV_MAX=6 146CONFIG_BF_REV_MAX=6
@@ -157,7 +161,6 @@ CONFIG_BFIN533_STAMP=y
157# CONFIG_BFIN533_BLUETECHNIX_CM is not set 161# CONFIG_BFIN533_BLUETECHNIX_CM is not set
158# CONFIG_H8606_HVSISTEMAS is not set 162# CONFIG_H8606_HVSISTEMAS is not set
159# CONFIG_BFIN532_IP0X is not set 163# CONFIG_BFIN532_IP0X is not set
160# CONFIG_GENERIC_BF533_BOARD is not set
161 164
162# 165#
163# BF533/2/1 Specific Configuration 166# BF533/2/1 Specific Configuration
@@ -277,7 +280,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
277# CONFIG_PHYS_ADDR_T_64BIT is not set 280# CONFIG_PHYS_ADDR_T_64BIT is not set
278CONFIG_ZONE_DMA_FLAG=1 281CONFIG_ZONE_DMA_FLAG=1
279CONFIG_VIRT_TO_BUS=y 282CONFIG_VIRT_TO_BUS=y
280# CONFIG_BFIN_GPTIMERS is not set 283CONFIG_BFIN_GPTIMERS=m
281# CONFIG_DMA_UNCACHED_4M is not set 284# CONFIG_DMA_UNCACHED_4M is not set
282# CONFIG_DMA_UNCACHED_2M is not set 285# CONFIG_DMA_UNCACHED_2M is not set
283CONFIG_DMA_UNCACHED_1M=y 286CONFIG_DMA_UNCACHED_1M=y
@@ -578,7 +581,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
578# CONFIG_BLK_DEV_HD is not set 581# CONFIG_BLK_DEV_HD is not set
579CONFIG_MISC_DEVICES=y 582CONFIG_MISC_DEVICES=y
580# CONFIG_EEPROM_93CX6 is not set 583# CONFIG_EEPROM_93CX6 is not set
584# CONFIG_ICS932S401 is not set
581# CONFIG_ENCLOSURE_SERVICES is not set 585# CONFIG_ENCLOSURE_SERVICES is not set
586# CONFIG_C2PORT is not set
582CONFIG_HAVE_IDE=y 587CONFIG_HAVE_IDE=y
583# CONFIG_IDE is not set 588# CONFIG_IDE is not set
584 589
@@ -612,6 +617,7 @@ CONFIG_SMC91X=y
612# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 617# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
613# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 618# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
614# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 619# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
620# CONFIG_B44 is not set
615CONFIG_NETDEV_1000=y 621CONFIG_NETDEV_1000=y
616# CONFIG_AX88180 is not set 622# CONFIG_AX88180 is not set
617CONFIG_NETDEV_10000=y 623CONFIG_NETDEV_10000=y
@@ -671,10 +677,10 @@ CONFIG_CONFIG_INPUT_PCF8574=m
671# CONFIG_SPI_ADC_BF533 is not set 677# CONFIG_SPI_ADC_BF533 is not set
672# CONFIG_BF5xx_PPIFCD is not set 678# CONFIG_BF5xx_PPIFCD is not set
673# CONFIG_BFIN_SIMPLE_TIMER is not set 679# CONFIG_BFIN_SIMPLE_TIMER is not set
674# CONFIG_BF5xx_PPI is not set 680CONFIG_BF5xx_PPI=m
675CONFIG_BFIN_SPORT=y 681CONFIG_BFIN_SPORT=m
676# CONFIG_BFIN_TIMER_LATENCY is not set 682# CONFIG_BFIN_TIMER_LATENCY is not set
677CONFIG_TWI_LCD=m 683# CONFIG_TWI_LCD is not set
678CONFIG_BFIN_DMA_INTERFACE=m 684CONFIG_BFIN_DMA_INTERFACE=m
679CONFIG_SIMPLE_GPIO=m 685CONFIG_SIMPLE_GPIO=m
680# CONFIG_VT is not set 686# CONFIG_VT is not set
@@ -765,6 +771,7 @@ CONFIG_SPI_MASTER=y
765# 771#
766CONFIG_SPI_BFIN=y 772CONFIG_SPI_BFIN=y
767# CONFIG_SPI_BFIN_LOCK is not set 773# CONFIG_SPI_BFIN_LOCK is not set
774# CONFIG_SPI_BFIN_SPORT is not set
768# CONFIG_SPI_BITBANG is not set 775# CONFIG_SPI_BITBANG is not set
769 776
770# 777#
@@ -777,60 +784,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
777# CONFIG_GPIOLIB is not set 784# CONFIG_GPIOLIB is not set
778# CONFIG_W1 is not set 785# CONFIG_W1 is not set
779# CONFIG_POWER_SUPPLY is not set 786# CONFIG_POWER_SUPPLY is not set
780CONFIG_HWMON=y 787# CONFIG_HWMON is not set
781# CONFIG_HWMON_VID is not set
782# CONFIG_SENSORS_AD7414 is not set
783# CONFIG_SENSORS_AD7418 is not set
784# CONFIG_SENSORS_ADCXX is not set
785# CONFIG_SENSORS_ADM1021 is not set
786# CONFIG_SENSORS_ADM1025 is not set
787# CONFIG_SENSORS_ADM1026 is not set
788# CONFIG_SENSORS_ADM1029 is not set
789# CONFIG_SENSORS_ADM1031 is not set
790# CONFIG_SENSORS_ADM9240 is not set
791# CONFIG_SENSORS_ADT7470 is not set
792# CONFIG_SENSORS_ADT7473 is not set
793# CONFIG_SENSORS_ATXP1 is not set
794# CONFIG_SENSORS_DS1621 is not set
795# CONFIG_SENSORS_F71805F is not set
796# CONFIG_SENSORS_F71882FG is not set
797# CONFIG_SENSORS_F75375S is not set
798# CONFIG_SENSORS_GL518SM is not set
799# CONFIG_SENSORS_GL520SM is not set
800# CONFIG_SENSORS_IT87 is not set
801# CONFIG_SENSORS_LM63 is not set
802# CONFIG_SENSORS_LM70 is not set
803# CONFIG_SENSORS_LM75 is not set
804# CONFIG_SENSORS_LM77 is not set
805# CONFIG_SENSORS_LM78 is not set
806# CONFIG_SENSORS_LM80 is not set
807# CONFIG_SENSORS_LM83 is not set
808# CONFIG_SENSORS_LM85 is not set
809# CONFIG_SENSORS_LM87 is not set
810# CONFIG_SENSORS_LM90 is not set
811# CONFIG_SENSORS_LM92 is not set
812# CONFIG_SENSORS_LM93 is not set
813# CONFIG_SENSORS_MAX1111 is not set
814# CONFIG_SENSORS_MAX1619 is not set
815# CONFIG_SENSORS_MAX6650 is not set
816# CONFIG_SENSORS_PC87360 is not set
817# CONFIG_SENSORS_PC87427 is not set
818# CONFIG_SENSORS_DME1737 is not set
819# CONFIG_SENSORS_SMSC47M1 is not set
820# CONFIG_SENSORS_SMSC47M192 is not set
821# CONFIG_SENSORS_SMSC47B397 is not set
822# CONFIG_SENSORS_ADS7828 is not set
823# CONFIG_SENSORS_THMC50 is not set
824# CONFIG_SENSORS_VT1211 is not set
825# CONFIG_SENSORS_W83781D is not set
826# CONFIG_SENSORS_W83791D is not set
827# CONFIG_SENSORS_W83792D is not set
828# CONFIG_SENSORS_W83793 is not set
829# CONFIG_SENSORS_W83L785TS is not set
830# CONFIG_SENSORS_W83L786NG is not set
831# CONFIG_SENSORS_W83627HF is not set
832# CONFIG_SENSORS_W83627EHF is not set
833# CONFIG_HWMON_DEBUG_CHIP is not set
834# CONFIG_THERMAL is not set 788# CONFIG_THERMAL is not set
835# CONFIG_THERMAL_HWMON is not set 789# CONFIG_THERMAL_HWMON is not set
836CONFIG_WATCHDOG=y 790CONFIG_WATCHDOG=y
@@ -841,6 +795,12 @@ CONFIG_WATCHDOG=y
841# 795#
842# CONFIG_SOFT_WATCHDOG is not set 796# CONFIG_SOFT_WATCHDOG is not set
843CONFIG_BFIN_WDT=y 797CONFIG_BFIN_WDT=y
798CONFIG_SSB_POSSIBLE=y
799
800#
801# Sonics Silicon Backplane
802#
803# CONFIG_SSB is not set
844 804
845# 805#
846# Multifunction device drivers 806# Multifunction device drivers
@@ -851,6 +811,7 @@ CONFIG_BFIN_WDT=y
851# CONFIG_MFD_TMIO is not set 811# CONFIG_MFD_TMIO is not set
852# CONFIG_MFD_WM8400 is not set 812# CONFIG_MFD_WM8400 is not set
853# CONFIG_MFD_WM8350_I2C is not set 813# CONFIG_MFD_WM8350_I2C is not set
814# CONFIG_REGULATOR is not set
854 815
855# 816#
856# Multimedia devices 817# Multimedia devices
@@ -909,6 +870,7 @@ CONFIG_ADV7393_1XMEM=y
909# CONFIG_FB_S1D13XXX is not set 870# CONFIG_FB_S1D13XXX is not set
910# CONFIG_FB_VIRTUAL is not set 871# CONFIG_FB_VIRTUAL is not set
911# CONFIG_FB_METRONOME is not set 872# CONFIG_FB_METRONOME is not set
873# CONFIG_FB_MB862XX is not set
912# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 874# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
913 875
914# 876#
@@ -1018,12 +980,14 @@ CONFIG_RTC_INTF_DEV=y
1018# CONFIG_RTC_DRV_M41T80 is not set 980# CONFIG_RTC_DRV_M41T80 is not set
1019# CONFIG_RTC_DRV_S35390A is not set 981# CONFIG_RTC_DRV_S35390A is not set
1020# CONFIG_RTC_DRV_FM3130 is not set 982# CONFIG_RTC_DRV_FM3130 is not set
983# CONFIG_RTC_DRV_RX8581 is not set
1021 984
1022# 985#
1023# SPI RTC drivers 986# SPI RTC drivers
1024# 987#
1025# CONFIG_RTC_DRV_M41T94 is not set 988# CONFIG_RTC_DRV_M41T94 is not set
1026# CONFIG_RTC_DRV_DS1305 is not set 989# CONFIG_RTC_DRV_DS1305 is not set
990# CONFIG_RTC_DRV_DS1390 is not set
1027# CONFIG_RTC_DRV_MAX6902 is not set 991# CONFIG_RTC_DRV_MAX6902 is not set
1028# CONFIG_RTC_DRV_R9701 is not set 992# CONFIG_RTC_DRV_R9701 is not set
1029# CONFIG_RTC_DRV_RS5C348 is not set 993# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1244,6 +1208,13 @@ CONFIG_DEBUG_INFO=y
1244# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1208# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1245# CONFIG_FAULT_INJECTION is not set 1209# CONFIG_FAULT_INJECTION is not set
1246# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1210# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1211
1212#
1213# Tracers
1214#
1215# CONFIG_SCHED_TRACER is not set
1216# CONFIG_CONTEXT_SWITCH_TRACER is not set
1217# CONFIG_BOOT_TRACER is not set
1247# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1218# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1248# CONFIG_SAMPLES is not set 1219# CONFIG_SAMPLES is not set
1249CONFIG_HAVE_ARCH_KGDB=y 1220CONFIG_HAVE_ARCH_KGDB=y
@@ -1282,6 +1253,7 @@ CONFIG_CRYPTO=y
1282# 1253#
1283# CONFIG_CRYPTO_FIPS is not set 1254# CONFIG_CRYPTO_FIPS is not set
1284# CONFIG_CRYPTO_MANAGER is not set 1255# CONFIG_CRYPTO_MANAGER is not set
1256# CONFIG_CRYPTO_MANAGER2 is not set
1285# CONFIG_CRYPTO_GF128MUL is not set 1257# CONFIG_CRYPTO_GF128MUL is not set
1286# CONFIG_CRYPTO_NULL is not set 1258# CONFIG_CRYPTO_NULL is not set
1287# CONFIG_CRYPTO_CRYPTD is not set 1259# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index 9e62b9f40eb1..591f6edda4f7 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -1,7 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# Tue Dec 30 17:24:37 2008
5# 4#
6# CONFIG_MMU is not set 5# CONFIG_MMU is not set
7# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -37,14 +36,13 @@ CONFIG_IKCONFIG_PROC=y
37CONFIG_LOG_BUF_SHIFT=14 36CONFIG_LOG_BUF_SHIFT=14
38# CONFIG_CGROUPS is not set 37# CONFIG_CGROUPS is not set
39# CONFIG_GROUP_SCHED is not set 38# CONFIG_GROUP_SCHED is not set
40# CONFIG_SYSFS_DEPRECATED is not set
41# CONFIG_SYSFS_DEPRECATED_V2 is not set 39# CONFIG_SYSFS_DEPRECATED_V2 is not set
42# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
43# CONFIG_NAMESPACES is not set 41# CONFIG_NAMESPACES is not set
44CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
45CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
47CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
48CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
49CONFIG_UID16=y 47CONFIG_UID16=y
50CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -57,13 +55,13 @@ CONFIG_BUG=y
57# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
58CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
59CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
61CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
62CONFIG_EPOLL=y 60CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
64CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
65CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
66CONFIG_AIO=y 64# CONFIG_AIO is not set
67CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
68CONFIG_SLAB=y 66CONFIG_SLAB=y
69# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -134,10 +132,15 @@ CONFIG_BF537=y
134# CONFIG_BF538 is not set 132# CONFIG_BF538 is not set
135# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
136# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
137# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
138# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
139# CONFIG_BF548 is not set 140# CONFIG_BF548 is not set
141# CONFIG_BF548M is not set
140# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
141# CONFIG_BF561 is not set 144# CONFIG_BF561 is not set
142CONFIG_BF_REV_MIN=2 145CONFIG_BF_REV_MIN=2
143CONFIG_BF_REV_MAX=3 146CONFIG_BF_REV_MAX=3
@@ -184,7 +187,6 @@ CONFIG_BFIN537_STAMP=y
184# CONFIG_BFIN537_BLUETECHNIX_TCM is not set 187# CONFIG_BFIN537_BLUETECHNIX_TCM is not set
185# CONFIG_PNAV10 is not set 188# CONFIG_PNAV10 is not set
186# CONFIG_CAMSIG_MINOTAUR is not set 189# CONFIG_CAMSIG_MINOTAUR is not set
187# CONFIG_GENERIC_BF537_BOARD is not set
188 190
189# 191#
190# BF537 Specific Configuration 192# BF537 Specific Configuration
@@ -589,7 +591,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
589# CONFIG_BLK_DEV_HD is not set 591# CONFIG_BLK_DEV_HD is not set
590CONFIG_MISC_DEVICES=y 592CONFIG_MISC_DEVICES=y
591# CONFIG_EEPROM_93CX6 is not set 593# CONFIG_EEPROM_93CX6 is not set
594# CONFIG_ICS932S401 is not set
592# CONFIG_ENCLOSURE_SERVICES is not set 595# CONFIG_ENCLOSURE_SERVICES is not set
596# CONFIG_C2PORT is not set
593CONFIG_HAVE_IDE=y 597CONFIG_HAVE_IDE=y
594# CONFIG_IDE is not set 598# CONFIG_IDE is not set
595 599
@@ -644,6 +648,7 @@ CONFIG_BFIN_RX_DESC_NUM=20
644# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 648# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
645# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 649# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
646# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 650# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
651# CONFIG_B44 is not set
647CONFIG_NETDEV_1000=y 652CONFIG_NETDEV_1000=y
648# CONFIG_AX88180 is not set 653# CONFIG_AX88180 is not set
649CONFIG_NETDEV_10000=y 654CONFIG_NETDEV_10000=y
@@ -706,10 +711,10 @@ CONFIG_SERIO_LIBPS2=y
706# CONFIG_SPI_ADC_BF533 is not set 711# CONFIG_SPI_ADC_BF533 is not set
707# CONFIG_BF5xx_PPIFCD is not set 712# CONFIG_BF5xx_PPIFCD is not set
708# CONFIG_BFIN_SIMPLE_TIMER is not set 713# CONFIG_BFIN_SIMPLE_TIMER is not set
709# CONFIG_BF5xx_PPI is not set 714CONFIG_BF5xx_PPI=m
710CONFIG_BFIN_SPORT=m 715CONFIG_BFIN_SPORT=m
711# CONFIG_BFIN_TIMER_LATENCY is not set 716# CONFIG_BFIN_TIMER_LATENCY is not set
712CONFIG_TWI_LCD=m 717# CONFIG_TWI_LCD is not set
713CONFIG_BFIN_DMA_INTERFACE=m 718CONFIG_BFIN_DMA_INTERFACE=m
714CONFIG_SIMPLE_GPIO=m 719CONFIG_SIMPLE_GPIO=m
715# CONFIG_VT is not set 720# CONFIG_VT is not set
@@ -808,6 +813,7 @@ CONFIG_SPI_MASTER=y
808# 813#
809CONFIG_SPI_BFIN=y 814CONFIG_SPI_BFIN=y
810# CONFIG_SPI_BFIN_LOCK is not set 815# CONFIG_SPI_BFIN_LOCK is not set
816# CONFIG_SPI_BFIN_SPORT is not set
811# CONFIG_SPI_BITBANG is not set 817# CONFIG_SPI_BITBANG is not set
812 818
813# 819#
@@ -820,60 +826,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
820# CONFIG_GPIOLIB is not set 826# CONFIG_GPIOLIB is not set
821# CONFIG_W1 is not set 827# CONFIG_W1 is not set
822# CONFIG_POWER_SUPPLY is not set 828# CONFIG_POWER_SUPPLY is not set
823CONFIG_HWMON=y 829# CONFIG_HWMON is not set
824# CONFIG_HWMON_VID is not set
825# CONFIG_SENSORS_AD7414 is not set
826# CONFIG_SENSORS_AD7418 is not set
827# CONFIG_SENSORS_ADCXX is not set
828# CONFIG_SENSORS_ADM1021 is not set
829# CONFIG_SENSORS_ADM1025 is not set
830# CONFIG_SENSORS_ADM1026 is not set
831# CONFIG_SENSORS_ADM1029 is not set
832# CONFIG_SENSORS_ADM1031 is not set
833# CONFIG_SENSORS_ADM9240 is not set
834# CONFIG_SENSORS_ADT7470 is not set
835# CONFIG_SENSORS_ADT7473 is not set
836# CONFIG_SENSORS_ATXP1 is not set
837# CONFIG_SENSORS_DS1621 is not set
838# CONFIG_SENSORS_F71805F is not set
839# CONFIG_SENSORS_F71882FG is not set
840# CONFIG_SENSORS_F75375S is not set
841# CONFIG_SENSORS_GL518SM is not set
842# CONFIG_SENSORS_GL520SM is not set
843# CONFIG_SENSORS_IT87 is not set
844# CONFIG_SENSORS_LM63 is not set
845# CONFIG_SENSORS_LM70 is not set
846# CONFIG_SENSORS_LM75 is not set
847# CONFIG_SENSORS_LM77 is not set
848# CONFIG_SENSORS_LM78 is not set
849# CONFIG_SENSORS_LM80 is not set
850# CONFIG_SENSORS_LM83 is not set
851# CONFIG_SENSORS_LM85 is not set
852# CONFIG_SENSORS_LM87 is not set
853# CONFIG_SENSORS_LM90 is not set
854# CONFIG_SENSORS_LM92 is not set
855# CONFIG_SENSORS_LM93 is not set
856# CONFIG_SENSORS_MAX1111 is not set
857# CONFIG_SENSORS_MAX1619 is not set
858# CONFIG_SENSORS_MAX6650 is not set
859# CONFIG_SENSORS_PC87360 is not set
860# CONFIG_SENSORS_PC87427 is not set
861# CONFIG_SENSORS_DME1737 is not set
862# CONFIG_SENSORS_SMSC47M1 is not set
863# CONFIG_SENSORS_SMSC47M192 is not set
864# CONFIG_SENSORS_SMSC47B397 is not set
865# CONFIG_SENSORS_ADS7828 is not set
866# CONFIG_SENSORS_THMC50 is not set
867# CONFIG_SENSORS_VT1211 is not set
868# CONFIG_SENSORS_W83781D is not set
869# CONFIG_SENSORS_W83791D is not set
870# CONFIG_SENSORS_W83792D is not set
871# CONFIG_SENSORS_W83793 is not set
872# CONFIG_SENSORS_W83L785TS is not set
873# CONFIG_SENSORS_W83L786NG is not set
874# CONFIG_SENSORS_W83627HF is not set
875# CONFIG_SENSORS_W83627EHF is not set
876# CONFIG_HWMON_DEBUG_CHIP is not set
877# CONFIG_THERMAL is not set 830# CONFIG_THERMAL is not set
878# CONFIG_THERMAL_HWMON is not set 831# CONFIG_THERMAL_HWMON is not set
879CONFIG_WATCHDOG=y 832CONFIG_WATCHDOG=y
@@ -884,6 +837,12 @@ CONFIG_WATCHDOG=y
884# 837#
885# CONFIG_SOFT_WATCHDOG is not set 838# CONFIG_SOFT_WATCHDOG is not set
886CONFIG_BFIN_WDT=y 839CONFIG_BFIN_WDT=y
840CONFIG_SSB_POSSIBLE=y
841
842#
843# Sonics Silicon Backplane
844#
845# CONFIG_SSB is not set
887 846
888# 847#
889# Multifunction device drivers 848# Multifunction device drivers
@@ -894,6 +853,7 @@ CONFIG_BFIN_WDT=y
894# CONFIG_MFD_TMIO is not set 853# CONFIG_MFD_TMIO is not set
895# CONFIG_MFD_WM8400 is not set 854# CONFIG_MFD_WM8400 is not set
896# CONFIG_MFD_WM8350_I2C is not set 855# CONFIG_MFD_WM8350_I2C is not set
856# CONFIG_REGULATOR is not set
897 857
898# 858#
899# Multimedia devices 859# Multimedia devices
@@ -957,6 +917,7 @@ CONFIG_ADV7393_1XMEM=y
957# CONFIG_FB_S1D13XXX is not set 917# CONFIG_FB_S1D13XXX is not set
958# CONFIG_FB_VIRTUAL is not set 918# CONFIG_FB_VIRTUAL is not set
959# CONFIG_FB_METRONOME is not set 919# CONFIG_FB_METRONOME is not set
920# CONFIG_FB_MB862XX is not set
960CONFIG_BACKLIGHT_LCD_SUPPORT=y 921CONFIG_BACKLIGHT_LCD_SUPPORT=y
961CONFIG_LCD_CLASS_DEVICE=m 922CONFIG_LCD_CLASS_DEVICE=m
962# CONFIG_LCD_LTV350QV is not set 923# CONFIG_LCD_LTV350QV is not set
@@ -1074,12 +1035,14 @@ CONFIG_RTC_INTF_DEV=y
1074# CONFIG_RTC_DRV_M41T80 is not set 1035# CONFIG_RTC_DRV_M41T80 is not set
1075# CONFIG_RTC_DRV_S35390A is not set 1036# CONFIG_RTC_DRV_S35390A is not set
1076# CONFIG_RTC_DRV_FM3130 is not set 1037# CONFIG_RTC_DRV_FM3130 is not set
1038# CONFIG_RTC_DRV_RX8581 is not set
1077 1039
1078# 1040#
1079# SPI RTC drivers 1041# SPI RTC drivers
1080# 1042#
1081# CONFIG_RTC_DRV_M41T94 is not set 1043# CONFIG_RTC_DRV_M41T94 is not set
1082# CONFIG_RTC_DRV_DS1305 is not set 1044# CONFIG_RTC_DRV_DS1305 is not set
1045# CONFIG_RTC_DRV_DS1390 is not set
1083# CONFIG_RTC_DRV_MAX6902 is not set 1046# CONFIG_RTC_DRV_MAX6902 is not set
1084# CONFIG_RTC_DRV_R9701 is not set 1047# CONFIG_RTC_DRV_R9701 is not set
1085# CONFIG_RTC_DRV_RS5C348 is not set 1048# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1300,6 +1263,13 @@ CONFIG_DEBUG_INFO=y
1300# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1263# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1301# CONFIG_FAULT_INJECTION is not set 1264# CONFIG_FAULT_INJECTION is not set
1302# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1265# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1266
1267#
1268# Tracers
1269#
1270# CONFIG_SCHED_TRACER is not set
1271# CONFIG_CONTEXT_SWITCH_TRACER is not set
1272# CONFIG_BOOT_TRACER is not set
1303# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1273# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1304# CONFIG_SAMPLES is not set 1274# CONFIG_SAMPLES is not set
1305CONFIG_HAVE_ARCH_KGDB=y 1275CONFIG_HAVE_ARCH_KGDB=y
@@ -1338,6 +1308,7 @@ CONFIG_CRYPTO=y
1338# 1308#
1339# CONFIG_CRYPTO_FIPS is not set 1309# CONFIG_CRYPTO_FIPS is not set
1340# CONFIG_CRYPTO_MANAGER is not set 1310# CONFIG_CRYPTO_MANAGER is not set
1311# CONFIG_CRYPTO_MANAGER2 is not set
1341# CONFIG_CRYPTO_GF128MUL is not set 1312# CONFIG_CRYPTO_GF128MUL is not set
1342# CONFIG_CRYPTO_NULL is not set 1313# CONFIG_CRYPTO_NULL is not set
1343# CONFIG_CRYPTO_CRYPTD is not set 1314# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig
index dd6ad6be1c87..1a8e8c3adf98 100644
--- a/arch/blackfin/configs/BF538-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF538-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -42,7 +42,7 @@ CONFIG_LOG_BUF_SHIFT=14
42CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
43CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
46CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
47CONFIG_UID16=y 47CONFIG_UID16=y
48CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -55,13 +55,13 @@ CONFIG_BUG=y
55# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
56CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
57CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
58CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
59CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
60CONFIG_EPOLL=y 60CONFIG_EPOLL=y
61CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
62CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
63CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
64CONFIG_AIO=y 64# CONFIG_AIO is not set
65CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
66CONFIG_SLAB=y 66CONFIG_SLAB=y
67# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -132,10 +132,15 @@ CONFIG_PREEMPT_VOLUNTARY=y
132CONFIG_BF538=y 132CONFIG_BF538=y
133# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
134# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
135# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
136# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
137# CONFIG_BF548 is not set 140# CONFIG_BF548 is not set
141# CONFIG_BF548M is not set
138# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
139# CONFIG_BF561 is not set 144# CONFIG_BF561 is not set
140CONFIG_BF_REV_MIN=4 145CONFIG_BF_REV_MIN=4
141CONFIG_BF_REV_MAX=5 146CONFIG_BF_REV_MAX=5
@@ -293,7 +298,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
293# CONFIG_PHYS_ADDR_T_64BIT is not set 298# CONFIG_PHYS_ADDR_T_64BIT is not set
294CONFIG_ZONE_DMA_FLAG=1 299CONFIG_ZONE_DMA_FLAG=1
295CONFIG_VIRT_TO_BUS=y 300CONFIG_VIRT_TO_BUS=y
296CONFIG_BFIN_GPTIMERS=y 301CONFIG_BFIN_GPTIMERS=m
297# CONFIG_DMA_UNCACHED_4M is not set 302# CONFIG_DMA_UNCACHED_4M is not set
298# CONFIG_DMA_UNCACHED_2M is not set 303# CONFIG_DMA_UNCACHED_2M is not set
299CONFIG_DMA_UNCACHED_1M=y 304CONFIG_DMA_UNCACHED_1M=y
@@ -354,7 +359,6 @@ CONFIG_BINFMT_ZFLAT=y
354# 359#
355# CONFIG_PM is not set 360# CONFIG_PM is not set
356CONFIG_ARCH_SUSPEND_POSSIBLE=y 361CONFIG_ARCH_SUSPEND_POSSIBLE=y
357# CONFIG_PM_WAKEUP_BY_GPIO is not set
358 362
359# 363#
360# CPU Frequency scaling 364# CPU Frequency scaling
@@ -645,6 +649,7 @@ CONFIG_SMC91X=y
645# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 649# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
646# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 650# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
647# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 651# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
652# CONFIG_B44 is not set
648# CONFIG_NETDEV_1000 is not set 653# CONFIG_NETDEV_1000 is not set
649# CONFIG_NETDEV_10000 is not set 654# CONFIG_NETDEV_10000 is not set
650 655
@@ -690,7 +695,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
690# CONFIG_TOUCHSCREEN_AD7877 is not set 695# CONFIG_TOUCHSCREEN_AD7877 is not set
691# CONFIG_TOUCHSCREEN_AD7879_I2C is not set 696# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
692CONFIG_TOUCHSCREEN_AD7879_SPI=y 697CONFIG_TOUCHSCREEN_AD7879_SPI=y
693CONFIG_TOUCHSCREEN_AD7879=m 698CONFIG_TOUCHSCREEN_AD7879=y
694# CONFIG_TOUCHSCREEN_FUJITSU is not set 699# CONFIG_TOUCHSCREEN_FUJITSU is not set
695# CONFIG_TOUCHSCREEN_GUNZE is not set 700# CONFIG_TOUCHSCREEN_GUNZE is not set
696# CONFIG_TOUCHSCREEN_ELO is not set 701# CONFIG_TOUCHSCREEN_ELO is not set
@@ -718,8 +723,8 @@ CONFIG_INPUT_MISC=y
718# CONFIG_SPI_ADC_BF533 is not set 723# CONFIG_SPI_ADC_BF533 is not set
719# CONFIG_BF5xx_PPIFCD is not set 724# CONFIG_BF5xx_PPIFCD is not set
720# CONFIG_BFIN_SIMPLE_TIMER is not set 725# CONFIG_BFIN_SIMPLE_TIMER is not set
721# CONFIG_BF5xx_PPI is not set 726CONFIG_BF5xx_PPI=m
722CONFIG_BFIN_SPORT=y 727CONFIG_BFIN_SPORT=m
723# CONFIG_BFIN_TIMER_LATENCY is not set 728# CONFIG_BFIN_TIMER_LATENCY is not set
724# CONFIG_TWI_LCD is not set 729# CONFIG_TWI_LCD is not set
725CONFIG_BFIN_DMA_INTERFACE=m 730CONFIG_BFIN_DMA_INTERFACE=m
@@ -762,7 +767,7 @@ CONFIG_UNIX98_PTYS=y
762# CONFIG_R3964 is not set 767# CONFIG_R3964 is not set
763# CONFIG_RAW_DRIVER is not set 768# CONFIG_RAW_DRIVER is not set
764# CONFIG_TCG_TPM is not set 769# CONFIG_TCG_TPM is not set
765CONFIG_I2C=y 770CONFIG_I2C=m
766CONFIG_I2C_BOARDINFO=y 771CONFIG_I2C_BOARDINFO=y
767# CONFIG_I2C_CHARDEV is not set 772# CONFIG_I2C_CHARDEV is not set
768CONFIG_I2C_HELPER_AUTO=y 773CONFIG_I2C_HELPER_AUTO=y
@@ -774,7 +779,7 @@ CONFIG_I2C_HELPER_AUTO=y
774# 779#
775# I2C system bus drivers (mostly embedded / system-on-chip) 780# I2C system bus drivers (mostly embedded / system-on-chip)
776# 781#
777CONFIG_I2C_BLACKFIN_TWI=y 782CONFIG_I2C_BLACKFIN_TWI=m
778CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 783CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
779# CONFIG_I2C_GPIO is not set 784# CONFIG_I2C_GPIO is not set
780# CONFIG_I2C_OCORES is not set 785# CONFIG_I2C_OCORES is not set
@@ -818,6 +823,7 @@ CONFIG_SPI_MASTER=y
818# 823#
819CONFIG_SPI_BFIN=y 824CONFIG_SPI_BFIN=y
820# CONFIG_SPI_BFIN_LOCK is not set 825# CONFIG_SPI_BFIN_LOCK is not set
826# CONFIG_SPI_BFIN_SPORT is not set
821# CONFIG_SPI_BITBANG is not set 827# CONFIG_SPI_BITBANG is not set
822 828
823# 829#
@@ -830,60 +836,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
830# CONFIG_GPIOLIB is not set 836# CONFIG_GPIOLIB is not set
831# CONFIG_W1 is not set 837# CONFIG_W1 is not set
832# CONFIG_POWER_SUPPLY is not set 838# CONFIG_POWER_SUPPLY is not set
833CONFIG_HWMON=y 839# CONFIG_HWMON is not set
834# CONFIG_HWMON_VID is not set
835# CONFIG_SENSORS_AD7414 is not set
836# CONFIG_SENSORS_AD7418 is not set
837# CONFIG_SENSORS_ADCXX is not set
838# CONFIG_SENSORS_ADM1021 is not set
839# CONFIG_SENSORS_ADM1025 is not set
840# CONFIG_SENSORS_ADM1026 is not set
841# CONFIG_SENSORS_ADM1029 is not set
842# CONFIG_SENSORS_ADM1031 is not set
843# CONFIG_SENSORS_ADM9240 is not set
844# CONFIG_SENSORS_ADT7470 is not set
845# CONFIG_SENSORS_ADT7473 is not set
846# CONFIG_SENSORS_ATXP1 is not set
847# CONFIG_SENSORS_DS1621 is not set
848# CONFIG_SENSORS_F71805F is not set
849# CONFIG_SENSORS_F71882FG is not set
850# CONFIG_SENSORS_F75375S is not set
851# CONFIG_SENSORS_GL518SM is not set
852# CONFIG_SENSORS_GL520SM is not set
853# CONFIG_SENSORS_IT87 is not set
854# CONFIG_SENSORS_LM63 is not set
855# CONFIG_SENSORS_LM70 is not set
856# CONFIG_SENSORS_LM75 is not set
857# CONFIG_SENSORS_LM77 is not set
858# CONFIG_SENSORS_LM78 is not set
859# CONFIG_SENSORS_LM80 is not set
860# CONFIG_SENSORS_LM83 is not set
861# CONFIG_SENSORS_LM85 is not set
862# CONFIG_SENSORS_LM87 is not set
863# CONFIG_SENSORS_LM90 is not set
864# CONFIG_SENSORS_LM92 is not set
865# CONFIG_SENSORS_LM93 is not set
866# CONFIG_SENSORS_MAX1111 is not set
867# CONFIG_SENSORS_MAX1619 is not set
868# CONFIG_SENSORS_MAX6650 is not set
869# CONFIG_SENSORS_PC87360 is not set
870# CONFIG_SENSORS_PC87427 is not set
871# CONFIG_SENSORS_DME1737 is not set
872# CONFIG_SENSORS_SMSC47M1 is not set
873# CONFIG_SENSORS_SMSC47M192 is not set
874# CONFIG_SENSORS_SMSC47B397 is not set
875# CONFIG_SENSORS_ADS7828 is not set
876# CONFIG_SENSORS_THMC50 is not set
877# CONFIG_SENSORS_VT1211 is not set
878# CONFIG_SENSORS_W83781D is not set
879# CONFIG_SENSORS_W83791D is not set
880# CONFIG_SENSORS_W83792D is not set
881# CONFIG_SENSORS_W83793 is not set
882# CONFIG_SENSORS_W83L785TS is not set
883# CONFIG_SENSORS_W83L786NG is not set
884# CONFIG_SENSORS_W83627HF is not set
885# CONFIG_SENSORS_W83627EHF is not set
886# CONFIG_HWMON_DEBUG_CHIP is not set
887# CONFIG_THERMAL is not set 840# CONFIG_THERMAL is not set
888# CONFIG_THERMAL_HWMON is not set 841# CONFIG_THERMAL_HWMON is not set
889CONFIG_WATCHDOG=y 842CONFIG_WATCHDOG=y
@@ -894,6 +847,12 @@ CONFIG_WATCHDOG=y
894# 847#
895# CONFIG_SOFT_WATCHDOG is not set 848# CONFIG_SOFT_WATCHDOG is not set
896CONFIG_BFIN_WDT=y 849CONFIG_BFIN_WDT=y
850CONFIG_SSB_POSSIBLE=y
851
852#
853# Sonics Silicon Backplane
854#
855# CONFIG_SSB is not set
897 856
898# 857#
899# Multifunction device drivers 858# Multifunction device drivers
@@ -904,6 +863,7 @@ CONFIG_BFIN_WDT=y
904# CONFIG_MFD_TMIO is not set 863# CONFIG_MFD_TMIO is not set
905# CONFIG_MFD_WM8400 is not set 864# CONFIG_MFD_WM8400 is not set
906# CONFIG_MFD_WM8350_I2C is not set 865# CONFIG_MFD_WM8350_I2C is not set
866# CONFIG_REGULATOR is not set
907 867
908# 868#
909# Multimedia devices 869# Multimedia devices
@@ -954,6 +914,7 @@ CONFIG_FB_BFIN_LQ035Q1=m
954# CONFIG_FB_S1D13XXX is not set 914# CONFIG_FB_S1D13XXX is not set
955# CONFIG_FB_VIRTUAL is not set 915# CONFIG_FB_VIRTUAL is not set
956# CONFIG_FB_METRONOME is not set 916# CONFIG_FB_METRONOME is not set
917# CONFIG_FB_MB862XX is not set
957# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 918# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
958 919
959# 920#
@@ -1007,12 +968,14 @@ CONFIG_RTC_INTF_DEV=y
1007# CONFIG_RTC_DRV_M41T80 is not set 968# CONFIG_RTC_DRV_M41T80 is not set
1008# CONFIG_RTC_DRV_S35390A is not set 969# CONFIG_RTC_DRV_S35390A is not set
1009# CONFIG_RTC_DRV_FM3130 is not set 970# CONFIG_RTC_DRV_FM3130 is not set
971# CONFIG_RTC_DRV_RX8581 is not set
1010 972
1011# 973#
1012# SPI RTC drivers 974# SPI RTC drivers
1013# 975#
1014# CONFIG_RTC_DRV_M41T94 is not set 976# CONFIG_RTC_DRV_M41T94 is not set
1015# CONFIG_RTC_DRV_DS1305 is not set 977# CONFIG_RTC_DRV_DS1305 is not set
978# CONFIG_RTC_DRV_DS1390 is not set
1016# CONFIG_RTC_DRV_MAX6902 is not set 979# CONFIG_RTC_DRV_MAX6902 is not set
1017# CONFIG_RTC_DRV_R9701 is not set 980# CONFIG_RTC_DRV_R9701 is not set
1018# CONFIG_RTC_DRV_RS5C348 is not set 981# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1233,6 +1196,13 @@ CONFIG_DEBUG_INFO=y
1233# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1196# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1234# CONFIG_FAULT_INJECTION is not set 1197# CONFIG_FAULT_INJECTION is not set
1235CONFIG_SYSCTL_SYSCALL_CHECK=y 1198CONFIG_SYSCTL_SYSCALL_CHECK=y
1199
1200#
1201# Tracers
1202#
1203# CONFIG_SCHED_TRACER is not set
1204# CONFIG_CONTEXT_SWITCH_TRACER is not set
1205# CONFIG_BOOT_TRACER is not set
1236# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1206# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1237# CONFIG_SAMPLES is not set 1207# CONFIG_SAMPLES is not set
1238CONFIG_HAVE_ARCH_KGDB=y 1208CONFIG_HAVE_ARCH_KGDB=y
@@ -1271,6 +1241,7 @@ CONFIG_CRYPTO=y
1271# 1241#
1272# CONFIG_CRYPTO_FIPS is not set 1242# CONFIG_CRYPTO_FIPS is not set
1273# CONFIG_CRYPTO_MANAGER is not set 1243# CONFIG_CRYPTO_MANAGER is not set
1244# CONFIG_CRYPTO_MANAGER2 is not set
1274# CONFIG_CRYPTO_GF128MUL is not set 1245# CONFIG_CRYPTO_GF128MUL is not set
1275# CONFIG_CRYPTO_NULL is not set 1246# CONFIG_CRYPTO_NULL is not set
1276# CONFIG_CRYPTO_CRYPTD is not set 1247# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig
index 6bc2fb1b2a70..2cd1c2b218d7 100644
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -36,14 +36,13 @@ CONFIG_IKCONFIG_PROC=y
36CONFIG_LOG_BUF_SHIFT=14 36CONFIG_LOG_BUF_SHIFT=14
37# CONFIG_CGROUPS is not set 37# CONFIG_CGROUPS is not set
38# CONFIG_GROUP_SCHED is not set 38# CONFIG_GROUP_SCHED is not set
39# CONFIG_SYSFS_DEPRECATED is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 39# CONFIG_SYSFS_DEPRECATED_V2 is not set
41# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
42# CONFIG_NAMESPACES is not set 41# CONFIG_NAMESPACES is not set
43CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
48CONFIG_UID16=y 47CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -56,13 +55,13 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 60CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
63CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
64CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
65CONFIG_AIO=y 64# CONFIG_AIO is not set
66CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLAB=y 66CONFIG_SLAB=y
68# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -133,16 +132,21 @@ CONFIG_PREEMPT_VOLUNTARY=y
133# CONFIG_BF538 is not set 132# CONFIG_BF538 is not set
134# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
135# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
136# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
137# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
138CONFIG_BF548=y 140CONFIG_BF548=y
141# CONFIG_BF548M is not set
139# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
140# CONFIG_BF561 is not set 144# CONFIG_BF561 is not set
141CONFIG_BF_REV_MIN=0 145CONFIG_BF_REV_MIN=0
142CONFIG_BF_REV_MAX=2 146CONFIG_BF_REV_MAX=2
143CONFIG_BF_REV_0_0=y 147# CONFIG_BF_REV_0_0 is not set
144# CONFIG_BF_REV_0_1 is not set 148# CONFIG_BF_REV_0_1 is not set
145# CONFIG_BF_REV_0_2 is not set 149CONFIG_BF_REV_0_2=y
146# CONFIG_BF_REV_0_3 is not set 150# CONFIG_BF_REV_0_3 is not set
147# CONFIG_BF_REV_0_4 is not set 151# CONFIG_BF_REV_0_4 is not set
148# CONFIG_BF_REV_0_5 is not set 152# CONFIG_BF_REV_0_5 is not set
@@ -348,7 +352,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
348# CONFIG_PHYS_ADDR_T_64BIT is not set 352# CONFIG_PHYS_ADDR_T_64BIT is not set
349CONFIG_ZONE_DMA_FLAG=1 353CONFIG_ZONE_DMA_FLAG=1
350CONFIG_VIRT_TO_BUS=y 354CONFIG_VIRT_TO_BUS=y
351# CONFIG_BFIN_GPTIMERS is not set 355CONFIG_BFIN_GPTIMERS=m
352# CONFIG_DMA_UNCACHED_4M is not set 356# CONFIG_DMA_UNCACHED_4M is not set
353CONFIG_DMA_UNCACHED_2M=y 357CONFIG_DMA_UNCACHED_2M=y
354# CONFIG_DMA_UNCACHED_1M is not set 358# CONFIG_DMA_UNCACHED_1M is not set
@@ -413,7 +417,6 @@ CONFIG_BINFMT_ZFLAT=y
413# 417#
414# CONFIG_PM is not set 418# CONFIG_PM is not set
415CONFIG_ARCH_SUSPEND_POSSIBLE=y 419CONFIG_ARCH_SUSPEND_POSSIBLE=y
416# CONFIG_PM_WAKEUP_BY_GPIO is not set
417 420
418# 421#
419# CPU Frequency scaling 422# CPU Frequency scaling
@@ -512,9 +515,9 @@ CONFIG_IRCOMM=m
512# 515#
513CONFIG_IRTTY_SIR=m 516CONFIG_IRTTY_SIR=m
514CONFIG_BFIN_SIR=m 517CONFIG_BFIN_SIR=m
515CONFIG_BFIN_SIR3=y
516# CONFIG_BFIN_SIR0 is not set 518# CONFIG_BFIN_SIR0 is not set
517# CONFIG_BFIN_SIR2 is not set 519# CONFIG_BFIN_SIR2 is not set
520CONFIG_BFIN_SIR3=y
518CONFIG_SIR_BFIN_DMA=y 521CONFIG_SIR_BFIN_DMA=y
519# CONFIG_SIR_BFIN_PIO is not set 522# CONFIG_SIR_BFIN_PIO is not set
520 523
@@ -538,7 +541,8 @@ CONFIG_SIR_BFIN_DMA=y
538CONFIG_WIRELESS=y 541CONFIG_WIRELESS=y
539# CONFIG_CFG80211 is not set 542# CONFIG_CFG80211 is not set
540CONFIG_WIRELESS_OLD_REGULATORY=y 543CONFIG_WIRELESS_OLD_REGULATORY=y
541# CONFIG_WIRELESS_EXT is not set 544CONFIG_WIRELESS_EXT=y
545CONFIG_WIRELESS_EXT_SYSFS=y
542# CONFIG_MAC80211 is not set 546# CONFIG_MAC80211 is not set
543# CONFIG_IEEE80211 is not set 547# CONFIG_IEEE80211 is not set
544# CONFIG_RFKILL is not set 548# CONFIG_RFKILL is not set
@@ -554,7 +558,9 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
554CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 558CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
555CONFIG_STANDALONE=y 559CONFIG_STANDALONE=y
556CONFIG_PREVENT_FIRMWARE_BUILD=y 560CONFIG_PREVENT_FIRMWARE_BUILD=y
557# CONFIG_FW_LOADER is not set 561CONFIG_FW_LOADER=m
562CONFIG_FIRMWARE_IN_KERNEL=y
563CONFIG_EXTRA_FIRMWARE=""
558# CONFIG_DEBUG_DRIVER is not set 564# CONFIG_DEBUG_DRIVER is not set
559# CONFIG_DEBUG_DEVRES is not set 565# CONFIG_DEBUG_DEVRES is not set
560# CONFIG_SYS_HYPERVISOR is not set 566# CONFIG_SYS_HYPERVISOR is not set
@@ -668,7 +674,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
668# CONFIG_BLK_DEV_HD is not set 674# CONFIG_BLK_DEV_HD is not set
669CONFIG_MISC_DEVICES=y 675CONFIG_MISC_DEVICES=y
670# CONFIG_EEPROM_93CX6 is not set 676# CONFIG_EEPROM_93CX6 is not set
677# CONFIG_ICS932S401 is not set
671# CONFIG_ENCLOSURE_SERVICES is not set 678# CONFIG_ENCLOSURE_SERVICES is not set
679# CONFIG_C2PORT is not set
672CONFIG_HAVE_IDE=y 680CONFIG_HAVE_IDE=y
673# CONFIG_IDE is not set 681# CONFIG_IDE is not set
674 682
@@ -743,6 +751,7 @@ CONFIG_SMSC911X=y
743# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 751# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
744# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 752# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
745# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 753# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
754# CONFIG_B44 is not set
746CONFIG_NETDEV_1000=y 755CONFIG_NETDEV_1000=y
747# CONFIG_AX88180 is not set 756# CONFIG_AX88180 is not set
748CONFIG_NETDEV_10000=y 757CONFIG_NETDEV_10000=y
@@ -751,8 +760,16 @@ CONFIG_NETDEV_10000=y
751# Wireless LAN 760# Wireless LAN
752# 761#
753# CONFIG_WLAN_PRE80211 is not set 762# CONFIG_WLAN_PRE80211 is not set
754# CONFIG_WLAN_80211 is not set 763CONFIG_WLAN_80211=y
764CONFIG_LIBERTAS=m
765# CONFIG_LIBERTAS_USB is not set
766CONFIG_LIBERTAS_SDIO=m
767CONFIG_POWEROF2_BLOCKSIZE_ONLY=y
768# CONFIG_LIBERTAS_DEBUG is not set
769# CONFIG_USB_ZD1201 is not set
770# CONFIG_USB_NET_RNDIS_WLAN is not set
755# CONFIG_IWLWIFI_LEDS is not set 771# CONFIG_IWLWIFI_LEDS is not set
772# CONFIG_HOSTAP is not set
756 773
757# 774#
758# USB Network Adapters 775# USB Network Adapters
@@ -844,8 +861,8 @@ CONFIG_INPUT_MISC=y
844# CONFIG_SPI_ADC_BF533 is not set 861# CONFIG_SPI_ADC_BF533 is not set
845# CONFIG_BF5xx_PPIFCD is not set 862# CONFIG_BF5xx_PPIFCD is not set
846# CONFIG_BFIN_SIMPLE_TIMER is not set 863# CONFIG_BFIN_SIMPLE_TIMER is not set
847# CONFIG_BF5xx_PPI is not set 864CONFIG_BF5xx_PPI=m
848# CONFIG_BFIN_SPORT is not set 865CONFIG_BFIN_SPORT=m
849# CONFIG_BFIN_TIMER_LATENCY is not set 866# CONFIG_BFIN_TIMER_LATENCY is not set
850# CONFIG_TWI_LCD is not set 867# CONFIG_TWI_LCD is not set
851CONFIG_BFIN_DMA_INTERFACE=m 868CONFIG_BFIN_DMA_INTERFACE=m
@@ -950,6 +967,7 @@ CONFIG_SPI_MASTER=y
950# 967#
951CONFIG_SPI_BFIN=y 968CONFIG_SPI_BFIN=y
952# CONFIG_SPI_BFIN_LOCK is not set 969# CONFIG_SPI_BFIN_LOCK is not set
970# CONFIG_SPI_BFIN_SPORT is not set
953# CONFIG_SPI_BITBANG is not set 971# CONFIG_SPI_BITBANG is not set
954 972
955# 973#
@@ -962,60 +980,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
962# CONFIG_GPIOLIB is not set 980# CONFIG_GPIOLIB is not set
963# CONFIG_W1 is not set 981# CONFIG_W1 is not set
964# CONFIG_POWER_SUPPLY is not set 982# CONFIG_POWER_SUPPLY is not set
965CONFIG_HWMON=y 983# CONFIG_HWMON is not set
966# CONFIG_HWMON_VID is not set
967# CONFIG_SENSORS_AD7414 is not set
968# CONFIG_SENSORS_AD7418 is not set
969# CONFIG_SENSORS_ADCXX is not set
970# CONFIG_SENSORS_ADM1021 is not set
971# CONFIG_SENSORS_ADM1025 is not set
972# CONFIG_SENSORS_ADM1026 is not set
973# CONFIG_SENSORS_ADM1029 is not set
974# CONFIG_SENSORS_ADM1031 is not set
975# CONFIG_SENSORS_ADM9240 is not set
976# CONFIG_SENSORS_ADT7470 is not set
977# CONFIG_SENSORS_ADT7473 is not set
978# CONFIG_SENSORS_ATXP1 is not set
979# CONFIG_SENSORS_DS1621 is not set
980# CONFIG_SENSORS_F71805F is not set
981# CONFIG_SENSORS_F71882FG is not set
982# CONFIG_SENSORS_F75375S is not set
983# CONFIG_SENSORS_GL518SM is not set
984# CONFIG_SENSORS_GL520SM is not set
985# CONFIG_SENSORS_IT87 is not set
986# CONFIG_SENSORS_LM63 is not set
987# CONFIG_SENSORS_LM70 is not set
988# CONFIG_SENSORS_LM75 is not set
989# CONFIG_SENSORS_LM77 is not set
990# CONFIG_SENSORS_LM78 is not set
991# CONFIG_SENSORS_LM80 is not set
992# CONFIG_SENSORS_LM83 is not set
993# CONFIG_SENSORS_LM85 is not set
994# CONFIG_SENSORS_LM87 is not set
995# CONFIG_SENSORS_LM90 is not set
996# CONFIG_SENSORS_LM92 is not set
997# CONFIG_SENSORS_LM93 is not set
998# CONFIG_SENSORS_MAX1111 is not set
999# CONFIG_SENSORS_MAX1619 is not set
1000# CONFIG_SENSORS_MAX6650 is not set
1001# CONFIG_SENSORS_PC87360 is not set
1002# CONFIG_SENSORS_PC87427 is not set
1003# CONFIG_SENSORS_DME1737 is not set
1004# CONFIG_SENSORS_SMSC47M1 is not set
1005# CONFIG_SENSORS_SMSC47M192 is not set
1006# CONFIG_SENSORS_SMSC47B397 is not set
1007# CONFIG_SENSORS_ADS7828 is not set
1008# CONFIG_SENSORS_THMC50 is not set
1009# CONFIG_SENSORS_VT1211 is not set
1010# CONFIG_SENSORS_W83781D is not set
1011# CONFIG_SENSORS_W83791D is not set
1012# CONFIG_SENSORS_W83792D is not set
1013# CONFIG_SENSORS_W83793 is not set
1014# CONFIG_SENSORS_W83L785TS is not set
1015# CONFIG_SENSORS_W83L786NG is not set
1016# CONFIG_SENSORS_W83627HF is not set
1017# CONFIG_SENSORS_W83627EHF is not set
1018# CONFIG_HWMON_DEBUG_CHIP is not set
1019# CONFIG_THERMAL is not set 984# CONFIG_THERMAL is not set
1020# CONFIG_THERMAL_HWMON is not set 985# CONFIG_THERMAL_HWMON is not set
1021CONFIG_WATCHDOG=y 986CONFIG_WATCHDOG=y
@@ -1031,6 +996,12 @@ CONFIG_BFIN_WDT=y
1031# USB-based Watchdog Cards 996# USB-based Watchdog Cards
1032# 997#
1033# CONFIG_USBPCWATCHDOG is not set 998# CONFIG_USBPCWATCHDOG is not set
999CONFIG_SSB_POSSIBLE=y
1000
1001#
1002# Sonics Silicon Backplane
1003#
1004# CONFIG_SSB is not set
1034 1005
1035# 1006#
1036# Multifunction device drivers 1007# Multifunction device drivers
@@ -1039,8 +1010,10 @@ CONFIG_BFIN_WDT=y
1039# CONFIG_MFD_SM501 is not set 1010# CONFIG_MFD_SM501 is not set
1040# CONFIG_HTC_PASIC3 is not set 1011# CONFIG_HTC_PASIC3 is not set
1041# CONFIG_MFD_TMIO is not set 1012# CONFIG_MFD_TMIO is not set
1013# CONFIG_PMIC_DA903X is not set
1042# CONFIG_MFD_WM8400 is not set 1014# CONFIG_MFD_WM8400 is not set
1043# CONFIG_MFD_WM8350_I2C is not set 1015# CONFIG_MFD_WM8350_I2C is not set
1016# CONFIG_REGULATOR is not set
1044 1017
1045# 1018#
1046# Multimedia devices 1019# Multimedia devices
@@ -1092,6 +1065,7 @@ CONFIG_FB_BF54X_LQ043=y
1092# CONFIG_FB_S1D13XXX is not set 1065# CONFIG_FB_S1D13XXX is not set
1093# CONFIG_FB_VIRTUAL is not set 1066# CONFIG_FB_VIRTUAL is not set
1094# CONFIG_FB_METRONOME is not set 1067# CONFIG_FB_METRONOME is not set
1068# CONFIG_FB_MB862XX is not set
1095# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1069# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1096 1070
1097# 1071#
@@ -1243,15 +1217,15 @@ CONFIG_USB_MUSB_HDRC=y
1243CONFIG_USB_MUSB_SOC=y 1217CONFIG_USB_MUSB_SOC=y
1244 1218
1245# 1219#
1246# Blackfin high speed USB support 1220# Blackfin high speed USB Support
1247# 1221#
1248CONFIG_USB_MUSB_HOST=y 1222CONFIG_USB_MUSB_HOST=y
1249# CONFIG_USB_MUSB_PERIPHERAL is not set 1223# CONFIG_USB_MUSB_PERIPHERAL is not set
1250# CONFIG_USB_MUSB_OTG is not set 1224# CONFIG_USB_MUSB_OTG is not set
1225# CONFIG_USB_GADGET_MUSB_HDRC is not set
1251CONFIG_USB_MUSB_HDRC_HCD=y 1226CONFIG_USB_MUSB_HDRC_HCD=y
1252# CONFIG_MUSB_PIO_ONLY is not set 1227CONFIG_MUSB_PIO_ONLY=y
1253CONFIG_USB_INVENTRA_DMA=y 1228CONFIG_MUSB_DMA_POLL=y
1254# CONFIG_USB_TI_CPPI_DMA is not set
1255# CONFIG_USB_MUSB_DEBUG is not set 1229# CONFIG_USB_MUSB_DEBUG is not set
1256 1230
1257# 1231#
@@ -1263,11 +1237,11 @@ CONFIG_USB_INVENTRA_DMA=y
1263# CONFIG_USB_TMC is not set 1237# CONFIG_USB_TMC is not set
1264 1238
1265# 1239#
1266# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1240# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1267# 1241#
1268 1242
1269# 1243#
1270# may also be needed; see USB_STORAGE Help for more information 1244# see USB_STORAGE Help for more information
1271# 1245#
1272CONFIG_USB_STORAGE=m 1246CONFIG_USB_STORAGE=m
1273# CONFIG_USB_STORAGE_DEBUG is not set 1247# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1321,7 +1295,31 @@ CONFIG_USB_STORAGE=m
1321# CONFIG_USB_ISIGHTFW is not set 1295# CONFIG_USB_ISIGHTFW is not set
1322# CONFIG_USB_VST is not set 1296# CONFIG_USB_VST is not set
1323# CONFIG_USB_GADGET is not set 1297# CONFIG_USB_GADGET is not set
1324CONFIG_MMC=m 1298# CONFIG_USB_GADGET_AT91 is not set
1299# CONFIG_USB_GADGET_ATMEL_USBA is not set
1300# CONFIG_USB_GADGET_FSL_USB2 is not set
1301# CONFIG_USB_GADGET_LH7A40X is not set
1302# CONFIG_USB_GADGET_OMAP is not set
1303# CONFIG_USB_GADGET_PXA25X is not set
1304# CONFIG_USB_GADGET_PXA27X is not set
1305# CONFIG_USB_GADGET_S3C2410 is not set
1306# CONFIG_USB_GADGET_M66592 is not set
1307# CONFIG_USB_GADGET_AMD5536UDC is not set
1308# CONFIG_USB_GADGET_FSL_QE is not set
1309# CONFIG_USB_GADGET_NET2272 is not set
1310# CONFIG_USB_GADGET_NET2280 is not set
1311# CONFIG_USB_GADGET_GOKU is not set
1312# CONFIG_USB_GADGET_DUMMY_HCD is not set
1313# CONFIG_USB_ZERO is not set
1314# CONFIG_USB_AUDIO is not set
1315# CONFIG_USB_ETH is not set
1316# CONFIG_USB_GADGETFS is not set
1317# CONFIG_USB_FILE_STORAGE is not set
1318# CONFIG_USB_G_SERIAL is not set
1319# CONFIG_USB_MIDI_GADGET is not set
1320# CONFIG_USB_G_PRINTER is not set
1321# CONFIG_USB_CDC_COMPOSITE is not set
1322CONFIG_MMC=y
1325# CONFIG_MMC_DEBUG is not set 1323# CONFIG_MMC_DEBUG is not set
1326# CONFIG_MMC_UNSAFE_RESUME is not set 1324# CONFIG_MMC_UNSAFE_RESUME is not set
1327 1325
@@ -1337,8 +1335,9 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1337# MMC/SD/SDIO Host Controller Drivers 1335# MMC/SD/SDIO Host Controller Drivers
1338# 1336#
1339# CONFIG_MMC_SDHCI is not set 1337# CONFIG_MMC_SDHCI is not set
1340CONFIG_SDH_BFIN=m 1338CONFIG_SDH_BFIN=y
1341# CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set 1339# CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set
1340# CONFIG_SDH_BFIN_ENABLE_SDIO_IRQ is not set
1342# CONFIG_MMC_SPI is not set 1341# CONFIG_MMC_SPI is not set
1343# CONFIG_MEMSTICK is not set 1342# CONFIG_MEMSTICK is not set
1344# CONFIG_NEW_LEDS is not set 1343# CONFIG_NEW_LEDS is not set
@@ -1373,12 +1372,14 @@ CONFIG_RTC_INTF_DEV=y
1373# CONFIG_RTC_DRV_M41T80 is not set 1372# CONFIG_RTC_DRV_M41T80 is not set
1374# CONFIG_RTC_DRV_S35390A is not set 1373# CONFIG_RTC_DRV_S35390A is not set
1375# CONFIG_RTC_DRV_FM3130 is not set 1374# CONFIG_RTC_DRV_FM3130 is not set
1375# CONFIG_RTC_DRV_RX8581 is not set
1376 1376
1377# 1377#
1378# SPI RTC drivers 1378# SPI RTC drivers
1379# 1379#
1380# CONFIG_RTC_DRV_M41T94 is not set 1380# CONFIG_RTC_DRV_M41T94 is not set
1381# CONFIG_RTC_DRV_DS1305 is not set 1381# CONFIG_RTC_DRV_DS1305 is not set
1382# CONFIG_RTC_DRV_DS1390 is not set
1382# CONFIG_RTC_DRV_MAX6902 is not set 1383# CONFIG_RTC_DRV_MAX6902 is not set
1383# CONFIG_RTC_DRV_R9701 is not set 1384# CONFIG_RTC_DRV_R9701 is not set
1384# CONFIG_RTC_DRV_RS5C348 is not set 1385# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1641,6 +1642,13 @@ CONFIG_DEBUG_INFO=y
1641# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1642# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1642# CONFIG_FAULT_INJECTION is not set 1643# CONFIG_FAULT_INJECTION is not set
1643# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1644# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1645
1646#
1647# Tracers
1648#
1649# CONFIG_SCHED_TRACER is not set
1650# CONFIG_CONTEXT_SWITCH_TRACER is not set
1651# CONFIG_BOOT_TRACER is not set
1644# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1652# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1645# CONFIG_SAMPLES is not set 1653# CONFIG_SAMPLES is not set
1646CONFIG_HAVE_ARCH_KGDB=y 1654CONFIG_HAVE_ARCH_KGDB=y
@@ -1680,6 +1688,7 @@ CONFIG_CRYPTO=y
1680# 1688#
1681# CONFIG_CRYPTO_FIPS is not set 1689# CONFIG_CRYPTO_FIPS is not set
1682# CONFIG_CRYPTO_MANAGER is not set 1690# CONFIG_CRYPTO_MANAGER is not set
1691# CONFIG_CRYPTO_MANAGER2 is not set
1683# CONFIG_CRYPTO_GF128MUL is not set 1692# CONFIG_CRYPTO_GF128MUL is not set
1684# CONFIG_CRYPTO_NULL is not set 1693# CONFIG_CRYPTO_NULL is not set
1685# CONFIG_CRYPTO_CRYPTD is not set 1694# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index 69714fb3e608..4a6ea8e31df7 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -36,14 +36,13 @@ CONFIG_IKCONFIG_PROC=y
36CONFIG_LOG_BUF_SHIFT=14 36CONFIG_LOG_BUF_SHIFT=14
37# CONFIG_CGROUPS is not set 37# CONFIG_CGROUPS is not set
38# CONFIG_GROUP_SCHED is not set 38# CONFIG_GROUP_SCHED is not set
39# CONFIG_SYSFS_DEPRECATED is not set
40# CONFIG_SYSFS_DEPRECATED_V2 is not set 39# CONFIG_SYSFS_DEPRECATED_V2 is not set
41# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
42# CONFIG_NAMESPACES is not set 41# CONFIG_NAMESPACES is not set
43CONFIG_BLK_DEV_INITRD=y 42CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 43CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 45# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 46CONFIG_EMBEDDED=y
48CONFIG_UID16=y 47CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 48CONFIG_SYSCTL_SYSCALL=y
@@ -56,13 +55,13 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 55# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 56CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 58# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 59CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 60CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 61CONFIG_SIGNALFD=y
63CONFIG_TIMERFD=y 62CONFIG_TIMERFD=y
64CONFIG_EVENTFD=y 63CONFIG_EVENTFD=y
65CONFIG_AIO=y 64# CONFIG_AIO is not set
66CONFIG_VM_EVENT_COUNTERS=y 65CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLAB=y 66CONFIG_SLAB=y
68# CONFIG_SLUB is not set 67# CONFIG_SLUB is not set
@@ -133,10 +132,15 @@ CONFIG_PREEMPT_VOLUNTARY=y
133# CONFIG_BF538 is not set 132# CONFIG_BF538 is not set
134# CONFIG_BF539 is not set 133# CONFIG_BF539 is not set
135# CONFIG_BF542 is not set 134# CONFIG_BF542 is not set
135# CONFIG_BF542M is not set
136# CONFIG_BF544 is not set 136# CONFIG_BF544 is not set
137# CONFIG_BF544M is not set
137# CONFIG_BF547 is not set 138# CONFIG_BF547 is not set
139# CONFIG_BF547M is not set
138# CONFIG_BF548 is not set 140# CONFIG_BF548 is not set
141# CONFIG_BF548M is not set
139# CONFIG_BF549 is not set 142# CONFIG_BF549 is not set
143# CONFIG_BF549M is not set
140CONFIG_BF561=y 144CONFIG_BF561=y
141# CONFIG_SMP is not set 145# CONFIG_SMP is not set
142CONFIG_BF_REV_MIN=3 146CONFIG_BF_REV_MIN=3
@@ -166,7 +170,6 @@ CONFIG_IRQ_SPI_ERROR=7
166CONFIG_BFIN561_EZKIT=y 170CONFIG_BFIN561_EZKIT=y
167# CONFIG_BFIN561_TEPLA is not set 171# CONFIG_BFIN561_TEPLA is not set
168# CONFIG_BFIN561_BLUETECHNIX_CM is not set 172# CONFIG_BFIN561_BLUETECHNIX_CM is not set
169# CONFIG_GENERIC_BF561_BOARD is not set
170 173
171# 174#
172# BF561 Specific Configuration 175# BF561 Specific Configuration
@@ -316,7 +319,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
316# CONFIG_PHYS_ADDR_T_64BIT is not set 319# CONFIG_PHYS_ADDR_T_64BIT is not set
317CONFIG_ZONE_DMA_FLAG=1 320CONFIG_ZONE_DMA_FLAG=1
318CONFIG_VIRT_TO_BUS=y 321CONFIG_VIRT_TO_BUS=y
319# CONFIG_BFIN_GPTIMERS is not set 322CONFIG_BFIN_GPTIMERS=m
320# CONFIG_DMA_UNCACHED_4M is not set 323# CONFIG_DMA_UNCACHED_4M is not set
321# CONFIG_DMA_UNCACHED_2M is not set 324# CONFIG_DMA_UNCACHED_2M is not set
322CONFIG_DMA_UNCACHED_1M=y 325CONFIG_DMA_UNCACHED_1M=y
@@ -382,7 +385,6 @@ CONFIG_BINFMT_ZFLAT=y
382# 385#
383# CONFIG_PM is not set 386# CONFIG_PM is not set
384CONFIG_ARCH_SUSPEND_POSSIBLE=y 387CONFIG_ARCH_SUSPEND_POSSIBLE=y
385# CONFIG_PM_WAKEUP_BY_GPIO is not set
386 388
387# 389#
388# CPU Frequency scaling 390# CPU Frequency scaling
@@ -612,6 +614,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
612CONFIG_MISC_DEVICES=y 614CONFIG_MISC_DEVICES=y
613# CONFIG_EEPROM_93CX6 is not set 615# CONFIG_EEPROM_93CX6 is not set
614# CONFIG_ENCLOSURE_SERVICES is not set 616# CONFIG_ENCLOSURE_SERVICES is not set
617# CONFIG_C2PORT is not set
615CONFIG_HAVE_IDE=y 618CONFIG_HAVE_IDE=y
616# CONFIG_IDE is not set 619# CONFIG_IDE is not set
617 620
@@ -645,6 +648,7 @@ CONFIG_SMC91X=y
645# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 648# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
646# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 649# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
647# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 650# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
651# CONFIG_B44 is not set
648CONFIG_NETDEV_1000=y 652CONFIG_NETDEV_1000=y
649# CONFIG_AX88180 is not set 653# CONFIG_AX88180 is not set
650CONFIG_NETDEV_10000=y 654CONFIG_NETDEV_10000=y
@@ -751,6 +755,7 @@ CONFIG_SPI_MASTER=y
751# 755#
752CONFIG_SPI_BFIN=y 756CONFIG_SPI_BFIN=y
753# CONFIG_SPI_BFIN_LOCK is not set 757# CONFIG_SPI_BFIN_LOCK is not set
758# CONFIG_SPI_BFIN_SPORT is not set
754# CONFIG_SPI_BITBANG is not set 759# CONFIG_SPI_BITBANG is not set
755 760
756# 761#
@@ -763,22 +768,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
763# CONFIG_GPIOLIB is not set 768# CONFIG_GPIOLIB is not set
764# CONFIG_W1 is not set 769# CONFIG_W1 is not set
765# CONFIG_POWER_SUPPLY is not set 770# CONFIG_POWER_SUPPLY is not set
766CONFIG_HWMON=y 771# CONFIG_HWMON is not set
767# CONFIG_HWMON_VID is not set
768# CONFIG_SENSORS_ADCXX is not set
769# CONFIG_SENSORS_F71805F is not set
770# CONFIG_SENSORS_F71882FG is not set
771# CONFIG_SENSORS_IT87 is not set
772# CONFIG_SENSORS_LM70 is not set
773# CONFIG_SENSORS_MAX1111 is not set
774# CONFIG_SENSORS_PC87360 is not set
775# CONFIG_SENSORS_PC87427 is not set
776# CONFIG_SENSORS_SMSC47M1 is not set
777# CONFIG_SENSORS_SMSC47B397 is not set
778# CONFIG_SENSORS_VT1211 is not set
779# CONFIG_SENSORS_W83627HF is not set
780# CONFIG_SENSORS_W83627EHF is not set
781# CONFIG_HWMON_DEBUG_CHIP is not set
782# CONFIG_THERMAL is not set 772# CONFIG_THERMAL is not set
783# CONFIG_THERMAL_HWMON is not set 773# CONFIG_THERMAL_HWMON is not set
784CONFIG_WATCHDOG=y 774CONFIG_WATCHDOG=y
@@ -789,6 +779,12 @@ CONFIG_WATCHDOG=y
789# 779#
790# CONFIG_SOFT_WATCHDOG is not set 780# CONFIG_SOFT_WATCHDOG is not set
791CONFIG_BFIN_WDT=y 781CONFIG_BFIN_WDT=y
782CONFIG_SSB_POSSIBLE=y
783
784#
785# Sonics Silicon Backplane
786#
787# CONFIG_SSB is not set
792 788
793# 789#
794# Multifunction device drivers 790# Multifunction device drivers
@@ -797,7 +793,7 @@ CONFIG_BFIN_WDT=y
797# CONFIG_MFD_SM501 is not set 793# CONFIG_MFD_SM501 is not set
798# CONFIG_HTC_PASIC3 is not set 794# CONFIG_HTC_PASIC3 is not set
799# CONFIG_MFD_TMIO is not set 795# CONFIG_MFD_TMIO is not set
800# CONFIG_MFD_WM8400 is not set 796# CONFIG_REGULATOR is not set
801 797
802# 798#
803# Multimedia devices 799# Multimedia devices
@@ -1041,6 +1037,13 @@ CONFIG_DEBUG_INFO=y
1041# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1037# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1042# CONFIG_FAULT_INJECTION is not set 1038# CONFIG_FAULT_INJECTION is not set
1043# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1039# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1040
1041#
1042# Tracers
1043#
1044# CONFIG_SCHED_TRACER is not set
1045# CONFIG_CONTEXT_SWITCH_TRACER is not set
1046# CONFIG_BOOT_TRACER is not set
1044# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1047# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1045# CONFIG_SAMPLES is not set 1048# CONFIG_SAMPLES is not set
1046CONFIG_HAVE_ARCH_KGDB=y 1049CONFIG_HAVE_ARCH_KGDB=y
@@ -1079,6 +1082,7 @@ CONFIG_CRYPTO=y
1079# 1082#
1080# CONFIG_CRYPTO_FIPS is not set 1083# CONFIG_CRYPTO_FIPS is not set
1081# CONFIG_CRYPTO_MANAGER is not set 1084# CONFIG_CRYPTO_MANAGER is not set
1085# CONFIG_CRYPTO_MANAGER2 is not set
1082# CONFIG_CRYPTO_GF128MUL is not set 1086# CONFIG_CRYPTO_GF128MUL is not set
1083# CONFIG_CRYPTO_NULL is not set 1087# CONFIG_CRYPTO_NULL is not set
1084# CONFIG_CRYPTO_CRYPTD is not set 1088# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig
index 017c6ea071b5..ef1a2c84ace1 100644
--- a/arch/blackfin/configs/BlackStamp_defconfig
+++ b/arch/blackfin/configs/BlackStamp_defconfig
@@ -43,7 +43,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
43CONFIG_BLK_DEV_INITRD=y 43CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 44CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 46# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 47CONFIG_EMBEDDED=y
48CONFIG_UID16=y 48CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 49CONFIG_SYSCTL_SYSCALL=y
@@ -56,7 +56,7 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 56# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 57CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 58CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 59# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 60CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 61CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 62CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig
index d880ef786770..e2fc588e4336 100644
--- a/arch/blackfin/configs/CM-BF527_defconfig
+++ b/arch/blackfin/configs/CM-BF527_defconfig
@@ -43,7 +43,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
43CONFIG_BLK_DEV_INITRD=y 43CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 44CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 46# CONFIG_SYSCTL is not set
47CONFIG_EMBEDDED=y 47CONFIG_EMBEDDED=y
48CONFIG_UID16=y 48CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y 49CONFIG_SYSCTL_SYSCALL=y
@@ -56,13 +56,13 @@ CONFIG_BUG=y
56# CONFIG_ELF_CORE is not set 56# CONFIG_ELF_CORE is not set
57CONFIG_COMPAT_BRK=y 57CONFIG_COMPAT_BRK=y
58CONFIG_BASE_FULL=y 58CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 59# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 60CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 61CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 62CONFIG_SIGNALFD=y
63CONFIG_TIMERFD=y 63CONFIG_TIMERFD=y
64CONFIG_EVENTFD=y 64CONFIG_EVENTFD=y
65CONFIG_AIO=y 65# CONFIG_AIO is not set
66CONFIG_VM_EVENT_COUNTERS=y 66CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLAB=y 67CONFIG_SLAB=y
68# CONFIG_SLUB is not set 68# CONFIG_SLUB is not set
diff --git a/arch/blackfin/configs/CM-BF533_defconfig b/arch/blackfin/configs/CM-BF533_defconfig
index 085211b9e4e4..65a8bbb8d647 100644
--- a/arch/blackfin/configs/CM-BF533_defconfig
+++ b/arch/blackfin/configs/CM-BF533_defconfig
@@ -46,7 +46,7 @@ CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_RELAY is not set 46# CONFIG_RELAY is not set
47# CONFIG_BLK_DEV_INITRD is not set 47# CONFIG_BLK_DEV_INITRD is not set
48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
49CONFIG_SYSCTL=y 49# CONFIG_SYSCTL is not set
50CONFIG_EMBEDDED=y 50CONFIG_EMBEDDED=y
51# CONFIG_UID16 is not set 51# CONFIG_UID16 is not set
52CONFIG_SYSCTL_SYSCALL=y 52CONFIG_SYSCTL_SYSCALL=y
@@ -57,7 +57,7 @@ CONFIG_PRINTK=y
57CONFIG_BUG=y 57CONFIG_BUG=y
58# CONFIG_ELF_CORE is not set 58# CONFIG_ELF_CORE is not set
59CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 60# CONFIG_FUTEX is not set
61CONFIG_ANON_INODES=y 61CONFIG_ANON_INODES=y
62CONFIG_EPOLL=y 62CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y 63CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/CM-BF537E_defconfig b/arch/blackfin/configs/CM-BF537E_defconfig
index 750203e27a46..9b7e9d781145 100644
--- a/arch/blackfin/configs/CM-BF537E_defconfig
+++ b/arch/blackfin/configs/CM-BF537E_defconfig
@@ -46,7 +46,7 @@ CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_RELAY is not set 46# CONFIG_RELAY is not set
47# CONFIG_BLK_DEV_INITRD is not set 47# CONFIG_BLK_DEV_INITRD is not set
48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
49CONFIG_SYSCTL=y 49# CONFIG_SYSCTL is not set
50CONFIG_EMBEDDED=y 50CONFIG_EMBEDDED=y
51# CONFIG_UID16 is not set 51# CONFIG_UID16 is not set
52CONFIG_SYSCTL_SYSCALL=y 52CONFIG_SYSCTL_SYSCALL=y
@@ -57,7 +57,7 @@ CONFIG_PRINTK=y
57CONFIG_BUG=y 57CONFIG_BUG=y
58# CONFIG_ELF_CORE is not set 58# CONFIG_ELF_CORE is not set
59CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 60# CONFIG_FUTEX is not set
61CONFIG_ANON_INODES=y 61CONFIG_ANON_INODES=y
62CONFIG_EPOLL=y 62CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y 63CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/CM-BF537U_defconfig b/arch/blackfin/configs/CM-BF537U_defconfig
index dec8a7d5cc0e..569523c1c034 100644
--- a/arch/blackfin/configs/CM-BF537U_defconfig
+++ b/arch/blackfin/configs/CM-BF537U_defconfig
@@ -46,7 +46,7 @@ CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_RELAY is not set 46# CONFIG_RELAY is not set
47# CONFIG_BLK_DEV_INITRD is not set 47# CONFIG_BLK_DEV_INITRD is not set
48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
49CONFIG_SYSCTL=y 49# CONFIG_SYSCTL is not set
50CONFIG_EMBEDDED=y 50CONFIG_EMBEDDED=y
51# CONFIG_UID16 is not set 51# CONFIG_UID16 is not set
52CONFIG_SYSCTL_SYSCALL=y 52CONFIG_SYSCTL_SYSCALL=y
@@ -57,7 +57,7 @@ CONFIG_PRINTK=y
57CONFIG_BUG=y 57CONFIG_BUG=y
58# CONFIG_ELF_CORE is not set 58# CONFIG_ELF_CORE is not set
59CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 60# CONFIG_FUTEX is not set
61CONFIG_ANON_INODES=y 61CONFIG_ANON_INODES=y
62CONFIG_EPOLL=y 62CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y 63CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig
index f410430b4e3d..035b635e599c 100644
--- a/arch/blackfin/configs/CM-BF548_defconfig
+++ b/arch/blackfin/configs/CM-BF548_defconfig
@@ -46,7 +46,7 @@ CONFIG_FAIR_USER_SCHED=y
46CONFIG_BLK_DEV_INITRD=y 46CONFIG_BLK_DEV_INITRD=y
47CONFIG_INITRAMFS_SOURCE="" 47CONFIG_INITRAMFS_SOURCE=""
48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
49CONFIG_SYSCTL=y 49# CONFIG_SYSCTL is not set
50CONFIG_EMBEDDED=y 50CONFIG_EMBEDDED=y
51CONFIG_UID16=y 51CONFIG_UID16=y
52CONFIG_SYSCTL_SYSCALL=y 52CONFIG_SYSCTL_SYSCALL=y
@@ -57,7 +57,7 @@ CONFIG_PRINTK=y
57CONFIG_BUG=y 57CONFIG_BUG=y
58# CONFIG_ELF_CORE is not set 58# CONFIG_ELF_CORE is not set
59CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 60# CONFIG_FUTEX is not set
61CONFIG_ANON_INODES=y 61CONFIG_ANON_INODES=y
62CONFIG_EPOLL=y 62CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y 63CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig
index 346bc7af8f42..7015e42ccce5 100644
--- a/arch/blackfin/configs/CM-BF561_defconfig
+++ b/arch/blackfin/configs/CM-BF561_defconfig
@@ -46,7 +46,7 @@ CONFIG_FAIR_USER_SCHED=y
46# CONFIG_RELAY is not set 46# CONFIG_RELAY is not set
47# CONFIG_BLK_DEV_INITRD is not set 47# CONFIG_BLK_DEV_INITRD is not set
48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
49CONFIG_SYSCTL=y 49# CONFIG_SYSCTL is not set
50CONFIG_EMBEDDED=y 50CONFIG_EMBEDDED=y
51# CONFIG_UID16 is not set 51# CONFIG_UID16 is not set
52CONFIG_SYSCTL_SYSCALL=y 52CONFIG_SYSCTL_SYSCALL=y
@@ -57,7 +57,7 @@ CONFIG_PRINTK=y
57CONFIG_BUG=y 57CONFIG_BUG=y
58# CONFIG_ELF_CORE is not set 58# CONFIG_ELF_CORE is not set
59CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 60# CONFIG_FUTEX is not set
61CONFIG_ANON_INODES=y 61CONFIG_ANON_INODES=y
62CONFIG_EPOLL=y 62CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y 63CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig
index bd553da15db8..dfc8e1ddd77a 100644
--- a/arch/blackfin/configs/H8606_defconfig
+++ b/arch/blackfin/configs/H8606_defconfig
@@ -45,7 +45,7 @@ CONFIG_SYSFS_DEPRECATED=y
45# CONFIG_RELAY is not set 45# CONFIG_RELAY is not set
46# CONFIG_BLK_DEV_INITRD is not set 46# CONFIG_BLK_DEV_INITRD is not set
47# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 47# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
48CONFIG_SYSCTL=y 48# CONFIG_SYSCTL is not set
49CONFIG_EMBEDDED=y 49CONFIG_EMBEDDED=y
50CONFIG_UID16=y 50CONFIG_UID16=y
51CONFIG_SYSCTL_SYSCALL=y 51CONFIG_SYSCTL_SYSCALL=y
@@ -56,7 +56,7 @@ CONFIG_PRINTK=y
56CONFIG_BUG=y 56CONFIG_BUG=y
57# CONFIG_ELF_CORE is not set 57# CONFIG_ELF_CORE is not set
58CONFIG_BASE_FULL=y 58CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 59# CONFIG_FUTEX is not set
60CONFIG_ANON_INODES=y 60CONFIG_ANON_INODES=y
61CONFIG_EPOLL=y 61CONFIG_EPOLL=y
62CONFIG_SIGNALFD=y 62CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig
index 7db93874c987..95a5f91aebaa 100644
--- a/arch/blackfin/configs/IP0X_defconfig
+++ b/arch/blackfin/configs/IP0X_defconfig
@@ -46,7 +46,7 @@ CONFIG_SYSFS_DEPRECATED=y
46CONFIG_BLK_DEV_INITRD=y 46CONFIG_BLK_DEV_INITRD=y
47CONFIG_INITRAMFS_SOURCE="" 47CONFIG_INITRAMFS_SOURCE=""
48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
49CONFIG_SYSCTL=y 49# CONFIG_SYSCTL is not set
50CONFIG_EMBEDDED=y 50CONFIG_EMBEDDED=y
51CONFIG_UID16=y 51CONFIG_UID16=y
52CONFIG_SYSCTL_SYSCALL=y 52CONFIG_SYSCTL_SYSCALL=y
@@ -57,7 +57,7 @@ CONFIG_PRINTK=y
57CONFIG_BUG=y 57CONFIG_BUG=y
58# CONFIG_ELF_CORE is not set 58# CONFIG_ELF_CORE is not set
59CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 60# CONFIG_FUTEX is not set
61CONFIG_ANON_INODES=y 61CONFIG_ANON_INODES=y
62CONFIG_EPOLL=y 62CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y 63CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index ad096702ac16..78e24080e7f1 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.28.7
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -35,13 +35,12 @@ CONFIG_SYSVIPC_SYSCTL=y
35CONFIG_LOG_BUF_SHIFT=14 35CONFIG_LOG_BUF_SHIFT=14
36# CONFIG_CGROUPS is not set 36# CONFIG_CGROUPS is not set
37# CONFIG_GROUP_SCHED is not set 37# CONFIG_GROUP_SCHED is not set
38# CONFIG_SYSFS_DEPRECATED is not set
39# CONFIG_SYSFS_DEPRECATED_V2 is not set 38# CONFIG_SYSFS_DEPRECATED_V2 is not set
40# CONFIG_RELAY is not set 39# CONFIG_RELAY is not set
41# CONFIG_NAMESPACES is not set 40# CONFIG_NAMESPACES is not set
42# CONFIG_BLK_DEV_INITRD is not set 41# CONFIG_BLK_DEV_INITRD is not set
43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 42# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
44CONFIG_SYSCTL=y 43# CONFIG_SYSCTL is not set
45CONFIG_EMBEDDED=y 44CONFIG_EMBEDDED=y
46CONFIG_UID16=y 45CONFIG_UID16=y
47CONFIG_SYSCTL_SYSCALL=y 46CONFIG_SYSCTL_SYSCALL=y
@@ -53,13 +52,13 @@ CONFIG_BUG=y
53# CONFIG_ELF_CORE is not set 52# CONFIG_ELF_CORE is not set
54CONFIG_COMPAT_BRK=y 53CONFIG_COMPAT_BRK=y
55CONFIG_BASE_FULL=y 54CONFIG_BASE_FULL=y
56CONFIG_FUTEX=y 55# CONFIG_FUTEX is not set
57CONFIG_ANON_INODES=y 56CONFIG_ANON_INODES=y
58CONFIG_EPOLL=y 57CONFIG_EPOLL=y
59CONFIG_SIGNALFD=y 58CONFIG_SIGNALFD=y
60CONFIG_TIMERFD=y 59CONFIG_TIMERFD=y
61CONFIG_EVENTFD=y 60CONFIG_EVENTFD=y
62CONFIG_AIO=y 61# CONFIG_AIO is not set
63CONFIG_VM_EVENT_COUNTERS=y 62CONFIG_VM_EVENT_COUNTERS=y
64CONFIG_SLAB=y 63CONFIG_SLAB=y
65# CONFIG_SLUB is not set 64# CONFIG_SLUB is not set
@@ -130,10 +129,15 @@ CONFIG_BF537=y
130# CONFIG_BF538 is not set 129# CONFIG_BF538 is not set
131# CONFIG_BF539 is not set 130# CONFIG_BF539 is not set
132# CONFIG_BF542 is not set 131# CONFIG_BF542 is not set
132# CONFIG_BF542M is not set
133# CONFIG_BF544 is not set 133# CONFIG_BF544 is not set
134# CONFIG_BF544M is not set
134# CONFIG_BF547 is not set 135# CONFIG_BF547 is not set
136# CONFIG_BF547M is not set
135# CONFIG_BF548 is not set 137# CONFIG_BF548 is not set
138# CONFIG_BF548M is not set
136# CONFIG_BF549 is not set 139# CONFIG_BF549 is not set
140# CONFIG_BF549M is not set
137# CONFIG_BF561 is not set 141# CONFIG_BF561 is not set
138CONFIG_BF_REV_MIN=2 142CONFIG_BF_REV_MIN=2
139CONFIG_BF_REV_MAX=3 143CONFIG_BF_REV_MAX=3
@@ -180,7 +184,6 @@ CONFIG_IRQ_SPI=10
180# CONFIG_BFIN537_BLUETECHNIX_TCM is not set 184# CONFIG_BFIN537_BLUETECHNIX_TCM is not set
181CONFIG_PNAV10=y 185CONFIG_PNAV10=y
182# CONFIG_CAMSIG_MINOTAUR is not set 186# CONFIG_CAMSIG_MINOTAUR is not set
183# CONFIG_GENERIC_BF537_BOARD is not set
184 187
185# 188#
186# BF537 Specific Configuration 189# BF537 Specific Configuration
@@ -341,7 +344,6 @@ CONFIG_BINFMT_ZFLAT=y
341# 344#
342# CONFIG_PM is not set 345# CONFIG_PM is not set
343CONFIG_ARCH_SUSPEND_POSSIBLE=y 346CONFIG_ARCH_SUSPEND_POSSIBLE=y
344# CONFIG_PM_WAKEUP_BY_GPIO is not set
345 347
346# 348#
347# CPU Frequency scaling 349# CPU Frequency scaling
@@ -538,7 +540,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
538# CONFIG_BLK_DEV_HD is not set 540# CONFIG_BLK_DEV_HD is not set
539CONFIG_MISC_DEVICES=y 541CONFIG_MISC_DEVICES=y
540# CONFIG_EEPROM_93CX6 is not set 542# CONFIG_EEPROM_93CX6 is not set
543# CONFIG_ICS932S401 is not set
541# CONFIG_ENCLOSURE_SERVICES is not set 544# CONFIG_ENCLOSURE_SERVICES is not set
545# CONFIG_C2PORT is not set
542CONFIG_HAVE_IDE=y 546CONFIG_HAVE_IDE=y
543# CONFIG_IDE is not set 547# CONFIG_IDE is not set
544 548
@@ -593,6 +597,7 @@ CONFIG_BFIN_MAC_RMII=y
593# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 597# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
594# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 598# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
595# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 599# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
600# CONFIG_B44 is not set
596CONFIG_NETDEV_1000=y 601CONFIG_NETDEV_1000=y
597# CONFIG_AX88180 is not set 602# CONFIG_AX88180 is not set
598CONFIG_NETDEV_10000=y 603CONFIG_NETDEV_10000=y
@@ -776,6 +781,7 @@ CONFIG_SPI_MASTER=y
776# 781#
777CONFIG_SPI_BFIN=y 782CONFIG_SPI_BFIN=y
778# CONFIG_SPI_BFIN_LOCK is not set 783# CONFIG_SPI_BFIN_LOCK is not set
784# CONFIG_SPI_BFIN_SPORT is not set
779# CONFIG_SPI_BITBANG is not set 785# CONFIG_SPI_BITBANG is not set
780 786
781# 787#
@@ -799,6 +805,7 @@ CONFIG_HWMON=y
799# CONFIG_SENSORS_ADM1029 is not set 805# CONFIG_SENSORS_ADM1029 is not set
800# CONFIG_SENSORS_ADM1031 is not set 806# CONFIG_SENSORS_ADM1031 is not set
801# CONFIG_SENSORS_ADM9240 is not set 807# CONFIG_SENSORS_ADM9240 is not set
808# CONFIG_SENSORS_ADT7462 is not set
802# CONFIG_SENSORS_ADT7470 is not set 809# CONFIG_SENSORS_ADT7470 is not set
803# CONFIG_SENSORS_ADT7473 is not set 810# CONFIG_SENSORS_ADT7473 is not set
804# CONFIG_SENSORS_ATXP1 is not set 811# CONFIG_SENSORS_ATXP1 is not set
@@ -845,6 +852,12 @@ CONFIG_HWMON=y
845# CONFIG_THERMAL is not set 852# CONFIG_THERMAL is not set
846# CONFIG_THERMAL_HWMON is not set 853# CONFIG_THERMAL_HWMON is not set
847# CONFIG_WATCHDOG is not set 854# CONFIG_WATCHDOG is not set
855CONFIG_SSB_POSSIBLE=y
856
857#
858# Sonics Silicon Backplane
859#
860# CONFIG_SSB is not set
848 861
849# 862#
850# Multifunction device drivers 863# Multifunction device drivers
@@ -853,8 +866,10 @@ CONFIG_HWMON=y
853# CONFIG_MFD_SM501 is not set 866# CONFIG_MFD_SM501 is not set
854# CONFIG_HTC_PASIC3 is not set 867# CONFIG_HTC_PASIC3 is not set
855# CONFIG_MFD_TMIO is not set 868# CONFIG_MFD_TMIO is not set
869# CONFIG_PMIC_DA903X is not set
856# CONFIG_MFD_WM8400 is not set 870# CONFIG_MFD_WM8400 is not set
857# CONFIG_MFD_WM8350_I2C is not set 871# CONFIG_MFD_WM8350_I2C is not set
872# CONFIG_REGULATOR is not set
858 873
859# 874#
860# Multimedia devices 875# Multimedia devices
@@ -910,6 +925,7 @@ CONFIG_FB_BFIN_LANDSCAPE=y
910# CONFIG_FB_S1D13XXX is not set 925# CONFIG_FB_S1D13XXX is not set
911# CONFIG_FB_VIRTUAL is not set 926# CONFIG_FB_VIRTUAL is not set
912# CONFIG_FB_METRONOME is not set 927# CONFIG_FB_METRONOME is not set
928# CONFIG_FB_MB862XX is not set
913CONFIG_BACKLIGHT_LCD_SUPPORT=y 929CONFIG_BACKLIGHT_LCD_SUPPORT=y
914CONFIG_LCD_CLASS_DEVICE=y 930CONFIG_LCD_CLASS_DEVICE=y
915# CONFIG_LCD_LTV350QV is not set 931# CONFIG_LCD_LTV350QV is not set
@@ -966,7 +982,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
966# 982#
967 983
968# 984#
969# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 985# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
970# 986#
971# CONFIG_USB_GADGET is not set 987# CONFIG_USB_GADGET is not set
972# CONFIG_MMC is not set 988# CONFIG_MMC is not set
@@ -1003,12 +1019,14 @@ CONFIG_RTC_INTF_DEV=y
1003# CONFIG_RTC_DRV_M41T80 is not set 1019# CONFIG_RTC_DRV_M41T80 is not set
1004# CONFIG_RTC_DRV_S35390A is not set 1020# CONFIG_RTC_DRV_S35390A is not set
1005# CONFIG_RTC_DRV_FM3130 is not set 1021# CONFIG_RTC_DRV_FM3130 is not set
1022# CONFIG_RTC_DRV_RX8581 is not set
1006 1023
1007# 1024#
1008# SPI RTC drivers 1025# SPI RTC drivers
1009# 1026#
1010# CONFIG_RTC_DRV_M41T94 is not set 1027# CONFIG_RTC_DRV_M41T94 is not set
1011# CONFIG_RTC_DRV_DS1305 is not set 1028# CONFIG_RTC_DRV_DS1305 is not set
1029# CONFIG_RTC_DRV_DS1390 is not set
1012# CONFIG_RTC_DRV_MAX6902 is not set 1030# CONFIG_RTC_DRV_MAX6902 is not set
1013# CONFIG_RTC_DRV_R9701 is not set 1031# CONFIG_RTC_DRV_R9701 is not set
1014# CONFIG_RTC_DRV_RS5C348 is not set 1032# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1196,6 +1214,10 @@ CONFIG_FRAME_WARN=1024
1196# CONFIG_DEBUG_MEMORY_INIT is not set 1214# CONFIG_DEBUG_MEMORY_INIT is not set
1197# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1215# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1198# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1216# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1217
1218#
1219# Tracers
1220#
1199# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1221# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1200# CONFIG_SAMPLES is not set 1222# CONFIG_SAMPLES is not set
1201CONFIG_HAVE_ARCH_KGDB=y 1223CONFIG_HAVE_ARCH_KGDB=y
@@ -1230,6 +1252,7 @@ CONFIG_CRYPTO=y
1230# 1252#
1231# CONFIG_CRYPTO_FIPS is not set 1253# CONFIG_CRYPTO_FIPS is not set
1232# CONFIG_CRYPTO_MANAGER is not set 1254# CONFIG_CRYPTO_MANAGER is not set
1255# CONFIG_CRYPTO_MANAGER2 is not set
1233# CONFIG_CRYPTO_GF128MUL is not set 1256# CONFIG_CRYPTO_GF128MUL is not set
1234# CONFIG_CRYPTO_NULL is not set 1257# CONFIG_CRYPTO_NULL is not set
1235# CONFIG_CRYPTO_CRYPTD is not set 1258# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig
index a46529c6ade3..2bc0779d22ea 100644
--- a/arch/blackfin/configs/SRV1_defconfig
+++ b/arch/blackfin/configs/SRV1_defconfig
@@ -49,7 +49,7 @@ CONFIG_SYSFS_DEPRECATED=y
49CONFIG_BLK_DEV_INITRD=y 49CONFIG_BLK_DEV_INITRD=y
50CONFIG_INITRAMFS_SOURCE="" 50CONFIG_INITRAMFS_SOURCE=""
51# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 51# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
52CONFIG_SYSCTL=y 52# CONFIG_SYSCTL is not set
53CONFIG_EMBEDDED=y 53CONFIG_EMBEDDED=y
54CONFIG_UID16=y 54CONFIG_UID16=y
55CONFIG_SYSCTL_SYSCALL=y 55CONFIG_SYSCTL_SYSCALL=y
@@ -61,7 +61,7 @@ CONFIG_PRINTK=y
61CONFIG_BUG=y 61CONFIG_BUG=y
62# CONFIG_ELF_CORE is not set 62# CONFIG_ELF_CORE is not set
63CONFIG_BASE_FULL=y 63CONFIG_BASE_FULL=y
64CONFIG_FUTEX=y 64# CONFIG_FUTEX is not set
65CONFIG_ANON_INODES=y 65CONFIG_ANON_INODES=y
66CONFIG_EPOLL=y 66CONFIG_EPOLL=y
67CONFIG_SIGNALFD=y 67CONFIG_SIGNALFD=y
diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig
index 97a1f1d20dcf..e65b3a49214f 100644
--- a/arch/blackfin/configs/TCM-BF537_defconfig
+++ b/arch/blackfin/configs/TCM-BF537_defconfig
@@ -39,7 +39,7 @@ CONFIG_LOG_BUF_SHIFT=14
39# CONFIG_NAMESPACES is not set 39# CONFIG_NAMESPACES is not set
40# CONFIG_BLK_DEV_INITRD is not set 40# CONFIG_BLK_DEV_INITRD is not set
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42CONFIG_SYSCTL=y 42# CONFIG_SYSCTL is not set
43CONFIG_EMBEDDED=y 43CONFIG_EMBEDDED=y
44# CONFIG_UID16 is not set 44# CONFIG_UID16 is not set
45CONFIG_SYSCTL_SYSCALL=y 45CONFIG_SYSCTL_SYSCALL=y
@@ -51,13 +51,13 @@ CONFIG_BUG=y
51# CONFIG_ELF_CORE is not set 51# CONFIG_ELF_CORE is not set
52CONFIG_COMPAT_BRK=y 52CONFIG_COMPAT_BRK=y
53CONFIG_BASE_FULL=y 53CONFIG_BASE_FULL=y
54CONFIG_FUTEX=y 54# CONFIG_FUTEX is not set
55CONFIG_ANON_INODES=y 55CONFIG_ANON_INODES=y
56CONFIG_EPOLL=y 56CONFIG_EPOLL=y
57CONFIG_SIGNALFD=y 57CONFIG_SIGNALFD=y
58CONFIG_TIMERFD=y 58CONFIG_TIMERFD=y
59CONFIG_EVENTFD=y 59CONFIG_EVENTFD=y
60CONFIG_AIO=y 60# CONFIG_AIO is not set
61CONFIG_VM_EVENT_COUNTERS=y 61CONFIG_VM_EVENT_COUNTERS=y
62CONFIG_SLAB=y 62CONFIG_SLAB=y
63# CONFIG_SLUB is not set 63# CONFIG_SLUB is not set
diff --git a/arch/blackfin/include/asm/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h
index 1306e6b22946..0292d58f9362 100644
--- a/arch/blackfin/include/asm/bfin5xx_spi.h
+++ b/arch/blackfin/include/asm/bfin5xx_spi.h
@@ -110,7 +110,7 @@
110struct bfin5xx_spi_master { 110struct bfin5xx_spi_master {
111 u16 num_chipselect; 111 u16 num_chipselect;
112 u8 enable_dma; 112 u8 enable_dma;
113 u16 pin_req[4]; 113 u16 pin_req[7];
114}; 114};
115 115
116/* spi_board_info.controller_data for SPI slave devices, 116/* spi_board_info.controller_data for SPI slave devices,
diff --git a/arch/blackfin/include/asm/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h
index 65a651db5b07..b558908e1c79 100644
--- a/arch/blackfin/include/asm/bfin_sport.h
+++ b/arch/blackfin/include/asm/bfin_sport.h
@@ -9,6 +9,13 @@
9#ifndef __BFIN_SPORT_H__ 9#ifndef __BFIN_SPORT_H__
10#define __BFIN_SPORT_H__ 10#define __BFIN_SPORT_H__
11 11
12#ifdef __KERNEL__
13#include <linux/cdev.h>
14#include <linux/mutex.h>
15#include <linux/sched.h>
16#include <linux/wait.h>
17#endif
18
12#define SPORT_MAJOR 237 19#define SPORT_MAJOR 237
13#define SPORT_NR_DEVS 2 20#define SPORT_NR_DEVS 2
14 21
@@ -119,7 +126,7 @@ struct sport_dev {
119 int tx_len; 126 int tx_len;
120 int tx_sent; 127 int tx_sent;
121 128
122 int sport_err_irq; 129 int err_irq;
123 130
124 struct mutex mutex; /* mutual exclusion semaphore */ 131 struct mutex mutex; /* mutual exclusion semaphore */
125 struct task_struct *task; 132 struct task_struct *task;
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h
index d4a082ef75b4..fe139619351f 100644
--- a/arch/blackfin/include/asm/gpio.h
+++ b/arch/blackfin/include/asm/gpio.h
@@ -110,7 +110,7 @@
110* MODIFICATION HISTORY : 110* MODIFICATION HISTORY :
111**************************************************************/ 111**************************************************************/
112 112
113#ifndef BF548_FAMILY 113#ifndef CONFIG_BF54x
114void set_gpio_dir(unsigned, unsigned short); 114void set_gpio_dir(unsigned, unsigned short);
115void set_gpio_inen(unsigned, unsigned short); 115void set_gpio_inen(unsigned, unsigned short);
116void set_gpio_polar(unsigned, unsigned short); 116void set_gpio_polar(unsigned, unsigned short);
@@ -303,7 +303,10 @@ static inline void gpio_set_value(unsigned gpio, int value)
303 303
304static inline int gpio_to_irq(unsigned gpio) 304static inline int gpio_to_irq(unsigned gpio)
305{ 305{
306 return (gpio + GPIO_IRQ_BASE); 306 if (likely(gpio < MAX_BLACKFIN_GPIOS))
307 return gpio + GPIO_IRQ_BASE;
308
309 return -EINVAL;
307} 310}
308 311
309static inline int irq_to_gpio(unsigned irq) 312static inline int irq_to_gpio(unsigned irq)
diff --git a/arch/blackfin/include/asm/gptimers.h b/arch/blackfin/include/asm/gptimers.h
index 0520d2aac8f3..b0f847ae4bf4 100644
--- a/arch/blackfin/include/asm/gptimers.h
+++ b/arch/blackfin/include/asm/gptimers.h
@@ -15,16 +15,16 @@
15#include <asm/blackfin.h> 15#include <asm/blackfin.h>
16 16
17/* 17/*
18 * BF537/BF527: 8 timers: 18 * BF51x/BF52x/BF537: 8 timers:
19 */ 19 */
20#if defined(BF527_FAMILY) || defined(BF537_FAMILY) 20#if defined(CONFIG_BF51x) || defined(CONFIG_BF52x) || defined(BF537_FAMILY)
21# define MAX_BLACKFIN_GPTIMERS 8 21# define MAX_BLACKFIN_GPTIMERS 8
22# define TIMER0_GROUP_REG TIMER_ENABLE 22# define TIMER0_GROUP_REG TIMER_ENABLE
23#endif 23#endif
24/* 24/*
25 * BF54x: 11 timers (BF542: 8 timers): 25 * BF54x: 11 timers (BF542: 8 timers):
26 */ 26 */
27#if defined(BF548_FAMILY) 27#if defined(CONFIG_BF54x)
28# ifdef CONFIG_BF542 28# ifdef CONFIG_BF542
29# define MAX_BLACKFIN_GPTIMERS 8 29# define MAX_BLACKFIN_GPTIMERS 8
30# else 30# else
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 51dac55c524a..a0678da40532 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -69,7 +69,7 @@ enum {
69static struct gpio_port_t * const gpio_array[] = { 69static struct gpio_port_t * const gpio_array[] = {
70#if defined(BF533_FAMILY) || defined(BF538_FAMILY) 70#if defined(BF533_FAMILY) || defined(BF538_FAMILY)
71 (struct gpio_port_t *) FIO_FLAG_D, 71 (struct gpio_port_t *) FIO_FLAG_D,
72#elif defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 72#elif defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
73 (struct gpio_port_t *) PORTFIO, 73 (struct gpio_port_t *) PORTFIO,
74 (struct gpio_port_t *) PORTGIO, 74 (struct gpio_port_t *) PORTGIO,
75 (struct gpio_port_t *) PORTHIO, 75 (struct gpio_port_t *) PORTHIO,
@@ -77,7 +77,7 @@ static struct gpio_port_t * const gpio_array[] = {
77 (struct gpio_port_t *) FIO0_FLAG_D, 77 (struct gpio_port_t *) FIO0_FLAG_D,
78 (struct gpio_port_t *) FIO1_FLAG_D, 78 (struct gpio_port_t *) FIO1_FLAG_D,
79 (struct gpio_port_t *) FIO2_FLAG_D, 79 (struct gpio_port_t *) FIO2_FLAG_D,
80#elif defined(BF548_FAMILY) 80#elif defined(CONFIG_BF54x)
81 (struct gpio_port_t *)PORTA_FER, 81 (struct gpio_port_t *)PORTA_FER,
82 (struct gpio_port_t *)PORTB_FER, 82 (struct gpio_port_t *)PORTB_FER,
83 (struct gpio_port_t *)PORTC_FER, 83 (struct gpio_port_t *)PORTC_FER,
@@ -93,7 +93,7 @@ static struct gpio_port_t * const gpio_array[] = {
93#endif 93#endif
94}; 94};
95 95
96#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 96#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
97static unsigned short * const port_fer[] = { 97static unsigned short * const port_fer[] = {
98 (unsigned short *) PORTF_FER, 98 (unsigned short *) PORTF_FER,
99 (unsigned short *) PORTG_FER, 99 (unsigned short *) PORTG_FER,
@@ -109,11 +109,11 @@ static unsigned short * const port_mux[] = {
109 109
110static const 110static const
111u8 pmux_offset[][16] = { 111u8 pmux_offset[][16] = {
112# if defined(BF527_FAMILY) 112# if defined(CONFIG_BF52x)
113 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */ 113 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */
114 { 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */ 114 { 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */
115 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */ 115 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */
116# elif defined(BF518_FAMILY) 116# elif defined(CONFIG_BF51x)
117 { 0, 2, 2, 2, 2, 2, 2, 4, 6, 6, 6, 8, 8, 8, 8, 10 }, /* PORTF */ 117 { 0, 2, 2, 2, 2, 2, 2, 4, 6, 6, 6, 8, 8, 8, 8, 10 }, /* PORTF */
118 { 0, 0, 0, 2, 4, 6, 6, 6, 8, 10, 10, 12, 14, 14, 14, 14 }, /* PORTG */ 118 { 0, 0, 0, 2, 4, 6, 6, 6, 8, 10, 10, 12, 14, 14, 14, 14 }, /* PORTG */
119 { 0, 0, 0, 0, 2, 2, 4, 6, 10, 10, 10, 10, 10, 10, 10, 10 }, /* PORTH */ 119 { 0, 0, 0, 0, 2, 2, 4, 6, 10, 10, 10, 10, 10, 10, 10, 10 }, /* PORTH */
@@ -139,7 +139,7 @@ static struct gpio_port_s gpio_bank_saved[GPIO_BANK_NUM];
139 139
140inline int check_gpio(unsigned gpio) 140inline int check_gpio(unsigned gpio)
141{ 141{
142#if defined(BF548_FAMILY) 142#if defined(CONFIG_BF54x)
143 if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 143 if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
144 || gpio == GPIO_PH14 || gpio == GPIO_PH15 144 || gpio == GPIO_PH14 || gpio == GPIO_PH15
145 || gpio == GPIO_PJ14 || gpio == GPIO_PJ15) 145 || gpio == GPIO_PJ14 || gpio == GPIO_PJ15)
@@ -187,13 +187,13 @@ static void port_setup(unsigned gpio, unsigned short usage)
187 if (check_gpio(gpio)) 187 if (check_gpio(gpio))
188 return; 188 return;
189 189
190#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 190#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
191 if (usage == GPIO_USAGE) 191 if (usage == GPIO_USAGE)
192 *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio); 192 *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio);
193 else 193 else
194 *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio); 194 *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio);
195 SSYNC(); 195 SSYNC();
196#elif defined(BF548_FAMILY) 196#elif defined(CONFIG_BF54x)
197 if (usage == GPIO_USAGE) 197 if (usage == GPIO_USAGE)
198 gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio); 198 gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
199 else 199 else
@@ -273,7 +273,7 @@ static void portmux_setup(unsigned short per)
273 } 273 }
274 } 274 }
275} 275}
276#elif defined(BF548_FAMILY) 276#elif defined(CONFIG_BF54x)
277inline void portmux_setup(unsigned short per) 277inline void portmux_setup(unsigned short per)
278{ 278{
279 u32 pmux; 279 u32 pmux;
@@ -297,7 +297,7 @@ inline u16 get_portmux(unsigned short per)
297 297
298 return (pmux >> (2 * gpio_sub_n(ident)) & 0x3); 298 return (pmux >> (2 * gpio_sub_n(ident)) & 0x3);
299} 299}
300#elif defined(BF527_FAMILY) || defined(BF518_FAMILY) 300#elif defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
301inline void portmux_setup(unsigned short per) 301inline void portmux_setup(unsigned short per)
302{ 302{
303 u16 pmux, ident = P_IDENT(per), function = P_FUNCT2MUX(per); 303 u16 pmux, ident = P_IDENT(per), function = P_FUNCT2MUX(per);
@@ -322,7 +322,7 @@ static int __init bfin_gpio_init(void)
322arch_initcall(bfin_gpio_init); 322arch_initcall(bfin_gpio_init);
323 323
324 324
325#ifndef BF548_FAMILY 325#ifndef CONFIG_BF54x
326/*********************************************************** 326/***********************************************************
327* 327*
328* FUNCTIONS: Blackfin General Purpose Ports Access Functions 328* FUNCTIONS: Blackfin General Purpose Ports Access Functions
@@ -489,7 +489,7 @@ static const unsigned int sic_iwr_irqs[] = {
489 IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX 489 IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX
490#elif defined(BF538_FAMILY) 490#elif defined(BF538_FAMILY)
491 IRQ_PORTF_INTB 491 IRQ_PORTF_INTB
492#elif defined(BF527_FAMILY) || defined(BF518_FAMILY) 492#elif defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
493 IRQ_PORTF_INTB, IRQ_PORTG_INTB, IRQ_PORTH_INTB 493 IRQ_PORTF_INTB, IRQ_PORTG_INTB, IRQ_PORTH_INTB
494#elif defined(BF561_FAMILY) 494#elif defined(BF561_FAMILY)
495 IRQ_PROG0_INTB, IRQ_PROG1_INTB, IRQ_PROG2_INTB 495 IRQ_PROG0_INTB, IRQ_PROG1_INTB, IRQ_PROG2_INTB
@@ -586,7 +586,7 @@ u32 bfin_pm_standby_setup(void)
586 gpio_array[bank]->maskb = 0; 586 gpio_array[bank]->maskb = 0;
587 587
588 if (mask) { 588 if (mask) {
589#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 589#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
590 gpio_bank_saved[bank].fer = *port_fer[bank]; 590 gpio_bank_saved[bank].fer = *port_fer[bank];
591#endif 591#endif
592 gpio_bank_saved[bank].inen = gpio_array[bank]->inen; 592 gpio_bank_saved[bank].inen = gpio_array[bank]->inen;
@@ -631,7 +631,7 @@ void bfin_pm_standby_restore(void)
631 bank = gpio_bank(i); 631 bank = gpio_bank(i);
632 632
633 if (mask) { 633 if (mask) {
634#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 634#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
635 *port_fer[bank] = gpio_bank_saved[bank].fer; 635 *port_fer[bank] = gpio_bank_saved[bank].fer;
636#endif 636#endif
637 gpio_array[bank]->inen = gpio_bank_saved[bank].inen; 637 gpio_array[bank]->inen = gpio_bank_saved[bank].inen;
@@ -657,9 +657,9 @@ void bfin_gpio_pm_hibernate_suspend(void)
657 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { 657 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
658 bank = gpio_bank(i); 658 bank = gpio_bank(i);
659 659
660#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 660#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
661 gpio_bank_saved[bank].fer = *port_fer[bank]; 661 gpio_bank_saved[bank].fer = *port_fer[bank];
662#if defined(BF527_FAMILY) || defined(BF518_FAMILY) 662#if defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
663 gpio_bank_saved[bank].mux = *port_mux[bank]; 663 gpio_bank_saved[bank].mux = *port_mux[bank];
664#else 664#else
665 if (bank == 0) 665 if (bank == 0)
@@ -685,8 +685,8 @@ void bfin_gpio_pm_hibernate_restore(void)
685 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { 685 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
686 bank = gpio_bank(i); 686 bank = gpio_bank(i);
687 687
688#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 688#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
689#if defined(BF527_FAMILY) || defined(BF518_FAMILY) 689#if defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
690 *port_mux[bank] = gpio_bank_saved[bank].mux; 690 *port_mux[bank] = gpio_bank_saved[bank].mux;
691#else 691#else
692 if (bank == 0) 692 if (bank == 0)
@@ -710,7 +710,7 @@ void bfin_gpio_pm_hibernate_restore(void)
710 710
711 711
712#endif 712#endif
713#else /* BF548_FAMILY */ 713#else /* CONFIG_BF54x */
714#ifdef CONFIG_PM 714#ifdef CONFIG_PM
715 715
716u32 bfin_pm_standby_setup(void) 716u32 bfin_pm_standby_setup(void)
@@ -762,7 +762,7 @@ unsigned short get_gpio_dir(unsigned gpio)
762} 762}
763EXPORT_SYMBOL(get_gpio_dir); 763EXPORT_SYMBOL(get_gpio_dir);
764 764
765#endif /* BF548_FAMILY */ 765#endif /* CONFIG_BF54x */
766 766
767/*********************************************************** 767/***********************************************************
768* 768*
@@ -802,7 +802,8 @@ int peripheral_request(unsigned short per, const char *label)
802 */ 802 */
803 if (unlikely(!check_gpio(ident) && 803 if (unlikely(!check_gpio(ident) &&
804 reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) { 804 reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
805 dump_stack(); 805 if (system_state == SYSTEM_BOOTING)
806 dump_stack();
806 printk(KERN_ERR 807 printk(KERN_ERR
807 "%s: Peripheral %d is already reserved as GPIO by %s !\n", 808 "%s: Peripheral %d is already reserved as GPIO by %s !\n",
808 __func__, ident, get_label(ident)); 809 __func__, ident, get_label(ident));
@@ -817,7 +818,7 @@ int peripheral_request(unsigned short per, const char *label)
817 * be requested and used by several drivers 818 * be requested and used by several drivers
818 */ 819 */
819 820
820#ifdef BF548_FAMILY 821#ifdef CONFIG_BF54x
821 if (!((per & P_MAYSHARE) && get_portmux(per) == P_FUNCT2MUX(per))) { 822 if (!((per & P_MAYSHARE) && get_portmux(per) == P_FUNCT2MUX(per))) {
822#else 823#else
823 if (!(per & P_MAYSHARE)) { 824 if (!(per & P_MAYSHARE)) {
@@ -830,7 +831,8 @@ int peripheral_request(unsigned short per, const char *label)
830 if (cmp_label(ident, label) == 0) 831 if (cmp_label(ident, label) == 0)
831 goto anyway; 832 goto anyway;
832 833
833 dump_stack(); 834 if (system_state == SYSTEM_BOOTING)
835 dump_stack();
834 printk(KERN_ERR 836 printk(KERN_ERR
835 "%s: Peripheral %d function %d is already reserved by %s !\n", 837 "%s: Peripheral %d function %d is already reserved by %s !\n",
836 __func__, ident, P_FUNCT2MUX(per), get_label(ident)); 838 __func__, ident, P_FUNCT2MUX(per), get_label(ident));
@@ -946,14 +948,16 @@ int bfin_gpio_request(unsigned gpio, const char *label)
946 } 948 }
947 949
948 if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) { 950 if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
949 dump_stack(); 951 if (system_state == SYSTEM_BOOTING)
952 dump_stack();
950 printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n", 953 printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n",
951 gpio, get_label(gpio)); 954 gpio, get_label(gpio));
952 local_irq_restore_hw(flags); 955 local_irq_restore_hw(flags);
953 return -EBUSY; 956 return -EBUSY;
954 } 957 }
955 if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) { 958 if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
956 dump_stack(); 959 if (system_state == SYSTEM_BOOTING)
960 dump_stack();
957 printk(KERN_ERR 961 printk(KERN_ERR
958 "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n", 962 "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
959 gpio, get_label(gpio)); 963 gpio, get_label(gpio));
@@ -964,7 +968,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
964 printk(KERN_NOTICE "bfin-gpio: GPIO %d is already reserved as gpio-irq!" 968 printk(KERN_NOTICE "bfin-gpio: GPIO %d is already reserved as gpio-irq!"
965 " (Documentation/blackfin/bfin-gpio-notes.txt)\n", gpio); 969 " (Documentation/blackfin/bfin-gpio-notes.txt)\n", gpio);
966 } 970 }
967#ifndef BF548_FAMILY 971#ifndef CONFIG_BF54x
968 else { /* Reset POLAR setting when acquiring a gpio for the first time */ 972 else { /* Reset POLAR setting when acquiring a gpio for the first time */
969 set_gpio_polar(gpio, 0); 973 set_gpio_polar(gpio, 0);
970 } 974 }
@@ -993,7 +997,8 @@ void bfin_gpio_free(unsigned gpio)
993 local_irq_save_hw(flags); 997 local_irq_save_hw(flags);
994 998
995 if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) { 999 if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
996 dump_stack(); 1000 if (system_state == SYSTEM_BOOTING)
1001 dump_stack();
997 gpio_error(gpio); 1002 gpio_error(gpio);
998 local_irq_restore_hw(flags); 1003 local_irq_restore_hw(flags);
999 return; 1004 return;
@@ -1017,7 +1022,8 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
1017 local_irq_save_hw(flags); 1022 local_irq_save_hw(flags);
1018 1023
1019 if (unlikely(reserved_gpio_irq_map[gpio_bank(gpio)] & gpio_bit(gpio))) { 1024 if (unlikely(reserved_gpio_irq_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
1020 dump_stack(); 1025 if (system_state == SYSTEM_BOOTING)
1026 dump_stack();
1021 printk(KERN_ERR 1027 printk(KERN_ERR
1022 "bfin-gpio: GPIO %d is already reserved as gpio-irq !\n", 1028 "bfin-gpio: GPIO %d is already reserved as gpio-irq !\n",
1023 gpio); 1029 gpio);
@@ -1025,7 +1031,8 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
1025 return -EBUSY; 1031 return -EBUSY;
1026 } 1032 }
1027 if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) { 1033 if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
1028 dump_stack(); 1034 if (system_state == SYSTEM_BOOTING)
1035 dump_stack();
1029 printk(KERN_ERR 1036 printk(KERN_ERR
1030 "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n", 1037 "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
1031 gpio, get_label(gpio)); 1038 gpio, get_label(gpio));
@@ -1057,7 +1064,8 @@ void bfin_gpio_irq_free(unsigned gpio)
1057 local_irq_save_hw(flags); 1064 local_irq_save_hw(flags);
1058 1065
1059 if (unlikely(!(reserved_gpio_irq_map[gpio_bank(gpio)] & gpio_bit(gpio)))) { 1066 if (unlikely(!(reserved_gpio_irq_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
1060 dump_stack(); 1067 if (system_state == SYSTEM_BOOTING)
1068 dump_stack();
1061 gpio_error(gpio); 1069 gpio_error(gpio);
1062 local_irq_restore_hw(flags); 1070 local_irq_restore_hw(flags);
1063 return; 1071 return;
@@ -1072,7 +1080,7 @@ void bfin_gpio_irq_free(unsigned gpio)
1072 1080
1073static inline void __bfin_gpio_direction_input(unsigned gpio) 1081static inline void __bfin_gpio_direction_input(unsigned gpio)
1074{ 1082{
1075#ifdef BF548_FAMILY 1083#ifdef CONFIG_BF54x
1076 gpio_array[gpio_bank(gpio)]->dir_clear = gpio_bit(gpio); 1084 gpio_array[gpio_bank(gpio)]->dir_clear = gpio_bit(gpio);
1077#else 1085#else
1078 gpio_array[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio); 1086 gpio_array[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio);
@@ -1100,13 +1108,13 @@ EXPORT_SYMBOL(bfin_gpio_direction_input);
1100 1108
1101void bfin_gpio_irq_prepare(unsigned gpio) 1109void bfin_gpio_irq_prepare(unsigned gpio)
1102{ 1110{
1103#ifdef BF548_FAMILY 1111#ifdef CONFIG_BF54x
1104 unsigned long flags; 1112 unsigned long flags;
1105#endif 1113#endif
1106 1114
1107 port_setup(gpio, GPIO_USAGE); 1115 port_setup(gpio, GPIO_USAGE);
1108 1116
1109#ifdef BF548_FAMILY 1117#ifdef CONFIG_BF54x
1110 local_irq_save_hw(flags); 1118 local_irq_save_hw(flags);
1111 __bfin_gpio_direction_input(gpio); 1119 __bfin_gpio_direction_input(gpio);
1112 local_irq_restore_hw(flags); 1120 local_irq_restore_hw(flags);
@@ -1135,7 +1143,7 @@ int bfin_gpio_direction_output(unsigned gpio, int value)
1135 1143
1136 gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio); 1144 gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
1137 gpio_set_value(gpio, value); 1145 gpio_set_value(gpio, value);
1138#ifdef BF548_FAMILY 1146#ifdef CONFIG_BF54x
1139 gpio_array[gpio_bank(gpio)]->dir_set = gpio_bit(gpio); 1147 gpio_array[gpio_bank(gpio)]->dir_set = gpio_bit(gpio);
1140#else 1148#else
1141 gpio_array[gpio_bank(gpio)]->dir |= gpio_bit(gpio); 1149 gpio_array[gpio_bank(gpio)]->dir |= gpio_bit(gpio);
@@ -1150,7 +1158,7 @@ EXPORT_SYMBOL(bfin_gpio_direction_output);
1150 1158
1151int bfin_gpio_get_value(unsigned gpio) 1159int bfin_gpio_get_value(unsigned gpio)
1152{ 1160{
1153#ifdef BF548_FAMILY 1161#ifdef CONFIG_BF54x
1154 return (1 & (gpio_array[gpio_bank(gpio)]->data >> gpio_sub_n(gpio))); 1162 return (1 & (gpio_array[gpio_bank(gpio)]->data >> gpio_sub_n(gpio)));
1155#else 1163#else
1156 unsigned long flags; 1164 unsigned long flags;
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index 4b4341da0585..27952ae047d8 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -183,6 +183,7 @@ SECTIONS
183 . = ALIGN(4); 183 . = ALIGN(4);
184 __etext_l1 = .; 184 __etext_l1 = .;
185 } 185 }
186 ASSERT (SIZEOF(.text_l1) <= L1_CODE_LENGTH, "L1 text overflow!")
186 187
187 .data_l1 L1_DATA_A_START : AT(LOADADDR(.text_l1) + SIZEOF(.text_l1)) 188 .data_l1 L1_DATA_A_START : AT(LOADADDR(.text_l1) + SIZEOF(.text_l1))
188 { 189 {
@@ -200,6 +201,7 @@ SECTIONS
200 . = ALIGN(4); 201 . = ALIGN(4);
201 __ebss_l1 = .; 202 __ebss_l1 = .;
202 } 203 }
204 ASSERT (SIZEOF(.data_a_l1) <= L1_DATA_A_LENGTH, "L1 data A overflow!")
203 205
204 .data_b_l1 L1_DATA_B_START : AT(LOADADDR(.data_l1) + SIZEOF(.data_l1)) 206 .data_b_l1 L1_DATA_B_START : AT(LOADADDR(.data_l1) + SIZEOF(.data_l1))
205 { 207 {
@@ -214,6 +216,7 @@ SECTIONS
214 . = ALIGN(4); 216 . = ALIGN(4);
215 __ebss_b_l1 = .; 217 __ebss_b_l1 = .;
216 } 218 }
219 ASSERT (SIZEOF(.data_b_l1) <= L1_DATA_B_LENGTH, "L1 data B overflow!")
217 220
218 __l2_lma_start = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1); 221 __l2_lma_start = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
219 222
@@ -239,6 +242,7 @@ SECTIONS
239 . = ALIGN(4); 242 . = ALIGN(4);
240 __ebss_l2 = .; 243 __ebss_l2 = .;
241 } 244 }
245 ASSERT (SIZEOF(.text_data_l1) <= L2_LENGTH, "L2 overflow!")
242 246
243 /* Force trailing alignment of our init section so that when we 247 /* Force trailing alignment of our init section so that when we
244 * free our init memory, we don't leave behind a partial page. 248 * free our init memory, we don't leave behind a partial page.
diff --git a/arch/blackfin/mach-bf518/include/mach/blackfin.h b/arch/blackfin/mach-bf518/include/mach/blackfin.h
index d1a2b9ca6227..267bb7c8bfb5 100644
--- a/arch/blackfin/mach-bf518/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf518/include/mach/blackfin.h
@@ -32,8 +32,6 @@
32#ifndef _MACH_BLACKFIN_H_ 32#ifndef _MACH_BLACKFIN_H_
33#define _MACH_BLACKFIN_H_ 33#define _MACH_BLACKFIN_H_
34 34
35#define BF518_FAMILY
36
37#include "bf518.h" 35#include "bf518.h"
38#include "mem_map.h" 36#include "mem_map.h"
39#include "defBF512.h" 37#include "defBF512.h"
diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF514.h b/arch/blackfin/mach-bf518/include/mach/cdefBF514.h
index 9521e178fb28..dfe492dfe54e 100644
--- a/arch/blackfin/mach-bf518/include/mach/cdefBF514.h
+++ b/arch/blackfin/mach-bf518/include/mach/cdefBF514.h
@@ -45,4 +45,71 @@
45 45
46/* The following are the #defines needed by ADSP-BF514 that are not in the common header */ 46/* The following are the #defines needed by ADSP-BF514 that are not in the common header */
47 47
48/* Removable Storage Interface Registers */
49
50#define bfin_read_RSI_PWR_CTL() bfin_read16(RSI_PWR_CONTROL)
51#define bfin_write_RSI_PWR_CTL(val) bfin_write16(RSI_PWR_CONTROL, val)
52#define bfin_read_RSI_CLK_CTL() bfin_read16(RSI_CLK_CONTROL)
53#define bfin_write_RSI_CLK_CTL(val) bfin_write16(RSI_CLK_CONTROL, val)
54#define bfin_read_RSI_ARGUMENT() bfin_read32(RSI_ARGUMENT)
55#define bfin_write_RSI_ARGUMENT(val) bfin_write32(RSI_ARGUMENT, val)
56#define bfin_read_RSI_COMMAND() bfin_read16(RSI_COMMAND)
57#define bfin_write_RSI_COMMAND(val) bfin_write16(RSI_COMMAND, val)
58#define bfin_read_RSI_RESP_CMD() bfin_read16(RSI_RESP_CMD)
59#define bfin_write_RSI_RESP_CMD(val) bfin_write16(RSI_RESP_CMD, val)
60#define bfin_read_RSI_RESPONSE0() bfin_read32(RSI_RESPONSE0)
61#define bfin_write_RSI_RESPONSE0(val) bfin_write32(RSI_RESPONSE0, val)
62#define bfin_read_RSI_RESPONSE1() bfin_read32(RSI_RESPONSE1)
63#define bfin_write_RSI_RESPONSE1(val) bfin_write32(RSI_RESPONSE1, val)
64#define bfin_read_RSI_RESPONSE2() bfin_read32(RSI_RESPONSE2)
65#define bfin_write_RSI_RESPONSE2(val) bfin_write32(RSI_RESPONSE2, val)
66#define bfin_read_RSI_RESPONSE3() bfin_read32(RSI_RESPONSE3)
67#define bfin_write_RSI_RESPONSE3(val) bfin_write32(RSI_RESPONSE3, val)
68#define bfin_read_RSI_DATA_TIMER() bfin_read32(RSI_DATA_TIMER)
69#define bfin_write_RSI_DATA_TIMER(val) bfin_write32(RSI_DATA_TIMER, val)
70#define bfin_read_RSI_DATA_LGTH() bfin_read16(RSI_DATA_LGTH)
71#define bfin_write_RSI_DATA_LGTH(val) bfin_write16(RSI_DATA_LGTH, val)
72#define bfin_read_RSI_DATA_CTL() bfin_read16(RSI_DATA_CONTROL)
73#define bfin_write_RSI_DATA_CTL(val) bfin_write16(RSI_DATA_CONTROL, val)
74#define bfin_read_RSI_DATA_CNT() bfin_read16(RSI_DATA_CNT)
75#define bfin_write_RSI_DATA_CNT(val) bfin_write16(RSI_DATA_CNT, val)
76#define bfin_read_RSI_STATUS() bfin_read32(RSI_STATUS)
77#define bfin_write_RSI_STATUS(val) bfin_write32(RSI_STATUS, val)
78#define bfin_read_RSI_STATUS_CLR() bfin_read16(RSI_STATUSCL)
79#define bfin_write_RSI_STATUS_CLR(val) bfin_write16(RSI_STATUSCL, val)
80#define bfin_read_RSI_MASK0() bfin_read32(RSI_MASK0)
81#define bfin_write_RSI_MASK0(val) bfin_write32(RSI_MASK0, val)
82#define bfin_read_RSI_MASK1() bfin_read32(RSI_MASK1)
83#define bfin_write_RSI_MASK1(val) bfin_write32(RSI_MASK1, val)
84#define bfin_read_RSI_FIFO_CNT() bfin_read16(RSI_FIFO_CNT)
85#define bfin_write_RSI_FIFO_CNT(val) bfin_write16(RSI_FIFO_CNT, val)
86#define bfin_read_RSI_CEATA_CTL() bfin_read16(RSI_CEATA_CONTROL)
87#define bfin_write_RSI_CEATA_CTL(val) bfin_write16(RSI_CEATA_CONTROL, val)
88#define bfin_read_RSI_FIFO() bfin_read32(RSI_FIFO)
89#define bfin_write_RSI_FIFO(val) bfin_write32(RSI_FIFO, val)
90#define bfin_read_RSI_E_STATUS() bfin_read16(RSI_ESTAT)
91#define bfin_write_RSI_E_STATUS(val) bfin_write16(RSI_ESTAT, val)
92#define bfin_read_RSI_E_MASK() bfin_read16(RSI_EMASK)
93#define bfin_write_RSI_E_MASK(val) bfin_write16(RSI_EMASK, val)
94#define bfin_read_RSI_CFG() bfin_read16(RSI_CONFIG)
95#define bfin_write_RSI_CFG(val) bfin_write16(RSI_CONFIG, val)
96#define bfin_read_RSI_RD_WAIT_EN() bfin_read16(RSI_RD_WAIT_EN)
97#define bfin_write_RSI_RD_WAIT_EN(val) bfin_write16(RSI_RD_WAIT_EN, val)
98#define bfin_read_RSI_PID0() bfin_read16(RSI_PID0)
99#define bfin_write_RSI_PID0(val) bfin_write16(RSI_PID0, val)
100#define bfin_read_RSI_PID1() bfin_read16(RSI_PID1)
101#define bfin_write_RSI_PID1(val) bfin_write16(RSI_PID1, val)
102#define bfin_read_RSI_PID2() bfin_read16(RSI_PID2)
103#define bfin_write_RSI_PID2(val) bfin_write16(RSI_PID2, val)
104#define bfin_read_RSI_PID3() bfin_read16(RSI_PID3)
105#define bfin_write_RSI_PID3(val) bfin_write16(RSI_PID3, val)
106#define bfin_read_RSI_PID4() bfin_read16(RSI_PID4)
107#define bfin_write_RSI_PID4(val) bfin_write16(RSI_PID4, val)
108#define bfin_read_RSI_PID5() bfin_read16(RSI_PID5)
109#define bfin_write_RSI_PID5(val) bfin_write16(RSI_PID5, val)
110#define bfin_read_RSI_PID6() bfin_read16(RSI_PID6)
111#define bfin_write_RSI_PID6(val) bfin_write16(RSI_PID6, val)
112#define bfin_read_RSI_PID7() bfin_read16(RSI_PID7)
113#define bfin_write_RSI_PID7(val) bfin_write16(RSI_PID7, val)
114
48#endif /* _CDEF_BF514_H */ 115#endif /* _CDEF_BF514_H */
diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF516.h b/arch/blackfin/mach-bf518/include/mach/cdefBF516.h
index 4e26ccfcef97..14df43d4677a 100644
--- a/arch/blackfin/mach-bf518/include/mach/cdefBF516.h
+++ b/arch/blackfin/mach-bf518/include/mach/cdefBF516.h
@@ -210,4 +210,71 @@
210#define bfin_read_EMAC_TXC_ABORT() bfin_read32(EMAC_TXC_ABORT) 210#define bfin_read_EMAC_TXC_ABORT() bfin_read32(EMAC_TXC_ABORT)
211#define bfin_write_EMAC_TXC_ABORT(val) bfin_write32(EMAC_TXC_ABORT, val) 211#define bfin_write_EMAC_TXC_ABORT(val) bfin_write32(EMAC_TXC_ABORT, val)
212 212
213/* Removable Storage Interface Registers */
214
215#define bfin_read_RSI_PWR_CTL() bfin_read16(RSI_PWR_CONTROL)
216#define bfin_write_RSI_PWR_CTL(val) bfin_write16(RSI_PWR_CONTROL, val)
217#define bfin_read_RSI_CLK_CTL() bfin_read16(RSI_CLK_CONTROL)
218#define bfin_write_RSI_CLK_CTL(val) bfin_write16(RSI_CLK_CONTROL, val)
219#define bfin_read_RSI_ARGUMENT() bfin_read32(RSI_ARGUMENT)
220#define bfin_write_RSI_ARGUMENT(val) bfin_write32(RSI_ARGUMENT, val)
221#define bfin_read_RSI_COMMAND() bfin_read16(RSI_COMMAND)
222#define bfin_write_RSI_COMMAND(val) bfin_write16(RSI_COMMAND, val)
223#define bfin_read_RSI_RESP_CMD() bfin_read16(RSI_RESP_CMD)
224#define bfin_write_RSI_RESP_CMD(val) bfin_write16(RSI_RESP_CMD, val)
225#define bfin_read_RSI_RESPONSE0() bfin_read32(RSI_RESPONSE0)
226#define bfin_write_RSI_RESPONSE0(val) bfin_write32(RSI_RESPONSE0, val)
227#define bfin_read_RSI_RESPONSE1() bfin_read32(RSI_RESPONSE1)
228#define bfin_write_RSI_RESPONSE1(val) bfin_write32(RSI_RESPONSE1, val)
229#define bfin_read_RSI_RESPONSE2() bfin_read32(RSI_RESPONSE2)
230#define bfin_write_RSI_RESPONSE2(val) bfin_write32(RSI_RESPONSE2, val)
231#define bfin_read_RSI_RESPONSE3() bfin_read32(RSI_RESPONSE3)
232#define bfin_write_RSI_RESPONSE3(val) bfin_write32(RSI_RESPONSE3, val)
233#define bfin_read_RSI_DATA_TIMER() bfin_read32(RSI_DATA_TIMER)
234#define bfin_write_RSI_DATA_TIMER(val) bfin_write32(RSI_DATA_TIMER, val)
235#define bfin_read_RSI_DATA_LGTH() bfin_read16(RSI_DATA_LGTH)
236#define bfin_write_RSI_DATA_LGTH(val) bfin_write16(RSI_DATA_LGTH, val)
237#define bfin_read_RSI_DATA_CTL() bfin_read16(RSI_DATA_CONTROL)
238#define bfin_write_RSI_DATA_CTL(val) bfin_write16(RSI_DATA_CONTROL, val)
239#define bfin_read_RSI_DATA_CNT() bfin_read16(RSI_DATA_CNT)
240#define bfin_write_RSI_DATA_CNT(val) bfin_write16(RSI_DATA_CNT, val)
241#define bfin_read_RSI_STATUS() bfin_read32(RSI_STATUS)
242#define bfin_write_RSI_STATUS(val) bfin_write32(RSI_STATUS, val)
243#define bfin_read_RSI_STATUS_CLR() bfin_read16(RSI_STATUSCL)
244#define bfin_write_RSI_STATUS_CLR(val) bfin_write16(RSI_STATUSCL, val)
245#define bfin_read_RSI_MASK0() bfin_read32(RSI_MASK0)
246#define bfin_write_RSI_MASK0(val) bfin_write32(RSI_MASK0, val)
247#define bfin_read_RSI_MASK1() bfin_read32(RSI_MASK1)
248#define bfin_write_RSI_MASK1(val) bfin_write32(RSI_MASK1, val)
249#define bfin_read_RSI_FIFO_CNT() bfin_read16(RSI_FIFO_CNT)
250#define bfin_write_RSI_FIFO_CNT(val) bfin_write16(RSI_FIFO_CNT, val)
251#define bfin_read_RSI_CEATA_CTL() bfin_read16(RSI_CEATA_CONTROL)
252#define bfin_write_RSI_CEATA_CTL(val) bfin_write16(RSI_CEATA_CONTROL, val)
253#define bfin_read_RSI_FIFO() bfin_read32(RSI_FIFO)
254#define bfin_write_RSI_FIFO(val) bfin_write32(RSI_FIFO, val)
255#define bfin_read_RSI_E_STATUS() bfin_read16(RSI_ESTAT)
256#define bfin_write_RSI_E_STATUS(val) bfin_write16(RSI_ESTAT, val)
257#define bfin_read_RSI_E_MASK() bfin_read16(RSI_EMASK)
258#define bfin_write_RSI_E_MASK(val) bfin_write16(RSI_EMASK, val)
259#define bfin_read_RSI_CFG() bfin_read16(RSI_CONFIG)
260#define bfin_write_RSI_CFG(val) bfin_write16(RSI_CONFIG, val)
261#define bfin_read_RSI_RD_WAIT_EN() bfin_read16(RSI_RD_WAIT_EN)
262#define bfin_write_RSI_RD_WAIT_EN(val) bfin_write16(RSI_RD_WAIT_EN, val)
263#define bfin_read_RSI_PID0() bfin_read16(RSI_PID0)
264#define bfin_write_RSI_PID0(val) bfin_write16(RSI_PID0, val)
265#define bfin_read_RSI_PID1() bfin_read16(RSI_PID1)
266#define bfin_write_RSI_PID1(val) bfin_write16(RSI_PID1, val)
267#define bfin_read_RSI_PID2() bfin_read16(RSI_PID2)
268#define bfin_write_RSI_PID2(val) bfin_write16(RSI_PID2, val)
269#define bfin_read_RSI_PID3() bfin_read16(RSI_PID3)
270#define bfin_write_RSI_PID3(val) bfin_write16(RSI_PID3, val)
271#define bfin_read_RSI_PID4() bfin_read16(RSI_PID4)
272#define bfin_write_RSI_PID4(val) bfin_write16(RSI_PID4, val)
273#define bfin_read_RSI_PID5() bfin_read16(RSI_PID5)
274#define bfin_write_RSI_PID5(val) bfin_write16(RSI_PID5, val)
275#define bfin_read_RSI_PID6() bfin_read16(RSI_PID6)
276#define bfin_write_RSI_PID6(val) bfin_write16(RSI_PID6, val)
277#define bfin_read_RSI_PID7() bfin_read16(RSI_PID7)
278#define bfin_write_RSI_PID7(val) bfin_write16(RSI_PID7, val)
279
213#endif /* _CDEF_BF516_H */ 280#endif /* _CDEF_BF516_H */
diff --git a/arch/blackfin/mach-bf518/include/mach/defBF514.h b/arch/blackfin/mach-bf518/include/mach/defBF514.h
index 543f2913b3f5..56ee5a7c2007 100644
--- a/arch/blackfin/mach-bf518/include/mach/defBF514.h
+++ b/arch/blackfin/mach-bf518/include/mach/defBF514.h
@@ -110,4 +110,139 @@
110#define RSI_PID6 0xFFC03FF8 /* RSI Peripheral ID Register 6 */ 110#define RSI_PID6 0xFFC03FF8 /* RSI Peripheral ID Register 6 */
111#define RSI_PID7 0xFFC03FFC /* RSI Peripheral ID Register 7 */ 111#define RSI_PID7 0xFFC03FFC /* RSI Peripheral ID Register 7 */
112 112
113/* ********************************************************** */
114/* SINGLE BIT MACRO PAIRS (bit mask and negated one) */
115/* and MULTI BIT READ MACROS */
116/* ********************************************************** */
117
118/* Bit masks for SDH_COMMAND */
119
120#define CMD_IDX 0x3f /* Command Index */
121#define CMD_RSP 0x40 /* Response */
122#define CMD_L_RSP 0x80 /* Long Response */
123#define CMD_INT_E 0x100 /* Command Interrupt */
124#define CMD_PEND_E 0x200 /* Command Pending */
125#define CMD_E 0x400 /* Command Enable */
126
127/* Bit masks for SDH_PWR_CTL */
128
129#define PWR_ON 0x3 /* Power On */
130#if 0
131#define TBD 0x3c /* TBD */
132#endif
133#define SD_CMD_OD 0x40 /* Open Drain Output */
134#define ROD_CTL 0x80 /* Rod Control */
135
136/* Bit masks for SDH_CLK_CTL */
137
138#define CLKDIV 0xff /* MC_CLK Divisor */
139#define CLK_E 0x100 /* MC_CLK Bus Clock Enable */
140#define PWR_SV_E 0x200 /* Power Save Enable */
141#define CLKDIV_BYPASS 0x400 /* Bypass Divisor */
142#define WIDE_BUS 0x800 /* Wide Bus Mode Enable */
143
144/* Bit masks for SDH_RESP_CMD */
145
146#define RESP_CMD 0x3f /* Response Command */
147
148/* Bit masks for SDH_DATA_CTL */
149
150#define DTX_E 0x1 /* Data Transfer Enable */
151#define DTX_DIR 0x2 /* Data Transfer Direction */
152#define DTX_MODE 0x4 /* Data Transfer Mode */
153#define DTX_DMA_E 0x8 /* Data Transfer DMA Enable */
154#define DTX_BLK_LGTH 0xf0 /* Data Transfer Block Length */
155
156/* Bit masks for SDH_STATUS */
157
158#define CMD_CRC_FAIL 0x1 /* CMD CRC Fail */
159#define DAT_CRC_FAIL 0x2 /* Data CRC Fail */
160#define CMD_TIME_OUT 0x4 /* CMD Time Out */
161#define DAT_TIME_OUT 0x8 /* Data Time Out */
162#define TX_UNDERRUN 0x10 /* Transmit Underrun */
163#define RX_OVERRUN 0x20 /* Receive Overrun */
164#define CMD_RESP_END 0x40 /* CMD Response End */
165#define CMD_SENT 0x80 /* CMD Sent */
166#define DAT_END 0x100 /* Data End */
167#define START_BIT_ERR 0x200 /* Start Bit Error */
168#define DAT_BLK_END 0x400 /* Data Block End */
169#define CMD_ACT 0x800 /* CMD Active */
170#define TX_ACT 0x1000 /* Transmit Active */
171#define RX_ACT 0x2000 /* Receive Active */
172#define TX_FIFO_STAT 0x4000 /* Transmit FIFO Status */
173#define RX_FIFO_STAT 0x8000 /* Receive FIFO Status */
174#define TX_FIFO_FULL 0x10000 /* Transmit FIFO Full */
175#define RX_FIFO_FULL 0x20000 /* Receive FIFO Full */
176#define TX_FIFO_ZERO 0x40000 /* Transmit FIFO Empty */
177#define RX_DAT_ZERO 0x80000 /* Receive FIFO Empty */
178#define TX_DAT_RDY 0x100000 /* Transmit Data Available */
179#define RX_FIFO_RDY 0x200000 /* Receive Data Available */
180
181/* Bit masks for SDH_STATUS_CLR */
182
183#define CMD_CRC_FAIL_STAT 0x1 /* CMD CRC Fail Status */
184#define DAT_CRC_FAIL_STAT 0x2 /* Data CRC Fail Status */
185#define CMD_TIMEOUT_STAT 0x4 /* CMD Time Out Status */
186#define DAT_TIMEOUT_STAT 0x8 /* Data Time Out status */
187#define TX_UNDERRUN_STAT 0x10 /* Transmit Underrun Status */
188#define RX_OVERRUN_STAT 0x20 /* Receive Overrun Status */
189#define CMD_RESP_END_STAT 0x40 /* CMD Response End Status */
190#define CMD_SENT_STAT 0x80 /* CMD Sent Status */
191#define DAT_END_STAT 0x100 /* Data End Status */
192#define START_BIT_ERR_STAT 0x200 /* Start Bit Error Status */
193#define DAT_BLK_END_STAT 0x400 /* Data Block End Status */
194
195/* Bit masks for SDH_MASK0 */
196
197#define CMD_CRC_FAIL_MASK 0x1 /* CMD CRC Fail Mask */
198#define DAT_CRC_FAIL_MASK 0x2 /* Data CRC Fail Mask */
199#define CMD_TIMEOUT_MASK 0x4 /* CMD Time Out Mask */
200#define DAT_TIMEOUT_MASK 0x8 /* Data Time Out Mask */
201#define TX_UNDERRUN_MASK 0x10 /* Transmit Underrun Mask */
202#define RX_OVERRUN_MASK 0x20 /* Receive Overrun Mask */
203#define CMD_RESP_END_MASK 0x40 /* CMD Response End Mask */
204#define CMD_SENT_MASK 0x80 /* CMD Sent Mask */
205#define DAT_END_MASK 0x100 /* Data End Mask */
206#define START_BIT_ERR_MASK 0x200 /* Start Bit Error Mask */
207#define DAT_BLK_END_MASK 0x400 /* Data Block End Mask */
208#define CMD_ACT_MASK 0x800 /* CMD Active Mask */
209#define TX_ACT_MASK 0x1000 /* Transmit Active Mask */
210#define RX_ACT_MASK 0x2000 /* Receive Active Mask */
211#define TX_FIFO_STAT_MASK 0x4000 /* Transmit FIFO Status Mask */
212#define RX_FIFO_STAT_MASK 0x8000 /* Receive FIFO Status Mask */
213#define TX_FIFO_FULL_MASK 0x10000 /* Transmit FIFO Full Mask */
214#define RX_FIFO_FULL_MASK 0x20000 /* Receive FIFO Full Mask */
215#define TX_FIFO_ZERO_MASK 0x40000 /* Transmit FIFO Empty Mask */
216#define RX_DAT_ZERO_MASK 0x80000 /* Receive FIFO Empty Mask */
217#define TX_DAT_RDY_MASK 0x100000 /* Transmit Data Available Mask */
218#define RX_FIFO_RDY_MASK 0x200000 /* Receive Data Available Mask */
219
220/* Bit masks for SDH_FIFO_CNT */
221
222#define FIFO_COUNT 0x7fff /* FIFO Count */
223
224/* Bit masks for SDH_E_STATUS */
225
226#define SDIO_INT_DET 0x2 /* SDIO Int Detected */
227#define SD_CARD_DET 0x10 /* SD Card Detect */
228
229/* Bit masks for SDH_E_MASK */
230
231#define SDIO_MSK 0x2 /* Mask SDIO Int Detected */
232#define SCD_MSK 0x40 /* Mask Card Detect */
233
234/* Bit masks for SDH_CFG */
235
236#define CLKS_EN 0x1 /* Clocks Enable */
237#define SD4E 0x4 /* SDIO 4-Bit Enable */
238#define MWE 0x8 /* Moving Window Enable */
239#define SD_RST 0x10 /* SDMMC Reset */
240#define PUP_SDDAT 0x20 /* Pull-up SD_DAT */
241#define PUP_SDDAT3 0x40 /* Pull-up SD_DAT3 */
242#define PD_SDDAT3 0x80 /* Pull-down SD_DAT3 */
243
244/* Bit masks for SDH_RD_WAIT_EN */
245
246#define RWR 0x1 /* Read Wait Request */
247
113#endif /* _DEF_BF514_H */ 248#endif /* _DEF_BF514_H */
diff --git a/arch/blackfin/mach-bf518/include/mach/defBF516.h b/arch/blackfin/mach-bf518/include/mach/defBF516.h
index 149a269306c5..dfc93843517d 100644
--- a/arch/blackfin/mach-bf518/include/mach/defBF516.h
+++ b/arch/blackfin/mach-bf518/include/mach/defBF516.h
@@ -487,4 +487,139 @@
487#define RSI_PID6 0xFFC03FF8 /* RSI Peripheral ID Register 6 */ 487#define RSI_PID6 0xFFC03FF8 /* RSI Peripheral ID Register 6 */
488#define RSI_PID7 0xFFC03FFC /* RSI Peripheral ID Register 7 */ 488#define RSI_PID7 0xFFC03FFC /* RSI Peripheral ID Register 7 */
489 489
490/* ********************************************************** */
491/* SINGLE BIT MACRO PAIRS (bit mask and negated one) */
492/* and MULTI BIT READ MACROS */
493/* ********************************************************** */
494
495/* Bit masks for SDH_COMMAND */
496
497#define CMD_IDX 0x3f /* Command Index */
498#define CMD_RSP 0x40 /* Response */
499#define CMD_L_RSP 0x80 /* Long Response */
500#define CMD_INT_E 0x100 /* Command Interrupt */
501#define CMD_PEND_E 0x200 /* Command Pending */
502#define CMD_E 0x400 /* Command Enable */
503
504/* Bit masks for SDH_PWR_CTL */
505
506#define PWR_ON 0x3 /* Power On */
507#if 0
508#define TBD 0x3c /* TBD */
509#endif
510#define SD_CMD_OD 0x40 /* Open Drain Output */
511#define ROD_CTL 0x80 /* Rod Control */
512
513/* Bit masks for SDH_CLK_CTL */
514
515#define CLKDIV 0xff /* MC_CLK Divisor */
516#define CLK_E 0x100 /* MC_CLK Bus Clock Enable */
517#define PWR_SV_E 0x200 /* Power Save Enable */
518#define CLKDIV_BYPASS 0x400 /* Bypass Divisor */
519#define WIDE_BUS 0x800 /* Wide Bus Mode Enable */
520
521/* Bit masks for SDH_RESP_CMD */
522
523#define RESP_CMD 0x3f /* Response Command */
524
525/* Bit masks for SDH_DATA_CTL */
526
527#define DTX_E 0x1 /* Data Transfer Enable */
528#define DTX_DIR 0x2 /* Data Transfer Direction */
529#define DTX_MODE 0x4 /* Data Transfer Mode */
530#define DTX_DMA_E 0x8 /* Data Transfer DMA Enable */
531#define DTX_BLK_LGTH 0xf0 /* Data Transfer Block Length */
532
533/* Bit masks for SDH_STATUS */
534
535#define CMD_CRC_FAIL 0x1 /* CMD CRC Fail */
536#define DAT_CRC_FAIL 0x2 /* Data CRC Fail */
537#define CMD_TIME_OUT 0x4 /* CMD Time Out */
538#define DAT_TIME_OUT 0x8 /* Data Time Out */
539#define TX_UNDERRUN 0x10 /* Transmit Underrun */
540#define RX_OVERRUN 0x20 /* Receive Overrun */
541#define CMD_RESP_END 0x40 /* CMD Response End */
542#define CMD_SENT 0x80 /* CMD Sent */
543#define DAT_END 0x100 /* Data End */
544#define START_BIT_ERR 0x200 /* Start Bit Error */
545#define DAT_BLK_END 0x400 /* Data Block End */
546#define CMD_ACT 0x800 /* CMD Active */
547#define TX_ACT 0x1000 /* Transmit Active */
548#define RX_ACT 0x2000 /* Receive Active */
549#define TX_FIFO_STAT 0x4000 /* Transmit FIFO Status */
550#define RX_FIFO_STAT 0x8000 /* Receive FIFO Status */
551#define TX_FIFO_FULL 0x10000 /* Transmit FIFO Full */
552#define RX_FIFO_FULL 0x20000 /* Receive FIFO Full */
553#define TX_FIFO_ZERO 0x40000 /* Transmit FIFO Empty */
554#define RX_DAT_ZERO 0x80000 /* Receive FIFO Empty */
555#define TX_DAT_RDY 0x100000 /* Transmit Data Available */
556#define RX_FIFO_RDY 0x200000 /* Receive Data Available */
557
558/* Bit masks for SDH_STATUS_CLR */
559
560#define CMD_CRC_FAIL_STAT 0x1 /* CMD CRC Fail Status */
561#define DAT_CRC_FAIL_STAT 0x2 /* Data CRC Fail Status */
562#define CMD_TIMEOUT_STAT 0x4 /* CMD Time Out Status */
563#define DAT_TIMEOUT_STAT 0x8 /* Data Time Out status */
564#define TX_UNDERRUN_STAT 0x10 /* Transmit Underrun Status */
565#define RX_OVERRUN_STAT 0x20 /* Receive Overrun Status */
566#define CMD_RESP_END_STAT 0x40 /* CMD Response End Status */
567#define CMD_SENT_STAT 0x80 /* CMD Sent Status */
568#define DAT_END_STAT 0x100 /* Data End Status */
569#define START_BIT_ERR_STAT 0x200 /* Start Bit Error Status */
570#define DAT_BLK_END_STAT 0x400 /* Data Block End Status */
571
572/* Bit masks for SDH_MASK0 */
573
574#define CMD_CRC_FAIL_MASK 0x1 /* CMD CRC Fail Mask */
575#define DAT_CRC_FAIL_MASK 0x2 /* Data CRC Fail Mask */
576#define CMD_TIMEOUT_MASK 0x4 /* CMD Time Out Mask */
577#define DAT_TIMEOUT_MASK 0x8 /* Data Time Out Mask */
578#define TX_UNDERRUN_MASK 0x10 /* Transmit Underrun Mask */
579#define RX_OVERRUN_MASK 0x20 /* Receive Overrun Mask */
580#define CMD_RESP_END_MASK 0x40 /* CMD Response End Mask */
581#define CMD_SENT_MASK 0x80 /* CMD Sent Mask */
582#define DAT_END_MASK 0x100 /* Data End Mask */
583#define START_BIT_ERR_MASK 0x200 /* Start Bit Error Mask */
584#define DAT_BLK_END_MASK 0x400 /* Data Block End Mask */
585#define CMD_ACT_MASK 0x800 /* CMD Active Mask */
586#define TX_ACT_MASK 0x1000 /* Transmit Active Mask */
587#define RX_ACT_MASK 0x2000 /* Receive Active Mask */
588#define TX_FIFO_STAT_MASK 0x4000 /* Transmit FIFO Status Mask */
589#define RX_FIFO_STAT_MASK 0x8000 /* Receive FIFO Status Mask */
590#define TX_FIFO_FULL_MASK 0x10000 /* Transmit FIFO Full Mask */
591#define RX_FIFO_FULL_MASK 0x20000 /* Receive FIFO Full Mask */
592#define TX_FIFO_ZERO_MASK 0x40000 /* Transmit FIFO Empty Mask */
593#define RX_DAT_ZERO_MASK 0x80000 /* Receive FIFO Empty Mask */
594#define TX_DAT_RDY_MASK 0x100000 /* Transmit Data Available Mask */
595#define RX_FIFO_RDY_MASK 0x200000 /* Receive Data Available Mask */
596
597/* Bit masks for SDH_FIFO_CNT */
598
599#define FIFO_COUNT 0x7fff /* FIFO Count */
600
601/* Bit masks for SDH_E_STATUS */
602
603#define SDIO_INT_DET 0x2 /* SDIO Int Detected */
604#define SD_CARD_DET 0x10 /* SD Card Detect */
605
606/* Bit masks for SDH_E_MASK */
607
608#define SDIO_MSK 0x2 /* Mask SDIO Int Detected */
609#define SCD_MSK 0x40 /* Mask Card Detect */
610
611/* Bit masks for SDH_CFG */
612
613#define CLKS_EN 0x1 /* Clocks Enable */
614#define SD4E 0x4 /* SDIO 4-Bit Enable */
615#define MWE 0x8 /* Moving Window Enable */
616#define SD_RST 0x10 /* SDMMC Reset */
617#define PUP_SDDAT 0x20 /* Pull-up SD_DAT */
618#define PUP_SDDAT3 0x40 /* Pull-up SD_DAT3 */
619#define PD_SDDAT3 0x80 /* Pull-down SD_DAT3 */
620
621/* Bit masks for SDH_RD_WAIT_EN */
622
623#define RWR 0x1 /* Read Wait Request */
624
490#endif /* _DEF_BF516_H */ 625#endif /* _DEF_BF516_H */
diff --git a/arch/blackfin/mach-bf527/include/mach/blackfin.h b/arch/blackfin/mach-bf527/include/mach/blackfin.h
index 297821e2d79a..417abcd61f4d 100644
--- a/arch/blackfin/mach-bf527/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf527/include/mach/blackfin.h
@@ -32,8 +32,6 @@
32#ifndef _MACH_BLACKFIN_H_ 32#ifndef _MACH_BLACKFIN_H_
33#define _MACH_BLACKFIN_H_ 33#define _MACH_BLACKFIN_H_
34 34
35#define BF527_FAMILY
36
37#include "bf527.h" 35#include "bf527.h"
38#include "mem_map.h" 36#include "mem_map.h"
39#include "defBF522.h" 37#include "defBF522.h"
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index cd04c5e44878..0572926da23f 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -843,6 +843,71 @@ static struct platform_device bfin_spi0_device = {
843}; 843};
844#endif /* spi master and devices */ 844#endif /* spi master and devices */
845 845
846#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
847
848/* SPORT SPI controller data */
849static struct bfin5xx_spi_master bfin_sport_spi0_info = {
850 .num_chipselect = 1, /* master only supports one device */
851 .enable_dma = 0, /* master don't support DMA */
852 .pin_req = {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_DRPRI,
853 P_SPORT0_RSCLK, P_SPORT0_TFS, P_SPORT0_RFS, 0},
854};
855
856static struct resource bfin_sport_spi0_resource[] = {
857 [0] = {
858 .start = SPORT0_TCR1,
859 .end = SPORT0_TCR1 + 0xFF,
860 .flags = IORESOURCE_MEM,
861 },
862 [1] = {
863 .start = IRQ_SPORT0_ERROR,
864 .end = IRQ_SPORT0_ERROR,
865 .flags = IORESOURCE_IRQ,
866 },
867};
868
869static struct platform_device bfin_sport_spi0_device = {
870 .name = "bfin-sport-spi",
871 .id = 1, /* Bus number */
872 .num_resources = ARRAY_SIZE(bfin_sport_spi0_resource),
873 .resource = bfin_sport_spi0_resource,
874 .dev = {
875 .platform_data = &bfin_sport_spi0_info, /* Passed to driver */
876 },
877};
878
879static struct bfin5xx_spi_master bfin_sport_spi1_info = {
880 .num_chipselect = 1, /* master only supports one device */
881 .enable_dma = 0, /* master don't support DMA */
882 .pin_req = {P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_DRPRI,
883 P_SPORT1_RSCLK, P_SPORT1_TFS, P_SPORT1_RFS, 0},
884};
885
886static struct resource bfin_sport_spi1_resource[] = {
887 [0] = {
888 .start = SPORT1_TCR1,
889 .end = SPORT1_TCR1 + 0xFF,
890 .flags = IORESOURCE_MEM,
891 },
892 [1] = {
893 .start = IRQ_SPORT1_ERROR,
894 .end = IRQ_SPORT1_ERROR,
895 .flags = IORESOURCE_IRQ,
896 },
897};
898
899static struct platform_device bfin_sport_spi1_device = {
900 .name = "bfin-sport-spi",
901 .id = 2, /* Bus number */
902 .num_resources = ARRAY_SIZE(bfin_sport_spi1_resource),
903 .resource = bfin_sport_spi1_resource,
904 .dev = {
905 .platform_data = &bfin_sport_spi1_info, /* Passed to driver */
906 },
907};
908
909#endif /* sport spi master and devices */
910
846#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) 911#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
847static struct platform_device bfin_fb_device = { 912static struct platform_device bfin_fb_device = {
848 .name = "bf537-lq035", 913 .name = "bf537-lq035",
@@ -1073,6 +1138,141 @@ static struct adp5588_kpad_platform_data adp5588_kpad_data = {
1073}; 1138};
1074#endif 1139#endif
1075 1140
1141#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
1142#include <linux/mfd/adp5520.h>
1143
1144 /*
1145 * ADP5520/5501 Backlight Data
1146 */
1147
1148static struct adp5520_backlight_platfrom_data adp5520_backlight_data = {
1149 .fade_in = FADE_T_1200ms,
1150 .fade_out = FADE_T_1200ms,
1151 .fade_led_law = BL_LAW_LINEAR,
1152 .en_ambl_sens = 1,
1153 .abml_filt = BL_AMBL_FILT_640ms,
1154 .l1_daylight_max = BL_CUR_mA(15),
1155 .l1_daylight_dim = BL_CUR_mA(0),
1156 .l2_office_max = BL_CUR_mA(7),
1157 .l2_office_dim = BL_CUR_mA(0),
1158 .l3_dark_max = BL_CUR_mA(3),
1159 .l3_dark_dim = BL_CUR_mA(0),
1160 .l2_trip = L2_COMP_CURR_uA(700),
1161 .l2_hyst = L2_COMP_CURR_uA(50),
1162 .l3_trip = L3_COMP_CURR_uA(80),
1163 .l3_hyst = L3_COMP_CURR_uA(20),
1164};
1165
1166 /*
1167 * ADP5520/5501 LEDs Data
1168 */
1169
1170#include <linux/leds.h>
1171
1172static struct led_info adp5520_leds[] = {
1173 {
1174 .name = "adp5520-led1",
1175 .default_trigger = "none",
1176 .flags = FLAG_ID_ADP5520_LED1_ADP5501_LED0 | LED_OFFT_600ms,
1177 },
1178#ifdef ADP5520_EN_ALL_LEDS
1179 {
1180 .name = "adp5520-led2",
1181 .default_trigger = "none",
1182 .flags = FLAG_ID_ADP5520_LED2_ADP5501_LED1,
1183 },
1184 {
1185 .name = "adp5520-led3",
1186 .default_trigger = "none",
1187 .flags = FLAG_ID_ADP5520_LED3_ADP5501_LED2,
1188 },
1189#endif
1190};
1191
1192static struct adp5520_leds_platfrom_data adp5520_leds_data = {
1193 .num_leds = ARRAY_SIZE(adp5520_leds),
1194 .leds = adp5520_leds,
1195 .fade_in = FADE_T_600ms,
1196 .fade_out = FADE_T_600ms,
1197 .led_on_time = LED_ONT_600ms,
1198};
1199
1200 /*
1201 * ADP5520 GPIO Data
1202 */
1203
1204static struct adp5520_gpio_platfrom_data adp5520_gpio_data = {
1205 .gpio_start = 50,
1206 .gpio_en_mask = GPIO_C1 | GPIO_C2 | GPIO_R2,
1207 .gpio_pullup_mask = GPIO_C1 | GPIO_C2 | GPIO_R2,
1208};
1209
1210 /*
1211 * ADP5520 Keypad Data
1212 */
1213
1214#include <linux/input.h>
1215static const unsigned short adp5520_keymap[ADP5520_KEYMAPSIZE] = {
1216 [KEY(0, 0)] = KEY_GRAVE,
1217 [KEY(0, 1)] = KEY_1,
1218 [KEY(0, 2)] = KEY_2,
1219 [KEY(0, 3)] = KEY_3,
1220 [KEY(1, 0)] = KEY_4,
1221 [KEY(1, 1)] = KEY_5,
1222 [KEY(1, 2)] = KEY_6,
1223 [KEY(1, 3)] = KEY_7,
1224 [KEY(2, 0)] = KEY_8,
1225 [KEY(2, 1)] = KEY_9,
1226 [KEY(2, 2)] = KEY_0,
1227 [KEY(2, 3)] = KEY_MINUS,
1228 [KEY(3, 0)] = KEY_EQUAL,
1229 [KEY(3, 1)] = KEY_BACKSLASH,
1230 [KEY(3, 2)] = KEY_BACKSPACE,
1231 [KEY(3, 3)] = KEY_ENTER,
1232};
1233
1234static struct adp5520_keys_platfrom_data adp5520_keys_data = {
1235 .rows_en_mask = ROW_R3 | ROW_R2 | ROW_R1 | ROW_R0,
1236 .cols_en_mask = COL_C3 | COL_C2 | COL_C1 | COL_C0,
1237 .keymap = adp5520_keymap,
1238 .keymapsize = ARRAY_SIZE(adp5520_keymap),
1239 .repeat = 0,
1240};
1241
1242 /*
1243 * ADP5520/5501 Multifuction Device Init Data
1244 */
1245
1246static struct adp5520_subdev_info adp5520_subdevs[] = {
1247 {
1248 .name = "adp5520-backlight",
1249 .id = ID_ADP5520,
1250 .platform_data = &adp5520_backlight_data,
1251 },
1252 {
1253 .name = "adp5520-led",
1254 .id = ID_ADP5520,
1255 .platform_data = &adp5520_leds_data,
1256 },
1257 {
1258 .name = "adp5520-gpio",
1259 .id = ID_ADP5520,
1260 .platform_data = &adp5520_gpio_data,
1261 },
1262 {
1263 .name = "adp5520-keys",
1264 .id = ID_ADP5520,
1265 .platform_data = &adp5520_keys_data,
1266 },
1267};
1268
1269static struct adp5520_platform_data adp5520_pdev_data = {
1270 .num_subdevs = ARRAY_SIZE(adp5520_subdevs),
1271 .subdevs = adp5520_subdevs,
1272};
1273
1274#endif
1275
1076static struct i2c_board_info __initdata bfin_i2c_board_info[] = { 1276static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
1077#if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) 1277#if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE)
1078 { 1278 {
@@ -1105,6 +1305,13 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
1105 .platform_data = (void *)&adp5588_kpad_data, 1305 .platform_data = (void *)&adp5588_kpad_data,
1106 }, 1306 },
1107#endif 1307#endif
1308#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
1309 {
1310 I2C_BOARD_INFO("pmic-adp5520", 0x32),
1311 .irq = IRQ_PF7,
1312 .platform_data = (void *)&adp5520_pdev_data,
1313 },
1314#endif
1108}; 1315};
1109 1316
1110#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) 1317#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
@@ -1120,8 +1327,11 @@ static struct platform_device bfin_sport1_uart_device = {
1120#endif 1327#endif
1121 1328
1122#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) 1329#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
1123#define PATA_INT IRQ_PF5 1330#define CF_IDE_NAND_CARD_USE_HDD_INTERFACE
1331/* #define CF_IDE_NAND_CARD_USE_CF_IN_COMMON_MEMORY_MODE */
1124 1332
1333#ifdef CF_IDE_NAND_CARD_USE_HDD_INTERFACE
1334#define PATA_INT IRQ_PF5
1125static struct pata_platform_info bfin_pata_platform_data = { 1335static struct pata_platform_info bfin_pata_platform_data = {
1126 .ioport_shift = 1, 1336 .ioport_shift = 1,
1127 .irq_flags = IRQF_TRIGGER_HIGH | IRQF_DISABLED, 1337 .irq_flags = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
@@ -1144,6 +1354,24 @@ static struct resource bfin_pata_resources[] = {
1144 .flags = IORESOURCE_IRQ, 1354 .flags = IORESOURCE_IRQ,
1145 }, 1355 },
1146}; 1356};
1357#elif defined(CF_IDE_NAND_CARD_USE_CF_IN_COMMON_MEMORY_MODE)
1358static struct pata_platform_info bfin_pata_platform_data = {
1359 .ioport_shift = 0,
1360};
1361
1362static struct resource bfin_pata_resources[] = {
1363 {
1364 .start = 0x20211820,
1365 .end = 0x2021183F,
1366 .flags = IORESOURCE_MEM,
1367 },
1368 {
1369 .start = 0x2021181C,
1370 .end = 0x2021181F,
1371 .flags = IORESOURCE_MEM,
1372 },
1373};
1374#endif
1147 1375
1148static struct platform_device bfin_pata_device = { 1376static struct platform_device bfin_pata_device = {
1149 .name = "pata_platform", 1377 .name = "pata_platform",
@@ -1232,6 +1460,11 @@ static struct platform_device *stamp_devices[] __initdata = {
1232 &bfin_spi0_device, 1460 &bfin_spi0_device,
1233#endif 1461#endif
1234 1462
1463#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
1464 &bfin_sport_spi0_device,
1465 &bfin_sport_spi1_device,
1466#endif
1467
1235#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) 1468#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
1236 &bfin_fb_device, 1469 &bfin_fb_device,
1237#endif 1470#endif
diff --git a/arch/blackfin/mach-bf548/include/mach/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h
index 0c0e3e2c3c21..cf6c1500222a 100644
--- a/arch/blackfin/mach-bf548/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf548/include/mach/blackfin.h
@@ -32,8 +32,6 @@
32#ifndef _MACH_BLACKFIN_H_ 32#ifndef _MACH_BLACKFIN_H_
33#define _MACH_BLACKFIN_H_ 33#define _MACH_BLACKFIN_H_
34 34
35#define BF548_FAMILY
36
37#include "bf548.h" 35#include "bf548.h"
38#include "mem_map.h" 36#include "mem_map.h"
39#include "anomaly.h" 37#include "anomaly.h"
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index f48a6aebb49b..bce5a84be49f 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -287,7 +287,7 @@ int bfin_pm_suspend_mem_enter(void)
287static int bfin_pm_valid(suspend_state_t state) 287static int bfin_pm_valid(suspend_state_t state)
288{ 288{
289 return (state == PM_SUSPEND_STANDBY 289 return (state == PM_SUSPEND_STANDBY
290#ifndef BF533_FAMILY 290#if !(defined(BF533_FAMILY) || defined(CONFIG_BF561))
291 /* 291 /*
292 * On BF533/2/1: 292 * On BF533/2/1:
293 * If we enter Hibernate the SCKE Pin is driven Low, 293 * If we enter Hibernate the SCKE Pin is driven Low,
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-21 22:59:17 -0500