Merge tag 'soc-arm-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / drivers / soc / rockchip / grf.c

diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c
index 30203ec447e52395ef2b8a2434caffb102912638..5fd62046b28aae0523c7250901b86107872917da 100644 (file)
--- a/drivers/soc/rockchip/grf.c
+++ b/drivers/soc/rockchip/grf.c
@@ -121,6 +121,17 @@ static const struct rockchip_grf_info rk3566_pipegrf __initconst = {
        .num_values = ARRAY_SIZE(rk3566_defaults),
 };
 
+#define RK3588_GRF_SOC_CON6            0x0318
+
+static const struct rockchip_grf_value rk3588_defaults[] __initconst = {
+       { "jtag switching", RK3588_GRF_SOC_CON6, HIWORD_UPDATE(0, 1, 14) },
+};
+
+static const struct rockchip_grf_info rk3588_sysgrf __initconst = {
+       .values = rk3588_defaults,
+       .num_values = ARRAY_SIZE(rk3588_defaults),
+};
+
 
 static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
        {
@@ -147,6 +158,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
        }, {
                .compatible = "rockchip,rk3566-pipe-grf",
                .data = (void *)&rk3566_pipegrf,
+       }, {
+               .compatible = "rockchip,rk3588-sys-grf",
+               .data = (void *)&rk3588_sysgrf,
        },
        { /* sentinel */ },
 };