On Mon, Oct 26, 2020 at 11:17:46AM +0530, Sameer Pujar wrote: > Since graph bindings are now converted to json-schema the references of > graph.txt are replaced with graph.yaml in various docs. This will conflict unless you split by subsystem (still conflicts, but it's not Linus dealing with them) and new ones will creep in during the cycle. It's easier to just make graph.txt say, 'This file has moved to...'. > Signed-off-by: Sameer Pujar <spujar@xxxxxxxxxx> > --- > Documentation/devicetree/bindings/arm/coresight.txt | 2 +- > Documentation/devicetree/bindings/connector/usb-connector.yaml | 2 +- > Documentation/devicetree/bindings/display/arm,hdlcd.txt | 2 +- > Documentation/devicetree/bindings/display/arm,komeda.txt | 2 +- > Documentation/devicetree/bindings/display/arm,malidp.txt | 2 +- > Documentation/devicetree/bindings/display/armada/marvell,dove-lcd.txt | 2 +- > Documentation/devicetree/bindings/display/atmel/hlcdc-dc.txt | 2 +- > Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt | 2 +- > .../devicetree/bindings/display/bridge/analogix,anx7814.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt | 2 +- > Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt | 2 +- > Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/ps8640.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/simple-bridge.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/tda998x.txt | 2 +- > .../devicetree/bindings/display/bridge/thine,thc63lvd1024.yaml | 2 +- > Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.txt | 2 +- > Documentation/devicetree/bindings/display/hisilicon/dw-dsi.txt | 2 +- > Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt | 2 +- > Documentation/devicetree/bindings/display/imx/ldb.txt | 2 +- > Documentation/devicetree/bindings/display/ingenic,ipu.yaml | 2 +- > Documentation/devicetree/bindings/display/ingenic,lcd.yaml | 4 ++-- > Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt | 2 +- > Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt | 2 +- > Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt | 2 +- > Documentation/devicetree/bindings/display/mipi-dsi-bus.txt | 2 +- > Documentation/devicetree/bindings/display/msm/dpu.txt | 2 +- > Documentation/devicetree/bindings/display/msm/dsi.txt | 2 +- > Documentation/devicetree/bindings/display/msm/mdp4.txt | 2 +- > Documentation/devicetree/bindings/display/msm/mdp5.txt | 2 +- > Documentation/devicetree/bindings/display/panel/panel-common.yaml | 2 +- > Documentation/devicetree/bindings/display/renesas,du.txt | 2 +- > .../devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt | 2 +- > Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt | 2 +- > Documentation/devicetree/bindings/display/st,stm32-dsi.yaml | 2 +- > Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml | 2 +- > Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml | 2 +- > Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml | 2 +- > Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt | 2 +- > Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- > Documentation/devicetree/bindings/display/truly,nt35597.txt | 2 +- > Documentation/devicetree/bindings/media/video-interfaces.txt | 2 +- > Documentation/devicetree/bindings/media/video-mux.txt | 2 +- > Documentation/devicetree/bindings/sound/st,stm32-sai.txt | 2 +- > Documentation/devicetree/bindings/usb/mediatek,mtu3.txt | 2 +- > Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml | 2 +- > 49 files changed, 50 insertions(+), 50 deletions(-) > > diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt > index d711676..97a6c1c 100644 > --- a/Documentation/devicetree/bindings/arm/coresight.txt > +++ b/Documentation/devicetree/bindings/arm/coresight.txt > @@ -141,7 +141,7 @@ Coresight components are interconnected to create a data path for the flow of > trace data generated from the "sources" to their collection points "sink". > Each coresight component must describe the "input" and "output" connections. > The connections must be described via generic DT graph bindings as described > -by the "bindings/graph.txt", where each "port" along with an "endpoint" > +by the "bindings/graph.yaml", where each "port" along with an "endpoint" > component represents a hardware port and the connection. > > * All output ports must be listed inside a child node named "out-ports" > diff --git a/Documentation/devicetree/bindings/connector/usb-connector.yaml b/Documentation/devicetree/bindings/connector/usb-connector.yaml > index 728f82d..f3e6df0 100644 > --- a/Documentation/devicetree/bindings/connector/usb-connector.yaml > +++ b/Documentation/devicetree/bindings/connector/usb-connector.yaml > @@ -125,7 +125,7 @@ properties: > power dual role. > > ports: > - description: OF graph bindings (specified in bindings/graph.txt) that model > + description: OF graph bindings (specified in bindings/graph.yaml) that model The real fix for the schemas is removing the free form reference and making a schema reference. > any data bus to the connector unless the bus is between parent node and > the connector. Since a single connector can have multiple data buses every > bus has an assigned OF graph port number as described below.
