From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org Cc: Archit Taneja <archit@ti.com>, Darren Etheridge <detheridge@ti.com>, Tony Lindgren <tony@atomide.com>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH 22/26] OMAPDSS: connector-dvi: Add DT support Date: Wed, 4 Dec 2013 14:28:49 +0200 [thread overview] Message-ID: <1386160133-24026-23-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1386160133-24026-1-git-send-email-tomi.valkeinen@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/video/omap2/displays-new/connector-dvi.c | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/drivers/video/omap2/displays-new/connector-dvi.c b/drivers/video/omap2/displays-new/connector-dvi.c index b6c50904038e..8f7e576769cd 100644 --- a/drivers/video/omap2/displays-new/connector-dvi.c +++ b/drivers/video/omap2/displays-new/connector-dvi.c @@ -277,6 +277,37 @@ static int dvic_probe_pdata(struct platform_device *pdev) return 0; } +static int dvic_probe_of(struct platform_device *pdev) +{ + struct panel_drv_data *ddata = platform_get_drvdata(pdev); + struct device_node *node = pdev->dev.of_node; + struct omap_dss_device *in; + struct device_node *adapter_node; + struct i2c_adapter *adapter; + + in = omapdss_of_find_source_for_first_ep(node); + if (IS_ERR(in)) { + dev_err(&pdev->dev, "failed to find video source\n"); + return PTR_ERR(in); + } + + ddata->in = in; + + adapter_node = of_parse_phandle(node, "i2c-bus", 0); + if (adapter_node) { + adapter = of_find_i2c_adapter_by_node(adapter_node); + if (adapter == NULL) { + dev_err(&pdev->dev, "failed to parse i2c-bus\n"); + omap_dss_put_device(ddata->in); + return -EINVAL; + } + + ddata->i2c_adapter = adapter; + } + + return 0; +} + static int dvic_probe(struct platform_device *pdev) { struct panel_drv_data *ddata; @@ -293,6 +324,10 @@ static int dvic_probe(struct platform_device *pdev) r = dvic_probe_pdata(pdev); if (r) return r; + } else if (pdev->dev.of_node) { + r = dvic_probe_of(pdev); + if (r) + return r; } else { return -ENODEV; } @@ -342,12 +377,20 @@ static int __exit dvic_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id dvic_of_match[] = { + { .compatible = "ti,dvi-connector", }, + {}, +}; + +MODULE_DEVICE_TABLE(of, dvic_of_match); + static struct platform_driver dvi_connector_driver = { .probe = dvic_probe, .remove = __exit_p(dvic_remove), .driver = { .name = "connector-dvi", .owner = THIS_MODULE, + .of_match_table = dvic_of_match, }, }; -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org Cc: Archit Taneja <archit@ti.com>, Darren Etheridge <detheridge@ti.com>, Tony Lindgren <tony@atomide.com>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH 22/26] OMAPDSS: connector-dvi: Add DT support Date: Wed, 04 Dec 2013 12:28:49 +0000 [thread overview] Message-ID: <1386160133-24026-23-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1386160133-24026-1-git-send-email-tomi.valkeinen@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/video/omap2/displays-new/connector-dvi.c | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/drivers/video/omap2/displays-new/connector-dvi.c b/drivers/video/omap2/displays-new/connector-dvi.c index b6c50904038e..8f7e576769cd 100644 --- a/drivers/video/omap2/displays-new/connector-dvi.c +++ b/drivers/video/omap2/displays-new/connector-dvi.c @@ -277,6 +277,37 @@ static int dvic_probe_pdata(struct platform_device *pdev) return 0; } +static int dvic_probe_of(struct platform_device *pdev) +{ + struct panel_drv_data *ddata = platform_get_drvdata(pdev); + struct device_node *node = pdev->dev.of_node; + struct omap_dss_device *in; + struct device_node *adapter_node; + struct i2c_adapter *adapter; + + in = omapdss_of_find_source_for_first_ep(node); + if (IS_ERR(in)) { + dev_err(&pdev->dev, "failed to find video source\n"); + return PTR_ERR(in); + } + + ddata->in = in; + + adapter_node = of_parse_phandle(node, "i2c-bus", 0); + if (adapter_node) { + adapter = of_find_i2c_adapter_by_node(adapter_node); + if (adapter = NULL) { + dev_err(&pdev->dev, "failed to parse i2c-bus\n"); + omap_dss_put_device(ddata->in); + return -EINVAL; + } + + ddata->i2c_adapter = adapter; + } + + return 0; +} + static int dvic_probe(struct platform_device *pdev) { struct panel_drv_data *ddata; @@ -293,6 +324,10 @@ static int dvic_probe(struct platform_device *pdev) r = dvic_probe_pdata(pdev); if (r) return r; + } else if (pdev->dev.of_node) { + r = dvic_probe_of(pdev); + if (r) + return r; } else { return -ENODEV; } @@ -342,12 +377,20 @@ static int __exit dvic_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id dvic_of_match[] = { + { .compatible = "ti,dvi-connector", }, + {}, +}; + +MODULE_DEVICE_TABLE(of, dvic_of_match); + static struct platform_driver dvi_connector_driver = { .probe = dvic_probe, .remove = __exit_p(dvic_remove), .driver = { .name = "connector-dvi", .owner = THIS_MODULE, + .of_match_table = dvic_of_match, }, }; -- 1.8.3.2
next prev parent reply other threads:[~2013-12-04 12:28 UTC|newest] Thread overview: 183+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-12-04 12:28 [PATCH 00/26] OMAPDSS: DT support (Christmas edition) Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 01/26] OMAPDSS: rename display-sysfs 'name' entry Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 02/26] OMAPDSS: DSI: fix fifosize Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 03/26] ARM: OMAP: remove DSS DT hack Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 04/26] OMAPDSS: remove DT hacks for regulators Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 05/26] ARM: OMAP2+: add omapdss_init_of() Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-11 23:10 ` Laurent Pinchart 2013-12-11 23:10 ` Laurent Pinchart 2013-12-12 7:30 ` Tomi Valkeinen 2013-12-12 7:30 ` Tomi Valkeinen 2013-12-13 8:32 ` Archit Taneja 2013-12-13 8:44 ` Archit Taneja 2013-12-13 8:40 ` Tomi Valkeinen 2013-12-13 8:40 ` Tomi Valkeinen 2013-12-13 17:07 ` Tony Lindgren 2013-12-13 17:07 ` Tony Lindgren 2013-12-04 12:28 ` [PATCH 06/26] OMAPDSS: if dssdev->name==NULL, use alias Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-11 23:13 ` Laurent Pinchart 2013-12-11 23:13 ` Laurent Pinchart 2013-12-11 23:56 ` Laurent Pinchart 2013-12-11 23:56 ` Laurent Pinchart 2013-12-12 7:41 ` Tomi Valkeinen 2013-12-12 7:41 ` Tomi Valkeinen [not found] ` <52A968BD.20304-l0cyMroinI0@public.gmane.org> 2013-12-12 10:05 ` Sebastian Reichel 2013-12-12 10:05 ` Sebastian Reichel 2013-12-12 13:22 ` Laurent Pinchart 2013-12-12 13:22 ` Laurent Pinchart 2013-12-12 14:13 ` Tomi Valkeinen 2013-12-12 14:13 ` Tomi Valkeinen 2013-12-12 14:15 ` Laurent Pinchart 2013-12-12 14:15 ` Laurent Pinchart 2013-12-12 14:19 ` Tomi Valkeinen 2013-12-12 14:19 ` Tomi Valkeinen 2013-12-12 17:31 ` Sebastian Reichel 2013-12-12 17:31 ` Sebastian Reichel 2013-12-13 12:01 ` Tomi Valkeinen 2013-12-13 12:01 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 07/26] OMAPDSS: get dssdev->alias from DT alias Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 08/26] OMAPFB: clean up default display search Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 09/26] OMAPFB: search for default display with DT alias Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 10/26] OMAPDSS: add of helpers Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-11 23:19 ` Laurent Pinchart 2013-12-11 23:19 ` Laurent Pinchart 2013-12-12 7:48 ` Tomi Valkeinen 2013-12-12 7:48 ` Tomi Valkeinen 2013-12-13 2:37 ` Laurent Pinchart 2013-12-13 2:37 ` Laurent Pinchart 2013-12-04 12:28 ` [PATCH 11/26] OMAPDSS: Add DT support to DSS, DISPC, DPI, HDMI, VENC Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 12/26] OMAPDSS: Add DT support to DSI Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 13/26] ARM: omap3.dtsi: add omapdss information Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-05 17:05 ` Tony Lindgren 2013-12-05 17:05 ` Tony Lindgren 2013-12-09 12:45 ` Tomi Valkeinen 2013-12-09 12:45 ` Tomi Valkeinen 2013-12-09 18:04 ` Tony Lindgren 2013-12-09 18:04 ` Tony Lindgren 2013-12-11 23:44 ` Laurent Pinchart 2013-12-11 23:44 ` Laurent Pinchart 2013-12-12 8:38 ` Tomi Valkeinen 2013-12-12 8:38 ` Tomi Valkeinen 2013-12-12 21:59 ` Tony Lindgren 2013-12-13 3:27 ` Laurent Pinchart 2013-12-13 3:27 ` Laurent Pinchart 2013-12-13 10:18 ` Tomi Valkeinen 2013-12-13 10:18 ` Tomi Valkeinen [not found] ` <52AADEF3.9040808-l0cyMroinI0@public.gmane.org> 2013-12-13 17:10 ` Tony Lindgren 2013-12-13 17:10 ` Tony Lindgren 2013-12-13 3:24 ` Laurent Pinchart 2013-12-13 3:24 ` Laurent Pinchart 2013-12-13 9:29 ` Tomi Valkeinen 2013-12-13 9:29 ` Tomi Valkeinen 2013-12-16 10:49 ` Tomi Valkeinen 2013-12-16 10:49 ` Tomi Valkeinen [not found] ` <52AEDA9F.2020609-l0cyMroinI0@public.gmane.org> 2013-12-16 13:55 ` Laurent Pinchart 2013-12-16 13:55 ` Laurent Pinchart 2013-12-04 12:28 ` [PATCH 14/26] ARM: omap4.dtsi: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 15/26] ARM: omap4-panda.dts: add display information Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-06 8:57 ` Javier Martinez Canillas 2013-12-06 8:57 ` Javier Martinez Canillas 2013-12-09 12:56 ` Tomi Valkeinen 2013-12-09 12:56 ` Tomi Valkeinen 2013-12-09 15:09 ` Javier Martinez Canillas 2013-12-09 15:09 ` Javier Martinez Canillas 2013-12-09 15:30 ` Tomi Valkeinen 2013-12-09 15:30 ` Tomi Valkeinen 2013-12-09 16:53 ` Javier Martinez Canillas 2013-12-09 16:53 ` Javier Martinez Canillas 2013-12-10 10:56 ` Enric Balletbo Serra 2013-12-10 10:56 ` Enric Balletbo Serra 2013-12-10 12:10 ` Tomi Valkeinen 2013-12-10 12:10 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 16/26] ARM: omap4-sdp.dts: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-13 9:27 ` Archit Taneja 2013-12-13 9:39 ` Archit Taneja 2013-12-13 9:39 ` Tomi Valkeinen 2013-12-13 9:39 ` Tomi Valkeinen 2013-12-13 9:58 ` Archit Taneja 2013-12-13 9:58 ` Archit Taneja 2013-12-13 10:15 ` Tomi Valkeinen 2013-12-13 10:15 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 17/26] ARM: omap3-tobi.dts: add lcd (TEST) Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-06 10:18 ` Florian Vaussard 2013-12-06 10:18 ` Florian Vaussard 2013-12-10 12:18 ` Tomi Valkeinen 2013-12-10 12:18 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 18/26] ARM: omap3-beagle.dts: add display information Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-06 8:41 ` Javier Martinez Canillas 2013-12-06 8:41 ` Javier Martinez Canillas 2013-12-09 12:06 ` Tomi Valkeinen 2013-12-09 12:06 ` Tomi Valkeinen 2013-12-09 12:16 ` Javier Martinez Canillas 2013-12-09 12:16 ` Javier Martinez Canillas 2013-12-04 12:28 ` [PATCH 19/26] ARM: omap3-beagle-xm.dts: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 20/26] OMAPDSS: panel-dsi-cm: Add DT support Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 21/26] OMAPDSS: encoder-tfp410: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen [this message] 2013-12-04 12:28 ` [PATCH 22/26] OMAPDSS: connector-dvi: " Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 23/26] OMAPDSS: encoder-tpd12s015: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 24/26] OMAPDSS: hdmi-connector: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 25/26] OMAPDSS: panel-dpi: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 26/26] OMAPDSS: connector-analog-tv: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen [not found] ` <1386160133-24026-1-git-send-email-tomi.valkeinen-l0cyMroinI0@public.gmane.org> 2013-12-04 16:01 ` [PATCH 00/26] OMAPDSS: DT support (Christmas edition) Sebastian Reichel 2013-12-04 16:01 ` Sebastian Reichel 2013-12-05 9:41 ` Tomi Valkeinen 2013-12-05 9:41 ` Tomi Valkeinen 2013-12-12 0:39 ` Laurent Pinchart 2013-12-12 0:39 ` Laurent Pinchart 2013-12-12 8:54 ` Tomi Valkeinen 2013-12-12 8:54 ` Tomi Valkeinen 2013-12-13 3:45 ` Laurent Pinchart 2013-12-13 3:45 ` Laurent Pinchart 2013-12-13 8:16 ` Geert Uytterhoeven 2013-12-13 8:16 ` Geert Uytterhoeven 2013-12-13 10:05 ` Tomi Valkeinen 2013-12-13 10:05 ` Tomi Valkeinen 2013-12-13 14:37 ` Laurent Pinchart 2013-12-13 14:37 ` Laurent Pinchart 2013-12-13 15:47 ` Tomi Valkeinen 2013-12-13 15:47 ` Tomi Valkeinen 2013-12-13 17:22 ` Tony Lindgren 2013-12-13 17:22 ` Tony Lindgren 2013-12-14 7:34 ` Tomi Valkeinen 2013-12-14 7:34 ` Tomi Valkeinen 2013-12-14 14:09 ` Tony Lindgren 2013-12-14 14:09 ` Tony Lindgren 2013-12-16 7:24 ` Tomi Valkeinen 2013-12-16 7:24 ` Tomi Valkeinen 2013-12-18 0:30 ` Tony Lindgren 2013-12-18 0:30 ` Tony Lindgren 2013-12-07 3:48 Javier Martinez Canillas 2013-12-07 3:48 ` Javier Martinez Canillas 2013-12-07 4:28 ` Javier Martinez Canillas 2013-12-07 4:28 ` Javier Martinez Canillas 2013-12-09 12:01 ` Tomi Valkeinen 2013-12-09 12:01 ` Tomi Valkeinen 2013-12-09 12:23 ` Javier Martinez Canillas 2013-12-09 12:23 ` Javier Martinez Canillas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1386160133-24026-23-git-send-email-tomi.valkeinen@ti.com \ --to=tomi.valkeinen@ti.com \ --cc=archit@ti.com \ --cc=detheridge@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.