[ARM] omap: i2c: use short connection ids

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index b62da4c95630448bfc5baac748e48cfe61421cca..382e09a1cecad151780e16fec8d5e2a4b945a908 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -130,8 +130,8 @@ static struct omap_clk omap_clks[] = {
        CLK("mmci-omap.1", "ick",       &armper_ck.clk, CK_16XX),
        /* Virtual clocks */
        CLK(NULL,       "mpu",          &virtual_ck_mpu, CK_16XX | CK_1510 | CK_310),
-       CLK("i2c_omap.1", "i2c_fck",    &i2c_fck,       CK_16XX | CK_1510 | CK_310),
-       CLK("i2c_omap.1", "i2c_ick",    &i2c_ick,       CK_16XX),
+       CLK("i2c_omap.1", "fck",        &i2c_fck,       CK_16XX | CK_1510 | CK_310),
+       CLK("i2c_omap.1", "ick",        &i2c_ick,       CK_16XX),
        CLK("omap-mcbsp.1", "ick",      &dspper_ck,     CK_16XX),
        CLK("omap-mcbsp.1", "ick",      &dummy_ck,      CK_1510 | CK_310),
        CLK("omap-mcbsp.2", "ick",      &armper_ck.clk, CK_16XX),

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index ea21d55a20759dc77f174a7c3b56f85f9512e240..81c7b705114dab458368c5f4fbb468806360d65f 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -186,12 +186,12 @@ static struct omap_clk omap24xx_clks[] = {
        CLK(NULL,       "eac_fck",      &eac_fck,       CK_242X),
        CLK(NULL,       "hdq_ick",      &hdq_ick,       CK_243X | CK_242X),
        CLK(NULL,       "hdq_fck",      &hdq_fck,       CK_243X | CK_242X),
-       CLK("i2c_omap.1", "i2c_ick",    &i2c1_ick,      CK_243X | CK_242X),
-       CLK("i2c_omap.1", "i2c_fck",    &i2c1_fck,      CK_242X),
-       CLK("i2c_omap.1", "i2c_fck",    &i2chs1_fck,    CK_243X),
-       CLK("i2c_omap.2", "i2c_ick",    &i2c2_ick,      CK_243X | CK_242X),
-       CLK("i2c_omap.2", "i2c_fck",    &i2c2_fck,      CK_242X),
-       CLK("i2c_omap.2", "i2c_fck",    &i2chs2_fck,    CK_243X),
+       CLK("i2c_omap.1", "ick",        &i2c1_ick,      CK_243X | CK_242X),
+       CLK("i2c_omap.1", "fck",        &i2c1_fck,      CK_242X),
+       CLK("i2c_omap.1", "fck",        &i2chs1_fck,    CK_243X),
+       CLK("i2c_omap.2", "ick",        &i2c2_ick,      CK_243X | CK_242X),
+       CLK("i2c_omap.2", "fck",        &i2c2_fck,      CK_242X),
+       CLK("i2c_omap.2", "fck",        &i2chs2_fck,    CK_243X),
        CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_243X | CK_242X),
        CLK(NULL,       "sdma_fck",     &sdma_fck,      CK_243X | CK_242X),
        CLK(NULL,       "sdma_ick",     &sdma_ick,      CK_243X | CK_242X),

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index a70aa2eaf053f978c0a0d541e9fe0187381533ac..859ad1d4062a0f35775164a67f6e3c26a8b41081 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -141,9 +141,9 @@ static struct omap_clk omap34xx_clks[] = {
        CLK("mmci-omap-hs.1",   "mmchs_fck",    &mmchs2_fck,    CK_343X),
        CLK(NULL,       "mspro_fck",    &mspro_fck,     CK_343X),
        CLK("mmci-omap-hs.0",   "mmchs_fck",    &mmchs1_fck,    CK_343X),
-       CLK("i2c_omap.3", "i2c_fck",    &i2c3_fck,      CK_343X),
-       CLK("i2c_omap.2", "i2c_fck",    &i2c2_fck,      CK_343X),
-       CLK("i2c_omap.1", "i2c_fck",    &i2c1_fck,      CK_343X),
+       CLK("i2c_omap.3", "fck",        &i2c3_fck,      CK_343X),
+       CLK("i2c_omap.2", "fck",        &i2c2_fck,      CK_343X),
+       CLK("i2c_omap.1", "fck",        &i2c1_fck,      CK_343X),
        CLK("omap-mcbsp.5", "fck",      &mcbsp5_fck,    CK_343X),
        CLK("omap-mcbsp.1", "fck",      &mcbsp1_fck,    CK_343X),
        CLK(NULL,       "core_48m_fck", &core_48m_fck,  CK_343X),
@@ -179,9 +179,9 @@ static struct omap_clk omap34xx_clks[] = {
        CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_343X),
        CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_343X),
        CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_343X),
-       CLK("i2c_omap.3", "i2c_ick",    &i2c3_ick,      CK_343X),
-       CLK("i2c_omap.2", "i2c_ick",    &i2c2_ick,      CK_343X),
-       CLK("i2c_omap.1", "i2c_ick",    &i2c1_ick,      CK_343X),
+       CLK("i2c_omap.3", "ick",        &i2c3_ick,      CK_343X),
+       CLK("i2c_omap.2", "ick",        &i2c2_ick,      CK_343X),
+       CLK("i2c_omap.1", "ick",        &i2c1_ick,      CK_343X),
        CLK(NULL,       "uart2_ick",    &uart2_ick,     CK_343X),
        CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_343X),
        CLK(NULL,       "gpt11_ick",    &gpt11_ick,     CK_343X),

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index be8ee2cac8bbe237c459fcd497cef8812acea728..19f86e1eefa153bea9440003e3fa7917bc13a9c7 100644 (file)
--- 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);