From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Tue, 14 Jul 2020 17:42:43 +0000 (-0300)
Subject: MLK-24374-2 arm64: dts: imx8qm: Move USBH1 to imx8qm-ss-conn
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~577^2~2^2~325
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=41db90ffb0f296b2d0d1a799fc091f981c5eef9d;p=linux.git

MLK-24374-2 arm64: dts: imx8qm: Move USBH1 to imx8qm-ss-conn

Commit ee96e9f815d6 ("MLK-24368-1 arm64: dts: imx8qm: Add support for USBH1")
caused i.MX8DXL USB PHYs to not go into low power mode via runtime suspend.

Fix it by moving the usbh1, usbmisc2 and usbphynop2 to the specific
imx8qm-ss-conn.dtsi file.

While at it, change the usbphynop2 status as disabled.

Reviewed-by: Jun Li <jun.li@nxp.com>
Tested-by: Sebastien Haezebrouck <sebastien.haezebrouck@nxp.com>
Reported-by: Sebastien Haezebrouck <sebastien.haezebrouck@nxp.com>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi
index 59a0a6ef57d3..c1807ed8ae2c 100644
--- a/arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi
@@ -62,31 +62,6 @@ conn_subsys: bus@5b000000 {
 		reg = <0x5b0d0200 0x200>;
 	};
 
-	usbh1: usb@5b0e0000 {
-		compatible = "fsl,imx8qm-usb", "fsl,imx7ulp-usb",
-			"fsl,imx27-usb";
-		reg = <0x5b0e0000 0x200>;
-		interrupt-parent = <&gic>;
-		interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-		phy_type = "hsic";
-		dr_mode = "host";
-		fsl,usbphy = <&usbphynop2>;
-		fsl,usbmisc = <&usbmisc2 0>;
-		clocks = <&usb2_lpcg 0>;
-		ahb-burst-config = <0x0>;
-		tx-burst-size-dword = <0x10>;
-		rx-burst-size-dword = <0x10>;
-		#stream-id-cells = <1>;
-		power-domains = <&pd IMX_SC_R_USB_1>;
-		status = "disabled";
-	};
-
-	usbmisc2: usbmisc@5b0e0200 {
-		#index-cells = <1>;
-		compatible = "fsl,imx7ulp-usbmisc", "fsl,imx6q-usbmisc";
-		reg = <0x5b0e0200 0x200>;
-	};
-
 	usbphy1: usbphy@0x5b100000 {
 		compatible = "fsl,imx8qm-usbphy", "fsl,imx7ulp-usbphy",
 			"fsl,imx6ul-usbphy", "fsl,imx23-usbphy";
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi
index c8b64a823388..d50856d38577 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi
@@ -4,6 +4,41 @@
  *	Dong Aisheng <aisheng.dong@nxp.com>
  */
 
+&conn_subsys {
+	usbh1: usb@5b0e0000 {
+		compatible = "fsl,imx8qm-usb", "fsl,imx7ulp-usb",
+			"fsl,imx27-usb";
+		reg = <0x5b0e0000 0x200>;
+		interrupt-parent = <&gic>;
+		interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+		phy_type = "hsic";
+		dr_mode = "host";
+		fsl,usbphy = <&usbphynop2>;
+		fsl,usbmisc = <&usbmisc2 0>;
+		clocks = <&usb2_lpcg 0>;
+		ahb-burst-config = <0x0>;
+		tx-burst-size-dword = <0x10>;
+		rx-burst-size-dword = <0x10>;
+		#stream-id-cells = <1>;
+		power-domains = <&pd IMX_SC_R_USB_1>;
+		status = "disabled";
+	};
+
+	usbmisc2: usbmisc@5b0e0200 {
+		#index-cells = <1>;
+		compatible = "fsl,imx7ulp-usbmisc", "fsl,imx6q-usbmisc";
+		reg = <0x5b0e0200 0x200>;
+	};
+
+	usbphynop2: usbphynop2 {
+		compatible = "usb-nop-xceiv";
+		clocks = <&usb2_lpcg 1>;
+		clock-names = "main_clk";
+		power-domains = <&pd IMX_SC_R_USB_0_PHY>;
+		status = "disabled";
+	};
+};
+
 &fec1 {
 	compatible = "fsl,imx8qm-fec", "fsl,imx6sx-fec";
 	iommus = <&smmu 0x12 0x7f80>;