2023-12-02 18:35:11

by Johan Jonker

Subject: [PATCH v1 1/2] ARM: dts: rockchip: add gpio alias for gpio dt nodes

Rockchip SoC TRM, SoC datasheet and board schematics always refer to
the same gpio numbers - even if not all are used for a specific board.
In order to not have to re-define them for every board add the
aliases to SoC dtsi files.

Signed-off-by: Jianqun Xu <[email protected]>
Signed-off-by: Johan Jonker <[email protected]>
---

Changed V1:
rebase
remove rk3066 gpio5 alias
---
arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 +++
arch/arm/boot/dts/rockchip/rk3066a.dtsi | 5 +++++
arch/arm/boot/dts/rockchip/rk322x.dtsi | 4 ++++
arch/arm/boot/dts/rockchip/rk3288.dtsi | 9 +++++++++
arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 4 ++++
5 files changed, 25 insertions(+)

diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi
index 78686fc72ce6..8aa2e0864fed 100644
--- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
@@ -17,6 +17,9 @@ / {
interrupt-parent = <&gic>;

aliases {
+ gpio0 = &gpio0;
+ gpio1 = &gpio1;
+ gpio2 = &gpio2;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
index de9915d946f7..30139f21de64 100644
--- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
@@ -13,6 +13,11 @@
/ {
compatible = "rockchip,rk3066a";

+ aliases {
+ gpio4 = &gpio4;
+ gpio6 = &gpio6;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi
index a721744cbfd1..831561fc1814 100644
--- a/arch/arm/boot/dts/rockchip/rk322x.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi
@@ -15,6 +15,10 @@ / {
interrupt-parent = <&gic>;

aliases {
+ gpio0 = &gpio0;
+ gpio1 = &gpio1;
+ gpio2 = &gpio2;
+ gpio3 = &gpio3;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
index cb9cdaddffd4..ead343dc3df1 100644
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
@@ -19,6 +19,15 @@ / {

aliases {
ethernet0 = &gmac;
+ gpio0 = &gpio0;
+ gpio1 = &gpio1;
+ gpio2 = &gpio2;
+ gpio3 = &gpio3;
+ gpio4 = &gpio4;
+ gpio5 = &gpio5;
+ gpio6 = &gpio6;
+ gpio7 = &gpio7;
+ gpio8 = &gpio8;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
index cb4e42ede56a..f37137f298d5 100644
--- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
@@ -16,6 +16,10 @@ / {

aliases {
ethernet0 = &emac;
+ gpio0 = &gpio0;
+ gpio1 = &gpio1;
+ gpio2 = &gpio2;
+ gpio3 = &gpio3;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
--
2.39.2

2023-12-04 19:36:30

by Heiko Stübner

Subject: Re: [PATCH v1 1/2] ARM: dts: rockchip: add gpio alias for gpio dt nodes

Hi Johan,

Am Samstag, 2. Dezember 2023, 19:22:01 CET schrieb Johan Jonker:
> Rockchip SoC TRM, SoC datasheet and board schematics always refer to
> the same gpio numbers - even if not all are used for a specific board.
> In order to not have to re-define them for every board add the
> aliases to SoC dtsi files.
>
> Signed-off-by: Jianqun Xu <[email protected]>
> Signed-off-by: Johan Jonker <[email protected]>

patch itself looks good, but I don't understand the authorship situation.
As these two signed-off-bys are now it would suggest that you picked up
Jianqun Xu's patch, but then the author would need to be different.

Or do you want to declare this via a
Co-Developed-by: Jianqun Xu <[email protected]>


Thanks
Heiko

> ---
>
> Changed V1:
> rebase
> remove rk3066 gpio5 alias
> ---
> arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 +++
> arch/arm/boot/dts/rockchip/rk3066a.dtsi | 5 +++++
> arch/arm/boot/dts/rockchip/rk322x.dtsi | 4 ++++
> arch/arm/boot/dts/rockchip/rk3288.dtsi | 9 +++++++++
> arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 4 ++++
> 5 files changed, 25 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> index 78686fc72ce6..8aa2e0864fed 100644
> --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> @@ -17,6 +17,9 @@ / {
> interrupt-parent = <&gic>;
>
> aliases {
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> i2c0 = &i2c0;
> i2c1 = &i2c1;
> i2c2 = &i2c2;
> diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> index de9915d946f7..30139f21de64 100644
> --- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> @@ -13,6 +13,11 @@
> / {
> compatible = "rockchip,rk3066a";
>
> + aliases {
> + gpio4 = &gpio4;
> + gpio6 = &gpio6;
> + };
> +
> cpus {
> #address-cells = <1>;
> #size-cells = <0>;
> diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi
> index a721744cbfd1..831561fc1814 100644
> --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi
> @@ -15,6 +15,10 @@ / {
> interrupt-parent = <&gic>;
>
> aliases {
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> + gpio3 = &gpio3;
> serial0 = &uart0;
> serial1 = &uart1;
> serial2 = &uart2;
> diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
> index cb9cdaddffd4..ead343dc3df1 100644
> --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
> @@ -19,6 +19,15 @@ / {
>
> aliases {
> ethernet0 = &gmac;
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> + gpio3 = &gpio3;
> + gpio4 = &gpio4;
> + gpio5 = &gpio5;
> + gpio6 = &gpio6;
> + gpio7 = &gpio7;
> + gpio8 = &gpio8;
> i2c0 = &i2c0;
> i2c1 = &i2c1;
> i2c2 = &i2c2;
> diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> index cb4e42ede56a..f37137f298d5 100644
> --- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> @@ -16,6 +16,10 @@ / {
>
> aliases {
> ethernet0 = &emac;
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> + gpio3 = &gpio3;
> i2c0 = &i2c0;
> i2c1 = &i2c1;
> i2c2 = &i2c2;
> --
> 2.39.2
>
>

2023-12-04 19:51:23

by Johan Jonker

Subject: Re: [PATCH v1 1/2] ARM: dts: rockchip: add gpio alias for gpio dt nodes

On 12/4/23 20:35, Heiko Stübner wrote:
> Hi Johan,
>
> Am Samstag, 2. Dezember 2023, 19:22:01 CET schrieb Johan Jonker:
>> Rockchip SoC TRM, SoC datasheet and board schematics always refer to
>> the same gpio numbers - even if not all are used for a specific board.
>> In order to not have to re-define them for every board add the
>> aliases to SoC dtsi files.
>>
>> Signed-off-by: Jianqun Xu <[email protected]>
>> Signed-off-by: Johan Jonker <[email protected]>
>

> patch itself looks good, but I don't understand the authorship situation.
> As these two signed-off-bys are now it would suggest that you picked up
> Jianqun Xu's patch, but then the author would need to be different.
>
> Or do you want to declare this via a
> Co-Developed-by: Jianqun Xu <[email protected]>

The newer tag use of Co-Developed-by is more confusing compared to in the old days...

Patch derived from:
https://lore.kernel.org/linux-rockchip/[email protected]/

Could you add/fix what is needed without resubmitting.

Johan

>
>
> Thanks
> Heiko
>
>> ---
>>
>> Changed V1:
>> rebase
>> remove rk3066 gpio5 alias
>> ---
>> arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 +++
>> arch/arm/boot/dts/rockchip/rk3066a.dtsi | 5 +++++
>> arch/arm/boot/dts/rockchip/rk322x.dtsi | 4 ++++
>> arch/arm/boot/dts/rockchip/rk3288.dtsi | 9 +++++++++
>> arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 4 ++++
>> 5 files changed, 25 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi
>> index 78686fc72ce6..8aa2e0864fed 100644
>> --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
>> +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
>> @@ -17,6 +17,9 @@ / {
>> interrupt-parent = <&gic>;
>>
>> aliases {
>> + gpio0 = &gpio0;
>> + gpio1 = &gpio1;
>> + gpio2 = &gpio2;
>> i2c0 = &i2c0;
>> i2c1 = &i2c1;
>> i2c2 = &i2c2;
>> diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
>> index de9915d946f7..30139f21de64 100644
>> --- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
>> +++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
>> @@ -13,6 +13,11 @@
>> / {
>> compatible = "rockchip,rk3066a";
>>
>> + aliases {
>> + gpio4 = &gpio4;
>> + gpio6 = &gpio6;
>> + };
>> +
>> cpus {
>> #address-cells = <1>;
>> #size-cells = <0>;
>> diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi
>> index a721744cbfd1..831561fc1814 100644
>> --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi
>> +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi
>> @@ -15,6 +15,10 @@ / {
>> interrupt-parent = <&gic>;
>>
>> aliases {
>> + gpio0 = &gpio0;
>> + gpio1 = &gpio1;
>> + gpio2 = &gpio2;
>> + gpio3 = &gpio3;
>> serial0 = &uart0;
>> serial1 = &uart1;
>> serial2 = &uart2;
>> diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
>> index cb9cdaddffd4..ead343dc3df1 100644
>> --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
>> +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
>> @@ -19,6 +19,15 @@ / {
>>
>> aliases {
>> ethernet0 = &gmac;
>> + gpio0 = &gpio0;
>> + gpio1 = &gpio1;
>> + gpio2 = &gpio2;
>> + gpio3 = &gpio3;
>> + gpio4 = &gpio4;
>> + gpio5 = &gpio5;
>> + gpio6 = &gpio6;
>> + gpio7 = &gpio7;
>> + gpio8 = &gpio8;
>> i2c0 = &i2c0;
>> i2c1 = &i2c1;
>> i2c2 = &i2c2;
>> diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
>> index cb4e42ede56a..f37137f298d5 100644
>> --- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
>> +++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
>> @@ -16,6 +16,10 @@ / {
>>
>> aliases {
>> ethernet0 = &emac;
>> + gpio0 = &gpio0;
>> + gpio1 = &gpio1;
>> + gpio2 = &gpio2;
>> + gpio3 = &gpio3;
>> i2c0 = &i2c0;
>> i2c1 = &i2c1;
>> i2c2 = &i2c2;
>> --
>> 2.39.2
>>
>>
>
>
>
>

2023-12-04 20:10:42

by Dragan Simic

Subject: Re: [PATCH v1 1/2] ARM: dts: rockchip: add gpio alias for gpio dt nodes

On 2023-12-02 19:22, Johan Jonker wrote:
> Rockchip SoC TRM, SoC datasheet and board schematics always refer to
> the same gpio numbers - even if not all are used for a specific board.
> In order to not have to re-define them for every board add the
> aliases to SoC dtsi files.
>
> Signed-off-by: Jianqun Xu <[email protected]>
> Signed-off-by: Johan Jonker <[email protected]>

Reviewed-by: Dragan Simic <[email protected]>

> ---
>
> Changed V1:
> rebase
> remove rk3066 gpio5 alias
> ---
> arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 +++
> arch/arm/boot/dts/rockchip/rk3066a.dtsi | 5 +++++
> arch/arm/boot/dts/rockchip/rk322x.dtsi | 4 ++++
> arch/arm/boot/dts/rockchip/rk3288.dtsi | 9 +++++++++
> arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 4 ++++
> 5 files changed, 25 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> index 78686fc72ce6..8aa2e0864fed 100644
> --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> @@ -17,6 +17,9 @@ / {
> interrupt-parent = <&gic>;
>
> aliases {
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> i2c0 = &i2c0;
> i2c1 = &i2c1;
> i2c2 = &i2c2;
> diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> index de9915d946f7..30139f21de64 100644
> --- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> @@ -13,6 +13,11 @@
> / {
> compatible = "rockchip,rk3066a";
>
> + aliases {
> + gpio4 = &gpio4;
> + gpio6 = &gpio6;
> + };
> +
> cpus {
> #address-cells = <1>;
> #size-cells = <0>;
> diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi
> b/arch/arm/boot/dts/rockchip/rk322x.dtsi
> index a721744cbfd1..831561fc1814 100644
> --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi
> @@ -15,6 +15,10 @@ / {
> interrupt-parent = <&gic>;
>
> aliases {
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> + gpio3 = &gpio3;
> serial0 = &uart0;
> serial1 = &uart1;
> serial2 = &uart2;
> diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi
> b/arch/arm/boot/dts/rockchip/rk3288.dtsi
> index cb9cdaddffd4..ead343dc3df1 100644
> --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
> @@ -19,6 +19,15 @@ / {
>
> aliases {
> ethernet0 = &gmac;
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> + gpio3 = &gpio3;
> + gpio4 = &gpio4;
> + gpio5 = &gpio5;
> + gpio6 = &gpio6;
> + gpio7 = &gpio7;
> + gpio8 = &gpio8;
> i2c0 = &i2c0;
> i2c1 = &i2c1;
> i2c2 = &i2c2;
> diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> index cb4e42ede56a..f37137f298d5 100644
> --- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> @@ -16,6 +16,10 @@ / {
>
> aliases {
> ethernet0 = &emac;
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> + gpio3 = &gpio3;
> i2c0 = &i2c0;
> i2c1 = &i2c1;
> i2c2 = &i2c2;
> --
> 2.39.2
>
>
> _______________________________________________
> Linux-rockchip mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-rockchip

2023-12-07 20:57:46

by Heiko Stübner

Subject: Re: [PATCH v1 1/2] ARM: dts: rockchip: add gpio alias for gpio dt nodes

On Sat, 2 Dec 2023 19:22:01 +0100, Johan Jonker wrote:
> Rockchip SoC TRM, SoC datasheet and board schematics always refer to
> the same gpio numbers - even if not all are used for a specific board.
> In order to not have to re-define them for every board add the
> aliases to SoC dtsi files.
>
>

Applied, thanks!

[1/2] ARM: dts: rockchip: add gpio alias for gpio dt nodes
commit: 04c521c3bec1fa0ccb97a1fbf74f0faeda3f4a53
[2/2] arm64: dts: rockchip: add gpio alias for gpio dt nodes
commit: cfb0264f3654e357bcdfe27c2f7240241c2ac6c5

Added the Co-developed-by for Jianqun before applying.

Best regards,
--
Heiko Stuebner <[email protected]>