rockchip: rk356x: Move common uart2 props to rk356x-u-boot.dtsi

Move uart2 bootph-pre-ram and clock-frequency props from board to SoC
u-boot.dtsi. Regular board device tree already enables the uart2 node,
so status prop is dropped from u-boot.dtsi file.

Also remove unnecessary stdout-path = &uart2, regular board device tree
already provide a stdout-path = "serial2:" value.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
index f986e1941e7f40132bc64af5f8b845a66a8f0232..fa3df73c33db396491a103ad515b4128f6510815 100644 (file)
--- a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
@@ -4,7 +4,6 @@
 
 / {
        chosen {
-               stdout-path = &uart2;
                u-boot,spl-boot-order = "same-as-spl", &sdmmc1, &sdmmc0;
        };
 
@@ -88,9 +87,3 @@
        vqmmc-supply = <&vcc_1v8>;
        status = "okay";
 };
-
-&uart2 {
-       clock-frequency = <24000000>;
-       bootph-all;
-       status = "okay";
-};

diff --git a/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
index 06cc15ed21b8fda806db6f91fbc646de89f4a868..11976fd3a6e0d4ddd2d3970a523b999b38d15fa7 100644 (file)
--- a/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
@@ -2,12 +2,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &gpio0 {
        bootph-all;
 };
@@ -28,12 +22,6 @@
        };
 };
 
-&uart2 {
-       bootph-all;
-       clock-frequency = <24000000>;
-       status = "okay";
-};
-
 /*
  * U-Boot does not support multiple regulators using the same gpio,
  * use vcc5v0_usb20_host to fix use of USB 2.0 port

diff --git a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
index 3c2c54e941836d988eb5ee6068f3c465d55cb1ae..8de9d1535efbbd7db4ae7b3aa03db28bb5d718af 100644 (file)
--- a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
@@ -2,12 +2,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
@@ -24,12 +18,6 @@
        };
 };
 
-&uart2 {
-       bootph-all;
-       clock-frequency = <24000000>;
-       status = "okay";
-};
-
 &usb_host0_xhci {
        dr_mode = "host";
 };

diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
index c925439f71cdd4497a1da288280a49702fd793b3..158f652cb3b1e3e7276473d680d73a37461b6ed2 100644 (file)
--- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
@@ -5,19 +5,7 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
 };
-
-&uart2 {
-       clock-frequency = <24000000>;
-       bootph-all;
-       status = "okay";
-};

diff --git a/arch/arm/dts/rk3566-soquartz-u-boot.dtsi b/arch/arm/dts/rk3566-soquartz-u-boot.dtsi
index 793cca2ceaca790363385c39fb37629391d5bc96..f65f4067f3e9a099aa311f70dff40838ee7060cc 100644 (file)
--- a/arch/arm/dts/rk3566-soquartz-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-soquartz-u-boot.dtsi
@@ -2,12 +2,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
@@ -15,12 +9,6 @@
        pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };
 
-&uart2 {
-       bootph-all;
-       clock-frequency = <24000000>;
-       status = "okay";
-};
-
 &usb_host0_xhci {
        dr_mode = "host";
 };

diff --git a/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi b/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi
index 60a3b21f2d45d5c3c678c0c359dfd5b3cd8f3bcd..5f4f14b3bdaed4eacf29b72c324d6e7015173694 100644 (file)
--- a/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi
@@ -4,16 +4,3 @@
  */
 
 #include "rk356x-u-boot.dtsi"
-
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
-&uart2 {
-       clock-frequency = <24000000>;
-       bootph-pre-ram;
-       status = "okay";
-};
-

diff --git a/arch/arm/dts/rk3568-evb-u-boot.dtsi b/arch/arm/dts/rk3568-evb-u-boot.dtsi
index 382a52a28b106866d40250133c84c77a88907d3a..5f4f14b3bdaed4eacf29b72c324d6e7015173694 100644 (file)
--- a/arch/arm/dts/rk3568-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-evb-u-boot.dtsi
@@ -4,20 +4,3 @@
  */
 
 #include "rk356x-u-boot.dtsi"
