Commit bcca940e authored Apr 29, 2019 by Olof Johansson

Merge tag 'v5.2-rockchip-drivers-1' of...

Merge tag 'v5.2-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/drivers

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>

parents 1e6df949 bbdc00a7

drivers/soc/rockchip/grf.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -66,9 +66,11 @@ static const struct rockchip_grf_info rk3228_grf __initconst = {
		};

		#define RK3288_GRF_SOC_CON0 0x244
		#define RK3288_GRF_SOC_CON2 0x24c

		static const struct rockchip_grf_value rk3288_defaults[] __initconst = {
		{ "jtag switching", RK3288_GRF_SOC_CON0, HIWORD_UPDATE(0, 1, 12) },
		{ "pwm select", RK3288_GRF_SOC_CON2, HIWORD_UPDATE(1, 1, 0) },
		};

		static const struct rockchip_grf_info rk3288_grf __initconst = {

Admin message