| Message ID | 20210601164800.7670-2-jbx6244@gmail.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | convert grf.txt to YAML | expand |
On 01-06-21, 18:47, Johan Jonker wrote: > The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" > in phy-provider.yaml has required "#phy-cells" for phy nodes. > The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. > Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent > notifications. Remove unneeded "#phy-cells" from parent node. > Also sort example. > > make ARCH=arm dtbs_check > DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ > phy/phy-provider.yaml > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > Acked-by: Rob Herring <robh@kernel.org> > --- > .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- > Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- I dont have grf.yaml, I guess it would be easier to split this into two or apply this thru rockchip tree. If you prefer latter: Acked-By: Vinod Koul <vkoul@kernel.org>
Hi Vinod, Am Donnerstag, 3. Juni 2021, 07:54:24 CEST schrieb Vinod Koul: > On 01-06-21, 18:47, Johan Jonker wrote: > > The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" > > in phy-provider.yaml has required "#phy-cells" for phy nodes. > > The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. > > Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent > > notifications. Remove unneeded "#phy-cells" from parent node. > > Also sort example. > > > > make ARCH=arm dtbs_check > > DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ > > phy/phy-provider.yaml > > > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > > Acked-by: Rob Herring <robh@kernel.org> > > --- > > .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- > > Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- > > I dont have grf.yaml, I guess it would be easier to split this into two > or apply this thru rockchip tree. If you prefer latter: > > Acked-By: Vinod Koul <vkoul@kernel.org> before we do any more rounds, I'll just do that with your Ack, thanks :-) Heiko
On Thu, Jun 3, 2021 at 3:58 AM Heiko Stübner <heiko@sntech.de> wrote: > > Hi Vinod, > > Am Donnerstag, 3. Juni 2021, 07:54:24 CEST schrieb Vinod Koul: > > On 01-06-21, 18:47, Johan Jonker wrote: > > > The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" > > > in phy-provider.yaml has required "#phy-cells" for phy nodes. > > > The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. > > > Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent > > > notifications. Remove unneeded "#phy-cells" from parent node. > > > Also sort example. > > > > > > make ARCH=arm dtbs_check > > > DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ > > > phy/phy-provider.yaml > > > > > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > > > Acked-by: Rob Herring <robh@kernel.org> > > > --- > > > .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- > > > Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- > > > > I dont have grf.yaml, I guess it would be easier to split this into two > > or apply this thru rockchip tree. If you prefer latter: > > > > Acked-By: Vinod Koul <vkoul@kernel.org> > > before we do any more rounds, I'll just do that with your Ack, thanks :-) This is generating warnings on linux-next now: /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml: syscon@ff770000: usb2phy@e450: '#phy-cells' does not match any of the regexes: 'pinctrl-[0-9]+' From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.yaml /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml: usb2phy@e450: '#phy-cells' does not match any of the regexes: 'pinctrl-[0-9]+' From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml Rob
On 6/7/21 3:16 PM, Rob Herring wrote: > On Thu, Jun 3, 2021 at 3:58 AM Heiko Stübner <heiko@sntech.de> wrote: >> >> Hi Vinod, >> >> Am Donnerstag, 3. Juni 2021, 07:54:24 CEST schrieb Vinod Koul: >>> On 01-06-21, 18:47, Johan Jonker wrote: >>>> The pattern: "^(|usb-|usb2-|usb3-|pci-|pcie-|sata-)phy(@[0-9a-f,]+)*$" >>>> in phy-provider.yaml has required "#phy-cells" for phy nodes. >>>> The "phy-cells" in rockchip-inno-usb2 nodes are located in subnodes. >>>> Rename the nodename to pattern "usb2phy@[0-9a-f]+$" to prevent >>>> notifications. Remove unneeded "#phy-cells" from parent node. >>>> Also sort example. >>>> >>>> make ARCH=arm dtbs_check >>>> DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ >>>> phy/phy-provider.yaml >>>> >>>> Signed-off-by: Johan Jonker <jbx6244@gmail.com> >>>> Acked-by: Rob Herring <robh@kernel.org> >>>> --- >>>> .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +++-------- >>>> Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- >>> >>> I dont have grf.yaml, I guess it would be easier to split this into two >>> or apply this thru rockchip tree. If you prefer latter: >>> >>> Acked-By: Vinod Koul <vkoul@kernel.org> >> >> before we do any more rounds, I'll just do that with your Ack, thanks :-) > > This is generating warnings on linux-next now: > > /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml: > syscon@ff770000: usb2phy@e450: '#phy-cells' does not match any of the > regexes: 'pinctrl-[0-9]+' > From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.example.dt.yaml: > usb2phy@e450: '#phy-cells' does not match any of the regexes: > 'pinctrl-[0-9]+' > From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml > > Rob > Hi Rob, Heiko, Sorry... That '#phy-cells' in the grf.yaml example also needs to go. Is that something Heiko can fix in his git tree or do I have to resubmit the complete patch or just a fix? Please advise. Kind regards, Johan === > > examples: > - | > #include <dt-bindings/clock/rk3399-cru.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/power/rk3399-power.h> > grf: syscon@ff770000 { > compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; > reg = <0xff770000 0x10000>; > #address-cells = <1>; > #size-cells = <1>; > > mipi_dphy_rx0: mipi-dphy-rx0 { > compatible = "rockchip,rk3399-mipi-dphy-rx0"; > clocks = <&cru SCLK_MIPIDPHY_REF>, > <&cru SCLK_DPHY_RX0_CFG>, > <&cru PCLK_VIO_GRF>; > clock-names = "dphy-ref", "dphy-cfg", "grf"; > power-domains = <&power RK3399_PD_VIO>; > #phy-cells = <0>; > }; > > u2phy0: usb2phy@e450 { > compatible = "rockchip,rk3399-usb2phy"; > reg = <0xe450 0x10>; > clocks = <&cru SCLK_USB2PHY0_REF>; > clock-names = "phyclk"; > #clock-cells = <0>; > clock-output-names = "clk_usbphy0_480m"; > #phy-cells = <0>; Remove > > u2phy0_host: host-port { > #phy-cells = <0>; > interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>; > interrupt-names = "linestate"; > }; > > u2phy0_otg: otg-port { > #phy-cells = <0>; > interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>, > <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>, > <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>; > interrupt-names = "otg-bvalid", "otg-id", > "linestate"; > }; > }; > };
diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml index a5b027a6e..5bebd86bf 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml @@ -30,9 +30,6 @@ properties: "#clock-cells": const: 0 - "#phy-cells": - const: 0 - clocks: maxItems: 1 @@ -120,7 +117,6 @@ required: - reg - clock-output-names - "#clock-cells" - - "#phy-cells" - host-port - otg-port @@ -131,26 +127,25 @@ examples: #include <dt-bindings/clock/rk3399-cru.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> - u2phy0: usb2-phy@e450 { + u2phy0: usb2phy@e450 { compatible = "rockchip,rk3399-usb2phy"; reg = <0xe450 0x10>; clocks = <&cru SCLK_USB2PHY0_REF>; clock-names = "phyclk"; clock-output-names = "clk_usbphy0_480m"; #clock-cells = <0>; - #phy-cells = <0>; u2phy0_host: host-port { - #phy-cells = <0>; interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>; interrupt-names = "linestate"; + #phy-cells = <0>; }; u2phy0_otg: otg-port { - #phy-cells = <0>; interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>; interrupt-names = "otg-bvalid", "otg-id", "linestate"; + #phy-cells = <0>; }; }; diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index 84bdaf88d..43c288708 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -184,7 +184,7 @@ allOf: - "#size-cells" patternProperties: - "usb2-phy@[0-9a-f]+$": + "usb2phy@[0-9a-f]+$": type: object $ref: "/schemas/phy/phy-rockchip-inno-usb2.yaml#" @@ -233,7 +233,7 @@ examples: #phy-cells = <0>; }; - u2phy0: usb2-phy@e450 { + u2phy0: usb2phy@e450 { compatible = "rockchip,rk3399-usb2phy"; reg = <0xe450 0x10>; clocks = <&cru SCLK_USB2PHY0_REF>;