Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / exynos5420-smdk5420.dts

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 2e748d19322f29bdd91fbcc270c97a382234cbf1..b9192ef1125731dff6e1b2427dc14b314c52d5b3 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -13,12 +13,14 @@
 #include "exynos5420.dtsi"
 #include "exynos5420-cpus.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include "exynos-mfc-reserved-memory.dtsi"
 
 / {
        model = "Samsung SMDK5420 board based on EXYNOS5420";
        compatible = "samsung,smdk5420", "samsung,exynos5420", "samsung,exynos5";
 
-       memory {
+       memory@20000000 {
+               device_type = "memory";
                reg = <0x20000000 0x80000000>;
        };
 
@@ -129,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>;
 };
@@ -354,11 +356,6 @@
        };
 };
 
-&mfc {
-       samsung,mfc-r = <0x43000000 0x800000>;
-       samsung,mfc-l = <0x51000000 0x800000>;
-};
-
 &mmc_0 {
        status = "okay";
        broken-cd;