* [PATCH 0/4] arm64: dts: ti: *: Define aliases in board file
@ 2022-08-30 15:21 ` Nishanth Menon
0 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
This series moves the aliases definitions in various TI SoC dts files
from SoC level to the board level.
Verification done:
a) build dtbs without the patches, regenerate dts using dtc -s -I dtb
b) build dtbs with the patches, regenerate the dts using dtc -s -I dtb
c) compare the regenerated dts file between a and b and ensure 0 delta
Nishanth Menon (4):
arm64: dts: ti: am65*: Define aliases in board files
arm64: dts: ti: j721e*: Define aliases in board files
arm64: dts: ti: j7200*: Define aliases in board files
arm64: dts: ti: am64*: Define aliases in board files
arch/arm64/boot/dts/ti/k3-am64.dtsi | 16 ----------------
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 16 ++++++++++++++++
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 16 ++++++++++++++++
.../boot/dts/ti/k3-am65-iot2050-common.dtsi | 12 ++++++++++++
arch/arm64/boot/dts/ti/k3-am65.dtsi | 17 -----------------
.../arm64/boot/dts/ti/k3-am654-base-board.dts | 17 +++++++++++++++++
.../dts/ti/k3-j7200-common-proc-board.dts | 17 +++++++++++++++++
arch/arm64/boot/dts/ti/k3-j7200.dtsi | 17 -----------------
.../dts/ti/k3-j721e-common-proc-board.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 19 -------------------
11 files changed, 116 insertions(+), 69 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 0/4] arm64: dts: ti: *: Define aliases in board file
@ 2022-08-30 15:21 ` Nishanth Menon
0 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
This series moves the aliases definitions in various TI SoC dts files
from SoC level to the board level.
Verification done:
a) build dtbs without the patches, regenerate dts using dtc -s -I dtb
b) build dtbs with the patches, regenerate the dts using dtc -s -I dtb
c) compare the regenerated dts file between a and b and ensure 0 delta
Nishanth Menon (4):
arm64: dts: ti: am65*: Define aliases in board files
arm64: dts: ti: j721e*: Define aliases in board files
arm64: dts: ti: j7200*: Define aliases in board files
arm64: dts: ti: am64*: Define aliases in board files
arch/arm64/boot/dts/ti/k3-am64.dtsi | 16 ----------------
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 16 ++++++++++++++++
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 16 ++++++++++++++++
.../boot/dts/ti/k3-am65-iot2050-common.dtsi | 12 ++++++++++++
arch/arm64/boot/dts/ti/k3-am65.dtsi | 17 -----------------
.../arm64/boot/dts/ti/k3-am654-base-board.dts | 17 +++++++++++++++++
.../dts/ti/k3-j7200-common-proc-board.dts | 17 +++++++++++++++++
arch/arm64/boot/dts/ti/k3-j7200.dtsi | 17 -----------------
.../dts/ti/k3-j721e-common-proc-board.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 19 -------------------
11 files changed, 116 insertions(+), 69 deletions(-)
--
2.31.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/4] arm64: dts: ti: am65*: Define aliases in board files
2022-08-30 15:21 ` Nishanth Menon
@ 2022-08-30 15:21 ` Nishanth Menon
-1 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dts file.
Note: the IoT family of boards have their own aliases already defined,
we need to carry the definitions forward to ensure things aren't
broken.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../boot/dts/ti/k3-am65-iot2050-common.dtsi | 12 ++++++++++++
arch/arm64/boot/dts/ti/k3-am65.dtsi | 17 -----------------
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 17 +++++++++++++++++
3 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
index 32b797237581..8499754f45bb 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -14,6 +14,18 @@
/ {
aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ i2c0 = &wkup_i2c0;
+ i2c1 = &mcu_i2c0;
+ i2c2 = &main_i2c0;
+ i2c3 = &main_i2c1;
+ i2c4 = &main_i2c2;
+ i2c5 = &main_i2c3;
+ ethernet0 = &cpsw_port1;
spi0 = &mcu_spi0;
mmc0 = &sdhci1;
mmc1 = &sdhci0;
diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi
index c538a0bf3cdd..166d4e02c7e1 100644
--- a/arch/arm64/boot/dts/ti/k3-am65.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi
@@ -18,23 +18,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &wkup_uart0;
- serial1 = &mcu_uart0;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- i2c0 = &wkup_i2c0;
- i2c1 = &mcu_i2c0;
- i2c2 = &main_i2c0;
- i2c3 = &main_i2c1;
- i2c4 = &main_i2c2;
- i2c5 = &main_i2c3;
- ethernet0 = &cpsw_port1;
- mmc0 = &sdhci0;
- mmc1 = &sdhci1;
- };
-
chosen { };
firmware {
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index 5850582dd4ed..aee866fb55b9 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -13,6 +13,23 @@ / {
compatible = "ti,am654-evm", "ti,am654";
model = "Texas Instruments AM654 Base Board";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ i2c0 = &wkup_i2c0;
+ i2c1 = &mcu_i2c0;
+ i2c2 = &main_i2c0;
+ i2c3 = &main_i2c1;
+ i2c4 = &main_i2c2;
+ i2c5 = &main_i2c3;
+ ethernet0 = &cpsw_port1;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "earlycon=ns16550a,mmio32,0x02800000";
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/4] arm64: dts: ti: am65*: Define aliases in board files
@ 2022-08-30 15:21 ` Nishanth Menon
0 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dts file.
Note: the IoT family of boards have their own aliases already defined,
we need to carry the definitions forward to ensure things aren't
broken.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../boot/dts/ti/k3-am65-iot2050-common.dtsi | 12 ++++++++++++
arch/arm64/boot/dts/ti/k3-am65.dtsi | 17 -----------------
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 17 +++++++++++++++++
3 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
index 32b797237581..8499754f45bb 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -14,6 +14,18 @@
/ {
aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ i2c0 = &wkup_i2c0;
+ i2c1 = &mcu_i2c0;
+ i2c2 = &main_i2c0;
+ i2c3 = &main_i2c1;
+ i2c4 = &main_i2c2;
+ i2c5 = &main_i2c3;
+ ethernet0 = &cpsw_port1;
spi0 = &mcu_spi0;
mmc0 = &sdhci1;
mmc1 = &sdhci0;
diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi
index c538a0bf3cdd..166d4e02c7e1 100644
--- a/arch/arm64/boot/dts/ti/k3-am65.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi
@@ -18,23 +18,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &wkup_uart0;
- serial1 = &mcu_uart0;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- i2c0 = &wkup_i2c0;
- i2c1 = &mcu_i2c0;
- i2c2 = &main_i2c0;
- i2c3 = &main_i2c1;
- i2c4 = &main_i2c2;
- i2c5 = &main_i2c3;
- ethernet0 = &cpsw_port1;
- mmc0 = &sdhci0;
- mmc1 = &sdhci1;
- };
-
chosen { };
firmware {
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index 5850582dd4ed..aee866fb55b9 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -13,6 +13,23 @@ / {
compatible = "ti,am654-evm", "ti,am654";
model = "Texas Instruments AM654 Base Board";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ i2c0 = &wkup_i2c0;
+ i2c1 = &mcu_i2c0;
+ i2c2 = &main_i2c0;
+ i2c3 = &main_i2c1;
+ i2c4 = &main_i2c2;
+ i2c5 = &main_i2c3;
+ ethernet0 = &cpsw_port1;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "earlycon=ns16550a,mmio32,0x02800000";
--
2.31.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] arm64: dts: ti: j721e*: Define aliases in board files
2022-08-30 15:21 ` Nishanth Menon
@ 2022-08-30 15:21 ` Nishanth Menon
-1 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dtsi file.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../dts/ti/k3-j721e-common-proc-board.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 19 -------------------
3 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index b1691ac3442d..7355144bdc19 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -15,6 +15,25 @@ / {
compatible = "ti,j721e-evm", "ti,j721e";
model = "Texas Instruments J721e EVM";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ serial9 = &main_uart7;
+ serial10 = &main_uart8;
+ serial11 = &main_uart9;
+ ethernet0 = &cpsw_port1;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ mmc2 = &main_sdhci2;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 80358cba6954..f5e6ab2ef35c 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -16,6 +16,25 @@ / {
compatible = "ti,j721e-sk", "ti,j721e";
model = "Texas Instruments J721E SK";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ serial9 = &main_uart7;
+ serial10 = &main_uart8;
+ serial11 = &main_uart9;
+ ethernet0 = &cpsw_port1;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ mmc2 = &main_sdhci2;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-j721e.dtsi b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
index 0e23886c9fd1..e8e93d075dc4 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
@@ -17,25 +17,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &wkup_uart0;
- serial1 = &mcu_uart0;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- serial5 = &main_uart3;
- serial6 = &main_uart4;
- serial7 = &main_uart5;
- serial8 = &main_uart6;
- serial9 = &main_uart7;
- serial10 = &main_uart8;
- serial11 = &main_uart9;
- ethernet0 = &cpsw_port1;
- mmc0 = &main_sdhci0;
- mmc1 = &main_sdhci1;
- mmc2 = &main_sdhci2;
- };
-
chosen { };
cpus {
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] arm64: dts: ti: j721e*: Define aliases in board files
@ 2022-08-30 15:21 ` Nishanth Menon
0 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dtsi file.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../dts/ti/k3-j721e-common-proc-board.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 19 +++++++++++++++++++
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 19 -------------------
3 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index b1691ac3442d..7355144bdc19 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -15,6 +15,25 @@ / {
compatible = "ti,j721e-evm", "ti,j721e";
model = "Texas Instruments J721e EVM";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ serial9 = &main_uart7;
+ serial10 = &main_uart8;
+ serial11 = &main_uart9;
+ ethernet0 = &cpsw_port1;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ mmc2 = &main_sdhci2;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 80358cba6954..f5e6ab2ef35c 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -16,6 +16,25 @@ / {
compatible = "ti,j721e-sk", "ti,j721e";
model = "Texas Instruments J721E SK";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ serial9 = &main_uart7;
+ serial10 = &main_uart8;
+ serial11 = &main_uart9;
+ ethernet0 = &cpsw_port1;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ mmc2 = &main_sdhci2;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-j721e.dtsi b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
index 0e23886c9fd1..e8e93d075dc4 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
@@ -17,25 +17,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &wkup_uart0;
- serial1 = &mcu_uart0;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- serial5 = &main_uart3;
- serial6 = &main_uart4;
- serial7 = &main_uart5;
- serial8 = &main_uart6;
- serial9 = &main_uart7;
- serial10 = &main_uart8;
- serial11 = &main_uart9;
- ethernet0 = &cpsw_port1;
- mmc0 = &main_sdhci0;
- mmc1 = &main_sdhci1;
- mmc2 = &main_sdhci2;
- };
-
chosen { };
cpus {
--
2.31.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] arm64: dts: ti: j7200*: Define aliases in board files
2022-08-30 15:21 ` Nishanth Menon
@ 2022-08-30 15:21 ` Nishanth Menon
-1 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dtsi file.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../boot/dts/ti/k3-j7200-common-proc-board.dts | 17 +++++++++++++++++
arch/arm64/boot/dts/ti/k3-j7200.dtsi | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
index 121975dc8239..5d4dbaad17e8 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
@@ -15,6 +15,23 @@ / {
compatible = "ti,j7200-evm", "ti,j7200";
model = "Texas Instruments J7200 EVM";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ serial9 = &main_uart7;
+ serial10 = &main_uart8;
+ serial11 = &main_uart9;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-j7200.dtsi b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
index b6da0454cc5b..05ffc2de7017 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
@@ -17,23 +17,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &wkup_uart0;
- serial1 = &mcu_uart0;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- serial5 = &main_uart3;
- serial6 = &main_uart4;
- serial7 = &main_uart5;
- serial8 = &main_uart6;
- serial9 = &main_uart7;
- serial10 = &main_uart8;
- serial11 = &main_uart9;
- mmc0 = &main_sdhci0;
- mmc1 = &main_sdhci1;
- };
-
chosen { };
cpus {
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] arm64: dts: ti: j7200*: Define aliases in board files
@ 2022-08-30 15:21 ` Nishanth Menon
0 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dtsi file.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../boot/dts/ti/k3-j7200-common-proc-board.dts | 17 +++++++++++++++++
arch/arm64/boot/dts/ti/k3-j7200.dtsi | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
index 121975dc8239..5d4dbaad17e8 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
@@ -15,6 +15,23 @@ / {
compatible = "ti,j7200-evm", "ti,j7200";
model = "Texas Instruments J7200 EVM";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ serial9 = &main_uart7;
+ serial10 = &main_uart8;
+ serial11 = &main_uart9;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-j7200.dtsi b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
index b6da0454cc5b..05ffc2de7017 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
@@ -17,23 +17,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &wkup_uart0;
- serial1 = &mcu_uart0;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- serial5 = &main_uart3;
- serial6 = &main_uart4;
- serial7 = &main_uart5;
- serial8 = &main_uart6;
- serial9 = &main_uart7;
- serial10 = &main_uart8;
- serial11 = &main_uart9;
- mmc0 = &main_sdhci0;
- mmc1 = &main_sdhci1;
- };
-
chosen { };
cpus {
--
2.31.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4] arm64: dts: ti: am64*: Define aliases in board files
2022-08-30 15:21 ` Nishanth Menon
@ 2022-08-30 15:21 ` Nishanth Menon
-1 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dtsi file.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
arch/arm64/boot/dts/ti/k3-am64.dtsi | 16 ----------------
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 16 ++++++++++++++++
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 16 ++++++++++++++++
3 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am64.dtsi b/arch/arm64/boot/dts/ti/k3-am64.dtsi
index 016dd8511ca6..ffe7578e553b 100644
--- a/arch/arm64/boot/dts/ti/k3-am64.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64.dtsi
@@ -18,22 +18,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &mcu_uart0;
- serial1 = &mcu_uart1;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- serial5 = &main_uart3;
- serial6 = &main_uart4;
- serial7 = &main_uart5;
- serial8 = &main_uart6;
- ethernet0 = &cpsw_port1;
- ethernet1 = &cpsw_port2;
- mmc0 = &sdhci0;
- mmc1 = &sdhci1;
- };
-
chosen { };
firmware {
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index ad150c704623..076e21e3d261 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -16,6 +16,22 @@ / {
compatible = "ti,am642-evm", "ti,am642";
model = "Texas Instruments AM642 EVM";
+ aliases {
+ serial0 = &mcu_uart0;
+ serial1 = &mcu_uart1;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ ethernet0 = &cpsw_port1;
+ ethernet1 = &cpsw_port2;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 2620469a7517..70432a9ac485 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -15,6 +15,22 @@ / {
compatible = "ti,am642-sk", "ti,am642";
model = "Texas Instruments AM642 SK";
+ aliases {
+ serial0 = &mcu_uart0;
+ serial1 = &mcu_uart1;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ ethernet0 = &cpsw_port1;
+ ethernet1 = &cpsw_port2;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4] arm64: dts: ti: am64*: Define aliases in board files
@ 2022-08-30 15:21 ` Nishanth Menon
0 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 15:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Vignesh Raghavendra
Cc: Tero Kristo, Nishanth Menon, Daniel Thompson, linux-kernel,
devicetree, linux-arm-kernel
Define aliases in board files, instead of in the SoC dtsi file.
Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
arch/arm64/boot/dts/ti/k3-am64.dtsi | 16 ----------------
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 16 ++++++++++++++++
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 16 ++++++++++++++++
3 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am64.dtsi b/arch/arm64/boot/dts/ti/k3-am64.dtsi
index 016dd8511ca6..ffe7578e553b 100644
--- a/arch/arm64/boot/dts/ti/k3-am64.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64.dtsi
@@ -18,22 +18,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &mcu_uart0;
- serial1 = &mcu_uart1;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- serial5 = &main_uart3;
- serial6 = &main_uart4;
- serial7 = &main_uart5;
- serial8 = &main_uart6;
- ethernet0 = &cpsw_port1;
- ethernet1 = &cpsw_port2;
- mmc0 = &sdhci0;
- mmc1 = &sdhci1;
- };
-
chosen { };
firmware {
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index ad150c704623..076e21e3d261 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -16,6 +16,22 @@ / {
compatible = "ti,am642-evm", "ti,am642";
model = "Texas Instruments AM642 EVM";
+ aliases {
+ serial0 = &mcu_uart0;
+ serial1 = &mcu_uart1;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ ethernet0 = &cpsw_port1;
+ ethernet1 = &cpsw_port2;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 2620469a7517..70432a9ac485 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -15,6 +15,22 @@ / {
compatible = "ti,am642-sk", "ti,am642";
model = "Texas Instruments AM642 SK";
+ aliases {
+ serial0 = &mcu_uart0;
+ serial1 = &mcu_uart1;
+ serial2 = &main_uart0;
+ serial3 = &main_uart1;
+ serial4 = &main_uart2;
+ serial5 = &main_uart3;
+ serial6 = &main_uart4;
+ serial7 = &main_uart5;
+ serial8 = &main_uart6;
+ ethernet0 = &cpsw_port1;
+ ethernet1 = &cpsw_port2;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
--
2.31.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] arm64: dts: ti: j721e*: Define aliases in board files
2022-08-30 15:21 ` Nishanth Menon
(?)
@ 2022-08-30 18:18 ` Arnd Bergmann
2022-08-30 20:15 ` Nishanth Menon
-1 siblings, 1 reply; 12+ messages in thread
From: Arnd Bergmann @ 2022-08-30 18:18 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 30, 2022, at 5:21 PM, Nishanth Menon wrote:
> Define aliases in board files, instead of in the SoC dtsi file.
>
> Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
> Signed-off-by: Nishanth Menon <nm@ti.com>
The patch is a good step in the right direction, but
>
> + aliases {
> + serial0 = &wkup_uart0;
> + serial1 = &mcu_uart0;
> + serial2 = &main_uart0;
> + serial3 = &main_uart1;
> + serial4 = &main_uart2;
> + serial5 = &main_uart3;
> + serial6 = &main_uart4;
> + serial7 = &main_uart5;
> + serial8 = &main_uart6;
> + serial9 = &main_uart7;
> + serial10 = &main_uart8;
> + serial11 = &main_uart9;
> + ethernet0 = &cpsw_port1;
> + mmc0 = &main_sdhci0;
> + mmc1 = &main_sdhci1;
> + mmc2 = &main_sdhci2;
Are all these devices actually used on both of the boards?
There is no point in defining an alias if the board
does not route these to a device or a connector.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] arm64: dts: ti: j721e*: Define aliases in board files
2022-08-30 18:18 ` Arnd Bergmann
@ 2022-08-30 20:15 ` Nishanth Menon
0 siblings, 0 replies; 12+ messages in thread
From: Nishanth Menon @ 2022-08-30 20:15 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel
On 20:18-20220830, Arnd Bergmann wrote:
> On Tue, Aug 30, 2022, at 5:21 PM, Nishanth Menon wrote:
> > Define aliases in board files, instead of in the SoC dtsi file.
> >
> > Reported-by: Daniel Thompson <daniel.thompson@linaro.org>
> > Signed-off-by: Nishanth Menon <nm@ti.com>
>
> The patch is a good step in the right direction, but
>
> >
> > + aliases {
> > + serial0 = &wkup_uart0;
> > + serial1 = &mcu_uart0;
> > + serial2 = &main_uart0;
> > + serial3 = &main_uart1;
> > + serial4 = &main_uart2;
> > + serial5 = &main_uart3;
> > + serial6 = &main_uart4;
> > + serial7 = &main_uart5;
> > + serial8 = &main_uart6;
> > + serial9 = &main_uart7;
> > + serial10 = &main_uart8;
> > + serial11 = &main_uart9;
> > + ethernet0 = &cpsw_port1;
> > + mmc0 = &main_sdhci0;
> > + mmc1 = &main_sdhci1;
> > + mmc2 = &main_sdhci2;
>
> Are all these devices actually used on both of the boards?
>
> There is no point in defining an alias if the board
> does not route these to a device or a connector.
Thanks and true, I had indeed missed cross checking against the usage.
Will recheck, cleanup and respin this series.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-08-30 20:16 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-30 15:21 [PATCH 0/4] arm64: dts: ti: *: Define aliases in board file Nishanth Menon
2022-08-30 15:21 ` Nishanth Menon
2022-08-30 15:21 ` [PATCH 1/4] arm64: dts: ti: am65*: Define aliases in board files Nishanth Menon
2022-08-30 15:21 ` Nishanth Menon
2022-08-30 15:21 ` [PATCH 2/4] arm64: dts: ti: j721e*: " Nishanth Menon
2022-08-30 15:21 ` Nishanth Menon
2022-08-30 18:18 ` Arnd Bergmann
2022-08-30 20:15 ` Nishanth Menon
2022-08-30 15:21 ` [PATCH 3/4] arm64: dts: ti: j7200*: " Nishanth Menon
2022-08-30 15:21 ` Nishanth Menon
2022-08-30 15:21 ` [PATCH 4/4] arm64: dts: ti: am64*: " Nishanth Menon
2022-08-30 15:21 ` Nishanth Menon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.