aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/mxs_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-13 02:08:59 -0400
committerOlof Johansson <olof@lixom.net>2012-09-13 02:08:59 -0400
commitf6cfa44405be73e4a02258fb0c093385064bd91d (patch)
tree7a953bfab7b37406f621b3d87e820861d3e724f6 /arch/arm/configs/mxs_defconfig
parented81eb9d242b2867e693734951a42737ef1d94b0 (diff)
parent8f9d87a0b2ec18416a8ad1a53dd5a97ee4ef7825 (diff)
Merge tag 'mxs-defconfig-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/defconfig
A collection of mxs_defconfig updates for 3.7. * tag 'mxs-defconfig-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs_defconfig: Add SPI and LRADC support ARM: mxs_defconfig: Add framebuffer support ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support ARM: mxs_defconfig: Enable USB host
Diffstat (limited to 'arch/arm/configs/mxs_defconfig')
-rw-r--r--arch/arm/configs/mxs_defconfig36
1 files changed, 35 insertions, 1 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 4edcfb4e4dee..5e021ced49c3 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -59,6 +59,9 @@ CONFIG_DEVTMPFS=y
59# CONFIG_FIRMWARE_IN_KERNEL is not set 59# CONFIG_FIRMWARE_IN_KERNEL is not set
60# CONFIG_BLK_DEV is not set 60# CONFIG_BLK_DEV is not set
61CONFIG_MTD=y 61CONFIG_MTD=y
62CONFIG_MTD_CHAR=y
63CONFIG_MTD_DATAFLASH=y
64CONFIG_MTD_M25P80
62CONFIG_MTD_NAND=y 65CONFIG_MTD_NAND=y
63CONFIG_MTD_NAND_GPMI_NAND=y 66CONFIG_MTD_NAND_GPMI_NAND=y
64CONFIG_NETDEVICES=y 67CONFIG_NETDEVICES=y
@@ -88,13 +91,13 @@ CONFIG_I2C_CHARDEV=y
88CONFIG_I2C_MXS=y 91CONFIG_I2C_MXS=y
89CONFIG_SPI=y 92CONFIG_SPI=y
90CONFIG_SPI_GPIO=m 93CONFIG_SPI_GPIO=m
94CONFIG_SPI_MXS=y
91CONFIG_DEBUG_GPIO=y 95CONFIG_DEBUG_GPIO=y
92CONFIG_GPIO_SYSFS=y 96CONFIG_GPIO_SYSFS=y
93# CONFIG_HWMON is not set 97# CONFIG_HWMON is not set
94# CONFIG_MFD_SUPPORT is not set 98# CONFIG_MFD_SUPPORT is not set
95CONFIG_DISPLAY_SUPPORT=m 99CONFIG_DISPLAY_SUPPORT=m
96# CONFIG_HID_SUPPORT is not set 100# CONFIG_HID_SUPPORT is not set
97# CONFIG_USB_SUPPORT is not set
98CONFIG_SOUND=y 101CONFIG_SOUND=y
99CONFIG_SND=y 102CONFIG_SND=y
100CONFIG_SND_TIMER=y 103CONFIG_SND_TIMER=y
@@ -109,14 +112,45 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
109CONFIG_SND_SOC_SGTL5000=y 112CONFIG_SND_SOC_SGTL5000=y
110CONFIG_REGULATOR=y 113CONFIG_REGULATOR=y
111CONFIG_REGULATOR_FIXED_VOLTAGE=y 114CONFIG_REGULATOR_FIXED_VOLTAGE=y
115CONFIG_FB=y
116CONFIG_FB_MXS=y
117CONFIG_BACKLIGHT_LCD_SUPPORT=y
118CONFIG_LCD_CLASS_DEVICE=y
119CONFIG_BACKLIGHT_CLASS_DEVICE=y
120CONFIG_BACKLIGHT_PWM=y
121CONFIG_FRAMEBUFFER_CONSOLE=y
122CONFIG_FONTS=y
123CONFIG_LOGO=y
124CONFIG_USB=y
125CONFIG_USB_CHIPIDEA=y
126CONFIG_USB_CHIPIDEA_HOST=y
127CONFIG_USB_STORAGE=y
128CONFIG_USB_MXS_PHY=y
129CONFIG_SCSI=y
130CONFIG_BLK_DEV_SD=y
112CONFIG_MMC=y 131CONFIG_MMC=y
113CONFIG_MMC_MXS=y 132CONFIG_MMC_MXS=y
133CONFIG_NEW_LEDS=y
134CONFIG_LEDS_CLASS=y
135CONFIG_LEDS_GPIO=y
136CONFIG_LEDS_TRIGGERS=y
137CONFIG_LEDS_TRIGGER_TIMER=y
138CONFIG_LEDS_TRIGGER_ONESHOT=y
139CONFIG_LEDS_TRIGGER_HEARTBEAT=y
140CONFIG_LEDS_TRIGGER_BACKLIGHT=y
141CONFIG_LEDS_TRIGGER_GPIO=y
114CONFIG_RTC_CLASS=y 142CONFIG_RTC_CLASS=y
115CONFIG_RTC_DRV_DS1307=m 143CONFIG_RTC_DRV_DS1307=m
116CONFIG_RTC_DRV_STMP=y 144CONFIG_RTC_DRV_STMP=y
117CONFIG_DMADEVICES=y 145CONFIG_DMADEVICES=y
118CONFIG_MXS_DMA=y 146CONFIG_MXS_DMA=y
147CONFIG_STAGING=y
148CONFIG_MXS_LRADC=y
149CONFIG_IIO_SYSFS_TRIGGER=y
119CONFIG_COMMON_CLK_DEBUG=y 150CONFIG_COMMON_CLK_DEBUG=y
151CONFIG_IIO=y
152CONFIG_PWM=y
153CONFIG_PWM_MXS=y
120CONFIG_EXT3_FS=y 154CONFIG_EXT3_FS=y
121# CONFIG_DNOTIFY is not set 155# CONFIG_DNOTIFY is not set
122CONFIG_FSCACHE=m 156CONFIG_FSCACHE=m
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-23 18:20:58 -0500