arm: dts: k3-am625: Drop SoC provided bootph params from board u-boot/r5 dtsi

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.dolcini@toradex.com>
Tested-by: Dhruva Gole <d-gole@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
index 10bdaa1..ad5487c 100644 (file)
--- 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 864ed54..9db58f0 100644 (file)
--- 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 bf21922..55420b2 100644 (file)
--- 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 7ae5e01..dcf7c76 100644 (file)
--- 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 0cae9c5..305d199 100644 (file)
--- 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 588d959..02f34c9 100644 (file)
--- 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 {
@@ -99,34 +82,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;
 };
@@ -157,10 +122,6 @@
        };
 };
 
-&main_pmx0 {
-       bootph-all;
-};
-
 /* Verdin UART_3, used as the Linux console */
 &main_uart0 {
        bootph-all;
@@ -171,10 +132,6 @@
        bootph-all;
 };
 
-&mcu_pmx0 {
-       bootph-all;
-};
-
 &pinctrl_ctrl_sleep_moci {
        bootph-all;
 };
@@ -211,18 +168,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;