Skip to content

Commit

Permalink
OMAPDSS: DSI: Remove dsi_pdev_map global struct
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Archit Taneja authored and Tomi Valkeinen committed Sep 26, 2012
1 parent 5d512fc commit 400e65d
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/video/omap2/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,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);
Expand All @@ -359,12 +357,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,
Expand Down Expand Up @@ -5194,7 +5199,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);
Expand Down

0 comments on commit 400e65d

Please sign in to comment.