k3-am62* SoC dtsi files now provide the following:

bootph-all: dmss secure_proxy_main dmsc k3_pds k3_clks k3_reset
   main_pmx0 main_timer0 mcu_pmx0 wkup_conf chipid

bootph-pre-ram: secure_proxy_sa3 main_esm mcu_esm

Drop these from board r5 and u-boot.dtsi files as these are duplicate in
them now.

Acked-by: Francesco Dolcini <francesco.dolc...@toradex.com>
Tested-by: Dhruva Gole <d-g...@ti.com>
Signed-off-by: Nishanth Menon <n...@ti.com>
---
Changes since v1:
- just picked up acks and tested tags

V1: https://lore.kernel.org/r/20231113145919.1928812-3...@ti.com

 arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi  | 54 ------------------
 arch/arm/dts/k3-am625-r5-beagleplay.dts       |  9 ---
 arch/arm/dts/k3-am625-r5-sk.dts               |  9 ---
 arch/arm/dts/k3-am625-sk-u-boot.dtsi          | 53 ------------------
 arch/arm/dts/k3-am625-verdin-r5.dts           |  9 ---
 .../dts/k3-am625-verdin-wifi-dev-u-boot.dtsi  | 55 +------------------
 6 files changed, 2 insertions(+), 187 deletions(-)

diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi 
b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
index d6c6baa5518b..6f3a31558b20 100644
--- a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
@@ -47,59 +47,17 @@
        };
 };
 
-&cbass_main {
-       bootph-all;
-};
-
 &main_timer0 {
        clock-frequency = <25000000>;
-       bootph-all;
-};
-
-&dmss {
-       bootph-all;
-};
-
-&secure_proxy_main {
-       bootph-all;
-};
-
-&dmsc {
-       bootph-all;
-};
-
-&k3_pds {
-       bootph-all;
-};
-
-&k3_clks {
-       bootph-all;
-};
-
-&k3_reset {
-       bootph-all;
 };
 
 &dmsc {
-       bootph-all;
        k3_sysreset: sysreset-controller {
                compatible = "ti,sci-sysreset";
                bootph-all;
        };
 };
 
-&wkup_conf {
-       bootph-all;
-};
-
-&chipid {
-       bootph-all;
-};
-
-&main_pmx0 {
-       bootph-all;
-};
-
 &main_uart0 {
        bootph-all;
 };
@@ -108,18 +66,6 @@
        bootph-all;
 };
 
-&cbass_mcu {
-       bootph-all;
-};
-
-&cbass_wakeup {
-       bootph-all;
-};
-
-&mcu_pmx0 {
-       bootph-all;
-};
-
 &main_i2c0 {
        bootph-all;
 };
diff --git a/arch/arm/dts/k3-am625-r5-beagleplay.dts 
b/arch/arm/dts/k3-am625-r5-beagleplay.dts
index 9c9d0570592a..1f450f55c1d2 100644
--- a/arch/arm/dts/k3-am625-r5-beagleplay.dts
+++ b/arch/arm/dts/k3-am625-r5-beagleplay.dts
@@ -54,12 +54,7 @@
        ti,secure-host;
 };
 
-&mcu_esm {
-       bootph-pre-ram;
-};
-
 &secure_proxy_sa3 {
-       bootph-pre-ram;
        /* We require this for boot handshake */
        status = "okay";
 };
@@ -73,10 +68,6 @@
        };
 };
 
-&main_esm {
-       bootph-pre-ram;
-};
-
 &main_pktdma {
        ti,sci = <&dm_tifs>;
 };
diff --git a/arch/arm/dts/k3-am625-r5-sk.dts b/arch/arm/dts/k3-am625-r5-sk.dts
index bf219226b974..55420b2f2c15 100644
--- a/arch/arm/dts/k3-am625-r5-sk.dts
+++ b/arch/arm/dts/k3-am625-r5-sk.dts
@@ -55,20 +55,11 @@
        ti,secure-host;
 };
 
-&mcu_esm {
-       bootph-pre-ram;
-};
-
 &secure_proxy_sa3 {
-       bootph-pre-ram;
        /* We require this for boot handshake */
        status = "okay";
 };
 
