* [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node @ 2021-07-26 13:15 Dario Binacchi 2021-07-26 13:15 ` [PATCH v2 2/2] dt-bindings: net: can: c_can: convert to json-schema Dario Binacchi 2021-07-27 8:09 ` [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node Tony Lindgren 0 siblings, 2 replies; 4+ messages in thread From: Dario Binacchi @ 2021-07-26 13:15 UTC (permalink / raw) To: linux-kernel Cc: Dario Binacchi, Benoît Cousson, Rob Herring, Tony Lindgren, devicetree, linux-omap Replace clock-name with clock-names. Signed-off-by: Dario Binacchi <dariobin@libero.it> --- (no changes since v1) arch/arm/boot/dts/am437x-l4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi index 40ef3973f2a9..ba58e6b0da1d 100644 --- a/arch/arm/boot/dts/am437x-l4.dtsi +++ b/arch/arm/boot/dts/am437x-l4.dtsi @@ -1595,7 +1595,7 @@ compatible = "ti,am4372-d_can", "ti,am3352-d_can"; reg = <0x0 0x2000>; clocks = <&dcan1_fck>; - clock-name = "fck"; + clock-names = "fck"; syscon-raminit = <&scm_conf 0x644 1>; interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] dt-bindings: net: can: c_can: convert to json-schema 2021-07-26 13:15 [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node Dario Binacchi @ 2021-07-26 13:15 ` Dario Binacchi 2021-07-29 23:40 ` Rob Herring 2021-07-27 8:09 ` [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node Tony Lindgren 1 sibling, 1 reply; 4+ messages in thread From: Dario Binacchi @ 2021-07-26 13:15 UTC (permalink / raw) To: linux-kernel Cc: Dario Binacchi, David S. Miller, Jakub Kicinski, Marc Kleine-Budde, Rob Herring, Wolfgang Grandegger, devicetree, linux-can, netdev Convert the Bosch C_CAN/D_CAN controller device tree binding documentation to json-schema. Document missing properties. Remove "ti,hwmods" as it is no longer used in TI dts. Make "clocks" required as it is used in all dts. Correct nodename in the example. Signed-off-by: Dario Binacchi <dariobin@libero.it> --- Changes in v2: - Drop Documentation references .../bindings/net/can/bosch,c_can.yaml | 83 +++++++++++++++++++ .../devicetree/bindings/net/can/c_can.txt | 65 --------------- 2 files changed, 83 insertions(+), 65 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/can/bosch,c_can.yaml delete mode 100644 Documentation/devicetree/bindings/net/can/c_can.txt diff --git a/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml b/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml new file mode 100644 index 000000000000..f937c37e9199 --- /dev/null +++ b/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/can/bosch,c_can.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Bosch C_CAN/D_CAN controller Device Tree Bindings + +description: Bosch C_CAN/D_CAN controller for CAN bus + +maintainers: + - Dario Binacchi <dariobin@libero.it> + +allOf: + - $ref: can-controller.yaml# + +properties: + compatible: + oneOf: + - enum: + - bosch,c_can + - bosch,d_can + - ti,dra7-d_can + - ti,am3352-d_can + - items: + - enum: + - ti,am4372-d_can + - const: ti,am3352-d_can + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + power-domains: + description: | + Should contain a phandle to a PM domain provider node and an args + specifier containing the DCAN device id value. It's mandatory for + Keystone 2 66AK2G SoCs only. + maxItems: 1 + + clocks: + description: | + CAN functional clock phandle. + maxItems: 1 + + clock-names: + maxItems: 1 + + syscon-raminit: + description: | + Handle to system control region that contains the RAMINIT register, + register offset to the RAMINIT register and the CAN instance number (0 + offset). + +required: + - compatible + - reg + - interrupts + - clocks + +additionalProperties: false + +examples: + - | + can@481d0000 { + compatible = "bosch,d_can"; + reg = <0x481d0000 0x2000>; + interrupts = <55>; + interrupt-parent = <&intc>; + status = "disabled"; + }; + - | + can@0 { + compatible = "ti,am3352-d_can"; + reg = <0x0 0x2000>; + clocks = <&dcan1_fck>; + clock-names = "fck"; + syscon-raminit = <&scm_conf 0x644 1>; + interrupts = <55>; + status = "disabled"; + }; diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt deleted file mode 100644 index 366479806acb..000000000000 --- a/Documentation/devicetree/bindings/net/can/c_can.txt +++ /dev/null @@ -1,65 +0,0 @@ -Bosch C_CAN/D_CAN controller Device Tree Bindings -------------------------------------------------- - -Required properties: -- compatible : Should be "bosch,c_can" for C_CAN controllers and - "bosch,d_can" for D_CAN controllers. - Can be "ti,dra7-d_can", "ti,am3352-d_can" or - "ti,am4372-d_can". -- reg : physical base address and size of the C_CAN/D_CAN - registers map -- interrupts : property with a value describing the interrupt - number - -The following are mandatory properties for DRA7x, AM33xx and AM43xx SoCs only: -- ti,hwmods : Must be "d_can<n>" or "c_can<n>", n being the - instance number - -The following are mandatory properties for Keystone 2 66AK2G SoCs only: -- power-domains : Should contain a phandle to a PM domain provider node - and an args specifier containing the DCAN device id - value. This property is as per the binding, - Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml -- clocks : CAN functional clock phandle. This property is as per the - binding, - Documentation/devicetree/bindings/clock/ti,sci-clk.yaml - -Optional properties: -- syscon-raminit : Handle to system control region that contains the - RAMINIT register, register offset to the RAMINIT - register and the CAN instance number (0 offset). - -Note: "ti,hwmods" field is used to fetch the base address and irq -resources from TI, omap hwmod data base during device registration. -Future plan is to migrate hwmod data base contents into device tree -blob so that, all the required data will be used from device tree dts -file. - -Example: - -Step1: SoC common .dtsi file - - dcan1: d_can@481d0000 { - compatible = "bosch,d_can"; - reg = <0x481d0000 0x2000>; - interrupts = <55>; - interrupt-parent = <&intc>; - status = "disabled"; - }; - -(or) - - dcan1: d_can@481d0000 { - compatible = "bosch,d_can"; - ti,hwmods = "d_can1"; - reg = <0x481d0000 0x2000>; - interrupts = <55>; - interrupt-parent = <&intc>; - status = "disabled"; - }; - -Step 2: board specific .dts file - - &dcan1 { - status = "okay"; - }; -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] dt-bindings: net: can: c_can: convert to json-schema 2021-07-26 13:15 ` [PATCH v2 2/2] dt-bindings: net: can: c_can: convert to json-schema Dario Binacchi @ 2021-07-29 23:40 ` Rob Herring 0 siblings, 0 replies; 4+ messages in thread From: Rob Herring @ 2021-07-29 23:40 UTC (permalink / raw) To: Dario Binacchi Cc: linux-kernel, David S. Miller, Jakub Kicinski, Marc Kleine-Budde, Wolfgang Grandegger, devicetree, linux-can, netdev On Mon, Jul 26, 2021 at 03:15:26PM +0200, Dario Binacchi wrote: > Convert the Bosch C_CAN/D_CAN controller device tree binding > documentation to json-schema. > > Document missing properties. > Remove "ti,hwmods" as it is no longer used in TI dts. > Make "clocks" required as it is used in all dts. > Correct nodename in the example. > > Signed-off-by: Dario Binacchi <dariobin@libero.it> > > --- > > Changes in v2: > - Drop Documentation references > > .../bindings/net/can/bosch,c_can.yaml | 83 +++++++++++++++++++ > .../devicetree/bindings/net/can/c_can.txt | 65 --------------- > 2 files changed, 83 insertions(+), 65 deletions(-) > create mode 100644 Documentation/devicetree/bindings/net/can/bosch,c_can.yaml > delete mode 100644 Documentation/devicetree/bindings/net/can/c_can.txt > > diff --git a/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml b/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml > new file mode 100644 > index 000000000000..f937c37e9199 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/can/bosch,c_can.yaml > @@ -0,0 +1,83 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/net/can/bosch,c_can.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Bosch C_CAN/D_CAN controller Device Tree Bindings > + > +description: Bosch C_CAN/D_CAN controller for CAN bus > + > +maintainers: > + - Dario Binacchi <dariobin@libero.it> > + > +allOf: > + - $ref: can-controller.yaml# > + > +properties: > + compatible: > + oneOf: > + - enum: > + - bosch,c_can > + - bosch,d_can > + - ti,dra7-d_can > + - ti,am3352-d_can > + - items: > + - enum: > + - ti,am4372-d_can > + - const: ti,am3352-d_can > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + power-domains: > + description: | > + Should contain a phandle to a PM domain provider node and an args > + specifier containing the DCAN device id value. It's mandatory for > + Keystone 2 66AK2G SoCs only. > + maxItems: 1 > + > + clocks: > + description: | > + CAN functional clock phandle. > + maxItems: 1 > + > + clock-names: > + maxItems: 1 > + > + syscon-raminit: Needs a type (phandle-array) and size (maxItems: 2) > + description: | > + Handle to system control region that contains the RAMINIT register, > + register offset to the RAMINIT register and the CAN instance number (0 > + offset). > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + > +additionalProperties: false > + > +examples: > + - | > + can@481d0000 { > + compatible = "bosch,d_can"; > + reg = <0x481d0000 0x2000>; > + interrupts = <55>; > + interrupt-parent = <&intc>; > + status = "disabled"; > + }; > + - | > + can@0 { > + compatible = "ti,am3352-d_can"; > + reg = <0x0 0x2000>; > + clocks = <&dcan1_fck>; > + clock-names = "fck"; > + syscon-raminit = <&scm_conf 0x644 1>; > + interrupts = <55>; > + status = "disabled"; > + }; > diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt > deleted file mode 100644 > index 366479806acb..000000000000 > --- a/Documentation/devicetree/bindings/net/can/c_can.txt > +++ /dev/null > @@ -1,65 +0,0 @@ > -Bosch C_CAN/D_CAN controller Device Tree Bindings > -------------------------------------------------- > - > -Required properties: > -- compatible : Should be "bosch,c_can" for C_CAN controllers and > - "bosch,d_can" for D_CAN controllers. > - Can be "ti,dra7-d_can", "ti,am3352-d_can" or > - "ti,am4372-d_can". > -- reg : physical base address and size of the C_CAN/D_CAN > - registers map > -- interrupts : property with a value describing the interrupt > - number > - > -The following are mandatory properties for DRA7x, AM33xx and AM43xx SoCs only: > -- ti,hwmods : Must be "d_can<n>" or "c_can<n>", n being the > - instance number > - > -The following are mandatory properties for Keystone 2 66AK2G SoCs only: > -- power-domains : Should contain a phandle to a PM domain provider node > - and an args specifier containing the DCAN device id > - value. This property is as per the binding, > - Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml > -- clocks : CAN functional clock phandle. This property is as per the > - binding, > - Documentation/devicetree/bindings/clock/ti,sci-clk.yaml > - > -Optional properties: > -- syscon-raminit : Handle to system control region that contains the > - RAMINIT register, register offset to the RAMINIT > - register and the CAN instance number (0 offset). > - > -Note: "ti,hwmods" field is used to fetch the base address and irq > -resources from TI, omap hwmod data base during device registration. > -Future plan is to migrate hwmod data base contents into device tree > -blob so that, all the required data will be used from device tree dts > -file. > - > -Example: > - > -Step1: SoC common .dtsi file > - > - dcan1: d_can@481d0000 { > - compatible = "bosch,d_can"; > - reg = <0x481d0000 0x2000>; > - interrupts = <55>; > - interrupt-parent = <&intc>; > - status = "disabled"; > - }; > - > -(or) > - > - dcan1: d_can@481d0000 { > - compatible = "bosch,d_can"; > - ti,hwmods = "d_can1"; > - reg = <0x481d0000 0x2000>; > - interrupts = <55>; > - interrupt-parent = <&intc>; > - status = "disabled"; > - }; > - > -Step 2: board specific .dts file > - > - &dcan1 { > - status = "okay"; > - }; > -- > 2.17.1 > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node 2021-07-26 13:15 [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node Dario Binacchi 2021-07-26 13:15 ` [PATCH v2 2/2] dt-bindings: net: can: c_can: convert to json-schema Dario Binacchi @ 2021-07-27 8:09 ` Tony Lindgren 1 sibling, 0 replies; 4+ messages in thread From: Tony Lindgren @ 2021-07-27 8:09 UTC (permalink / raw) To: Dario Binacchi Cc: linux-kernel, Benoît Cousson, Rob Herring, devicetree, linux-omap * Dario Binacchi <dariobin@libero.it> [210726 16:15]: > Replace clock-name with clock-names. Applying into fixes with a fixes tag. Thanks, Tony ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-29 23:40 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-26 13:15 [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node Dario Binacchi 2021-07-26 13:15 ` [PATCH v2 2/2] dt-bindings: net: can: c_can: convert to json-schema Dario Binacchi 2021-07-29 23:40 ` Rob Herring 2021-07-27 8:09 ` [PATCH v2 1/2] ARM: dts: am437x-l4: fix typo in can@0 node Tony Lindgren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).