Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11ee9606 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DSI: improve DSI module id handling 



We currently use the id of the dsi platform device (dsidev->id) as the
DSI hardware module ID. This works because we assign the ID manually in
arch/arm/mach-omap2/display.c at boot time.

However, with device tree the platform device IDs are automatically
assigned to an arbitrary number, and we can't use it.

Instead of using dsidev->id during operation, this patch stores the
value of dsidev->id to a private field of the dsi driver at probe(). The
future device tree code can thus set the private field with some other
way.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 9d8232a7

drivers/video/omap2/dss/dsi.c

+21 −25
Original line number Original line Diff line number Diff line
@@ -256,6 +256,8 @@ struct dsi_data { 
	struct platform_device *pdev;

	struct platform_device *pdev;

	void __iomem	*base;

	void __iomem	*base;





	int module_id;



	int irq;

	int irq;





	struct clk *dss_clk;

	struct clk *dss_clk;
@@ -358,11 +360,6 @@ struct platform_device *dsi_get_dsidev_from_id(int module) 
	return dsi_pdev_map[module];

	return dsi_pdev_map[module];

}

}





static inline int dsi_get_dsidev_id(struct platform_device *dsidev)

{

	return dsidev->id;

}



static inline void dsi_write_reg(struct platform_device *dsidev,

static inline void dsi_write_reg(struct platform_device *dsidev,

		const struct dsi_reg idx, u32 val)

		const struct dsi_reg idx, u32 val)

{

{
@@ -1181,10 +1178,9 @@ static unsigned long dsi_get_txbyteclkhs(struct platform_device *dsidev) 
static unsigned long dsi_fclk_rate(struct platform_device *dsidev)

static unsigned long dsi_fclk_rate(struct platform_device *dsidev)

{

{

	unsigned long r;

	unsigned long r;

	int dsi_module = dsi_get_dsidev_id(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);





	if (dss_get_dsi_clk_source(dsi_module) == OMAP_DSS_CLK_SRC_FCK) {

	if (dss_get_dsi_clk_source(dsi->module_id) == OMAP_DSS_CLK_SRC_FCK) {

		/* DSI FCLK source is DSS_CLK_FCK */

		/* DSI FCLK source is DSS_CLK_FCK */

		r = clk_get_rate(dsi->dss_clk);

		r = clk_get_rate(dsi->dss_clk);

	} else {

	} else {
@@ -1683,7 +1679,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev, 
	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_clock_info *cinfo = &dsi->current_cinfo;

	struct dsi_clock_info *cinfo = &dsi->current_cinfo;

	enum omap_dss_clk_source dispc_clk_src, dsi_clk_src;

	enum omap_dss_clk_source dispc_clk_src, dsi_clk_src;

	int dsi_module = dsi_get_dsidev_id(dsidev);

	int dsi_module = dsi->module_id;





	dispc_clk_src = dss_get_dispc_clk_source();

	dispc_clk_src = dss_get_dispc_clk_source();

	dsi_clk_src = dss_get_dsi_clk_source(dsi_module);

	dsi_clk_src = dss_get_dsi_clk_source(dsi_module);
@@ -1755,7 +1751,6 @@ static void dsi_dump_dsidev_irqs(struct platform_device *dsidev, 
	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	unsigned long flags;

	unsigned long flags;

	struct dsi_irq_stats stats;

	struct dsi_irq_stats stats;

	int dsi_module = dsi_get_dsidev_id(dsidev);





	spin_lock_irqsave(&dsi->irq_stats_lock, flags);

	spin_lock_irqsave(&dsi->irq_stats_lock, flags);
@@ -1772,7 +1767,7 @@ static void dsi_dump_dsidev_irqs(struct platform_device *dsidev, 
#define PIS(x) \

#define PIS(x) \

	seq_printf(s, "%-20s %10d\n", #x, stats.dsi_irqs[ffs(DSI_IRQ_##x)-1]);

	seq_printf(s, "%-20s %10d\n", #x, stats.dsi_irqs[ffs(DSI_IRQ_##x)-1]);





	seq_printf(s, "-- DSI%d interrupts --\n", dsi_module + 1);

	seq_printf(s, "-- DSI%d interrupts --\n", dsi->module_id + 1);

	PIS(VC0);

	PIS(VC0);

	PIS(VC1);

	PIS(VC1);

	PIS(VC2);

	PIS(VC2);
@@ -2272,7 +2267,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev) 




	DSSDBGF();

	DSSDBGF();





	r = dss_dsi_enable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));

	r = dss_dsi_enable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));

	if (r)

	if (r)

		return r;

		return r;
@@ -2382,20 +2377,21 @@ err_cio_pwr: 
		dsi_cio_disable_lane_override(dsidev);

		dsi_cio_disable_lane_override(dsidev);

err_scp_clk_dom:

err_scp_clk_dom:

	dsi_disable_scp_clk(dsidev);

	dsi_disable_scp_clk(dsidev);

	dss_dsi_disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));

	dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));

	return r;

	return r;

}

}





static void dsi_cio_uninit(struct omap_dss_device *dssdev)

static void dsi_cio_uninit(struct omap_dss_device *dssdev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);





	/* DDR_CLK_ALWAYS_ON */

	/* DDR_CLK_ALWAYS_ON */

	REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 0, 13, 13);

	REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 0, 13, 13);





	dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_OFF);

	dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_OFF);

	dsi_disable_scp_clk(dsidev);

	dsi_disable_scp_clk(dsidev);

	dss_dsi_disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev));

	dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));

}

}





