diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-19 16:02:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:19 -0500 |
| commit | 1d14de087dd1cab0436fb7c9d5e38d852f33df69 (patch) | |
| tree | 6aebc10cd49bb223b60c059fb4dd17f10c818982 /drivers/i2c/busses | |
| parent | b820ce4e6736ddad7ccda528e10aaf37ad3f13f9 (diff) | |
[ARM] omap: i2c: use short connection ids
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c/busses')
| -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) | |||
| 194 | static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev) | 194 | static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev) |
| 195 | { | 195 | { |
| 196 | if (cpu_is_omap16xx() || cpu_class_is_omap2()) { | 196 | if (cpu_is_omap16xx() || cpu_class_is_omap2()) { |
| 197 | dev->iclk = clk_get(dev->dev, "i2c_ick"); | 197 | dev->iclk = clk_get(dev->dev, "ick"); |
| 198 | if (IS_ERR(dev->iclk)) { | 198 | if (IS_ERR(dev->iclk)) { |
| 199 | dev->iclk = NULL; | 199 | dev->iclk = NULL; |
| 200 | return -ENODEV; | 200 | return -ENODEV; |
| 201 | } | 201 | } |
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | dev->fclk = clk_get(dev->dev, "i2c_fck"); | 204 | dev->fclk = clk_get(dev->dev, "fck"); |
| 205 | if (IS_ERR(dev->fclk)) { | 205 | if (IS_ERR(dev->fclk)) { |
| 206 | if (dev->iclk != NULL) { | 206 | if (dev->iclk != NULL) { |
| 207 | clk_put(dev->iclk); | 207 | clk_put(dev->iclk); |