diff mbox series

[v5,13/13] arm: dts: mt2701: harmonize node names and compatibles

Message ID 20210316092232.9806-13-chunfeng.yun@mediatek.com (mailing list archive)
State New, archived
Headers show
Series [v5,01/13] dt-bindings: usb: fix yamllint check warning | expand

Commit Message

Chunfeng Yun March 16, 2021, 9:22 a.m. UTC
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/mt2701.dtsi | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Comments

Matthias Brugger March 29, 2021, 1:47 p.m. UTC | #1
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/mt2701.dtsi | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
> index fade14284017..4776f85d6d5b 100644
> --- a/arch/arm/boot/dts/mt2701.dtsi
> +++ b/arch/arm/boot/dts/mt2701.dtsi
> @@ -607,7 +607,7 @@
>  	};
>  
>  	usb0: usb@1a1c0000 {
> -		compatible = "mediatek,mt8173-xhci";
> +		compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
>  		reg = <0 0x1a1c0000 0 0x1000>,
>  		      <0 0x1a1c4700 0 0x0100>;
>  		reg-names = "mac", "ippc";
> @@ -620,8 +620,9 @@
>  		status = "disabled";
>  	};
>  
> -	u3phy0: usb-phy@1a1c4000 {
> -		compatible = "mediatek,mt2701-u3phy";
> +	u3phy0: t-phy@1a1c4000 {
> +		compatible = "mediatek,mt2701-tphy",
> +			     "mediatek,generic-tphy-v1";
>  		reg = <0 0x1a1c4000 0 0x0700>;
>  		#address-cells = <2>;
>  		#size-cells = <2>;
> @@ -646,7 +647,7 @@
>  	};
>  
>  	usb1: usb@1a240000 {
> -		compatible = "mediatek,mt8173-xhci";
> +		compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
>  		reg = <0 0x1a240000 0 0x1000>,
>  		      <0 0x1a244700 0 0x0100>;
>  		reg-names = "mac", "ippc";
> @@ -659,8 +660,9 @@
>  		status = "disabled";
>  	};
>  
> -	u3phy1: usb-phy@1a244000 {
> -		compatible = "mediatek,mt2701-u3phy";
> +	u3phy1: t-phy@1a244000 {
> +		compatible = "mediatek,mt2701-tphy",
> +			     "mediatek,generic-tphy-v1";
>  		reg = <0 0x1a244000 0 0x0700>;
>  		#address-cells = <2>;
>  		#size-cells = <2>;
> @@ -700,8 +702,9 @@
>  		status = "disabled";
>  	};
>  
> -	u2phy0: usb-phy@11210000 {
> -		compatible = "mediatek,generic-tphy-v1";
> +	u2phy0: t-phy@11210000 {
> +		compatible = "mediatek,mt2701-tphy",
> +			     "mediatek,generic-tphy-v1";
>  		reg = <0 0x11210000 0 0x0800>;
>  		#address-cells = <2>;
>  		#size-cells = <2>;
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index fade14284017..4776f85d6d5b 100644
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi
@@ -607,7 +607,7 @@ 
 	};
 
 	usb0: usb@1a1c0000 {
-		compatible = "mediatek,mt8173-xhci";
+		compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
 		reg = <0 0x1a1c0000 0 0x1000>,
 		      <0 0x1a1c4700 0 0x0100>;
 		reg-names = "mac", "ippc";
@@ -620,8 +620,9 @@ 
 		status = "disabled";
 	};
 
-	u3phy0: usb-phy@1a1c4000 {
-		compatible = "mediatek,mt2701-u3phy";
+	u3phy0: t-phy@1a1c4000 {
+		compatible = "mediatek,mt2701-tphy",
+			     "mediatek,generic-tphy-v1";
 		reg = <0 0x1a1c4000 0 0x0700>;
 		#address-cells = <2>;
 		#size-cells = <2>;
@@ -646,7 +647,7 @@ 
 	};
 
 	usb1: usb@1a240000 {
-		compatible = "mediatek,mt8173-xhci";
+		compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
 		reg = <0 0x1a240000 0 0x1000>,
 		      <0 0x1a244700 0 0x0100>;
 		reg-names = "mac", "ippc";
@@ -659,8 +660,9 @@ 
 		status = "disabled";
 	};
 
-	u3phy1: usb-phy@1a244000 {
-		compatible = "mediatek,mt2701-u3phy";
+	u3phy1: t-phy@1a244000 {
+		compatible = "mediatek,mt2701-tphy",
+			     "mediatek,generic-tphy-v1";
 		reg = <0 0x1a244000 0 0x0700>;
 		#address-cells = <2>;
 		#size-cells = <2>;
@@ -700,8 +702,9 @@ 
 		status = "disabled";
 	};
 
-	u2phy0: usb-phy@11210000 {
-		compatible = "mediatek,generic-tphy-v1";
+	u2phy0: t-phy@11210000 {
+		compatible = "mediatek,mt2701-tphy",
+			     "mediatek,generic-tphy-v1";
 		reg = <0 0x11210000 0 0x0800>;
 		#address-cells = <2>;
 		#size-cells = <2>;