arm: imx943: Update dts files to build with v7.1-dts tag

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 <trini@konsulko.com>

diff --git a/arch/arm/dts/imx943-evk-u-boot.dtsi b/arch/arm/dts/imx943-evk-u-boot.dtsi
index 635a3042fddc599f1fc5b5733207695340cf8b55..3c395610c5ffc8cad7cd9e0a2aa58bb46ba6a699 100644 (file)
--- 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 74481aeefb5d9aee68aba13a5e6def5041604efb..8bd63d2e213dcde6c495e61d12e476341505b054 100644 (file)
--- 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>,