diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-19 22:02:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 18:50:19 +0100 |
| commit | 1d14de087dd1cab0436fb7c9d5e38d852f33df69 (patch) | |
| tree | 6aebc10cd49bb223b60c059fb4dd17f10c818982 /drivers | |
| parent | [ARM] omap: mcbsp: convert to use fck/ick clocks directly (diff) | |
| download | linux-1d14de087dd1cab0436fb7c9d5e38d852f33df69.tar.xz linux-1d14de087dd1cab0436fb7c9d5e38d852f33df69.zip | |
[ARM] omap: i2c: use short connection ids
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index be8ee2cac8bb..19f86e1eefa1 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -194,14 +194,14 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg) static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev) { if (cpu_is_omap16xx() || cpu_class_is_omap2()) { - dev->iclk = clk_get(dev->dev, "i2c_ick"); + dev->iclk = clk_get(dev->dev, "ick"); if (IS_ERR(dev->iclk)) { dev->iclk = NULL; return -ENODEV; } } - dev->fclk = clk_get(dev->dev, "i2c_fck"); + dev->fclk = clk_get(dev->dev, "fck"); if (IS_ERR(dev->fclk)) { if (dev->iclk != NULL) { clk_put(dev->iclk); |