static void dsi_config_tx_fifo(struct platform_device *dsidev,

static void dsi_config_tx_fifo(struct platform_device *dsidev,
@@ -4272,7 +4268,7 @@ static int dsi_configure_dispc_clocks(struct omap_dss_device *dssdev) 
static int dsi_display_init_dsi(struct omap_dss_device *dssdev)

static int dsi_display_init_dsi(struct omap_dss_device *dssdev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	int dsi_module = dsi_get_dsidev_id(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int r;

	int r;





	r = dsi_pll_init(dsidev, true, true);

	r = dsi_pll_init(dsidev, true, true);
@@ -4284,7 +4280,7 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev) 
		goto err1;

		goto err1;





	dss_select_dispc_clk_source(dssdev->clocks.dispc.dispc_fclk_src);

	dss_select_dispc_clk_source(dssdev->clocks.dispc.dispc_fclk_src);

	dss_select_dsi_clk_source(dsi_module, dssdev->clocks.dsi.dsi_fclk_src);

	dss_select_dsi_clk_source(dsi->module_id, dssdev->clocks.dsi.dsi_fclk_src);

	dss_select_lcd_clk_source(dssdev->manager->id,

	dss_select_lcd_clk_source(dssdev->manager->id,

			dssdev->clocks.dispc.channel.lcd_clk_src);

			dssdev->clocks.dispc.channel.lcd_clk_src);
@@ -4323,7 +4319,7 @@ err3: 
	dsi_cio_uninit(dssdev);

	dsi_cio_uninit(dssdev);

err2:

err2:

	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi_module, OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);





err1:

err1:
@@ -4337,7 +4333,6 @@ static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev, 
{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	int dsi_module = dsi_get_dsidev_id(dsidev);





	if (enter_ulps && !dsi->ulps_enabled)

	if (enter_ulps && !dsi->ulps_enabled)

		dsi_enter_ulps(dsidev);

		dsi_enter_ulps(dsidev);
@@ -4350,7 +4345,7 @@ static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev, 
	dsi_vc_enable(dsidev, 3, 0);

	dsi_vc_enable(dsidev, 3, 0);





	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi_module, OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);

	dsi_cio_uninit(dssdev);

	dsi_cio_uninit(dssdev);

	dsi_pll_uninit(dsidev, disconnect_lanes);

	dsi_pll_uninit(dsidev, disconnect_lanes);
@@ -4611,7 +4606,7 @@ static void dsi_put_clocks(struct platform_device *dsidev) 
static int __init omap_dsihw_probe(struct platform_device *dsidev)

static int __init omap_dsihw_probe(struct platform_device *dsidev)

{

{

	u32 rev;

	u32 rev;

	int r, i, dsi_module = dsi_get_dsidev_id(dsidev);

	int r, i;

	struct resource *dsi_mem;

	struct resource *dsi_mem;

	struct dsi_data *dsi;

	struct dsi_data *dsi;

	struct omap_dss_board_info *pdata = dsidev->dev.platform_data;

	struct omap_dss_board_info *pdata = dsidev->dev.platform_data;
@@ -4620,8 +4615,9 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) 
	if (!dsi)

	if (!dsi)

		return -ENOMEM;

		return -ENOMEM;





	dsi->module_id = dsidev->id;

	dsi->pdev = dsidev;

	dsi->pdev = dsidev;

	dsi_pdev_map[dsi_module] = dsidev;

	dsi_pdev_map[dsi->module_id] = dsidev;

	dev_set_drvdata(&dsidev->dev, dsi);

	dev_set_drvdata(&dsidev->dev, dsi);





	spin_lock_init(&dsi->irq_lock);

	spin_lock_init(&dsi->irq_lock);
@@ -4707,7 +4703,7 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) 
		if (dssdev->type != OMAP_DISPLAY_TYPE_DSI)

		if (dssdev->type != OMAP_DISPLAY_TYPE_DSI)

			continue;

			continue;





		if (dssdev->phy.dsi.module != dsi_module)

		if (dssdev->phy.dsi.module != dsi->module_id)

			continue;

			continue;





		r = dsi_init_display(dssdev);

		r = dsi_init_display(dssdev);
@@ -4724,15 +4720,15 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) 




	dsi_runtime_put(dsidev);

	dsi_runtime_put(dsidev);





	if (dsi_module == 0)

	if (dsi->module_id == 0)

		dss_debugfs_create_file("dsi1_regs", dsi1_dump_regs);

		dss_debugfs_create_file("dsi1_regs", dsi1_dump_regs);

	else if (dsi_module == 1)

	else if (dsi->module_id == 1)

		dss_debugfs_create_file("dsi2_regs", dsi2_dump_regs);

		dss_debugfs_create_file("dsi2_regs", dsi2_dump_regs);





#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS

#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS

	if (dsi_module == 0)

	if (dsi->module_id == 0)

		dss_debugfs_create_file("dsi1_irqs", dsi1_dump_irqs);

		dss_debugfs_create_file("dsi1_irqs", dsi1_dump_irqs);

	else if (dsi_module == 1)

	else if (dsi->module_id == 1)

		dss_debugfs_create_file("dsi2_irqs", dsi2_dump_irqs);

		dss_debugfs_create_file("dsi2_irqs", dsi2_dump_irqs);

#endif

#endif

	return 0;

	return 0;