changes v3:
- can-controller.yaml: add "additionalProperties: true"
- fsl,flexcan.yaml: remove maxItems and not needed type definition
changes v2:
- add can-controller.yaml for common patterns
- use phandle-array instead of uint32-array
- Drop the outer 'items' in fsl,stop-mode
- use can@ instead of flexcan@
Oleksij Rempel (2):
dt-bindings: can: add can-controller.yaml
dt-bindings: can: flexcan: convert fsl,*flexcan bindings to yaml
.../bindings/net/can/can-controller.yaml | 18 +++
.../bindings/net/can/fsl,flexcan.yaml | 135 ++++++++++++++++++
.../bindings/net/can/fsl-flexcan.txt | 57 --------
3 files changed, 153 insertions(+), 57 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/can/can-controller.yaml
create mode 100644 Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
delete mode 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
--
2.28.0
In order to automate the verification of DT nodes convert
fsl-flexcan.txt to fsl,flexcan.yaml
Signed-off-by: Oleksij Rempel <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Marc Kleine-Budde <[email protected]>
---
.../bindings/net/can/fsl,flexcan.yaml | 135 ++++++++++++++++++
.../bindings/net/can/fsl-flexcan.txt | 57 --------
2 files changed, 135 insertions(+), 57 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
delete mode 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
diff --git a/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
new file mode 100644
index 000000000000..43df15ba8fa4
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
@@ -0,0 +1,135 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/can/fsl,flexcan.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title:
+ Flexcan CAN controller on Freescale's ARM and PowerPC system-on-a-chip (SOC).
+
+maintainers:
+ - Marc Kleine-Budde <[email protected]>
+
+allOf:
+ - $ref: can-controller.yaml#
+
+properties:
+ compatible:
+ oneOf:
+ - enum:
+ - fsl,imx8qm-flexcan
+ - fsl,imx8mp-flexcan
+ - fsl,imx6q-flexcan
+ - fsl,imx53-flexcan
+ - fsl,imx35-flexcan
+ - fsl,imx28-flexcan
+ - fsl,imx25-flexcan
+ - fsl,p1010-flexcan
+ - fsl,vf610-flexcan
+ - fsl,ls1021ar2-flexcan
+ - fsl,lx2160ar1-flexcan
+ - items:
+ - enum:
+ - fsl,imx7d-flexcan
+ - fsl,imx6ul-flexcan
+ - fsl,imx6sx-flexcan
+ - const: fsl,imx6q-flexcan
+ - items:
+ - enum:
+ - fsl,ls1028ar1-flexcan
+ - const: fsl,lx2160ar1-flexcan
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 2
+
+ clock-names:
+ items:
+ - const: ipg
+ - const: per
+
+ clock-frequency:
+ description: |
+ The oscillator frequency driving the flexcan device, filled in by the
+ boot loader. This property should only be used the used operating system
+ doesn't support the clocks and clock-names property.
+
+ xceiver-supply:
+ description: Regulator that powers the CAN transceiver.
+
+ big-endian:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description: |
+ This means the registers of FlexCAN controller are big endian. This is
+ optional property.i.e. if this property is not present in device tree
+ node then controller is assumed to be little endian. If this property is
+ present then controller is assumed to be big endian.
+
+ fsl,stop-mode:
+ description: |
+ Register bits of stop mode control.
+
+ The format should be as follows:
+ <gpr req_gpr req_bit>
+ gpr is the phandle to general purpose register node.
+ req_gpr is the gpr register offset of CAN stop request.
+ 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
+
+ fsl,clk-source:
+ description: |
+ Select the clock source to the CAN Protocol Engine (PE). It's SoC
+ implementation dependent. Refer to RM for detailed definition. If this
+ property is not set in device tree node then driver selects clock source 1
+ by default.
+ 0: clock source 0 (oscillator clock)
+ 1: clock source 1 (peripheral clock)
+ $ref: /schemas/types.yaml#/definitions/uint32
+ default: 1
+ minimum: 0
+ maximum: 1
+
+ wakeup-source:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description:
+ Enable CAN remote wakeup.
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ can@1c000 {
+ compatible = "fsl,p1010-flexcan";
+ reg = <0x1c000 0x1000>;
+ interrupts = <48 0x2>;
+ interrupt-parent = <&mpic>;
+ clock-frequency = <200000000>;
+ fsl,clk-source = <0>;
+ };
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+
+ can@2090000 {
+ compatible = "fsl,imx6q-flexcan";
+ reg = <0x02090000 0x4000>;
+ interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks 1>, <&clks 2>;
+ clock-names = "ipg", "per";
+ fsl,stop-mode = <&gpr 0x34 28>;
+ };
diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
deleted file mode 100644
index e10b6eb955e1..000000000000
--- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-Flexcan CAN controller on Freescale's ARM and PowerPC system-on-a-chip (SOC).
-
-Required properties:
-
-- compatible : Should be "fsl,<processor>-flexcan"
-
- where <processor> is imx8qm, imx6q, imx28, imx53, imx35, imx25, p1010,
- vf610, ls1021ar2, lx2160ar1, ls1028ar1.
-
- The ls1028ar1 must be followed by lx2160ar1, e.g.
- - "fsl,ls1028ar1-flexcan", "fsl,lx2160ar1-flexcan"
-
- An implementation should also claim any of the following compatibles
- that it is fully backwards compatible with:
-
- - fsl,p1010-flexcan
-
-- reg : Offset and length of the register set for this device
-- interrupts : Interrupt tuple for this device
-
-Optional properties:
-
-- clock-frequency : The oscillator frequency driving the flexcan device
-
-- xceiver-supply: Regulator that powers the CAN transceiver
-
-- big-endian: This means the registers of FlexCAN controller are big endian.
- This is optional property.i.e. if this property is not present in
- device tree node then controller is assumed to be little endian.
- if this property is present then controller is assumed to be big
- endian.
-
-- fsl,stop-mode: register bits of stop mode control, the format is
- <&gpr req_gpr req_bit>.
- gpr is the phandle to general purpose register node.
- req_gpr is the gpr register offset of CAN stop request.
- req_bit is the bit offset of CAN stop request.
-
-- fsl,clk-source: Select the clock source to the CAN Protocol Engine (PE).
- It's SoC Implementation dependent. Refer to RM for detailed
- definition. If this property is not set in device tree node
- then driver selects clock source 1 by default.
- 0: clock source 0 (oscillator clock)
- 1: clock source 1 (peripheral clock)
-
-- wakeup-source: enable CAN remote wakeup
-
-Example:
-
- can@1c000 {
- compatible = "fsl,p1010-flexcan";
- reg = <0x1c000 0x1000>;
- interrupts = <48 0x2>;
- interrupt-parent = <&mpic>;
- clock-frequency = <200000000>; // filled in by bootloader
- fsl,clk-source = <0>; // select clock source 0 for PE
- };
--
2.28.0
For now we have only node name as common rule for all CAN controllers
Signed-off-by: Oleksij Rempel <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Marc Kleine-Budde <[email protected]>
---
.../bindings/net/can/can-controller.yaml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/can/can-controller.yaml
diff --git a/Documentation/devicetree/bindings/net/can/can-controller.yaml b/Documentation/devicetree/bindings/net/can/can-controller.yaml
new file mode 100644
index 000000000000..9cf2ae097156
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/can/can-controller.yaml
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/can/can-controller.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: CAN Controller Generic Binding
+
+maintainers:
+ - Marc Kleine-Budde <[email protected]>
+
+properties:
+ $nodename:
+ pattern: "^can(@.*)?$"
+
+additionalProperties: true
+
+...
--
2.28.0
On Thu, 22 Oct 2020 09:52:17 +0200, Oleksij Rempel wrote:
> For now we have only node name as common rule for all CAN controllers
>
> Signed-off-by: Oleksij Rempel <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> ---
> .../bindings/net/can/can-controller.yaml | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/net/can/can-controller.yaml
>
Reviewed-by: Rob Herring <[email protected]>
On Thu, 22 Oct 2020 09:52:18 +0200, Oleksij Rempel wrote:
> In order to automate the verification of DT nodes convert
> fsl-flexcan.txt to fsl,flexcan.yaml
>
> Signed-off-by: Oleksij Rempel <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> ---
> .../bindings/net/can/fsl,flexcan.yaml | 135 ++++++++++++++++++
> .../bindings/net/can/fsl-flexcan.txt | 57 --------
> 2 files changed, 135 insertions(+), 57 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
> delete mode 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
>
Reviewed-by: Rob Herring <[email protected]>
On Thu, Oct 22, 2020 at 2:52 AM Oleksij Rempel <[email protected]> wrote:
>
> In order to automate the verification of DT nodes convert
> fsl-flexcan.txt to fsl,flexcan.yaml
>
> Signed-off-by: Oleksij Rempel <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> ---
> .../bindings/net/can/fsl,flexcan.yaml | 135 ++++++++++++++++++
> .../bindings/net/can/fsl-flexcan.txt | 57 --------
> 2 files changed, 135 insertions(+), 57 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
> delete mode 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
Why did this go into v5.10-rc3? It's not a fix and now a fix is needed:
/builds/robherring/linux-dt-bindings/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,imx6q-flexcan' was expected
'fsl,lx2160ar1-flexcan' was expected
From schema: /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
/builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/net/can/fsl,flexcan.example.dt.yaml:
can@2090000: fsl,stop-mode: [[4294967295, 52, 28]] is too short
From schema: /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
On 11/10/20 4:43 PM, Rob Herring wrote:
> On Thu, Oct 22, 2020 at 2:52 AM Oleksij Rempel <[email protected]> wrote:
>>
>> In order to automate the verification of DT nodes convert
>> fsl-flexcan.txt to fsl,flexcan.yaml
>>
>> Signed-off-by: Oleksij Rempel <[email protected]>
>> Link: https://lore.kernel.org/r/[email protected]
>> Signed-off-by: Marc Kleine-Budde <[email protected]>
>> ---
>> .../bindings/net/can/fsl,flexcan.yaml | 135 ++++++++++++++++++
>> .../bindings/net/can/fsl-flexcan.txt | 57 --------
>> 2 files changed, 135 insertions(+), 57 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
>> delete mode 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
>
> Why did this go into v5.10-rc3? It's not a fix and now a fix is needed:
Sorry, this was against the rules and not a good idea.
> /builds/robherring/linux-dt-bindings/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,imx6q-flexcan' was expected
> 'fsl,lx2160ar1-flexcan' was expected
> From schema: /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
> /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/net/can/fsl,flexcan.example.dt.yaml:
> can@2090000: fsl,stop-mode: [[4294967295, 52, 28]] is too short
> From schema: /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
I've both issues and found two more. See the following thread for details:
http://lore.kernel.org/r/[email protected]
regards,
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 |