Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1642936 > unrolled thread

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

Started byFrank Wang <frank.wang@rock-chips.com>
First post2017-05-17 05:50 +0200
Last post2017-05-17 11:30 +0200
Articles 7 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] add and fix some device node for rk322x SoC Frank Wang <frank.wang@rock-chips.com> - 2017-05-17 05:50 +0200
    [PATCH 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets Frank Wang <frank.wang@rock-chips.com> - 2017-05-17 05:50 +0200
      Re: [PATCH 2/3] arm: dts: rk322x: correct uart2 pinctrl and add  another sets Kever Yang <ellisys@163.com> - 2017-05-17 08:50 +0200
        Re: [PATCH 2/3] arm: dts: rk322x: correct uart2 pinctrl and add  another sets Frank Wang <frank.wang@rock-chips.com> - 2017-05-17 09:40 +0200
    [PATCH 1/3] arm: dts: rk322x: fix i2s1 pinctrl error Frank Wang <frank.wang@rock-chips.com> - 2017-05-17 05:50 +0200
      Re: [PATCH 1/3] arm: dts: rk322x: fix i2s1 pinctrl error Heiko Stübner <heiko@sntech.de> - 2017-05-17 11:10 +0200
        Re: [PATCH 1/3] arm: dts: rk322x: fix i2s1 pinctrl error Frank Wang <frank.wang@rock-chips.com> - 2017-05-17 11:30 +0200

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

FromFrank Wang <frank.wang@rock-chips.com>
Date2017-05-17 05:50 +0200
Subject[PATCH 0/3] add and fix some device node for rk322x SoC
Message-ID<tHY8h-6fJ-3@gated-at.bofh.it>
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

[toc] | [next] | [standalone]

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

FromFrank Wang <frank.wang@rock-chips.com>
Date2017-05-17 05:50 +0200
Subject[PATCH 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets
Message-ID<tHY8i-6fJ-17@gated-at.bofh.it>
In reply to#1642936
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

[toc] | [prev] | [next] | [standalone]

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

FromKever Yang <ellisys@163.com>
Date2017-05-17 08:50 +0200
SubjectRe: [PATCH 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets
Message-ID<tI0Wt-83r-1@gated-at.bofh.it>
In reply to#1642938
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>;
> +			};
> +		};
>   	};
>   };

[toc] | [prev] | [next] | [standalone]

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

FromFrank Wang <frank.wang@rock-chips.com>
Date2017-05-17 09:40 +0200
SubjectRe: [PATCH 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets
Message-ID<tI1IT-8F-21@gated-at.bofh.it>
In reply to#1643005
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>;
>> +            };
>> +        };
>>       };
>>   };
>
>
>
>
>

[toc] | [prev] | [next] | [standalone]

#1642940 — [PATCH 1/3] arm: dts: rk322x: fix i2s1 pinctrl error

FromFrank Wang <frank.wang@rock-chips.com>
Date2017-05-17 05:50 +0200
Subject[PATCH 1/3] arm: dts: rk322x: fix i2s1 pinctrl error
Message-ID<tHY8i-6fJ-13@gated-at.bofh.it>
In reply to#1642936
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

[toc] | [prev] | [next] | [standalone]

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

FromHeiko Stübner <heiko@sntech.de>
Date2017-05-17 11:10 +0200
SubjectRe: [PATCH 1/3] arm: dts: rk322x: fix i2s1 pinctrl error
Message-ID<tI37Y-19V-17@gated-at.bofh.it>
In reply to#1642940
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>;
>  			};
>  		};

[toc] | [prev] | [next] | [standalone]

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

FromFrank Wang <frank.wang@rock-chips.com>
Date2017-05-17 11:30 +0200
SubjectRe: [PATCH 1/3] arm: dts: rk322x: fix i2s1 pinctrl error
Message-ID<tI3rj-1fU-5@gated-at.bofh.it>
In reply to#1643158
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>;
>>   			};
>>   		};
>
>
>
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web