Message ID | 20240430153053.308788-13-jonas@kwiboo.se |
---|---|
State | Accepted |
Commit | 2dfa45a785d2a92073589d3a42214b9b90dd04f4 |
Delegated to: | Kever Yang |
Headers | show |
Series | rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC | expand |
On 2024/4/30 23:30, Jonas Karlman wrote: > Remove superfluous bootph-all props already inherited from main soc > u-boot.dtsi file. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: New patch split from "Fix loading FIT from SD-card" patch > --- > arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 - > arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 2 -- > arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 2 -- > 3 files changed, 5 deletions(-) > > diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi > index 796ac9642399..9df4a02c3e74 100644 > --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi > @@ -38,7 +38,6 @@ > }; > > &sdmmc { > - bootph-all; > bus-width = <4>; > cap-mmc-highspeed; > cap-sd-highspeed; > diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi > index 83b0c44e9ec5..56fdaf440aea 100644 > --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi > @@ -12,12 +12,10 @@ > > &sdhci { > max-frequency = <25000000>; > - bootph-all; > }; > > &sdmmc { > max-frequency = <20000000>; > - bootph-all; > }; > > &spiflash { > diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi > index 5dc7d0db5f73..dcfcec4f3072 100644 > --- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi > @@ -8,10 +8,8 @@ > > &sdhci { > max-frequency = <25000000>; > - bootph-all; > }; > > &sdmmc { > max-frequency = <20000000>; > - bootph-all; > };
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi index 796ac9642399..9df4a02c3e74 100644 --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -38,7 +38,6 @@ }; &sdmmc { - bootph-all; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi index 83b0c44e9ec5..56fdaf440aea 100644 --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi @@ -12,12 +12,10 @@ &sdhci { max-frequency = <25000000>; - bootph-all; }; &sdmmc { max-frequency = <20000000>; - bootph-all; }; &spiflash { diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi index 5dc7d0db5f73..dcfcec4f3072 100644 --- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi +++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi @@ -8,10 +8,8 @@ &sdhci { max-frequency = <25000000>; - bootph-all; }; &sdmmc { max-frequency = <20000000>; - bootph-all; };
Remove superfluous bootph-all props already inherited from main soc u-boot.dtsi file. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: New patch split from "Fix loading FIT from SD-card" patch --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 - arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 2 -- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 2 -- 3 files changed, 5 deletions(-)