Skip to contentSkip to conversation

arm64: dts: mediatek: mt8516: rename usb phy

PATCH Applied Fabien Parent 2 participants 4 messages Oct 14, 2020 – Oct 19, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm64: dts: mediatek: mt8516: rename usb phy

The USB phy node is named usb0_phy but there is only one phy with 2 ports on MT8516. Rename the phy to make it more obvious it can also support the usb1 node.
The usb1 node will be added in a follow-up commit.

---
 arch/arm64/boot/dts/mediatek/mt8516.dtsi         | 2 +-
 arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt8516.dtsi +1 -1
index 943c426e9aaf..50049b6c1ba7 100644
@@ -455,7 +455,7 @@ usb0: usb@11100000 {
 			status = "disabled";
 		};
 
-		usb0_phy: usb@11110000 {
+		usb_phy: usb@11110000 {
 			compatible = "mediatek,generic-tphy-v1";
 			reg = <0 0x11110000 0 0x800>;
 			#address-cells = <2>;
arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +1 -1
index dfceffe6950a..8bad8faf35d2 100644
@@ -195,7 +195,7 @@ usb_con: connector {
 	};
 };
 
-&usb0_phy {
+&usb_phy {
 	status = "okay";
 };
 
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 arm64: dts: mediatek: mt8516: add usb1 node

The MT8516 has 2 USB instances. Add support for the second USB instance. usb1 can only work in host mode.

---
 arch/arm64/boot/dts/mediatek/mt8516.dtsi | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm64/boot/dts/mediatek/mt8516.dtsi +21 -0
index 50049b6c1ba7..eca7969e15ab 100644
@@ -455,6 +455,20 @@ usb0: usb@11100000 {
 			status = "disabled";
 		};
 
+		usb1: usb@11190000 {
+			compatible = "mediatek,mtk-musb";
+			reg = <0 0x11190000 0 0x1000>;
+			interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_LOW>;
+			interrupt-names = "mc";
+			phys = <&usb1_port PHY_TYPE_USB2>;
+			clocks = <&topckgen CLK_TOP_USB>,
+				 <&topckgen CLK_TOP_USBIF>,
+				 <&topckgen CLK_TOP_USB_1P>;
+			clock-names = "main","mcu","univpll";
+			dr_mode = "host";
+			status = "disabled";
+		};
+
 		usb_phy: usb@11110000 {
 			compatible = "mediatek,generic-tphy-v1";
 			reg = <0 0x11110000 0 0x800>;
@@ -469,6 +483,13 @@ usb0_port: usb-phy@11110800 {
 				clock-names = "ref";
 				#phy-cells = <1>;
 			};
+
+			usb1_port: usb-phy@11110900 {
+				reg = <0 0x11110900 0 0x100>;
+				clocks = <&topckgen CLK_TOP_USB_PHY48M>;
+				clock-names = "ref";
+				#phy-cells = <1>;
+			};
 		};
 
 		auxadc: adc@11003000 {
Signature · 1 line
2.28.0
maintainer Applied
#2 lore raw

Re: [PATCH 2/2] arm64: dts: mediatek: mt8516: add usb1 node

Quoted 4 lines · Fabien Parent

The MT8516 has 2 USB instances. Add support for the second USB instance. usb1 can only work in host mode.

Applied to v5.10-tmp/dts64

Thanks!

Quoted 44 lines
---
  arch/arm64/boot/dts/mediatek/mt8516.dtsi | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
arch/arm64/boot/dts/mediatek/mt8516.dtsi +21 -0
index 50049b6c1ba7..eca7969e15ab 100644
@@ -455,6 +455,20 @@ usb0: usb@11100000 {
  			status = "disabled";
  		};
 
+		usb1: usb@11190000 {
+			compatible = "mediatek,mtk-musb";
+			reg = <0 0x11190000 0 0x1000>;
+			interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_LOW>;
+			interrupt-names = "mc";
+			phys = <&usb1_port PHY_TYPE_USB2>;
+			clocks = <&topckgen CLK_TOP_USB>,
+				 <&topckgen CLK_TOP_USBIF>,
+				 <&topckgen CLK_TOP_USB_1P>;
+			clock-names = "main","mcu","univpll";
+			dr_mode = "host";
+			status = "disabled";
+		};
+
  		usb_phy: usb@11110000 {
  			compatible = "mediatek,generic-tphy-v1";
  			reg = <0 0x11110000 0 0x800>;
@@ -469,6 +483,13 @@ usb0_port: usb-phy@11110800 {
  				clock-names = "ref";
  				#phy-cells = <1>;
  			};
+
+			usb1_port: usb-phy@11110900 {
+				reg = <0 0x11110900 0 0x100>;
+				clocks = <&topckgen CLK_TOP_USB_PHY48M>;
+				clock-names = "ref";
+				#phy-cells = <1>;
+			};
  		};
 
  		auxadc: adc@11003000 {
maintainer Applied
#3 lore raw
In reply to Fabien Parent
Quoted 6 lines · Fabien Parent

The USB phy node is named usb0_phy but there is only one phy with 2 ports on MT8516. Rename the phy to make it more obvious it can also support the usb1 node.
The usb1 node will be added in a follow-up commit.

Applied to v5.10-tmp/dts64

Thanks!

Quoted 32 lines
---
  arch/arm64/boot/dts/mediatek/mt8516.dtsi         | 2 +-
  arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt8516.dtsi +1 -1
index 943c426e9aaf..50049b6c1ba7 100644
@@ -455,7 +455,7 @@ usb0: usb@11100000 {
  			status = "disabled";
  		};
 
-		usb0_phy: usb@11110000 {
+		usb_phy: usb@11110000 {
  			compatible = "mediatek,generic-tphy-v1";
  			reg = <0 0x11110000 0 0x800>;
  			#address-cells = <2>;
arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +1 -1
index dfceffe6950a..8bad8faf35d2 100644
@@ -195,7 +195,7 @@ usb_con: connector {
  	};
  };
 
-&usb0_phy {
+&usb_phy {
  	status = "okay";
  };