Message ID | 20210116090656.11752-1-chunfeng.yun@mediatek.com |
---|---|
State | Superseded |
Headers | show |
Series | [next,01/15] dt-bindings: usb: fix yamllint check warning | expand |
On 16.01.2021 12:06, Chunfeng Yun wrote: > Harmonize node names, compatibles and properties. > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > --- > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > index 5b782a4769e7..a69a033a68ac 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi [...] > @@ -908,11 +908,11 @@ > status = "disabled"; > }; > > - mipi_tx0: mipi-dphy@11e50000 { > + mipi_tx0: dsi-phy@11e50000 { Again, why not just "phy@..."? [...] > @@ -931,11 +931,10 @@ > }; > }; > > - u3phy: usb-phy@11f40000 { > + u3phy: t-phy@11f40000 { Here as well... [...] MBR, Sergei
On Sat, Jan 16, 2021 at 5:07 PM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote: > > Harmonize node names, compatibles and properties. > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > --- > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > index 5b782a4769e7..a69a033a68ac 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > @@ -865,7 +865,7 @@ > ranges; > status = "disabled"; > > - usb_host: xhci@11200000 { > + usb_host: usb@11200000 { > compatible = "mediatek,mt8183-xhci", > "mediatek,mtk-xhci"; > reg = <0 0x11200000 0 0x1000>; > @@ -908,11 +908,11 @@ > status = "disabled"; > }; > > - mipi_tx0: mipi-dphy@11e50000 { > + mipi_tx0: dsi-phy@11e50000 { > compatible = "mediatek,mt8183-mipi-tx"; > reg = <0 0x11e50000 0 0x1000>; > clocks = <&apmixedsys CLK_APMIXED_MIPID0_26M>; > - clock-names = "ref_clk"; > + clock-names = "ref"; > #clock-cells = <0>; > #phy-cells = <0>; > clock-output-names = "mipi_tx0_pll"; This is unrelated to USB, so this should probably be a separate patch. > @@ -931,11 +931,10 @@ > }; > }; > > - u3phy: usb-phy@11f40000 { > + u3phy: t-phy@11f40000 { > compatible = "mediatek,mt8183-tphy", > "mediatek,generic-tphy-v2"; > #address-cells = <1>; > - #phy-cells = <1>; > #size-cells = <1>; > ranges = <0 0 0x11f40000 0x1000>; > status = "okay"; > -- > 2.18.0 > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Sun, Jan 17, 2021 at 9:58 AM Nicolas Boichat <drinkcat@chromium.org> wrote: > > On Sat, Jan 16, 2021 at 5:07 PM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote: > > > > Harmonize node names, compatibles and properties. > > > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > > --- > > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > index 5b782a4769e7..a69a033a68ac 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > @@ -865,7 +865,7 @@ > > ranges; > > status = "disabled"; > > > > - usb_host: xhci@11200000 { > > + usb_host: usb@11200000 { > > compatible = "mediatek,mt8183-xhci", > > "mediatek,mtk-xhci"; > > reg = <0 0x11200000 0 0x1000>; > > @@ -908,11 +908,11 @@ > > status = "disabled"; > > }; > > > > - mipi_tx0: mipi-dphy@11e50000 { > > + mipi_tx0: dsi-phy@11e50000 { > > compatible = "mediatek,mt8183-mipi-tx"; > > reg = <0 0x11e50000 0 0x1000>; > > clocks = <&apmixedsys CLK_APMIXED_MIPID0_26M>; > > - clock-names = "ref_clk"; > > + clock-names = "ref"; > > #clock-cells = <0>; > > #phy-cells = <0>; > > clock-output-names = "mipi_tx0_pll"; > > This is unrelated to USB, so this should probably be a separate patch. Actually, after looking again at the complete stack of patches, I think this might be ok as part of this overall cleanup (I'll let the maintainer speak up). > > > @@ -931,11 +931,10 @@ > > }; > > }; > > > > - u3phy: usb-phy@11f40000 { > > + u3phy: t-phy@11f40000 { > > compatible = "mediatek,mt8183-tphy", > > "mediatek,generic-tphy-v2"; > > #address-cells = <1>; > > - #phy-cells = <1>; > > #size-cells = <1>; > > ranges = <0 0 0x11f40000 0x1000>; > > status = "okay"; > > -- > > 2.18.0 > > _______________________________________________ > > Linux-mediatek mailing list > > Linux-mediatek@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-mediatek
Hi, Chunfeng: Chunfeng Yun <chunfeng.yun@mediatek.com> 於 2021年1月16日 週六 下午5:07寫道: > > The compatilbe "mediatek,mt7623-mipi-tx" is not supported in driver, > and in fact uses "mediatek,mt2701-mipi-tx" instead on MT7623, so changes > the compatible items to make dependence clear. > > And add an optional "clock-names" property, it's not used to get the clock, > but some DTS files provide it. Separate the clock part to another patch. Regards, Chun-Kuang. > > Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > --- > .../bindings/phy/mediatek,dsi-phy.yaml | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml > index 71d4acea1f66..af6e554c5b69 100644 > --- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml > +++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml > @@ -19,11 +19,14 @@ properties: > pattern: "^dsi-phy@[0-9a-f]+$" > > compatible: > - enum: > - - mediatek,mt2701-mipi-tx > - - mediatek,mt7623-mipi-tx > - - mediatek,mt8173-mipi-tx > - - mediatek,mt8183-mipi-tx > + oneOf: > + - items: > + - enum: > + - mediatek,mt7623-mipi-tx > + - const: mediatek,mt2701-mipi-tx > + - const: mediatek,mt2701-mipi-tx > + - const: mediatek,mt8173-mipi-tx > + - const: mediatek,mt8183-mipi-tx > > reg: > maxItems: 1 > @@ -32,6 +35,10 @@ properties: > items: > - description: PLL reference clock > > + clock-names: > + items: > + - const: ref > + > clock-output-names: > maxItems: 1 > > -- > 2.18.0
Hi, Chunfeng: Chunfeng Yun <chunfeng.yun@mediatek.com> 於 2021年1月16日 週六 下午5:07寫道: > > The compatilbe "mediatek,mt7623-hdmi-tx" is not supported in driver, > and in fact uses "mediatek,mt2701-hdmi-tx" instead on MT7623, so changes > the compatible items to make dependence clear. > > Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > --- > .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml > index 4752517a1446..0d94950b84ca 100644 > --- a/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml > +++ b/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml > @@ -21,10 +21,13 @@ properties: > pattern: "^hdmi-phy@[0-9a-f]+$" > > compatible: > - enum: > - - mediatek,mt2701-hdmi-phy > - - mediatek,mt7623-hdmi-phy > - - mediatek,mt8173-hdmi-phy > + oneOf: > + - items: > + - enum: > + - mediatek,mt7623-hdmi-phy > + - const: mediatek,mt2701-hdmi-phy > + - const: mediatek,mt2701-hdmi-phy > + - const: mediatek,mt8173-hdmi-phy > I like move 'items' to the bottom. - const: mediatek,mt2701-hdmi-phy - const: mediatek,mt8173-hdmi-phy - items: - enum: - mediatek,mt7623-hdmi-phy - const: mediatek,mt2701-hdmi-phy Regards, Chun-Kuang. > reg: > maxItems: 1 > -- > 2.18.0
On Sat, 2021-01-16 at 12:36 +0300, Sergei Shtylyov wrote: > Hello! > > On 16.01.2021 12:06, Chunfeng Yun wrote: > > > This is used to fix dtbs_check warning > > > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > > --- > > arch/arm64/boot/dts/mediatek/mt7622.dtsi | 9 +++++---- > > 1 file changed, 5 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi > > index 5b9ec032ce8d..4cfa09b0ca3c 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi > > +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi > > @@ -740,8 +740,8 @@ > > status = "disabled"; > > }; > > > > - u3phy: usb-phy@1a0c4000 { > > - compatible = "mediatek,mt7622-u3phy", > > + u3phy: t-phy@1a0c4000 { > > What is "t-phy"? Perhaps you should have used just "phy" here... At first I use "phy", but it causes dt_binding_check fail: "'#phy-cells' is a required property" Due to we only need add '#phy-cells' for each subnode (usb-phy, pcie-phy or sata-phy), but not for parent one, I change the parent node name as "t-phy" which is a glue layer node, not a real phy. I also prefer to "phy", but seems dt_binding_check can't distinguish this case. Thanks > > > + compatible = "mediatek,mt7622-tphy", > > "mediatek,generic-tphy-v1"; > > reg = <0 0x1a0c4000 0 0x700>; > > #address-cells = <2>; > > @@ -875,8 +875,9 @@ > > status = "disabled"; > > }; > > > > - sata_phy: sata-phy@1a243000 { > > - compatible = "mediatek,generic-tphy-v1"; > > + sata_phy: t-phy@1a243000 { > > Same here... > > > + compatible = "mediatek,mt7622-tphy", > > + "mediatek,generic-tphy-v1"; > > #address-cells = <2>; > > #size-cells = <2>; > > ranges; > > MBR, Sergei
On Sat, 2021-01-16 at 12:43 +0300, Sergei Shtylyov wrote: > On 16.01.2021 12:06, Chunfeng Yun wrote: > > > Harmonize node names, compatibles and properties. > > > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > > --- > > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > index 5b782a4769e7..a69a033a68ac 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > [...] > > @@ -908,11 +908,11 @@ > > status = "disabled"; > > }; > > > > - mipi_tx0: mipi-dphy@11e50000 { > > + mipi_tx0: dsi-phy@11e50000 { > > Again, why not just "phy@..."? This following the style as usb-phy, pcie-phy etc. but is not yet a standard prefix for Display serial interface PHY > > [...] > > @@ -931,11 +931,10 @@ > > }; > > }; > > > > - u3phy: usb-phy@11f40000 { > > + u3phy: t-phy@11f40000 { > > Here as well... Already explain it in [11/15] > > [...] > > MBR, Sergei
On Mon, 2021-01-18 at 22:56 +0800, Chun-Kuang Hu wrote: > Hi, Chunfeng: > > Chunfeng Yun <chunfeng.yun@mediatek.com> 於 2021年1月16日 週六 下午5:07寫道: > > > > The compatilbe "mediatek,mt7623-mipi-tx" is not supported in driver, > > and in fact uses "mediatek,mt2701-mipi-tx" instead on MT7623, so changes > > the compatible items to make dependence clear. > > > > And add an optional "clock-names" property, it's not used to get the clock, > > but some DTS files provide it. > > Separate the clock part to another patch. Ok, will do it. > > Regards, > Chun-Kuang. > > > > > Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org> > > Cc: Philipp Zabel <p.zabel@pengutronix.de> > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > > --- > > .../bindings/phy/mediatek,dsi-phy.yaml | 17 ++++++++++++----- > > 1 file changed, 12 insertions(+), 5 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml > > index 71d4acea1f66..af6e554c5b69 100644 > > --- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml > > +++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml > > @@ -19,11 +19,14 @@ properties: > > pattern: "^dsi-phy@[0-9a-f]+$" > > > > compatible: > > - enum: > > - - mediatek,mt2701-mipi-tx > > - - mediatek,mt7623-mipi-tx > > - - mediatek,mt8173-mipi-tx > > - - mediatek,mt8183-mipi-tx > > + oneOf: > > + - items: > > + - enum: > > + - mediatek,mt7623-mipi-tx > > + - const: mediatek,mt2701-mipi-tx > > + - const: mediatek,mt2701-mipi-tx > > + - const: mediatek,mt8173-mipi-tx > > + - const: mediatek,mt8183-mipi-tx > > > > reg: > > maxItems: 1 > > @@ -32,6 +35,10 @@ properties: > > items: > > - description: PLL reference clock > > > > + clock-names: > > + items: > > + - const: ref > > + > > clock-output-names: > > maxItems: 1 > > > > -- > > 2.18.0
On Mon, 2021-01-18 at 23:05 +0800, Chun-Kuang Hu wrote: > Hi, Chunfeng: > > Chunfeng Yun <chunfeng.yun@mediatek.com> 於 2021年1月16日 週六 下午5:07寫道: > > > > The compatilbe "mediatek,mt7623-hdmi-tx" is not supported in driver, > > and in fact uses "mediatek,mt2701-hdmi-tx" instead on MT7623, so changes > > the compatible items to make dependence clear. > > > > Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org> > > Cc: Philipp Zabel <p.zabel@pengutronix.de> > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > > --- > > .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 11 +++++++---- > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml > > index 4752517a1446..0d94950b84ca 100644 > > --- a/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml > > +++ b/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml > > @@ -21,10 +21,13 @@ properties: > > pattern: "^hdmi-phy@[0-9a-f]+$" > > > > compatible: > > - enum: > > - - mediatek,mt2701-hdmi-phy > > - - mediatek,mt7623-hdmi-phy > > - - mediatek,mt8173-hdmi-phy > > + oneOf: > > + - items: > > + - enum: > > + - mediatek,mt7623-hdmi-phy > > + - const: mediatek,mt2701-hdmi-phy > > + - const: mediatek,mt2701-hdmi-phy > > + - const: mediatek,mt8173-hdmi-phy > > > > I like move 'items' to the bottom. I follow the same style as other bindings > > - const: mediatek,mt2701-hdmi-phy > - const: mediatek,mt8173-hdmi-phy > > - items: > - enum: > - mediatek,mt7623-hdmi-phy > - const: mediatek,mt2701-hdmi-phy > > Regards, > Chun-Kuang. > > > reg: > > maxItems: 1 > > -- > > 2.18.0
diff --git a/Documentation/devicetree/bindings/usb/usb-device.yaml b/Documentation/devicetree/bindings/usb/usb-device.yaml index 7bb25a45427d..23e76cfb2066 100644 --- a/Documentation/devicetree/bindings/usb/usb-device.yaml +++ b/Documentation/devicetree/bindings/usb/usb-device.yaml @@ -82,9 +82,9 @@ required: additionalProperties: true examples: - #hub connected to port 1 - #device connected to port 2 - #device connected to port 3 + # hub connected to port 1 + # device connected to port 2 + # device connected to port 3 # interface 0 of configuration 1 # interface 0 of configuration 2 - |
Fix warning: "missing starting space in comment" Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> --- Documentation/devicetree/bindings/usb/usb-device.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.18.0