rockchip: rk3328: Add missing bootph-some-ram props

Add bootph-some-ram props to pinctrl nodes related to eMMC, SD-card and
SPI flash to match e.g. RK3308 and RK3399.

Also adjust bootph props for sdio_vcc_pin, pinctrl and uart2m1_xfer.

Fixes: 1e21f5693045 ("rockchip: rk3328: Fix loading FIT from SD-card when booting from eMMC")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
index 4fa170eeaf8d768fee192c1bf534ae65497daf51..d8c79600b659f72ad0d14aca7205cd70c73fde6a 100644 (file)
--- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
@@ -12,7 +12,7 @@
 };
 
 &sdio_vcc_pin {
-       bootph-all;
+       bootph-pre-ram;
 };
 
 &usb20_otg {

diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
index 0a9423cd9c7e00d46ff07e593a77badc16ea6766..b50c1332b8364cfa43ed5890704c3fd037b029e1 100644 (file)
--- a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
@@ -8,9 +8,6 @@
 #include "rk3328-sdram-lpddr3-666.dtsi"
 
 &spi0 {
-       bootph-pre-ram;
-       bootph-some-ram;
-
        flash@0 {
                bootph-pre-ram;
                bootph-some-ram;
@@ -19,18 +16,22 @@
 
 &spi0m2_clk {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_cs0 {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_rx {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_tx {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &usb20_otg {

diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
index 1096821fc5d367f094d47c61a3fc1acc7e0416e6..8ae003bbefd1f2278af54e9f073eb5f8c7867131 100644 (file)
--- a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
@@ -8,9 +8,6 @@
 #include "rk3328-sdram-ddr4-666.dtsi"
 
 &spi0 {
-       bootph-pre-ram;
-       bootph-some-ram;
-
        flash@0 {
                bootph-pre-ram;
                bootph-some-ram;
@@ -19,18 +16,22 @@
 
 &spi0m2_clk {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_cs0 {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_rx {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_tx {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &usb20_otg {

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 551cff6f24f614ad6a3d08aef7f7409ebd5f452f..22f128090f8447079a41796898897724a698e7d4 100644 (file)
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -30,9 +30,6 @@
 };
 
 &spi0 {
-       bootph-pre-ram;
-       bootph-some-ram;
-
        flash@0 {
                bootph-pre-ram;
                bootph-some-ram;
@@ -41,18 +38,22 @@
 
 &spi0m2_clk {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_cs0 {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_rx {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &spi0m2_tx {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &usb20_otg {

diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
index d3608bd0e2b2f16b07e9091b39e171d2809a7ead..0135bc08d4913df45533662b7bd93a3e9db616b6 100644 (file)
--- a/arch/arm/dts/rk3328-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-u-boot.dtsi
@@ -17,7 +17,6 @@
        };
 
        dmc: dmc {
-               bootph-all;
                compatible = "rockchip,rk3328-dmc";
                reg = <0x0 0xff400000 0x0 0x1000
                       0x0 0xff780000 0x0 0x3000
@@ -25,6 +24,7 @@
                       0x0 0xff440000 0x0 0x1000
                       0x0 0xff720000 0x0 0x1000
                       0x0 0xff798000 0x0 0x1000>;
+               bootph-all;
        };
 };
 
@@ -42,14 +42,17 @@
 
 &emmc_bus8 {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &emmc_clk {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &emmc_cmd {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &gpio0 {
@@ -66,10 +69,12 @@
 
 &pcfg_pull_none_8ma {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pcfg_pull_none_12ma {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pcfg_pull_up {
@@ -78,19 +83,21 @@
 
 &pcfg_pull_up_4ma {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pcfg_pull_up_8ma {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pcfg_pull_up_12ma {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pinctrl {
-       bootph-pre-ram;
-       bootph-some-ram;
+       bootph-all;
 };
 
 &sdmmc {
@@ -103,18 +110,22 @@
 
 &sdmmc0_bus4 {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_clk {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_cmd {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_dectn {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0m1_pin {
@@ -127,7 +138,8 @@
 };
 
 &uart2m1_xfer {
-       bootph-all;
+       bootph-pre-sram;
+       bootph-pre-ram;
 };
 
 &vop {