[PATCH 0/8] various imx6ul DT fixes

[PATCH 0/8] various imx6ul DT fixes

[Alexander Stein]

This patch set fixes several, but not all, dt_binding_check warnings. Some are
missing properties or their format, others address issues regarding to
compatible names. I only touched those where compatibles are stated in the yaml
bindings.
There are several imx6ul compatible names used by imx6ul.dtsi, but which are
not listed in the bindings. Namely:
* "fsl,imx6ul-gpt", "fsl,imx6sx-gpt"
* "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon"
* "fsl,imx6ul-gpc", "fsl,imx6q-gpc"
* "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc"

Despite GPC, the others are apperently compatible to imx6sx. I'm not sure how
to fix the DTB check warning. Add the imx6ul compatible to bindings and drivers?
Or change the .dtsi to use only the imx6sx compatible.

The GPC on imx6ul apparently does only support power gating for ARM CPU, so
this would require actually a new compatible which supports only 1 domain.

Alexander Stein (8):
  ARM: dts: imx6ul: add missing properties for sram
  ARM: dts: imx6ul: change operating-points to uint32-matrix
  ARM: dts: imx6ul: fix keypad compatible
  ARM: dts: imx6ul: fix adc node compatible
  ARM: dts: imx6ul: remove unsupported adc property
  ARM: dts: imx6ul: fix csi node compatible
  ARM: dts: imx6ul: fix lcdif node compatible
  ARM: dts: imx6ul: fix qspi node compatible

 arch/arm/boot/dts/imx6ul.dtsi | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

-- 
2.25.1

[PATCH 1/8] ARM: dts: imx6ul: add missing properties for sram

[Alexander Stein]

