| Message ID | 20210316092232.9806-12-chunfeng.yun@mediatek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d0ec64bd6766bb73eb2d2dc1c78614595d23639d |
| Headers | show |
| Series | [v5,01/13] dt-bindings: usb: fix yamllint check warning | expand |
On 16/03/2021 10:22, Chunfeng Yun wrote: > This is used to fix dtbs_check warning > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Applied now to v5.12-next/dts32 > --- > v2~v5: no changes > --- > arch/arm/boot/dts/mt7623.dtsi | 26 ++++++++++++++------------ > arch/arm/boot/dts/mt7623n.dtsi | 4 ++-- > 2 files changed, 16 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi > index aea6809500d7..3c11f7cfcc40 100644 > --- a/arch/arm/boot/dts/mt7623.dtsi > +++ b/arch/arm/boot/dts/mt7623.dtsi > @@ -787,8 +787,9 @@ > }; > }; > > - pcie0_phy: pcie-phy@1a149000 { > - compatible = "mediatek,generic-tphy-v1"; > + pcie0_phy: t-phy@1a149000 { > + compatible = "mediatek,mt7623-tphy", > + "mediatek,generic-tphy-v1"; > reg = <0 0x1a149000 0 0x0700>; > #address-cells = <2>; > #size-cells = <2>; > @@ -804,8 +805,9 @@ > }; > }; > > - pcie1_phy: pcie-phy@1a14a000 { > - compatible = "mediatek,generic-tphy-v1"; > + pcie1_phy: t-phy@1a14a000 { > + compatible = "mediatek,mt7623-tphy", > + "mediatek,generic-tphy-v1"; > reg = <0 0x1a14a000 0 0x0700>; > #address-cells = <2>; > #size-cells = <2>; > @@ -823,7 +825,7 @@ > > usb1: usb@1a1c0000 { > compatible = "mediatek,mt7623-xhci", > - "mediatek,mt8173-xhci"; > + "mediatek,mtk-xhci"; > reg = <0 0x1a1c0000 0 0x1000>, > <0 0x1a1c4700 0 0x0100>; > reg-names = "mac", "ippc"; > @@ -836,9 +838,9 @@ > status = "disabled"; > }; > > - u3phy1: usb-phy@1a1c4000 { > - compatible = "mediatek,mt7623-u3phy", > - "mediatek,mt2701-u3phy"; > + u3phy1: t-phy@1a1c4000 { > + compatible = "mediatek,mt7623-tphy", > + "mediatek,generic-tphy-v1"; > reg = <0 0x1a1c4000 0 0x0700>; > #address-cells = <2>; > #size-cells = <2>; > @@ -864,7 +866,7 @@ > > usb2: usb@1a240000 { > compatible = "mediatek,mt7623-xhci", > - "mediatek,mt8173-xhci"; > + "mediatek,mtk-xhci"; > reg = <0 0x1a240000 0 0x1000>, > <0 0x1a244700 0 0x0100>; > reg-names = "mac", "ippc"; > @@ -877,9 +879,9 @@ > status = "disabled"; > }; > > - u3phy2: usb-phy@1a244000 { > - compatible = "mediatek,mt7623-u3phy", > - "mediatek,mt2701-u3phy"; > + u3phy2: t-phy@1a244000 { > + compatible = "mediatek,mt7623-tphy", > + "mediatek,generic-tphy-v1"; > reg = <0 0x1a244000 0 0x0700>; > #address-cells = <2>; > #size-cells = <2>; > diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi > index 1880ac9e32cf..bcb0846e29fd 100644 > --- a/arch/arm/boot/dts/mt7623n.dtsi > +++ b/arch/arm/boot/dts/mt7623n.dtsi > @@ -246,7 +246,7 @@ > status = "disabled"; > }; > > - mipi_tx0: mipi-dphy@10010000 { > + mipi_tx0: dsi-phy@10010000 { > compatible = "mediatek,mt7623-mipi-tx", > "mediatek,mt2701-mipi-tx"; > reg = <0 0x10010000 0 0x90>; > @@ -265,7 +265,7 @@ > status = "disabled"; > }; > > - hdmi_phy: phy@10209100 { > + hdmi_phy: hdmi-phy@10209100 { > compatible = "mediatek,mt7623-hdmi-phy", > "mediatek,mt2701-hdmi-phy"; > reg = <0 0x10209100 0 0x24>; >
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi index aea6809500d7..3c11f7cfcc40 100644 --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -787,8 +787,9 @@ }; }; - pcie0_phy: pcie-phy@1a149000 { - compatible = "mediatek,generic-tphy-v1"; + pcie0_phy: t-phy@1a149000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a149000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -804,8 +805,9 @@ }; }; - pcie1_phy: pcie-phy@1a14a000 { - compatible = "mediatek,generic-tphy-v1"; + pcie1_phy: t-phy@1a14a000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a14a000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -823,7 +825,7 @@ usb1: usb@1a1c0000 { compatible = "mediatek,mt7623-xhci", - "mediatek,mt8173-xhci"; + "mediatek,mtk-xhci"; reg = <0 0x1a1c0000 0 0x1000>, <0 0x1a1c4700 0 0x0100>; reg-names = "mac", "ippc"; @@ -836,9 +838,9 @@ status = "disabled"; }; - u3phy1: usb-phy@1a1c4000 { - compatible = "mediatek,mt7623-u3phy", - "mediatek,mt2701-u3phy"; + u3phy1: t-phy@1a1c4000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a1c4000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -864,7 +866,7 @@ usb2: usb@1a240000 { compatible = "mediatek,mt7623-xhci", - "mediatek,mt8173-xhci"; + "mediatek,mtk-xhci"; reg = <0 0x1a240000 0 0x1000>, <0 0x1a244700 0 0x0100>; reg-names = "mac", "ippc"; @@ -877,9 +879,9 @@ status = "disabled"; }; - u3phy2: usb-phy@1a244000 { - compatible = "mediatek,mt7623-u3phy", - "mediatek,mt2701-u3phy"; + u3phy2: t-phy@1a244000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a244000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi index 1880ac9e32cf..bcb0846e29fd 100644 --- a/arch/arm/boot/dts/mt7623n.dtsi +++ b/arch/arm/boot/dts/mt7623n.dtsi @@ -246,7 +246,7 @@ status = "disabled"; }; - mipi_tx0: mipi-dphy@10010000 { + mipi_tx0: dsi-phy@10010000 { compatible = "mediatek,mt7623-mipi-tx", "mediatek,mt2701-mipi-tx"; reg = <0 0x10010000 0 0x90>; @@ -265,7 +265,7 @@ status = "disabled"; }; - hdmi_phy: phy@10209100 { + hdmi_phy: hdmi-phy@10209100 { compatible = "mediatek,mt7623-hdmi-phy", "mediatek,mt2701-hdmi-phy"; reg = <0 0x10209100 0 0x24>;
This is used to fix dtbs_check warning Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> --- v2~v5: no changes --- arch/arm/boot/dts/mt7623.dtsi | 26 ++++++++++++++------------ arch/arm/boot/dts/mt7623n.dtsi | 4 ++-- 2 files changed, 16 insertions(+), 14 deletions(-)