[PATCH 1/7] dt-bindings: net: mdio: Add a nodename pattern

[PATCH 1/7] dt-bindings: net: mdio: Add a nodename pattern

[Maxime Ripard]

The node name of an MDIO controller should be MDIO. Let's add a rule for
this.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 Documentation/devicetree/bindings/net/mdio.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/mdio.yaml b/Documentation/devicetree/bindings/net/mdio.yaml
index b8fa8251c4bc..12069d0b25c6 100644
--- a/Documentation/devicetree/bindings/net/mdio.yaml
+++ b/Documentation/devicetree/bindings/net/mdio.yaml
@@ -18,6 +18,9 @@ description:
   a device specific binding document.
 
 properties:
+  $nodename:
+    pattern: "^mdio(@.*)?"
+
   reset-gpios:
     maxItems: 1
     description:
-- 
2.21.0

[PATCH 2/7] dt-bindings: net: mdio: Add address and size cells

[Maxime Ripard]

MDIO controllers should have child nodes with a singe value in their reg
properties being the ID of the PHY in the bus.

Let's add the proper constraints on #address-cells and #size-cells.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 Documentation/devicetree/bindings/net/mdio.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/mdio.yaml b/Documentation/devicetree/bindings/net/mdio.yaml
index 12069d0b25c6..24d67074d494 100644
--- a/Documentation/devicetree/bindings/net/mdio.yaml
+++ b/Documentation/devicetree/bindings/net/mdio.yaml
@@ -21,6 +21,12 @@ properties:
   $nodename:
     pattern: "^mdio(@.*)?"
 
+  "#address-cells":
+    const: 1
+
+  "#size-cells":
+    const: 0
+
   reset-gpios:
     maxItems: 1
     description:
-- 
2.21.0

[PATCH 3/7] dt-bindings: net: mdio: Add child nodes

[Maxime Ripard]

The child nodes of a mdio bus are supposed to be ethernet PHYs, with a reg
property. Make sure that's validated as well.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 Documentation/devicetree/bindings/net/mdio.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/mdio.yaml b/Documentation/devicetree/bindings/net/mdio.yaml
index 24d67074d494..5d08d2ffd4eb 100644
--- a/Documentation/devicetree/bindings/net/mdio.yaml
+++ b/Documentation/devicetree/bindings/net/mdio.yaml
@@ -39,6 +39,20 @@ properties:
       and must therefore be appropriately determined based on all PHY
       requirements (maximum value of all per-PHY RESET pulse widths).
 
+patternProperties:
+  "^ethernet-phy@[0-9a-f]+$":
+    type: object
+
+    properties:
+      reg:
+        minimum: 0
+        maximum: 31
+        description:
+          The ID number for the PHY.
+
+    required:
+      - reg
+
 examples:
   - |
     davinci_mdio: mdio@5c030000 {
-- 
2.21.0

Re: [PATCH 3/7] dt-bindings: net: mdio: Add child nodes

[Rob Herring]

On Wed, Jul 3, 2019 at 3:55 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The child nodes of a mdio bus are supposed to be ethernet PHYs, with a reg
> property. Make sure that's validated as well.

I don't think this is always true. I seem to recall there's some
timestamping devices connected via mdio.

In any case, it's not a long list of names, so we can probably just
enumerate them as needed. Does this generate any warnings?

>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
>  Documentation/devicetree/bindings/net/mdio.yaml | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/net/mdio.yaml b/Documentation/devicetree/bindings/net/mdio.yaml
> index 24d67074d494..5d08d2ffd4eb 100644
> --- a/Documentation/devicetree/bindings/net/mdio.yaml
> +++ b/Documentation/devicetree/bindings/net/mdio.yaml
> @@ -39,6 +39,20 @@ properties:
>        and must therefore be appropriately determined based on all PHY
>        requirements (maximum value of all per-PHY RESET pulse widths).
>
> +patternProperties:
> +  "^ethernet-phy@[0-9a-f]+$":
> +    type: object
> +
> +    properties:
> +      reg:
> +        minimum: 0
> +        maximum: 31
> +        description:
> +          The ID number for the PHY.
> +
> +    required:
> +      - reg
> +
>  examples:
>    - |
>      davinci_mdio: mdio@5c030000 {
> --
> 2.21.0
>

Re: [PATCH 3/7] dt-bindings: net: mdio: Add child nodes

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 806 bytes --]

On Wed, Jul 03, 2019 at 07:53:43AM -0600, Rob Herring wrote:
> On Wed, Jul 3, 2019 at 3:55 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > The child nodes of a mdio bus are supposed to be ethernet PHYs, with a reg
> > property. Make sure that's validated as well.
>
> I don't think this is always true. I seem to recall there's some
> timestamping devices connected via mdio.
>
> In any case, it's not a long list of names, so we can probably just
> enumerate them as needed. Does this generate any warnings?

I did a run on both arm and arm64 Allwinner DTS, and it doesn't.

I can do one on multi_v7 / arm64's defconfig, but that's probably
going to be a bit hard to tell from the noise of warnings.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 3/7] dt-bindings: net: mdio: Add child nodes

