[PATCH v2 0/2] Fix emmc hs400 mode on mt7986

[PATCH v2 0/2] Fix emmc hs400 mode on mt7986

[Frank Wunderlich]

From: Frank Wunderlich <frank-w@public-files.de>

Eric boots linux directly from ATF without using uboot. In this corner
case clocks for emmc hs400 mode are not correctly setup.

Fix this by adding assigned-clocks and assigned.clock-parents to mmc node.

Eric Woudstra (1):
  arm64: dts: mt7986: fix emmc hs400 mode without uboot initialization

Frank Wunderlich (1):
  dt-bindings: mmc: mtk-sd: drop assigned-clocks/clock-parents

 Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 ----------
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi         |  4 ++++
 2 files changed, 4 insertions(+), 10 deletions(-)

-- 
2.34.1

[PATCH v2 1/2] dt-bindings: mmc: mtk-sd: drop assigned-clocks/clock-parents

[Frank Wunderlich]

From: Frank Wunderlich <frank-w@public-files.de>

MT7986 has 2 clock-parents and these properties are not needed in driver
binding. So drop them completely.

Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
v2:
- drop assigned-clock* completely based on discussion with Krzysztof in v1
---
 Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
index 46eefdd19a2c..3fffa467e4e1 100644
--- a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
+++ b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
@@ -91,16 +91,6 @@ properties:
       should switch dat1 pin to GPIO mode.
     maxItems: 1
 
-  assigned-clocks:
-    description:
-      PLL of the source clock.
-    maxItems: 1
-
-  assigned-clock-parents:
-    description:
-      parent of source clock, used for HS400 mode to get 400Mhz source clock.
-    maxItems: 1
-
   hs400-ds-delay:
     $ref: /schemas/types.yaml#/definitions/uint32
     description:
-- 
2.34.1

[PATCH v2 2/2] arm64: dts: mt7986: fix emmc hs400 mode without uboot initialization

[Frank Wunderlich]

From: Eric Woudstra <ericwouds@gmail.com>

Eric reports errors on emmc with hs400 mode when booting linux on bpi-r3
without uboot [1]. Booting with uboot does not show this because clocks
seem to be initialized by uboot.

Fix this by adding assigned-clocks and assigned-clock-parents like it's
done in uboot [2].

[1] https://forum.banana-pi.org/t/bpi-r3-kernel-fails-setting-emmc-clock-to-416m-depends-on-u-boot/15170
[2] https://github.com/u-boot/u-boot/blob/master/arch/arm/dts/mt7986.dtsi#L287

Cc: stable@vger.kernel.org
Fixes: 513b49d19b34 ("arm64: dts: mt7986: add mmc related device nodes")
Signed-off-by: Eric Woudstra <ericwouds@gmail.com>
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
index 68539ea788df..207510abda89 100644
--- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
@@ -374,6 +374,10 @@ mmc0: mmc@11230000 {
 			reg = <0 0x11230000 0 0x1000>,
 			      <0 0x11c20000 0 0x1000>;
 			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+			assigned-clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
+					  <&topckgen CLK_TOP_EMMC_250M_SEL>;
+			assigned-clock-parents = <&apmixedsys CLK_APMIXED_MPLL>,
+						 <&topckgen CLK_TOP_NET1PLL_D5_D2>;
 			clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
 				 <&infracfg CLK_INFRA_MSDC_HCK_CK>,
 				 <&infracfg CLK_INFRA_MSDC_CK>,
-- 
2.34.1

Re: [PATCH v2 1/2] dt-bindings: mmc: mtk-sd: drop assigned-clocks/clock-parents

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

On Thu, Jun 29, 2023 at 08:43:17PM +0200, Frank Wunderlich wrote:
> From: Frank Wunderlich <frank-w@public-files.de>
> 
> MT7986 has 2 clock-parents and these properties are not needed in driver
> binding. So drop them completely.
> 
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Cheers,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2 1/2] dt-bindings: mmc: mtk-sd: drop assigned-clocks/clock-parents

[Ulf Hansson]

On Thu, 29 Jun 2023 at 20:43, Frank Wunderlich <linux@fw-web.de> wrote:
>
> From: Frank Wunderlich <frank-w@public-files.de>
>
> MT7986 has 2 clock-parents and these properties are not needed in driver
> binding. So drop them completely.
>
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>

Applied for next, thanks!

Kind regards
Uffe


