Skip to contentSkip to conversation

dt-bindings: mmc: imx-esdhc: Change imx8mn and imx8mp compatible fallback

PATCH In review Adam Ford 3 participants 8 messages Mar 23, 2022 – Mar 24, 2022

Subsystems (3)
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/3 dt-bindings: mmc: imx-esdhc: Change imx8mn and imx8mp compatible fallback

The SDHC controller in the imx8mn and imx8mp have the same controller as the imx8mm which is slightly different than that of the imx7d. Using the fallback of the imx8mm enables the controllers to support HS400-ES which is not available on the imx7d.

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +2 -2
index 7dbbcae9485c..d6ea73d76bdd 100644
@@ -39,14 +39,14 @@ properties:
       - items:
           - enum:
               - fsl,imx8mm-usdhc
-              - fsl,imx8mn-usdhc
-              - fsl,imx8mp-usdhc
               - fsl,imx8mq-usdhc
               - fsl,imx8qm-usdhc
               - fsl,imx8qxp-usdhc
           - const: fsl,imx7d-usdhc
       - items:
           - enum:
+              - fsl,imx8mn-usdhc
+              - fsl,imx8mp-usdhc
               - fsl,imx93-usdhc
               - fsl,imx8ulp-usdhc
           - const: fsl,imx8mm-usdhc
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/3 arm64: dts: imx8mn: Enable HS400-ES

The SDHC controller in the imx8mn has the same controller as the imx8mm which supports HS400-ES. Change the compatible fallback to imx8mm to enable it.

