* [PATCH 1/3] ARM: dts: rockchip: Move gpio aliases to SoC dtsi for RK3128
2023-12-02 13:05 [PATCH 0/3] Move core bus and gpio aliases to SoC dtsi for RK3128 Alex Bee
@ 2023-12-02 13:05 ` Alex Bee
2023-12-02 13:05 ` [PATCH 2/3] ARM: dts: rockchip: Move i2c " Alex Bee
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Alex Bee @ 2023-12-02 13:05 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
Alex Bee
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 move the
aliases to SoC dtsi for RK3128 like it's being done for most other
Rockchip ARM SoCs.
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
arch/arm/boot/dts/rockchip/rk3128-evb.dts | 4 ----
arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 4 ----
arch/arm/boot/dts/rockchip/rk3128.dtsi | 7 +++++++
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/rockchip/rk3128-evb.dts b/arch/arm/boot/dts/rockchip/rk3128-evb.dts
index c38f42497cbd..776a483cc26b 100644
--- a/arch/arm/boot/dts/rockchip/rk3128-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rk3128-evb.dts
@@ -12,10 +12,6 @@ / {
compatible = "rockchip,rk3128-evb", "rockchip,rk3128";
aliases {
- gpio0 = &gpio0;
- gpio1 = &gpio1;
- gpio2 = &gpio2;
- gpio3 = &gpio3;
i2c1 = &i2c1;
mmc0 = &emmc;
};
diff --git a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
index 61b9f069c8a2..b448e2b96e08 100644
--- a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
+++ b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
@@ -11,10 +11,6 @@ / {
compatible = "geniatech,xpi-3128", "rockchip,rk3128";
aliases {
- gpio0 = &gpio0;
- gpio1 = &gpio1;
- gpio2 = &gpio2;
- gpio3 = &gpio3;
mmc0 = &emmc;
mmc1 = &sdmmc;
serial0 = &uart1;
diff --git a/arch/arm/boot/dts/rockchip/rk3128.dtsi b/arch/arm/boot/dts/rockchip/rk3128.dtsi
index 4e8b38604ecd..5b751284d6ca 100644
--- a/arch/arm/boot/dts/rockchip/rk3128.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3128.dtsi
@@ -15,6 +15,13 @@ / {
#address-cells = <1>;
#size-cells = <1>;
+ aliases {
+ gpio0 = &gpio0;
+ gpio1 = &gpio1;
+ gpio2 = &gpio2;
+ gpio3 = &gpio3;
+ };
+
arm-pmu {
compatible = "arm,cortex-a7-pmu";
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
--
2.43.0
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] ARM: dts: rockchip: Move i2c aliases to SoC dtsi for RK3128
2023-12-02 13:05 [PATCH 0/3] Move core bus and gpio aliases to SoC dtsi for RK3128 Alex Bee
2023-12-02 13:05 ` [PATCH 1/3] ARM: dts: rockchip: Move " Alex Bee
@ 2023-12-02 13:05 ` Alex Bee
2023-12-02 13:05 ` [PATCH] ARM: dts: rockchip: Move uart " Alex Bee
2023-12-05 0:05 ` [PATCH 0/3] Move core bus and gpio " Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Alex Bee @ 2023-12-02 13:05 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
Alex Bee
SoC TRM, SoC datasheet and board schematics always refer to the
same i2c numbers - even if not all are used for a specific board.
In order to not have to re-define them for every board move the
aliases to SoC dtsi for RK3128 like it's being done for all other
Rockchip ARM SoCs.
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
arch/arm/boot/dts/rockchip/rk3128-evb.dts | 1 -
arch/arm/boot/dts/rockchip/rk3128.dtsi | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/rockchip/rk3128-evb.dts b/arch/arm/boot/dts/rockchip/rk3128-evb.dts
index 776a483cc26b..c7ab7fcdb436 100644
--- a/arch/arm/boot/dts/rockchip/rk3128-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rk3128-evb.dts
@@ -12,7 +12,6 @@ / {
compatible = "rockchip,rk3128-evb", "rockchip,rk3128";
aliases {
- i2c1 = &i2c1;
mmc0 = &emmc;
};
diff --git a/arch/arm/boot/dts/rockchip/rk3128.dtsi b/arch/arm/boot/dts/rockchip/rk3128.dtsi
index 5b751284d6ca..dc149d98cf9e 100644
--- a/arch/arm/boot/dts/rockchip/rk3128.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3128.dtsi
@@ -20,6 +20,10 @@ aliases {
gpio1 = &gpio1;
gpio2 = &gpio2;
gpio3 = &gpio3;
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
};
arm-pmu {
--
2.43.0
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ARM: dts: rockchip: Move uart aliases to SoC dtsi for RK3128
2023-12-02 13:05 [PATCH 0/3] Move core bus and gpio aliases to SoC dtsi for RK3128 Alex Bee
2023-12-02 13:05 ` [PATCH 1/3] ARM: dts: rockchip: Move " Alex Bee
2023-12-02 13:05 ` [PATCH 2/3] ARM: dts: rockchip: Move i2c " Alex Bee
@ 2023-12-02 13:05 ` Alex Bee
2023-12-05 0:05 ` [PATCH 0/3] Move core bus and gpio " Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Alex Bee @ 2023-12-02 13:05 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
Alex Bee
SoC TRM, SoC datasheet and board schematics always refer to the
same uart numbers - even if not all are used for a specific board.
In order to not have to re-define them for every board move the
aliases to SoC dtsi for RK3128 like it's being done for all other
Rockchip ARM SoCs.
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 3 +--
arch/arm/boot/dts/rockchip/rk3128.dtsi | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
index b448e2b96e08..6e46e839de39 100644
--- a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
+++ b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
@@ -13,7 +13,6 @@ / {
aliases {
mmc0 = &emmc;
mmc1 = &sdmmc;
- serial0 = &uart1;
};
memory@60000000 {
@@ -22,7 +21,7 @@ memory@60000000 {
};
chosen {
- stdout-path = "serial0:115200n8";
+ stdout-path = &uart1;
};
adc-keys {
diff --git a/arch/arm/boot/dts/rockchip/rk3128.dtsi b/arch/arm/boot/dts/rockchip/rk3128.dtsi
index dc149d98cf9e..edf90ebd7ff9 100644
--- a/arch/arm/boot/dts/rockchip/rk3128.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3128.dtsi
@@ -24,6 +24,9 @@ aliases {
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
+ serial0 = &uart0;
+ serial1 = &uart1;
+ serial2 = &uart2;
};
arm-pmu {
--
2.43.0
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] Move core bus and gpio aliases to SoC dtsi for RK3128
2023-12-02 13:05 [PATCH 0/3] Move core bus and gpio aliases to SoC dtsi for RK3128 Alex Bee
` (2 preceding siblings ...)
2023-12-02 13:05 ` [PATCH] ARM: dts: rockchip: Move uart " Alex Bee
@ 2023-12-05 0:05 ` Heiko Stuebner
2023-12-05 13:33 ` Alex Bee
3 siblings, 1 reply; 6+ messages in thread
From: Heiko Stuebner @ 2023-12-05 0:05 UTC (permalink / raw)
To: Krzysztof Kozlowski, Alex Bee, Rob Herring, Conor Dooley
Cc: Heiko Stuebner, linux-arm-kernel, linux-kernel, linux-rockchip,
devicetree
On Sat, 2 Dec 2023 14:05:04 +0100, Alex Bee wrote:
> Following up the recent discussion [0] about where aliases can be/should be
> placed this series moves gpio, i2c and uart aliases to SoC dtsi for RK3128.
>
> Note: This patches are based on maintainter's repo.
>
> [0] https://lore.kernel.org/all/b0c637f5-5abf-420b-8b02-839eba68799e@linaro.org/T/#m94aebb23a29b015d94b250a70b675febdaa902ea
>
> [...]
Applied, thanks!
[1/3] ARM: dts: rockchip: Move gpio aliases to SoC dtsi for RK3128
commit: 3b0422a4ce59d8afb84bd7516bf71a3c1caa7925
[2/3] ARM: dts: rockchip: Move i2c aliases to SoC dtsi for RK3128
commit: 39732a49803cf271454416341549df09c4a2fd2f
I also applied patch 3 ... though had to pick it manually from the list
as the subject was a bit garbled (missing 3/3), so b4 did not pick it up.
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] Move core bus and gpio aliases to SoC dtsi for RK3128
2023-12-05 0:05 ` [PATCH 0/3] Move core bus and gpio " Heiko Stuebner
@ 2023-12-05 13:33 ` Alex Bee
0 siblings, 0 replies; 6+ messages in thread
From: Alex Bee @ 2023-12-05 13:33 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-arm-kernel, Conor Dooley, Rob Herring, Krzysztof Kozlowski,
linux-kernel, linux-rockchip, devicetree
Hi Heiko,
Am 05.12.23 um 01:05 schrieb Heiko Stuebner:
> On Sat, 2 Dec 2023 14:05:04 +0100, Alex Bee wrote:
>> Following up the recent discussion [0] about where aliases can be/should be
>> placed this series moves gpio, i2c and uart aliases to SoC dtsi for RK3128.
>>
>> Note: This patches are based on maintainter's repo.
>>
>> [0] https://lore.kernel.org/all/b0c637f5-5abf-420b-8b02-839eba68799e@linaro.org/T/#m94aebb23a29b015d94b250a70b675febdaa902ea
>>
>> [...]
> Applied, thanks!
>
> [1/3] ARM: dts: rockchip: Move gpio aliases to SoC dtsi for RK3128
> commit: 3b0422a4ce59d8afb84bd7516bf71a3c1caa7925
> [2/3] ARM: dts: rockchip: Move i2c aliases to SoC dtsi for RK3128
> commit: 39732a49803cf271454416341549df09c4a2fd2f
>
> I also applied patch 3 ... though had to pick it manually from the list
> as the subject was a bit garbled (missing 3/3), so b4 did not pick it up.
Thanks and sorry for the mess.
Not sure how I managed to get this done :) Will double check next time
before submitting.
Alex
>
> Best regards,
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread