diff options
author | Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com> | 2014-11-21 18:55:03 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 10:45:58 -0500 |
commit | ad8dd8827bbe119c80f1df7734ca70afc1dee522 (patch) | |
tree | bc2512d53cd65017ffdf9e7e64660dfba0c0b1d3 /arch/arm/configs | |
parent | 368c7e57ce3bcf331366bd77b5bfccf7827c5453 (diff) |
ARM: defconfig: imx_v6_v7_defconfig updates
This is a squash of several imx_v6_v7_defconfig update patches.
- Enable tlv320aic3x audio codec by default (Phytec PBAB01 board)
- Enable DS1307 rtc and gpio fan by default (TBS2910 board)
- Select thermal related drivers
- Add SNVS power off driver
Signed-off-by: Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com>
Signed-off-by: Soeren Moch <smoch@web.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 8fca6e276b69..c7b8fba8654b 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -162,7 +162,13 @@ CONFIG_SPI_IMX=y | |||
162 | CONFIG_GPIO_SYSFS=y | 162 | CONFIG_GPIO_SYSFS=y |
163 | CONFIG_GPIO_MC9S08DZ60=y | 163 | CONFIG_GPIO_MC9S08DZ60=y |
164 | CONFIG_GPIO_STMPE=y | 164 | CONFIG_GPIO_STMPE=y |
165 | # CONFIG_HWMON is not set | 165 | CONFIG_SENSORS_GPIO_FAN=y |
166 | CONFIG_THERMAL=y | ||
167 | CONFIG_CPU_THERMAL=y | ||
168 | CONFIG_IMX_THERMAL=y | ||
169 | CONFIG_POWER_SUPPLY=y | ||
170 | CONFIG_POWER_RESET=y | ||
171 | CONFIG_POWER_RESET_IMX=y | ||
166 | CONFIG_WATCHDOG=y | 172 | CONFIG_WATCHDOG=y |
167 | CONFIG_IMX2_WDT=y | 173 | CONFIG_IMX2_WDT=y |
168 | CONFIG_MFD_DA9052_I2C=y | 174 | CONFIG_MFD_DA9052_I2C=y |
@@ -210,6 +216,7 @@ CONFIG_SND_SOC_IMX_WM8962=y | |||
210 | CONFIG_SND_SOC_IMX_SGTL5000=y | 216 | CONFIG_SND_SOC_IMX_SGTL5000=y |
211 | CONFIG_SND_SOC_IMX_SPDIF=y | 217 | CONFIG_SND_SOC_IMX_SPDIF=y |
212 | CONFIG_SND_SOC_IMX_MC13783=y | 218 | CONFIG_SND_SOC_IMX_MC13783=y |
219 | CONFIG_SND_SOC_TLV320AIC3X=y | ||
213 | CONFIG_SND_SIMPLE_CARD=y | 220 | CONFIG_SND_SIMPLE_CARD=y |
214 | CONFIG_USB=y | 221 | CONFIG_USB=y |
215 | CONFIG_USB_EHCI_HCD=y | 222 | CONFIG_USB_EHCI_HCD=y |
@@ -238,6 +245,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y | |||
238 | CONFIG_LEDS_TRIGGER_GPIO=y | 245 | CONFIG_LEDS_TRIGGER_GPIO=y |
239 | CONFIG_RTC_CLASS=y | 246 | CONFIG_RTC_CLASS=y |
240 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 247 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
248 | CONFIG_RTC_DRV_DS1307=y | ||
241 | CONFIG_RTC_DRV_ISL1208=y | 249 | CONFIG_RTC_DRV_ISL1208=y |
242 | CONFIG_RTC_DRV_PCF8563=y | 250 | CONFIG_RTC_DRV_PCF8563=y |
243 | CONFIG_RTC_DRV_MC13XXX=y | 251 | CONFIG_RTC_DRV_MC13XXX=y |