Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / exynos5800-peach-pi.dts

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 5ec71e2400fd76d1ac7e0153f2bff477ef2dd25a..9fafe10d9e4e4a59f5c44fa425816ef0185080a9 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -79,7 +79,8 @@
 
        };
 
-       memory {
+       memory@20000000 {
+               device_type = "memory";
                reg = <0x20000000 0x80000000>;
        };
 
@@ -179,7 +180,7 @@
 
 &hdmi {
        status = "okay";
-       hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+       hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
        ddc = <&i2c_2>;