diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-29 02:02:27 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-29 02:02:27 +0100 |
commit | c441ab93d2b0ffec1852c1fd2186d262c2031d16 (patch) | |
tree | f2ce1495f4b0cc5cc3733de02b6123c5942ef650 /arch/arm/mach-omap1/gpio16xx.c | |
parent | efa25ffdd6a8518e963c5426f70b094a09fb2abb (diff) | |
parent | 55ace6b285d7350d5b562ba065656c8242629a32 (diff) | |
download | talos-op-linux-c441ab93d2b0ffec1852c1fd2186d262c2031d16.tar.gz talos-op-linux-c441ab93d2b0ffec1852c1fd2186d262c2031d16.zip |
Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3
Merge "Samsung 3rd DT updates for v3.15" from Kukjin Kim:
- Arndale Octa board updates:
LDO3 and LDO23 enabled for soft-reset
LDO9 enabled for USB operation
MDMA1 disabled to avoid imprecise external abort
Note that this is based on previous tags/samsung-dt-2
* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Keep some essential LDOs enabled for arndale-octa board
ARM: dts: Disable MDMA1 node for arndale-octa board
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/gpio16xx.c')
0 files changed, 0 insertions, 0 deletions