pull-request: can 2020-11-11

pull-request: can 2020-11-11

[Marc Kleine-Budde]

Hello,

after v5.10-rc1 the flexcan bindings were converted to yaml. This causes
several unneeded regressions on i.MX53 based boards and/or SoC specifying the
fsl,stop-mode property in their flexcan node.

This series fixes these problems by first updating the affected i.MX SoC dtsi
files and then fixing the flexcan yaml binding.

After I got the OK from the DT and fsl people, the plan is to upstream this via
net/master. If this is not an option, I'll send individual patches.

I've marked the servies das v2, as I accidentally sent out a work-in-progress
state of this series.

regards,
Marc

[net v2 1/4] ARM: dts: imx: fix can fsl,stop-mode

[Marc Kleine-Budde]

Since commit:

    d9b081e3fc4b can: flexcan: remove ack_grp and ack_bit handling from driver

the 4th and 5th value of the property "fsl,stop-mode" aren't used anymore. With
the conversion of the flexcan binding to yaml this raises the following error
during dtbs_check:

arch/arm/boot/dts/imx6dl-apf6dev.dt.yaml: flexcan@2090000: fsl,stop-mode:0: [1, 52, 28, 16, 17] is too long
    From schema: Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

This patch fixes the error by removing the obsolete values.

Cc: Shawn Guo <shawnguo@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
 arch/arm/boot/dts/imx6sx.dtsi  | 4 ++--
 arch/arm/boot/dts/imx6ul.dtsi  | 4 ++--
 arch/arm/boot/dts/imx7s.dtsi   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 7a8837cbe21b..bc98b63922b0 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -549,7 +549,7 @@ can1: flexcan@2090000 {
 				clocks = <&clks IMX6QDL_CLK_CAN1_IPG>,
 					 <&clks IMX6QDL_CLK_CAN1_SERIAL>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x34 28 0x10 17>;
+				fsl,stop-mode = <&gpr 0x34 28>;
 				status = "disabled";
 			};
 
