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

Commit 8105c94b authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DISPC: remove dispc fck uses 



The previous patch changes dispc to get the dispc fck rate from dss core
driver. This was the only use of the dispc fck in dispc, and thus we can
now remove the clock handling.

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

drivers/video/omap2/dss/dispc.c

+0 −14
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ static struct { 
	int		ctx_loss_cnt;

	int		ctx_loss_cnt;





	int irq;

	int irq;

	struct clk *dss_clk;





	u32 fifo_size[DISPC_MAX_NR_FIFOS];

	u32 fifo_size[DISPC_MAX_NR_FIFOS];

	/* maps which plane is using a fifo. fifo-id -> plane-id */

	/* maps which plane is using a fifo. fifo-id -> plane-id */
@@ -3619,7 +3618,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev) 
	u32 rev;

	u32 rev;

	int r = 0;

	int r = 0;

	struct resource *dispc_mem;

	struct resource *dispc_mem;

	struct clk *clk;





	dispc.pdev = pdev;

	dispc.pdev = pdev;
@@ -3646,15 +3644,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	clk = clk_get(&pdev->dev, "fck");

	if (IS_ERR(clk)) {

		DSSERR("can't get fck\n");

		r = PTR_ERR(clk);

		return r;

	}



	dispc.dss_clk = clk;



	pm_runtime_enable(&pdev->dev);

	pm_runtime_enable(&pdev->dev);





	r = dispc_runtime_get();

	r = dispc_runtime_get();
@@ -3675,7 +3664,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev) 




err_runtime_get:

err_runtime_get:

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	clk_put(dispc.dss_clk);

	return r;

	return r;

}

}
@@ -3683,8 +3671,6 @@ static int __exit omap_dispchw_remove(struct platform_device *pdev) 
{

{

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);





	clk_put(dispc.dss_clk);



	return 0;

	return 0;

}

}