devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rahul Sharma <rahul.sharma@samsung.com>
To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org
Cc: kgene.kim@samsung.com, t.stanislaws@samsung.com,
	sw0312.kim@samsung.com, inki.dae@samsung.com,
	jy0922.shim@samsung.com, kyungmin.park@samsung.com,
	thomas.ab@samsung.com, prashanth.g@samsung.com,
	joshi@samsung.com, s.shirish@samsung.com, r.sh.open@gmail.com,
	rahul.sharma@samsung.com
Subject: [PATCH v2 2/6] dts: exynos: add device tree support for exynos5 mixer
Date: Sat, 13 Oct 2012 02:12:31 +0530	[thread overview]
Message-ID: <1350074555-26018-3-git-send-email-rahul.sharma@samsung.com> (raw)
In-Reply-To: <1350074555-26018-1-git-send-email-rahul.sharma@samsung.com>

This patch adds support for device tree based discovery for exynos5
mixer. Mixer node is also renamed with "exynos5-mixer".

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 .../devicetree/bindings/drm/exynos/mixer.txt       |   15 +++++++++++++++
 arch/arm/boot/dts/exynos5250.dtsi                  |    6 ++++++
 arch/arm/mach-exynos/include/mach/map.h            |    1 +
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 ++
 4 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt

diff --git a/Documentation/devicetree/bindings/drm/exynos/mixer.txt b/Documentation/devicetree/bindings/drm/exynos/mixer.txt
new file mode 100644
index 0000000..05e4731
--- /dev/null
+++ b/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>;
+	};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index eea84a3..6abadbf 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -498,4 +498,10 @@
 		reg = <0x14530000 0x100000>;
 		interrupts = <0 95 0>;
         };
+
+        mixer {
+		compatible = "samsung,exynos5-mixer";
+		reg = <0x14450000 0x10000>;
+		interrupts = <0 94 0>;
+        };
 };
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 7b9efb2..314ee75 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -201,6 +201,7 @@
 #define EXYNOS4_PA_SDO			0x12C20000
 #define EXYNOS4_PA_HDMI			0x12D00000
 #define EXYNOS4_PA_IIC_HDMIPHY		0x138E0000
+#define EXYNOS5_PA_MIXER		0x14450000
 #define EXYNOS5_PA_HDMI		0x14530000
 
 #define EXYNOS4_PA_IIC(x)		(0x13860000 + ((x) * 0x10000))
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 43449fb..cdad7c1 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -66,6 +66,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-hdmi", EXYNOS5_PA_HDMI,
 				"exynos5-hdmi", NULL),
+	OF_DEV_AUXDATA("samsung,exynos5-mixer", EXYNOS5_PA_MIXER,
+				"exynos5-mixer", NULL),
 	{},
 };
 
-- 
1.7.0.4

  parent reply	other threads:[~2012-10-12 20:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-12 20:42 [PATCH v2 0/6] arm: exynos: add dt based support for exynos5 hdmi Rahul Sharma
2012-10-12 20:42 ` [PATCH v2 1/6] dts: exynos: add device tree " Rahul Sharma
2012-10-13 13:40   ` Tomasz Figa
2012-10-15  5:54     ` Rahul Sharma
2012-10-12 20:42 ` Rahul Sharma [this message]
2012-10-12 20:42 ` [PATCH v2 3/6] dts: exynos: add device tree support for exynos5 hdmiphy Rahul Sharma
2012-10-13 13:43   ` Tomasz Figa
2012-10-12 20:42 ` [PATCH v2 4/6] dts: exynos: add device tree support for exynos5 hdmiddc Rahul Sharma
2012-10-12 20:42 ` [PATCH v2 5/6] arm: exynos: add clocks for exynos5 hdmi Rahul Sharma
2012-10-12 20:42 ` [PATCH v2 6/6] arm: exynos: removing exynos-drm device registration from non-dt platforms Rahul Sharma
2012-10-13 13:46   ` Tomasz Figa
2012-10-15  6:04     ` Rahul Sharma
2012-10-15  4:07   ` Inki Dae

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1350074555-26018-3-git-send-email-rahul.sharma@samsung.com \
    --to=rahul.sharma@samsung.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=inki.dae@samsung.com \
    --cc=joshi@samsung.com \
    --cc=jy0922.shim@samsung.com \
    --cc=kgene.kim@samsung.com \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=prashanth.g@samsung.com \
    --cc=r.sh.open@gmail.com \
    --cc=s.shirish@samsung.com \
    --cc=sw0312.kim@samsung.com \
    --cc=t.stanislaws@samsung.com \
    --cc=thomas.ab@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).