[PATCH v2 0/3] add and fix some device node for rk322x SoC

[PATCH v2 0/3] add and fix some device node for rk322x SoC

[Frank Wang]

These series of patches fix some device node errors and add watchdog
device node support for rk322x SoC.

Changes from v1:
 - Updated the 'Signed-off-by' tag with original authors' email id.
 - Dropped pinctrl-0 of uart2 emendation.

Frank Wang (2):
  arm: dts: rk322x: correct uart2 pinctrl and add another sets
  arm: dts: rk322x: add watchdog device node.

Sugar Zhang (1):
  arm: dts: rk322x: fix i2s1 pinctrl error

 arch/arm/boot/dts/rk322x.dtsi | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

-- 
2.0.0

[PATCH v2 1/3] arm: dts: rk322x: fix i2s1 pinctrl error

[Frank Wang]

From: Sugar Zhang <sugar.zhang@rock-chips.com>

Refer to Chapter 5.3.2 of rk3229 TRM, we can see that GPIO1A[2,4,5]
using RK_FUNC_2 not RK_FUNC_1. This patch fixes it.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
---
 arch/arm/boot/dts/rk322x.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 48a0c1c..cc6a27d 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -621,9 +621,9 @@
 						<0 12 RK_FUNC_1 &pcfg_pull_none>,
 						<0 13 RK_FUNC_1 &pcfg_pull_none>,
 						<0 14 RK_FUNC_1 &pcfg_pull_none>,
-						<1 2 RK_FUNC_1 &pcfg_pull_none>,
-						<1 4 RK_FUNC_1 &pcfg_pull_none>,
-						<1 5 RK_FUNC_1 &pcfg_pull_none>;
+						<1 2 RK_FUNC_2 &pcfg_pull_none>,
+						<1 4 RK_FUNC_2 &pcfg_pull_none>,
+						<1 5 RK_FUNC_2 &pcfg_pull_none>;
 			};
 		};
 
-- 
2.0.0

[PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets

[Frank Wang]

Correct UART2 PINCTRL flag and add another PINCTRL sets for UART2
in case of confict with SDMMC.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
---
 arch/arm/boot/dts/rk322x.dtsi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index cc6a27d..fe6530f 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -693,7 +693,7 @@
 
 		uart2 {
 			uart2_xfer: uart2-xfer {
-				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,
+				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>,
 						<1 19 RK_FUNC_2 &pcfg_pull_none>;
 			};
 
@@ -705,5 +705,12 @@
 				rockchip,pins = <0 24 RK_FUNC_1 &pcfg_pull_none>;
 			};
 		};
+
+		uart2-1 {
+			uart21_xfer: uart21-xfer {
+				rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>,
+						<1 9 RK_FUNC_2 &pcfg_pull_none>;
+			};
+		};
 	};
 };
-- 
2.0.0

[PATCH v2 3/3] arm: dts: rk322x: add watchdog device node.

[Frank Wang]

Add watchdog device node for rk322x SoC.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
---
 arch/arm/boot/dts/rk322x.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index fe6530f..f7498b3 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -280,6 +280,14 @@
 		status = "disabled";
 	};
 
+	wdt: watchdog@110a0000 {
+		compatible = "snps,dw-wdt";
+		reg = <0x110a0000 0x100>;
+		clocks = <&cru PCLK_CPU>;
+		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+	};
+
 	pwm0: pwm@110b0000 {
 		compatible = "rockchip,rk3288-pwm";
 		reg = <0x110b0000 0x10>;
-- 
2.0.0

Re: [PATCH v2 3/3] arm: dts: rk322x: add watchdog device node.

[Heiko Stuebner]

Am Mittwoch, 17. Mai 2017, 17:52:26 CEST schrieb Frank Wang:
> Add watchdog device node for rk322x SoC.
> 
> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

applied for 4.13, after fixing the subject up a bit (ARM: dts: rockchip: ...)


Thanks
Heiko

Re: [PATCH v2 1/3] arm: dts: rk322x: fix i2s1 pinctrl error

[Heiko Stuebner]

Am Mittwoch, 17. Mai 2017, 17:52:24 CEST schrieb Frank Wang:
> From: Sugar Zhang <sugar.zhang@rock-chips.com>
> 
> Refer to Chapter 5.3.2 of rk3229 TRM, we can see that GPIO1A[2,4,5]
> using RK_FUNC_2 not RK_FUNC_1. This patch fixes it.
> 
> Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

applied for 4.13, after fixing the subject up a bit (ARM: dts: rockchip: ...)


Thanks
Heiko

Re: [PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets

[Heiko Stuebner]

Am Mittwoch, 17. Mai 2017, 17:52:25 CEST schrieb Frank Wang:
> Correct UART2 PINCTRL flag and add another PINCTRL sets for UART2
> in case of confict with SDMMC.
> 
> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

I've split that into 2 patches:
- pull-up fix
- addition of alternative pinctrl
  (also moved the uart21-xfer into the uart2 group directly below the
   uart2-xfer pinctrl)

I've fixed up the subject in both (ARM: dts: rockchip:) and applied
everything for 4.13


Heiko