I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

The convention for omap device naming is omap_XXX.

Rename the device and driver name in order to stick
to this naming convention.

Change device name in clock nodes as well.

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Ben Dooks <ben-i2c@fluff.org>
Acked-by: Paul Walmsley <paul@pwsan.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index 423d21d8c19047c04c6a09ac69cf91a1885f136c..12fee24181b28e328def8a4fc8292ec70a7530a1 100644 (file)
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -736,9 +736,9 @@ 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", "fck",        &i2c_fck,       CK_16XX | CK_1510 | CK_310 | CK_7XX),
-       CLK("i2c_omap.1", "ick",        &i2c_ick,       CK_16XX),
-       CLK("i2c_omap.1", "ick",        &dummy_ck,      CK_1510 | CK_310 | CK_7XX),
+       CLK("omap_i2c.1", "fck",        &i2c_fck,       CK_16XX | CK_1510 | CK_310 | CK_7XX),
+       CLK("omap_i2c.1", "ick",        &i2c_ick,       CK_16XX),
+       CLK("omap_i2c.1", "ick",        &dummy_ck,      CK_1510 | CK_310 | CK_7XX),
        CLK("omap1_spi100k.1", "fck",   &dummy_ck,      CK_7XX),
        CLK("omap1_spi100k.1", "ick",   &dummy_ck,      CK_7XX),
        CLK("omap1_spi100k.2", "fck",   &dummy_ck,      CK_7XX),

diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index 21f856252ad86e3c95ac14ba75620a8385ce1676..ed61ac2c6f7b23451f4f4c90da69480fbb784ea1 100644 (file)
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1862,10 +1862,10 @@ static struct omap_clk omap2420_clks[] = {
        CLK(NULL,       "eac_fck",      &eac_fck,       CK_242X),
        CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_242X),
        CLK("omap_hdq.1", "fck",        &hdq_fck,       CK_242X),
-       CLK("i2c_omap.1", "ick",        &i2c1_ick,      CK_242X),
-       CLK("i2c_omap.1", "fck",        &i2c1_fck,      CK_242X),
-       CLK("i2c_omap.2", "ick",        &i2c2_ick,      CK_242X),
-       CLK("i2c_omap.2", "fck",        &i2c2_fck,      CK_242X),
+       CLK("omap_i2c.1", "ick",        &i2c1_ick,      CK_242X),
+       CLK("omap_i2c.1", "fck",        &i2c1_fck,      CK_242X),
+       CLK("omap_i2c.2", "ick",        &i2c2_ick,      CK_242X),
+       CLK("omap_i2c.2", "fck",        &i2c2_fck,      CK_242X),
        CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_242X),
        CLK(NULL,       "sdma_fck",     &sdma_fck,      CK_242X),
        CLK(NULL,       "sdma_ick",     &sdma_ick,      CK_242X),

diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
index e32afcbdfb88aabdfd69979d478e6f21cce491d0..1bded4e074891dfcff18ac18924aaf811e4176ee 100644 (file)
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -1969,10 +1969,10 @@ static struct omap_clk omap2430_clks[] = {
        CLK(NULL,       "fac_fck",      &fac_fck,       CK_243X),
        CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_243X),
        CLK("omap_hdq.1", "fck",        &hdq_fck,       CK_243X),
-       CLK("i2c_omap.1", "ick",        &i2c1_ick,      CK_243X),
-       CLK("i2c_omap.1", "fck",        &i2chs1_fck,    CK_243X),
-       CLK("i2c_omap.2", "ick",        &i2c2_ick,      CK_243X),
-       CLK("i2c_omap.2", "fck",        &i2chs2_fck,    CK_243X),
+       CLK("omap_i2c.1", "ick",        &i2c1_ick,      CK_243X),
+       CLK("omap_i2c.1", "fck",        &i2chs1_fck,    CK_243X),
+       CLK("omap_i2c.2", "ick",        &i2c2_ick,      CK_243X),
+       CLK("omap_i2c.2", "fck",        &i2chs2_fck,    CK_243X),
        CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_243X),
        CLK(NULL,       "sdma_fck",     &sdma_fck,      CK_243X),
        CLK(NULL,       "sdma_ick",     &sdma_ick,      CK_243X),

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index d85ecd5aebfd1d64358f4f91789b65c542df9c43..ee8aa39269f3f60d7fb8a739361821dcb79127ba 100644 (file)
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3285,9 +3285,9 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK("mmci-omap-hs.1",   "fck",  &mmchs2_fck,    CK_3XXX),
        CLK(NULL,       "mspro_fck",    &mspro_fck,     CK_343X),
        CLK("mmci-omap-hs.0",   "fck",  &mmchs1_fck,    CK_3XXX),
-       CLK("i2c_omap.3", "fck",        &i2c3_fck,      CK_3XXX),
-       CLK("i2c_omap.2", "fck",        &i2c2_fck,      CK_3XXX),
-       CLK("i2c_omap.1", "fck",        &i2c1_fck,      CK_3XXX),
+       CLK("omap_i2c.3", "fck",        &i2c3_fck,      CK_3XXX),
+       CLK("omap_i2c.2", "fck",        &i2c2_fck,      CK_3XXX),
+       CLK("omap_i2c.1", "fck",        &i2c1_fck,      CK_3XXX),
        CLK("omap-mcbsp.5", "fck",      &mcbsp5_fck,    CK_3XXX),
        CLK("omap-mcbsp.1", "fck",      &mcbsp1_fck,    CK_3XXX),
        CLK(NULL,       "core_48m_fck", &core_48m_fck,  CK_3XXX),
