[PATCH v2 0/5] ARM: dts: imx6sl / imx6sll: dtbs_check errors

[PATCH v2 0/5] ARM: dts: imx6sl / imx6sll: dtbs_check errors

[Andreas Kemnade]

Fix some errors found by make dtbs_check during adding of new device trees.
These are not all errors, just the ones which seem clear to me now.

Changes in v2:
- style: correct align in operating points

Andreas Kemnade (5):
  ARM: dts: imx: e60k02: correct led node name
  ARM: dts: imx6sl: fixup of operating points
  ARM: dts: imx6sll: fixup of operating points
  ARM: dts: imx6sl: fix mmc compatibles
  ARM: dts: imx6sll: fix mmc compatibles

 arch/arm/boot/dts/e60k02.dtsi  |  2 +-
 arch/arm/boot/dts/imx6sl.dtsi  | 26 ++++++++++++--------------
 arch/arm/boot/dts/imx6sll.dtsi | 28 +++++++++++++---------------
 3 files changed, 26 insertions(+), 30 deletions(-)

-- 
2.30.2

[PATCH v2 1/5] ARM: dts: imx: e60k02: correct led node name

[Andreas Kemnade]

Only led-X or led are allowed according to bindings definition.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/e60k02.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/e60k02.dtsi b/arch/arm/boot/dts/e60k02.dtsi
index cfb239d5186a..1a49f15f2df2 100644
--- a/arch/arm/boot/dts/e60k02.dtsi
+++ b/arch/arm/boot/dts/e60k02.dtsi
@@ -41,7 +41,7 @@ cover {
 	leds: leds {
 		compatible = "gpio-leds";
 
-		on {
+		led {
 			label = "e60k02:white:on";
 			gpios = <&gpio5 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "timer";
-- 
2.30.2

[PATCH v2 2/5] ARM: dts: imx6sl: fixup of operating points

[Andreas Kemnade]

Make operating point definitions comply with binding
specifications.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/imx6sl.dtsi | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 997b96c1c47b..c7d907c5c352 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -55,18 +55,16 @@ cpu@0 {
 			device_type = "cpu";
 			reg = <0x0>;
 			next-level-cache = <&L2>;
-			operating-points = <
+			operating-points =
 				/* kHz    uV */
-				996000  1275000
-				792000  1175000
-				396000  975000
-			>;
-			fsl,soc-operating-points = <
+				<996000  1275000>,
+				<792000  1175000>,
+				<396000  975000>;
+			fsl,soc-operating-points =
 				/* ARM kHz      SOC-PU uV */
-				996000          1225000
-				792000          1175000
-				396000          1175000
-			>;
+				<996000         1225000>,
+				<792000         1175000>,
+				<396000         1175000>;
 			clock-latency = <61036>; /* two CLK32 periods */
 			#cooling-cells = <2>;
 			clocks = <&clks IMX6SL_CLK_ARM>, <&clks IMX6SL_CLK_PLL2_PFD2>,
-- 
2.30.2

[PATCH v2 3/5] ARM: dts: imx6sll: fixup of operating points

[Andreas Kemnade]

Make operating point definitions comply with binding
specifications.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/imx6sll.dtsi | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 04f8d637a501..d4a000c3dde7 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -51,20 +51,18 @@ cpu0: cpu@0 {
 			device_type = "cpu";
 			reg = <0>;
 			next-level-cache = <&L2>;
-			operating-points = <
+			operating-points =
 				/* kHz    uV */
-				996000  1275000
-				792000  1175000
-				396000  1075000
-				198000	975000
-			>;
-			fsl,soc-operating-points = <
+				<996000  1275000>,
+				<792000  1175000>,
+				<396000  1075000>,
+				<198000	  975000>;
+			fsl,soc-operating-points =
 				/* ARM kHz      SOC-PU uV */
-				996000          1175000
-				792000          1175000
-				396000          1175000
-				198000		1175000
-			>;
+				<996000         1175000>,
+				<792000         1175000>,
+				<396000         1175000>,
+				<198000		1175000>;
 			clock-latency = <61036>; /* two CLK32 periods */
 			#cooling-cells = <2>;
 			clocks = <&clks IMX6SLL_CLK_ARM>,
-- 
2.30.2

[PATCH v2 4/5] ARM: dts: imx6sl: fix mmc compatibles

[Andreas Kemnade]

Binding specification only allows one compatible here.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/imx6sl.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index c7d907c5c352..887d2a80a335 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -856,7 +856,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>,
@@ -868,7 +868,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>,
@@ -880,7 +880,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>,
@@ -892,7 +892,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.30.2

Re: [PATCH v2 4/5] ARM: dts: imx6sl: fix mmc compatibles

[Ahmad Fatoum]

Hello Andreas,

On 24.09.21 11:14, Andreas Kemnade wrote:
> Binding specification only allows one compatible here.

This same change was NACKed by Lucas here:
https://lore.kernel.org/linux-devicetree/72e1194e10ccb4f87aed96265114f0963e805092.camel@pengutronix.de/

I also think the schema should be fixed instead.

Cheers,
Ahmad

> 
> Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
>  arch/arm/boot/dts/imx6sl.dtsi | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index c7d907c5c352..887d2a80a335 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -856,7 +856,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>,
> @@ -868,7 +868,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>,
> @@ -880,7 +880,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>,
> @@ -892,7 +892,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>,
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH v2 4/5] ARM: dts: imx6sl: fix mmc compatibles

[Andreas Kemnade]

Hi Ahmad,

On Sun, 26 Sep 2021 08:54:35 +0200
Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:

> Hello Andreas,
> 
> On 24.09.21 11:14, Andreas Kemnade wrote:
> > Binding specification only allows one compatible here.  
> 
> This same change was NACKed by Lucas here:
> https://lore.kernel.org/linux-devicetree/72e1194e10ccb4f87aed96265114f0963e805092.camel@pengutronix.de/
> 
> I also think the schema should be fixed instead.
> 
well, that argumentation makes sense. Feel free to drop this patch. I
will not repost the series if it is just about dropping patches.

Regards,
Andreas

Re: [PATCH v2 4/5] ARM: dts: imx6sl: fix mmc compatibles

[Krzysztof Kozlowski]

On Sun, 26 Sept 2021 at 20:33, Andreas Kemnade <andreas@kemnade.info> wrote:
>
> Hi Ahmad,
>
> On Sun, 26 Sep 2021 08:54:35 +0200
> Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
>
> > Hello Andreas,
> >
> > On 24.09.21 11:14, Andreas Kemnade wrote:
> > > Binding specification only allows one compatible here.
> >
> > This same change was NACKed by Lucas here:
> > https://lore.kernel.org/linux-devicetree/72e1194e10ccb4f87aed96265114f0963e805092.camel@pengutronix.de/
> >
> > I also think the schema should be fixed instead.
> >
> well, that argumentation makes sense. Feel free to drop this patch. I
> will not repost the series if it is just about dropping patches.

The argument of using a new DTB with an old kernel, therefore
prohibiting changes in new DTB, does not make that much sense, except
when caring about other systems which would like to directly reuse the
DTB... anyway it's not that important to fight over it.

Best regards,
Krzysztof

Re: [PATCH v2 4/5] ARM: dts: imx6sl: fix mmc compatibles

[Andreas Kemnade]

Hi,

On Mon, 27 Sep 2021 09:34:57 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> wrote:

> On Sun, 26 Sept 2021 at 20:33, Andreas Kemnade <andreas@kemnade.info> wrote:
> >
> > Hi Ahmad,
> >
> > On Sun, 26 Sep 2021 08:54:35 +0200
> > Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> >  
> > > Hello Andreas,
> > >
> > > On 24.09.21 11:14, Andreas Kemnade wrote:  
> > > > Binding specification only allows one compatible here.  
> > >
> > > This same change was NACKed by Lucas here:
> > > https://lore.kernel.org/linux-devicetree/72e1194e10ccb4f87aed96265114f0963e805092.camel@pengutronix.de/
> > >
> > > I also think the schema should be fixed instead.
> > >  
> > well, that argumentation makes sense. Feel free to drop this patch. I
> > will not repost the series if it is just about dropping patches.  
> 
> The argument of using a new DTB with an old kernel, therefore
> prohibiting changes in new DTB, does not make that much sense, except
> when caring about other systems which would like to directly reuse the
> DTB... anyway it's not that important to fight over it.
> 
well, I have no strong opinion here, but I want to get rid of that
warning, unecessary noise which might hide real problems.

Regards,
Andreas

Re: [PATCH v2 4/5] ARM: dts: imx6sl: fix mmc compatibles

[Andreas Kemnade]

On Mon, 27 Sep 2021 09:34:57 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> wrote:

> On Sun, 26 Sept 2021 at 20:33, Andreas Kemnade <andreas@kemnade.info> wrote:
> >
> > Hi Ahmad,
> >
> > On Sun, 26 Sep 2021 08:54:35 +0200
> > Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> >  
> > > Hello Andreas,
> > >
> > > On 24.09.21 11:14, Andreas Kemnade wrote:  
> > > > Binding specification only allows one compatible here.  
> > >
> > > This same change was NACKed by Lucas here:
> > > https://lore.kernel.org/linux-devicetree/72e1194e10ccb4f87aed96265114f0963e805092.camel@pengutronix.de/
> > >
> > > I also think the schema should be fixed instead.
> > >  
> > well, that argumentation makes sense. Feel free to drop this patch. I
> > will not repost the series if it is just about dropping patches.  
> 
> The argument of using a new DTB with an old kernel, therefore
> prohibiting changes in new DTB, does not make that much sense, except
> when caring about other systems which would like to directly reuse the
> DTB... anyway it's not that important to fight over it.
> 
hmm, imx6sl_data specifies
ESDHC_FLAG_ERR004536 
imx6sq_data does not specify it.

Than there is  ESDHC_FLAG_STD_TUNING vs. ESDHC_FLAG_MAN_TUNING.
So it the fsl,imx6q-usdhc really a technically valid fallback compatible?

Regards,
Andreas

[PATCH v2 5/5] ARM: dts: imx6sll: fix mmc compatibles

[Andreas Kemnade]

Binding specification only allows one compatible here.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/imx6sll.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index d4a000c3dde7..5c4088893106 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -709,7 +709,7 @@ usbmisc: usbmisc@2184800 {
 			};
 
 			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>,
@@ -723,7 +723,7 @@ usdhc1: mmc@2190000 {
 			};
 
 			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>,
@@ -737,7 +737,7 @@ usdhc2: mmc@2194000 {
 			};
 
 			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>,
-- 
2.30.2

Re: [PATCH v2 0/5] ARM: dts: imx6sl / imx6sll: dtbs_check errors

[Shawn Guo]

On Fri, Sep 24, 2021 at 11:14:34AM +0200, Andreas Kemnade wrote:
> Fix some errors found by make dtbs_check during adding of new device trees.
> These are not all errors, just the ones which seem clear to me now.
> 
> Changes in v2:
> - style: correct align in operating points
> 
> Andreas Kemnade (5):
>   ARM: dts: imx: e60k02: correct led node name
>   ARM: dts: imx6sl: fixup of operating points
>   ARM: dts: imx6sll: fixup of operating points

Applied above, thanks!

>   ARM: dts: imx6sl: fix mmc compatibles
>   ARM: dts: imx6sll: fix mmc compatibles
> 
>  arch/arm/boot/dts/e60k02.dtsi  |  2 +-
>  arch/arm/boot/dts/imx6sl.dtsi  | 26 ++++++++++++--------------
>  arch/arm/boot/dts/imx6sll.dtsi | 28 +++++++++++++---------------
>  3 files changed, 26 insertions(+), 30 deletions(-)
> 
> -- 
> 2.30.2
>