> ---
> v2:
> - drop assigned-clock* completely based on discussion with Krzysztof in v1
> ---
>  Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 ----------
>  1 file changed, 10 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
> index 46eefdd19a2c..3fffa467e4e1 100644
> --- a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
> +++ b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
> @@ -91,16 +91,6 @@ properties:
>        should switch dat1 pin to GPIO mode.
>      maxItems: 1
>
> -  assigned-clocks:
> -    description:
> -      PLL of the source clock.
> -    maxItems: 1
> -
> -  assigned-clock-parents:
> -    description:
> -      parent of source clock, used for HS400 mode to get 400Mhz source clock.
> -    maxItems: 1
> -
>    hs400-ds-delay:
>      $ref: /schemas/types.yaml#/definitions/uint32
>      description:
> --
> 2.34.1
>

Aw: [PATCH v2 2/2] arm64: dts: mt7986: fix emmc hs400 mode without uboot initialization

[Frank Wunderlich]

Hi,

just a friendly reminder, patch seems not applied to next.

dt-binding part is reported as applied

regards Frank


> Gesendet: Donnerstag, 29. Juni 2023 um 20:43 Uhr
> Von: "Frank Wunderlich" <linux@fw-web.de>
> An: linux-mediatek@lists.infradead.org
> Cc: "Frank Wunderlich" <frank-w@public-files.de>, "Chaotian Jing" <chaotian.jing@mediatek.com>, "Ulf Hansson" <ulf.hansson@linaro.org>, "Rob Herring" <robh+dt@kernel.org>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Conor Dooley" <conor+dt@kernel.org>, "Matthias Brugger" <matthias.bgg@gmail.com>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, "Wenbin Mei" <wenbin.mei@mediatek.com>, "Sam Shih" <sam.shih@mediatek.com>, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "Eric Woudstra" <ericwouds@gmail.com>, stable@vger.kernel.org
> Betreff: [PATCH v2 2/2] arm64: dts: mt7986: fix emmc hs400 mode without uboot initialization
>
> From: Eric Woudstra <ericwouds@gmail.com>
>
> Eric reports errors on emmc with hs400 mode when booting linux on bpi-r3
> without uboot [1]. Booting with uboot does not show this because clocks
> seem to be initialized by uboot.
>
> Fix this by adding assigned-clocks and assigned-clock-parents like it's
> done in uboot [2].
>
> [1] https://forum.banana-pi.org/t/bpi-r3-kernel-fails-setting-emmc-clock-to-416m-depends-on-u-boot/15170
> [2] https://github.com/u-boot/u-boot/blob/master/arch/arm/dts/mt7986.dtsi#L287
>
> Cc: stable@vger.kernel.org
> Fixes: 513b49d19b34 ("arm64: dts: mt7986: add mmc related device nodes")
> Signed-off-by: Eric Woudstra <ericwouds@gmail.com>
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> ---
>  arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
> index 68539ea788df..207510abda89 100644
> --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
> @@ -374,6 +374,10 @@ mmc0: mmc@11230000 {
>  			reg = <0 0x11230000 0 0x1000>,
>  			      <0 0x11c20000 0 0x1000>;
>  			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
> +			assigned-clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
> +					  <&topckgen CLK_TOP_EMMC_250M_SEL>;
> +			assigned-clock-parents = <&apmixedsys CLK_APMIXED_MPLL>,
> +						 <&topckgen CLK_TOP_NET1PLL_D5_D2>;
>  			clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
>  				 <&infracfg CLK_INFRA_MSDC_HCK_CK>,
>  				 <&infracfg CLK_INFRA_MSDC_CK>,
> --
> 2.34.1
>
>

Re: [PATCH v2 2/2] arm64: dts: mt7986: fix emmc hs400 mode without uboot initialization

[AngeloGioacchino Del Regno]

Il 29/06/23 20:43, Frank Wunderlich ha scritto:
> From: Eric Woudstra <ericwouds@gmail.com>
> 
> Eric reports errors on emmc with hs400 mode when booting linux on bpi-r3
> without uboot [1]. Booting with uboot does not show this because clocks
> seem to be initialized by uboot.
> 
> Fix this by adding assigned-clocks and assigned-clock-parents like it's
> done in uboot [2].
> 
> [1] https://forum.banana-pi.org/t/bpi-r3-kernel-fails-setting-emmc-clock-to-416m-depends-on-u-boot/15170
> [2] https://github.com/u-boot/u-boot/blob/master/arch/arm/dts/mt7986.dtsi#L287
> 
> Cc: stable@vger.kernel.org
> Fixes: 513b49d19b34 ("arm64: dts: mt7986: add mmc related device nodes")
> Signed-off-by: Eric Woudstra <ericwouds@gmail.com>
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>