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

Commit 1f9f1635 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.18/fixes-rc5-signed' of... 

Merge tag 'omap-for-v4.18/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

One omap dts mismerge fix

The dts patch for droid4 PWM vibrator has added gpio6 entries to the wrong
node. Let's fix it with a note that there seems to be also other GPIO PWM
issues to fix still to get the PWM vibrator working. So this can wait for
v4.19 merge cycle if necessary.

* tag 'omap-for-v4.18/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: omap4-droid4: fix dts w.r.t. pwm

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 13e66cee d3f6daed

arch/arm/boot/dts/omap4-droid4-xt894.dts

+3 −6
Original line number Diff line number Diff line
@@ -159,13 +159,7 @@ 


		dais = <&mcbsp2_port>, <&mcbsp3_port>;

	};

};



&dss {

	status = "okay";

};



&gpio6 {

	pwm8: dmtimer-pwm-8 {

		pinctrl-names = "default";

		pinctrl-0 = <&vibrator_direction_pin>;
@@ -192,7 +186,10 @@ 
		pwm-names = "enable", "direction";

		direction-duty-cycle-ns = <10000000>;

	};

};



&dss {

	status = "okay";

};



&dsi1 {