[Rob Herring]

On Wed, Jul 3, 2019 at 8:13 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> On Wed, Jul 03, 2019 at 07:53:43AM -0600, Rob Herring wrote:
> > On Wed, Jul 3, 2019 at 3:55 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > >
> > > The child nodes of a mdio bus are supposed to be ethernet PHYs, with a reg
> > > property. Make sure that's validated as well.
> >
> > I don't think this is always true. I seem to recall there's some
> > timestamping devices connected via mdio.
> >
> > In any case, it's not a long list of names, so we can probably just
> > enumerate them as needed. Does this generate any warnings?
>
> I did a run on both arm and arm64 Allwinner DTS, and it doesn't.
>
> I can do one on multi_v7 / arm64's defconfig, but that's probably
> going to be a bit hard to tell from the noise of warnings.

I do allmodconfig because that will build all dtbs. You can run checks
with a single schema like this:

make dtbs_check DT_SCHEMA_FILES=a-single-schema.yaml

Rob

Re: [PATCH 3/7] dt-bindings: net: mdio: Add child nodes

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]

Hi Rob,

On Wed, Jul 03, 2019 at 08:20:32AM -0600, Rob Herring wrote:
> On Wed, Jul 3, 2019 at 8:13 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > On Wed, Jul 03, 2019 at 07:53:43AM -0600, Rob Herring wrote:
> > > On Wed, Jul 3, 2019 at 3:55 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > > >
> > > > The child nodes of a mdio bus are supposed to be ethernet PHYs, with a reg
> > > > property. Make sure that's validated as well.
> > >
> > > I don't think this is always true. I seem to recall there's some
> > > timestamping devices connected via mdio.
> > >
> > > In any case, it's not a long list of names, so we can probably just
> > > enumerate them as needed. Does this generate any warnings?
> >
> > I did a run on both arm and arm64 Allwinner DTS, and it doesn't.
> >
> > I can do one on multi_v7 / arm64's defconfig, but that's probably
> > going to be a bit hard to tell from the noise of warnings.
>
> I do allmodconfig because that will build all dtbs. You can run checks
> with a single schema like this:
>
> make dtbs_check DT_SCHEMA_FILES=a-single-schema.yaml

Right, of course :)

I just did it, and apart from a few arm32 broadcom boards that don't
have the right address-cells / size-cells (probably false positive due
to the fact they use mdio@something as node name), there's no other
warnings.

I'm not sure what you were on about though. If there's another node
than an ethernet phy, we won' have any warning since we don't have
additionalProperties to false.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 3/7] dt-bindings: net: mdio: Add child nodes

[Rob Herring]

