mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-24 15:21:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rockchip: rk3308: fix same-as-spl boot order

Browse Source 
Boot devices defined in rk3308.c and in rk3308.dtsi do not match, causing
'same-as-spl' feature not to work. Update DTS definitions, aligning to
Linux kernel DTS and to other Rockchip DTS files, i.e. from dwmmc to mmc.

Add rk3308-rock-pi-s.dtb in dtb-y targets for CONFIG_ROCKCHIP_RK3308.

Signed-off-by: Massimo Pegorer <massimo.pegorer@vimar.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Pegorer Massimo 2023-07-15 10:19:46 +00:00 committed by Kever Yang
parent 1d7e1d09ca
commit ffd41939fe
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/dts/Makefile
View File

@ -119,7 +119,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
dtb-$(CONFIG_ROCKCHIP_RK3308) += \ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
rk3308-evb.dtb \ rk3308-evb.dtb \
rk3308-roc-cc.dtb rk3308-roc-cc.dtb \
rk3308-rock-pi-s.dtb
dtb-$(CONFIG_ROCKCHIP_RK3328) += \ dtb-$(CONFIG_ROCKCHIP_RK3328) += \
rk3328-evb.dtb \ rk3328-evb.dtb \

6
arch/arm/dts/rk3308.dtsi
View File

@ -584,7 +584,7 @@
status = "disabled"; status = "disabled";
}; };
sdmmc: dwmmc@ff480000 { sdmmc: mmc@ff480000 {
compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff480000 0x0 0x4000>; reg = <0x0 0xff480000 0x0 0x4000>;
max-frequency = <150000000>; max-frequency = <150000000>;
@ -599,7 +599,7 @@
status = "disabled"; status = "disabled";
}; };
emmc: dwmmc@ff490000 { emmc: mmc@ff490000 {
compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff490000 0x0 0x4000>; reg = <0x0 0xff490000 0x0 0x4000>;
max-frequency = <150000000>; max-frequency = <150000000>;
@ -612,7 +612,7 @@
status = "disabled"; status = "disabled";
}; };
sdio: dwmmc@ff4a0000 { sdio: mmc@ff4a0000 {
compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff4a0000 0x0 0x4000>; reg = <0x0 0xff4a0000 0x0 0x4000>;
max-frequency = <150000000>; max-frequency = <150000000>;