diff mbox series

[v5,06/13] arm64: dts: mediatek: mt8173: fix dtbs_check warning

Message ID 20210316092232.9806-6-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
Harmonize nodes names, compatibles and remove unused property.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2~v5: no changes
---
 arch/arm64/boot/dts/mediatek/mt8173-evb.dts |  4 +---
 arch/arm64/boot/dts/mediatek/mt8173.dtsi    | 13 +++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

Comments

Matthias Brugger March 29, 2021, 1:46 p.m. UTC | #1
On 16/03/2021 10:22, Chunfeng Yun wrote:
> Harmonize nodes names, compatibles and remove unused property.
> 
> Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>

Applied now to v5.12-next/dts64

> ---
> v2~v5: no changes
> ---
>  arch/arm64/boot/dts/mediatek/mt8173-evb.dts |  4 +---
>  arch/arm64/boot/dts/mediatek/mt8173.dtsi    | 13 +++++++------
>  2 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
> index 6dffada2e66b..0ce81c4fe81e 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
> +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
> @@ -516,10 +516,8 @@
>  	extcon = <&extcon_usb>;
>  	dr_mode = "otg";
>  	wakeup-source;
> -	pinctrl-names = "default", "id_float", "id_ground";
> +	pinctrl-names = "default";
>  	pinctrl-0 = <&usb_id_pins_float>;
> -	pinctrl-1 = <&usb_id_pins_float>;
> -	pinctrl-2 = <&usb_id_pins_ground>;
>  	status = "okay";
>  };
>  
> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> index ecb37a7e6870..003a5653c505 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> @@ -631,7 +631,7 @@
>  			#mbox-cells = <2>;
>  		};
>  
> -		mipi_tx0: mipi-dphy@10215000 {
> +		mipi_tx0: dsi-phy@10215000 {
>  			compatible = "mediatek,mt8173-mipi-tx";
>  			reg = <0 0x10215000 0 0x1000>;
>  			clocks = <&clk26m>;
> @@ -641,7 +641,7 @@
>  			status = "disabled";
>  		};
>  
> -		mipi_tx1: mipi-dphy@10216000 {
> +		mipi_tx1: dsi-phy@10216000 {
>  			compatible = "mediatek,mt8173-mipi-tx";
>  			reg = <0 0x10216000 0 0x1000>;
>  			clocks = <&clk26m>;
> @@ -926,7 +926,7 @@
>  		};
>  
>  		ssusb: usb@11271000 {
> -			compatible = "mediatek,mt8173-mtu3";
> +			compatible = "mediatek,mt8173-mtu3", "mediatek,mtu3";
>  			reg = <0 0x11271000 0 0x3000>,
>  			      <0 0x11280700 0 0x0100>;
>  			reg-names = "mac", "ippc";
> @@ -943,8 +943,9 @@
>  			ranges;
>  			status = "disabled";
>  
> -			usb_host: xhci@11270000 {
> -				compatible = "mediatek,mt8173-xhci";
> +			usb_host: usb@11270000 {
> +				compatible = "mediatek,mt8173-xhci",
> +					     "mediatek,mtk-xhci";
>  				reg = <0 0x11270000 0 0x1000>;
>  				reg-names = "mac";
>  				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
> @@ -955,7 +956,7 @@
>  			};
>  		};
>  
> -		u3phy: usb-phy@11290000 {
> +		u3phy: t-phy@11290000 {
>  			compatible = "mediatek,mt8173-u3phy";
>  			reg = <0 0x11290000 0 0x800>;
>  			#address-cells = <2>;
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 6dffada2e66b..0ce81c4fe81e 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -516,10 +516,8 @@ 
 	extcon = <&extcon_usb>;
 	dr_mode = "otg";
 	wakeup-source;
-	pinctrl-names = "default", "id_float", "id_ground";
+	pinctrl-names = "default";
 	pinctrl-0 = <&usb_id_pins_float>;
-	pinctrl-1 = <&usb_id_pins_float>;
-	pinctrl-2 = <&usb_id_pins_ground>;
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index ecb37a7e6870..003a5653c505 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -631,7 +631,7 @@ 
 			#mbox-cells = <2>;
 		};
 
-		mipi_tx0: mipi-dphy@10215000 {
+		mipi_tx0: dsi-phy@10215000 {
 			compatible = "mediatek,mt8173-mipi-tx";
 			reg = <0 0x10215000 0 0x1000>;
 			clocks = <&clk26m>;
@@ -641,7 +641,7 @@ 
 			status = "disabled";
 		};
 
-		mipi_tx1: mipi-dphy@10216000 {
+		mipi_tx1: dsi-phy@10216000 {
 			compatible = "mediatek,mt8173-mipi-tx";
 			reg = <0 0x10216000 0 0x1000>;
 			clocks = <&clk26m>;
@@ -926,7 +926,7 @@ 
 		};
 
 		ssusb: usb@11271000 {
-			compatible = "mediatek,mt8173-mtu3";
+			compatible = "mediatek,mt8173-mtu3", "mediatek,mtu3";
 			reg = <0 0x11271000 0 0x3000>,
 			      <0 0x11280700 0 0x0100>;
 			reg-names = "mac", "ippc";
@@ -943,8 +943,9 @@ 
 			ranges;
 			status = "disabled";
 
-			usb_host: xhci@11270000 {
-				compatible = "mediatek,mt8173-xhci";
+			usb_host: usb@11270000 {
+				compatible = "mediatek,mt8173-xhci",
+					     "mediatek,mtk-xhci";
 				reg = <0 0x11270000 0 0x1000>;
 				reg-names = "mac";
 				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
@@ -955,7 +956,7 @@ 
 			};
 		};
 
-		u3phy: usb-phy@11290000 {
+		u3phy: t-phy@11290000 {
 			compatible = "mediatek,mt8173-u3phy";
 			reg = <0 0x11290000 0 0x800>;
 			#address-cells = <2>;