On Mon, Feb 28, 2022 at 3:37 PM Peter Geis <pgwipeout@xxxxxxxxx> wrote: > > On Mon, Feb 28, 2022 at 2:18 PM Rob Herring <robh+dt@xxxxxxxxxx> wrote: > > > > On Tue, Feb 8, 2022 at 3:15 AM Yifeng Zhao <yifeng.zhao@xxxxxxxxxxxxxx> wrote: > > > > > > Add the compatible strings for the Naneng combo PHY found on rockchip SoC. > > > > > > Reviewed-by: Rob Herring <robh@xxxxxxxxxx> > > > Signed-off-by: Yifeng Zhao <yifeng.zhao@xxxxxxxxxxxxxx> > > > Signed-off-by: Johan Jonker <jbx6244@xxxxxxxxx> > > > --- > > > > > > Changes in v8: None > > > Changes in v7: > > > - remove u3otg0_port_en, u3otg1_port_en and pipe_sgmii_mac_sel > > > > > > Changes in v5: > > > - modify description for ssc and ext-refclk > > > - remove apb reset > > > > > > Changes in v4: > > > - restyle > > > - remove some minItems > > > - add more properties > > > - remove reset-names > > > - move #phy-cells > > > - add rockchip,rk3568-pipe-grf > > > - add rockchip,rk3568-pipe-phy-grf > > > > > > Changes in v3: None > > > Changes in v2: > > > - Fix dtschema/dtc warnings/errors > > > > > > .../phy/phy-rockchip-naneng-combphy.yaml | 109 ++++++++++++++++++ > > > 1 file changed, 109 insertions(+) > > > create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml > > > > This now fails in linux-next: > > > > /builds/robherring/linux-dt/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.example.dt.yaml: > > syscon@fdc50000: compatible: 'oneOf' conditional failed, one must be > > fixed: > > ['rockchip,rk3568-pipe-grf', 'syscon'] is too short > > 'rockchip,rk3568-pipe-grf' is not one of ['rockchip,rk3288-sgrf', > > 'rockchip,rk3568-usb2phy-grf', 'rockchip,rv1108-usbgrf'] > > From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > /builds/robherring/linux-dt/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.example.dt.yaml: > > syscon@fdc70000: compatible: 'oneOf' conditional failed, one must be > > fixed: > > ['rockchip,rk3568-pipe-phy-grf', 'syscon'] is too short > > 'rockchip,rk3568-pipe-phy-grf' is not one of ['rockchip,rk3288-sgrf', > > 'rockchip,rk3568-usb2phy-grf', 'rockchip,rv1108-usbgrf'] > > From schema: /builds/robherring/linux-dt/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > > > > > > The problem appears to be that patch 1 was applied incorrectly and the > > compatibles ended up in the wrong section (the one requiring > > 'simple-mfd'). Patch 1 probably conflicts as my bot will just skip the > > patch if it conflicts which is why this had a different error report. > > Good Afternoon Rob, > > This is fixed in the first patch of my rk356x dwc3 enablement series: > https://patchwork.kernel.org/project/linux-rockchip/patch/20220228135700.1089526-2-pgwipeout@xxxxxxxxx/ Where does that say Vinod incorrectly applied the original patch and needs to apply it? What's the status of the series? Do we have to wait for the rest of the series to be applied? Rob
