diff mbox series

[v5,08/13] arm64: dts: mediatek: mt8516: harmonize node names and compatibles

Message ID 20210316092232.9806-8-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:
  harmonize node names and compatibles;
  add property "usb-role-switch" for connector dependence.

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

Comments

Matthias Brugger March 29, 2021, 1:46 p.m. UTC | #1
On 16/03/2021 10:22, Chunfeng Yun wrote:
> This is used to fix dtbs_check warning:
>   harmonize node names and compatibles;
>   add property "usb-role-switch" for connector dependence.
> 
> 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/mt8516.dtsi         | 9 +++++----
>  arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 1 +
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/mediatek/mt8516.dtsi b/arch/arm64/boot/dts/mediatek/mt8516.dtsi
> index b80e95574bef..bbe5a1419eff 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8516.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8516.dtsi
> @@ -480,7 +480,7 @@
>  		};
>  
>  		usb0: usb@11100000 {
> -			compatible = "mediatek,mtk-musb";
> +			compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb";
>  			reg = <0 0x11100000 0 0x1000>;
>  			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>;
>  			interrupt-names = "mc";
> @@ -493,7 +493,7 @@
>  		};
>  
>  		usb1: usb@11190000 {
> -			compatible = "mediatek,mtk-musb";
> +			compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb";
>  			reg = <0 0x11190000 0 0x1000>;
>  			interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_LOW>;
>  			interrupt-names = "mc";
> @@ -506,8 +506,9 @@
>  			status = "disabled";
>  		};
>  
> -		usb_phy: usb@11110000 {
> -			compatible = "mediatek,generic-tphy-v1";
> +		usb_phy: t-phy@11110000 {
> +			compatible = "mediatek,mt8516-tphy",
> +				     "mediatek,generic-tphy-v1";
>  			reg = <0 0x11110000 0 0x800>;
>  			#address-cells = <2>;
>  			#size-cells = <2>;
> diff --git a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
> index 63fd70086bb8..7d738f01cf8d 100644
> --- a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
> @@ -188,6 +188,7 @@
>  &usb0 {
>  	status = "okay";
>  	dr_mode = "peripheral";
> +	usb-role-switch;
>  
>  	usb_con: connector {
>  		compatible = "usb-c-connector";
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/mediatek/mt8516.dtsi b/arch/arm64/boot/dts/mediatek/mt8516.dtsi
index b80e95574bef..bbe5a1419eff 100644
--- a/arch/arm64/boot/dts/mediatek/mt8516.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8516.dtsi
@@ -480,7 +480,7 @@ 
 		};
 
 		usb0: usb@11100000 {
-			compatible = "mediatek,mtk-musb";
+			compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb";
 			reg = <0 0x11100000 0 0x1000>;
 			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>;
 			interrupt-names = "mc";
@@ -493,7 +493,7 @@ 
 		};
 
 		usb1: usb@11190000 {
-			compatible = "mediatek,mtk-musb";
+			compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb";
 			reg = <0 0x11190000 0 0x1000>;
 			interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_LOW>;
 			interrupt-names = "mc";
@@ -506,8 +506,9 @@ 
 			status = "disabled";
 		};
 
-		usb_phy: usb@11110000 {
-			compatible = "mediatek,generic-tphy-v1";
+		usb_phy: t-phy@11110000 {
+			compatible = "mediatek,mt8516-tphy",
+				     "mediatek,generic-tphy-v1";
 			reg = <0 0x11110000 0 0x800>;
 			#address-cells = <2>;
 			#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
index 63fd70086bb8..7d738f01cf8d 100644
--- a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
+++ b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
@@ -188,6 +188,7 @@ 
 &usb0 {
 	status = "okay";
 	dr_mode = "peripheral";
+	usb-role-switch;
 
 	usb_con: connector {
 		compatible = "usb-c-connector";