From: Archit Taneja <archit@ti.com> To: tomi.valkeinen@ti.com Cc: rob@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, Archit Taneja <archit@ti.com> Subject: [PATCH v2 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Date: Thu, 30 Aug 2012 11:52:33 +0000 [thread overview] Message-ID: <1346326845-16583-12-git-send-email-archit@ti.com> (raw) In-Reply-To: <1346326845-16583-1-git-send-email-archit@ti.com> dsi_pdev_map is a struct visible globally in the DSI driver to get the platform device pointer of the DSI device corresponding to it's module ID. This was required because there was no clean way to derive the platform device from the DSI module instance number or from the connected panel. With the new output entity, it is possible to retrieve the platform device pointer if the omap_dss_output pointer is available. Modify the functions dsi_get_dsidev_from_dssdev() dsi_get_dsidev_from_id() so that they use output instead of dsi_pdev_map to retrieve the dsi platform device pointer. Signed-off-by: Archit Taneja <archit@ti.com> --- drivers/video/omap2/dss/dsi.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 6a83ab7..78212c4 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -346,8 +346,6 @@ struct dsi_packet_sent_handler_data { struct completion *completion; }; -static struct platform_device *dsi_pdev_map[MAX_NUM_DSI]; - #ifdef DEBUG static bool dsi_perf; module_param(dsi_perf, bool, 0644); @@ -360,12 +358,19 @@ static inline struct dsi_data *dsi_get_dsidrv_data(struct platform_device *dside static inline struct platform_device *dsi_get_dsidev_from_dssdev(struct omap_dss_device *dssdev) { - return dsi_pdev_map[dssdev->phy.dsi.module]; + return dssdev->output->pdev; } struct platform_device *dsi_get_dsidev_from_id(int module) { - return dsi_pdev_map[module]; + struct omap_dss_output *out; + enum omap_dss_output_id id; + + id = module = 0 ? OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2; + + out = omap_dss_get_output(id); + + return out->pdev; } static inline void dsi_write_reg(struct platform_device *dsidev, @@ -4933,7 +4938,6 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) dsi->module_id = dsidev->id; dsi->pdev = dsidev; - dsi_pdev_map[dsi->module_id] = dsidev; dev_set_drvdata(&dsidev->dev, dsi); spin_lock_init(&dsi->irq_lock); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Archit Taneja <archit@ti.com> To: tomi.valkeinen@ti.com Cc: rob@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, Archit Taneja <archit@ti.com> Subject: [PATCH v2 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Date: Thu, 30 Aug 2012 17:10:33 +0530 [thread overview] Message-ID: <1346326845-16583-12-git-send-email-archit@ti.com> (raw) In-Reply-To: <1346326845-16583-1-git-send-email-archit@ti.com> dsi_pdev_map is a struct visible globally in the DSI driver to get the platform device pointer of the DSI device corresponding to it's module ID. This was required because there was no clean way to derive the platform device from the DSI module instance number or from the connected panel. With the new output entity, it is possible to retrieve the platform device pointer if the omap_dss_output pointer is available. Modify the functions dsi_get_dsidev_from_dssdev() dsi_get_dsidev_from_id() so that they use output instead of dsi_pdev_map to retrieve the dsi platform device pointer. Signed-off-by: Archit Taneja <archit@ti.com> --- drivers/video/omap2/dss/dsi.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 6a83ab7..78212c4 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -346,8 +346,6 @@ struct dsi_packet_sent_handler_data { struct completion *completion; }; -static struct platform_device *dsi_pdev_map[MAX_NUM_DSI]; - #ifdef DEBUG static bool dsi_perf; module_param(dsi_perf, bool, 0644); @@ -360,12 +358,19 @@ static inline struct dsi_data *dsi_get_dsidrv_data(struct platform_device *dside static inline struct platform_device *dsi_get_dsidev_from_dssdev(struct omap_dss_device *dssdev) { - return dsi_pdev_map[dssdev->phy.dsi.module]; + return dssdev->output->pdev; } struct platform_device *dsi_get_dsidev_from_id(int module) { - return dsi_pdev_map[module]; + struct omap_dss_output *out; + enum omap_dss_output_id id; + + id = module == 0 ? OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2; + + out = omap_dss_get_output(id); + + return out->pdev; } static inline void dsi_write_reg(struct platform_device *dsidev, @@ -4933,7 +4938,6 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) dsi->module_id = dsidev->id; dsi->pdev = dsidev; - dsi_pdev_map[dsi->module_id] = dsidev; dev_set_drvdata(&dsidev->dev, dsi); spin_lock_init(&dsi->irq_lock); -- 1.7.9.5
next prev parent reply other threads:[~2012-08-30 11:52 UTC|newest] Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-21 5:58 [PATCH 00/23] OMAPDSS: Create output entities Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 01/23] OMAPDSS: outputs: Create a new entity called outputs Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-24 12:41 ` Tomi Valkeinen 2012-08-24 12:41 ` Tomi Valkeinen 2012-08-24 12:51 ` Archit Taneja 2012-08-24 12:53 ` Archit Taneja 2012-08-29 10:32 ` Tomi Valkeinen 2012-08-29 10:32 ` Tomi Valkeinen 2012-08-29 10:57 ` Archit Taneja 2012-08-29 10:58 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 02/23] OMAPDSS: outputs: Create and initialize output instances Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-24 13:14 ` Tomi Valkeinen 2012-08-24 13:14 ` Tomi Valkeinen 2012-08-27 6:19 ` Archit Taneja 2012-08-27 6:31 ` Archit Taneja 2012-08-27 6:44 ` Tomi Valkeinen 2012-08-27 6:44 ` Tomi Valkeinen 2012-08-21 5:58 ` [PATCH 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 04/23] OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 05/23] OMAPDSS: Remove manager->device references Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 06/23] OMAP_VOUT: " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 07/23] OMAPFB: remove " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 08/23] OMAPDRM: Remove " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 09/23] OMAPDSS: Create links between managers, outputs and devices Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 10/23] OMAPDSS: DPI: Pass outputs from panel driver to DPI interface driver Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 12/23] OMAPDSS: DSI: Pass outputs from panel driver to DSI interface driver Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 13/23] OMAPDSS: SDI: Pass outputs from panel driver to SDI " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 14/23] OMAPDSS: RFBI: Pass outputs from panel driver to RFBI " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 15/23] OMAPDSS: RFBI: Add output pointers as arguments to all exported functions Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 16/23] OMAPDSS: VENC: Pass outputs from panel driver to VENC interface driver Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 17/23] OMAPDSS: HDMI: Pass outputs from panel driver to HDMI " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 18/23] OMAPDSS: HDMI: Add output pointers as arguments to all functions used by hdmi panel driver Archit Taneja 2012-08-21 6:10 ` [PATCH 18/23] OMAPDSS: HDMI: Add output pointers as arguments to all functions used by hdmi panel dr Archit Taneja 2012-08-21 5:58 ` [PATCH 19/23] OMAPDSS/OMAPFB: Change dssdev->manager references Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 20/23] OMAPDSS: MANAGER: Update display sysfs store Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 21/23] OMAPDSS: MANAGER: Get device via output Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 22/23] OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 23/23] OMAPDSS: Remove old way of setting manager and device links Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 00/23] OMAPDSS: Create output entities Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 01/23] OMAPDSS: outputs: Create a new entity called outputs Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 02/23] OMAPDSS: outputs: Create and register output instances Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 11:57 ` Tomi Valkeinen 2012-08-31 11:57 ` Tomi Valkeinen 2012-08-31 12:03 ` Archit Taneja 2012-08-31 12:15 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 12:03 ` Tomi Valkeinen 2012-08-31 12:03 ` Tomi Valkeinen 2012-08-31 12:24 ` Archit Taneja 2012-08-31 12:36 ` Archit Taneja 2012-08-31 12:28 ` Tomi Valkeinen 2012-08-31 12:28 ` Tomi Valkeinen 2012-08-30 11:40 ` [PATCH v2 04/23] OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 05/23] OMAPDSS: Remove manager->device references Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 06/23] OMAP_VOUT: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 12:11 ` Tomi Valkeinen 2012-08-31 12:11 ` Tomi Valkeinen 2012-08-31 12:34 ` Archit Taneja 2012-08-31 12:46 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 07/23] OMAPFB: remove " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 08/23] OMAPDRM: Remove " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 09/23] OMAPDSS: Create links between managers, outputs and devices Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 14:10 ` Tomi Valkeinen 2012-08-31 14:10 ` Tomi Valkeinen 2012-08-31 14:24 ` Archit Taneja 2012-08-31 14:36 ` Archit Taneja 2012-08-31 14:45 ` Tomi Valkeinen 2012-08-31 14:45 ` Tomi Valkeinen 2012-08-31 15:08 ` Tomi Valkeinen 2012-08-31 15:08 ` Tomi Valkeinen 2012-09-03 9:26 ` Archit Taneja 2012-09-03 9:38 ` Archit Taneja 2012-09-03 9:35 ` Tomi Valkeinen 2012-09-03 9:35 ` Tomi Valkeinen 2012-08-30 11:40 ` [PATCH v2 10/23] OMAPDSS: DPI: Pass omap_dss_output within the driver Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 13:48 ` Tomi Valkeinen 2012-08-31 13:48 ` Tomi Valkeinen 2012-08-31 13:59 ` Archit Taneja 2012-08-31 14:00 ` Archit Taneja 2012-08-30 11:40 ` Archit Taneja [this message] 2012-08-30 11:52 ` [PATCH v2 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Archit Taneja 2012-08-30 11:40 ` [PATCH v2 12/23] OMAPDSS: DSI: Pass omap_dss_output within the driver Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 13/23] OMAPDSS: SDI: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 14/23] OMAPDSS: RFBI: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 15/23] OMAPDSS: RFBI: Add dssdev pointers as arguments to all exported functions Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 14:20 ` Tomi Valkeinen 2012-08-31 14:20 ` Tomi Valkeinen 2012-08-31 14:30 ` Archit Taneja 2012-08-31 14:42 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 16/23] OMAPDSS: VENC: Pass omap_dss_output within the driver Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 17/23] OMAPDSS: HDMI: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 18/23] OMAPDSS: HDMI: Add dssdev pointer as an argument to all functions used by hdmi panel driver Archit Taneja 2012-08-30 11:52 ` [PATCH v2 18/23] OMAPDSS: HDMI: Add dssdev pointer as an argument to all functions used by hdmi pane Archit Taneja 2012-08-30 11:40 ` [PATCH v2 19/23] OMAPDSS/OMAPFB: Change dssdev->manager references Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 20/23] OMAPDSS: MANAGER: Update display sysfs store Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 14:30 ` Tomi Valkeinen 2012-08-31 14:30 ` Tomi Valkeinen 2012-08-31 14:41 ` Archit Taneja 2012-08-31 14:53 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 21/23] OMAPDSS: MANAGER: Get device via output Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 22/23] OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 23/23] OMAPDSS: Remove old way of setting manager and device links Archit Taneja 2012-08-30 11:52 ` Archit Taneja
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=1346326845-16583-12-git-send-email-archit@ti.com \ --to=archit@ti.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=rob@ti.com \ --cc=tomi.valkeinen@ti.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.