All 3 properties are required by sram.yaml. Fixes the dt_binding_check
warning:
sram@900000: '#address-cells' is a required property
sram@900000: '#size-cells' is a required property
sram@900000: 'ranges' is a required property

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index afeec01f6522..1d435a46fc5c 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -149,6 +149,9 @@ soc {
 		ocram: sram@900000 {
 			compatible = "mmio-sram";
 			reg = <0x00900000 0x20000>;
+			ranges = <0 0x00900000 0x20000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 		};
 
 		intc: interrupt-controller@a01000 {
-- 
2.25.1

Re: [PATCH 1/8] ARM: dts: imx6ul: add missing properties for sram

[Shawn Guo]

On Tue, Jan 25, 2022 at 02:50:07PM +0100, Alexander Stein wrote:
> All 3 properties are required by sram.yaml. Fixes the dt_binding_check

I guess it's dtbs_check rather than dt_binding_check?

Shawn

> warning:
> sram@900000: '#address-cells' is a required property
> sram@900000: '#size-cells' is a required property
> sram@900000: 'ranges' is a required property
> 
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> ---
>  arch/arm/boot/dts/imx6ul.dtsi | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> index afeec01f6522..1d435a46fc5c 100644
> --- a/arch/arm/boot/dts/imx6ul.dtsi
> +++ b/arch/arm/boot/dts/imx6ul.dtsi
> @@ -149,6 +149,9 @@ soc {
>  		ocram: sram@900000 {
>  			compatible = "mmio-sram";
>  			reg = <0x00900000 0x20000>;
> +			ranges = <0 0x00900000 0x20000>;
> +			#address-cells = <1>;
> +			#size-cells = <1>;
>  		};
>  
>  		intc: interrupt-controller@a01000 {
> -- 
> 2.25.1
> 

Re: (EXT) Re: [PATCH 1/8] ARM: dts: imx6ul: add missing properties for sram

[Alexander Stein]

Hi Shawn,

Am Freitag, 11. Februar 2022, 04:42:20 CET schrieb Shawn Guo:
> On Tue, Jan 25, 2022 at 02:50:07PM +0100, Alexander Stein wrote:
> > All 3 properties are required by sram.yaml. Fixes the dt_binding_check
> 
> I guess it's dtbs_check rather than dt_binding_check?

You are right. Will fix in a v2.

Regards,
Alexander

> > warning:
> > sram@900000: '#address-cells' is a required property
> > sram@900000: '#size-cells' is a required property
> > sram@900000: 'ranges' is a required property
> > 
> > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> > ---
> > 
> >  arch/arm/boot/dts/imx6ul.dtsi | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> > index afeec01f6522..1d435a46fc5c 100644
> > --- a/arch/arm/boot/dts/imx6ul.dtsi
> > +++ b/arch/arm/boot/dts/imx6ul.dtsi
> > @@ -149,6 +149,9 @@ soc {
> > 
> >  		ocram: sram@900000 {
> >  		
> >  			compatible = "mmio-sram";
> >  			reg = <0x00900000 0x20000>;
> > 
> > +			ranges = <0 0x00900000 0x20000>;
> > +			#address-cells = <1>;
> > +			#size-cells = <1>;
> > 
> >  		};
> >  		
> >  		intc: interrupt-controller@a01000 {

[PATCH 2/8] ARM: dts: imx6ul: change operating-points to uint32-matrix

[Alexander Stein]

operating-points is a uint32-matrix as per opp-v1.yaml. Change it
accordingly. While at it, change fsl,soc-operating-points as well,
although there is no bindings file (yet). But they should have the same
format. Fixes the dt_binding_check warning:
cpu@0: operating-points:0: [696000, 1275000, 528000, 1175000, 396000,
1025000, 198000, 950000] is too long
cpu@0: operating-points:0: Additional items are not allowed (528000,
1175000, 396000, 1025000, 198000, 950000 were unexpected)

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 1d435a46fc5c..2fcbd9d91521 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -64,20 +64,18 @@ cpu0: cpu@0 {
 			clock-frequency = <696000000>;
 			clock-latency = <61036>; /* two CLK32 periods */
 			#cooling-cells = <2>;
-			operating-points = <
+			operating-points =
 				/* kHz	uV */
-				696000	1275000
-				528000	1175000
-				396000	1025000
-				198000	950000
-			>;
-			fsl,soc-operating-points = <
+				<696000	1275000>,
+				<528000	1175000>,
+				<396000	1025000>,
+				<198000	950000>;
+			fsl,soc-operating-points =
 				/* KHz	uV */
-				696000	1275000
-				528000	1175000
-				396000	1175000
-				198000	1175000
-			>;
+				<696000	1275000>,
+				<528000	1175000>,
+				<396000	1175000>,
+				<198000	1175000>;
 			clocks = <&clks IMX6UL_CLK_ARM>,
 				 <&clks IMX6UL_CLK_PLL2_BUS>,
 				 <&clks IMX6UL_CLK_PLL2_PFD2>,
-- 
2.25.1

[PATCH 3/8] ARM: dts: imx6ul: fix keypad compatible

[Alexander Stein]

According to binding, the compatible shall only contain imx6ul and imx21
compatibles. Fixes the dt_binding_check warning:
keypad@20b8000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6ul-kpp', 'fsl,imx6q-kpp', 'fsl,imx21-kpp'] is too long
Additional items are not allowed ('fsl,imx6q-kpp', 'fsl,imx21-kpp' were
unexpected)
Additional items are not allowed ('fsl,imx21-kpp' was unexpected)
'fsl,imx21-kpp' was expected

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 2fcbd9d91521..df8b4ad62418 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -544,7 +544,7 @@ fec2: ethernet@20b4000 {
 			};
 
 			kpp: keypad@20b8000 {
-				compatible = "fsl,imx6ul-kpp", "fsl,imx6q-kpp", "fsl,imx21-kpp";
+				compatible = "fsl,imx6ul-kpp", "fsl,imx21-kpp";
 				reg = <0x020b8000 0x4000>;
 				interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6UL_CLK_KPP>;
-- 
2.25.1

[PATCH 4/8] ARM: dts: imx6ul: fix adc node compatible

[Alexander Stein]

fsl,imx6ul-adc is not listed in the binding, so remove it. Fixes the
dt_binding_check warning:
adc@2198000: compatible:0: 'fsl,vf610-adc' was expected
adc@2198000: compatible: ['fsl,imx6ul-adc', 'fsl,vf610-adc'] is too long
adc@2198000: compatible: Additional items are not allowed ('fsl,vf610-adc'
was unexpected)

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index df8b4ad62418..d6c2b0ad3eac 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -920,7 +920,7 @@ usdhc2: mmc@2194000 {
 			};
 
 			adc1: adc@2198000 {
-				compatible = "fsl,imx6ul-adc", "fsl,vf610-adc";
+				compatible = "fsl,vf610-adc";
 				reg = <0x02198000 0x4000>;
 				interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6UL_CLK_ADC1>;
-- 
2.25.1

Re: [PATCH 4/8] ARM: dts: imx6ul: fix adc node compatible

[Shawn Guo]

On Tue, Jan 25, 2022 at 02:50:10PM +0100, Alexander Stein wrote:
> fsl,imx6ul-adc is not listed in the binding, so remove it. Fixes the
> dt_binding_check warning:
> adc@2198000: compatible:0: 'fsl,vf610-adc' was expected
> adc@2198000: compatible: ['fsl,imx6ul-adc', 'fsl,vf610-adc'] is too long
> adc@2198000: compatible: Additional items are not allowed ('fsl,vf610-adc'
> was unexpected)
> 
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> ---
>  arch/arm/boot/dts/imx6ul.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> index df8b4ad62418..d6c2b0ad3eac 100644
> --- a/arch/arm/boot/dts/imx6ul.dtsi
> +++ b/arch/arm/boot/dts/imx6ul.dtsi
> @@ -920,7 +920,7 @@ usdhc2: mmc@2194000 {
>  			};
>  
>  			adc1: adc@2198000 {
> -				compatible = "fsl,imx6ul-adc", "fsl,vf610-adc";
> +				compatible = "fsl,vf610-adc";

Maybe we should add compatible "fsl,imx6ul-adc" to bindings?

Shawn

>  				reg = <0x02198000 0x4000>;
>  				interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks IMX6UL_CLK_ADC1>;
> -- 
> 2.25.1
> 

Re: (EXT) Re: [PATCH 4/8] ARM: dts: imx6ul: fix adc node compatible

[Alexander Stein]

Am Freitag, 11. Februar 2022, 04:47:07 CET schrieb Shawn Guo:
> On Tue, Jan 25, 2022 at 02:50:10PM +0100, Alexander Stein wrote:
> > fsl,imx6ul-adc is not listed in the binding, so remove it. Fixes the
> > dt_binding_check warning:
> > adc@2198000: compatible:0: 'fsl,vf610-adc' was expected
> > adc@2198000: compatible: ['fsl,imx6ul-adc', 'fsl,vf610-adc'] is too long
> > adc@2198000: compatible: Additional items are not allowed ('fsl,vf610-adc'
> > was unexpected)
> > 
> > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> > ---
> > 
> >  arch/arm/boot/dts/imx6ul.dtsi | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> > index df8b4ad62418..d6c2b0ad3eac 100644
> > --- a/arch/arm/boot/dts/imx6ul.dtsi
> > +++ b/arch/arm/boot/dts/imx6ul.dtsi
> > @@ -920,7 +920,7 @@ usdhc2: mmc@2194000 {
> > 
> >  			};
> >  			
> >  			adc1: adc@2198000 {
> > 
> > -				compatible = "fsl,imx6ul-adc", 
"fsl,vf610-adc";
> > +				compatible = "fsl,vf610-adc";
> 
> Maybe we should add compatible "fsl,imx6ul-adc" to bindings?

In this case "fsl,imx6sx-adc" has to be added as well. I'll do it in a v2.

Regards,
Alexander

> >  				reg = <0x02198000 0x4000>;
> >  				interrupts = <GIC_SPI 100 
IRQ_TYPE_LEVEL_HIGH>;
> >  				clocks = <&clks IMX6UL_CLK_ADC1>;

[PATCH 5/8] ARM: dts: imx6ul: remove unsupported adc property

[Alexander Stein]

'num-channels' is not supported by binding, nor driver, remove it. Fixes
the dt_binding_check warning:
adc@2198000: 'num-channels' does not match any of the regexes:
'pinctrl-[0-9]+'

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index d6c2b0ad3eac..8d7d6cfc2c38 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -924,7 +924,6 @@ adc1: adc@2198000 {
 				reg = <0x02198000 0x4000>;
 				interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6UL_CLK_ADC1>;
-				num-channels = <2>;
 				clock-names = "adc";
 				fsl,adck-max-frequency = <30000000>, <40000000>,
 							 <20000000>;
-- 
2.25.1

[PATCH 6/8] ARM: dts: imx6ul: fix csi node compatible

[Alexander Stein]

"fsl,imx6ul-csi" was never listed as compatible to "fsl,imx7-csi", neither
in yaml bindings, nor previous txt binding. Remove the imx7 part. Fixes
the dt schema check warning:
csi@21c4000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6ul-csi', 'fsl,imx7-csi'] is too long
Additional items are not allowed ('fsl,imx7-csi' was unexpected)
'fsl,imx8mm-csi' was expected

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 8d7d6cfc2c38..e75c2e164551 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -998,7 +998,7 @@ cpu_speed_grade: speed-grade@10 {
 			};
 
 			csi: csi@21c4000 {
-				compatible = "fsl,imx6ul-csi", "fsl,imx7-csi";
+				compatible = "fsl,imx6ul-csi";
 				reg = <0x021c4000 0x4000>;
 				interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6UL_CLK_CSI>;
-- 
2.25.1

[PATCH 7/8] ARM: dts: imx6ul: fix lcdif node compatible

[Alexander Stein]

In yaml binding "fsl,imx6ul-lcdif" is listed as compatible to imx6sx-lcdif,
but not imx28-lcdif. Change the list accordingly. Fixes the
dt_binding_check warning:
lcdif@21c8000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6ul-lcdif', 'fsl,imx28-lcdif'] is too long
Additional items are not allowed ('fsl,imx28-lcdif' was unexpected)
'fsl,imx6ul-lcdif' is not one of ['fsl,imx23-lcdif', 'fsl,imx28-lcdif',
'fsl,imx6sx-lcdif']
'fsl,imx6sx-lcdif' was expected

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index e75c2e164551..4d19ba7cb342 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -1007,7 +1007,7 @@ csi: csi@21c4000 {
 			};
 
 			lcdif: lcdif@21c8000 {
-				compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
+				compatible = "fsl,imx6ul-lcdif", "fsl,imx6sx-lcdif";
 				reg = <0x021c8000 0x4000>;
 				interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6UL_CLK_LCDIF_PIX>,
-- 
2.25.1

[PATCH 8/8] ARM: dts: imx6ul: fix qspi node compatible

[Alexander Stein]

imx6ul is not compatible to imx6sx, both have different erratas.
Fixes the dt_binding_check warning:
spi@21e0000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6ul-qspi', 'fsl,imx6sx-qspi'] is too long
Additional items are not allowed ('fsl,imx6sx-qspi' was unexpected)
'fsl,imx6ul-qspi' is not one of ['fsl,ls1043a-qspi']
'fsl,imx6ul-qspi' is not one of ['fsl,imx8mq-qspi']
'fsl,ls1021a-qspi' was expected
'fsl,imx7d-qspi' was expected

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/imx6ul.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 4d19ba7cb342..36be13bf1439 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -1028,7 +1028,7 @@ pxp: pxp@21cc000 {
 			qspi: spi@21e0000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
-				compatible = "fsl,imx6ul-qspi", "fsl,imx6sx-qspi";
+				compatible = "fsl,imx6ul-qspi";
 				reg = <0x021e0000 0x4000>, <0x60000000 0x10000000>;
 				reg-names = "QuadSPI", "QuadSPI-memory";
 				interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-- 
2.25.1

Re: [PATCH 0/8] various imx6ul DT fixes

[Shawn Guo]

On Tue, Jan 25, 2022 at 02:50:06PM +0100, Alexander Stein wrote:
> This patch set fixes several, but not all, dt_binding_check warnings. Some are
> missing properties or their format, others address issues regarding to
> compatible names. I only touched those where compatibles are stated in the yaml
> bindings.
> There are several imx6ul compatible names used by imx6ul.dtsi, but which are
> not listed in the bindings. Namely:
> * "fsl,imx6ul-gpt", "fsl,imx6sx-gpt"
> * "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon"
> * "fsl,imx6ul-gpc", "fsl,imx6q-gpc"
> * "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc"
> 
> Despite GPC, the others are apperently compatible to imx6sx. I'm not sure how
> to fix the DTB check warning. Add the imx6ul compatible to bindings and drivers?

Add the compatible to bindings, I would say.

Shawn

> Or change the .dtsi to use only the imx6sx compatible.
> 
> The GPC on imx6ul apparently does only support power gating for ARM CPU, so
> this would require actually a new compatible which supports only 1 domain.
> 
> Alexander Stein (8):
>   ARM: dts: imx6ul: add missing properties for sram
>   ARM: dts: imx6ul: change operating-points to uint32-matrix
>   ARM: dts: imx6ul: fix keypad compatible
>   ARM: dts: imx6ul: fix adc node compatible
>   ARM: dts: imx6ul: remove unsupported adc property
>   ARM: dts: imx6ul: fix csi node compatible
>   ARM: dts: imx6ul: fix lcdif node compatible
>   ARM: dts: imx6ul: fix qspi node compatible
> 
>  arch/arm/boot/dts/imx6ul.dtsi | 36 +++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)
> 
> -- 
> 2.25.1
>