Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / boot / dts / exynos4210-universal_c210.dts

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index cf95202..0c89ea9 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -20,7 +20,8 @@
        model = "Samsung Universal C210 based on Exynos4210 rev0";
        compatible = "samsung,universal_c210", "samsung,exynos4210", "samsung,exynos4";
 
-       memory {
+       memory@40000000 {
+               device_type = "memory";
                reg =  <0x40000000 0x10000000
                        0x50000000 0x10000000>;
        };
@@ -521,16 +522,16 @@
 &pinctrl_1 {
        hdmi_hpd: hdmi-hpd {
                samsung,pins = "gpx3-7";
-               samsung,pin-pud = <0>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
        };
 };
 
 &pinctrl_0 {
        i2c_ddc_bus: i2c-ddc-bus {
                samsung,pins = "gpe4-2", "gpe4-3";
-               samsung,pin-function = <2>;
-               samsung,pin-pud = <3>;
-               samsung,pin-drv = <0>;
+               samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+               samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
        };
 };