arch/arm64/boot/dts/freescale/imx8mn.dtsi +3 -3
index 99f0f5026674..959285c3fee0 100644
@@ -933,7 +933,7 @@ mu: mailbox@30aa0000 {
 			};
 
 			usdhc1: mmc@30b40000 {
-				compatible = "fsl,imx8mn-usdhc", "fsl,imx7d-usdhc";
+				compatible = "fsl,imx8mn-usdhc", "fsl,imx8mm-usdhc";
 				reg = <0x30b40000 0x10000>;
 				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clk IMX8MN_CLK_IPG_ROOT>,
@@ -947,7 +947,7 @@ usdhc1: mmc@30b40000 {
 			};
 
 			usdhc2: mmc@30b50000 {
-				compatible = "fsl,imx8mn-usdhc", "fsl,imx7d-usdhc";
+				compatible = "fsl,imx8mn-usdhc", "fsl,imx8mm-usdhc";
 				reg = <0x30b50000 0x10000>;
 				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clk IMX8MN_CLK_IPG_ROOT>,
@@ -961,7 +961,7 @@ usdhc2: mmc@30b50000 {
 			};
 
 			usdhc3: mmc@30b60000 {
-				compatible = "fsl,imx8mn-usdhc", "fsl,imx7d-usdhc";
+				compatible = "fsl,imx8mn-usdhc", "fsl,imx8mm-usdhc";
 				reg = <0x30b60000 0x10000>;
 				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clk IMX8MN_CLK_IPG_ROOT>,
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 3/3 arm64: dts: imx8mp: Enable HS400-ES

In reply to Adam Ford

The SDHC controller in the imx8mp has the same controller as the imx8mm which supports HS400-ES. Change the compatible fallback to imx8mm to enable it.

arch/arm64/boot/dts/freescale/imx8mp.dtsi +3 -3
index 794d75173cf5..d5ee1520f1fe 100644
@@ -769,7 +769,7 @@ i2c6: i2c@30ae0000 {
 			};
 
 			usdhc1: mmc@30b40000 {
-				compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";
+				compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc";
 				reg = <0x30b40000 0x10000>;
 				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clk IMX8MP_CLK_DUMMY>,
@@ -783,7 +783,7 @@ usdhc1: mmc@30b40000 {
 			};
 
 			usdhc2: mmc@30b50000 {
-				compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";
+				compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc";
 				reg = <0x30b50000 0x10000>;
 				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clk IMX8MP_CLK_DUMMY>,
@@ -797,7 +797,7 @@ usdhc2: mmc@30b50000 {
 			};
 
 			usdhc3: mmc@30b60000 {
-				compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc";
+				compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc";
 				reg = <0x30b60000 0x10000>;
 				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clk IMX8MP_CLK_DUMMY>,
Signature · 1 line
2.34.1
#3 lore raw
In reply to Adam Ford
Quoted 12 lines · Adam Ford

The SDHC controller in the imx8mn and imx8mp have the same controller as the imx8mm which is slightly different than that of the imx7d. Using the fallback of the imx8mm enables the controllers to support HS400-ES which is not available on the imx7d.

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +0 -0
index 7dbbcae9485c..d6ea73d76bdd 100644

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml properties: · line 41

Quoted 3 lines
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +0 -0
@@ -39,14 +39,14 @@ properties:
       - items:
           - enum:
               - fsl,imx8mm-usdhc

Your change looks reasonable, but why imx8mm is compatible with imx7d?

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml properties: · line 52

Quoted 13 lines
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +2 -2
-              - fsl,imx8mn-usdhc
-              - fsl,imx8mp-usdhc
               - fsl,imx8mq-usdhc
               - fsl,imx8qm-usdhc
               - fsl,imx8qxp-usdhc
           - const: fsl,imx7d-usdhc
       - items:
           - enum:
+              - fsl,imx8mn-usdhc
+              - fsl,imx8mp-usdhc
               - fsl,imx93-usdhc
               - fsl,imx8ulp-usdhc
           - const: fsl,imx8mm-usdhc

Best regards,
Krzysztof

author
#4 lore raw
Quoted 9 lines · Krzysztof Kozlowski
Quoted 7 lines · Adam Ford

The SDHC controller in the imx8mn and imx8mp have the same controller as the imx8mm which is slightly different than that of the imx7d. Using the fallback of the imx8mm enables the controllers to support HS400-ES which is not available on the imx7d.

Quoted 10 lines

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml properties: · line 41

Quoted 8 lines
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +0 -0
index 7dbbcae9485c..d6ea73d76bdd 100644
@@ -39,14 +39,14 @@ properties:
       - items:
           - enum:
               - fsl,imx8mm-usdhc

Your change looks reasonable, but why imx8mm is compatible with imx7d?

I saw that, and I wasn't sure the best way to go about fixing it. If I move the 8mm out of the imx7d category, do I need to add it to the enum list associated with the imx8mm, or can I just delete it from the enum leaving the const for imx8mm good enough?

I am not very good with YAML files yet, so please forgive my ignorance.

adam

Quoted 18 lines
Quoted 4 lines
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +0 -2
-              - fsl,imx8mn-usdhc
-              - fsl,imx8mp-usdhc
               - fsl,imx8mq-usdhc

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml properties: · line 52

Quoted 10 lines
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +2 -0
               - fsl,imx8qm-usdhc
               - fsl,imx8qxp-usdhc
           - const: fsl,imx7d-usdhc
       - items:
           - enum:
+              - fsl,imx8mn-usdhc
+              - fsl,imx8mp-usdhc
               - fsl,imx93-usdhc
               - fsl,imx8ulp-usdhc
           - const: fsl,imx8mm-usdhc

Best regards,
Krzysztof

#5 lore raw
Quoted 21 lines · Adam Ford
Quoted 9 lines · Krzysztof Kozlowski
Quoted 7 lines · Adam Ford

The SDHC controller in the imx8mn and imx8mp have the same controller as the imx8mm which is slightly different than that of the imx7d. Using the fallback of the imx8mm enables the controllers to support HS400-ES which is not available on the imx7d.

Quoted 10 lines

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml properties: · line 41

Quoted 8 lines
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +0 -0
index 7dbbcae9485c..d6ea73d76bdd 100644
@@ -39,14 +39,14 @@ properties:
       - items:
           - enum:
               - fsl,imx8mm-usdhc

Your change looks reasonable, but why imx8mm is compatible with imx7d?

Quoted 5 lines

I saw that, and I wasn't sure the best way to go about fixing it. If I move the 8mm out of the imx7d category, do I need to add it to the enum list associated with the imx8mm, or can I just delete it from the enum leaving the const for imx8mm good enough?

The DTS is using:
compatible = "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"
which looks incorrect, based on what you wrote in commit description. Since fsl,imx8mm-usdhc has its own compatibility-group and defines the properties for entire family (imx8mm + imx8mn + imx8mp), then I would assume that either fsl,imx8mm-usdhc is not be compatible with imx7d or everything is compatible with imx7d. IOW, DTS and bindings should be changed to one of following:
1. Everything compatible with imx7d:
compatible = "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; compatible = "fsl,imx8mq-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";

2. A new group:
compatible = "fsl,imx8mm-usdhc";
compatible = "fsl,imx8mq-usdhc", "fsl,imx8mm-usdhc";

Which one, I am not sure. My commit 80fd350b95 organized it in (1) approach, because also that time there was no new group for 8mm (added in commit 431fae8). I assume NXP engineer knows better, so the better solution would be (2). In such case, imx8mm has to be moved to the first enum and all DTS have to be adjusted.

Best regards,
Krzysztof

author
#6 lore raw
Quoted 45 lines · Krzysztof Kozlowski
Quoted 21 lines · Adam Ford
Quoted 9 lines · Krzysztof Kozlowski
Quoted 7 lines · Adam Ford

The SDHC controller in the imx8mn and imx8mp have the same controller as the imx8mm which is slightly different than that of the imx7d. Using the fallback of the imx8mm enables the controllers to support HS400-ES which is not available on the imx7d.

Quoted 10 lines

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml properties: · line 41

Quoted 8 lines
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +0 -0
index 7dbbcae9485c..d6ea73d76bdd 100644
@@ -39,14 +39,14 @@ properties:
       - items:
           - enum:
               - fsl,imx8mm-usdhc

Your change looks reasonable, but why imx8mm is compatible with imx7d?

Quoted 5 lines

I saw that, and I wasn't sure the best way to go about fixing it. If I move the 8mm out of the imx7d category, do I need to add it to the enum list associated with the imx8mm, or can I just delete it from the enum leaving the const for imx8mm good enough?

The DTS is using:
compatible = "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"
which looks incorrect, based on what you wrote in commit description. Since fsl,imx8mm-usdhc has its own compatibility-group and defines the properties for entire family (imx8mm + imx8mn + imx8mp), then I would assume that either fsl,imx8mm-usdhc is not be compatible with imx7d or everything is compatible with imx7d. IOW, DTS and bindings should be changed to one of following:
1. Everything compatible with imx7d:
compatible = "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; compatible = "fsl,imx8mq-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";

2. A new group:
compatible = "fsl,imx8mm-usdhc";
compatible = "fsl,imx8mq-usdhc", "fsl,imx8mm-usdhc";

Quoted 5 lines

Which one, I am not sure. My commit 80fd350b95 organized it in (1) approach, because also that time there was no new group for 8mm (added in commit 431fae8). I assume NXP engineer knows better, so the better solution would be (2). In such case, imx8mm has to be moved to the first enum and all DTS have to be adjusted.

I pulled NXP's downtream kernel based on 5.15.y, and grepped the code for imx8mm-usdhc. It looks like the imx8mm, imx8mn, imx8mp, and imx8ulp use the imx8mm compatible flag.
The imx8mq uses the older imx7d. I'll do a second revision later today or tomorrow. Looking inside the driver, it appears there are some other quirks that different between the imx7d and imx8mm beyond just support for HS400-ES, so I think your option 2 is appropriate. Hopefully someone from NXP can comment.

adam

Quoted 4 lines

Best regards,
Krzysztof

#7 lore raw
Quoted 74 lines

-----Original Message-----
From: Adam Ford [mailto:[email protected]]
Sent: 2022年3月24日 1:23
To: Krzysztof Kozlowski <[email protected]>
Cc: arm-soc <[email protected]>; Adam Ford-BE <[email protected]>; Ulf Hansson <[email protected]>; Rob Herring <[email protected]>; Krzysztof Kozlowski <[email protected]>; Shawn Guo <[email protected]>; Sascha Hauer <[email protected]>; Pengutronix Kernel Team <[email protected]>; Fabio Estevam <[email protected]>; dl-linux-imx <[email protected]>; linux-mmc <[email protected]>; devicetree <[email protected]>; Linux Kernel Mailing List <[email protected]>
Subject: Re: [PATCH 1/3] dt-bindings: mmc: imx-esdhc: Change imx8mn and imx8mp compatible fallback

Quoted 3 lines · Krzysztof Kozlowski
Quoted 1 line · Adam Ford

On Wed, Mar 23, 2022 at 8:56 AM Krzysztof Kozlowski <[email protected]>

Quoted 4 lines · wrote:
Quoted 4 lines
Quoted 4 lines · Adam Ford
Quoted 2 lines

The SDHC controller in the imx8mn and imx8mp have the same controller as the imx8mm which is slightly different than that of the

imx7d.

Quoted 41 lines
Quoted 18 lines
Quoted 5 lines
Quoted 5 lines

Using the fallback of the imx8mm enables the controllers to support HS400-ES which is not available on the imx7d.

Quoted 12 lines

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml properties: · line 41

Quoted 10 lines

diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml index 7dbbcae9485c..d6ea73d76bdd 100644

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +0 -0
@@ -39,14 +39,14 @@ properties:
       - items:
           - enum:
               - fsl,imx8mm-usdhc

Your change looks reasonable, but why imx8mm is compatible with imx7d?

Quoted 5 lines

I saw that, and I wasn't sure the best way to go about fixing it. If I move the 8mm out of the imx7d category, do I need to add it to the enum list associated with the imx8mm, or can I just delete it from the enum leaving the const for imx8mm good enough?

The DTS is using:
compatible = "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"
which looks incorrect, based on what you wrote in commit description. Since fsl,imx8mm-usdhc has its own compatibility-group and defines the properties for entire family (imx8mm + imx8mn + imx8mp), then I would assume that either fsl,imx8mm-usdhc is not be compatible with imx7d or everything is compatible with imx7d. IOW, DTS and bindings should be changed to one of following:
1. Everything compatible with imx7d:
compatible = "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; compatible = "fsl,imx8mq-usdhc", "fsl,imx8mm-usdhc",
"fsl,imx7d-usdhc";

2. A new group:
compatible = "fsl,imx8mm-usdhc";
compatible = "fsl,imx8mq-usdhc", "fsl,imx8mm-usdhc";

Quoted 5 lines

Which one, I am not sure. My commit 80fd350b95 organized it in (1) approach, because also that time there was no new group for 8mm (added in commit 431fae8). I assume NXP engineer knows better, so the better solution would be (2). In such case, imx8mm has to be moved to the first enum and all DTS have to be adjusted.

Quoted 9 lines

I pulled NXP's downtream kernel based on 5.15.y, and grepped the code for imx8mm-usdhc. It looks like the imx8mm, imx8mn, imx8mp, and imx8ulp use the imx8mm compatible flag.
The imx8mq uses the older imx7d. I'll do a second revision later today or tomorrow. Looking inside the driver, it appears there are some other quirks that different between the imx7d and imx8mm beyond just support for HS400-ES, so I think your option 2 is appropriate.
Hopefully someone from NXP can comment.

I think better to change like this, and dts need change accordingly.

compatible:
oneOf:
- enum:
- fsl,imx25-esdhc
- fsl,imx35-esdhc
- fsl,imx51-esdhc
- fsl,imx53-esdhc
- fsl,imx6q-usdhc
- fsl,imx6sl-usdhc
- fsl,imx6sll-usdhc
- fsl,imx6sx-usdhc
- fsl,imx6ull-usdhc
- fsl,imx7d-usdhc
- fsl,imx7ulp-usdhc
- fsl,imxrt1050-usdhc
- fsl,imx8mm-usdhc
- fsl,imx8qxp-usdhc
- nxp,s32g2-usdhc
- items:
- enum:
- fsl,imx8mq-usdhc
- const: fsl,imx7d-usdhc
- items:
- enum:
- fsl,imx93-usdhc
- fsl,imx8ulp-usdhc
- fsl,imx8mn-usdhc
- fsl,imx8mp-usdhc
- const: fsl,imx8mm-usdhc
- items:
- enum:
- fsl,imx8qm-usdhc
- const: fsl,imx8qxp-usdhc

Best Regards
Haibo Chen

Quoted 5 lines

adam

Quoted 4 lines

Best regards,
Krzysztof