diff options
author | Pavel Machek <pavel@ucw.cz> | 2018-07-16 03:10:48 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2018-07-17 02:38:52 -0400 |
commit | d3f6daede246038cf2ea38b78d732f9dd8feb1d6 (patch) | |
tree | 2d0123b4c9667410f0da2b93374633dfe0b7491d | |
parent | 923847413f7316b5ced3491769b3fefa6c56a79a (diff) |
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>
-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 @@ | |||
159 | 159 | ||
160 | dais = <&mcbsp2_port>, <&mcbsp3_port>; | 160 | dais = <&mcbsp2_port>, <&mcbsp3_port>; |
161 | }; | 161 | }; |
162 | }; | ||
163 | |||
164 | &dss { | ||
165 | status = "okay"; | ||
166 | }; | ||
167 | 162 | ||
168 | &gpio6 { | ||
169 | pwm8: dmtimer-pwm-8 { | 163 | pwm8: dmtimer-pwm-8 { |
170 | pinctrl-names = "default"; | 164 | pinctrl-names = "default"; |
171 | pinctrl-0 = <&vibrator_direction_pin>; | 165 | pinctrl-0 = <&vibrator_direction_pin>; |
@@ -192,7 +186,10 @@ | |||
192 | pwm-names = "enable", "direction"; | 186 | pwm-names = "enable", "direction"; |
193 | direction-duty-cycle-ns = <10000000>; | 187 | direction-duty-cycle-ns = <10000000>; |
194 | }; | 188 | }; |
189 | }; | ||
195 | 190 | ||
191 | &dss { | ||
192 | status = "okay"; | ||
196 | }; | 193 | }; |
197 | 194 | ||
198 | &dsi1 { | 195 | &dsi1 { |