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

Commit aeac9e3f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Tomi Valkeinen
Browse files

video: jz4740-fb: Use clk_prepare_enable/clk_disable_unprepare 



In preparation to switching the jz4740 clk driver to the common clk framework
update the clk enable/disable calls to clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 8a519c43

drivers/video/jz4740_fb.c

+5 −5
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int jzfb_set_par(struct fb_info *info) 
	writel(ctrl, jzfb->base + JZ_REG_LCD_CTRL);



	if (!jzfb->is_enabled)

		clk_disable(jzfb->ldclk);

		clk_disable_unprepare(jzfb->ldclk);



	mutex_unlock(&jzfb->lock);
@@ -485,7 +485,7 @@ static void jzfb_enable(struct jzfb *jzfb) 
{

	uint32_t ctrl;



	clk_enable(jzfb->ldclk);

	clk_prepare_enable(jzfb->ldclk);



	jz_gpio_bulk_resume(jz_lcd_ctrl_pins, jzfb_num_ctrl_pins(jzfb));

	jz_gpio_bulk_resume(jz_lcd_data_pins, jzfb_num_data_pins(jzfb));
@@ -514,7 +514,7 @@ static void jzfb_disable(struct jzfb *jzfb) 
	jz_gpio_bulk_suspend(jz_lcd_ctrl_pins, jzfb_num_ctrl_pins(jzfb));

	jz_gpio_bulk_suspend(jz_lcd_data_pins, jzfb_num_data_pins(jzfb));



	clk_disable(jzfb->ldclk);

	clk_disable_unprepare(jzfb->ldclk);

}



static int jzfb_blank(int blank_mode, struct fb_info *info)
@@ -693,7 +693,7 @@ static int jzfb_probe(struct platform_device *pdev) 


	fb_alloc_cmap(&fb->cmap, 256, 0);



	clk_enable(jzfb->ldclk);

	clk_prepare_enable(jzfb->ldclk);

	jzfb->is_enabled = 1;



	writel(jzfb->framedesc->next, jzfb->base + JZ_REG_LCD_DA0);
@@ -763,7 +763,7 @@ static int jzfb_suspend(struct device *dev) 
static int jzfb_resume(struct device *dev)

{

	struct jzfb *jzfb = dev_get_drvdata(dev);

	clk_enable(jzfb->ldclk);

	clk_prepare_enable(jzfb->ldclk);



	mutex_lock(&jzfb->lock);

	if (jzfb->is_enabled)