soc: rockchip: disable jtag switching for RK3328 Soc
diff mbox

Message ID 1495699104-137633-1-git-send-email-shawn.lin@rock-chips.com
State New
Headers show

Commit Message

Shawn Lin May 25, 2017, 7:58 a.m. UTC
Disable IO function switching between sdmmc and jtag
for RK3328 Soc.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---

 drivers/soc/rockchip/grf.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Comments

Shawn Lin June 16, 2017, 8:17 a.m. UTC | #1
Hi Heiko,

Ping.... :)

On 2017/5/25 15:58, Shawn Lin wrote:
> Disable IO function switching between sdmmc and jtag
> for RK3328 Soc.
> 
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> ---
> 
>   drivers/soc/rockchip/grf.c | 14 ++++++++++++++
>   1 file changed, 14 insertions(+)
> 
> diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c
> index d61db34..15e71fd 100644
> --- a/drivers/soc/rockchip/grf.c
> +++ b/drivers/soc/rockchip/grf.c
> @@ -54,6 +54,17 @@ struct rockchip_grf_info {
>   	.num_values = ARRAY_SIZE(rk3288_defaults),
>   };
>   
> +#define RK3328_GRF_SOC_CON4		0x410
> +
> +static const struct rockchip_grf_value rk3328_defaults[] __initconst = {
> +	{ "jtag switching", RK3328_GRF_SOC_CON4, HIWORD_UPDATE(0, 1, 12) },
> +};
> +
> +static const struct rockchip_grf_info rk3328_grf __initconst = {
> +	.values = rk3328_defaults,
> +	.num_values = ARRAY_SIZE(rk3328_defaults),
> +};
> +
>   #define RK3368_GRF_SOC_CON15		0x43c
>   
>   static const struct rockchip_grf_value rk3368_defaults[] __initconst = {
> @@ -84,6 +95,9 @@ struct rockchip_grf_info {
>   		.compatible = "rockchip,rk3288-grf",
>   		.data = (void *)&rk3288_grf,
>   	}, {
> +		.compatible = "rockchip,rk3328-grf",
> +		.data = (void *)&rk3328_grf,
> +	}, {
>   		.compatible = "rockchip,rk3368-grf",
>   		.data = (void *)&rk3368_grf,
>   	}, {
>
Heiko Stuebner June 17, 2017, 5:59 p.m. UTC | #2
Am Freitag, 16. Juni 2017, 16:17:45 CEST schrieb Shawn Lin:
> Hi Heiko,
> 
> Ping.... :)
> 
> On 2017/5/25 15:58, Shawn Lin wrote:
> > Disable IO function switching between sdmmc and jtag
> > for RK3328 Soc.
> > 
> > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

Ihad already applied this on thursday, just forgot to push the branch :-) .

As there was some unresolved discussion with the driver itself, we'll
see where this ends up.


Heiko

Patch
diff mbox

diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c
index d61db34..15e71fd 100644
--- a/drivers/soc/rockchip/grf.c
+++ b/drivers/soc/rockchip/grf.c
@@ -54,6 +54,17 @@  struct rockchip_grf_info {
 	.num_values = ARRAY_SIZE(rk3288_defaults),
 };
 
+#define RK3328_GRF_SOC_CON4		0x410
+
+static const struct rockchip_grf_value rk3328_defaults[] __initconst = {
+	{ "jtag switching", RK3328_GRF_SOC_CON4, HIWORD_UPDATE(0, 1, 12) },
+};
+
+static const struct rockchip_grf_info rk3328_grf __initconst = {
+	.values = rk3328_defaults,
+	.num_values = ARRAY_SIZE(rk3328_defaults),
+};
+
 #define RK3368_GRF_SOC_CON15		0x43c
 
 static const struct rockchip_grf_value rk3368_defaults[] __initconst = {
@@ -84,6 +95,9 @@  struct rockchip_grf_info {
 		.compatible = "rockchip,rk3288-grf",
 		.data = (void *)&rk3288_grf,
 	}, {
+		.compatible = "rockchip,rk3328-grf",
+		.data = (void *)&rk3328_grf,
+	}, {
 		.compatible = "rockchip,rk3368-grf",
 		.data = (void *)&rk3368_grf,
 	}, {