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

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

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 518ca57..61906b3 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -18,7 +18,7 @@
        model = "Hardkernel ODROID-X board based on Exynos4412";
        compatible = "hardkernel,odroid-x", "samsung,exynos4412", "samsung,exynos4";
 
-       memory {
+       memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0x3FF00000>;
        };
@@ -84,7 +84,7 @@
 &pinctrl_1 {
        gpio_home_key: home_key {
                samsung,pins = "gpx2-2";
-               samsung,pin-pud = <0>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
        };
 };