ARM: dts: exynos: Use macros for pinctrl configuration on exynos4x12

[linux-beck.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 cd363d7e4e34a5cb1e6cd92e59c90435bdf25d18..96f8e94b4ac028b66bfd3d6986f50212d5406c57 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";
@@ -489,16 +500,16 @@
 &pinctrl_1 {
        keypad_rows: keypad-rows {
                samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
-               samsung,pin-function = <3>;
-               samsung,pin-pud = <3>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+               samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 
        keypad_cols: keypad-cols {
                samsung,pins = "gpx1-0", "gpx1-1";
-               samsung,pin-function = <3>;
-               samsung,pin-pud = <0>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 };