* [PATCH v2 0/2] dt-bindings: net: meson-dwmac: convert to yaml @ 2019-08-06 12:50 Neil Armstrong 2019-08-06 12:50 ` [PATCH v2 1/2] dt-bindings: net: snps, dwmac: update reg minItems maxItems Neil Armstrong 2019-08-06 12:50 ` [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong 0 siblings, 2 replies; 7+ messages in thread From: Neil Armstrong @ 2019-08-06 12:50 UTC (permalink / raw) To: robh+dt Cc: devicetree, Neil Armstrong, martin.blumenstingl, netdev, linux-kernel, linux-amlogic, linux-arm-kernel This patchsets converts the Amlogic Meson DWMAC glue bindings over to YAML schemas using the already converted dwmac bindings. The first patch is needed because the Amlogic glue needs a supplementary reg cell to access the DWMAC glue registers. Neil Armstrong (2): dt-bindings: net: snps,dwmac: update reg minItems maxItems dt-bindings: net: meson-dwmac: convert to yaml .../bindings/net/amlogic,meson-dwmac.yaml | 113 ++++++++++++++++++ .../devicetree/bindings/net/meson-dwmac.txt | 71 ----------- .../devicetree/bindings/net/snps,dwmac.yaml | 8 +- 3 files changed, 120 insertions(+), 72 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml delete mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] dt-bindings: net: snps, dwmac: update reg minItems maxItems 2019-08-06 12:50 [PATCH v2 0/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong @ 2019-08-06 12:50 ` Neil Armstrong 2019-08-06 15:22 ` Rob Herring 2019-08-06 12:50 ` [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong 1 sibling, 1 reply; 7+ messages in thread From: Neil Armstrong @ 2019-08-06 12:50 UTC (permalink / raw) To: robh+dt Cc: devicetree, Neil Armstrong, martin.blumenstingl, netdev, linux-kernel, linux-amlogic, linux-arm-kernel The Amlogic Meson DWMAC glue bindings needs a second reg cells for the glue registers, thus update the reg minItems/maxItems to allow more than a single reg cell. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 76fea2be66ac..4377f511a51d 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -61,7 +61,8 @@ properties: - snps,dwxgmac-2.10 reg: - maxItems: 1 + minItems: 1 + maxItems: 2 interrupts: minItems: 1 -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: net: snps, dwmac: update reg minItems maxItems 2019-08-06 12:50 ` [PATCH v2 1/2] dt-bindings: net: snps, dwmac: update reg minItems maxItems Neil Armstrong @ 2019-08-06 15:22 ` Rob Herring 2019-08-07 12:04 ` Maxime Ripard 0 siblings, 1 reply; 7+ messages in thread From: Rob Herring @ 2019-08-06 15:22 UTC (permalink / raw) To: Neil Armstrong, Maxime Ripard Cc: devicetree, Martin Blumenstingl, netdev, linux-kernel, linux-amlogic, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE +Maxime On Tue, Aug 6, 2019 at 6:50 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > The Amlogic Meson DWMAC glue bindings needs a second reg cells for the > glue registers, thus update the reg minItems/maxItems to allow more > than a single reg cell. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) I haven't checked, but the derivative schema could be assuming this schema enforced reg is 1 item. I don't think that's a major issue though. Acked-by: Rob Herring <robh@kernel.org> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: net: snps, dwmac: update reg minItems maxItems 2019-08-06 15:22 ` Rob Herring @ 2019-08-07 12:04 ` Maxime Ripard 0 siblings, 0 replies; 7+ messages in thread From: Maxime Ripard @ 2019-08-07 12:04 UTC (permalink / raw) To: Rob Herring Cc: devicetree, Neil Armstrong, Martin Blumenstingl, netdev, linux-kernel, linux-amlogic, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE Hi, On Tue, Aug 06, 2019 at 09:22:12AM -0600, Rob Herring wrote: > +Maxime > > On Tue, Aug 6, 2019 at 6:50 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > > > The Amlogic Meson DWMAC glue bindings needs a second reg cells for the > > glue registers, thus update the reg minItems/maxItems to allow more > > than a single reg cell. > > > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > --- > > Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > I haven't checked, but the derivative schema could be assuming this > schema enforced reg is 1 item. Yeah, we do for Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml (but somehow not allwinner,sun8i-a83t-emac.yaml) Neil, can you add it to sun7i-a20-gmac? > I don't think that's a major issue > though. > > Acked-by: Rob Herring <robh@kernel.org> With that fixed, Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml 2019-08-06 12:50 [PATCH v2 0/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong 2019-08-06 12:50 ` [PATCH v2 1/2] dt-bindings: net: snps, dwmac: update reg minItems maxItems Neil Armstrong @ 2019-08-06 12:50 ` Neil Armstrong 2019-08-06 15:15 ` Rob Herring 2019-08-06 19:11 ` Martin Blumenstingl 1 sibling, 2 replies; 7+ messages in thread From: Neil Armstrong @ 2019-08-06 12:50 UTC (permalink / raw) To: robh+dt Cc: devicetree, Neil Armstrong, martin.blumenstingl, netdev, linux-kernel, linux-amlogic, linux-arm-kernel Now that we have the DT validation in place, let's convert the device tree bindings for the Synopsys DWMAC Glue for Amlogic SoCs over to a YAML schemas. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/net/amlogic,meson-dwmac.yaml | 113 ++++++++++++++++++ .../devicetree/bindings/net/meson-dwmac.txt | 71 ----------- .../devicetree/bindings/net/snps,dwmac.yaml | 5 + 3 files changed, 118 insertions(+), 71 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml delete mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt diff --git a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml new file mode 100644 index 000000000000..ae91aa9d8616 --- /dev/null +++ b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml @@ -0,0 +1,113 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/net/amlogic,meson-dwmac.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson DWMAC Ethernet controller + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + - Martin Blumenstingl <martin.blumenstingl@googlemail.com> + +# We need a select here so we don't match all nodes with 'snps,dwmac' +select: + properties: + compatible: + contains: + enum: + - amlogic,meson6-dwmac + - amlogic,meson8b-dwmac + - amlogic,meson8m2-dwmac + - amlogic,meson-gxbb-dwmac + - amlogic,meson-axg-dwmac + required: + - compatible + +allOf: + - $ref: "snps,dwmac.yaml#" + - if: + properties: + compatible: + contains: + enum: + - amlogic,meson8b-dwmac + - amlogic,meson8m2-dwmac + - amlogic,meson-gxbb-dwmac + - amlogic,meson-axg-dwmac + + then: + properties: + clocks: + items: + - description: GMAC main clock + - description: First parent clock of the internal mux + - description: Second parent clock of the internal mux + + clock-names: + minItems: 3 + maxItems: 3 + items: + - const: stmmaceth + - const: clkin0 + - const: clkin1 + + amlogic,tx-delay-ns: + $ref: /schemas/types.yaml#definitions/uint32 + description: + The internal RGMII TX clock delay (provided by this driver) in + nanoseconds. Allowed values are 0ns, 2ns, 4ns, 6ns. + When phy-mode is set to "rgmii" then the TX delay should be + explicitly configured. When not configured a fallback of 2ns is + used. When the phy-mode is set to either "rgmii-id" or "rgmii-txid" + the TX clock delay is already provided by the PHY. In that case + this property should be set to 0ns (which disables the TX clock + delay in the MAC to prevent the clock from going off because both + PHY and MAC are adding a delay). + Any configuration is ignored when the phy-mode is set to "rmii". + +properties: + compatible: + additionalItems: true + maxItems: 3 + items: + - enum: + - amlogic,meson6-dwmac + - amlogic,meson8b-dwmac + - amlogic,meson8m2-dwmac + - amlogic,meson-gxbb-dwmac + - amlogic,meson-axg-dwmac + contains: + enum: + - snps,dwmac-3.70a + - snps,dwmac + + reg: + items: + - description: + The first register range should be the one of the DWMAC controller + - description: + The second range is is for the Amlogic specific configuration + (for example the PRG_ETHERNET register range on Meson8b and newer) + +required: + - compatible + - reg + - interrupts + - interrupt-names + - clocks + - clock-names + - phy-mode + +examples: + - | + ethmac: ethernet@c9410000 { + compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac"; + reg = <0xc9410000 0x10000>, <0xc8834540 0x8>; + interrupts = <8>; + interrupt-names = "macirq"; + clocks = <&clk_eth>, <&clkc_fclk_div2>, <&clk_mpll2>; + clock-names = "stmmaceth", "clkin0", "clkin1"; + phy-mode = "rgmii"; + }; diff --git a/Documentation/devicetree/bindings/net/meson-dwmac.txt b/Documentation/devicetree/bindings/net/meson-dwmac.txt deleted file mode 100644 index 1321bb194ed9..000000000000 --- a/Documentation/devicetree/bindings/net/meson-dwmac.txt +++ /dev/null @@ -1,71 +0,0 @@ -* Amlogic Meson DWMAC Ethernet controller - -The device inherits all the properties of the dwmac/stmmac devices -described in the file stmmac.txt in the current directory with the -following changes. - -Required properties on all platforms: - -- compatible: Depending on the platform this should be one of: - - "amlogic,meson6-dwmac" - - "amlogic,meson8b-dwmac" - - "amlogic,meson8m2-dwmac" - - "amlogic,meson-gxbb-dwmac" - - "amlogic,meson-axg-dwmac" - Additionally "snps,dwmac" and any applicable more - detailed version number described in net/stmmac.txt - should be used. - -- reg: The first register range should be the one of the DWMAC - controller. The second range is is for the Amlogic specific - configuration (for example the PRG_ETHERNET register range - on Meson8b and newer) - -Required properties on Meson8b, Meson8m2, GXBB and newer: -- clock-names: Should contain the following: - - "stmmaceth" - see stmmac.txt - - "clkin0" - first parent clock of the internal mux - - "clkin1" - second parent clock of the internal mux - -Optional properties on Meson8b, Meson8m2, GXBB and newer: -- amlogic,tx-delay-ns: The internal RGMII TX clock delay (provided - by this driver) in nanoseconds. Allowed values - are: 0ns, 2ns, 4ns, 6ns. - When phy-mode is set to "rgmii" then the TX - delay should be explicitly configured. When - not configured a fallback of 2ns is used. - When the phy-mode is set to either "rgmii-id" - or "rgmii-txid" the TX clock delay is already - provided by the PHY. In that case this - property should be set to 0ns (which disables - the TX clock delay in the MAC to prevent the - clock from going off because both PHY and MAC - are adding a delay). - Any configuration is ignored when the phy-mode - is set to "rmii". - -Example for Meson6: - - ethmac: ethernet@c9410000 { - compatible = "amlogic,meson6-dwmac", "snps,dwmac"; - reg = <0xc9410000 0x10000 - 0xc1108108 0x4>; - interrupts = <0 8 1>; - interrupt-names = "macirq"; - clocks = <&clk81>; - clock-names = "stmmaceth"; - } - -Example for GXBB: - ethmac: ethernet@c9410000 { - compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac"; - reg = <0x0 0xc9410000 0x0 0x10000>, - <0x0 0xc8834540 0x0 0x8>; - interrupts = <0 8 1>; - interrupt-names = "macirq"; - clocks = <&clkc CLKID_ETH>, - <&clkc CLKID_FCLK_DIV2>, - <&clkc CLKID_MPLL2>; - clock-names = "stmmaceth", "clkin0", "clkin1"; - phy-mode = "rgmii"; - }; diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 4377f511a51d..c78be15704b9 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -50,6 +50,11 @@ properties: - allwinner,sun8i-r40-emac - allwinner,sun8i-v3s-emac - allwinner,sun50i-a64-emac + - amlogic,meson6-dwmac + - amlogic,meson8b-dwmac + - amlogic,meson8m2-dwmac + - amlogic,meson-gxbb-dwmac + - amlogic,meson-axg-dwmac - snps,dwmac - snps,dwmac-3.50a - snps,dwmac-3.610 -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml 2019-08-06 12:50 ` [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong @ 2019-08-06 15:15 ` Rob Herring 2019-08-06 19:11 ` Martin Blumenstingl 1 sibling, 0 replies; 7+ messages in thread From: Rob Herring @ 2019-08-06 15:15 UTC (permalink / raw) To: Neil Armstrong Cc: devicetree, Martin Blumenstingl, netdev, linux-kernel, linux-amlogic, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Tue, Aug 6, 2019 at 6:50 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Now that we have the DT validation in place, let's convert the device tree > bindings for the Synopsys DWMAC Glue for Amlogic SoCs over to a YAML schemas. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > .../bindings/net/amlogic,meson-dwmac.yaml | 113 ++++++++++++++++++ > .../devicetree/bindings/net/meson-dwmac.txt | 71 ----------- > .../devicetree/bindings/net/snps,dwmac.yaml | 5 + > 3 files changed, 118 insertions(+), 71 deletions(-) > create mode 100644 Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml > delete mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt I don't love the compatible schema with 'additionalItems: true' and contains, but I guess it is what it is. I'm hopeful schemas help limit how many variations we end up with. Reviewed-by: Rob Herring <robh@kernel.org> Rob _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml 2019-08-06 12:50 ` [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong 2019-08-06 15:15 ` Rob Herring @ 2019-08-06 19:11 ` Martin Blumenstingl 1 sibling, 0 replies; 7+ messages in thread From: Martin Blumenstingl @ 2019-08-06 19:11 UTC (permalink / raw) To: Neil Armstrong Cc: devicetree, netdev, linux-kernel, robh+dt, linux-amlogic, linux-arm-kernel On Tue, Aug 6, 2019 at 2:50 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Now that we have the DT validation in place, let's convert the device tree > bindings for the Synopsys DWMAC Glue for Amlogic SoCs over to a YAML schemas. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> thank you for taking care of this conversion! Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> [...] > + amlogic,tx-delay-ns: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: > + The internal RGMII TX clock delay (provided by this driver) in > + nanoseconds. Allowed values are 0ns, 2ns, 4ns, 6ns. once I have more time I will try to see whether we can define an enum with these values, then invalid values will yield a warning/error when building the .dtb (which seems to be a good idea) this comment shouldn't prevent this patch from being applied as the initial conversion will already make life a lot easier Martin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-08-07 12:05 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-06 12:50 [PATCH v2 0/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong 2019-08-06 12:50 ` [PATCH v2 1/2] dt-bindings: net: snps, dwmac: update reg minItems maxItems Neil Armstrong 2019-08-06 15:22 ` Rob Herring 2019-08-07 12:04 ` Maxime Ripard 2019-08-06 12:50 ` [PATCH v2 2/2] dt-bindings: net: meson-dwmac: convert to yaml Neil Armstrong 2019-08-06 15:15 ` Rob Herring 2019-08-06 19:11 ` Martin Blumenstingl
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).