diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-29 18:28:59 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-29 18:28:59 +0100 |
commit | 7734a93bf7553042a339748dad6e4961d94cfa28 (patch) | |
tree | a44542fcf8ea3116a127f40981e6e75ce4b7a00a /arch/arm/configs | |
parent | Linux 3.8-rc5 (diff) | |
parent | ARM: davinci: da850: add RTC DT entries (diff) | |
download | linux-7734a93bf7553042a339748dad6e4961d94cfa28.tar.xz linux-7734a93bf7553042a339748dad6e4961d94cfa28.zip |
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_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig index f29223954af8..0892db4346e9 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 |