diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-29 19:56:07 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-29 19:56:07 +0300 |
| commit | bcca940e51688f6046d427695f7161167aaa963b (patch) | |
| tree | e185c47964622a1ad97b103c53848155684255e2 /drivers/soc | |
| parent | 1e6df9493700e92d26e4699a3f40846129b863e6 (diff) | |
| parent | bbdc00a7de24cc90315b1775fb74841373fe12f7 (diff) | |
| download | linux-bcca940e51688f6046d427695f7161167aaa963b.tar.xz | |
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>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/rockchip/grf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c index 96882ffde67e..3b81e1d75a97 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -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 = { |