Signed-off-by: Karol Lewandowski <k.lewandowsk@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Cc: Tomasz Stanislawski <t.stanislaws@xxxxxxxxxxx>
---
.../devicetree/bindings/arm/exynos/tvmixer.txt | 26 ++++++++++++++++++++
drivers/media/video/s5p-tv/mixer_drv.c | 9 +++++++
2 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/exynos/tvmixer.txt
diff --git a/Documentation/devicetree/bindings/arm/exynos/tvmixer.txt b/Documentation/devicetree/bindings/arm/exynos/tvmixer.txt
new file mode 100644
index 0000000..5b4f02e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/exynos/tvmixer.txt
@@ -0,0 +1,26 @@
+* Samsung video/graphics mixer and blender
+
+Mixer blends graphics data from multiple sources and sends resulting
+data to TVOUT module.
+
+
+Required properties:
+
+ - compatible : "samsung,s5pv210-tvmixer"
+ - reg : shall contain memory addresses and sizes of mixer and video
+ processor devices
+ - reg-names : "mxr" for mixer's address/size and "vp" to for video
+ processor's.
+ - interrupt-names : shall contain "irq"
+
+
+Example:
+
+ tvmixer@12c10000 {
+ compatible = "samsung,s5pv210-tvmixer";
+ reg = <0x12c10000 0x10000>,
+ <0x12c00000 0x10000>;
+ reg-names = "mxr", "vp";
+ interrupts = <0 123 0>;
+ interrupt-names = "irq";
+ };
diff --git a/drivers/media/video/s5p-tv/mixer_drv.c b/drivers/media/video/s5p-tv/mixer_drv.c
index a2c0c25..80b7755 100644
--- a/drivers/media/video/s5p-tv/mixer_drv.c
+++ b/drivers/media/video/s5p-tv/mixer_drv.c
@@ -448,6 +448,14 @@ static int __devexit mxr_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_OF
+static const struct of_device_id mxr_dt_match[] = {
+ { .compatible = "samsung,s5pv210-tvmixer" },
+ { },
+};
+MODULE_DEVICE_TABLE(of, mxr_dt_match);
+#endif
+
static struct platform_driver mxr_driver __refdata = {
.probe = mxr_probe,
.remove = __devexit_p(mxr_remove),
@@ -455,6 +463,7 @@ static struct platform_driver mxr_driver __refdata = {
.name = MXR_DRIVER_NAME,
.owner = THIS_MODULE,
.pm = &mxr_pm_ops,
+ .of_match_table = of_match_ptr(mxr_dt_match),
}
};
--
1.7.9.1
--
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
