diff options
author | Luwei Zhou <b45643@freescale.com> | 2013-08-26 05:13:44 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:01:27 -0400 |
commit | eb2e6fd0c138ca49f8abcb58e17cfd1056ea9d14 (patch) | |
tree | faaf469ef7056df664ba530b25d8ed717fc495e9 /arch | |
parent | 102dfd44faefe62ab0cd9f4af1f5c4c9214723cc (diff) |
ENGR00276701 imx_v6_v7_defconfig: Enable mma8451,mag3110,isl29023
Add mma8451, mag3110, isl29023 support in deault config.
Signed-off-by: Luwei Zhou <b45643@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 566ed209e7f6..d876da99cd31 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -140,6 +140,7 @@ CONFIG_TOUCHSCREEN_MAX11801=y | |||
140 | CONFIG_TOUCHSCREEN_MC13783=y | 140 | CONFIG_TOUCHSCREEN_MC13783=y |
141 | CONFIG_INPUT_MISC=y | 141 | CONFIG_INPUT_MISC=y |
142 | CONFIG_INPUT_MMA8450=y | 142 | CONFIG_INPUT_MMA8450=y |
143 | CONFIG_INPUT_ISL29023=y | ||
143 | CONFIG_SERIO_SERPORT=m | 144 | CONFIG_SERIO_SERPORT=m |
144 | CONFIG_VT_HW_CONSOLE_BINDING=y | 145 | CONFIG_VT_HW_CONSOLE_BINDING=y |
145 | # CONFIG_LEGACY_PTYS is not set | 146 | # CONFIG_LEGACY_PTYS is not set |
@@ -162,7 +163,7 @@ CONFIG_GPIO_SYSFS=y | |||
162 | CONFIG_GPIO_MC9S08DZ60=y | 163 | CONFIG_GPIO_MC9S08DZ60=y |
163 | CONFIG_POWER_SUPPLY=y | 164 | CONFIG_POWER_SUPPLY=y |
164 | CONFIG_SABRESD_MAX8903=y | 165 | CONFIG_SABRESD_MAX8903=y |
165 | # CONFIG_HWMON is not set | 166 | CONFIG_SENSORS_MAG3110=y |
166 | CONFIG_THERMAL=y | 167 | CONFIG_THERMAL=y |
167 | CONFIG_CPU_THERMAL=y | 168 | CONFIG_CPU_THERMAL=y |
168 | CONFIG_IMX_THERMAL=y | 169 | CONFIG_IMX_THERMAL=y |
@@ -200,9 +201,9 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y | |||
200 | CONFIG_BACKLIGHT_PWM=y | 201 | CONFIG_BACKLIGHT_PWM=y |
201 | CONFIG_FB_MXC_SYNC_PANEL=y | 202 | CONFIG_FB_MXC_SYNC_PANEL=y |
202 | CONFIG_FB_MXC_LDB=y | 203 | CONFIG_FB_MXC_LDB=y |
203 | CONFIG_FB_MXC_HDMI=y | ||
204 | CONFIG_FB_MXC_MIPI_DSI=y | 204 | CONFIG_FB_MXC_MIPI_DSI=y |
205 | CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y | 205 | CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y |
206 | CONFIG_FB_MXC_HDMI=y | ||
206 | CONFIG_FRAMEBUFFER_CONSOLE=y | 207 | CONFIG_FRAMEBUFFER_CONSOLE=y |
207 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | 208 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y |
208 | CONFIG_FONTS=y | 209 | CONFIG_FONTS=y |
@@ -279,7 +280,6 @@ CONFIG_UDF_FS=m | |||
279 | CONFIG_MSDOS_FS=m | 280 | CONFIG_MSDOS_FS=m |
280 | CONFIG_VFAT_FS=y | 281 | CONFIG_VFAT_FS=y |
281 | CONFIG_TMPFS=y | 282 | CONFIG_TMPFS=y |
282 | CONFIG_CONFIGFS_FS=m | ||
283 | CONFIG_JFFS2_FS=y | 283 | CONFIG_JFFS2_FS=y |
284 | CONFIG_UBIFS_FS=y | 284 | CONFIG_UBIFS_FS=y |
285 | CONFIG_NFS_FS=y | 285 | CONFIG_NFS_FS=y |