When moving to the v7,1-dts tag, we see a few problems trying to build this platform. In turn, when looking at the upstream changes we can see that USB3 support has been included now, but isn't exactly the same as in our tree either. Modify things such that we build again.
Signed-off-by: Tom Rini <[email protected]> --- Please note that these files are not covered directly by a MAINTAINERS entry, so an update to fix that would be appreciated. I'm also not sure if we retain exactly the same functionality after this patch, so a replacement patch to update correctly would also be good. Cc: Stefano Babic <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: "NXP i.MX U-Boot Team" <[email protected]> Cc: Alice Guo <[email protected]> --- arch/arm/dts/imx943-evk-u-boot.dtsi | 13 ------------- arch/arm/dts/imx943-u-boot.dtsi | 29 ----------------------------- 2 files changed, 42 deletions(-) diff --git a/arch/arm/dts/imx943-evk-u-boot.dtsi b/arch/arm/dts/imx943-evk-u-boot.dtsi index 3b3619d22327..c27f7b066498 100644 --- a/arch/arm/dts/imx943-evk-u-boot.dtsi +++ b/arch/arm/dts/imx943-evk-u-boot.dtsi @@ -126,19 +126,6 @@ status = "okay"; }; -&usb3_dwc3 { - bootph-pre-ram; - dr_mode = "otg"; - hnp-disable; - srp-disable; - adp-disable; - usb-role-switch; - role-switch-default-mode = "peripheral"; - snps,dis-u1-entry-quirk; - snps,dis-u2-entry-quirk; - status = "okay"; -}; - &usb3_phy { bootph-pre-ram; orientation-switch; diff --git a/arch/arm/dts/imx943-u-boot.dtsi b/arch/arm/dts/imx943-u-boot.dtsi index 74481aeefb5d..8bd63d2e213d 100644 --- a/arch/arm/dts/imx943-u-boot.dtsi +++ b/arch/arm/dts/imx943-u-boot.dtsi @@ -249,35 +249,6 @@ &{/soc} { bootph-all; - usb3: usb@4c010010 { - compatible = "fsl,imx95-dwc3", "fsl,imx8mp-dwc3"; - reg = <0x0 0x4c010010 0x0 0x04>, - <0x0 0x4c1f0000 0x0 0x20>; - ranges; - interrupts = <GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH>; - #address-cells = <2>; - #size-cells = <2>; - clocks = <&scmi_clk IMX94_CLK_HSIO>, - <&scmi_clk IMX94_CLK_32K>; - clock-names = "hsio", "suspend"; - power-domains = <&scmi_devpd IMX94_PD_HSIO_TOP>; - status = "disabled"; - - usb3_dwc3: usb@4c100000 { - compatible = "snps,dwc3"; - reg = <0x0 0x4c100000 0x0 0x10000>; - interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&scmi_clk IMX94_CLK_HSIO>, - <&scmi_clk IMX94_CLK_24M>, - <&scmi_clk IMX94_CLK_32K>; - clock-names = "bus_early", "ref", "suspend"; - phys = <&usb3_phy>, <&usb3_phy>; - phy-names = "usb2-phy", "usb3-phy"; - snps,gfladj-refclk-lpm-sel-quirk; - snps,parkmode-disable-ss-quirk; - }; - }; - usb3_phy: phy@4c1f0040 { compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy"; reg = <0x0 0x4c1f0040 0x0 0x40>, -- 2.43.0