@@ -560,7 +560,7 @@ can2: flexcan@2094000 {
 				clocks = <&clks IMX6QDL_CLK_CAN2_IPG>,
 					 <&clks IMX6QDL_CLK_CAN2_SERIAL>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x34 29 0x10 18>;
+				fsl,stop-mode = <&gpr 0x34 29>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index dfdca1804f9f..6c604c38c790 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -463,7 +463,7 @@ flexcan1: can@2090000 {
 				clocks = <&clks IMX6SX_CLK_CAN1_IPG>,
 					 <&clks IMX6SX_CLK_CAN1_SERIAL>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
+				fsl,stop-mode = <&gpr 0x10 1>;
 				status = "disabled";
 			};
 
@@ -474,7 +474,7 @@ flexcan2: can@2094000 {
 				clocks = <&clks IMX6SX_CLK_CAN2_IPG>,
 					 <&clks IMX6SX_CLK_CAN2_SERIAL>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
+				fsl,stop-mode = <&gpr 0x10 2>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index d7d9f3e46b92..713a4bb341db 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -430,7 +430,7 @@ can1: flexcan@2090000 {
 				clocks = <&clks IMX6UL_CLK_CAN1_IPG>,
 					 <&clks IMX6UL_CLK_CAN1_SERIAL>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
+				fsl,stop-mode = <&gpr 0x10 1>;
 				status = "disabled";
 			};
 
@@ -441,7 +441,7 @@ can2: flexcan@2094000 {
 				clocks = <&clks IMX6UL_CLK_CAN2_IPG>,
 					 <&clks IMX6UL_CLK_CAN2_SERIAL>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
+				fsl,stop-mode = <&gpr 0x10 2>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 84d9cc13afb9..b58262acba11 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -971,7 +971,7 @@ flexcan1: can@30a00000 {
 				clocks = <&clks IMX7D_CLK_DUMMY>,
 					<&clks IMX7D_CAN1_ROOT_CLK>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
+				fsl,stop-mode = <&gpr 0x10 1>;
 				status = "disabled";
 			};
 
@@ -982,7 +982,7 @@ flexcan2: can@30a10000 {
 				clocks = <&clks IMX7D_CLK_DUMMY>,
 					<&clks IMX7D_CAN2_ROOT_CLK>;
 				clock-names = "ipg", "per";
-				fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
+				fsl,stop-mode = <&gpr 0x10 2>;
 				status = "disabled";
 			};
 

base-commit: e87d24fce924bfcef9714bbaeb1514162420052e
-- 
2.28.0

[net v2 2/4] ARM: dts: imx: Change flexcan node name to "can"

[Marc Kleine-Budde]

Change i.MX SoCs nand node name from "flexcan" to "can" to be compliant with
yaml schema, it requires the nodename to be "can". This fixes the following
error found by dtbs_check:

arch/arm/boot/dts/imx6dl-apf6dev.dt.yaml: flexcan@2090000: $nodename:0: 'flexcan@2090000' does not match '^can(@.*)?$'
    From schema: Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

Cc: Shawn Guo <shawnguo@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
 arch/arm/boot/dts/imx6ul.dtsi  | 4 ++--
 arch/arm/boot/dts/vfxxx.dtsi   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index bc98b63922b0..7a1d39b58c8b 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -542,7 +542,7 @@ pwm4: pwm@208c000 {
 				status = "disabled";
 			};
 
-			can1: flexcan@2090000 {
+			can1: can@2090000 {
 				compatible = "fsl,imx6q-flexcan";
 				reg = <0x02090000 0x4000>;
 				interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
@@ -553,7 +553,7 @@ can1: flexcan@2090000 {
 				status = "disabled";
 			};
 
-			can2: flexcan@2094000 {
+			can2: can@2094000 {
 				compatible = "fsl,imx6q-flexcan";
 				reg = <0x02094000 0x4000>;
 				interrupts = <0 111 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 713a4bb341db..798a1c2a539e 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -423,7 +423,7 @@ pwm4: pwm@208c000 {
 				status = "disabled";
 			};
 
-			can1: flexcan@2090000 {
+			can1: can@2090000 {
 				compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan";
 				reg = <0x02090000 0x4000>;
 				interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
@@ -434,7 +434,7 @@ can1: flexcan@2090000 {
 				status = "disabled";
 			};
 
-			can2: flexcan@2094000 {
+			can2: can@2094000 {
 				compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan";
 				reg = <0x02094000 0x4000>;
 				interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 2259d11af721..acb1a9040e56 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -95,7 +95,7 @@ edma0: dma-controller@40018000 {
 				status = "disabled";
 			};
 
-			can0: flexcan@40020000 {
+			can0: can@40020000 {
 				compatible = "fsl,vf610-flexcan";
 				reg = <0x40020000 0x4000>;
 				interrupts = <58 IRQ_TYPE_LEVEL_HIGH>;
@@ -681,7 +681,7 @@ fec1: ethernet@400d1000 {
 				status = "disabled";
 			};
 
-			can1: flexcan@400d4000 {
+			can1: can@400d4000 {
 				compatible = "fsl,vf610-flexcan";
 				reg = <0x400d4000 0x4000>;
 				interrupts = <59 IRQ_TYPE_LEVEL_HIGH>;
-- 
2.28.0

[net v2 3/4] dt-bindings: can: fsl,flexcan.yaml: fix compatible for i.MX35 and i.MX53

[Marc Kleine-Budde]

As both the i.MX35 and i.MX53 flexcan IP cores are compatible to the i.MX25,
they are listed as:

    compatible = "fsl,imx35-flexcan", "fsl,imx25-flexcan";

and:

    compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan";

in the SoC device trees.

This patch fixes the following errors, which shows up during a dtbs_check:

arch/arm/boot/dts/imx53-ard.dt.yaml: can@53fc8000: compatible: 'oneOf' conditional failed, one must be fixed:
   ['fsl,imx53-flexcan', 'fsl,imx25-flexcan'] is too long
   Additional items are not allowed ('fsl,imx25-flexcan' was unexpected)
   'fsl,imx53-flexcan' is not one of ['fsl,imx7d-flexcan', 'fsl,imx6ul-flexcan', 'fsl,imx6sx-flexcan']
   'fsl,imx53-flexcan' is not one of ['fsl,ls1028ar1-flexcan']
   'fsl,imx6q-flexcan' was expected
   'fsl,lx2160ar1-flexcan' was expected
   From schema: Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: devicetree@vger.kernel.org
Reported-by: Rob Herring <robh+dt@kernel.org>
Fixes: e5ab9aa7e49b ("dt-bindings: can: flexcan: convert fsl,*flexcan bindings to yaml")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
index 43df15ba8fa4..04127714e704 100644
--- a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
+++ b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
@@ -28,6 +28,11 @@ properties:
           - fsl,vf610-flexcan
           - fsl,ls1021ar2-flexcan
           - fsl,lx2160ar1-flexcan
+      - items:
+          - enum:
+              - fsl,imx53-flexcan
+              - fsl,imx35-flexcan
+          - const: fsl,imx25-flexcan
       - items:
           - enum:
               - fsl,imx7d-flexcan
-- 
2.28.0

[net v2 4/4] dt-bindings: can: fsl,flexcan.yaml: fix fsl,stop-mode

[Marc Kleine-Budde]

The fsl,stop-mode property is a phandle-array and should consist of one phandle
and two 32 bit integers, e.g.:

    fsl,stop-mode = <&gpr 0x34 28>;

This patch fixes the following errors, which shows up during a dtbs_check:

arch/arm/boot/dts/imx6dl-apf6dev.dt.yaml: can@2090000: fsl,stop-mode: [[1, 52, 28]] is too short
    From schema: Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: devicetree@vger.kernel.org
Reported-by: Rob Herring <robh+dt@kernel.org>
Fixes: e5ab9aa7e49b ("dt-bindings: can: flexcan: convert fsl,*flexcan bindings to yaml")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 .../devicetree/bindings/net/can/fsl,flexcan.yaml      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
index 04127714e704..7eca1bf034e6 100644
--- a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
+++ b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
@@ -86,11 +86,12 @@ properties:
       req_bit is the bit offset of CAN stop request.
     $ref: /schemas/types.yaml#/definitions/phandle-array
     items:
-      - description: The 'gpr' is the phandle to general purpose register node.
-      - description: The 'req_gpr' is the gpr register offset of CAN stop request.
-        maximum: 0xff
-      - description: The 'req_bit' is the bit offset of CAN stop request.
-        maximum: 0x1f
+      items:
+        - description: The 'gpr' is the phandle to general purpose register node.
+        - description: The 'req_gpr' is the gpr register offset of CAN stop request.
+          maximum: 0xff
+        - description: The 'req_bit' is the bit offset of CAN stop request.
+          maximum: 0x1f
 
   fsl,clk-source:
     description: |
-- 
2.28.0

Re: pull-request: can 2020-11-11

[Rob Herring]

On Wed, Nov 11, 2020 at 7:05 AM Marc Kleine-Budde <mkl@pengutronix.de> wrote:
>
> Hello,
>
> after v5.10-rc1 the flexcan bindings were converted to yaml. This causes
> several unneeded regressions on i.MX53 based boards and/or SoC specifying the
> fsl,stop-mode property in their flexcan node.
>
> This series fixes these problems by first updating the affected i.MX SoC dtsi
> files and then fixing the flexcan yaml binding.
>
> After I got the OK from the DT and fsl people, the plan is to upstream this via
> net/master. If this is not an option, I'll send individual patches.

There's no need for dts changes to go into 5.10. dtbs_check is nowhere
near warning free yet. They should go via the soc tree. The schema
fixes do need to go in and I can take them. However, all the issues
still aren't fixed:

Documentation/devicetree/bindings/clock/imx5-clock.example.dt.yaml:
can@53fc8000: compatible: 'oneOf' conditional failed, one must be
fixed:
        ['fsl,imx53-flexcan', 'fsl,p1010-flexcan'] is too long
        Additional items are not allowed ('fsl,p1010-flexcan' was unexpected)
        'fsl,imx53-flexcan' is not one of ['fsl,imx7d-flexcan',
'fsl,imx6ul-flexcan', 'fsl,imx6sx-flexcan']
        'fsl,imx53-flexcan' is not one of ['fsl,ls1028ar1-flexcan']
        'fsl,imx25-flexcan' was expected
        'fsl,imx6q-flexcan' was expected
        'fsl,lx2160ar1-flexcan' was expected
        From schema:
/home/rob/proj/git/linux-dt/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

Either the imx5-clock.yaml example needs changing or the schema does.
I'm guessing it's the former. I've applied the 2 schema patches here.

Rob

Re: pull-request: can 2020-11-11

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 2138 bytes --]

On 11/11/20 8:05 PM, Rob Herring wrote:
>> after v5.10-rc1 the flexcan bindings were converted to yaml. This causes
>> several unneeded regressions on i.MX53 based boards and/or SoC specifying the
>> fsl,stop-mode property in their flexcan node.
>>
>> This series fixes these problems by first updating the affected i.MX SoC dtsi
>> files and then fixing the flexcan yaml binding.
>>
>> After I got the OK from the DT and fsl people, the plan is to upstream this via
>> net/master. If this is not an option, I'll send individual patches.
> 
> There's no need for dts changes to go into 5.10. dtbs_check is nowhere
> near warning free yet. They should go via the soc tree. The schema
> fixes do need to go in and I can take them. However, all the issues
> still aren't fixed:

Right, this shows up with the dt_binding_check...

> Documentation/devicetree/bindings/clock/imx5-clock.example.dt.yaml:
> can@53fc8000: compatible: 'oneOf' conditional failed, one must be
> fixed:
>         ['fsl,imx53-flexcan', 'fsl,p1010-flexcan'] is too long
>         Additional items are not allowed ('fsl,p1010-flexcan' was unexpected)
>         'fsl,imx53-flexcan' is not one of ['fsl,imx7d-flexcan',
> 'fsl,imx6ul-flexcan', 'fsl,imx6sx-flexcan']
>         'fsl,imx53-flexcan' is not one of ['fsl,ls1028ar1-flexcan']
>         'fsl,imx25-flexcan' was expected
>         'fsl,imx6q-flexcan' was expected
>         'fsl,lx2160ar1-flexcan' was expected
>         From schema:
> /home/rob/proj/git/linux-dt/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
> 
> Either the imx5-clock.yaml example needs changing or the schema does.
> I'm guessing it's the former. 

Ack. I've created a patch to fix this:

http://lore.kernel.org/r/20201111213548.1621094-1-mkl@pengutronix.de

> I've applied the 2 schema patches here.

Thanks

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [net v2 1/4] ARM: dts: imx: fix can fsl,stop-mode

[Shawn Guo]

On Wed, Nov 11, 2020 at 02:05:04PM +0100, Marc Kleine-Budde wrote:
> Since commit:
> 
>     d9b081e3fc4b can: flexcan: remove ack_grp and ack_bit handling from driver
> 
> the 4th and 5th value of the property "fsl,stop-mode" aren't used anymore. With
> the conversion of the flexcan binding to yaml this raises the following error
> during dtbs_check:
> 
> arch/arm/boot/dts/imx6dl-apf6dev.dt.yaml: flexcan@2090000: fsl,stop-mode:0: [1, 52, 28, 16, 17] is too long
>     From schema: Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
> 
> This patch fixes the error by removing the obsolete values.
> 
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Already applied a patch from Oleksij Rempel [1].

Shawn

[1] https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git/commit/?h=imx/dt64&id=73db215119963918afe446c6cec76e2d421aa33c

Re: [net v2 2/4] ARM: dts: imx: Change flexcan node name to "can"

[Shawn Guo]

On Wed, Nov 11, 2020 at 02:05:05PM +0100, Marc Kleine-Budde wrote:
> Change i.MX SoCs nand node name from "flexcan" to "can" to be compliant with
> yaml schema, it requires the nodename to be "can". This fixes the following
> error found by dtbs_check:
> 
> arch/arm/boot/dts/imx6dl-apf6dev.dt.yaml: flexcan@2090000: $nodename:0: 'flexcan@2090000' does not match '^can(@.*)?$'
>     From schema: Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
> 
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Applied, thanks.