2023-12-18 10:57:07

by Andy Yan

[permalink] [raw]
Subject: [PATCH v2 0/3] Fix mainline support for rk3036 kylin board

From: Andy Yan <[email protected]>


When I want to test some patch of inno hdmi driver on
mainline, I found the support of rk3036 kylin board
was broken by somehow:

PATCH 1 is add psci dt node, as we switch to psci for
cpu on/off for many yeas.
PATCH 2 add stdou-path for uart boot console.
PATCH 3 fix the emmc per board rockchip,default-sample-phase property
issue.

Changes in v2:
- Fix typo s/patch/path/
- Change subjet s/arm/ARM/

Andy Yan (3):
ARM: dts: rockchip: Add psci for rk3036
ARM: dts: rockchip: Add stdout-path for rk3036 kylin
ARM: dts: rockchip: Remove rockchip,default-sample-phase from
rk3036.dtsi

arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 4 ++++
arch/arm/boot/dts/rockchip/rk3036.dtsi | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)

--
2.34.1



2023-12-18 10:57:53

by Andy Yan

[permalink] [raw]
Subject: [PATCH v2 3/3] ARM: dts: rockchip: Remove rockchip,default-sample-phase from rk3036.dtsi

From: Andy Yan <[email protected]>

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 <[email protected]>
---

(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";
--
2.34.1


2023-12-19 12:29:48

by Shawn Lin

[permalink] [raw]
Subject: Re: [PATCH v2 3/3] ARM: dts: rockchip: Remove rockchip,default-sample-phase from rk3036.dtsi


On 2023/12/18 18:55, Andy Yan wrote:
> From: Andy Yan <[email protected]>
>
> 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 <[email protected]>
> ---
>

Reviewed-by: Shawn Lin <[email protected]>

> (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";

2023-12-24 19:55:59

by Heiko Stuebner

[permalink] [raw]
Subject: Re: (subset) [PATCH v2 0/3] Fix mainline support for rk3036 kylin board

On Mon, 18 Dec 2023 18:55:20 +0800, Andy Yan wrote:
> From: Andy Yan <[email protected]>
>
>
> When I want to test some patch of inno hdmi driver on
> mainline, I found the support of rk3036 kylin board
> was broken by somehow:
>
> [...]

Applied, thanks!

[2/3] ARM: dts: rockchip: Add stdout-path for rk3036 kylin
commit: 1df4bc6908b2739f7ff28a1775729730d1addf16
[3/3] ARM: dts: rockchip: Remove rockchip,default-sample-phase from rk3036.dtsi
commit: bb0b255fb6f14b1620566d7d32c43adaca09c5e5

Best regards,
--
Heiko Stuebner <[email protected]>