Merge tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / arm / boot / dts / exynos4412-origen.dts

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index cd363d7..26a36fe 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -84,6 +84,22 @@
        cpu0-supply = <&buck2_reg>;
 };
 
+&exynos_usbphy {
+       status = "okay";
+};
+
+&ehci {
+       samsung,vbus-gpio = <&gpx3 5 1>;
+       status = "okay";
+
+       port@1{
+               status = "okay";
+       };
+       port@2 {
+               status = "okay";
+       };
+};
+
 &fimd {
        pinctrl-0 = <&lcd_clk &lcd_data24 &pwm1_out>;
        pinctrl-names = "default";
@@ -466,11 +482,6 @@
        };
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-       status = "okay";
-};
-
 &mshc_0 {
        pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
        pinctrl-names = "default";