Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: PNX4008: convert i2c-pnx to use clk API enable/disable calls

Browse Source 
clk_set_rate() is not supposed to be used to turn clocks on and off.
That's what clk_enable/clk_disable is for.

Acked-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2009-11-20 11:44:46 +00:00
parent 0321cb83e1
commit ebdbbf2003
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-pnx4008/clock.c
View File

@ -639,30 +639,30 @@ static struct clk i2c0_ck = {
.name = "i2c0_ck", .name = "i2c0_ck",
.parent = &per_ck, .parent = &per_ck,
.flags = NEEDS_INITIALIZATION, .flags = NEEDS_INITIALIZATION,
.round_rate = &on_off_round_rate,
.set_rate = &on_off_set_rate,
.enable_shift = 0, .enable_shift = 0,
.enable_reg = I2CCLKCTRL_REG, .enable_reg = I2CCLKCTRL_REG,
.enable = clk_reg_enable,
.disable = clk_reg_disable,
}; };
static struct clk i2c1_ck = { static struct clk i2c1_ck = {
.name = "i2c1_ck", .name = "i2c1_ck",
.parent = &per_ck, .parent = &per_ck,
.flags = NEEDS_INITIALIZATION, .flags = NEEDS_INITIALIZATION,
.round_rate = &on_off_round_rate,
.set_rate = &on_off_set_rate,
.enable_shift = 1, .enable_shift = 1,
.enable_reg = I2CCLKCTRL_REG, .enable_reg = I2CCLKCTRL_REG,
.enable = clk_reg_enable,
.disable = clk_reg_disable,
}; };
static struct clk i2c2_ck = { static struct clk i2c2_ck = {
.name = "i2c2_ck", .name = "i2c2_ck",
.parent = &per_ck, .parent = &per_ck,
.flags = NEEDS_INITIALIZATION, .flags = NEEDS_INITIALIZATION,
.round_rate = &on_off_round_rate,
.set_rate = &on_off_set_rate,
.enable_shift = 2, .enable_shift = 2,
.enable_reg = USB_OTG_CLKCTRL_REG, .enable_reg = USB_OTG_CLKCTRL_REG,
.enable = clk_reg_enable,
.disable = clk_reg_disable,
}; };
static struct clk spi0_ck = { static struct clk spi0_ck = {

18
drivers/i2c/busses/i2c-pnx.c
View File

@ -555,8 +555,8 @@ static int i2c_pnx_controller_suspend(struct platform_device *pdev,
struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev); struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev);
struct i2c_pnx_algo_data *alg_data = i2c_pnx->adapter->algo_data; struct i2c_pnx_algo_data *alg_data = i2c_pnx->adapter->algo_data;
/* FIXME: disable clock? */ /* FIXME: shouldn't this be clk_disable? */
clk_set_rate(alg_data->clk, 1); clk_enable(alg_data->clk);
return 0; return 0;
} }
@ -566,9 +566,7 @@ static int i2c_pnx_controller_resume(struct platform_device *pdev)
struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev); struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev);
struct i2c_pnx_algo_data *alg_data = i2c_pnx->adapter->algo_data; struct i2c_pnx_algo_data *alg_data = i2c_pnx->adapter->algo_data;
clk_set_rate(alg_data->clk, 1); return clk_enable(alg_data->clk);
return 0;
} }
#else #else
#define i2c_pnx_controller_suspend NULL #define i2c_pnx_controller_suspend NULL
@ -630,7 +628,9 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
goto out_release; goto out_release;
} }
clk_set_rate(alg_data->clk, 1); ret = clk_enable(alg_data->clk);
if (ret)
goto out_unmap;
/* /*
* Clock Divisor High This value is the number of system clocks * Clock Divisor High This value is the number of system clocks
@ -650,7 +650,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
iowrite32(mcntrl_reset, I2C_REG_CTL(alg_data)); iowrite32(mcntrl_reset, I2C_REG_CTL(alg_data));
if (wait_reset(I2C_PNX_TIMEOUT, alg_data)) { if (wait_reset(I2C_PNX_TIMEOUT, alg_data)) {
ret = -ENODEV; ret = -ENODEV;
goto out_unmap; goto out_clock;
} }
init_completion(&alg_data->mif.complete); init_completion(&alg_data->mif.complete);
@ -676,7 +676,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
out_irq: out_irq:
free_irq(alg_data->irq, i2c_pnx->adapter); free_irq(alg_data->irq, i2c_pnx->adapter);
out_clock: out_clock:
clk_set_rate(alg_data->clk, 0); clk_disable(alg_data->clk);
out_unmap: out_unmap:
iounmap((void *)alg_data->ioaddr); iounmap((void *)alg_data->ioaddr);
out_release: out_release:
@ -697,7 +697,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev)
free_irq(alg_data->irq, i2c_pnx->adapter); free_irq(alg_data->irq, i2c_pnx->adapter);
i2c_del_adapter(adap); i2c_del_adapter(adap);
clk_set_rate(alg_data->clk, 0); clk_disable(alg_data->clk);
iounmap((void *)alg_data->ioaddr); iounmap((void *)alg_data->ioaddr);
release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE); release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
clk_put(alg_data->clk); clk_put(alg_data->clk);