diff options
| author | Karol Lewandowski <k.lewandowsk@samsung.com> | 2012-04-12 20:45:26 +0200 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-12-13 14:53:46 +0530 |
| commit | 7ac753fbdb27c67ac74c0dcbdd5f42dc711592db (patch) | |
| tree | bb4c56d440106f597e4fbd563373964548ff242a | |
| parent | 3dc6a8c5d5c558ab4f90a2640dcf13757ff8727e (diff) | |
| download | linux-topics-7ac753fbdb27c67ac74c0dcbdd5f42dc711592db.tar.gz | |
s5p-tv: Add initial DT-support for TV mixer
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Tomasz Stanislawski <t.stanislaws@samsung.com>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/exynos/tvmixer.txt | 26 | ||||
| -rw-r--r-- | drivers/media/platform/s5p-tv/mixer_drv.c | 9 |
2 files changed, 35 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/exynos/tvmixer.txt b/Documentation/devicetree/bindings/arm/exynos/tvmixer.txt new file mode 100644 index 00000000000..5b4f02e5973 --- /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/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c index ca0f2971744..8f93d2258c8 100644 --- a/drivers/media/platform/s5p-tv/mixer_drv.c +++ b/drivers/media/platform/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), } }; |