Message ID | 20230314003755.512696-3-jonas@kwiboo.se |
---|---|
State | Accepted |
Commit | 42f67fb51cb4f0aa84f39ea755f46686bec9f0b7 |
Delegated to: | Kever Yang |
Headers | show |
Series | rockchip: Fixes for RK3568 and RK3588 and cleanup | expand |
On 2023/3/14 08:38, Jonas Karlman wrote: > The boot source node path for emmc is using the old sdhci name. > Replace with correct mmc name and also add same-as-spl to boot order. > > Fixes: 0d61f8e5f1c0 ("rockchip: rk3568: add boot device detection") > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk356x-u-boot.dtsi | 2 +- > arch/arm/mach-rockchip/rk3568/rk3568.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi > index 23316410496d..04a7b0a0f668 100644 > --- a/arch/arm/dts/rk356x-u-boot.dtsi > +++ b/arch/arm/dts/rk356x-u-boot.dtsi > @@ -12,7 +12,7 @@ > }; > > chosen { > - u-boot,spl-boot-order = &sdhci, &sdmmc0; > + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0; > }; > > dmc: dmc { > diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c > index 4a08820a0937..69ef19cc85af 100644 > --- a/arch/arm/mach-rockchip/rk3568/rk3568.c > +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c > @@ -82,7 +82,7 @@ static struct mm_region rk3568_mem_map[] = { > }; > > const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { > - [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe310000", > + [BROM_BOOTSOURCE_EMMC] = "/mmc@fe310000", > [BROM_BOOTSOURCE_SPINOR] = "/spi@fe300000/flash@0", > [BROM_BOOTSOURCE_SD] = "/mmc@fe2b0000", > };
diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi index 23316410496d..04a7b0a0f668 100644 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@ -12,7 +12,7 @@ }; chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc0; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0; }; dmc: dmc { diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c index 4a08820a0937..69ef19cc85af 100644 --- a/arch/arm/mach-rockchip/rk3568/rk3568.c +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c @@ -82,7 +82,7 @@ static struct mm_region rk3568_mem_map[] = { }; const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe310000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@fe310000", [BROM_BOOTSOURCE_SPINOR] = "/spi@fe300000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe2b0000", };
The boot source node path for emmc is using the old sdhci name. Replace with correct mmc name and also add same-as-spl to boot order. Fixes: 0d61f8e5f1c0 ("rockchip: rk3568: add boot device detection") Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk356x-u-boot.dtsi | 2 +- arch/arm/mach-rockchip/rk3568/rk3568.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)