summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoeren Moch <smoch@web.de>2014-11-04 21:11:33 +0100
committerShawn Guo <shawn.guo@linaro.org>2014-11-19 11:51:55 +0800
commit1420c06fe15cb0409c734ec4720f2dee6da3872d (patch)
treeb8844a81c67f6908b86cd39ac24b55bae9707d99
parent8b2dbe927f99ddd30fc42ef421e0b509d4cd4cb7 (diff)
ARM: imx_v6_v7_defconfig: enable DS1307 rtc and gpio fan by default
Used on TBS2910 board. Signed-off-by: Soeren Moch <smoch@web.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 707b5e8fd1ad..7885e75d8a44 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -163,7 +163,7 @@ CONFIG_SPI_IMX=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MC9S08DZ60=y
CONFIG_GPIO_STMPE=y
-# CONFIG_HWMON is not set
+CONFIG_SENSORS_GPIO_FAN=y
CONFIG_WATCHDOG=y
CONFIG_IMX2_WDT=y
CONFIG_MFD_DA9052_I2C=y
@@ -240,6 +240,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_ISL1208=y
CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_MC13XXX=y