-&main_esm {
-       bootph-pre-ram;
-};
-
 &cbass_main {
        sysctrler: sysctrler {
                compatible = "ti,am654-system-controller";
diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi 
b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
index 7ae5e01f7c7f..dcf7c7652d31 100644
--- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
@@ -25,49 +25,8 @@
        bootph-all;
 };
 
-&cbass_main {
-       bootph-all;
-};
-
 &main_timer0 {
        clock-frequency = <25000000>;
-       bootph-all;
-};
-
-&dmss {
-       bootph-all;
-};
-
-&secure_proxy_main {
-       bootph-all;
-};
-
-&dmsc {
-       bootph-all;
-};
-
-&k3_pds {
-       bootph-all;
-};
-
-&k3_clks {
-       bootph-all;
-};
-
-&k3_reset {
-       bootph-all;
-};
-
-&wkup_conf {
-       bootph-all;
-};
-
-&chipid {
-       bootph-all;
-};
-
-&main_pmx0 {
-       bootph-all;
 };
 
 &main_uart0 {
@@ -78,18 +37,6 @@
        bootph-all;
 };
 
-&cbass_mcu {
-       bootph-all;
-};
-
-&cbass_wakeup {
-       bootph-all;
-};
-
-&mcu_pmx0 {
-       bootph-all;
-};
-
 &sdhci1 {
        bootph-all;
 };
diff --git a/arch/arm/dts/k3-am625-verdin-r5.dts 
b/arch/arm/dts/k3-am625-verdin-r5.dts
index 0cae9c577732..305d199678b3 100644
--- a/arch/arm/dts/k3-am625-verdin-r5.dts
+++ b/arch/arm/dts/k3-am625-verdin-r5.dts
@@ -69,16 +69,7 @@
        ti,secure-host;
 };
 
-&main_esm {
-       bootph-pre-ram;
-};
-
-&mcu_esm {
-       bootph-pre-ram;
-};
-
 &secure_proxy_sa3 {
-       bootph-pre-ram;
        /* We require this for boot handshake */
        status = "okay";
 };
diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi 
b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
index 75cb60b57d79..86e2d111f541 100644
--- a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
@@ -21,25 +21,8 @@
        };
 };
 
-&cbass_main {
-       bootph-all;
-
-       timer@2400000 {
-               clock-frequency = <25000000>;
-               bootph-all;
-       };
-};
-
-&cbass_mcu {
-       bootph-all;
-};
-
-&cbass_wakeup {
-       bootph-all;
-};
-
-&chipid {
-       bootph-all;
+&main_timer0 {
+       clock-frequency = <25000000>;
 };
 
 &main_bcdma {
@@ -98,34 +81,16 @@
 };
 
 &dmsc {
-       bootph-all;
-
        k3_sysreset: sysreset-controller {
                compatible = "ti,sci-sysreset";
                bootph-all;
        };
 };
 
-&dmss {
-       bootph-all;
-};
-
 &fss {
        bootph-all;
 };
 
-&k3_clks {
-       bootph-all;
-};
-
-&k3_pds {
-       bootph-all;
-};
-
-&k3_reset {
-       bootph-all;
-};
-
 &main_gpio0 {
        bootph-all;
 };
@@ -156,10 +121,6 @@
        };
 };
 
-&main_pmx0 {
-       bootph-all;
-};
-
 /* Verdin UART_3, used as the Linux console */
 &main_uart0 {
        bootph-all;
@@ -170,10 +131,6 @@
        bootph-all;
 };
 
-&mcu_pmx0 {
-       bootph-all;
-};
-
 &pinctrl_ctrl_sleep_moci {
        bootph-all;
 };
@@ -210,18 +167,10 @@
        status = "disabled";
 };
 
-&secure_proxy_main {
-       bootph-all;
-};
-
 &verdin_ctrl_sleep_moci {
        bootph-all;
 };
 
-&wkup_conf {
-       bootph-all;
-};
-
 /* Verdin UART_2 */
 &wkup_uart0 {
        bootph-all;
-- 
2.40.0

Reply via email to