On 2024/1/27 06:14, Jonas Karlman wrote:
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
Thanks, - Kever
arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 7 ------- arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3566-soquartz-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi | 13 ------------- arch/arm/dts/rk3568-evb-u-boot.dtsi | 17 ----------------- arch/arm/dts/rk3568-generic-u-boot.dtsi | 11 ----------- arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 12 ------------ arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 12 ------------ arch/arm/dts/rk356x-u-boot.dtsi | 5 +++++ 14 files changed, 5 insertions(+), 156 deletions(-)
diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi index f986e1941e7f..fa3df73c33db 100644 --- 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;@@ -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 06cc15ed21b8..11976fd3a6e0 100644 --- 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 3c2c54e94183..8de9d1535efb 100644 --- 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 c925439f71cd..158f652cb3b1 100644 --- 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 793cca2ceaca..f65f4067f3e9 100644 --- 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 60a3b21f2d45..5f4f14b3bdae 100644 --- 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 382a52a28b10..5f4f14b3bdae 100644 --- 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 90022580a13b..6e8307e3bdf6 100644 --- 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 27c627752333..a44ac35bdacd 100644 --- 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 880f8ff91fcb..62f572c4cf9f 100644 --- 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 0fc360b06df7..ecba91aa30f5 100644 --- 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 1136f0bb3b81..caf524443079 100644 --- 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 b05b7151e6c7..46ebb77283f1 100644 --- 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 354b6958e572..cacd45348a49 100644 --- 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 {