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: 1e21f56930 ("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>
This commit is contained in:
Jonas Karlman
2024-05-01 19:21:24 +00:00
committed by Kever Yang
parent 38b666577c
commit 7c35f6d481
5 changed files with 29 additions and 14 deletions

View File

@@ -12,7 +12,7 @@
}; };
&sdio_vcc_pin { &sdio_vcc_pin {
bootph-all; bootph-pre-ram;
}; };
&usb20_otg { &usb20_otg {

View File

@@ -8,9 +8,6 @@
#include "rk3328-sdram-lpddr3-666.dtsi" #include "rk3328-sdram-lpddr3-666.dtsi"
&spi0 { &spi0 {
bootph-pre-ram;
bootph-some-ram;
flash@0 { flash@0 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram; bootph-some-ram;
@@ -19,18 +16,22 @@
&spi0m2_clk { &spi0m2_clk {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_cs0 { &spi0m2_cs0 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_rx { &spi0m2_rx {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_tx { &spi0m2_tx {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&usb20_otg { &usb20_otg {

View File

@@ -8,9 +8,6 @@
#include "rk3328-sdram-ddr4-666.dtsi" #include "rk3328-sdram-ddr4-666.dtsi"
&spi0 { &spi0 {
bootph-pre-ram;
bootph-some-ram;
flash@0 { flash@0 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram; bootph-some-ram;
@@ -19,18 +16,22 @@
&spi0m2_clk { &spi0m2_clk {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_cs0 { &spi0m2_cs0 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_rx { &spi0m2_rx {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_tx { &spi0m2_tx {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&usb20_otg { &usb20_otg {

View File

@@ -30,9 +30,6 @@
}; };
&spi0 { &spi0 {
bootph-pre-ram;
bootph-some-ram;
flash@0 { flash@0 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram; bootph-some-ram;
@@ -41,18 +38,22 @@
&spi0m2_clk { &spi0m2_clk {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_cs0 { &spi0m2_cs0 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_rx { &spi0m2_rx {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&spi0m2_tx { &spi0m2_tx {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&usb20_otg { &usb20_otg {

View File

@@ -17,7 +17,6 @@
}; };
dmc: dmc { dmc: dmc {
bootph-all;
compatible = "rockchip,rk3328-dmc"; compatible = "rockchip,rk3328-dmc";
reg = <0x0 0xff400000 0x0 0x1000 reg = <0x0 0xff400000 0x0 0x1000
0x0 0xff780000 0x0 0x3000 0x0 0xff780000 0x0 0x3000
@@ -25,6 +24,7 @@
0x0 0xff440000 0x0 0x1000 0x0 0xff440000 0x0 0x1000
0x0 0xff720000 0x0 0x1000 0x0 0xff720000 0x0 0x1000
0x0 0xff798000 0x0 0x1000>; 0x0 0xff798000 0x0 0x1000>;
bootph-all;
}; };
}; };
@@ -42,14 +42,17 @@
&emmc_bus8 { &emmc_bus8 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&emmc_clk { &emmc_clk {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&emmc_cmd { &emmc_cmd {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&gpio0 { &gpio0 {
@@ -66,10 +69,12 @@
&pcfg_pull_none_8ma { &pcfg_pull_none_8ma {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&pcfg_pull_none_12ma { &pcfg_pull_none_12ma {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&pcfg_pull_up { &pcfg_pull_up {
@@ -78,19 +83,21 @@
&pcfg_pull_up_4ma { &pcfg_pull_up_4ma {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&pcfg_pull_up_8ma { &pcfg_pull_up_8ma {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&pcfg_pull_up_12ma { &pcfg_pull_up_12ma {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&pinctrl { &pinctrl {
bootph-pre-ram; bootph-all;
bootph-some-ram;
}; };
&sdmmc { &sdmmc {
@@ -103,18 +110,22 @@
&sdmmc0_bus4 { &sdmmc0_bus4 {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&sdmmc0_clk { &sdmmc0_clk {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&sdmmc0_cmd { &sdmmc0_cmd {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&sdmmc0_dectn { &sdmmc0_dectn {
bootph-pre-ram; bootph-pre-ram;
bootph-some-ram;
}; };
&sdmmc0m1_pin { &sdmmc0m1_pin {
@@ -127,7 +138,8 @@
}; };
&uart2m1_xfer { &uart2m1_xfer {
bootph-all; bootph-pre-sram;
bootph-pre-ram;
}; };
&vop { &vop {