summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-29 09:28:59 -0800
committerOlof Johansson <olof@lixom.net>2013-01-29 09:28:59 -0800
commit7734a93bf7553042a339748dad6e4961d94cfa28 (patch)
treea44542fcf8ea3116a127f40981e6e75ce4b7a00a /arch/arm/configs
parent949db153b6466c6f7cad5a427ecea94985927311 (diff)
parent1661636d362b6d1a6c2bab210f2ab363a69deccc (diff)
Merge tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
From Sekhar Nori: DaVinci DT changes for v3.9 This pull requests adds support for pinctrl, NAND and RTC support when DA850 is booting using DT. * tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: da850: add RTC DT entries ARM: davinci: da850: move interrupt-parent property to soc node ARM: davinci: da8xx defconfig: enable pinctrl config option ARM: davinci: da850: add NAND driver DT entries ARM: davinci: da850: add pinctrl driver DT entries
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/da8xx_omapl_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig
index f29223954af..0892db4346e 100644
--- a/arch/arm/configs/da8xx_omapl_defconfig
+++ b/arch/arm/configs/da8xx_omapl_defconfig
@@ -81,6 +81,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_DAVINCI=y
+CONFIG_PINCTRL_SINGLE=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
CONFIG_REGULATOR=y