Skip to content

Commit 34fec92

Browse files
shawn1221rkhuangtao
authored andcommitted
UPSTREAM: soc: rockchip: disable jtag switching for RK3328 Soc
Disable IO function switching between sdmmc and jtag for RK3328 Soc. Change-Id: Ic8f4494b11e1091fa7a4d71674940d3c8fd5b1ad Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> (cherry picked from 887758c325487ac747e03d552de42ec0ceaf214d)
1 parent 81ec76c commit 34fec92

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

  • drivers/soc/rockchip

drivers/soc/rockchip/grf.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@ static const struct rockchip_grf_info rk3288_grf __initconst = {
5454
.num_values = ARRAY_SIZE(rk3288_defaults),
5555
};
5656

57+
#define RK3328_GRF_SOC_CON4 0x410
58+
59+
static const struct rockchip_grf_value rk3328_defaults[] __initconst = {
60+
{ "jtag switching", RK3328_GRF_SOC_CON4, HIWORD_UPDATE(0, 1, 12) },
61+
};
62+
63+
static const struct rockchip_grf_info rk3328_grf __initconst = {
64+
.values = rk3328_defaults,
65+
.num_values = ARRAY_SIZE(rk3328_defaults),
66+
};
67+
5768
#define RK3368_GRF_SOC_CON15 0x43c
5869

5970
static const struct rockchip_grf_value rk3368_defaults[] __initconst = {
@@ -83,6 +94,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
8394
}, {
8495
.compatible = "rockchip,rk3288-grf",
8596
.data = (void *)&rk3288_grf,
97+
}, {
98+
.compatible = "rockchip,rk3328-grf",
99+
.data = (void *)&rk3328_grf,
86100
}, {
87101
.compatible = "rockchip,rk3368-grf",
88102
.data = (void *)&rk3368_grf,

0 commit comments

Comments
 (0)