summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAswath Govindraju <a-govindraju@ti.com>2021-12-23 13:16:49 +0100
committerNishanth Menon <nm@ti.com>2022-01-24 20:40:19 +0100
commit165216533dda560f2620ce8f61381a9ee0ca57ba (patch)
treee233704aeb6892da0e487e19c655d05986e0f044 /arch
parentLinux 5.17-rc1 (diff)
downloadlinux-165216533dda560f2620ce8f61381a9ee0ca57ba.tar.xz
linux-165216533dda560f2620ce8f61381a9ee0ca57ba.zip
arm64: dts: ti: k3-j721s2: Move aliases to board dts
Aliases are board specific and should be in board dts files. So, move aliases to board dts and trim the list to interfaces that are actually enabled. Signed-off-by: Aswath Govindraju <a-govindraju@ti.com> Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com> Link: https://lore.kernel.org/r/20211223121650.26868-2-vigneshr@ti.com
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts10
-rw-r--r--arch/arm64/boot/dts/ti/k3-j721s2.dtsi22
2 files changed, 10 insertions, 22 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index a5a24f9f46c5..708c14338eb7 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -19,6 +19,16 @@
bootargs = "console=ttyS10,115200n8 earlycon=ns16550a,mmio32,2880000";
};
+ aliases {
+ serial1 = &mcu_uart0;
+ serial10 = &main_uart8;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ can0 = &main_mcan16;
+ can1 = &mcu_mcan0;
+ can2 = &mcu_mcan1;
+ };
+
evm_12v0: fixedregulator-evm12v0 {
/* main supply */
compatible = "regulator-fixed";
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2.dtsi
index 80d3cae03e88..fe5234c40f6c 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2.dtsi
@@ -21,28 +21,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;
- can0 = &main_mcan16;
- can1 = &mcu_mcan0;
- can2 = &mcu_mcan1;
- can3 = &main_mcan3;
- can4 = &main_mcan5;
- };
-
chosen { };
cpus {