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

Commit 7a10f473 authored by Daniel Drake's avatar Daniel Drake Committed by Wolfram Sang
Browse files

i2c-pxa: prepare clock before use 



On OLPC XO-1.75 (MMP2), a WARN_ON() was occurring during boot
since the clock being enabled by i2c-pxa had not been prepared.

Use clk_prepare_enable() to ensure that the prepare operation
has taken place, and use clk_disable_unprepare() in the matching
shutdown paths.

Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 661f6c1c

drivers/i2c/busses/i2c-pxa.c

+3 −3
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static int i2c_pxa_probe(struct platform_device *dev) 
		i2c->adap.class = plat->class;

	}



	clk_enable(i2c->clk);

	clk_prepare_enable(i2c->clk);



	if (i2c->use_pio) {

		i2c->adap.algo = &i2c_pxa_pio_algorithm;
@@ -1202,7 +1202,7 @@ static int i2c_pxa_probe(struct platform_device *dev) 
	if (!i2c->use_pio)

		free_irq(irq, i2c);

ereqirq:

	clk_disable(i2c->clk);

	clk_disable_unprepare(i2c->clk);

	iounmap(i2c->reg_base);

eremap:

	clk_put(i2c->clk);
@@ -1221,7 +1221,7 @@ static int i2c_pxa_remove(struct platform_device *dev) 
	if (!i2c->use_pio)

		free_irq(i2c->irq, i2c);



	clk_disable(i2c->clk);

	clk_disable_unprepare(i2c->clk);

	clk_put(i2c->clk);



	iounmap(i2c->reg_base);