Skip to content

Commit 6f6878e

Browse files
Ondrej Jirmanmmind
authored andcommitted
soc: rockchip: grf: Fix SDMMC not working on RK3588 with bus-width > 1
RK3588 has the same issue as other earlier RK SoCs. JTAG functionality muxed to some SDMMC data pins causes issues with SDMMC interface. Without this patch, I can only use SDMMC inteface with bus-width = <1>. (JTAG is muxed to data pins D2 and D3) Signed-off-by: Ondrej Jirman <megi@xff.cz> Link: https://lore.kernel.org/r/20230619011002.2249960-1-megi@xff.cz Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent 480a579 commit 6f6878e

File tree

1 file changed

+14
-0
lines changed
  • drivers/soc/rockchip

1 file changed

+14
-0
lines changed

drivers/soc/rockchip/grf.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,17 @@ static const struct rockchip_grf_info rk3566_pipegrf __initconst = {
121121
.num_values = ARRAY_SIZE(rk3566_defaults),
122122
};
123123

124+
#define RK3588_GRF_SOC_CON6 0x0318
125+
126+
static const struct rockchip_grf_value rk3588_defaults[] __initconst = {
127+
{ "jtag switching", RK3588_GRF_SOC_CON6, HIWORD_UPDATE(0, 1, 14) },
128+
};
129+
130+
static const struct rockchip_grf_info rk3588_sysgrf __initconst = {
131+
.values = rk3588_defaults,
132+
.num_values = ARRAY_SIZE(rk3588_defaults),
133+
};
134+
124135

125136
static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
126137
{
@@ -147,6 +158,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
147158
}, {
148159
.compatible = "rockchip,rk3566-pipe-grf",
149160
.data = (void *)&rk3566_pipegrf,
161+
}, {
162+
.compatible = "rockchip,rk3588-sys-grf",
163+
.data = (void *)&rk3588_sysgrf,
150164
},
151165
{ /* sentinel */ },
152166
};

0 commit comments

Comments
 (0)