diff options
| author | Pavel Machek <pavel@ucw.cz> | 2018-07-16 10:10:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-24 14:07:11 +0300 |
| commit | 248e87dfb8e9a30cf049087fea999fa0d3ca0f20 (patch) | |
| tree | aadd5c723c1fb457a6755a40f6e7a7a64c480360 | |
| parent | 74c5905e1503f6be7bcac53a2a625cb752ad827c (diff) | |
| download | linux-248e87dfb8e9a30cf049087fea999fa0d3ca0f20.tar.xz | |
ARM: dts: omap4-droid4: fix dts w.r.t. pwm
[ 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 <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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm/boot/dts/omap4-droid4-xt894.dts | 9 |
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 { |