-
-/ {
-       chosen {
-               stdout-path = &uart2;
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci;
-       };
-};
-
-&sdmmc0 {
-       status = "okay";
-};
-
-&uart2 {
-       clock-frequency = <24000000>;
-       bootph-pre-ram;
-       status = "okay";
-};

diff --git a/arch/arm/dts/rk3568-generic-u-boot.dtsi b/arch/arm/dts/rk3568-generic-u-boot.dtsi
index 90022580a13b6797926141377b6775dc2e35bf94..6e8307e3bdf60a6b8afd48275ccc637394c505c0 100644 (file)
--- a/arch/arm/dts/rk3568-generic-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-generic-u-boot.dtsi
@@ -1,14 +1,3 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
 #include "rk356x-u-boot.dtsi"
-
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
-&uart2 {
-       bootph-pre-ram;
-       clock-frequency = <24000000>;
-};

diff --git a/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi b/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
index 27c627752333b933791d8eb313c8d7a4f3b962ff..a44ac35bdacd440ad4d4a0f245fbb3454d520e2a 100644 (file)
--- a/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
@@ -6,12 +6,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
@@ -19,9 +13,3 @@
        mmc-hs400-enhanced-strobe;
        pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };
-
-&uart2 {
-       bootph-all;
-       clock-frequency = <24000000>;
-       status = "okay";
-};

diff --git a/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi b/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
index 880f8ff91fcbe93fc7ea3a9c20c211e0f98d7c9f..62f572c4cf9f8f9714c56f04d6ae972ccbf7d62d 100644 (file)
--- a/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
@@ -8,12 +8,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &pcie3x1 {
        /delete-property/ vpcie3v3-supply;
 };
@@ -27,12 +21,6 @@
        pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
 };
 
-&uart2 {
-       clock-frequency = <24000000>;
-       bootph-all;
-       status = "okay";
-};
-
 &vcc5v0_usb_host {
        /delete-property/ regulator-always-on;
        /delete-property/ regulator-boot-on;

diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
index 0fc360b06df7a99430cd5df11b3d63d4a81b078d..ecba91aa30f522d7841edf205dd35da2e8632aa8 100644 (file)
--- a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
@@ -2,12 +2,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &fspi_dual_io_pins {
        bootph-all;
 };
@@ -29,9 +23,3 @@
                bootph-pre-ram;
        };
 };
-
-&uart2 {
-       bootph-all;
-       clock-frequency = <24000000>;
-       status = "okay";
-};

diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
index 1136f0bb3b814b0cec2763c0f761648bae259f9b..caf524443079100802da47a0c614df556647f68f 100644 (file)
--- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
@@ -2,12 +2,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &pcie3x1 {
        pinctrl-0 = <&pcie30x1_reset_h>;
 };
@@ -28,12 +22,6 @@
        mmc-hs400-enhanced-strobe;
 };
 
-&uart2 {
-       bootph-all;
-       clock-frequency = <24000000>;
-       status = "okay";
-};
-
 &usb_host0_xhci {
        dr_mode = "host";
 };

diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
index b05b7151e6c71e96e0a01d8ecc3e373976925463..46ebb77283f10d3614e75ee2f6ec8685b2d56e1f 100644 (file)
--- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
@@ -6,12 +6,6 @@
 
 #include "rk356x-u-boot.dtsi"
 
-/ {
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
 &pcie3x2 {
        pinctrl-0 = <&pcie3x2_reset_h>;
 };
@@ -48,9 +42,3 @@
                spi-tx-bus-width = <1>;
        };
 };
-
-&uart2 {
-       clock-frequency = <24000000>;
-       bootph-all;
-       status = "okay";
-};

diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
index 354b6958e5721f107f9e74997c1efe0318f3d797..cacd45348a4981dcca8b00052eac8d4242c34275 100644 (file)
--- a/arch/arm/dts/rk356x-u-boot.dtsi
+++ b/arch/arm/dts/rk356x-u-boot.dtsi
@@ -141,6 +141,11 @@
        bootph-pre-ram;
 };
 
+&uart2 {
+       bootph-pre-ram;
+       clock-frequency = <24000000>;
+};
+
 #ifdef CONFIG_ROCKCHIP_SPI_IMAGE
 &binman {
        simple-bin-spi {