Signed-off-by: Rahul Sharma <rahul.sharma@xxxxxxxxxxx>
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
---
arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
arch/arm/mach-exynos/mach-exynos4-dt.c | 2 ++
2 files changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 6c2c79d..07cb7d4 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -296,4 +296,12 @@
interrupts = <0 95 0>;
hpd-gpio = <&gpx3 7 0xf 1 3>;
};
+
+ mixer: mixer {
+ compatible = "samsung,exynos4-mixer";
+ reg = <0x12c10000 0x10000>,
+ <0x12c00000 0x10000>;
+ interrupts = <0 91 0>;
+ samsung,power-domain = <&pd_tv>;
+ };
};
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 24f72a5..f3b85b64 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -82,6 +82,8 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = {
"exynos-tmu", NULL),
OF_DEV_AUXDATA("samsung,exynos4-hdmi14", EXYNOS4_PA_HDMI,
"exynos4-hdmi", NULL),
+ OF_DEV_AUXDATA("samsung,exynos4-mixer", EXYNOS4_PA_MIXER,
+ "s5p-mixer", NULL),
{},
};
--
1.8.0
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
