4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Machek <pa...@ucw.cz>
[ Upstream commit d3f6daede246038cf2ea38b78d732f9dd8feb1d6 ]
pwm node should not be under gpio6 node in the device tree.
This fixes detection of the pwm on Droid 4.
Fixes: 6d7bdd328da4 ("ARM: dts: omap4-droid4: update touchscreen")
Signed-off-by: Pavel Machek <pa...@ucw.cz>
Reviewed-by: Sebastian Reichel <sebastian.reic...@collabora.co.uk>
[t...@atomide.com: added fixes tag]
Signed-off-by: Tony Lindgren <t...@atomide.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
arch/arm/boot/dts/omap4-droid4-xt894.dts | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -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 {
