Squashed 'dts/upstream/' changes from aaba2d45dc2a..b35b9bd1d4ee

[thirdparty/u-boot.git] / src / arm / nxp / imx / imx25.dtsi

diff --git a/src/arm/nxp/imx/imx25.dtsi b/src/arm/nxp/imx/imx25.dtsi
index 534c70b8d79df50564e4450db9890541a85a16a4..9cfff2151b7edc9fc5eb6dc390dc35286aed332c 100644 (file)
--- a/src/arm/nxp/imx/imx25.dtsi
+++ b/src/arm/nxp/imx/imx25.dtsi
@@ -68,6 +68,16 @@
                };
        };
 
+       usbphy0: usb-phy0 {
+               compatible = "usb-nop-xceiv";
+               #phy-cells = <0>;
+       };
+
+       usbphy1: usb-phy1 {
+               compatible = "usb-nop-xceiv";
+               #phy-cells = <0>;
+       };
+
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -93,7 +103,7 @@
                                compatible = "fsl,imx25-i2c", "fsl,imx21-i2c";
                                reg = <0x43f80000 0x4000>;
                                clocks = <&clks 48>;
-                               clock-names = "";
+                               clock-names = "ipg";
                                interrupts = <3>;
                                status = "disabled";
                        };
@@ -104,7 +114,7 @@
                                compatible = "fsl,imx25-i2c", "fsl,imx21-i2c";
                                reg = <0x43f84000 0x4000>;
                                clocks = <&clks 48>;
-                               clock-names = "";
+                               clock-names = "ipg";
                                interrupts = <10>;
                                status = "disabled";
                        };
@@ -151,7 +161,7 @@
                                compatible = "fsl,imx25-i2c", "fsl,imx21-i2c";
                                reg = <0x43f98000 0x4000>;
                                clocks = <&clks 48>;
-                               clock-names = "";
+                               clock-names = "ipg";
                                interrupts = <4>;
                                status = "disabled";
                        };
@@ -178,12 +188,9 @@
                        };
 
                        kpp: kpp@43fa8000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "fsl,imx25-kpp", "fsl,imx21-kpp";
                                reg = <0x43fa8000 0x4000>;
                                clocks = <&clks 102>;
-                               clock-names = "";
                                interrupts = <24>;
                                status = "disabled";
                        };
@@ -542,7 +549,7 @@
                        };
 
                        iim: efuse@53ff0000 {
-                               compatible = "fsl,imx25-iim", "fsl,imx27-iim";
+                               compatible = "fsl,imx25-iim";
                                reg = <0x53ff0000 0x4000>;
                                interrupts = <19>;
                                clocks = <&clks 99>;
@@ -597,7 +604,7 @@
                        #size-cells = <1>;
                };
 
-               emi@80000000 {
+               bus@80000000 {
                        compatible = "fsl,emi-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -617,22 +624,4 @@
                        };
                };
        };
-
-       usbphy {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               usbphy0: usb-phy@0 {
-                       reg = <0>;
-                       compatible = "usb-nop-xceiv";
-                       #phy-cells = <0>;
-               };
-
-               usbphy1: usb-phy@1 {
-                       reg = <1>;
-                       compatible = "usb-nop-xceiv";
-                       #phy-cells = <0>;
-               };
-       };
 };