aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-19 21:02:29 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 17:50:19 +0000
commit1d14de087dd1cab0436fb7c9d5e38d852f33df69 (patch)
tree6aebc10cd49bb223b60c059fb4dd17f10c818982 /drivers/i2c
parentb820ce4e6736ddad7ccda528e10aaf37ad3f13f9 (diff)
downloadkernel_samsung_tuna-1d14de087dd1cab0436fb7c9d5e38d852f33df69.zip
kernel_samsung_tuna-1d14de087dd1cab0436fb7c9d5e38d852f33df69.tar.gz
kernel_samsung_tuna-1d14de087dd1cab0436fb7c9d5e38d852f33df69.tar.bz2
[ARM] omap: i2c: use short connection ids
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index be8ee2c..19f86e1 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);