Merge tag 'v5.2-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 29 Apr 2019 16:56:07 +0000 (09:56 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 29 Apr 2019 16:56:07 +0000 (09:56 -0700)
Select correct pwm solution by default.

* tag 'v5.2-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: Set the proper PWM for rk3288

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge