diff options
| author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2015-01-06 17:19:04 +0900 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2015-04-13 12:44:49 +0200 |
| commit | 751cd6d88d9620c83042641b52fdd244408a3947 (patch) | |
| tree | 523d189ed4a56d3730650e74222133639c05f45c | |
| parent | 7c7ab44f86d64ba6a6733da8f201a26a6c0e807f (diff) | |
| download | linux-exynos-751cd6d88d9620c83042641b52fdd244408a3947.tar.gz linux-exynos-751cd6d88d9620c83042641b52fdd244408a3947.tar.bz2 linux-exynos-751cd6d88d9620c83042641b52fdd244408a3947.zip | |
exynos-gsc: add devicetree binding optional flag for lcd-wb
This patch adds optional flag for lcd-wb of gsc. If the flag is set,
then the gsc hw is controlled by drm driver.
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
| -rw-r--r-- | Documentation/devicetree/bindings/media/exynos5-gsc.txt | 4 | ||||
| -rw-r--r-- | drivers/media/platform/exynos-gsc/gsc-core.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/media/exynos5-gsc.txt b/Documentation/devicetree/bindings/media/exynos5-gsc.txt index 0604d42f38d1..d526777a3abd 100644 --- a/Documentation/devicetree/bindings/media/exynos5-gsc.txt +++ b/Documentation/devicetree/bindings/media/exynos5-gsc.txt @@ -7,6 +7,10 @@ Required properties: - reg: should contain G-Scaler physical address location and length. - interrupts: should contain G-Scaler interrupt number +Optional properties: +- samsung,lcd-wb: this property must be present if the IP block has the LCD + writeback input. + Example: gsc_0: gsc@0x13e00000 { diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index fd2891c886a3..2edc40bc5547 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1084,9 +1084,11 @@ static int gsc_probe(struct platform_device *pdev) if (!gsc) return -ENOMEM; - if (dev->of_node) + if (dev->of_node) { gsc->id = of_alias_get_id(pdev->dev.of_node, "gsc"); - else + if (of_property_read_bool(dev->of_node, "samsung,lcd-wb")) + return -ENODEV; + } else gsc->id = pdev->id; if (gsc->id >= drv_data->num_entities) { |