Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1ae5b12 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.16/n900-regression' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 28c9770b d937678a

arch/arm/boot/dts/omap3-n900.dts

+1 −1
Original line number Diff line number Diff line
@@ -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;

	};

};