diff options
| author | Andy Yan <andy.yan@rock-chips.com> | 2023-12-18 13:55:23 +0300 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2023-12-24 21:49:38 +0300 |
| commit | bb0b255fb6f14b1620566d7d32c43adaca09c5e5 (patch) | |
| tree | 8c97af26699aafe8817f7de5502861277356cea9 /arch/arm/boot | |
| parent | 1df4bc6908b2739f7ff28a1775729730d1addf16 (diff) | |
| download | linux-bb0b255fb6f14b1620566d7d32c43adaca09c5e5.tar.xz | |
ARM: dts: rockchip: Remove rockchip,default-sample-phase from rk3036.dtsi
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>
Link: https://lore.kernel.org/r/20231218105523.2478315-4-andyshrk@163.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/rockchip/rk3036.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi index 2b00109bea6a..04af224005f8 100644 --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi @@ -285,7 +285,6 @@ 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"; |