On Wed, Jul 3, 2019 at 1:58 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Hi Rob,
>
> On Wed, Jul 03, 2019 at 08:20:32AM -0600, Rob Herring wrote:
> > On Wed, Jul 3, 2019 at 8:13 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > >
> > > On Wed, Jul 03, 2019 at 07:53:43AM -0600, Rob Herring wrote:
> > > > On Wed, Jul 3, 2019 at 3:55 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> > > > >
> > > > > The child nodes of a mdio bus are supposed to be ethernet PHYs, with a reg
> > > > > property. Make sure that's validated as well.
> > > >
> > > > I don't think this is always true. I seem to recall there's some
> > > > timestamping devices connected via mdio.
> > > >
> > > > In any case, it's not a long list of names, so we can probably just
> > > > enumerate them as needed. Does this generate any warnings?
> > >
> > > I did a run on both arm and arm64 Allwinner DTS, and it doesn't.
> > >
> > > I can do one on multi_v7 / arm64's defconfig, but that's probably
> > > going to be a bit hard to tell from the noise of warnings.
> >
> > I do allmodconfig because that will build all dtbs. You can run checks
> > with a single schema like this:
> >
> > make dtbs_check DT_SCHEMA_FILES=a-single-schema.yaml
>
> Right, of course :)
>
> I just did it, and apart from a few arm32 broadcom boards that don't
> have the right address-cells / size-cells (probably false positive due
> to the fact they use mdio@something as node name), there's no other
> warnings.

Actually, they look like real errors in the DT with the values of
address-cells / size-cells swapped. But the node is disabled in the
ones I looked at.

> I'm not sure what you were on about though. If there's another node
> than an ethernet phy, we won' have any warning since we don't have
> additionalProperties to false.

True. I guess I wasn't thinking through it... Anyways, I applied it.

Rob

[PATCH 4/7] dt-bindings: display: Fix simple-framebuffer example

[Maxime Ripard]

