Skip to contentSkip to conversation

soc: rockchip: disable jtag switching for RK3128 SoCs

PATCH New Heiko Stuebner 2 participants 4 messages Mar 2, 2018 – Mar 5, 2018 Arm Rockchip

lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

PATCH 1/1 soc: rockchip: disable jtag switching for RK3128 SoCs

From: Xiao Yao <[email protected]>

Disable IO function switching between sdmmc and jtag for RK3128 SoCs.

Signed-off-by Xiao Yao <[email protected]>
Signed-off-by Heiko Stuebner <[email protected]>
---
 drivers/soc/rockchip/grf.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/soc/rockchip/grf.c +14 -0
index dd81b87d79f0..96882ffde67e 100644
@@ -43,6 +43,17 @@ static const struct rockchip_grf_info rk3036_grf __initconst = {
 	.num_values = ARRAY_SIZE(rk3036_defaults),
 };
 
+#define RK3128_GRF_SOC_CON0		0x140
+
+static const struct rockchip_grf_value rk3128_defaults[] __initconst = {
+	{ "jtag switching", RK3128_GRF_SOC_CON0, HIWORD_UPDATE(0, 1, 8) },
+};
+
+static const struct rockchip_grf_info rk3128_grf __initconst = {
+	.values = rk3128_defaults,
+	.num_values = ARRAY_SIZE(rk3128_defaults),
+};
+
 #define RK3228_GRF_SOC_CON6		0x418
 
 static const struct rockchip_grf_value rk3228_defaults[] __initconst = {

@@ -102,6 +113,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
 	{
 		.compatible = "rockchip,rk3036-grf",
 		.data = (void *)&rk3036_grf,
+	}, {
+		.compatible = "rockchip,rk3128-grf",
+		.data = (void *)&rk3128_grf,
 	}, {
 		.compatible = "rockchip,rk3228-grf",
 		.data = (void *)&rk3228_grf,
Signature · 1 line
2.16.1
#1 lore raw

PATCH 1/1 soc: rockchip: disable jtag switching for RK3128 SoCs

Quoted 5 lines · Heiko Stuebner

From: Xiao Yao <[email protected]>

Disable IO function switching between sdmmc and jtag for RK3128 SoCs.

I acked this on the vendor kernel tree, so FWIW:

Reviewed-by Shawn Lin <[email protected]>

Hope this is one of the final patches for that, as I would revive IO function switching between sdmmc and jtag for newer SoCs after addressing the problem from HW level.

Quoted 39 lines
Signed-off-by Xiao Yao <[email protected]>
Signed-off-by Heiko Stuebner <[email protected]>
---
  drivers/soc/rockchip/grf.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
drivers/soc/rockchip/grf.c +14 -0
index dd81b87d79f0..96882ffde67e 100644
@@ -43,6 +43,17 @@ static const struct rockchip_grf_info rk3036_grf __initconst = {
  	.num_values = ARRAY_SIZE(rk3036_defaults),
  };
 
+#define RK3128_GRF_SOC_CON0		0x140
+
+static const struct rockchip_grf_value rk3128_defaults[] __initconst = {
+	{ "jtag switching", RK3128_GRF_SOC_CON0, HIWORD_UPDATE(0, 1, 8) },
+};
+
+static const struct rockchip_grf_info rk3128_grf __initconst = {
+	.values = rk3128_defaults,
+	.num_values = ARRAY_SIZE(rk3128_defaults),
+};
+
  #define RK3228_GRF_SOC_CON6		0x418
 
  static const struct rockchip_grf_value rk3228_defaults[] __initconst = {

@@ -102,6 +113,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = {
  	{
  		.compatible = "rockchip,rk3036-grf",
  		.data = (void *)&rk3036_grf,
+	}, {
+		.compatible = "rockchip,rk3128-grf",
+		.data = (void *)&rk3128_grf,
  	}, {
  		.compatible = "rockchip,rk3228-grf",
  		.data = (void *)&rk3228_grf,
Signature · 2 lines
Best Regards
Shawn Lin
author maintainer
#2 lore raw

PATCH 1/1 soc: rockchip: disable jtag switching for RK3128 SoCs

Hi Shawn,

Am Montag, 5. M?rz 2018, 15:39:04 CET schrieb Shawn Lin:

Quoted 7 lines · Heiko Stuebner
Quoted 5 lines

From: Xiao Yao <[email protected]>

Disable IO function switching between sdmmc and jtag for RK3128 SoCs.

Quoted 7 lines

I acked this on the vendor kernel tree, so FWIW:

Reviewed-by Shawn Lin <[email protected]>

Hope this is one of the final patches for that, as I would revive IO function switching between sdmmc and jtag for newer SoCs after addressing the problem from HW level.

the main problem we had with that was that the mmc-subsystem somehow definitly didn't like it when the controller pins where pulled out from under it on card eject.

But of course, if you can get this solved by hw somehow, that would be pretty cool :-)

Heiko

#3 lore raw

PATCH 1/1 soc: rockchip: disable jtag switching for RK3128 SoCs

Quoted 14 lines · Heiko Stuebner

Hi Shawn,

Am Montag, 5. M?rz 2018, 15:39:04 CET schrieb Shawn Lin:

Quoted 11 lines · Heiko Stuebner
Quoted 5 lines

From: Xiao Yao <[email protected]>

Disable IO function switching between sdmmc and jtag for RK3128 SoCs.

I acked this on the vendor kernel tree, so FWIW:

Reviewed-by Shawn Lin <[email protected]>
Quoted 7 lines
Quoted 3 lines

Hope this is one of the final patches for that, as I would revive IO function switching between sdmmc and jtag for newer SoCs after addressing the problem from HW level.

the main problem we had with that was that the mmc-subsystem somehow definitly didn't like it when the controller pins where pulled out from under it on card eject.

Right, we had sort out it's timing revelant between mmc controller and the switching hw block.

Quoted 3 lines

But of course, if you can get this solved by hw somehow, that would be pretty cool :-)

It is under extensively tested now, and seems quite positive. :)

Quoted 6 lines

Heiko

Signature · 2 lines
Best Regards
Shawn Lin