summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2018-07-16 10:10:48 +0300
committerTony Lindgren <tony@atomide.com>2018-07-17 09:38:52 +0300
commitd3f6daede246038cf2ea38b78d732f9dd8feb1d6 (patch)
tree2d0123b4c9667410f0da2b93374633dfe0b7491d /arch
parent923847413f7316b5ced3491769b3fefa6c56a79a (diff)
downloadlinux-d3f6daede246038cf2ea38b78d732f9dd8feb1d6.tar.xz
ARM: dts: omap4-droid4: fix dts w.r.t. pwm
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 <pavel@ucw.cz> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> [tony@atomide.com: added fixes tag] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/omap4-droid4-xt894.dts9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index bdf73cbcec3a..e7c3c563ff8f 100644
--- 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 {