hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Select correct pwm solution by default. 

-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAly/dWgQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgdfoB/4irvAihmabor/KyjEeBZMO7NDb4Z+WDOhQ
 3dsIsqotPwza4m81ERlKOVdXEYqd+692Jat8fLHF4DgL9NjKPLARDpTg6MeWXB8L
 z4BaSwrA5WC9VqbnbxbjWMdk2uJPo52YngLQeznsDFcGJdqHux1XGU/kICV0Tkqt
 DXdCbRzVIC+9GHHSG8VVPyVIDkFsFxFSb6ENOESh/W9SqKg1uHZBuZy+WCoojrKK
 C4IU4XxUeZCLJGu63F5VpzVaqcw7pMvff0qig3PDr426mLS146wdQVtXMsdH2cf3
 Sz+mqXkuA2ORyD3CRhRRVnckALrw5aFtLGkOEWlUKNY59zElvoyU
 =4KwL
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2019-04-29 09:56:07 -07:00
parent 1e6df94937 bbdc00a7de
commit bcca940e51
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soc/rockchip/grf.c
View File

@ -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 = {