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 fa1e2c0..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>;
        };
@@ -269,7 +270,7 @@
 };
 
 &hdmi {
-       hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+       hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd>;
        hdmi-en-supply = <&hdmi_en>;