commit 43a808ccd686f7f8ccd10992058d45d0465cb8f2
author Pegorer Massimo <Massimo.Pegorer@vimar.com> Sat Jul 15 10:19:46 2023 +0000
committer Kever Yang <kever.yang@rock-chips.com> Mon Jul 31 14:38:59 2023 +0800
tree a83940fd52f85632cde7b3e9a74103ca666da477
parent f8cc29be26c1995f18de3724a6e42f7b63850205

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

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>

arch/arm/dts/Makefile

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index bd5887b..4379d97 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -119,7 +119,8 @@
 
 dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 	rk3308-evb.dtb \
-	rk3308-roc-cc.dtb
+	rk3308-roc-cc.dtb \
+	rk3308-rock-pi-s.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 	rk3328-evb.dtb \