@@ -3326,9 +3326,9 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_3XXX),
        CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_3XXX),
        CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_3XXX),
-       CLK("i2c_omap.3", "ick",        &i2c3_ick,      CK_3XXX),
-       CLK("i2c_omap.2", "ick",        &i2c2_ick,      CK_3XXX),
-       CLK("i2c_omap.1", "ick",        &i2c1_ick,      CK_3XXX),
+       CLK("omap_i2c.3", "ick",        &i2c3_ick,      CK_3XXX),
+       CLK("omap_i2c.2", "ick",        &i2c2_ick,      CK_3XXX),
+       CLK("omap_i2c.1", "ick",        &i2c1_ick,      CK_3XXX),
        CLK(NULL,       "uart2_ick",    &uart2_ick,     CK_3XXX),
        CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_3XXX),
        CLK(NULL,       "gpt11_ick",    &gpt11_ick,     CK_3XXX),

diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index 1599836ba3d9ba2787aa38f4414d88b346dc37bb..217cce489738b6b1755baa2c1a0ac10255c1f2ec 100644 (file)
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -2872,10 +2872,10 @@ static struct omap_clk omap44xx_clks[] = {
        CLK(NULL,       "gpu_fck",                      &gpu_fck,       CK_443X),
        CLK("omap2_hdq.0",      "fck",                          &hdq1w_fck,     CK_443X),
        CLK(NULL,       "hsi_fck",                      &hsi_fck,       CK_443X),
-       CLK("i2c_omap.1",       "fck",                          &i2c1_fck,      CK_443X),
-       CLK("i2c_omap.2",       "fck",                          &i2c2_fck,      CK_443X),
-       CLK("i2c_omap.3",       "fck",                          &i2c3_fck,      CK_443X),
-       CLK("i2c_omap.4",       "fck",                          &i2c4_fck,      CK_443X),
+       CLK("omap_i2c.1",       "fck",                          &i2c1_fck,      CK_443X),
+       CLK("omap_i2c.2",       "fck",                          &i2c2_fck,      CK_443X),
+       CLK("omap_i2c.3",       "fck",                          &i2c3_fck,      CK_443X),
+       CLK("omap_i2c.4",       "fck",                          &i2c4_fck,      CK_443X),
        CLK(NULL,       "ipu_fck",                      &ipu_fck,       CK_443X),
        CLK(NULL,       "iss_ctrlclk",                  &iss_ctrlclk,   CK_443X),
        CLK(NULL,       "iss_fck",                      &iss_fck,       CK_443X),
@@ -2975,10 +2975,10 @@ static struct omap_clk omap44xx_clks[] = {
        CLK(NULL,       "gpt9_ick",                     &dummy_ck,      CK_443X),
        CLK(NULL,       "gpt10_ick",                    &dummy_ck,      CK_443X),
        CLK(NULL,       "gpt11_ick",                    &dummy_ck,      CK_443X),
-       CLK("i2c_omap.1",       "ick",                          &dummy_ck,      CK_443X),
-       CLK("i2c_omap.2",       "ick",                          &dummy_ck,      CK_443X),
-       CLK("i2c_omap.3",       "ick",                          &dummy_ck,      CK_443X),
-       CLK("i2c_omap.4",       "ick",                          &dummy_ck,      CK_443X),
+       CLK("omap_i2c.1",       "ick",                          &dummy_ck,      CK_443X),
+       CLK("omap_i2c.2",       "ick",                          &dummy_ck,      CK_443X),
+       CLK("omap_i2c.3",       "ick",                          &dummy_ck,      CK_443X),
+       CLK("omap_i2c.4",       "ick",                          &dummy_ck,      CK_443X),
        CLK("mmci-omap-hs.0",   "ick",                          &dummy_ck,      CK_443X),
        CLK("mmci-omap-hs.1",   "ick",                          &dummy_ck,      CK_443X),
        CLK("mmci-omap-hs.2",   "ick",                          &dummy_ck,      CK_443X),

diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index db9c4efd79e34cc9b9ecacdf39844622fa179767..a4f8003de664c1972c697070268108ee3cd95082 100644 (file)
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -40,7 +40,7 @@
 #define OMAP_I2C_SIZE          0x3f
 #define OMAP1_I2C_BASE         0xfffb3800
 
-static const char name[] = "i2c_omap";
+static const char name[] = "omap_i2c";
 
 #define I2C_RESOURCE_BUILDER(base, irq)                        \
        {                                               \

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 760b8be6975fd7c956ba2b0b0944b7cc43346e98..9d090833e245a7a6cbe48dceedb2de60343ef58a 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1139,7 +1139,7 @@ static struct platform_driver omap_i2c_driver = {
        .probe          = omap_i2c_probe,
        .remove         = omap_i2c_remove,
        .driver         = {
-               .name   = "i2c_omap",
+               .name   = "omap_i2c",
                .owner  = THIS_MODULE,
        },
 };
@@ -1161,4 +1161,4 @@ module_exit(omap_i2c_exit_driver);
 MODULE_AUTHOR("MontaVista Software, Inc. (and others)");
 MODULE_DESCRIPTION("TI OMAP I2C bus adapter");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:i2c_omap");
+MODULE_ALIAS("platform:omap_i2c");