diff options
author | Olof Johansson <olof@lixom.net> | 2018-07-20 01:07:12 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-07-20 01:07:12 +0300 |
commit | 1f9f163500d0a1aaabcd994879e00f48190eb025 (patch) | |
tree | ab3ce79712ec16b4e4d82f293b68d930e429b2ae /drivers/gpu/drm/omapdrm/omap_fb.h | |
parent | 13e66ceea1600f1061181acc2d4e0fac1a7d0333 (diff) | |
parent | d3f6daede246038cf2ea38b78d732f9dd8feb1d6 (diff) | |
download | linux-1f9f163500d0a1aaabcd994879e00f48190eb025.tar.xz |
Merge tag 'omap-for-v4.18/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
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.
* tag 'omap-for-v4.18/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: omap4-droid4: fix dts w.r.t. pwm
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fb.h')
0 files changed, 0 insertions, 0 deletions