[PATCH 1/2] ARM: dts: rockchip: add "rockchip, rk3288-grf" compatible for grf node

[PATCH 1/2] ARM: dts: rockchip: add "rockchip, rk3288-grf" compatible for grf node

[Shawn Lin]

rockchip,rk3288-grf is used both for rk3228 and rk3229.

Signed-off-by: Shawn Lin <shawn.lin-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
---

 arch/arm/boot/dts/rk322x.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 780ec3a..3dd2e12 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -233,7 +233,7 @@
 	};
 
 	grf: syscon@11000000 {
-		compatible = "syscon", "simple-mfd";
+		compatible = "rockchip,rk3228-grf", "syscon", "simple-mfd";
 		reg = <0x11000000 0x1000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
-- 
1.9.1

[PATCH 2/2] soc: rockchip: disable jtag switching for RK3228/RK3229 SoCs

[Shawn Lin]

Disable IO function switching between sdmmc and jtag
for RK3228 and RK3229 SoCs.

Signed-off-by: Shawn Lin <shawn.lin-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
---

 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 15e71fd..dd81b87 100644
--- a/drivers/soc/rockchip/grf.c
+++ b/drivers/soc/rockchip/grf.c
@@ -43,6 +43,17 @@ struct rockchip_grf_info {
 	.num_values = ARRAY_SIZE(rk3036_defaults),
 };
 
+#define RK3228_GRF_SOC_CON6		0x418
+
+static const struct rockchip_grf_value rk3228_defaults[] __initconst = {
+	{ "jtag switching", RK3228_GRF_SOC_CON6, HIWORD_UPDATE(0, 1, 8) },
+};
+
+static const struct rockchip_grf_info rk3228_grf __initconst = {
+	.values = rk3228_defaults,
+	.num_values = ARRAY_SIZE(rk3228_defaults),
+};
+
 #define RK3288_GRF_SOC_CON0		0x244
 
 static const struct rockchip_grf_value rk3288_defaults[] __initconst = {
@@ -92,6 +103,9 @@ struct rockchip_grf_info {
 		.compatible = "rockchip,rk3036-grf",
 		.data = (void *)&rk3036_grf,
 	}, {
+		.compatible = "rockchip,rk3228-grf",
+		.data = (void *)&rk3228_grf,
+	}, {
 		.compatible = "rockchip,rk3288-grf",
 		.data = (void *)&rk3288_grf,
 	}, {
-- 
1.9.1

Re: [PATCH 1/2] ARM: dts: rockchip: add "rockchip, rk3288-grf" compatible for grf node

[Heiko Stuebner]

Hi Shawn,

Am Mittwoch, 7. Februar 2018, 07:20:02 CET schrieb Shawn Lin:
> rockchip,rk3288-grf is used both for rk3228 and rk3229.
> 
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

applied for 4.17 after replacing the rk3288 occurences with rk3228 in the
commit message :-)

Also please include the general linux-arm-kerneĺ list in future patches.


Thanks
Heiko

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [PATCH 2/2] soc: rockchip: disable jtag switching for RK3228/RK3229 SoCs

[Heiko Stuebner]

Am Mittwoch, 7. Februar 2018, 07:20:03 CET schrieb Shawn Lin:
> Disable IO function switching between sdmmc and jtag
> for RK3228 and RK3229 SoCs.
> 
> Signed-off-by: Shawn Lin <shawn.lin-TNX95d0MmH7DzftRWevZcw@public.gmane.org>

applied for 4.17

Thanks
Heiko

Re: [PATCH 1/2] ARM: dts: rockchip: add "rockchip,rk3288-grf" compatible for grf node

[Shawn Lin]

On 2018/2/10 2:17, Heiko Stuebner wrote:
> Hi Shawn,
> 
> Am Mittwoch, 7. Februar 2018, 07:20:02 CET schrieb Shawn Lin:
>> rockchip,rk3288-grf is used both for rk3228 and rk3229.
>>
>> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> 
> applied for 4.17 after replacing the rk3288 occurences with rk3228 in the
> commit message :-)
> 

Woops, Sorry for that.

> Also please include the general linux-arm-kerneĺ list in future patches.

Sure.

> 
> 
> Thanks
> Heiko
> 
> 
> 


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip