* [PATCH 1/3] ARM: dts: imx6sx: Remove incorrect mmc fallback compatible
@ 2024-10-23 19:26 Fabio Estevam
2024-10-23 19:26 ` [PATCH 2/3] ARM: dts: imx6sl: " Fabio Estevam
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fabio Estevam @ 2024-10-23 19:26 UTC (permalink / raw)
To: shawnguo
Cc: linux-arm-kernel, robh, krzk+dt, conor+dt, devicetree, imx,
Fabio Estevam
From: Fabio Estevam <festevam@denx.de>
Per fsl-imx-esdhc.yaml, the correct compatible string for i.MX6SX is:
compatible = "fsl,imx6sx-usdhc"
Remove the undocumented "fsl,imx6sl-usdhc" fallback compatible.
This fixes the following dt-schema warnings:
mmc@2198000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too long
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too short
'fsl,imx50-esdhc' was expected
...
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
index b386448486df..a94bebaa858a 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
@@ -998,7 +998,7 @@ mlb: mlb@218c000 {
};
usdhc1: mmc@2190000 {
- compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+ compatible = "fsl,imx6sx-usdhc";
reg = <0x02190000 0x4000>;
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_USDHC1>,
@@ -1012,7 +1012,7 @@ usdhc1: mmc@2190000 {
};
usdhc2: mmc@2194000 {
- compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+ compatible = "fsl,imx6sx-usdhc";
reg = <0x02194000 0x4000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_USDHC2>,
@@ -1026,7 +1026,7 @@ usdhc2: mmc@2194000 {
};
usdhc3: mmc@2198000 {
- compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+ compatible = "fsl,imx6sx-usdhc";
reg = <0x02198000 0x4000>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_USDHC3>,
@@ -1040,7 +1040,7 @@ usdhc3: mmc@2198000 {
};
usdhc4: mmc@219c000 {
- compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+ compatible = "fsl,imx6sx-usdhc";
reg = <0x0219c000 0x4000>;
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_USDHC4>,
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] ARM: dts: imx6sl: Remove incorrect mmc fallback compatible
2024-10-23 19:26 [PATCH 1/3] ARM: dts: imx6sx: Remove incorrect mmc fallback compatible Fabio Estevam
@ 2024-10-23 19:26 ` Fabio Estevam
2024-10-23 19:26 ` [PATCH 3/3] ARM: dts: imx7ulp: " Fabio Estevam
2024-11-01 10:12 ` [PATCH 1/3] ARM: dts: imx6sx: " Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2024-10-23 19:26 UTC (permalink / raw)
To: shawnguo
Cc: linux-arm-kernel, robh, krzk+dt, conor+dt, devicetree, imx,
Fabio Estevam
From: Fabio Estevam <festevam@denx.de>
Per fsl-imx-esdhc.yaml, the correct compatible string for i.MX6SL is:
compatible = "fsl,imx6sl-usdhc"
Remove the undocumented "fsl,imx6q-usdhc" fallback compatible.
This fixes the following dt-schema warnings:
mmc@2190000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too long
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too short
'fsl,imx50-esdhc' was expected
...
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
arch/arm/boot/dts/nxp/imx/imx6sl.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
index 6aa61235e39e..0883dee72bb6 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
@@ -859,7 +859,7 @@ fec: ethernet@2188000 {
};
usdhc1: mmc@2190000 {
- compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ compatible = "fsl,imx6sl-usdhc";
reg = <0x02190000 0x4000>;
interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_USDHC1>,
@@ -871,7 +871,7 @@ usdhc1: mmc@2190000 {
};
usdhc2: mmc@2194000 {
- compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ compatible = "fsl,imx6sl-usdhc";
reg = <0x02194000 0x4000>;
interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_USDHC2>,
@@ -883,7 +883,7 @@ usdhc2: mmc@2194000 {
};
usdhc3: mmc@2198000 {
- compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ compatible = "fsl,imx6sl-usdhc";
reg = <0x02198000 0x4000>;
interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_USDHC3>,
@@ -895,7 +895,7 @@ usdhc3: mmc@2198000 {
};
usdhc4: mmc@219c000 {
- compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+ compatible = "fsl,imx6sl-usdhc";
reg = <0x0219c000 0x4000>;
interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_USDHC4>,
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] ARM: dts: imx7ulp: Remove incorrect mmc fallback compatible
2024-10-23 19:26 [PATCH 1/3] ARM: dts: imx6sx: Remove incorrect mmc fallback compatible Fabio Estevam
2024-10-23 19:26 ` [PATCH 2/3] ARM: dts: imx6sl: " Fabio Estevam
@ 2024-10-23 19:26 ` Fabio Estevam
2024-11-01 10:12 ` [PATCH 1/3] ARM: dts: imx6sx: " Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2024-10-23 19:26 UTC (permalink / raw)
To: shawnguo
Cc: linux-arm-kernel, robh, krzk+dt, conor+dt, devicetree, imx,
Fabio Estevam
From: Fabio Estevam <festevam@denx.de>
Per fsl-imx-esdhc.yaml, the correct compatible string for i.MX7ULP is:
compatible = "fsl,imx7ulp-usdhc"
Remove the undocumented "fsl,imx6sx-usdhc" fallback compatible.
This fixes the following dt-schema warnings:
mmc@2198000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too long
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too short
'fsl,imx50-esdhc' was expected
...
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi b/arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi
index b093f2a447ae..3c6ef7bfba60 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi
@@ -218,7 +218,7 @@ usbphy1: usb-phy@40350000 {
};
usdhc0: mmc@40370000 {
- compatible = "fsl,imx7ulp-usdhc", "fsl,imx6sx-usdhc";
+ compatible = "fsl,imx7ulp-usdhc";
reg = <0x40370000 0x10000>;
interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>,
@@ -232,7 +232,7 @@ usdhc0: mmc@40370000 {
};
usdhc1: mmc@40380000 {
- compatible = "fsl,imx7ulp-usdhc", "fsl,imx6sx-usdhc";
+ compatible = "fsl,imx7ulp-usdhc";
reg = <0x40380000 0x10000>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>,
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] ARM: dts: imx6sx: Remove incorrect mmc fallback compatible
2024-10-23 19:26 [PATCH 1/3] ARM: dts: imx6sx: Remove incorrect mmc fallback compatible Fabio Estevam
2024-10-23 19:26 ` [PATCH 2/3] ARM: dts: imx6sl: " Fabio Estevam
2024-10-23 19:26 ` [PATCH 3/3] ARM: dts: imx7ulp: " Fabio Estevam
@ 2024-11-01 10:12 ` Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2024-11-01 10:12 UTC (permalink / raw)
To: Fabio Estevam
Cc: shawnguo, linux-arm-kernel, robh, krzk+dt, conor+dt, devicetree,
imx, Fabio Estevam
On Wed, Oct 23, 2024 at 04:26:36PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <festevam@denx.de>
>
> Per fsl-imx-esdhc.yaml, the correct compatible string for i.MX6SX is:
>
> compatible = "fsl,imx6sx-usdhc"
>
> Remove the undocumented "fsl,imx6sl-usdhc" fallback compatible.
>
> This fixes the following dt-schema warnings:
>
> mmc@2198000: compatible: 'oneOf' conditional failed, one must be fixed:
> ['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too long
> ['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too short
> 'fsl,imx50-esdhc' was expected
> ...
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied all, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-01 10:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-23 19:26 [PATCH 1/3] ARM: dts: imx6sx: Remove incorrect mmc fallback compatible Fabio Estevam
2024-10-23 19:26 ` [PATCH 2/3] ARM: dts: imx6sl: " Fabio Estevam
2024-10-23 19:26 ` [PATCH 3/3] ARM: dts: imx7ulp: " Fabio Estevam
2024-11-01 10:12 ` [PATCH 1/3] ARM: dts: imx6sx: " Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).