tag 3649b255203c18c5e9a10f9d7e479572b3da622f
tagger Tony Lindgren <tony@atomide.com> Thu Jul 19 00:34:25 2018 -0700
object d3f6daede246038cf2ea38b78d732f9dd8feb1d6

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.

commit d3f6daede246038cf2ea38b78d732f9dd8feb1d6
author Pavel Machek <pavel@ucw.cz> Mon Jul 16 09:10:48 2018 +0200
committer Tony Lindgren <tony@atomide.com> Mon Jul 16 23:38:52 2018 -0700
tree 2d0123b4c9667410f0da2b93374633dfe0b7491d
parent 923847413f7316b5ced3491769b3fefa6c56a79a

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>