diff options
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 33 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 35 |
2 files changed, 35 insertions, 33 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi index 9badc2bfa915..4eb51cad186d 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"; @@ -208,14 +183,6 @@ conn_subsys: bus@5b000000 { status = "disabled"; }; - usbphynop2: usbphynop2 { - compatible = "usb-nop-xceiv"; - clocks = <&usb2_lpcg 1>; - clock-names = "main_clk"; - power-domains = <&pd IMX_SC_R_USB_0_PHY>; - status = "okay"; - }; - usbotg3: usb3@5b110000 { compatible = "Cadence,usb3"; reg = <0x5B110000 0x10000>, diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi index 00ebdc6fc875..1f875642ec2a 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>; |