summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRahul Sharma <rahul.sharma@samsung.com>2012-10-29 21:51:36 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-10-29 21:51:36 +0900
commit5af0d8a372811c353ab7de5d161463f58aa2173a (patch)
treea86464da1a245458c4dcffad5d50d35af54b62b9 /arch/arm
parent566cf8eef26d99415aa8a542bd6bba6a719d2031 (diff)
ARM: dts: add device tree support for exynos5 mixer
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> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi6
-rw-r--r--arch/arm/mach-exynos/mach-exynos5-dt.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index b68be1cab2e0..2a203e62f745 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/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/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 5e38208e0d13..4fc15daf7c17 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/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),
{},
};