This is the second round of mxs-dt patches for 3.7. It's based on

mxs-dt-3.7 and mxs-clk-dt-lookup which have been pulled into arm-soc.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJQW8PHAAoJEFBXWFqHsHzO4GYH/jMaG4hFP4Epmxo88WJGhU4l
 6ZNI1Gz90XGnx+EKJY7B30cRkvO/ydWrlUB0lMMnKdXuM/okAV66TFWrNTaEWjq1
 15xlfn7jlpxY2lu2zflw3sM00jAL65AJDG3G4hA+ZnQlRo4G5MHYHAAGUawwxBJl
 J0P0ZSGrVvZ82wGnW2FhvjrF0WR6Ni0mrhRnWQhsub9lykc4YUgOhG0IgxAh8jMx
 RW7cR1o4St8ro4vm4joJdEa+ZQDprQDQsMJBOkacTb3SH4uDNpJpSeFVXa7BMSZ+
 A8UpG+aHELyCJKU3gHuApcxS0tiK+vd1p0dikRGu6y167hHcKkzqZyVqOYTMrOU=
 =/jro
 -----END PGP SIGNATURE-----

Merge tag 'mxs-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo:
This is the second round of mxs-dt patches for 3.7.  It's based on
mxs-dt-3.7 and mxs-clk-dt-lookup which have been pulled into arm-soc.

* tag 'mxs-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: m28evk: Disable OCOTP OUI loading
  ARM: dts: imx23-olinuxino: Add USB host support
  ARM: dts: mx23: Add USB resources
  ARM: dts: mxs: Add ethernetX to macX aliases

arch/arm/boot/dts/imx23-olinuxino.dts

@@ -40,6 +40,7 @@
 					reg = <0>;
 					fsl,pinmux-ids = <
 						0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
+						0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */
 					>;
 					fsl,drive-strength = <0>;
 					fsl,voltage = <1>;
@@ -60,6 +61,31 @@
 				pinctrl-0 = <&auart0_2pins_a>;
 				status = "okay";
 			};
+
+			usbphy0: usbphy@8007c000 {
+				status = "okay";
+			};
+		};
+	};
+
+	ahb@80080000 {
+		usb0: usb@80080000 {
+			vbus-supply = <&reg_usb0_vbus>;
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_usb0_vbus: usb0_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb0_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			enable-active-high;
+			startup-delay-us = <300>; /* LAN9215 requires a POR of 200us minimum */
+			gpio = <&gpio0 17 0>;
 		};
 	};
 

arch/arm/boot/dts/imx23.dtsi

@@ -436,8 +436,10 @@
 				status = "disabled";
 			};
 
-			usbphy@8007c000 {
+			usbphy0: usbphy@8007c000 {
+				compatible = "fsl,imx23-usbphy";
 				reg = <0x8007c000 0x2000>;
+				clocks = <&clks 41>;
 				status = "disabled";
 			};
 		};
@@ -450,8 +452,12 @@
 		reg = <0x80080000 0x80000>;
 		ranges;
 
-		usbctrl@80080000 {
+		usb0: usb@80080000 {
+			compatible = "fsl,imx23-usb", "fsl,imx27-usb";
 			reg = <0x80080000 0x40000>;
+			interrupts = <11>;
+			fsl,usbphy = <&usbphy0>;
+			clocks = <&clks 40>;
 			status = "disabled";
 		};
 	};

arch/arm/boot/dts/imx28.dtsi

@@ -27,6 +27,8 @@
 		serial2 = &auart2;
 		serial3 = &auart3;
 		serial4 = &auart4;
+		ethernet0 = &mac0;
+		ethernet1 = &mac1;
 	};
 
 	cpus {

arch/arm/mach-mxs/mach-mxs.c

@@ -288,8 +288,6 @@ static void __init imx28_evk_post_init(void)
 
 static void __init m28evk_init(void)
 {
-	update_fec_mac_prop(OUI_DENX);
-
 	mxsfb_pdata.mode_list = m28evk_video_modes;
 	mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes);
 	mxsfb_pdata.default_bpp = 16;