ARM: dts: imx: add minor fix to pass schema dtb check
Subsystems (2)
PATCH 1/1 ARM: dts: imx: add minor fix to pass schema dtb check
From: Haibo Chen <[email protected]>
Add some fix to pass schema dtb check for fsl-imx-esdhc.yaml
--- arch/arm/boot/dts/imx50.dtsi | 8 ++++---- arch/arm/boot/dts/imx6sl.dtsi | 8 ++++---- arch/arm/boot/dts/imx6sll.dtsi | 6 +++--- arch/arm/boot/dts/imx6sx.dtsi | 8 ++++---- arch/arm/boot/dts/imx6ul.dtsi | 4 ++-- arch/arm/boot/dts/imx6ull.dtsi | 4 ++-- arch/arm/boot/dts/imx7s.dtsi | 6 +++--- arch/arm/boot/dts/imx7ulp.dtsi | 4 ++-- arch/arm/boot/dts/vfxxx.dtsi | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-)
arch/arm/boot/dts/imx50.dtsi +4 -4
@@ -116,7 +116,7 @@ ranges; esdhc1: mmc@50004000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50004000 0x4000>; interrupts = <1>; clocks = <&clks IMX5_CLK_ESDHC1_IPG_GATE>,
@@ -128,7 +128,7 @@ }; esdhc2: mmc@50008000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50008000 0x4000>; interrupts = <2>; clocks = <&clks IMX5_CLK_ESDHC2_IPG_GATE>,
@@ -177,7 +177,7 @@ }; esdhc3: mmc@50020000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50020000 0x4000>; interrupts = <3>; clocks = <&clks IMX5_CLK_ESDHC3_IPG_GATE>,
@@ -189,7 +189,7 @@ }; esdhc4: mmc@50024000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50024000 0x4000>; interrupts = <4>; clocks = <&clks IMX5_CLK_ESDHC4_IPG_GATE>,
arch/arm/boot/dts/imx6sl.dtsi +4 -4
@@ -858,7 +858,7 @@ }; 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>,
@@ -870,7 +870,7 @@ }; 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>,
@@ -882,7 +882,7 @@ }; 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>,
@@ -894,7 +894,7 @@ }; 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>,
arch/arm/boot/dts/imx6sll.dtsi +3 -3
@@ -711,7 +711,7 @@ }; usdhc1: mmc@2190000 { - compatible = "fsl,imx6sll-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sll-usdhc"; reg = <0x02190000 0x4000>; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_USDHC1>,
@@ -725,7 +725,7 @@ }; usdhc2: mmc@2194000 { - compatible = "fsl,imx6sll-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sll-usdhc"; reg = <0x02194000 0x4000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_USDHC2>,
@@ -739,7 +739,7 @@ }; usdhc3: mmc@2198000 { - compatible = "fsl,imx6sll-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sll-usdhc"; reg = <0x02198000 0x4000>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_USDHC3>,
arch/arm/boot/dts/imx6sx.dtsi +4 -4
@@ -967,7 +967,7 @@ }; 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>,
@@ -979,7 +979,7 @@ }; 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>,
@@ -991,7 +991,7 @@ }; 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>,
@@ -1003,7 +1003,7 @@ }; 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>,
arch/arm/boot/dts/imx6ul.dtsi +2 -2
@@ -891,7 +891,7 @@ }; usdhc1: mmc@2190000 { - compatible = "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sx-usdhc"; reg = <0x02190000 0x4000>; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_USDHC1>,
@@ -905,7 +905,7 @@ }; usdhc2: mmc@2194000 { - compatible = "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sx-usdhc"; reg = <0x02194000 0x4000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_USDHC2>,
arch/arm/boot/dts/imx6ull.dtsi +2 -2
@@ -42,11 +42,11 @@ }; &usdhc1 { - compatible = "fsl,imx6ull-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6ull-usdhc"; }; &usdhc2 { - compatible = "fsl,imx6ull-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6ull-usdhc"; }; / {
arch/arm/boot/dts/imx7s.dtsi +3 -3
@@ -1158,7 +1158,7 @@ }; usdhc1: mmc@30b40000 { - compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc"; + compatible = "fsl,imx7d-usdhc"; reg = <0x30b40000 0x10000>; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_IPG_ROOT_CLK>,
@@ -1170,7 +1170,7 @@ }; usdhc2: mmc@30b50000 { - compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc"; + compatible = "fsl,imx7d-usdhc"; reg = <0x30b50000 0x10000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_IPG_ROOT_CLK>,
@@ -1182,7 +1182,7 @@ }; usdhc3: mmc@30b60000 { - compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc"; + compatible = "fsl,imx7d-usdhc"; reg = <0x30b60000 0x10000>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_IPG_ROOT_CLK>,
arch/arm/boot/dts/imx7ulp.dtsi +2 -2
@@ -216,7 +216,7 @@ }; 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>,
@@ -230,7 +230,7 @@ }; 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>,
arch/arm/boot/dts/vfxxx.dtsi +2 -2
@@ -574,7 +574,7 @@ <20000000>; }; - esdhc0: esdhc@400b1000 { + esdhc0: mmc@400b1000 { compatible = "fsl,imx53-esdhc"; reg = <0x400b1000 0x1000>; interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
@@ -585,7 +585,7 @@ status = "disabled"; }; - esdhc1: esdhc@400b2000 { + esdhc1: mmc@400b2000 { compatible = "fsl,imx53-esdhc"; reg = <0x400b2000 0x1000>; interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.17.1
Lucas Stach
NAKAm Mittwoch, dem 18.08.2021 um 17:12 +0800 schrieb [email protected]:
Quoted 3 lines
From: Haibo Chen <[email protected]>
Add some fix to pass schema dtb check for
fsl-imx-esdhc.yaml
Nack.
As far as I can see the controller is functionally compatible to the fallback compatibles (in some cases with reduced functionality, like no HS200) support. Removing those fallback compatibles will break older kernels that don't have support for the new, preferred compatibles and other software like bootloaders that might match to the fallback compatibles, as they don't make use of the extended functionality anyways.
Please fix the schema to accept the valid fallback compatibles.
Regards,
Lucas
Quoted 280 lines
Signed-off-by Haibo Chen <[email protected]>--- arch/arm/boot/dts/imx50.dtsi | 8 ++++---- arch/arm/boot/dts/imx6sl.dtsi | 8 ++++---- arch/arm/boot/dts/imx6sll.dtsi | 6 +++--- arch/arm/boot/dts/imx6sx.dtsi | 8 ++++---- arch/arm/boot/dts/imx6ul.dtsi | 4 ++-- arch/arm/boot/dts/imx6ull.dtsi | 4 ++-- arch/arm/boot/dts/imx7s.dtsi | 6 +++--- arch/arm/boot/dts/imx7ulp.dtsi | 4 ++-- arch/arm/boot/dts/vfxxx.dtsi | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-)arch/arm/boot/dts/imx50.dtsi +4
-4@@ -116,7 +116,7 @@ ranges; esdhc1: mmc@50004000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50004000 0x4000>; interrupts = <1>; clocks = <&clks IMX5_CLK_ESDHC1_IPG_GATE>,@@ -128,7 +128,7 @@ }; esdhc2: mmc@50008000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50008000 0x4000>; interrupts = <2>; clocks = <&clks IMX5_CLK_ESDHC2_IPG_GATE>,@@ -177,7 +177,7 @@ }; esdhc3: mmc@50020000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50020000 0x4000>; interrupts = <3>; clocks = <&clks IMX5_CLK_ESDHC3_IPG_GATE>,@@ -189,7 +189,7 @@ }; esdhc4: mmc@50024000 { - compatible = "fsl,imx50-esdhc", "fsl,imx53-esdhc"; + compatible = "fsl,imx53-esdhc"; reg = <0x50024000 0x4000>; interrupts = <4>; clocks = <&clks IMX5_CLK_ESDHC4_IPG_GATE>,arch/arm/boot/dts/imx6sl.dtsi +4
-4@@ -858,7 +858,7 @@ }; 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>,@@ -870,7 +870,7 @@ }; 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>,@@ -882,7 +882,7 @@ }; 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>,@@ -894,7 +894,7 @@ }; 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>,arch/arm/boot/dts/imx6sll.dtsi +3
-3@@ -711,7 +711,7 @@ }; usdhc1: mmc@2190000 { - compatible = "fsl,imx6sll-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sll-usdhc"; reg = <0x02190000 0x4000>; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_USDHC1>,@@ -725,7 +725,7 @@ }; usdhc2: mmc@2194000 { - compatible = "fsl,imx6sll-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sll-usdhc"; reg = <0x02194000 0x4000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_USDHC2>,@@ -739,7 +739,7 @@ }; usdhc3: mmc@2198000 { - compatible = "fsl,imx6sll-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sll-usdhc"; reg = <0x02198000 0x4000>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_USDHC3>,arch/arm/boot/dts/imx6sx.dtsi +4
-4@@ -967,7 +967,7 @@ }; 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>,@@ -979,7 +979,7 @@ }; 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>,@@ -991,7 +991,7 @@ }; 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>,@@ -1003,7 +1003,7 @@ }; 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>,arch/arm/boot/dts/imx6ul.dtsi +2
-2@@ -891,7 +891,7 @@ }; usdhc1: mmc@2190000 { - compatible = "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sx-usdhc"; reg = <0x02190000 0x4000>; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_USDHC1>,@@ -905,7 +905,7 @@ }; usdhc2: mmc@2194000 { - compatible = "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6sx-usdhc"; reg = <0x02194000 0x4000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_USDHC2>,arch/arm/boot/dts/imx6ull.dtsi +2
-2@@ -42,11 +42,11 @@ }; &usdhc1 { - compatible = "fsl,imx6ull-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6ull-usdhc"; }; &usdhc2 { - compatible = "fsl,imx6ull-usdhc", "fsl,imx6sx-usdhc"; + compatible = "fsl,imx6ull-usdhc"; }; / {arch/arm/boot/dts/imx7s.dtsi +3
-3@@ -1158,7 +1158,7 @@ }; usdhc1: mmc@30b40000 { - compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc"; + compatible = "fsl,imx7d-usdhc"; reg = <0x30b40000 0x10000>; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_IPG_ROOT_CLK>,@@ -1170,7 +1170,7 @@ }; usdhc2: mmc@30b50000 { - compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc"; + compatible = "fsl,imx7d-usdhc"; reg = <0x30b50000 0x10000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_IPG_ROOT_CLK>,@@ -1182,7 +1182,7 @@ }; usdhc3: mmc@30b60000 { - compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc"; + compatible = "fsl,imx7d-usdhc"; reg = <0x30b60000 0x10000>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_IPG_ROOT_CLK>,arch/arm/boot/dts/imx7ulp.dtsi +2
-2@@ -216,7 +216,7 @@ }; 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>,@@ -230,7 +230,7 @@ }; 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>,arch/arm/boot/dts/vfxxx.dtsi +2
-2@@ -574,7 +574,7 @@ <20000000>; }; - esdhc0: esdhc@400b1000 { + esdhc0: mmc@400b1000 { compatible = "fsl,imx53-esdhc"; reg = <0x400b1000 0x1000>; interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;@@ -585,7 +585,7 @@ status = "disabled"; }; - esdhc1: esdhc@400b2000 { + esdhc1: mmc@400b2000 { compatible = "fsl,imx53-esdhc"; reg = <0x400b2000 0x1000>; interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;