X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Farm%2Fboot%2Fdts%2Fexynos5420-smdk5420.dts;h=b9192ef1125731dff6e1b2427dc14b314c52d5b3;hb=7e75c99e6e2aac23b3e563b8c9e93d3e13afad1e;hp=ed8f3426911bc4ee69cd2e3011c02f2a39218316;hpb=f4a9c169c29efea31b22aec0012ad29df6cf84d4;p=deliverable%2Flinux.git

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index ed8f3426911b..b9192ef11257 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -19,7 +19,8 @@
 	model = "Samsung SMDK5420 board based on EXYNOS5420";
 	compatible = "samsung,smdk5420", "samsung,exynos5420", "samsung,exynos5";
 
-	memory {
+	memory@20000000 {
+		device_type = "memory";
 		reg = <0x20000000 0x80000000>;
 	};
 
@@ -130,7 +131,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>;
 };