github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 22:52:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Some additional sane defaults for the oldish rk3368 soc.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmkbmvcQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgVYxB/kBH1cFa7Epi7l2tUtu4A8wpNUpxUtSyto7
 8VlPbL4wa6KUzTnZFG7cQGvqIeaQnVTFAEYAPXH/UQiYNyS6MJZdxp7+E29GGS58
 /EKrjE1J4HAfJAaJ3W4YTDISYdjcE9dgb1SPeAAvSY1+ecBCj6GyGU7wdEGK8bQL
 snNEL4HIoOzow9GCQIx+dHOZ7FEJbv0MbQQU9pJEuziAQl6Z7O+fSJoKKktjJpXR
 hQDuRGFwXr0L9QyK6qmUP0bxvVd/Zky8O7yl2G16Y3PWfjvOiNlIfiyubMFC78ps
 AoQvTMcshKey25nVL/YOeYe2qy+KGhTBnlPks2SYDiyaoBuT/Fh/
 =pv4F
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmklqRQACgkQmmx57+YA
 GNm1iA//WETh19gVbS6+w7J6wIec7u+bm7dTCns609NkwnK0z+Glj8ZyfetNCZGG
 6L2MgrUeo2Gw7Cfy6WdRVjdqWkMrBb5vpkAcd+Jn1Vh5x8yHIxIu5oBHXOWMjlz6
 F1+/PYZo5umcnKc3nppvVR9tQYp5jihMY4o7kWGRHJLWSJxZGYQPajunLeKZId5H
 q5ysW/IB2dMHUnq0zzn4SIkUY4LiIxxgQO5GvLWNzl2P9QQSoOlGPofJEeCurfHt
 gx0AwMT/Wamb6DcK8/P1HzQjHYBRkmmrmLoMqIgmM2E0fc35kTDKuWiuHytIEl27
 E/8oHRLTJu9gsB0/Dva8Z6ivmt+yhxeRuTWuDsBe4Nac2ONFaQ9EawLPWatMEmiR
 SSObiovAd57ub3U6aNw29VkAcVjykfyxWbhckfhDwgqSY5CPDWDqMezIeeoLvRP8
 TomzEYYEsgsRuzV6dGOfeTm7oPcnxRJyQIu5RgTkTRdCYr2EI8XMsy5sMCZaWdKw
 Qp97qGIeHdkpIu02UCUPX1vwoLW+s+Gdana2P8cwUKv/uIm+ItiiPSACcb0hnXhL
 9Mb+vY+gARZ0k3HRAEe6u+YWVOkJF5UAGIg8HKJ64qcFYkAqVkDBa3TCFF5YBlen
 rWoyKvkdJyYtg/xobKaPvLRxdi7fdtFA2O5/JXCbwPKSORcvbfU=
 =LdjL
 -----END PGP SIGNATURE-----

Merge tag 'v6.19-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/drivers

Some additional sane defaults for the oldish rk3368 soc.

* tag 'v6.19-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: grf: Add select correct PWM implementation on RK3368
  soc: rockchip: grf: Set pwm2/xin32k pad default to xin32k for rk3368

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-11-25 14:02:26 +01:00
commit c0401dcbca
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ static const struct rockchip_grf_info rk3328_grf __initconst = {
static const struct rockchip_grf_value rk3368_defaults[] __initconst = {
{ "jtag switching", RK3368_GRF_SOC_CON15, FIELD_PREP_WM16_CONST(BIT(13), 0) },
{ "pwm select", RK3368_GRF_SOC_CON15, FIELD_PREP_WM16_CONST(BIT(12), 1) },
};
static const struct rockchip_grf_info rk3368_grf __initconst = {
@ -98,6 +99,17 @@ static const struct rockchip_grf_info rk3368_grf __initconst = {
.num_values = ARRAY_SIZE(rk3368_defaults),
};
#define RK3368_PMUGRF_SOC_CON0 0x100
static const struct rockchip_grf_value rk3368_pmugrf_defaults[] __initconst = {
{ "pwm2 select", RK3368_PMUGRF_SOC_CON0, FIELD_PREP_WM16_CONST(BIT(7), 0) },
};
static const struct rockchip_grf_info rk3368_pmugrf __initconst = {
.values = rk3368_pmugrf_defaults,
.num_values = ARRAY_SIZE(rk3368_pmugrf_defaults),
};
#define RK3399_GRF_SOC_CON7 0xe21c
static const struct rockchip_grf_value rk3399_defaults[] __initconst = {
@ -175,6 +187,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
}, {
.compatible = "rockchip,rk3368-grf",
.data = (void *)&rk3368_grf,
}, {
.compatible = "rockchip,rk3368-pmugrf",
.data = (void *)&rk3368_pmugrf,
}, {
.compatible = "rockchip,rk3399-grf",
.data = (void *)&rk3399_grf,