aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/ape6evm_defconfig9
-rw-r--r--arch/arm/configs/at91_dt_defconfig35
-rw-r--r--arch/arm/configs/at91sam9260_9g20_defconfig13
-rw-r--r--arch/arm/configs/at91sam9261_9g10_defconfig5
-rw-r--r--arch/arm/configs/at91sam9263_defconfig13
-rw-r--r--arch/arm/configs/at91sam9g45_defconfig19
-rw-r--r--arch/arm/configs/at91sam9rl_defconfig19
-rw-r--r--arch/arm/configs/bcm2835_defconfig1
-rw-r--r--arch/arm/configs/bcm_defconfig1
-rw-r--r--arch/arm/configs/bockw_defconfig3
-rw-r--r--arch/arm/configs/ezx_defconfig1
-rw-r--r--arch/arm/configs/imote2_defconfig1
-rw-r--r--arch/arm/configs/koelsch_defconfig17
-rw-r--r--arch/arm/configs/kzm9g_defconfig1
-rw-r--r--arch/arm/configs/lager_defconfig8
-rw-r--r--arch/arm/configs/lpc32xx_defconfig2
-rw-r--r--arch/arm/configs/marzen_defconfig1
-rw-r--r--arch/arm/configs/multi_v7_defconfig39
-rw-r--r--arch/arm/configs/mvebu_v7_defconfig68
-rw-r--r--arch/arm/configs/pxa3xx_defconfig1
-rw-r--r--arch/arm/configs/qcom_defconfig14
-rw-r--r--arch/arm/configs/sama5_defconfig18
-rw-r--r--arch/arm/configs/shmobile_defconfig16
-rw-r--r--arch/arm/configs/sunxi_defconfig4
-rw-r--r--arch/arm/configs/tegra_defconfig5
25 files changed, 216 insertions, 98 deletions
diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
index bb396c0e5fda..b54b28fc5a70 100644
--- a/arch/arm/configs/ape6evm_defconfig
+++ b/arch/arm/configs/ape6evm_defconfig
@@ -12,7 +12,6 @@ CONFIG_KALLSYMS_ALL=y
12CONFIG_EMBEDDED=y 12CONFIG_EMBEDDED=y
13CONFIG_PERF_EVENTS=y 13CONFIG_PERF_EVENTS=y
14CONFIG_SLAB=y 14CONFIG_SLAB=y
15# CONFIG_BLOCK is not set
16CONFIG_ARCH_SHMOBILE_LEGACY=y 15CONFIG_ARCH_SHMOBILE_LEGACY=y
17CONFIG_ARCH_R8A73A4=y 16CONFIG_ARCH_R8A73A4=y
18CONFIG_MACH_APE6EVM=y 17CONFIG_MACH_APE6EVM=y
@@ -64,6 +63,8 @@ CONFIG_SERIAL_NONSTANDARD=y
64CONFIG_SERIAL_SH_SCI=y 63CONFIG_SERIAL_SH_SCI=y
65CONFIG_SERIAL_SH_SCI_NR_UARTS=12 64CONFIG_SERIAL_SH_SCI_NR_UARTS=12
66CONFIG_SERIAL_SH_SCI_CONSOLE=y 65CONFIG_SERIAL_SH_SCI_CONSOLE=y
66CONFIG_I2C=y
67CONFIG_I2C_SH_MOBILE=y
67CONFIG_GPIO_SH_PFC=y 68CONFIG_GPIO_SH_PFC=y
68CONFIG_GPIOLIB=y 69CONFIG_GPIOLIB=y
69# CONFIG_HWMON is not set 70# CONFIG_HWMON is not set
@@ -72,11 +73,17 @@ CONFIG_RCAR_THERMAL=y
72CONFIG_REGULATOR=y 73CONFIG_REGULATOR=y
73CONFIG_REGULATOR_FIXED_VOLTAGE=y 74CONFIG_REGULATOR_FIXED_VOLTAGE=y
74CONFIG_REGULATOR_GPIO=y 75CONFIG_REGULATOR_GPIO=y
76CONFIG_REGULATOR_MAX8973=y
75# CONFIG_HID is not set 77# CONFIG_HID is not set
76# CONFIG_USB_SUPPORT is not set 78# CONFIG_USB_SUPPORT is not set
79CONFIG_MMC=y
80CONFIG_MMC_SDHI=y
81CONFIG_MMC_SH_MMCIF=y
77CONFIG_NEW_LEDS=y 82CONFIG_NEW_LEDS=y
78CONFIG_LEDS_CLASS=y 83CONFIG_LEDS_CLASS=y
79CONFIG_LEDS_GPIO=y 84CONFIG_LEDS_GPIO=y
85CONFIG_DMADEVICES=y
86CONFIG_SH_DMAE=y
80# CONFIG_IOMMU_SUPPORT is not set 87# CONFIG_IOMMU_SUPPORT is not set
81# CONFIG_DNOTIFY is not set 88# CONFIG_DNOTIFY is not set
82CONFIG_TMPFS=y 89CONFIG_TMPFS=y
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index 300ded9acbe9..3b515c179487 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -18,15 +18,14 @@ CONFIG_SOC_AT91RM9200=y
18CONFIG_SOC_AT91SAM9260=y 18CONFIG_SOC_AT91SAM9260=y
19CONFIG_SOC_AT91SAM9261=y 19CONFIG_SOC_AT91SAM9261=y
20CONFIG_SOC_AT91SAM9263=y 20CONFIG_SOC_AT91SAM9263=y
21CONFIG_SOC_AT91SAM9RL=y
21CONFIG_SOC_AT91SAM9G45=y 22CONFIG_SOC_AT91SAM9G45=y
22CONFIG_SOC_AT91SAM9X5=y 23CONFIG_SOC_AT91SAM9X5=y
23CONFIG_SOC_AT91SAM9N12=y 24CONFIG_SOC_AT91SAM9N12=y
24CONFIG_SOC_AT91SAM9RL=y
25CONFIG_MACH_AT91RM9200_DT=y 25CONFIG_MACH_AT91RM9200_DT=y
26CONFIG_MACH_AT91SAM9_DT=y 26CONFIG_MACH_AT91SAM9_DT=y
27CONFIG_AT91_TIMER_HZ=128 27CONFIG_AT91_TIMER_HZ=128
28CONFIG_AEABI=y 28CONFIG_AEABI=y
29# CONFIG_OABI_COMPAT is not set
30CONFIG_UACCESS_WITH_MEMCPY=y 29CONFIG_UACCESS_WITH_MEMCPY=y
31CONFIG_ZBOOT_ROM_TEXT=0x0 30CONFIG_ZBOOT_ROM_TEXT=0x0
32CONFIG_ZBOOT_ROM_BSS=0x0 31CONFIG_ZBOOT_ROM_BSS=0x0
@@ -63,23 +62,20 @@ CONFIG_DEVTMPFS_MOUNT=y
63# CONFIG_PREVENT_FIRMWARE_BUILD is not set 62# CONFIG_PREVENT_FIRMWARE_BUILD is not set
64CONFIG_MTD=y 63CONFIG_MTD=y
65CONFIG_MTD_CMDLINE_PARTS=y 64CONFIG_MTD_CMDLINE_PARTS=y
66CONFIG_MTD_CHAR=y
67CONFIG_MTD_BLOCK=y 65CONFIG_MTD_BLOCK=y
68CONFIG_MTD_DATAFLASH=y 66CONFIG_MTD_DATAFLASH=y
69CONFIG_MTD_NAND=y 67CONFIG_MTD_NAND=y
70CONFIG_MTD_NAND_ATMEL=y 68CONFIG_MTD_NAND_ATMEL=y
71CONFIG_MTD_UBI=y 69CONFIG_MTD_UBI=y
72CONFIG_MTD_UBI_GLUEBI=y 70CONFIG_MTD_UBI_GLUEBI=y
73CONFIG_PROC_DEVICETREE=y
74CONFIG_BLK_DEV_LOOP=y 71CONFIG_BLK_DEV_LOOP=y
75CONFIG_BLK_DEV_RAM=y 72CONFIG_BLK_DEV_RAM=y
76CONFIG_BLK_DEV_RAM_COUNT=4 73CONFIG_BLK_DEV_RAM_COUNT=4
77CONFIG_BLK_DEV_RAM_SIZE=8192 74CONFIG_BLK_DEV_RAM_SIZE=8192
78CONFIG_ATMEL_PWM=y
79CONFIG_ATMEL_TCLIB=y 75CONFIG_ATMEL_TCLIB=y
76CONFIG_ATMEL_SSC=y
80CONFIG_SCSI=y 77CONFIG_SCSI=y
81CONFIG_BLK_DEV_SD=y 78CONFIG_BLK_DEV_SD=y
82CONFIG_SCSI_MULTI_LUN=y
83# CONFIG_SCSI_LOWLEVEL is not set 79# CONFIG_SCSI_LOWLEVEL is not set
84CONFIG_NETDEVICES=y 80CONFIG_NETDEVICES=y
85CONFIG_MACB=y 81CONFIG_MACB=y
@@ -105,9 +101,8 @@ CONFIG_RT2800USB=m
105CONFIG_RT2800USB_RT53XX=y 101CONFIG_RT2800USB_RT53XX=y
106CONFIG_RT2800USB_RT55XX=y 102CONFIG_RT2800USB_RT55XX=y
107CONFIG_RT2800USB_UNKNOWN=y 103CONFIG_RT2800USB_UNKNOWN=y
108CONFIG_RTLWIFI=m
109# CONFIG_RTLWIFI_DEBUG is not set
110CONFIG_RTL8192CU=m 104CONFIG_RTL8192CU=m
105# CONFIG_RTLWIFI_DEBUG is not set
111CONFIG_MWIFIEX=m 106CONFIG_MWIFIEX=m
112CONFIG_MWIFIEX_SDIO=m 107CONFIG_MWIFIEX_SDIO=m
113CONFIG_MWIFIEX_USB=m 108CONFIG_MWIFIEX_USB=m
@@ -128,9 +123,12 @@ CONFIG_SERIAL_ATMEL=y
128CONFIG_SERIAL_ATMEL_CONSOLE=y 123CONFIG_SERIAL_ATMEL_CONSOLE=y
129CONFIG_HW_RANDOM=y 124CONFIG_HW_RANDOM=y
130CONFIG_I2C=y 125CONFIG_I2C=y
126CONFIG_I2C_AT91=y
131CONFIG_I2C_GPIO=y 127CONFIG_I2C_GPIO=y
132CONFIG_SPI=y 128CONFIG_SPI=y
133CONFIG_SPI_ATMEL=y 129CONFIG_SPI_ATMEL=y
130CONFIG_POWER_SUPPLY=y
131CONFIG_POWER_RESET=y
134# CONFIG_HWMON is not set 132# CONFIG_HWMON is not set
135CONFIG_WATCHDOG=y 133CONFIG_WATCHDOG=y
136CONFIG_AT91SAM9X_WATCHDOG=y 134CONFIG_AT91SAM9X_WATCHDOG=y
@@ -144,11 +142,14 @@ CONFIG_BACKLIGHT_ATMEL_LCDC=y
144# CONFIG_BACKLIGHT_GENERIC is not set 142# CONFIG_BACKLIGHT_GENERIC is not set
145CONFIG_FRAMEBUFFER_CONSOLE=y 143CONFIG_FRAMEBUFFER_CONSOLE=y
146CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 144CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
147CONFIG_FONTS=y
148CONFIG_FONT_8x8=y
149CONFIG_FONT_ACORN_8x8=y
150CONFIG_FONT_MINI_4x6=y
151CONFIG_LOGO=y 145CONFIG_LOGO=y
146CONFIG_SOUND=y
147CONFIG_SND=y
148CONFIG_SND_SOC=y
149CONFIG_SND_ATMEL_SOC=y
150CONFIG_SND_AT91_SOC_SAM9G20_WM8731=y
151CONFIG_SND_ATMEL_SOC_WM8904=y
152CONFIG_SND_AT91_SOC_SAM9X5_WM8731=y
152CONFIG_USB=y 153CONFIG_USB=y
153CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 154CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
154CONFIG_USB_EHCI_HCD=y 155CONFIG_USB_EHCI_HCD=y
@@ -169,6 +170,7 @@ CONFIG_MMC_SPI=y
169CONFIG_NEW_LEDS=y 170CONFIG_NEW_LEDS=y
170CONFIG_LEDS_CLASS=y 171CONFIG_LEDS_CLASS=y
171CONFIG_LEDS_GPIO=y 172CONFIG_LEDS_GPIO=y
173CONFIG_LEDS_PWM=y
172CONFIG_LEDS_TRIGGERS=y 174CONFIG_LEDS_TRIGGERS=y
173CONFIG_LEDS_TRIGGER_TIMER=y 175CONFIG_LEDS_TRIGGER_TIMER=y
174CONFIG_LEDS_TRIGGER_HEARTBEAT=y 176CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -178,7 +180,12 @@ CONFIG_RTC_DRV_RV3029C2=y
178CONFIG_RTC_DRV_AT91RM9200=y 180CONFIG_RTC_DRV_AT91RM9200=y
179CONFIG_RTC_DRV_AT91SAM9=y 181CONFIG_RTC_DRV_AT91SAM9=y
180CONFIG_DMADEVICES=y 182CONFIG_DMADEVICES=y
183CONFIG_AT_HDMAC=y
181# CONFIG_IOMMU_SUPPORT is not set 184# CONFIG_IOMMU_SUPPORT is not set
185CONFIG_IIO=y
186CONFIG_AT91_ADC=y
187CONFIG_PWM=y
188CONFIG_PWM_ATMEL=y
182CONFIG_EXT4_FS=y 189CONFIG_EXT4_FS=y
183CONFIG_FANOTIFY=y 190CONFIG_FANOTIFY=y
184CONFIG_VFAT_FS=y 191CONFIG_VFAT_FS=y
@@ -209,3 +216,7 @@ CONFIG_CRC_CCITT=y
209CONFIG_CRC_ITU_T=y 216CONFIG_CRC_ITU_T=y
210CONFIG_CRC7=m 217CONFIG_CRC7=m
211CONFIG_AVERAGE=y 218CONFIG_AVERAGE=y
219CONFIG_FONTS=y
220CONFIG_FONT_8x8=y
221CONFIG_FONT_ACORN_8x8=y
222CONFIG_FONT_MINI_4x6=y
diff --git a/arch/arm/configs/at91sam9260_9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig
index c4c160fc8791..3ada05d639ad 100644
--- a/arch/arm/configs/at91sam9260_9g20_defconfig
+++ b/arch/arm/configs/at91sam9260_9g20_defconfig
@@ -54,7 +54,6 @@ CONFIG_DEVTMPFS=y
54CONFIG_DEVTMPFS_MOUNT=y 54CONFIG_DEVTMPFS_MOUNT=y
55CONFIG_MTD=y 55CONFIG_MTD=y
56CONFIG_MTD_CMDLINE_PARTS=y 56CONFIG_MTD_CMDLINE_PARTS=y
57CONFIG_MTD_OF_PARTS=y
58CONFIG_MTD_BLOCK=y 57CONFIG_MTD_BLOCK=y
59CONFIG_MTD_DATAFLASH=y 58CONFIG_MTD_DATAFLASH=y
60CONFIG_MTD_NAND=y 59CONFIG_MTD_NAND=y
@@ -66,13 +65,10 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
66CONFIG_EEPROM_AT25=y 65CONFIG_EEPROM_AT25=y
67CONFIG_SCSI=y 66CONFIG_SCSI=y
68CONFIG_BLK_DEV_SD=y 67CONFIG_BLK_DEV_SD=y
69CONFIG_SCSI_MULTI_LUN=y
70# CONFIG_SCSI_LOWLEVEL is not set 68# CONFIG_SCSI_LOWLEVEL is not set
71CONFIG_NETDEVICES=y 69CONFIG_NETDEVICES=y
72CONFIG_MII=y
73CONFIG_MACB=y 70CONFIG_MACB=y
74# CONFIG_NET_VENDOR_BROADCOM is not set 71# CONFIG_NET_VENDOR_BROADCOM is not set
75# CONFIG_NET_VENDOR_CHELSIO is not set
76# CONFIG_NET_VENDOR_FARADAY is not set 72# CONFIG_NET_VENDOR_FARADAY is not set
77# CONFIG_NET_VENDOR_INTEL is not set 73# CONFIG_NET_VENDOR_INTEL is not set
78# CONFIG_NET_VENDOR_MARVELL is not set 74# CONFIG_NET_VENDOR_MARVELL is not set
@@ -86,7 +82,6 @@ CONFIG_SMSC_PHY=y
86# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 82# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
87CONFIG_KEYBOARD_GPIO=y 83CONFIG_KEYBOARD_GPIO=y
88# CONFIG_INPUT_MOUSE is not set 84# CONFIG_INPUT_MOUSE is not set
89# CONFIG_SERIO is not set
90CONFIG_SERIAL_ATMEL=y 85CONFIG_SERIAL_ATMEL=y
91CONFIG_SERIAL_ATMEL_CONSOLE=y 86CONFIG_SERIAL_ATMEL_CONSOLE=y
92CONFIG_HW_RANDOM=y 87CONFIG_HW_RANDOM=y
@@ -97,6 +92,8 @@ CONFIG_SPI=y
97CONFIG_SPI_ATMEL=y 92CONFIG_SPI_ATMEL=y
98CONFIG_SPI_SPIDEV=y 93CONFIG_SPI_SPIDEV=y
99CONFIG_GPIO_SYSFS=y 94CONFIG_GPIO_SYSFS=y
95CONFIG_POWER_SUPPLY=y
96CONFIG_POWER_RESET=y
100# CONFIG_HWMON is not set 97# CONFIG_HWMON is not set
101CONFIG_WATCHDOG=y 98CONFIG_WATCHDOG=y
102CONFIG_WATCHDOG_NOWAYOUT=y 99CONFIG_WATCHDOG_NOWAYOUT=y
@@ -127,6 +124,8 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
127CONFIG_RTC_CLASS=y 124CONFIG_RTC_CLASS=y
128CONFIG_RTC_DRV_RV3029C2=y 125CONFIG_RTC_DRV_RV3029C2=y
129CONFIG_RTC_DRV_AT91SAM9=y 126CONFIG_RTC_DRV_AT91SAM9=y
127CONFIG_IIO=y
128CONFIG_AT91_ADC=y
130CONFIG_EXT4_FS=y 129CONFIG_EXT4_FS=y
131CONFIG_VFAT_FS=y 130CONFIG_VFAT_FS=y
132CONFIG_TMPFS=y 131CONFIG_TMPFS=y
@@ -139,10 +138,8 @@ CONFIG_NLS_CODEPAGE_850=y
139CONFIG_NLS_ISO8859_1=y 138CONFIG_NLS_ISO8859_1=y
140CONFIG_NLS_ISO8859_15=y 139CONFIG_NLS_ISO8859_15=y
141CONFIG_NLS_UTF8=y 140CONFIG_NLS_UTF8=y
142# CONFIG_ENABLE_WARN_DEPRECATED is not set
143CONFIG_DEBUG_KERNEL=y
144CONFIG_DEBUG_INFO=y 141CONFIG_DEBUG_INFO=y
142# CONFIG_ENABLE_WARN_DEPRECATED is not set
145# CONFIG_FTRACE is not set 143# CONFIG_FTRACE is not set
146CONFIG_DEBUG_LL=y 144CONFIG_DEBUG_LL=y
147CONFIG_AT91_DEBUG_LL_DBGU0=y
148CONFIG_EARLY_PRINTK=y 145CONFIG_EARLY_PRINTK=y
diff --git a/arch/arm/configs/at91sam9261_9g10_defconfig b/arch/arm/configs/at91sam9261_9g10_defconfig
index f80e993b04ce..0c505d801e25 100644
--- a/arch/arm/configs/at91sam9261_9g10_defconfig
+++ b/arch/arm/configs/at91sam9261_9g10_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_KERNEL_LZMA=y 2CONFIG_KERNEL_LZMA=y
4# CONFIG_SWAP is not set 3# CONFIG_SWAP is not set
@@ -20,7 +19,6 @@ CONFIG_MACH_AT91SAM9261EK=y
20CONFIG_MACH_AT91SAM9G10EK=y 19CONFIG_MACH_AT91SAM9G10EK=y
21# CONFIG_ARM_THUMB is not set 20# CONFIG_ARM_THUMB is not set
22CONFIG_AEABI=y 21CONFIG_AEABI=y
23# CONFIG_OABI_COMPAT is not set
24CONFIG_ZBOOT_ROM_TEXT=0x0 22CONFIG_ZBOOT_ROM_TEXT=0x0
25CONFIG_ZBOOT_ROM_BSS=0x0 23CONFIG_ZBOOT_ROM_BSS=0x0
26CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" 24CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
@@ -55,7 +53,6 @@ CONFIG_ATMEL_TCLIB=y
55CONFIG_ATMEL_SSC=y 53CONFIG_ATMEL_SSC=y
56CONFIG_SCSI=y 54CONFIG_SCSI=y
57CONFIG_BLK_DEV_SD=y 55CONFIG_BLK_DEV_SD=y
58CONFIG_SCSI_MULTI_LUN=y
59CONFIG_NETDEVICES=y 56CONFIG_NETDEVICES=y
60CONFIG_DM9000=y 57CONFIG_DM9000=y
61CONFIG_USB_ZD1201=m 58CONFIG_USB_ZD1201=m
@@ -87,6 +84,8 @@ CONFIG_I2C_CHARDEV=y
87CONFIG_I2C_GPIO=y 84CONFIG_I2C_GPIO=y
88CONFIG_SPI=y 85CONFIG_SPI=y
89CONFIG_SPI_ATMEL=y 86CONFIG_SPI_ATMEL=y
87CONFIG_POWER_SUPPLY=y
88CONFIG_POWER_RESET=y
90# CONFIG_HWMON is not set 89# CONFIG_HWMON is not set
91CONFIG_WATCHDOG=y 90CONFIG_WATCHDOG=y
92CONFIG_WATCHDOG_NOWAYOUT=y 91CONFIG_WATCHDOG_NOWAYOUT=y
diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig
index e40026364e57..8b671c977b81 100644
--- a/arch/arm/configs/at91sam9263_defconfig
+++ b/arch/arm/configs/at91sam9263_defconfig
@@ -18,7 +18,6 @@ CONFIG_MACH_AT91SAM9263EK=y
18CONFIG_MTD_AT91_DATAFLASH_CARD=y 18CONFIG_MTD_AT91_DATAFLASH_CARD=y
19# CONFIG_ARM_THUMB is not set 19# CONFIG_ARM_THUMB is not set
20CONFIG_AEABI=y 20CONFIG_AEABI=y
21# CONFIG_OABI_COMPAT is not set
22CONFIG_ZBOOT_ROM_TEXT=0x0 21CONFIG_ZBOOT_ROM_TEXT=0x0
23CONFIG_ZBOOT_ROM_BSS=0x0 22CONFIG_ZBOOT_ROM_BSS=0x0
24CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" 23CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
@@ -51,7 +50,6 @@ CONFIG_DEVTMPFS=y
51CONFIG_DEVTMPFS_MOUNT=y 50CONFIG_DEVTMPFS_MOUNT=y
52CONFIG_MTD=y 51CONFIG_MTD=y
53CONFIG_MTD_CMDLINE_PARTS=y 52CONFIG_MTD_CMDLINE_PARTS=y
54CONFIG_MTD_CHAR=y
55CONFIG_MTD_BLOCK=y 53CONFIG_MTD_BLOCK=y
56CONFIG_NFTL=y 54CONFIG_NFTL=y
57CONFIG_NFTL_RW=y 55CONFIG_NFTL_RW=y
@@ -64,13 +62,10 @@ CONFIG_MTD_UBI_GLUEBI=y
64CONFIG_BLK_DEV_LOOP=y 62CONFIG_BLK_DEV_LOOP=y
65CONFIG_BLK_DEV_RAM=y 63CONFIG_BLK_DEV_RAM=y
66CONFIG_BLK_DEV_RAM_SIZE=8192 64CONFIG_BLK_DEV_RAM_SIZE=8192
67CONFIG_ATMEL_PWM=y
68CONFIG_ATMEL_TCLIB=y 65CONFIG_ATMEL_TCLIB=y
69CONFIG_SCSI=y 66CONFIG_SCSI=y
70CONFIG_BLK_DEV_SD=y 67CONFIG_BLK_DEV_SD=y
71CONFIG_SCSI_MULTI_LUN=y
72CONFIG_NETDEVICES=y 68CONFIG_NETDEVICES=y
73CONFIG_MII=y
74CONFIG_MACB=y 69CONFIG_MACB=y
75CONFIG_SMSC_PHY=y 70CONFIG_SMSC_PHY=y
76# CONFIG_WLAN is not set 71# CONFIG_WLAN is not set
@@ -92,6 +87,8 @@ CONFIG_I2C_GPIO=y
92CONFIG_SPI=y 87CONFIG_SPI=y
93CONFIG_SPI_ATMEL=y 88CONFIG_SPI_ATMEL=y
94CONFIG_GPIO_SYSFS=y 89CONFIG_GPIO_SYSFS=y
90CONFIG_POWER_SUPPLY=y
91CONFIG_POWER_RESET=y
95# CONFIG_HWMON is not set 92# CONFIG_HWMON is not set
96CONFIG_WATCHDOG=y 93CONFIG_WATCHDOG=y
97CONFIG_WATCHDOG_NOWAYOUT=y 94CONFIG_WATCHDOG_NOWAYOUT=y
@@ -103,7 +100,6 @@ CONFIG_LCD_CLASS_DEVICE=y
103CONFIG_BACKLIGHT_CLASS_DEVICE=y 100CONFIG_BACKLIGHT_CLASS_DEVICE=y
104CONFIG_FRAMEBUFFER_CONSOLE=y 101CONFIG_FRAMEBUFFER_CONSOLE=y
105CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 102CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
106CONFIG_FONTS=y
107CONFIG_LOGO=y 103CONFIG_LOGO=y
108CONFIG_SOUND=y 104CONFIG_SOUND=y
109CONFIG_SND=y 105CONFIG_SND=y
@@ -129,12 +125,14 @@ CONFIG_SDIO_UART=m
129CONFIG_MMC_ATMELMCI=m 125CONFIG_MMC_ATMELMCI=m
130CONFIG_NEW_LEDS=y 126CONFIG_NEW_LEDS=y
131CONFIG_LEDS_CLASS=y 127CONFIG_LEDS_CLASS=y
132CONFIG_LEDS_ATMEL_PWM=y
133CONFIG_LEDS_GPIO=y 128CONFIG_LEDS_GPIO=y
129CONFIG_LEDS_PWM=y
134CONFIG_LEDS_TRIGGERS=y 130CONFIG_LEDS_TRIGGERS=y
135CONFIG_LEDS_TRIGGER_HEARTBEAT=y 131CONFIG_LEDS_TRIGGER_HEARTBEAT=y
136CONFIG_RTC_CLASS=y 132CONFIG_RTC_CLASS=y
137CONFIG_RTC_DRV_AT91SAM9=y 133CONFIG_RTC_DRV_AT91SAM9=y
134CONFIG_PWM=y
135CONFIG_PWM_ATMEL=y
138CONFIG_EXT4_FS=y 136CONFIG_EXT4_FS=y
139CONFIG_VFAT_FS=y 137CONFIG_VFAT_FS=y
140CONFIG_TMPFS=y 138CONFIG_TMPFS=y
@@ -150,3 +148,4 @@ CONFIG_NLS_ISO8859_1=y
150CONFIG_NLS_UTF8=y 148CONFIG_NLS_UTF8=y
151CONFIG_DEBUG_USER=y 149CONFIG_DEBUG_USER=y
152CONFIG_XZ_DEC=y 150CONFIG_XZ_DEC=y
151CONFIG_FONTS=y
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
index c6661a60025d..f66d1a1b64bf 100644
--- a/arch/arm/configs/at91sam9g45_defconfig
+++ b/arch/arm/configs/at91sam9g45_defconfig
@@ -20,7 +20,6 @@ CONFIG_MACH_AT91SAM9M10G45EK=y
20CONFIG_MACH_AT91SAM9_DT=y 20CONFIG_MACH_AT91SAM9_DT=y
21CONFIG_AT91_SLOW_CLOCK=y 21CONFIG_AT91_SLOW_CLOCK=y
22CONFIG_AEABI=y 22CONFIG_AEABI=y
23# CONFIG_OABI_COMPAT is not set
24CONFIG_UACCESS_WITH_MEMCPY=y 23CONFIG_UACCESS_WITH_MEMCPY=y
25CONFIG_ZBOOT_ROM_TEXT=0x0 24CONFIG_ZBOOT_ROM_TEXT=0x0
26CONFIG_ZBOOT_ROM_BSS=0x0 25CONFIG_ZBOOT_ROM_BSS=0x0
@@ -51,7 +50,6 @@ CONFIG_DEVTMPFS_MOUNT=y
51# CONFIG_PREVENT_FIRMWARE_BUILD is not set 50# CONFIG_PREVENT_FIRMWARE_BUILD is not set
52CONFIG_MTD=y 51CONFIG_MTD=y
53CONFIG_MTD_CMDLINE_PARTS=y 52CONFIG_MTD_CMDLINE_PARTS=y
54CONFIG_MTD_CHAR=y
55CONFIG_MTD_BLOCK=y 53CONFIG_MTD_BLOCK=y
56CONFIG_MTD_DATAFLASH=y 54CONFIG_MTD_DATAFLASH=y
57CONFIG_MTD_NAND=y 55CONFIG_MTD_NAND=y
@@ -62,15 +60,12 @@ CONFIG_BLK_DEV_LOOP=y
62CONFIG_BLK_DEV_RAM=y 60CONFIG_BLK_DEV_RAM=y
63CONFIG_BLK_DEV_RAM_COUNT=4 61CONFIG_BLK_DEV_RAM_COUNT=4
64CONFIG_BLK_DEV_RAM_SIZE=8192 62CONFIG_BLK_DEV_RAM_SIZE=8192
65CONFIG_ATMEL_PWM=y
66CONFIG_ATMEL_TCLIB=y 63CONFIG_ATMEL_TCLIB=y
67CONFIG_ATMEL_SSC=y 64CONFIG_ATMEL_SSC=y
68CONFIG_SCSI=y 65CONFIG_SCSI=y
69CONFIG_BLK_DEV_SD=y 66CONFIG_BLK_DEV_SD=y
70CONFIG_SCSI_MULTI_LUN=y
71# CONFIG_SCSI_LOWLEVEL is not set 67# CONFIG_SCSI_LOWLEVEL is not set
72CONFIG_NETDEVICES=y 68CONFIG_NETDEVICES=y
73CONFIG_MII=y
74CONFIG_MACB=y 69CONFIG_MACB=y
75CONFIG_DAVICOM_PHY=y 70CONFIG_DAVICOM_PHY=y
76# CONFIG_INPUT_MOUSEDEV is not set 71# CONFIG_INPUT_MOUSEDEV is not set
@@ -93,18 +88,22 @@ CONFIG_I2C_CHARDEV=y
93CONFIG_I2C_GPIO=y 88CONFIG_I2C_GPIO=y
94CONFIG_SPI=y 89CONFIG_SPI=y
95CONFIG_SPI_ATMEL=y 90CONFIG_SPI_ATMEL=y
91CONFIG_POWER_SUPPLY=y
92CONFIG_POWER_RESET=y
96# CONFIG_HWMON is not set 93# CONFIG_HWMON is not set
94CONFIG_WATCHDOG=y
95CONFIG_WATCHDOG_NOWAYOUT=y
96CONFIG_AT91SAM9X_WATCHDOG=y
97CONFIG_FB=y 97CONFIG_FB=y
98CONFIG_FB_ATMEL=y 98CONFIG_FB_ATMEL=y
99CONFIG_BACKLIGHT_LCD_SUPPORT=y 99CONFIG_BACKLIGHT_LCD_SUPPORT=y
100CONFIG_LCD_CLASS_DEVICE=y 100CONFIG_LCD_CLASS_DEVICE=y
101CONFIG_BACKLIGHT_CLASS_DEVICE=y 101CONFIG_BACKLIGHT_CLASS_DEVICE=y
102CONFIG_BACKLIGHT_ATMEL_LCDC=y 102CONFIG_BACKLIGHT_ATMEL_LCDC=y
103CONFIG_BACKLIGHT_ATMEL_PWM=y
104# CONFIG_BACKLIGHT_GENERIC is not set 103# CONFIG_BACKLIGHT_GENERIC is not set
104CONFIG_BACKLIGHT_PWM=y
105CONFIG_FRAMEBUFFER_CONSOLE=y 105CONFIG_FRAMEBUFFER_CONSOLE=y
106CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 106CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
107CONFIG_FONTS=y
108CONFIG_LOGO=y 107CONFIG_LOGO=y
109CONFIG_SOUND=y 108CONFIG_SOUND=y
110CONFIG_SND=y 109CONFIG_SND=y
@@ -135,6 +134,7 @@ CONFIG_MMC_ATMELMCI=y
135CONFIG_NEW_LEDS=y 134CONFIG_NEW_LEDS=y
136CONFIG_LEDS_CLASS=y 135CONFIG_LEDS_CLASS=y
137CONFIG_LEDS_GPIO=y 136CONFIG_LEDS_GPIO=y
137CONFIG_LEDS_PWM=y
138CONFIG_LEDS_TRIGGERS=y 138CONFIG_LEDS_TRIGGERS=y
139CONFIG_LEDS_TRIGGER_TIMER=y 139CONFIG_LEDS_TRIGGER_TIMER=y
140CONFIG_LEDS_TRIGGER_HEARTBEAT=y 140CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -147,6 +147,8 @@ CONFIG_DMATEST=m
147# CONFIG_IOMMU_SUPPORT is not set 147# CONFIG_IOMMU_SUPPORT is not set
148CONFIG_IIO=y 148CONFIG_IIO=y
149CONFIG_AT91_ADC=y 149CONFIG_AT91_ADC=y
150CONFIG_PWM=y
151CONFIG_PWM_ATMEL=y
150CONFIG_EXT4_FS=y 152CONFIG_EXT4_FS=y
151CONFIG_FANOTIFY=y 153CONFIG_FANOTIFY=y
152CONFIG_VFAT_FS=y 154CONFIG_VFAT_FS=y
@@ -159,8 +161,8 @@ CONFIG_NLS_CODEPAGE_437=y
159CONFIG_NLS_CODEPAGE_850=y 161CONFIG_NLS_CODEPAGE_850=y
160CONFIG_NLS_ISO8859_1=y 162CONFIG_NLS_ISO8859_1=y
161CONFIG_STRIP_ASM_SYMS=y 163CONFIG_STRIP_ASM_SYMS=y
162# CONFIG_SCHED_DEBUG is not set
163CONFIG_DEBUG_MEMORY_INIT=y 164CONFIG_DEBUG_MEMORY_INIT=y
165# CONFIG_SCHED_DEBUG is not set
164# CONFIG_FTRACE is not set 166# CONFIG_FTRACE is not set
165CONFIG_DEBUG_USER=y 167CONFIG_DEBUG_USER=y
166CONFIG_DEBUG_LL=y 168CONFIG_DEBUG_LL=y
@@ -170,3 +172,4 @@ CONFIG_CRYPTO_ECB=y
170CONFIG_CRYPTO_USER_API_HASH=m 172CONFIG_CRYPTO_USER_API_HASH=m
171CONFIG_CRYPTO_USER_API_SKCIPHER=m 173CONFIG_CRYPTO_USER_API_SKCIPHER=m
172# CONFIG_CRYPTO_HW is not set 174# CONFIG_CRYPTO_HW is not set
175CONFIG_FONTS=y
diff --git a/arch/arm/configs/at91sam9rl_defconfig b/arch/arm/configs/at91sam9rl_defconfig
index 5d7797d43d23..4c26d344ae88 100644
--- a/arch/arm/configs/at91sam9rl_defconfig
+++ b/arch/arm/configs/at91sam9rl_defconfig
@@ -2,8 +2,8 @@
2# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
5CONFIG_EMBEDDED=y
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
6CONFIG_EMBEDDED=y
7CONFIG_SLAB=y 7CONFIG_SLAB=y
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
@@ -37,7 +37,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4
37CONFIG_BLK_DEV_RAM_SIZE=24576 37CONFIG_BLK_DEV_RAM_SIZE=24576
38CONFIG_SCSI=y 38CONFIG_SCSI=y
39CONFIG_BLK_DEV_SD=y 39CONFIG_BLK_DEV_SD=y
40CONFIG_SCSI_MULTI_LUN=y
41# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 40# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
42CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 41CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
43CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 42CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
@@ -54,20 +53,31 @@ CONFIG_I2C_CHARDEV=y
54CONFIG_I2C_GPIO=y 53CONFIG_I2C_GPIO=y
55CONFIG_SPI=y 54CONFIG_SPI=y
56CONFIG_SPI_ATMEL=y 55CONFIG_SPI_ATMEL=y
56CONFIG_POWER_SUPPLY=y
57CONFIG_POWER_RESET=y
57# CONFIG_HWMON is not set 58# CONFIG_HWMON is not set
58CONFIG_WATCHDOG=y 59CONFIG_WATCHDOG=y
59CONFIG_WATCHDOG_NOWAYOUT=y 60CONFIG_WATCHDOG_NOWAYOUT=y
60CONFIG_AT91SAM9X_WATCHDOG=y 61CONFIG_AT91SAM9X_WATCHDOG=y
61CONFIG_FB=y 62CONFIG_FB=y
62CONFIG_FB_ATMEL=y 63CONFIG_FB_ATMEL=y
64CONFIG_USB_GADGET=y
65CONFIG_USB_ATMEL_USBA=y
63CONFIG_MMC=y 66CONFIG_MMC=y
64CONFIG_MMC_ATMELMCI=m 67CONFIG_MMC_ATMELMCI=m
68CONFIG_NEW_LEDS=y
69CONFIG_LEDS_CLASS=y
70CONFIG_LEDS_GPIO=y
71CONFIG_LEDS_PWM=y
72CONFIG_LEDS_TRIGGERS=y
73CONFIG_LEDS_TRIGGER_HEARTBEAT=y
65CONFIG_RTC_CLASS=y 74CONFIG_RTC_CLASS=y
66CONFIG_RTC_DRV_AT91SAM9=y 75CONFIG_RTC_DRV_AT91SAM9=y
67CONFIG_IIO=y 76CONFIG_IIO=y
68CONFIG_AT91_ADC=y 77CONFIG_AT91_ADC=y
69CONFIG_EXT2_FS=y 78CONFIG_PWM=y
70CONFIG_MSDOS_FS=y 79CONFIG_PWM_ATMEL=y
80CONFIG_EXT4_FS=y
71CONFIG_VFAT_FS=y 81CONFIG_VFAT_FS=y
72CONFIG_TMPFS=y 82CONFIG_TMPFS=y
73CONFIG_UBIFS_FS=y 83CONFIG_UBIFS_FS=y
@@ -77,7 +87,6 @@ CONFIG_NLS_CODEPAGE_850=y
77CONFIG_NLS_ISO8859_1=y 87CONFIG_NLS_ISO8859_1=y
78CONFIG_NLS_ISO8859_15=y 88CONFIG_NLS_ISO8859_15=y
79CONFIG_NLS_UTF8=y 89CONFIG_NLS_UTF8=y
80CONFIG_DEBUG_KERNEL=y
81CONFIG_DEBUG_INFO=y 90CONFIG_DEBUG_INFO=y
82CONFIG_DEBUG_USER=y 91CONFIG_DEBUG_USER=y
83CONFIG_DEBUG_LL=y 92CONFIG_DEBUG_LL=y
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
index 0302d293fba0..31cb07388885 100644
--- a/arch/arm/configs/bcm2835_defconfig
+++ b/arch/arm/configs/bcm2835_defconfig
@@ -98,6 +98,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
98CONFIG_LEDS_TRIGGER_CAMERA=y 98CONFIG_LEDS_TRIGGER_CAMERA=y
99CONFIG_STAGING=y 99CONFIG_STAGING=y
100CONFIG_USB_DWC2=y 100CONFIG_USB_DWC2=y
101CONFIG_USB_DWC2_HOST=y
101# CONFIG_IOMMU_SUPPORT is not set 102# CONFIG_IOMMU_SUPPORT is not set
102CONFIG_EXT2_FS=y 103CONFIG_EXT2_FS=y
103CONFIG_EXT2_FS_XATTR=y 104CONFIG_EXT2_FS_XATTR=y
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index fbebcbce1e8c..bc614f44b33d 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -83,7 +83,6 @@ CONFIG_I2C_CHARDEV=y
83CONFIG_MFD_BCM590XX=y 83CONFIG_MFD_BCM590XX=y
84CONFIG_REGULATOR=y 84CONFIG_REGULATOR=y
85CONFIG_REGULATOR_FIXED_VOLTAGE=y 85CONFIG_REGULATOR_FIXED_VOLTAGE=y
86CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
87CONFIG_REGULATOR_USERSPACE_CONSUMER=y 86CONFIG_REGULATOR_USERSPACE_CONSUMER=y
88CONFIG_REGULATOR_BCM590XX=y 87CONFIG_REGULATOR_BCM590XX=y
89 88
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index e816140d81c5..1dde5daa84f9 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -29,7 +29,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0
29CONFIG_ARM_APPENDED_DTB=y 29CONFIG_ARM_APPENDED_DTB=y
30CONFIG_VFP=y 30CONFIG_VFP=y
31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32# CONFIG_SUSPEND is not set
33CONFIG_PM_RUNTIME=y 32CONFIG_PM_RUNTIME=y
34CONFIG_NET=y 33CONFIG_NET=y
35CONFIG_PACKET=y 34CONFIG_PACKET=y
@@ -55,6 +54,7 @@ CONFIG_MTD_BLOCK=y
55CONFIG_MTD_CFI=y 54CONFIG_MTD_CFI=y
56CONFIG_MTD_CFI_AMDSTD=y 55CONFIG_MTD_CFI_AMDSTD=y
57CONFIG_MTD_M25P80=y 56CONFIG_MTD_M25P80=y
57CONFIG_MTD_SPI_NOR=y
58CONFIG_SCSI=y 58CONFIG_SCSI=y
59CONFIG_BLK_DEV_SD=y 59CONFIG_BLK_DEV_SD=y
60CONFIG_NETDEVICES=y 60CONFIG_NETDEVICES=y
@@ -82,6 +82,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
82# CONFIG_HWMON is not set 82# CONFIG_HWMON is not set
83CONFIG_I2C=y 83CONFIG_I2C=y
84CONFIG_I2C_RCAR=y 84CONFIG_I2C_RCAR=y
85CONFIG_GPIO_RCAR=y
85CONFIG_REGULATOR=y 86CONFIG_REGULATOR=y
86CONFIG_MEDIA_SUPPORT=y 87CONFIG_MEDIA_SUPPORT=y
87CONFIG_MEDIA_CAMERA_SUPPORT=y 88CONFIG_MEDIA_CAMERA_SUPPORT=y
diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig
index d95763d5f0d8..eb440aae4283 100644
--- a/arch/arm/configs/ezx_defconfig
+++ b/arch/arm/configs/ezx_defconfig
@@ -230,7 +230,6 @@ CONFIG_POWER_SUPPLY=y
230CONFIG_EZX_PCAP=y 230CONFIG_EZX_PCAP=y
231CONFIG_REGULATOR=y 231CONFIG_REGULATOR=y
232CONFIG_REGULATOR_DEBUG=y 232CONFIG_REGULATOR_DEBUG=y
233CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
234CONFIG_REGULATOR_USERSPACE_CONSUMER=y 233CONFIG_REGULATOR_USERSPACE_CONSUMER=y
235CONFIG_REGULATOR_PCAP=y 234CONFIG_REGULATOR_PCAP=y
236CONFIG_MEDIA_SUPPORT=y 235CONFIG_MEDIA_SUPPORT=y
diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig
index fd996bb13022..182e54692664 100644
--- a/arch/arm/configs/imote2_defconfig
+++ b/arch/arm/configs/imote2_defconfig
@@ -208,7 +208,6 @@ CONFIG_POWER_SUPPLY=y
208CONFIG_PMIC_DA903X=y 208CONFIG_PMIC_DA903X=y
209CONFIG_REGULATOR=y 209CONFIG_REGULATOR=y
210CONFIG_REGULATOR_DEBUG=y 210CONFIG_REGULATOR_DEBUG=y
211CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
212CONFIG_REGULATOR_USERSPACE_CONSUMER=y 211CONFIG_REGULATOR_USERSPACE_CONSUMER=y
213CONFIG_REGULATOR_DA903X=y 212CONFIG_REGULATOR_DA903X=y
214CONFIG_MEDIA_SUPPORT=y 213CONFIG_MEDIA_SUPPORT=y
diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
index 86faab565a96..b33d19b7f134 100644
--- a/arch/arm/configs/koelsch_defconfig
+++ b/arch/arm/configs/koelsch_defconfig
@@ -15,6 +15,9 @@ CONFIG_MACH_KOELSCH=y
15CONFIG_CPU_BPREDICT_DISABLE=y 15CONFIG_CPU_BPREDICT_DISABLE=y
16CONFIG_PL310_ERRATA_588369=y 16CONFIG_PL310_ERRATA_588369=y
17CONFIG_ARM_ERRATA_754322=y 17CONFIG_ARM_ERRATA_754322=y
18CONFIG_PCI=y
19CONFIG_PCI_RCAR_GEN2=y
20CONFIG_PCI_RCAR_GEN2_PCIE=y
18CONFIG_SMP=y 21CONFIG_SMP=y
19CONFIG_SCHED_MC=y 22CONFIG_SCHED_MC=y
20CONFIG_NR_CPUS=8 23CONFIG_NR_CPUS=8
@@ -42,6 +45,8 @@ CONFIG_ATA=y
42CONFIG_SATA_RCAR=y 45CONFIG_SATA_RCAR=y
43CONFIG_MTD=y 46CONFIG_MTD=y
44CONFIG_MTD_M25P80=y 47CONFIG_MTD_M25P80=y
48CONFIG_MTD_SPI_NOR=y
49CONFIG_EEPROM_AT24=y
45CONFIG_NETDEVICES=y 50CONFIG_NETDEVICES=y
46# CONFIG_NET_VENDOR_ARC is not set 51# CONFIG_NET_VENDOR_ARC is not set
47# CONFIG_NET_CADENCE is not set 52# CONFIG_NET_CADENCE is not set
@@ -66,9 +71,12 @@ CONFIG_SERIAL_SH_SCI=y
66CONFIG_SERIAL_SH_SCI_NR_UARTS=20 71CONFIG_SERIAL_SH_SCI_NR_UARTS=20
67CONFIG_SERIAL_SH_SCI_CONSOLE=y 72CONFIG_SERIAL_SH_SCI_CONSOLE=y
68CONFIG_I2C=y 73CONFIG_I2C=y
74CONFIG_I2C_MUX=y
75CONFIG_I2C_SH_MOBILE=y
69CONFIG_I2C_RCAR=y 76CONFIG_I2C_RCAR=y
70CONFIG_SPI=y 77CONFIG_SPI=y
71CONFIG_SPI_RSPI=y 78CONFIG_SPI_RSPI=y
79CONFIG_SPI_SH_MSIOF=y
72CONFIG_GPIOLIB=y 80CONFIG_GPIOLIB=y
73CONFIG_GPIO_RCAR=y 81CONFIG_GPIO_RCAR=y
74# CONFIG_HWMON is not set 82# CONFIG_HWMON is not set
@@ -76,7 +84,16 @@ CONFIG_THERMAL=y
76CONFIG_RCAR_THERMAL=y 84CONFIG_RCAR_THERMAL=y
77CONFIG_REGULATOR=y 85CONFIG_REGULATOR=y
78CONFIG_REGULATOR_FIXED_VOLTAGE=y 86CONFIG_REGULATOR_FIXED_VOLTAGE=y
87CONFIG_REGULATOR_DA9210=y
79CONFIG_REGULATOR_GPIO=y 88CONFIG_REGULATOR_GPIO=y
89CONFIG_MEDIA_SUPPORT=y
90CONFIG_MEDIA_CAMERA_SUPPORT=y
91CONFIG_V4L_PLATFORM_DRIVERS=y
92CONFIG_SOC_CAMERA=y
93CONFIG_SOC_CAMERA_PLATFORM=y
94CONFIG_VIDEO_RCAR_VIN=y
95# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
96CONFIG_VIDEO_ADV7180=y
80# CONFIG_HID is not set 97# CONFIG_HID is not set
81# CONFIG_USB_SUPPORT is not set 98# CONFIG_USB_SUPPORT is not set
82CONFIG_MMC=y 99CONFIG_MMC=y
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index bd097d455f87..8cb115d74fdf 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -119,6 +119,7 @@ CONFIG_MMC_SDHI=y
119CONFIG_MMC_SH_MMCIF=y 119CONFIG_MMC_SH_MMCIF=y
120CONFIG_NEW_LEDS=y 120CONFIG_NEW_LEDS=y
121CONFIG_LEDS_CLASS=y 121CONFIG_LEDS_CLASS=y
122CONFIG_LEDS_GPIO=y
122CONFIG_RTC_CLASS=y 123CONFIG_RTC_CLASS=y
123CONFIG_RTC_DRV_RS5C372=y 124CONFIG_RTC_DRV_RS5C372=y
124CONFIG_DMADEVICES=y 125CONFIG_DMADEVICES=y
diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
index 58702440472a..929c571ea29b 100644
--- a/arch/arm/configs/lager_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -22,6 +22,9 @@ CONFIG_ARM_ERRATA_458693=y
22CONFIG_ARM_ERRATA_460075=y 22CONFIG_ARM_ERRATA_460075=y
23CONFIG_ARM_ERRATA_743622=y 23CONFIG_ARM_ERRATA_743622=y
24CONFIG_ARM_ERRATA_754322=y 24CONFIG_ARM_ERRATA_754322=y
25CONFIG_PCI=y
26CONFIG_PCI_RCAR_GEN2=y
27CONFIG_PCI_RCAR_GEN2_PCIE=y
25CONFIG_HAVE_ARM_ARCH_TIMER=y 28CONFIG_HAVE_ARM_ARCH_TIMER=y
26CONFIG_AEABI=y 29CONFIG_AEABI=y
27# CONFIG_OABI_COMPAT is not set 30# CONFIG_OABI_COMPAT is not set
@@ -53,6 +56,7 @@ CONFIG_DEVTMPFS=y
53CONFIG_DEVTMPFS_MOUNT=y 56CONFIG_DEVTMPFS_MOUNT=y
54CONFIG_MTD=y 57CONFIG_MTD=y
55CONFIG_MTD_M25P80=y 58CONFIG_MTD_M25P80=y
59CONFIG_MTD_SPI_NOR=y
56CONFIG_BLK_DEV_SD=y 60CONFIG_BLK_DEV_SD=y
57CONFIG_ATA=y 61CONFIG_ATA=y
58CONFIG_SATA_RCAR=y 62CONFIG_SATA_RCAR=y
@@ -85,11 +89,12 @@ CONFIG_SERIAL_SH_SCI=y
85CONFIG_SERIAL_SH_SCI_NR_UARTS=10 89CONFIG_SERIAL_SH_SCI_NR_UARTS=10
86CONFIG_SERIAL_SH_SCI_CONSOLE=y 90CONFIG_SERIAL_SH_SCI_CONSOLE=y
87# CONFIG_HW_RANDOM is not set 91# CONFIG_HW_RANDOM is not set
88CONFIG_I2C=y
89CONFIG_I2C_GPIO=y 92CONFIG_I2C_GPIO=y
93CONFIG_I2C_SH_MOBILE=y
90CONFIG_I2C_RCAR=y 94CONFIG_I2C_RCAR=y
91CONFIG_SPI=y 95CONFIG_SPI=y
92CONFIG_SPI_RSPI=y 96CONFIG_SPI_RSPI=y
97CONFIG_SPI_SH_MSIOF=y
93CONFIG_GPIO_SH_PFC=y 98CONFIG_GPIO_SH_PFC=y
94CONFIG_GPIOLIB=y 99CONFIG_GPIOLIB=y
95CONFIG_GPIO_RCAR=y 100CONFIG_GPIO_RCAR=y
@@ -98,6 +103,7 @@ CONFIG_THERMAL=y
98CONFIG_RCAR_THERMAL=y 103CONFIG_RCAR_THERMAL=y
99CONFIG_REGULATOR=y 104CONFIG_REGULATOR=y
100CONFIG_REGULATOR_FIXED_VOLTAGE=y 105CONFIG_REGULATOR_FIXED_VOLTAGE=y
106CONFIG_REGULATOR_DA9210=y
101CONFIG_REGULATOR_GPIO=y 107CONFIG_REGULATOR_GPIO=y
102CONFIG_MEDIA_SUPPORT=y 108CONFIG_MEDIA_SUPPORT=y
103CONFIG_MEDIA_CAMERA_SUPPORT=y 109CONFIG_MEDIA_CAMERA_SUPPORT=y
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
index 398a367ffce8..9f56ca3985ae 100644
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
@@ -59,6 +59,7 @@ CONFIG_MTD_M25P80=y
59CONFIG_MTD_NAND=y 59CONFIG_MTD_NAND=y
60CONFIG_MTD_NAND_SLC_LPC32XX=y 60CONFIG_MTD_NAND_SLC_LPC32XX=y
61CONFIG_MTD_NAND_MLC_LPC32XX=y 61CONFIG_MTD_NAND_MLC_LPC32XX=y
62CONFIG_MTD_UBI=y
62CONFIG_BLK_DEV_LOOP=y 63CONFIG_BLK_DEV_LOOP=y
63CONFIG_BLK_DEV_CRYPTOLOOP=y 64CONFIG_BLK_DEV_CRYPTOLOOP=y
64CONFIG_BLK_DEV_RAM=y 65CONFIG_BLK_DEV_RAM=y
@@ -189,6 +190,7 @@ CONFIG_VFAT_FS=y
189CONFIG_TMPFS=y 190CONFIG_TMPFS=y
190CONFIG_JFFS2_FS=y 191CONFIG_JFFS2_FS=y
191CONFIG_JFFS2_FS_WBUF_VERIFY=y 192CONFIG_JFFS2_FS_WBUF_VERIFY=y
193CONFIG_UBIFS_FS=y
192CONFIG_CRAMFS=y 194CONFIG_CRAMFS=y
193CONFIG_NFS_FS=y 195CONFIG_NFS_FS=y
194CONFIG_ROOT_NFS=y 196CONFIG_ROOT_NFS=y
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 92994f7f6fd8..ff91630d34e1 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -84,6 +84,7 @@ CONFIG_GPIO_RCAR=y
84CONFIG_THERMAL=y 84CONFIG_THERMAL=y
85CONFIG_RCAR_THERMAL=y 85CONFIG_RCAR_THERMAL=y
86CONFIG_SSB=y 86CONFIG_SSB=y
87CONFIG_REGULATOR=y
87CONFIG_MEDIA_SUPPORT=y 88CONFIG_MEDIA_SUPPORT=y
88CONFIG_MEDIA_CAMERA_SUPPORT=y 89CONFIG_MEDIA_CAMERA_SUPPORT=y
89CONFIG_V4L_PLATFORM_DRIVERS=y 90CONFIG_V4L_PLATFORM_DRIVERS=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 691117bc7e2b..491b7d5523bf 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -30,6 +30,7 @@ CONFIG_ARCH_HI3xxx=y
30CONFIG_ARCH_HIX5HD2=y 30CONFIG_ARCH_HIX5HD2=y
31CONFIG_ARCH_HIP04=y 31CONFIG_ARCH_HIP04=y
32CONFIG_ARCH_KEYSTONE=y 32CONFIG_ARCH_KEYSTONE=y
33CONFIG_ARCH_MESON=y
33CONFIG_ARCH_MXC=y 34CONFIG_ARCH_MXC=y
34CONFIG_SOC_IMX51=y 35CONFIG_SOC_IMX51=y
35CONFIG_SOC_IMX53=y 36CONFIG_SOC_IMX53=y
@@ -43,6 +44,7 @@ CONFIG_SOC_AM33XX=y
43CONFIG_SOC_AM43XX=y 44CONFIG_SOC_AM43XX=y
44CONFIG_SOC_DRA7XX=y 45CONFIG_SOC_DRA7XX=y
45CONFIG_ARCH_QCOM=y 46CONFIG_ARCH_QCOM=y
47CONFIG_ARCH_MEDIATEK=y
46CONFIG_ARCH_MSM8X60=y 48CONFIG_ARCH_MSM8X60=y
47CONFIG_ARCH_MSM8960=y 49CONFIG_ARCH_MSM8960=y
48CONFIG_ARCH_MSM8974=y 50CONFIG_ARCH_MSM8974=y
@@ -75,6 +77,7 @@ CONFIG_PCI=y
75CONFIG_PCI_MSI=y 77CONFIG_PCI_MSI=y
76CONFIG_PCI_MVEBU=y 78CONFIG_PCI_MVEBU=y
77CONFIG_PCI_TEGRA=y 79CONFIG_PCI_TEGRA=y
80CONFIG_PCIEPORTBUS=y
78CONFIG_SMP=y 81CONFIG_SMP=y
79CONFIG_NR_CPUS=8 82CONFIG_NR_CPUS=8
80CONFIG_HIGHPTE=y 83CONFIG_HIGHPTE=y
@@ -87,6 +90,7 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
87CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 90CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
88CONFIG_CPU_IDLE=y 91CONFIG_CPU_IDLE=y
89CONFIG_NEON=y 92CONFIG_NEON=y
93CONFIG_ARM_ZYNQ_CPUIDLE=y
90CONFIG_NET=y 94CONFIG_NET=y
91CONFIG_PACKET=y 95CONFIG_PACKET=y
92CONFIG_UNIX=y 96CONFIG_UNIX=y
@@ -107,6 +111,7 @@ CONFIG_CAN=y
107CONFIG_CAN_RAW=y 111CONFIG_CAN_RAW=y
108CONFIG_CAN_BCM=y 112CONFIG_CAN_BCM=y
109CONFIG_CAN_DEV=y 113CONFIG_CAN_DEV=y
114CONFIG_CAN_XILINXCAN=y
110CONFIG_CAN_MCP251X=y 115CONFIG_CAN_MCP251X=y
111CONFIG_CFG80211=m 116CONFIG_CFG80211=m
112CONFIG_MAC80211=m 117CONFIG_MAC80211=m
@@ -120,7 +125,10 @@ CONFIG_CMA_SIZE_MBYTES=64
120CONFIG_OMAP_OCP2SCP=y 125CONFIG_OMAP_OCP2SCP=y
121CONFIG_MTD=y 126CONFIG_MTD=y
122CONFIG_MTD_M25P80=y 127CONFIG_MTD_M25P80=y
128CONFIG_MTD_SPI_NOR=y
123CONFIG_BLK_DEV_LOOP=y 129CONFIG_BLK_DEV_LOOP=y
130CONFIG_AD525X_DPOT=y
131CONFIG_AD525X_DPOT_I2C=y
124CONFIG_ICS932S401=y 132CONFIG_ICS932S401=y
125CONFIG_APDS9802ALS=y 133CONFIG_APDS9802ALS=y
126CONFIG_ISL29003=y 134CONFIG_ISL29003=y
@@ -130,9 +138,11 @@ CONFIG_BLK_DEV_SD=y
130CONFIG_BLK_DEV_SR=y 138CONFIG_BLK_DEV_SR=y
131CONFIG_SCSI_MULTI_LUN=y 139CONFIG_SCSI_MULTI_LUN=y
132CONFIG_ATA=y 140CONFIG_ATA=y
141CONFIG_SATA_AHCI=y
133CONFIG_SATA_AHCI_PLATFORM=y 142CONFIG_SATA_AHCI_PLATFORM=y
134CONFIG_AHCI_ST=y 143CONFIG_AHCI_ST=y
135CONFIG_AHCI_SUNXI=y 144CONFIG_AHCI_SUNXI=y
145CONFIG_AHCI_TEGRA=y
136CONFIG_SATA_HIGHBANK=y 146CONFIG_SATA_HIGHBANK=y
137CONFIG_SATA_MV=y 147CONFIG_SATA_MV=y
138CONFIG_NETDEVICES=y 148CONFIG_NETDEVICES=y
@@ -147,6 +157,7 @@ CONFIG_R8169=y
147CONFIG_SMSC911X=y 157CONFIG_SMSC911X=y
148CONFIG_STMMAC_ETH=y 158CONFIG_STMMAC_ETH=y
149CONFIG_TI_CPSW=y 159CONFIG_TI_CPSW=y
160CONFIG_XILINX_EMACLITE=y
150CONFIG_AT803X_PHY=y 161CONFIG_AT803X_PHY=y
151CONFIG_MARVELL_PHY=y 162CONFIG_MARVELL_PHY=y
152CONFIG_ICPLUS_PHY=y 163CONFIG_ICPLUS_PHY=y
@@ -157,6 +168,7 @@ CONFIG_USB_NET_SMSC95XX=y
157CONFIG_BRCMFMAC=m 168CONFIG_BRCMFMAC=m
158CONFIG_RT2X00=m 169CONFIG_RT2X00=m
159CONFIG_RT2800USB=m 170CONFIG_RT2800USB=m
171CONFIG_INPUT_JOYDEV=y
160CONFIG_INPUT_EVDEV=y 172CONFIG_INPUT_EVDEV=y
161CONFIG_KEYBOARD_GPIO=y 173CONFIG_KEYBOARD_GPIO=y
162CONFIG_KEYBOARD_TEGRA=y 174CONFIG_KEYBOARD_TEGRA=y
@@ -165,6 +177,7 @@ CONFIG_KEYBOARD_ST_KEYSCAN=y
165CONFIG_KEYBOARD_CROS_EC=y 177CONFIG_KEYBOARD_CROS_EC=y
166CONFIG_MOUSE_PS2_ELANTECH=y 178CONFIG_MOUSE_PS2_ELANTECH=y
167CONFIG_INPUT_TOUCHSCREEN=y 179CONFIG_INPUT_TOUCHSCREEN=y
180CONFIG_TOUCHSCREEN_ATMEL_MXT=y
168CONFIG_TOUCHSCREEN_STMPE=y 181CONFIG_TOUCHSCREEN_STMPE=y
169CONFIG_INPUT_MISC=y 182CONFIG_INPUT_MISC=y
170CONFIG_INPUT_MPU3050=y 183CONFIG_INPUT_MPU3050=y
@@ -174,6 +187,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
174CONFIG_SERIAL_8250_DW=y 187CONFIG_SERIAL_8250_DW=y
175CONFIG_SERIAL_AMBA_PL011=y 188CONFIG_SERIAL_AMBA_PL011=y
176CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 189CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
190CONFIG_SERIAL_MESON=y
191CONFIG_SERIAL_MESON_CONSOLE=y
177CONFIG_SERIAL_SAMSUNG=y 192CONFIG_SERIAL_SAMSUNG=y
178CONFIG_SERIAL_SAMSUNG_CONSOLE=y 193CONFIG_SERIAL_SAMSUNG_CONSOLE=y
179CONFIG_SERIAL_SIRFSOC=y 194CONFIG_SERIAL_SIRFSOC=y
@@ -206,6 +221,8 @@ CONFIG_I2C_SIRF=y
206CONFIG_I2C_TEGRA=y 221CONFIG_I2C_TEGRA=y
207CONFIG_I2C_ST=y 222CONFIG_I2C_ST=y
208CONFIG_SPI=y 223CONFIG_SPI=y
224CONFIG_I2C_XILINX=y
225CONFIG_SPI_CADENCE=y
209CONFIG_SPI_OMAP24XX=y 226CONFIG_SPI_OMAP24XX=y
210CONFIG_SPI_ORION=y 227CONFIG_SPI_ORION=y
211CONFIG_SPI_PL022=y 228CONFIG_SPI_PL022=y
@@ -215,11 +232,14 @@ CONFIG_SPI_SUN6I=y
215CONFIG_SPI_TEGRA114=y 232CONFIG_SPI_TEGRA114=y
216CONFIG_SPI_TEGRA20_SFLASH=y 233CONFIG_SPI_TEGRA20_SFLASH=y
217CONFIG_SPI_TEGRA20_SLINK=y 234CONFIG_SPI_TEGRA20_SLINK=y
235CONFIG_SPI_XILINX=y
218CONFIG_PINCTRL_AS3722=y 236CONFIG_PINCTRL_AS3722=y
219CONFIG_PINCTRL_PALMAS=y 237CONFIG_PINCTRL_PALMAS=y
220CONFIG_GPIO_SYSFS=y 238CONFIG_GPIO_SYSFS=y
221CONFIG_GPIO_GENERIC_PLATFORM=y 239CONFIG_GPIO_GENERIC_PLATFORM=y
222CONFIG_GPIO_DWAPB=y 240CONFIG_GPIO_DWAPB=y
241CONFIG_GPIO_XILINX=y
242CONFIG_GPIO_ZYNQ=y
223CONFIG_GPIO_PCA953X=y 243CONFIG_GPIO_PCA953X=y
224CONFIG_GPIO_PCA953X_IRQ=y 244CONFIG_GPIO_PCA953X_IRQ=y
225CONFIG_GPIO_TWL4030=y 245CONFIG_GPIO_TWL4030=y
@@ -238,6 +258,7 @@ CONFIG_ARMADA_THERMAL=y
238CONFIG_ST_THERMAL_SYSCFG=y 258CONFIG_ST_THERMAL_SYSCFG=y
239CONFIG_ST_THERMAL_MEMMAP=y 259CONFIG_ST_THERMAL_MEMMAP=y
240CONFIG_WATCHDOG=y 260CONFIG_WATCHDOG=y
261CONFIG_XILINX_WATCHDOG=y
241CONFIG_ORION_WATCHDOG=y 262CONFIG_ORION_WATCHDOG=y
242CONFIG_SUNXI_WATCHDOG=y 263CONFIG_SUNXI_WATCHDOG=y
243CONFIG_MFD_AS3722=y 264CONFIG_MFD_AS3722=y
@@ -251,7 +272,6 @@ CONFIG_MFD_PALMAS=y
251CONFIG_MFD_TPS65090=y 272CONFIG_MFD_TPS65090=y
252CONFIG_MFD_TPS6586X=y 273CONFIG_MFD_TPS6586X=y
253CONFIG_MFD_TPS65910=y 274CONFIG_MFD_TPS65910=y
254CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
255CONFIG_REGULATOR_AB8500=y 275CONFIG_REGULATOR_AB8500=y
256CONFIG_REGULATOR_AS3722=y 276CONFIG_REGULATOR_AS3722=y
257CONFIG_REGULATOR_BCM590XX=y 277CONFIG_REGULATOR_BCM590XX=y
@@ -282,6 +302,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
282CONFIG_BACKLIGHT_CLASS_DEVICE=y 302CONFIG_BACKLIGHT_CLASS_DEVICE=y
283CONFIG_BACKLIGHT_PWM=y 303CONFIG_BACKLIGHT_PWM=y
284CONFIG_FRAMEBUFFER_CONSOLE=y 304CONFIG_FRAMEBUFFER_CONSOLE=y
305CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
285CONFIG_SOUND=y 306CONFIG_SOUND=y
286CONFIG_SND=y 307CONFIG_SND=y
287CONFIG_SND_SOC=y 308CONFIG_SND_SOC=y
@@ -334,7 +355,18 @@ CONFIG_MMC_DW=y
334CONFIG_MMC_DW_EXYNOS=y 355CONFIG_MMC_DW_EXYNOS=y
335CONFIG_NEW_LEDS=y 356CONFIG_NEW_LEDS=y
336CONFIG_LEDS_CLASS=y 357CONFIG_LEDS_CLASS=y
358CONFIG_LEDS_GPIO=y
337CONFIG_LEDS_PWM=y 359CONFIG_LEDS_PWM=y
360CONFIG_LEDS_TRIGGERS=y
361CONFIG_LEDS_TRIGGER_TIMER=y
362CONFIG_LEDS_TRIGGER_ONESHOT=y
363CONFIG_LEDS_TRIGGER_HEARTBEAT=y
364CONFIG_LEDS_TRIGGER_BACKLIGHT=y
365CONFIG_LEDS_TRIGGER_CPU=y
366CONFIG_LEDS_TRIGGER_GPIO=y
367CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
368CONFIG_LEDS_TRIGGER_TRANSIENT=y
369CONFIG_LEDS_TRIGGER_CAMERA=y
338CONFIG_EDAC=y 370CONFIG_EDAC=y
339CONFIG_EDAC_MM_EDAC=y 371CONFIG_EDAC_MM_EDAC=y
340CONFIG_EDAC_HIGHBANK_MC=y 372CONFIG_EDAC_HIGHBANK_MC=y
@@ -350,6 +382,7 @@ CONFIG_RTC_DRV_TPS65910=y
350CONFIG_RTC_DRV_EM3027=y 382CONFIG_RTC_DRV_EM3027=y
351CONFIG_RTC_DRV_PL031=y 383CONFIG_RTC_DRV_PL031=y
352CONFIG_RTC_DRV_VT8500=y 384CONFIG_RTC_DRV_VT8500=y
385CONFIG_RTC_DRV_SUN6I=y
353CONFIG_RTC_DRV_SUNXI=y 386CONFIG_RTC_DRV_SUNXI=y
354CONFIG_RTC_DRV_MV=y 387CONFIG_RTC_DRV_MV=y
355CONFIG_RTC_DRV_TEGRA=y 388CONFIG_RTC_DRV_TEGRA=y
@@ -365,6 +398,7 @@ CONFIG_IMX_SDMA=y
365CONFIG_IMX_DMA=y 398CONFIG_IMX_DMA=y
366CONFIG_MXS_DMA=y 399CONFIG_MXS_DMA=y
367CONFIG_DMA_OMAP=y 400CONFIG_DMA_OMAP=y
401CONFIG_XILINX_VDMA=y
368CONFIG_STAGING=y 402CONFIG_STAGING=y
369CONFIG_SENSORS_ISL29018=y 403CONFIG_SENSORS_ISL29018=y
370CONFIG_SENSORS_ISL29028=y 404CONFIG_SENSORS_ISL29028=y
@@ -372,6 +406,7 @@ CONFIG_MFD_NVEC=y
372CONFIG_KEYBOARD_NVEC=y 406CONFIG_KEYBOARD_NVEC=y
373CONFIG_SERIO_NVEC_PS2=y 407CONFIG_SERIO_NVEC_PS2=y
374CONFIG_NVEC_POWER=y 408CONFIG_NVEC_POWER=y
409CONFIG_NVEC_PAZ00=y
375CONFIG_QCOM_GSBI=y 410CONFIG_QCOM_GSBI=y
376CONFIG_COMMON_CLK_QCOM=y 411CONFIG_COMMON_CLK_QCOM=y
377CONFIG_MSM_GCC_8660=y 412CONFIG_MSM_GCC_8660=y
@@ -381,6 +416,7 @@ CONFIG_TEGRA_IOMMU_GART=y
381CONFIG_TEGRA_IOMMU_SMMU=y 416CONFIG_TEGRA_IOMMU_SMMU=y
382CONFIG_MEMORY=y 417CONFIG_MEMORY=y
383CONFIG_IIO=y 418CONFIG_IIO=y
419CONFIG_XILINX_XADC=y
384CONFIG_AK8975=y 420CONFIG_AK8975=y
385CONFIG_PWM=y 421CONFIG_PWM=y
386CONFIG_PWM_TEGRA=y 422CONFIG_PWM_TEGRA=y
@@ -404,3 +440,4 @@ CONFIG_DEBUG_FS=y
404CONFIG_MAGIC_SYSRQ=y 440CONFIG_MAGIC_SYSRQ=y
405CONFIG_LOCKUP_DETECTOR=y 441CONFIG_LOCKUP_DETECTOR=y
406CONFIG_CRYPTO_DEV_TEGRA_AES=y 442CONFIG_CRYPTO_DEV_TEGRA_AES=y
443CONFIG_GENERIC_CPUFREQ_CPU0=y
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index fdfda1fa9521..ed0a0d1be0f3 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_FHANDLE=y 2CONFIG_FHANDLE=y
4CONFIG_IRQ_DOMAIN_DEBUG=y 3CONFIG_IRQ_DOMAIN_DEBUG=y
@@ -15,9 +14,6 @@ CONFIG_MACH_ARMADA_375=y
15CONFIG_MACH_ARMADA_38X=y 14CONFIG_MACH_ARMADA_38X=y
16CONFIG_MACH_ARMADA_XP=y 15CONFIG_MACH_ARMADA_XP=y
17CONFIG_MACH_DOVE=y 16CONFIG_MACH_DOVE=y
18CONFIG_NEON=y
19# CONFIG_CACHE_L2X0 is not set
20# CONFIG_SWP_EMULATE is not set
21CONFIG_PCI=y 17CONFIG_PCI=y
22CONFIG_PCI_MSI=y 18CONFIG_PCI_MSI=y
23CONFIG_PCI_MVEBU=y 19CONFIG_PCI_MVEBU=y
@@ -29,12 +25,14 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
29CONFIG_ZBOOT_ROM_BSS=0x0 25CONFIG_ZBOOT_ROM_BSS=0x0
30CONFIG_ARM_APPENDED_DTB=y 26CONFIG_ARM_APPENDED_DTB=y
31CONFIG_ARM_ATAG_DTB_COMPAT=y 27CONFIG_ARM_ATAG_DTB_COMPAT=y
28CONFIG_CPU_FREQ=y
32CONFIG_CPU_IDLE=y 29CONFIG_CPU_IDLE=y
33CONFIG_ARM_MVEBU_V7_CPUIDLE=y 30CONFIG_ARM_MVEBU_V7_CPUIDLE=y
34CONFIG_CPU_FREQ=y
35CONFIG_CPUFREQ_GENERIC=y
36CONFIG_VFP=y 31CONFIG_VFP=y
32CONFIG_NEON=y
37CONFIG_NET=y 33CONFIG_NET=y
34CONFIG_PACKET=y
35CONFIG_UNIX=y
38CONFIG_INET=y 36CONFIG_INET=y
39CONFIG_IP_PNP=y 37CONFIG_IP_PNP=y
40CONFIG_IP_PNP_DHCP=y 38CONFIG_IP_PNP_DHCP=y
@@ -44,11 +42,24 @@ CONFIG_BT_MRVL=y
44CONFIG_BT_MRVL_SDIO=y 42CONFIG_BT_MRVL_SDIO=y
45CONFIG_CFG80211=y 43CONFIG_CFG80211=y
46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_DEVTMPFS=y
46CONFIG_DEVTMPFS_MOUNT=y
47CONFIG_MTD=y
48CONFIG_MTD_CFI=y
49CONFIG_MTD_CFI_INTELEXT=y
50CONFIG_MTD_CFI_AMDSTD=y
51CONFIG_MTD_CFI_STAA=y
52CONFIG_MTD_PHYSMAP_OF=y
53CONFIG_MTD_M25P80=y
54CONFIG_MTD_NAND=y
55CONFIG_MTD_NAND_PXA3xx=y
56CONFIG_MTD_SPI_NOR=y
47CONFIG_BLK_DEV_SD=y 57CONFIG_BLK_DEV_SD=y
48CONFIG_ATA=y 58CONFIG_ATA=y
49CONFIG_AHCI_MVEBU=y 59CONFIG_AHCI_MVEBU=y
50CONFIG_SATA_MV=y 60CONFIG_SATA_MV=y
51CONFIG_NETDEVICES=y 61CONFIG_NETDEVICES=y
62CONFIG_MV643XX_ETH=y
52CONFIG_MVNETA=y 63CONFIG_MVNETA=y
53CONFIG_MVPP2=y 64CONFIG_MVPP2=y
54CONFIG_MARVELL_PHY=y 65CONFIG_MARVELL_PHY=y
@@ -58,47 +69,36 @@ CONFIG_INPUT_EVDEV=y
58CONFIG_KEYBOARD_GPIO=y 69CONFIG_KEYBOARD_GPIO=y
59CONFIG_SERIAL_8250=y 70CONFIG_SERIAL_8250=y
60CONFIG_SERIAL_8250_CONSOLE=y 71CONFIG_SERIAL_8250_CONSOLE=y
72CONFIG_SERIAL_8250_DW=y
61CONFIG_SERIAL_OF_PLATFORM=y 73CONFIG_SERIAL_OF_PLATFORM=y
62CONFIG_I2C=y 74CONFIG_I2C=y
75CONFIG_I2C_MV64XXX=y
63CONFIG_SPI=y 76CONFIG_SPI=y
64CONFIG_SPI_ORION=y 77CONFIG_SPI_ORION=y
65CONFIG_I2C_MV64XXX=y
66CONFIG_MTD=y
67CONFIG_MTD_CHAR=y
68CONFIG_MTD_M25P80=y
69CONFIG_MTD_SPI_NOR=y
70CONFIG_MTD_CFI=y
71CONFIG_MTD_CFI_INTELEXT=y
72CONFIG_MTD_CFI_AMDSTD=y
73CONFIG_MTD_CFI_STAA=y
74CONFIG_MTD_PHYSMAP_OF=y
75CONFIG_MTD_NAND=y
76CONFIG_MTD_NAND_PXA3xx=y
77CONFIG_SERIAL_8250_DW=y
78CONFIG_GPIOLIB=y
79CONFIG_GPIO_SYSFS=y 78CONFIG_GPIO_SYSFS=y
79CONFIG_SENSORS_GPIO_FAN=y
80CONFIG_THERMAL=y 80CONFIG_THERMAL=y
81CONFIG_ARMADA_THERMAL=y 81CONFIG_ARMADA_THERMAL=y
82CONFIG_WATCHDOG=y
83CONFIG_ORION_WATCHDOG=y
82CONFIG_SOUND=y 84CONFIG_SOUND=y
83CONFIG_SND=y 85CONFIG_SND=y
84CONFIG_SND_SOC=y 86CONFIG_SND_SOC=y
85CONFIG_SND_KIRKWOOD_SOC=y 87CONFIG_SND_KIRKWOOD_SOC=y
86CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y 88CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y
87CONFIG_WATCHDOG=y
88CONFIG_ORION_WATCHDOG=y
89CONFIG_USB_SUPPORT=y
90CONFIG_USB=y 89CONFIG_USB=y
90CONFIG_USB_XHCI_HCD=y
91CONFIG_USB_XHCI_MVEBU=y
91CONFIG_USB_EHCI_HCD=y 92CONFIG_USB_EHCI_HCD=y
92CONFIG_USB_EHCI_ROOT_HUB_TT=y 93CONFIG_USB_EHCI_ROOT_HUB_TT=y
93CONFIG_USB_STORAGE=y 94CONFIG_USB_STORAGE=y
94CONFIG_USB_XHCI_HCD=y
95CONFIG_USB_XHCI_MVEBU=y
96CONFIG_MMC=y 95CONFIG_MMC=y
97CONFIG_MMC_SDHCI_PXAV3=y 96CONFIG_MMC_SDHCI=y
97CONFIG_MMC_SDHCI_PLTFM=y
98CONFIG_MMC_SDHCI_DOVE=y
98CONFIG_MMC_MVSDIO=y 99CONFIG_MMC_MVSDIO=y
99CONFIG_NEW_LEDS=y
100CONFIG_LEDS_GPIO=y 100CONFIG_LEDS_GPIO=y
101CONFIG_LEDS_CLASS=m 101CONFIG_LEDS_CLASS=y
102CONFIG_LEDS_TRIGGERS=y 102CONFIG_LEDS_TRIGGERS=y
103CONFIG_LEDS_TRIGGER_TIMER=y 103CONFIG_LEDS_TRIGGER_TIMER=y
104CONFIG_LEDS_TRIGGER_HEARTBEAT=y 104CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -107,12 +107,9 @@ CONFIG_RTC_DRV_S35390A=y
107CONFIG_RTC_DRV_MV=y 107CONFIG_RTC_DRV_MV=y
108CONFIG_DMADEVICES=y 108CONFIG_DMADEVICES=y
109CONFIG_MV_XOR=y 109CONFIG_MV_XOR=y
110CONFIG_MEMORY=y
111CONFIG_MVEBU_DEVBUS=y
112# CONFIG_IOMMU_SUPPORT is not set 110# CONFIG_IOMMU_SUPPORT is not set
113CONFIG_EXT2_FS=y 111CONFIG_MEMORY=y
114CONFIG_EXT3_FS=y 112CONFIG_EXT4_FS=y
115# CONFIG_EXT3_FS_XATTR is not set
116CONFIG_ISO9660_FS=y 113CONFIG_ISO9660_FS=y
117CONFIG_JOLIET=y 114CONFIG_JOLIET=y
118CONFIG_UDF_FS=m 115CONFIG_UDF_FS=m
@@ -126,10 +123,11 @@ CONFIG_NLS_CODEPAGE_850=y
126CONFIG_NLS_ISO8859_1=y 123CONFIG_NLS_ISO8859_1=y
127CONFIG_NLS_ISO8859_2=y 124CONFIG_NLS_ISO8859_2=y
128CONFIG_NLS_UTF8=y 125CONFIG_NLS_UTF8=y
129CONFIG_MAGIC_SYSRQ=y 126CONFIG_PRINTK_TIME=y
127CONFIG_DEBUG_INFO=y
130CONFIG_DEBUG_FS=y 128CONFIG_DEBUG_FS=y
129CONFIG_MAGIC_SYSRQ=y
131# CONFIG_SCHED_DEBUG is not set 130# CONFIG_SCHED_DEBUG is not set
132CONFIG_TIMER_STATS=y 131CONFIG_TIMER_STATS=y
133# CONFIG_DEBUG_BUGVERBOSE is not set 132# CONFIG_DEBUG_BUGVERBOSE is not set
134CONFIG_DEBUG_INFO=y
135CONFIG_DEBUG_USER=y 133CONFIG_DEBUG_USER=y
diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig
index 60e313834b3f..5f337d7ceb5b 100644
--- a/arch/arm/configs/pxa3xx_defconfig
+++ b/arch/arm/configs/pxa3xx_defconfig
@@ -77,7 +77,6 @@ CONFIG_BATTERY_DA9030=y
77CONFIG_PMIC_DA903X=y 77CONFIG_PMIC_DA903X=y
78CONFIG_REGULATOR=y 78CONFIG_REGULATOR=y
79CONFIG_REGULATOR_DEBUG=y 79CONFIG_REGULATOR_DEBUG=y
80CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
81CONFIG_REGULATOR_DA903X=y 80CONFIG_REGULATOR_DA903X=y
82CONFIG_FB=y 81CONFIG_FB=y
83CONFIG_FB_PXA=y 82CONFIG_FB_PXA=y
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index 42ebd72799e6..8c7da3319d82 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -29,6 +29,7 @@ CONFIG_HIGHPTE=y
29CONFIG_CLEANCACHE=y 29CONFIG_CLEANCACHE=y
30CONFIG_ARM_APPENDED_DTB=y 30CONFIG_ARM_APPENDED_DTB=y
31CONFIG_ARM_ATAG_DTB_COMPAT=y 31CONFIG_ARM_ATAG_DTB_COMPAT=y
32CONFIG_CPU_IDLE=y
32CONFIG_VFP=y 33CONFIG_VFP=y
33CONFIG_NEON=y 34CONFIG_NEON=y
34# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -53,14 +54,13 @@ CONFIG_DEVTMPFS_MOUNT=y
53CONFIG_MTD=y 54CONFIG_MTD=y
54CONFIG_MTD_BLOCK=y 55CONFIG_MTD_BLOCK=y
55CONFIG_MTD_M25P80=y 56CONFIG_MTD_M25P80=y
57CONFIG_MTD_SPI_NOR=y
56CONFIG_BLK_DEV_LOOP=y 58CONFIG_BLK_DEV_LOOP=y
57CONFIG_BLK_DEV_RAM=y 59CONFIG_BLK_DEV_RAM=y
58CONFIG_SCSI=y 60CONFIG_SCSI=y
59CONFIG_SCSI_TGT=y
60CONFIG_BLK_DEV_SD=y 61CONFIG_BLK_DEV_SD=y
61CONFIG_CHR_DEV_SG=y 62CONFIG_CHR_DEV_SG=y
62CONFIG_CHR_DEV_SCH=y 63CONFIG_CHR_DEV_SCH=y
63CONFIG_SCSI_MULTI_LUN=y
64CONFIG_SCSI_CONSTANTS=y 64CONFIG_SCSI_CONSTANTS=y
65CONFIG_SCSI_LOGGING=y 65CONFIG_SCSI_LOGGING=y
66CONFIG_SCSI_SCAN_ASYNC=y 66CONFIG_SCSI_SCAN_ASYNC=y
@@ -86,7 +86,6 @@ CONFIG_SERIO_LIBPS2=y
86CONFIG_SERIAL_MSM=y 86CONFIG_SERIAL_MSM=y
87CONFIG_SERIAL_MSM_CONSOLE=y 87CONFIG_SERIAL_MSM_CONSOLE=y
88CONFIG_HW_RANDOM=y 88CONFIG_HW_RANDOM=y
89CONFIG_HW_RANDOM_MSM=y
90CONFIG_I2C=y 89CONFIG_I2C=y
91CONFIG_I2C_CHARDEV=y 90CONFIG_I2C_CHARDEV=y
92CONFIG_I2C_QUP=y 91CONFIG_I2C_QUP=y
@@ -94,7 +93,9 @@ CONFIG_SPI=y
94CONFIG_SPI_QUP=y 93CONFIG_SPI_QUP=y
95CONFIG_SPMI=y 94CONFIG_SPMI=y
96CONFIG_PINCTRL_APQ8064=y 95CONFIG_PINCTRL_APQ8064=y
96CONFIG_PINCTRL_APQ8084=y
97CONFIG_PINCTRL_IPQ8064=y 97CONFIG_PINCTRL_IPQ8064=y
98CONFIG_PINCTRL_MSM8960=y
98CONFIG_PINCTRL_MSM8X74=y 99CONFIG_PINCTRL_MSM8X74=y
99CONFIG_DEBUG_GPIO=y 100CONFIG_DEBUG_GPIO=y
100CONFIG_GPIO_SYSFS=y 101CONFIG_GPIO_SYSFS=y
@@ -103,6 +104,7 @@ CONFIG_POWER_RESET=y
103CONFIG_POWER_RESET_MSM=y 104CONFIG_POWER_RESET_MSM=y
104CONFIG_THERMAL=y 105CONFIG_THERMAL=y
105CONFIG_REGULATOR=y 106CONFIG_REGULATOR=y
107CONFIG_REGULATOR_FIXED_VOLTAGE=y
106CONFIG_MEDIA_SUPPORT=y 108CONFIG_MEDIA_SUPPORT=y
107CONFIG_FB=y 109CONFIG_FB=y
108CONFIG_SOUND=y 110CONFIG_SOUND=y
@@ -124,6 +126,7 @@ CONFIG_USB_GADGET_DEBUG_FILES=y
124CONFIG_USB_GADGET_VBUS_DRAW=500 126CONFIG_USB_GADGET_VBUS_DRAW=500
125CONFIG_MMC=y 127CONFIG_MMC=y
126CONFIG_MMC_BLOCK_MINORS=16 128CONFIG_MMC_BLOCK_MINORS=16
129CONFIG_MMC_ARMMMCI=y
127CONFIG_MMC_SDHCI=y 130CONFIG_MMC_SDHCI=y
128CONFIG_MMC_SDHCI_PLTFM=y 131CONFIG_MMC_SDHCI_PLTFM=y
129CONFIG_MMC_SDHCI_MSM=y 132CONFIG_MMC_SDHCI_MSM=y
@@ -133,11 +136,14 @@ CONFIG_QCOM_BAM_DMA=y
133CONFIG_STAGING=y 136CONFIG_STAGING=y
134CONFIG_QCOM_GSBI=y 137CONFIG_QCOM_GSBI=y
135CONFIG_COMMON_CLK_QCOM=y 138CONFIG_COMMON_CLK_QCOM=y
139CONFIG_APQ_MMCC_8084=y
140CONFIG_IPQ_GCC_806X=y
136CONFIG_MSM_GCC_8660=y 141CONFIG_MSM_GCC_8660=y
137CONFIG_MSM_MMCC_8960=y 142CONFIG_MSM_MMCC_8960=y
138CONFIG_MSM_MMCC_8974=y 143CONFIG_MSM_MMCC_8974=y
139CONFIG_MSM_IOMMU=y 144CONFIG_MSM_IOMMU=y
140CONFIG_GENERIC_PHY=y 145CONFIG_PHY_QCOM_APQ8064_SATA=y
146CONFIG_PHY_QCOM_IPQ806X_SATA=y
141CONFIG_EXT2_FS=y 147CONFIG_EXT2_FS=y
142CONFIG_EXT2_FS_XATTR=y 148CONFIG_EXT2_FS_XATTR=y
143CONFIG_EXT3_FS=y 149CONFIG_EXT3_FS=y
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index 12007282b557..c9089c927daf 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -22,7 +22,6 @@ CONFIG_SOC_SAMA5D3=y
22CONFIG_SOC_SAMA5D4=y 22CONFIG_SOC_SAMA5D4=y
23CONFIG_MACH_SAMA5_DT=y 23CONFIG_MACH_SAMA5_DT=y
24CONFIG_AEABI=y 24CONFIG_AEABI=y
25# CONFIG_OABI_COMPAT is not set
26CONFIG_UACCESS_WITH_MEMCPY=y 25CONFIG_UACCESS_WITH_MEMCPY=y
27CONFIG_ZBOOT_ROM_TEXT=0x0 26CONFIG_ZBOOT_ROM_TEXT=0x0
28CONFIG_ZBOOT_ROM_BSS=0x0 27CONFIG_ZBOOT_ROM_BSS=0x0
@@ -66,15 +65,14 @@ CONFIG_DEVTMPFS_MOUNT=y
66# CONFIG_PREVENT_FIRMWARE_BUILD is not set 65# CONFIG_PREVENT_FIRMWARE_BUILD is not set
67CONFIG_MTD=y 66CONFIG_MTD=y
68CONFIG_MTD_CMDLINE_PARTS=y 67CONFIG_MTD_CMDLINE_PARTS=y
69CONFIG_MTD_CHAR=y
70CONFIG_MTD_BLOCK=y 68CONFIG_MTD_BLOCK=y
71CONFIG_MTD_CFI=y 69CONFIG_MTD_CFI=y
72CONFIG_MTD_M25P80=y 70CONFIG_MTD_M25P80=y
73CONFIG_MTD_NAND=y 71CONFIG_MTD_NAND=y
74CONFIG_MTD_NAND_ATMEL=y 72CONFIG_MTD_NAND_ATMEL=y
73CONFIG_MTD_SPI_NOR=y
75CONFIG_MTD_UBI=y 74CONFIG_MTD_UBI=y
76CONFIG_MTD_UBI_GLUEBI=y 75CONFIG_MTD_UBI_GLUEBI=y
77CONFIG_PROC_DEVICETREE=y
78CONFIG_BLK_DEV_LOOP=y 76CONFIG_BLK_DEV_LOOP=y
79CONFIG_BLK_DEV_RAM=y 77CONFIG_BLK_DEV_RAM=y
80CONFIG_BLK_DEV_RAM_COUNT=4 78CONFIG_BLK_DEV_RAM_COUNT=4
@@ -84,10 +82,8 @@ CONFIG_ATMEL_SSC=y
84CONFIG_EEPROM_AT24=y 82CONFIG_EEPROM_AT24=y
85CONFIG_SCSI=y 83CONFIG_SCSI=y
86CONFIG_BLK_DEV_SD=y 84CONFIG_BLK_DEV_SD=y
87CONFIG_SCSI_MULTI_LUN=y
88# CONFIG_SCSI_LOWLEVEL is not set 85# CONFIG_SCSI_LOWLEVEL is not set
89CONFIG_NETDEVICES=y 86CONFIG_NETDEVICES=y
90CONFIG_MII=y
91CONFIG_MACB=y 87CONFIG_MACB=y
92# CONFIG_NET_VENDOR_BROADCOM is not set 88# CONFIG_NET_VENDOR_BROADCOM is not set
93# CONFIG_NET_VENDOR_CIRRUS is not set 89# CONFIG_NET_VENDOR_CIRRUS is not set
@@ -136,6 +132,8 @@ CONFIG_SPI=y
136CONFIG_SPI_ATMEL=y 132CONFIG_SPI_ATMEL=y
137CONFIG_SPI_GPIO=y 133CONFIG_SPI_GPIO=y
138CONFIG_GPIO_SYSFS=y 134CONFIG_GPIO_SYSFS=y
135CONFIG_POWER_SUPPLY=y
136CONFIG_POWER_RESET=y
139# CONFIG_HWMON is not set 137# CONFIG_HWMON is not set
140CONFIG_SSB=m 138CONFIG_SSB=m
141CONFIG_REGULATOR=y 139CONFIG_REGULATOR=y
@@ -146,6 +144,11 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
146CONFIG_BACKLIGHT_CLASS_DEVICE=y 144CONFIG_BACKLIGHT_CLASS_DEVICE=y
147# CONFIG_BACKLIGHT_GENERIC is not set 145# CONFIG_BACKLIGHT_GENERIC is not set
148CONFIG_FRAMEBUFFER_CONSOLE=y 146CONFIG_FRAMEBUFFER_CONSOLE=y
147CONFIG_SOUND=y
148CONFIG_SND=y
149CONFIG_SND_SOC=y
150CONFIG_SND_ATMEL_SOC=y
151CONFIG_SND_ATMEL_SOC_WM8904=y
149# CONFIG_HID_GENERIC is not set 152# CONFIG_HID_GENERIC is not set
150CONFIG_USB=y 153CONFIG_USB=y
151CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 154CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -166,6 +169,7 @@ CONFIG_MMC_ATMELMCI=y
166CONFIG_NEW_LEDS=y 169CONFIG_NEW_LEDS=y
167CONFIG_LEDS_CLASS=y 170CONFIG_LEDS_CLASS=y
168CONFIG_LEDS_GPIO=y 171CONFIG_LEDS_GPIO=y
172CONFIG_LEDS_PWM=y
169CONFIG_LEDS_TRIGGER_TIMER=y 173CONFIG_LEDS_TRIGGER_TIMER=y
170CONFIG_LEDS_TRIGGER_HEARTBEAT=y 174CONFIG_LEDS_TRIGGER_HEARTBEAT=y
171CONFIG_LEDS_TRIGGER_GPIO=y 175CONFIG_LEDS_TRIGGER_GPIO=y
@@ -175,6 +179,8 @@ CONFIG_DMADEVICES=y
175# CONFIG_IOMMU_SUPPORT is not set 179# CONFIG_IOMMU_SUPPORT is not set
176CONFIG_IIO=y 180CONFIG_IIO=y
177CONFIG_AT91_ADC=y 181CONFIG_AT91_ADC=y
182CONFIG_PWM=y
183CONFIG_PWM_ATMEL=y
178CONFIG_EXT4_FS=y 184CONFIG_EXT4_FS=y
179CONFIG_FANOTIFY=y 185CONFIG_FANOTIFY=y
180CONFIG_VFAT_FS=y 186CONFIG_VFAT_FS=y
@@ -189,8 +195,8 @@ CONFIG_NLS_ISO8859_1=y
189CONFIG_NLS_UTF8=y 195CONFIG_NLS_UTF8=y
190CONFIG_STRIP_ASM_SYMS=y 196CONFIG_STRIP_ASM_SYMS=y
191CONFIG_DEBUG_FS=y 197CONFIG_DEBUG_FS=y
192# CONFIG_SCHED_DEBUG is not set
193CONFIG_DEBUG_MEMORY_INIT=y 198CONFIG_DEBUG_MEMORY_INIT=y
199# CONFIG_SCHED_DEBUG is not set
194# CONFIG_FTRACE is not set 200# CONFIG_FTRACE is not set
195CONFIG_DEBUG_USER=y 201CONFIG_DEBUG_USER=y
196CONFIG_DEBUG_LL=y 202CONFIG_DEBUG_LL=y
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 3b136144cc83..d7346ad51043 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -3,6 +3,7 @@ CONFIG_NO_HZ=y
3CONFIG_IKCONFIG=y 3CONFIG_IKCONFIG=y
4CONFIG_IKCONFIG_PROC=y 4CONFIG_IKCONFIG_PROC=y
5CONFIG_LOG_BUF_SHIFT=16 5CONFIG_LOG_BUF_SHIFT=16
6CONFIG_BLK_DEV_INITRD=y
6CONFIG_CC_OPTIMIZE_FOR_SIZE=y 7CONFIG_CC_OPTIMIZE_FOR_SIZE=y
7CONFIG_SYSCTL_SYSCALL=y 8CONFIG_SYSCTL_SYSCALL=y
8CONFIG_EMBEDDED=y 9CONFIG_EMBEDDED=y
@@ -11,9 +12,11 @@ CONFIG_SLAB=y
11CONFIG_ARCH_SHMOBILE_MULTI=y 12CONFIG_ARCH_SHMOBILE_MULTI=y
12CONFIG_ARCH_EMEV2=y 13CONFIG_ARCH_EMEV2=y
13CONFIG_ARCH_R7S72100=y 14CONFIG_ARCH_R7S72100=y
15CONFIG_ARCH_R8A7740=y
14CONFIG_ARCH_R8A7779=y 16CONFIG_ARCH_R8A7779=y
15CONFIG_ARCH_R8A7790=y 17CONFIG_ARCH_R8A7790=y
16CONFIG_ARCH_R8A7791=y 18CONFIG_ARCH_R8A7791=y
19CONFIG_ARCH_R8A7794=y
17CONFIG_MACH_KOELSCH=y 20CONFIG_MACH_KOELSCH=y
18CONFIG_MACH_LAGER=y 21CONFIG_MACH_LAGER=y
19CONFIG_MACH_MARZEN=y 22CONFIG_MACH_MARZEN=y
@@ -49,6 +52,7 @@ CONFIG_DEVTMPFS=y
49CONFIG_DEVTMPFS_MOUNT=y 52CONFIG_DEVTMPFS_MOUNT=y
50CONFIG_MTD=y 53CONFIG_MTD=y
51CONFIG_MTD_M25P80=y 54CONFIG_MTD_M25P80=y
55CONFIG_MTD_SPI_NOR=y
52CONFIG_EEPROM_AT24=y 56CONFIG_EEPROM_AT24=y
53CONFIG_BLK_DEV_SD=y 57CONFIG_BLK_DEV_SD=y
54CONFIG_ATA=y 58CONFIG_ATA=y
@@ -73,6 +77,8 @@ CONFIG_SMSC_PHY=y
73# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 77# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
74CONFIG_KEYBOARD_GPIO=y 78CONFIG_KEYBOARD_GPIO=y
75# CONFIG_INPUT_MOUSE is not set 79# CONFIG_INPUT_MOUSE is not set
80CONFIG_INPUT_TOUCHSCREEN=y
81CONFIG_TOUCHSCREEN_ST1232=y
76# CONFIG_LEGACY_PTYS is not set 82# CONFIG_LEGACY_PTYS is not set
77CONFIG_SERIAL_8250=y 83CONFIG_SERIAL_8250=y
78CONFIG_SERIAL_8250_CONSOLE=y 84CONFIG_SERIAL_8250_CONSOLE=y
@@ -82,6 +88,7 @@ CONFIG_SERIAL_SH_SCI=y
82CONFIG_SERIAL_SH_SCI_NR_UARTS=20 88CONFIG_SERIAL_SH_SCI_NR_UARTS=20
83CONFIG_SERIAL_SH_SCI_CONSOLE=y 89CONFIG_SERIAL_SH_SCI_CONSOLE=y
84CONFIG_I2C_GPIO=y 90CONFIG_I2C_GPIO=y
91CONFIG_I2C_RIIC=y
85CONFIG_I2C_SH_MOBILE=y 92CONFIG_I2C_SH_MOBILE=y
86CONFIG_I2C_RCAR=y 93CONFIG_I2C_RCAR=y
87CONFIG_SPI=y 94CONFIG_SPI=y
@@ -110,10 +117,16 @@ CONFIG_VIDEO_RENESAS_VSP1=y
110CONFIG_VIDEO_ADV7180=y 117CONFIG_VIDEO_ADV7180=y
111CONFIG_DRM=y 118CONFIG_DRM=y
112CONFIG_DRM_RCAR_DU=y 119CONFIG_DRM_RCAR_DU=y
120CONFIG_BACKLIGHT_LCD_SUPPORT=y
121# CONFIG_LCD_CLASS_DEVICE is not set
122# CONFIG_BACKLIGHT_GENERIC is not set
123CONFIG_BACKLIGHT_PWM=y
113CONFIG_SOUND=y 124CONFIG_SOUND=y
114CONFIG_SND=y 125CONFIG_SND=y
115CONFIG_SND_SOC=y 126CONFIG_SND_SOC=y
127CONFIG_SND_SOC_SH4_FSI=y
116CONFIG_SND_SOC_RCAR=y 128CONFIG_SND_SOC_RCAR=y
129CONFIG_SND_SOC_WM8978=y
117CONFIG_USB=y 130CONFIG_USB=y
118CONFIG_USB_EHCI_HCD=y 131CONFIG_USB_EHCI_HCD=y
119CONFIG_USB_OHCI_HCD=y 132CONFIG_USB_OHCI_HCD=y
@@ -130,9 +143,12 @@ CONFIG_NEW_LEDS=y
130CONFIG_LEDS_CLASS=y 143CONFIG_LEDS_CLASS=y
131CONFIG_LEDS_GPIO=y 144CONFIG_LEDS_GPIO=y
132CONFIG_RTC_CLASS=y 145CONFIG_RTC_CLASS=y
146CONFIG_RTC_DRV_S35390A=y
133CONFIG_DMADEVICES=y 147CONFIG_DMADEVICES=y
134CONFIG_SH_DMAE=y 148CONFIG_SH_DMAE=y
135# CONFIG_IOMMU_SUPPORT is not set 149# CONFIG_IOMMU_SUPPORT is not set
150CONFIG_PWM=y
151CONFIG_PWM_RENESAS_TPU=y
136# CONFIG_DNOTIFY is not set 152# CONFIG_DNOTIFY is not set
137CONFIG_MSDOS_FS=y 153CONFIG_MSDOS_FS=y
138CONFIG_VFAT_FS=y 154CONFIG_VFAT_FS=y
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 7209bfd62074..c1a4ca4f6e6d 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -75,7 +75,6 @@ CONFIG_POWER_RESET_SUN6I=y
75CONFIG_WATCHDOG=y 75CONFIG_WATCHDOG=y
76CONFIG_SUNXI_WATCHDOG=y 76CONFIG_SUNXI_WATCHDOG=y
77CONFIG_MFD_AXP20X=y 77CONFIG_MFD_AXP20X=y
78CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
79CONFIG_REGULATOR_GPIO=y 78CONFIG_REGULATOR_GPIO=y
80CONFIG_USB=y 79CONFIG_USB=y
81CONFIG_USB_EHCI_HCD=y 80CONFIG_USB_EHCI_HCD=y
@@ -93,6 +92,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
93CONFIG_RTC_CLASS=y 92CONFIG_RTC_CLASS=y
94# CONFIG_RTC_INTF_SYSFS is not set 93# CONFIG_RTC_INTF_SYSFS is not set
95# CONFIG_RTC_INTF_PROC is not set 94# CONFIG_RTC_INTF_PROC is not set
95CONFIG_RTC_DRV_SUN6I=y
96CONFIG_RTC_DRV_SUNXI=y 96CONFIG_RTC_DRV_SUNXI=y
97# CONFIG_IOMMU_SUPPORT is not set 97# CONFIG_IOMMU_SUPPORT is not set
98CONFIG_PHY_SUN4I_USB=y 98CONFIG_PHY_SUN4I_USB=y
@@ -103,5 +103,7 @@ CONFIG_NFS_FS=y
103CONFIG_NFS_V3_ACL=y 103CONFIG_NFS_V3_ACL=y
104CONFIG_NFS_V4=y 104CONFIG_NFS_V4=y
105CONFIG_ROOT_NFS=y 105CONFIG_ROOT_NFS=y
106CONFIG_NLS_CODEPAGE_437=y
107CONFIG_NLS_ISO8859_1=y
106CONFIG_PRINTK_TIME=y 108CONFIG_PRINTK_TIME=y
107CONFIG_DEBUG_FS=y 109CONFIG_DEBUG_FS=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 285c433a9aad..888fc1521322 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -102,6 +102,9 @@ CONFIG_BLK_DEV_SD=y
102CONFIG_BLK_DEV_SR=y 102CONFIG_BLK_DEV_SR=y
103CONFIG_SCSI_MULTI_LUN=y 103CONFIG_SCSI_MULTI_LUN=y
104# CONFIG_SCSI_LOWLEVEL is not set 104# CONFIG_SCSI_LOWLEVEL is not set
105CONFIG_ATA=y
106CONFIG_SATA_AHCI=y
107CONFIG_AHCI_TEGRA=y
105CONFIG_NETDEVICES=y 108CONFIG_NETDEVICES=y
106CONFIG_DUMMY=y 109CONFIG_DUMMY=y
107CONFIG_IGB=y 110CONFIG_IGB=y
@@ -120,6 +123,7 @@ CONFIG_KEYBOARD_TEGRA=y
120CONFIG_KEYBOARD_CROS_EC=y 123CONFIG_KEYBOARD_CROS_EC=y
121CONFIG_MOUSE_PS2_ELANTECH=y 124CONFIG_MOUSE_PS2_ELANTECH=y
122CONFIG_INPUT_TOUCHSCREEN=y 125CONFIG_INPUT_TOUCHSCREEN=y
126CONFIG_TOUCHSCREEN_ATMEL_MXT=y
123CONFIG_TOUCHSCREEN_STMPE=y 127CONFIG_TOUCHSCREEN_STMPE=y
124CONFIG_INPUT_MISC=y 128CONFIG_INPUT_MISC=y
125CONFIG_INPUT_MPU3050=y 129CONFIG_INPUT_MPU3050=y
@@ -165,7 +169,6 @@ CONFIG_MFD_TPS6586X=y
165CONFIG_MFD_TPS65910=y 169CONFIG_MFD_TPS65910=y
166CONFIG_REGULATOR=y 170CONFIG_REGULATOR=y
167CONFIG_REGULATOR_FIXED_VOLTAGE=y 171CONFIG_REGULATOR_FIXED_VOLTAGE=y
168CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
169CONFIG_REGULATOR_AS3722=y 172CONFIG_REGULATOR_AS3722=y
170CONFIG_REGULATOR_GPIO=y 173CONFIG_REGULATOR_GPIO=y
171CONFIG_REGULATOR_MAX8907=y 174CONFIG_REGULATOR_MAX8907=y