aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorDmitry Lavnikevich <d.lavnikevich@sam-solutions.com>2014-11-21 18:55:03 -0500
committerArnd Bergmann <arnd@arndb.de>2014-12-04 10:45:58 -0500
commitad8dd8827bbe119c80f1df7734ca70afc1dee522 (patch)
treebc2512d53cd65017ffdf9e7e64660dfba0c0b1d3 /arch/arm/configs
parent368c7e57ce3bcf331366bd77b5bfccf7827c5453 (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_defconfig10
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
162CONFIG_GPIO_SYSFS=y 162CONFIG_GPIO_SYSFS=y
163CONFIG_GPIO_MC9S08DZ60=y 163CONFIG_GPIO_MC9S08DZ60=y
164CONFIG_GPIO_STMPE=y 164CONFIG_GPIO_STMPE=y
165# CONFIG_HWMON is not set 165CONFIG_SENSORS_GPIO_FAN=y
166CONFIG_THERMAL=y
167CONFIG_CPU_THERMAL=y
168CONFIG_IMX_THERMAL=y
169CONFIG_POWER_SUPPLY=y
170CONFIG_POWER_RESET=y
171CONFIG_POWER_RESET_IMX=y
166CONFIG_WATCHDOG=y 172CONFIG_WATCHDOG=y
167CONFIG_IMX2_WDT=y 173CONFIG_IMX2_WDT=y
168CONFIG_MFD_DA9052_I2C=y 174CONFIG_MFD_DA9052_I2C=y
@@ -210,6 +216,7 @@ CONFIG_SND_SOC_IMX_WM8962=y
210CONFIG_SND_SOC_IMX_SGTL5000=y 216CONFIG_SND_SOC_IMX_SGTL5000=y
211CONFIG_SND_SOC_IMX_SPDIF=y 217CONFIG_SND_SOC_IMX_SPDIF=y
212CONFIG_SND_SOC_IMX_MC13783=y 218CONFIG_SND_SOC_IMX_MC13783=y
219CONFIG_SND_SOC_TLV320AIC3X=y
213CONFIG_SND_SIMPLE_CARD=y 220CONFIG_SND_SIMPLE_CARD=y
214CONFIG_USB=y 221CONFIG_USB=y
215CONFIG_USB_EHCI_HCD=y 222CONFIG_USB_EHCI_HCD=y
@@ -238,6 +245,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
238CONFIG_LEDS_TRIGGER_GPIO=y 245CONFIG_LEDS_TRIGGER_GPIO=y
239CONFIG_RTC_CLASS=y 246CONFIG_RTC_CLASS=y
240CONFIG_RTC_INTF_DEV_UIE_EMUL=y 247CONFIG_RTC_INTF_DEV_UIE_EMUL=y
248CONFIG_RTC_DRV_DS1307=y
241CONFIG_RTC_DRV_ISL1208=y 249CONFIG_RTC_DRV_ISL1208=y
242CONFIG_RTC_DRV_PCF8563=y 250CONFIG_RTC_DRV_PCF8563=y
243CONFIG_RTC_DRV_MC13XXX=y 251CONFIG_RTC_DRV_MC13XXX=y