diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-29 13:04:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-29 13:04:27 +0200 |
| commit | a1ae5b128365f36a3fa2143cfa9de14fc71c51d8 (patch) | |
| tree | 86ecbcd8cf0789163a22999b9ca12e33e1058c08 /arch | |
| parent | ARM: dts: fix L2 address in Hi3620 (diff) | |
| parent | ARM: dts: Revert enabling of twl configuration for n900 (diff) | |
| download | linux-a1ae5b128365f36a3fa2143cfa9de14fc71c51d8.tar.xz linux-a1ae5b128365f36a3fa2143cfa9de14fc71c51d8.zip | |
Merge tag 'omap-for-v3.16/n900-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "omap n900 regression fix for v3.16 rc series" from Tony Lindgren:
Minimal regression fix for n900 display that got broken with
enabling of twl4030 PM features. Turns out more work is needed
before we can enable twl4030 PM on n900.
I did not notice this earlier as I have my n900 in a rack
and the display did not get enabled for device tree based booting
until for v3.16.
* tag 'omap-for-v3.16/n900-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: Revert enabling of twl configuration for n900
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 1fe45d1f75ec..b15f1a77d684 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -353,7 +353,7 @@ }; twl_power: power { - compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off"; + compatible = "ti,twl4030-power-n900"; ti,use_poweroff; }; }; |