diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-29 07:04:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-29 07:04:27 -0400 |
| commit | a1ae5b128365f36a3fa2143cfa9de14fc71c51d8 (patch) | |
| tree | 86ecbcd8cf0789163a22999b9ca12e33e1058c08 /arch | |
| parent | 28c9770bcbd2b6dbab99669825a2f8fa69e6d35b (diff) | |
| parent | d937678ab625b0f63ce54b2b9b3e1cbd1b4a1b15 (diff) | |
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 @@ | |||
| 353 | }; | 353 | }; |
| 354 | 354 | ||
| 355 | twl_power: power { | 355 | twl_power: power { |
| 356 | compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off"; | 356 | compatible = "ti,twl4030-power-n900"; |
| 357 | ti,use_poweroff; | 357 | ti,use_poweroff; |
| 358 | }; | 358 | }; |
| 359 | }; | 359 | }; |