The simple-framebuffer binding has a compatible that isn't one of the valid
options. Since an Allwinner pipeline is being described, let's add the
matching compatible.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 .../devicetree/bindings/display/simple-framebuffer.yaml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/display/simple-framebuffer.yaml b/Documentation/devicetree/bindings/display/simple-framebuffer.yaml
index b052d76cf8b6..c8d73ef010b5 100644
--- a/Documentation/devicetree/bindings/display/simple-framebuffer.yaml
+++ b/Documentation/devicetree/bindings/display/simple-framebuffer.yaml
@@ -139,7 +139,7 @@ examples:
       #size-cells = <1>;
       stdout-path = "display0";
       framebuffer0: framebuffer@1d385000 {
-        compatible = "simple-framebuffer";
+        compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
         reg = <0x1d385000 3840000>;
         width = <1600>;
         height = <1200>;
-- 
2.21.0

[PATCH 5/7] dt-bindings: simple-framebuffer: Add requirement for pipelines

[Maxime Ripard]

Both the allwinner and amlogic compatibles require that either the
allwinner,pipeline or the amlogic,pipeline property is set. This was
dropped during the conversion since we didn't have conditionals back then,
but we can express this properly now.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 .../bindings/display/simple-framebuffer.yaml  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/simple-framebuffer.yaml b/Documentation/devicetree/bindings/display/simple-framebuffer.yaml
index c8d73ef010b5..678776b6012a 100644
--- a/Documentation/devicetree/bindings/display/simple-framebuffer.yaml
+++ b/Documentation/devicetree/bindings/display/simple-framebuffer.yaml
@@ -126,6 +126,28 @@ required:
   # but usually they will be filled by the bootloader.
   - compatible
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,simple-framebuffer
+
+    then:
+      required:
+        - allwinner,pipeline
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amlogic,simple-framebuffer
+
+    then:
+      required:
+        - amlogic,pipeline
+
+
 additionalProperties: false
 
 examples:
@@ -140,6 +162,7 @@ examples:
       stdout-path = "display0";
       framebuffer0: framebuffer@1d385000 {
         compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
+        allwinner,pipeline = "de_be0-lcd0";
         reg = <0x1d385000 3840000>;
         width = <1600>;
         height = <1200>;
-- 
2.21.0

[PATCH 6/7] dt-bindings: net: Use phy-mode instead of phy-connection-type

[Maxime Ripard]

When adding support for the DWMAC (and derivatives) bindings,
phy-connection-type was required, even though the previous binding required
the equivalent phy-mode.

Let's fix this by using phy-mode as we should have.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 .../devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml | 4 ++--
 .../bindings/net/allwinner,sun8i-a83t-emac.yaml           | 8 ++++----
 Documentation/devicetree/bindings/net/snps,dwmac.yaml     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml b/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml
index 4b45798f0e68..06b1cc8bea14 100644
--- a/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml
+++ b/Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml
@@ -44,7 +44,7 @@ required:
   - interrupt-names
   - clocks
   - clock-names
-  - phy-connection-type
+  - phy-mode
 
 examples:
   - |
@@ -55,7 +55,7 @@ examples:
         interrupt-names = "macirq";
         clocks = <&ahb_gates 49>, <&gmac_tx>;
         clock-names = "stmmaceth", "allwinner_gmac_tx";
-        phy-connection-type = "mii";
+        phy-mode = "mii";
     };
 
 # FIXME: We should set it, but it would report all the generic
diff --git a/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml b/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
index 6f68c7f5fc34..d4084c149768 100644
--- a/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
+++ b/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
@@ -52,8 +52,8 @@ required:
   - clock-names
   - resets
   - reset-names
-  - phy-connection-type
   - phy-handle
+  - phy-mode
   - syscon
 
 allOf:
@@ -198,7 +198,7 @@ examples:
         clock-names = "stmmaceth";
 
         phy-handle = <&int_mii_phy>;
-        phy-connection-type = "mii";
+        phy-mode = "mii";
         allwinner,leds-active-low;
 
         mdio1: mdio {
@@ -249,7 +249,7 @@ examples:
         clock-names = "stmmaceth";
 
         phy-handle = <&ext_rgmii_phy>;
-        phy-connection-type = "rgmii";
+        phy-mode = "rgmii";
         allwinner,leds-active-low;
 
         mdio2: mdio {
@@ -301,7 +301,7 @@ examples:
         clocks = <&ccu 27>;
         clock-names = "stmmaceth";
         phy-handle = <&ext_rgmii_phy1>;
-        phy-connection-type = "rgmii";
+        phy-mode = "rgmii";
 
         mdio {
             compatible = "snps,dwmac-mdio";
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 658726c620be..76fea2be66ac 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -261,7 +261,7 @@ required:
   - reg
   - interrupts
   - interrupt-names
-  - phy-connection-type
+  - phy-mode
 
 dependencies:
   snps,reset-active-low: ["snps,reset-gpio"]
@@ -384,7 +384,7 @@ examples:
         interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
         mac-address = [000000000000]; /* Filled in by U-Boot */
         max-frame-size = <3800>;
-        phy-connection-type = "gmii";
+        phy-mode = "gmii";
         snps,multicast-filter-bins = <256>;
         snps,perfect-filter-entries = <128>;
         rx-fifo-depth = <16384>;
-- 
2.21.0

[PATCH 7/7] dt-bindings: usb: ehci: Fix example warnings

[Maxime Ripard]

The example of the EHCI binding generates a bunch of warnings now that the
examples are validated too.

Most notably, phy-names isn't used at all, and the node name should be USB.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 Documentation/devicetree/bindings/usb/generic-ehci.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
index d3b4f6415920..059f6ef1ad4a 100644
--- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
@@ -74,7 +74,7 @@ additionalProperties: false
 
 examples:
   - |
-    ehci@e0000300 {
+    usb@e0000300 {
         compatible = "ibm,usb-ehci-440epx", "generic-ehci";
         interrupt-parent = <&UIC0>;
         interrupts = <0x1a 4>;
@@ -89,7 +89,6 @@ examples:
         interrupts = <39>;
         clocks = <&ahb_gates 1>;
         phys = <&usbphy 1>;
-        phy-names = "usb";
     };
 
 ...
-- 
2.21.0

Re: [PATCH 1/7] dt-bindings: net: mdio: Add a nodename pattern

[Rob Herring]

On Wed, Jul 3, 2019 at 3:55 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> The node name of an MDIO controller should be MDIO. Let's add a rule for
> this.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
>  Documentation/devicetree/bindings/net/mdio.yaml | 3 +++
>  1 file changed, 3 insertions(+)

Series applied. Thanks.

BTW, just some errors with Broadcom boards with the mdio schema.

Rob