From 0064216ec1c13b749b492ad7e1cd2f647d1e7f63 Mon Sep 17 00:00:00 2001
From: Rahul Sharma <rahul.sharma@samsung.com>
Date: Mon, 29 Oct 2012 21:51:36 +0900
Subject: [PATCH] --- yaml --- r: 342285 b: refs/heads/master c:
 5af0d8a372811c353ab7de5d161463f58aa2173a h: refs/heads/master i:   342283:
 ddf1422e111e112f868aaa946a6f9fabfebd88cf v: v3

---
 [refs]                                            |  2 +-
 .../devicetree/bindings/drm/exynos/mixer.txt      | 15 +++++++++++++++
 trunk/arch/arm/boot/dts/exynos5250.dtsi           |  6 ++++++
 trunk/arch/arm/mach-exynos/mach-exynos5-dt.c      |  2 ++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt

diff --git a/[refs] b/[refs]
index 3ad9013ad209..8cfb6190b551 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 566cf8eef26d99415aa8a542bd6bba6a719d2031
+refs/heads/master: 5af0d8a372811c353ab7de5d161463f58aa2173a
diff --git a/trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt b/trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt
new file mode 100644
index 000000000000..9b2ea0343566
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt
@@ -0,0 +1,15 @@
+Device-Tree bindings for mixer driver
+
+Required properties:
+- compatible: value should be "samsung,exynos5-mixer".
+- reg: physical base address of the mixer and length of memory mapped
+	region.
+- interrupts: interrupt number to the cpu.
+
+Example:
+
+	mixer {
+		compatible = "samsung,exynos5-mixer";
+		reg = <0x14450000 0x10000>;
+		interrupts = <0 94 0>;
+	};
diff --git a/trunk/arch/arm/boot/dts/exynos5250.dtsi b/trunk/arch/arm/boot/dts/exynos5250.dtsi
index b68be1cab2e0..2a203e62f745 100644
--- a/trunk/arch/arm/boot/dts/exynos5250.dtsi
+++ b/trunk/arch/arm/boot/dts/exynos5250.dtsi
@@ -526,4 +526,10 @@
 		reg = <0x14530000 0x100000>;
 		interrupts = <0 95 0>;
 	};
+
+	mixer {
+		compatible = "samsung,exynos5-mixer";
+		reg = <0x14450000 0x10000>;
+		interrupts = <0 94 0>;
+	};
 };
diff --git a/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c b/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c
index 5e38208e0d13..4fc15daf7c17 100644
--- a/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -74,6 +74,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 				"exynos-gsc.3", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000,
 				"exynos5-hdmi", NULL),
+	OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
+				"exynos5-mixer", NULL),
 	{},
 };