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

[PATCH 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.

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 | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

-- 
2.0.0

[PATCH 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: 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 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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index cc6a27d..ea1239a 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -222,7 +222,7 @@
 		clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
 		clock-names = "baudclk", "apb_pclk";
 		pinctrl-names = "default";
-		pinctrl-0 = <&uart2_xfer>;
+		pinctrl-0 = <&uart21_xfer>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
 		status = "disabled";
@@ -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 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 ea1239a..221251a 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 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets

[Kever Yang]

Hi Frank,


On 05/17/2017 11:40 AM, Frank Wang wrote:
> 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 | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
> index cc6a27d..ea1239a 100644
> --- a/arch/arm/boot/dts/rk322x.dtsi
> +++ b/arch/arm/boot/dts/rk322x.dtsi
> @@ -222,7 +222,7 @@
>   		clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
>   		clock-names = "baudclk", "apb_pclk";
>   		pinctrl-names = "default";
> -		pinctrl-0 = <&uart2_xfer>;
> +		pinctrl-0 = <&uart21_xfer>;

There are more than one group of UART in rk322x, maybe we need to move
or add this setting in the dts file to override dtsi setting?

Thanks,
- Kever
>   		reg-shift = <2>;
>   		reg-io-width = <4>;
>   		status = "disabled";
> @@ -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>;
> +			};
> +		};
>   	};
>   };

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

[Frank Wang]

Hi Kever,


On 2017/5/17 14:31, Kever Yang wrote:
> Hi Frank,
>
>
> On 05/17/2017 11:40 AM, Frank Wang wrote:
>> 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 | 11 +++++++++--
>>   1 file changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/rk322x.dtsi 
>> b/arch/arm/boot/dts/rk322x.dtsi
>> index cc6a27d..ea1239a 100644
>> --- a/arch/arm/boot/dts/rk322x.dtsi
>> +++ b/arch/arm/boot/dts/rk322x.dtsi
>> @@ -222,7 +222,7 @@
>>           clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
>>           clock-names = "baudclk", "apb_pclk";
>>           pinctrl-names = "default";
>> -        pinctrl-0 = <&uart2_xfer>;
>> +        pinctrl-0 = <&uart21_xfer>;
>
> There are more than one group of UART in rk322x, maybe we need to move
> or add this setting in the dts file to override dtsi setting?
>

That makes sense, I will delete above change in next version and 
overwrite it in dts file later.

BR.
Frank


> Thanks,
> - Kever
>>           reg-shift = <2>;
>>           reg-io-width = <4>;
>>           status = "disabled";
>> @@ -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>;
>> +            };
>> +        };
>>       };
>>   };
>
>
>
>
>

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

[Heiko Stübner]

Hi Frank,

Am Mittwoch, 17. Mai 2017, 11:40:49 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: Frank Wang <frank.wang@rock-chips.com>

if the patch has another author, you should preserve his/her Signed-off-by
line, so for example this patch would look like:

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

Same for all other patches with differing authors in your 2 series from
today. As this touches the developer-certificate-of-origin, this is also
something I cannot really correct myself.


Heiko


> ---
>  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>;
>  			};
>  		};

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

[Frank Wang]

Hi Heiko,

On 2017/5/17 17:01, Heiko Stübner wrote:
> Hi Frank,
>
> Am Mittwoch, 17. Mai 2017, 11:40:49 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: Frank Wang <frank.wang@rock-chips.com>
> if the patch has another author, you should preserve his/her Signed-off-by
> line, so for example this patch would look like:
>
> Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
>
> Same for all other patches with differing authors in your 2 series from
> today. As this touches the developer-certificate-of-origin, this is also
> something I cannot really correct myself.

Noted and thanks for reminding, I will resend these 2 series.

BR.
Frank

>
> Heiko
>
>
>> ---
>>   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>;
>>   			};
>>   		};
>
>
>
>

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

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]

Hi Frank,

[auto build test ERROR on rockchip/for-next]
[also build test ERROR on v4.12-rc1 next-20170517]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Frank-Wang/add-and-fix-some-device-node-for-rk322x-SoC/20170518-081958
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next
config: arm-at91_dt_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

>> Error: arch/arm/boot/dts/rk322x.dtsi:286.18-19 syntax error
   FATAL ERROR: Unable to parse input tree

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 22761 bytes --]

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

[Frank Wang]

Hi,

Sorry, I forgot to declare that this change required below patch on 
patchwork.
https://patchwork.kernel.org/patch/9703945/


BR.
Frank

On 2017/5/18 11:18, kbuild test robot wrote:
> Hi Frank,
>
> [auto build test ERROR on rockchip/for-next]
> [also build test ERROR on v4.12-rc1 next-20170517]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url:    https://github.com/0day-ci/linux/commits/Frank-Wang/add-and-fix-some-device-node-for-rk322x-SoC/20170518-081958
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next
> config: arm-at91_dt_defconfig (attached as .config)
> compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
> reproduce:
>          wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>          chmod +x ~/bin/make.cross
>          # save the attached .config to linux build tree
>          make.cross ARCH=arm
>
> All errors (new ones prefixed by >>):
>
>>> Error: arch/arm/boot/dts/rk322x.dtsi:286.18-19 syntax error
>     FATAL ERROR: Unable to parse input tree
>
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

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

[Heiko Stübner]

Am Donnerstag, 18. Mai 2017, 11:58:04 CEST schrieb Frank Wang:
> Hi,
> 
> Sorry, I forgot to declare that this change required below patch on
> patchwork.
> https://patchwork.kernel.org/patch/9703945/

I found that yesterday already and brought everything in the correct order 
when applying :-)


Heiko

> 
> 
> BR.
> Frank
> 
> On 2017/5/18 11:18, kbuild test robot wrote:
> > Hi Frank,
> > 
> > [auto build test ERROR on rockchip/for-next]
> > [also build test ERROR on v4.12-rc1 next-20170517]
> > [if your patch is applied to the wrong git tree, please drop us a note to
> > help improve the system]
> > 
> > url:   
> > https://github.com/0day-ci/linux/commits/Frank-Wang/add-and-fix-some-devi
> > ce-node-for-rk322x-SoC/20170518-081958 base:  
> > https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
> > for-next config: arm-at91_dt_defconfig (attached as .config)
> > compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
> > 
> > reproduce:
> >          wget
> >          https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/ma
> >          ke.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
> >          # save the attached .config to linux build tree
> >          make.cross ARCH=arm
> > 
> > All errors (new ones prefixed by >>):
> >>> Error: arch/arm/boot/dts/rk322x.dtsi:286.18-19 syntax error
> >>> 
> >     FATAL ERROR: Unable to parse input tree
> > 
> > ---
> > 0-DAY kernel test infrastructure                Open Source Technology
> > Center https://lists.01.org/pipermail/kbuild-all                   Intel
> > Corporation