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

[cascardo/linux.git] / arch / arm / boot / dts / exynos5250-spring.dts

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 4ec0d67..4d7bdb7 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -20,7 +20,8 @@
        model = "Google Spring";
        compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
 
-       memory {
+       memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 
@@ -91,7 +92,7 @@
 };
 
 &hdmi {
-       hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+       hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
        phy = <&hdmiphy>;