| Message ID | 20231218105523.2478315-4-andyshrk@163.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix mainline support for rk3036 kylin board | expand |
On 2023/12/18 18:55, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This should be a per board property, should not be put in > a soc core dtsi. > > And when this property convert from default-sample-phase > in linux-5.7 by commit 8a385eb57296 ("ARM: dts: rockchip: fix > rockchip,default-sample-phase property names"), the emmc > on rk3036 kylin board get a initialising error: > > [ 4.512797] Freeing unused kernel memory: 8192K > [ 4.519500] mmc_host mmc1: Bus speed (slot 0) = 37125000Hz (slot req 37500000Hz, actual 37125000HZ div = 0) > [ 4.530971] mmc1: error -84 whilst initialising MMC card > [ 4.537277] Run /init as init process > [ 4.550932] mmc_host mmc1: Bus speed (slot 0) = 300000Hz (slot req 300000Hz, actual 300000HZ div = 0) > [ 4.664717] mmc_host mmc1: Bus speed (slot 0) = 37125000Hz (slot req 37500000Hz, actual 37125000HZ div = 0) > [ 4.676156] mmc1: error -84 whilst initialising MMC card > > I think the reason why the emmc on rk3036 kylin board was able > to work before linux-5.7 was that the illegal property was not > correctly identified by the rockchip dw_mmc driver. > > Fixes: faea098e1808 ("ARM: dts: rockchip: add core rk3036 dtsi") > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > --- > Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> > (no changes since v1) > > arch/arm/boot/dts/rockchip/rk3036.dtsi | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi > index 5344803442a1..466952bf9db4 100644 > --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi > +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi > @@ -287,7 +287,6 @@ emmc: mmc@1021c000 { > clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, > <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; > clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; > - rockchip,default-sample-phase = <158>; > disable-wp; > dmas = <&pdma 12>; > dma-names = "rx-tx";
diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi index 5344803442a1..466952bf9db4 100644 --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi @@ -287,7 +287,6 @@ emmc: mmc@1021c000 { clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; - rockchip,default-sample-phase = <158>; disable-wp; dmas = <&pdma 12>; dma-names = "rx-tx";