[PATCH 1/4] ARM: dts: add support for hdmi to exynos4

[Rahul Sharma]

Signed-off-by: Rahul Sharma <rahul.sharma at samsung.com>

Conflicts:
	arch/arm/mach-exynos/mach-exynos4-dt.c
---
 arch/arm/boot/dts/exynos4.dtsi         | 7 +++++++
 arch/arm/mach-exynos/mach-exynos4-dt.c | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fc..6c2c79d 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -289,4 +289,11 @@
 			interrupts = <0 34 0>;
 		};
 	};
+
+	hdmi {
+		compatible = "samsung,exynos4-hdmi14";
+		reg = <0x12D00000 0x70000>;
+		interrupts = <0 95 0>;
+		hpd-gpio = <&gpx3 7 0xf 1 3>;
+	};
 };
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index ab1dacc..24f72a5 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -80,6 +80,8 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
 	OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
 				"exynos-tmu", NULL),
+	OF_DEV_AUXDATA("samsung,exynos4-hdmi14", EXYNOS4_PA_HDMI,
+				"exynos4-hdmi", NULL),
 	{},
 };
 
-- 
1.8.0