aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chen <jason.chen@linaro.org>2011-12-05 16:41:46 +0800
committerJason Chen <jason.chen@linaro.org>2011-12-06 12:46:20 +0800
commit424c1dd765507a204529413e8db86c731fde6473 (patch)
tree764442b0273a998da1fe28405a15a8c0de0a50ba
parent45fe0a3bb468fed637bda3368de0b65975d17eea (diff)
downloadlinux-linaro-424c1dd765507a204529413e8db86c731fde6473.tar.gz
MXC V4L2 output: add dt support
Signed-off-by: Jason Chen <jason.chen@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx6q-sabrelite.dts4
-rw-r--r--drivers/media/video/mxc/output/mxc_vout.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 736b9ce09ef..5883e308ba0 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -120,5 +120,9 @@
internal_clk = "false";
reg = <0x00000001 0x0>; /* reserve fb mem */
};
+
+ v4l2-out@0 {
+ compatible = "fsl,vout_ipuv3";
+ };
};
};
diff --git a/drivers/media/video/mxc/output/mxc_vout.c b/drivers/media/video/mxc/output/mxc_vout.c
index 57e684f9930..8092e670114 100644
--- a/drivers/media/video/mxc/output/mxc_vout.c
+++ b/drivers/media/video/mxc/output/mxc_vout.c
@@ -1630,9 +1630,15 @@ static int mxc_vout_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id mxc_vout_dt_ids[] = {
+ { .compatible = "fsl,vout_ipuv3", },
+ { /* sentinel */ }
+};
+
static struct platform_driver mxc_vout_driver = {
.driver = {
.name = "mxc_v4l2_output",
+ .of_match_table = mxc_vout_dt_ids,
},
.probe = mxc_vout_probe,
.remove = mxc_vout_remove,