From cd96f37f82b28b0a1cb69c273f2aa309128cd528 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Mon, 23 Jun 2025 14:29:42 +0200 Subject: [PATCH] dts: arm: ti: Move am64x_{main,mcu} to dts/vendor/ti This files can be used by the 32-bit as well as 64-bit ARM architectures. Move them into the dts/vendor/ti directory to make the ISA independant. All nodes located in the AM64x MAIN domain should have the main_ prefix. This makes it more clear where those pins are actually located in the chip. Signed-off-by: Daniel Schultz --- dts/arm/ti/am64x_m4.dtsi | 9 +- dts/arm/ti/am64x_r5.dtsi | 145 +++++++++--------- dts/arm/ti/am64x_r5f0_0.dtsi | 2 +- dts/arm/ti/am64x_r5f0_1.dtsi | 2 +- dts/arm/ti/am64x_r5f1_0.dtsi | 2 +- dts/arm/ti/am64x_r5f1_1.dtsi | 2 +- dts/{arm => vendor}/ti/am64x_main.dtsi | 74 +++++---- .../ti/am64x_main_power_domains.dtsi | 0 dts/{arm => vendor}/ti/am64x_mcu.dtsi | 0 .../ti/am64x_mcu_power_domains.dtsi | 0 10 files changed, 119 insertions(+), 117 deletions(-) rename dts/{arm => vendor}/ti/am64x_main.dtsi (83%) rename dts/{arm => vendor}/ti/am64x_main_power_domains.dtsi (100%) rename dts/{arm => vendor}/ti/am64x_mcu.dtsi (100%) rename dts/{arm => vendor}/ti/am64x_mcu_power_domains.dtsi (100%) diff --git a/dts/arm/ti/am64x_m4.dtsi b/dts/arm/ti/am64x_m4.dtsi index 4e693e31b72..e77641a6c70 100644 --- a/dts/arm/ti/am64x_m4.dtsi +++ b/dts/arm/ti/am64x_m4.dtsi @@ -8,9 +8,8 @@ #include #include #include - -#include "am64x_main.dtsi" -#include "am64x_mcu.dtsi" +#include +#include / { @@ -70,12 +69,12 @@ interrupt-parent = <&nvic>; }; -&mbox6 { +&main_mbox6 { interrupts = <56 4>; interrupt-parent = <&nvic>; }; -&mbox7 { +&main_mbox7 { interrupts = <57 4>; interrupt-parent = <&nvic>; }; diff --git a/dts/arm/ti/am64x_r5.dtsi b/dts/arm/ti/am64x_r5.dtsi index 7b6a7f8ea30..f12885ff1ca 100644 --- a/dts/arm/ti/am64x_r5.dtsi +++ b/dts/arm/ti/am64x_r5.dtsi @@ -8,8 +8,8 @@ #include #include #include -#include "am64x_main.dtsi" -#include "am64x_mcu.dtsi" +#include +#include / { #address-cells = <1>; @@ -58,126 +58,176 @@ }; }; +&dmsc { + ti,host-id = <36>; + mboxes = <&secure_proxy_main 2>, <&secure_proxy_main 3>; +}; + &secure_proxy_main { interrupts = <0 65 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer0 { +&main_timer0 { interrupts = <0 152 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer1 { +&main_timer1 { interrupts = <0 153 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer2 { +&main_timer2 { interrupts = <0 154 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer3 { +&main_timer3 { interrupts = <0 155 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer4 { +&main_timer4 { interrupts = <0 156 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer5 { +&main_timer5 { interrupts = <0 157 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer6 { +&main_timer6 { interrupts = <0 158 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer7 { +&main_timer7 { interrupts = <0 159 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer8 { +&main_timer8 { interrupts = <0 160 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer9 { +&main_timer9 { interrupts = <0 161 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer10 { +&main_timer10 { interrupts = <0 162 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&timer11 { +&main_timer11 { interrupts = <0 163 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&uart0 { +&main_uart0 { interrupts = <0 210 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&uart1 { +&main_uart1 { interrupts = <0 211 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&uart2 { +&main_uart2 { interrupts = <0 212 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&uart3 { +&main_uart3 { interrupts = <0 213 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&uart4 { +&main_uart4 { interrupts = <0 214 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&uart5 { +&main_uart5 { interrupts = <0 215 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&uart6 { +&main_uart6 { interrupts = <0 216 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&i2c0 { +&main_i2c0 { interrupts = <0 193 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&i2c1 { +&main_i2c1 { interrupts = <0 194 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&i2c2 { +&main_i2c2 { interrupts = <0 195 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; -&i2c3 { +&main_i2c3 { interrupts = <0 196 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; +&main_adc0 { + interrupts = <0 128 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox0 { + interrupts = <0 96 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox1 { + interrupts = <0 97 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox2 { + interrupts = <0 98 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox3 { + interrupts = <0 99 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox4 { + interrupts = <0 98 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox5 { + interrupts = <0 99 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox6 { + interrupts = <0 100 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + +&main_mbox7 { + interrupts = <0 100 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; + interrupt-parent = <&vim>; +}; + &mcu_uart0 { interrupts = <0 217 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; @@ -197,48 +247,3 @@ interrupts = <0 62 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; interrupt-parent = <&vim>; }; - -&adc0 { - interrupts = <0 128 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox0 { - interrupts = <0 96 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox1 { - interrupts = <0 97 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox2 { - interrupts = <0 98 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox3 { - interrupts = <0 99 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox4 { - interrupts = <0 98 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox5 { - interrupts = <0 99 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox6 { - interrupts = <0 100 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; - -&mbox7 { - interrupts = <0 100 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>; - interrupt-parent = <&vim>; -}; diff --git a/dts/arm/ti/am64x_r5f0_0.dtsi b/dts/arm/ti/am64x_r5f0_0.dtsi index 9ae6548a7a4..0a2f943748d 100644 --- a/dts/arm/ti/am64x_r5f0_0.dtsi +++ b/dts/arm/ti/am64x_r5f0_0.dtsi @@ -6,7 +6,7 @@ #include -&mbox2 { +&main_mbox2 { usr-id = <0>; status = "okay"; }; diff --git a/dts/arm/ti/am64x_r5f0_1.dtsi b/dts/arm/ti/am64x_r5f0_1.dtsi index 563e5e099f4..427adad04cf 100644 --- a/dts/arm/ti/am64x_r5f0_1.dtsi +++ b/dts/arm/ti/am64x_r5f0_1.dtsi @@ -6,7 +6,7 @@ #include -&mbox2 { +&main_mbox2 { usr-id = <1>; status = "okay"; }; diff --git a/dts/arm/ti/am64x_r5f1_0.dtsi b/dts/arm/ti/am64x_r5f1_0.dtsi index 3b07b5dae13..cf9ab789691 100644 --- a/dts/arm/ti/am64x_r5f1_0.dtsi +++ b/dts/arm/ti/am64x_r5f1_0.dtsi @@ -6,7 +6,7 @@ #include -&mbox4 { +&main_mbox4 { usr-id = <0>; status = "okay"; }; diff --git a/dts/arm/ti/am64x_r5f1_1.dtsi b/dts/arm/ti/am64x_r5f1_1.dtsi index 3a5b930cccc..92022c35724 100644 --- a/dts/arm/ti/am64x_r5f1_1.dtsi +++ b/dts/arm/ti/am64x_r5f1_1.dtsi @@ -6,7 +6,7 @@ #include -&mbox4 { +&main_mbox4 { usr-id = <1>; status = "okay"; }; diff --git a/dts/arm/ti/am64x_main.dtsi b/dts/vendor/ti/am64x_main.dtsi similarity index 83% rename from dts/arm/ti/am64x_main.dtsi rename to dts/vendor/ti/am64x_main.dtsi index 232366dca4b..a76a657280e 100644 --- a/dts/arm/ti/am64x_main.dtsi +++ b/dts/vendor/ti/am64x_main.dtsi @@ -13,9 +13,7 @@ dmsc: system-controller@44043000 { compatible = "ti,k2g-sci"; - ti,host-id = <36>; mbox-names = "rx", "tx"; - mboxes = <&secure_proxy_main 2>, <&secure_proxy_main 3>; reg-names = "debug_messages"; reg = <0x44043000 0xfe0>; status = "disabled"; @@ -29,85 +27,85 @@ status = "disabled"; }; - pinctrl: pinctrl@f4000 { + main_pinctrl: pinctrl@f4000 { compatible = "ti,k3-pinctrl"; reg = <0xf4000 0x2ac>; status = "disabled"; }; - timer0: timer@2400000 { + main_timer0: timer@2400000 { compatible = "ti,am654-timer"; reg = <0x2400000 DT_SIZE_K(1)>; status = "disabled"; }; - timer1: timer@2410000 { + main_timer1: timer@2410000 { compatible = "ti,am654-timer"; reg = <0x2410000 DT_SIZE_K(1)>; status = "disabled"; }; - timer2: timer@2420000 { + main_timer2: timer@2420000 { compatible = "ti,am654-timer"; reg = <0x2420000 DT_SIZE_K(1)>; status = "disabled"; }; - timer3: timer@2430000 { + main_timer3: timer@2430000 { compatible = "ti,am654-timer"; reg = <0x2430000 DT_SIZE_K(1)>; status = "disabled"; }; - timer4: timer@2440000 { + main_timer4: timer@2440000 { compatible = "ti,am654-timer"; reg = <0x2440000 DT_SIZE_K(1)>; status = "disabled"; }; - timer5: timer@2450000 { + main_timer5: timer@2450000 { compatible = "ti,am654-timer"; reg = <0x2450000 DT_SIZE_K(1)>; status = "disabled"; }; - timer6: timer@2460000 { + main_timer6: timer@2460000 { compatible = "ti,am654-timer"; reg = <0x2460000 DT_SIZE_K(1)>; status = "disabled"; }; - timer7: timer@2470000 { + main_timer7: timer@2470000 { compatible = "ti,am654-timer"; reg = <0x2470000 DT_SIZE_K(1)>; status = "disabled"; }; - timer8: timer@2480000 { + main_timer8: timer@2480000 { compatible = "ti,am654-timer"; reg = <0x2480000 DT_SIZE_K(1)>; status = "disabled"; }; - timer9: timer@2490000 { + main_timer9: timer@2490000 { compatible = "ti,am654-timer"; reg = <0x2490000 DT_SIZE_K(1)>; status = "disabled"; }; - timer10: timer@24a0000 { + main_timer10: timer@24a0000 { compatible = "ti,am654-timer"; reg = <0x24a0000 DT_SIZE_K(1)>; status = "disabled"; }; - timer11: timer@24b0000 { + main_timer11: timer@24b0000 { compatible = "ti,am654-timer"; reg = <0x24b0000 DT_SIZE_K(1)>; status = "disabled"; }; - uart0: uart@2800000 { + main_uart0: uart@2800000 { compatible = "ns16550"; reg = <0x02800000 0x200>; clock-frequency = ; @@ -115,7 +113,7 @@ status = "disabled"; }; - uart1: uart@2810000 { + main_uart1: uart@2810000 { compatible = "ns16550"; reg = <0x02810000 0x200>; clock-frequency = ; @@ -123,7 +121,7 @@ status = "disabled"; }; - uart2: uart@2820000 { + main_uart2: uart@2820000 { compatible = "ns16550"; reg = <0x02820000 0x200>; clock-frequency = ; @@ -131,7 +129,7 @@ status = "disabled"; }; - uart3: uart@2830000 { + main_uart3: uart@2830000 { compatible = "ns16550"; reg = <0x02830000 0x200>; clock-frequency = ; @@ -139,7 +137,7 @@ status = "disabled"; }; - uart4: uart@2840000 { + main_uart4: uart@2840000 { compatible = "ns16550"; reg = <0x02840000 0x200>; clock-frequency = ; @@ -147,7 +145,7 @@ status = "disabled"; }; - uart5: uart@2850000 { + main_uart5: uart@2850000 { compatible = "ns16550"; reg = <0x02850000 0x200>; clock-frequency = ; @@ -155,7 +153,7 @@ status = "disabled"; }; - uart6: uart@2860000 { + main_uart6: uart@2860000 { compatible = "ns16550"; reg = <0x02860000 0x200>; clock-frequency = ; @@ -163,7 +161,7 @@ status = "disabled"; }; - i2c0: i2c0@20000000 { + main_i2c0: i2c0@20000000 { compatible = "ti,omap-i2c"; reg = <0x20000000 0x100>; clock-frequency = ; @@ -172,7 +170,7 @@ status = "disabled"; }; - i2c1: i2c0@20010000 { + main_i2c1: i2c0@20010000 { compatible = "ti,omap-i2c"; reg = <0x20010000 0x100>; clock-frequency = ; @@ -181,7 +179,7 @@ status = "disabled"; }; - i2c2: i2c0@20020000 { + main_i2c2: i2c0@20020000 { compatible = "ti,omap-i2c"; reg = <0x20020000 0x100>; clock-frequency = ; @@ -190,7 +188,7 @@ status = "disabled"; }; - i2c3: i2c0@20030000 { + main_i2c3: i2c0@20030000 { compatible = "ti,omap-i2c"; reg = <0x20030000 0x100>; clock-frequency = ; @@ -199,7 +197,7 @@ status = "disabled"; }; - gpio0: gpio@600000 { + main_gpio0: gpio@600000 { compatible = "ti,davinci-gpio"; reg = <0x600000 0x100>; gpio-controller; @@ -207,7 +205,7 @@ status = "disabled"; }; - gpio1: gpio@601000 { + main_gpio1: gpio@601000 { compatible = "ti,davinci-gpio"; reg = <0x601000 0x100>; gpio-controller; @@ -215,7 +213,7 @@ status = "disabled"; }; - mcspi0: spi@20100000 { + main_mcspi0: spi@20100000 { compatible = "ti,omap-mcspi"; reg = <0x20100000 0x400>; clock-frequency = ; @@ -225,7 +223,7 @@ status = "disabled"; }; - adc0: adc@28001000 { + main_adc0: adc@28001000 { compatible = "ti,am335x-adc"; reg = <0x28001000 DT_SIZE_K(1)>; status = "disabled"; @@ -235,7 +233,7 @@ }; /* users: r5f0_0, r5f0_1, r5f1_0, r5f1_1 */ - mbox0: mailbox@29000000 { + main_mbox0: mailbox@29000000 { compatible = "ti,omap-mailbox"; reg = <0x29000000 0x200>; #mbox-cells = <1>; @@ -243,7 +241,7 @@ }; /* users: r5f0_0, r5f0_1, r5f1_0, r5f1_1 */ - mbox1: mailbox@29010000 { + main_mbox1: mailbox@29010000 { compatible = "ti,omap-mailbox"; reg = <0x29010000 0x200>; #mbox-cells = <1>; @@ -251,7 +249,7 @@ }; /* users: r5f0_0, r5f0_1, a53 */ - mbox2: mailbox@29020000 { + main_mbox2: mailbox@29020000 { compatible = "ti,omap-mailbox"; reg = <0x29020000 0x200>; #mbox-cells = <1>; @@ -259,7 +257,7 @@ }; /* users: r5f0_0, r5f0_1, a53 */ - mbox3: mailbox@29030000 { + main_mbox3: mailbox@29030000 { compatible = "ti,omap-mailbox"; reg = <0x29030000 0x200>; #mbox-cells = <1>; @@ -267,7 +265,7 @@ }; /* users: r5f1_0, r5f1_1, a53 */ - mbox4: mailbox@29040000 { + main_mbox4: mailbox@29040000 { compatible = "ti,omap-mailbox"; reg = <0x29040000 0x200>; #mbox-cells = <1>; @@ -275,7 +273,7 @@ }; /* users: r5f1_0, r5f1_1, a53 */ - mbox5: mailbox@29050000 { + main_mbox5: mailbox@29050000 { compatible = "ti,omap-mailbox"; reg = <0x29050000 0x200>; #mbox-cells = <1>; @@ -283,7 +281,7 @@ }; /* users: r5f0_0, r5f0_1, a53, m4 */ - mbox6: mailbox@29060000 { + main_mbox6: mailbox@29060000 { compatible = "ti,omap-mailbox"; reg = <0x29060000 0x200>; #mbox-cells = <1>; @@ -291,7 +289,7 @@ }; /* users: r5f1_0, r5f1_1, a53, m4 */ - mbox7: mailbox@29070000 { + main_mbox7: mailbox@29070000 { compatible = "ti,omap-mailbox"; reg = <0x29070000 0x200>; #mbox-cells = <1>; diff --git a/dts/arm/ti/am64x_main_power_domains.dtsi b/dts/vendor/ti/am64x_main_power_domains.dtsi similarity index 100% rename from dts/arm/ti/am64x_main_power_domains.dtsi rename to dts/vendor/ti/am64x_main_power_domains.dtsi diff --git a/dts/arm/ti/am64x_mcu.dtsi b/dts/vendor/ti/am64x_mcu.dtsi similarity index 100% rename from dts/arm/ti/am64x_mcu.dtsi rename to dts/vendor/ti/am64x_mcu.dtsi diff --git a/dts/arm/ti/am64x_mcu_power_domains.dtsi b/dts/vendor/ti/am64x_mcu_power_domains.dtsi similarity index 100% rename from dts/arm/ti/am64x_mcu_power_domains.dtsi rename to dts/vendor/ti/am64x_mcu_power_domains.dtsi