aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2010-12-09 09:24:16 -0500
committerTony Lindgren <tony@atomide.com>2010-12-20 20:53:04 -0500
commitf7bb0d9ab29e3159e22c3bfc843bd37c7d3c91a0 (patch)
tree702fb45ad3b0a54a57d33e6be589669c1ea869df
parent05f185c774992f1d9edb646a3ecfdabdc8e358f3 (diff)
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>
-rw-r--r--arch/arm/mach-omap1/clock_data.c6
-rw-r--r--arch/arm/mach-omap2/clock2420_data.c8
-rw-r--r--arch/arm/mach-omap2/clock2430_data.c8
-rw-r--r--arch/arm/mach-omap2/clock3xxx_data.c12
-rw-r--r--arch/arm/mach-omap2/clock44xx_data.c16
-rw-r--r--arch/arm/plat-omap/i2c.c2
-rw-r--r--drivers/i2c/busses/i2c-omap.c4
7 files changed, 28 insertions, 28 deletions
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index 423d21d8c190..12fee24181b2 100644
--- 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[] = {
736 CLK("mmci-omap.1", "ick", &armper_ck.clk, CK_16XX), 736 CLK("mmci-omap.1", "ick", &armper_ck.clk, CK_16XX),
737 /* Virtual clocks */ 737 /* Virtual clocks */
738 CLK(NULL, "mpu", &virtual_ck_mpu, CK_16XX | CK_1510 | CK_310), 738 CLK(NULL, "mpu", &virtual_ck_mpu, CK_16XX | CK_1510 | CK_310),
739 CLK("i2c_omap.1", "fck", &i2c_fck, CK_16XX | CK_1510 | CK_310 | CK_7XX), 739 CLK("omap_i2c.1", "fck", &i2c_fck, CK_16XX | CK_1510 | CK_310 | CK_7XX),
740 CLK("i2c_omap.1", "ick", &i2c_ick, CK_16XX), 740 CLK("omap_i2c.1", "ick", &i2c_ick, CK_16XX),
741 CLK("i2c_omap.1", "ick", &dummy_ck, CK_1510 | CK_310 | CK_7XX), 741 CLK("omap_i2c.1", "ick", &dummy_ck, CK_1510 | CK_310 | CK_7XX),
742 CLK("omap1_spi100k.1", "fck", &dummy_ck, CK_7XX), 742 CLK("omap1_spi100k.1", "fck", &dummy_ck, CK_7XX),
743 CLK("omap1_spi100k.1", "ick", &dummy_ck, CK_7XX), 743 CLK("omap1_spi100k.1", "ick", &dummy_ck, CK_7XX),
744 CLK("omap1_spi100k.2", "fck", &dummy_ck, CK_7XX), 744 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 21f856252ad8..ed61ac2c6f7b 100644
--- 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[] = {
1862 CLK(NULL, "eac_fck", &eac_fck, CK_242X), 1862 CLK(NULL, "eac_fck", &eac_fck, CK_242X),
1863 CLK("omap_hdq.0", "ick", &hdq_ick, CK_242X), 1863 CLK("omap_hdq.0", "ick", &hdq_ick, CK_242X),
1864 CLK("omap_hdq.1", "fck", &hdq_fck, CK_242X), 1864 CLK("omap_hdq.1", "fck", &hdq_fck, CK_242X),
1865 CLK("i2c_omap.1", "ick", &i2c1_ick, CK_242X), 1865 CLK("omap_i2c.1", "ick", &i2c1_ick, CK_242X),
1866 CLK("i2c_omap.1", "fck", &i2c1_fck, CK_242X), 1866 CLK("omap_i2c.1", "fck", &i2c1_fck, CK_242X),
1867 CLK("i2c_omap.2", "ick", &i2c2_ick, CK_242X), 1867 CLK("omap_i2c.2", "ick", &i2c2_ick, CK_242X),
1868 CLK("i2c_omap.2", "fck", &i2c2_fck, CK_242X), 1868 CLK("omap_i2c.2", "fck", &i2c2_fck, CK_242X),
1869 CLK(NULL, "gpmc_fck", &gpmc_fck, CK_242X), 1869 CLK(NULL, "gpmc_fck", &gpmc_fck, CK_242X),
1870 CLK(NULL, "sdma_fck", &sdma_fck, CK_242X), 1870 CLK(NULL, "sdma_fck", &sdma_fck, CK_242X),
1871 CLK(NULL, "sdma_ick", &sdma_ick, CK_242X), 1871 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 e32afcbdfb88..1bded4e07489 100644
--- 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[] = {
1969 CLK(NULL, "fac_fck", &fac_fck, CK_243X), 1969 CLK(NULL, "fac_fck", &fac_fck, CK_243X),
1970 CLK("omap_hdq.0", "ick", &hdq_ick, CK_243X), 1970 CLK("omap_hdq.0", "ick", &hdq_ick, CK_243X),
1971 CLK("omap_hdq.1", "fck", &hdq_fck, CK_243X), 1971 CLK("omap_hdq.1", "fck", &hdq_fck, CK_243X),
1972 CLK("i2c_omap.1", "ick", &i2c1_ick, CK_243X), 1972 CLK("omap_i2c.1", "ick", &i2c1_ick, CK_243X),
1973 CLK("i2c_omap.1", "fck", &i2chs1_fck, CK_243X), 1973 CLK("omap_i2c.1", "fck", &i2chs1_fck, CK_243X),
1974 CLK("i2c_omap.2", "ick", &i2c2_ick, CK_243X), 1974 CLK("omap_i2c.2", "ick", &i2c2_ick, CK_243X),
1975 CLK("i2c_omap.2", "fck", &i2chs2_fck, CK_243X), 1975 CLK("omap_i2c.2", "fck", &i2chs2_fck, CK_243X),
1976 CLK(NULL, "gpmc_fck", &gpmc_fck, CK_243X), 1976 CLK(NULL, "gpmc_fck", &gpmc_fck, CK_243X),
1977 CLK(NULL, "sdma_fck", &sdma_fck, CK_243X), 1977 CLK(NULL, "sdma_fck", &sdma_fck, CK_243X),
1978 CLK(NULL, "sdma_ick", &sdma_ick, CK_243X), 1978 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 d85ecd5aebfd..ee8aa39269f3 100644
--- 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[] = {
3285 CLK("mmci-omap-hs.1", "fck", &mmchs2_fck, CK_3XXX), 3285 CLK("mmci-omap-hs.1", "fck", &mmchs2_fck, CK_3XXX),
3286 CLK(NULL, "mspro_fck", &mspro_fck, CK_343X), 3286 CLK(NULL, "mspro_fck", &mspro_fck, CK_343X),
3287 CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_3XXX), 3287 CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_3XXX),
3288 CLK("i2c_omap.3", "fck", &i2c3_fck, CK_3XXX), 3288 CLK("omap_i2c.3", "fck", &i2c3_fck, CK_3XXX),
3289 CLK("i2c_omap.2", "fck", &i2c2_fck, CK_3XXX), 3289 CLK("omap_i2c.2", "fck", &i2c2_fck, CK_3XXX),
3290 CLK("i2c_omap.1", "fck", &i2c1_fck, CK_3XXX), 3290 CLK("omap_i2c.1", "fck", &i2c1_fck, CK_3XXX),
3291 CLK("omap-mcbsp.5", "fck", &mcbsp5_fck, CK_3XXX), 3291 CLK("omap-mcbsp.5", "fck", &mcbsp5_fck, CK_3XXX),
3292 CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_3XXX), 3292 CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_3XXX),
3293 CLK(NULL, "core_48m_fck", &core_48m_fck, CK_3XXX), 3293 CLK(NULL, "core_48m_fck", &core_48m_fck, CK_3XXX),
@@ -3326,9 +3326,9 @@ static struct omap_clk omap3xxx_clks[] = {
3326 CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_3XXX), 3326 CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_3XXX),
3327 CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_3XXX), 3327 CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_3XXX),
3328 CLK("omap2_mcspi.1", "ick", &mcspi1_ick, CK_3XXX), 3328 CLK("omap2_mcspi.1", "ick", &mcspi1_ick, CK_3XXX),
3329 CLK("i2c_omap.3", "ick", &i2c3_ick, CK_3XXX), 3329 CLK("omap_i2c.3", "ick", &i2c3_ick, CK_3XXX),
3330 CLK("i2c_omap.2", "ick", &i2c2_ick, CK_3XXX), 3330 CLK("omap_i2c.2", "ick", &i2c2_ick, CK_3XXX),
3331 CLK("i2c_omap.1", "ick", &i2c1_ick, CK_3XXX), 3331 CLK("omap_i2c.1", "ick", &i2c1_ick, CK_3XXX),
3332 CLK(NULL, "uart2_ick", &uart2_ick, CK_3XXX), 3332 CLK(NULL, "uart2_ick", &uart2_ick, CK_3XXX),
3333 CLK(NULL, "uart1_ick", &uart1_ick, CK_3XXX), 3333 CLK(NULL, "uart1_ick", &uart1_ick, CK_3XXX),
3334 CLK(NULL, "gpt11_ick", &gpt11_ick, CK_3XXX), 3334 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 1599836ba3d9..217cce489738 100644
--- 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[] = {
2872 CLK(NULL, "gpu_fck", &gpu_fck, CK_443X), 2872 CLK(NULL, "gpu_fck", &gpu_fck, CK_443X),
2873 CLK("omap2_hdq.0", "fck", &hdq1w_fck, CK_443X), 2873 CLK("omap2_hdq.0", "fck", &hdq1w_fck, CK_443X),
2874 CLK(NULL, "hsi_fck", &hsi_fck, CK_443X), 2874 CLK(NULL, "hsi_fck", &hsi_fck, CK_443X),
2875 CLK("i2c_omap.1", "fck", &i2c1_fck, CK_443X), 2875 CLK("omap_i2c.1", "fck", &i2c1_fck, CK_443X),
2876 CLK("i2c_omap.2", "fck", &i2c2_fck, CK_443X), 2876 CLK("omap_i2c.2", "fck", &i2c2_fck, CK_443X),
2877 CLK("i2c_omap.3", "fck", &i2c3_fck, CK_443X), 2877 CLK("omap_i2c.3", "fck", &i2c3_fck, CK_443X),
2878 CLK("i2c_omap.4", "fck", &i2c4_fck, CK_443X), 2878 CLK("omap_i2c.4", "fck", &i2c4_fck, CK_443X),
2879 CLK(NULL, "ipu_fck", &ipu_fck, CK_443X), 2879 CLK(NULL, "ipu_fck", &ipu_fck, CK_443X),
2880 CLK(NULL, "iss_ctrlclk", &iss_ctrlclk, CK_443X), 2880 CLK(NULL, "iss_ctrlclk", &iss_ctrlclk, CK_443X),
2881 CLK(NULL, "iss_fck", &iss_fck, CK_443X), 2881 CLK(NULL, "iss_fck", &iss_fck, CK_443X),
@@ -2975,10 +2975,10 @@ static struct omap_clk omap44xx_clks[] = {
2975 CLK(NULL, "gpt9_ick", &dummy_ck, CK_443X), 2975 CLK(NULL, "gpt9_ick", &dummy_ck, CK_443X),
2976 CLK(NULL, "gpt10_ick", &dummy_ck, CK_443X), 2976 CLK(NULL, "gpt10_ick", &dummy_ck, CK_443X),
2977 CLK(NULL, "gpt11_ick", &dummy_ck, CK_443X), 2977 CLK(NULL, "gpt11_ick", &dummy_ck, CK_443X),
2978 CLK("i2c_omap.1", "ick", &dummy_ck, CK_443X), 2978 CLK("omap_i2c.1", "ick", &dummy_ck, CK_443X),
2979 CLK("i2c_omap.2", "ick", &dummy_ck, CK_443X), 2979 CLK("omap_i2c.2", "ick", &dummy_ck, CK_443X),
2980 CLK("i2c_omap.3", "ick", &dummy_ck, CK_443X), 2980 CLK("omap_i2c.3", "ick", &dummy_ck, CK_443X),
2981 CLK("i2c_omap.4", "ick", &dummy_ck, CK_443X), 2981 CLK("omap_i2c.4", "ick", &dummy_ck, CK_443X),
2982 CLK("mmci-omap-hs.0", "ick", &dummy_ck, CK_443X), 2982 CLK("mmci-omap-hs.0", "ick", &dummy_ck, CK_443X),
2983 CLK("mmci-omap-hs.1", "ick", &dummy_ck, CK_443X), 2983 CLK("mmci-omap-hs.1", "ick", &dummy_ck, CK_443X),
2984 CLK("mmci-omap-hs.2", "ick", &dummy_ck, CK_443X), 2984 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 db9c4efd79e3..a4f8003de664 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -40,7 +40,7 @@
40#define OMAP_I2C_SIZE 0x3f 40#define OMAP_I2C_SIZE 0x3f
41#define OMAP1_I2C_BASE 0xfffb3800 41#define OMAP1_I2C_BASE 0xfffb3800
42 42
43static const char name[] = "i2c_omap"; 43static const char name[] = "omap_i2c";
44 44
45#define I2C_RESOURCE_BUILDER(base, irq) \ 45#define I2C_RESOURCE_BUILDER(base, irq) \
46 { \ 46 { \
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 760b8be6975f..9d090833e245 100644
--- 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 = {
1139 .probe = omap_i2c_probe, 1139 .probe = omap_i2c_probe,
1140 .remove = omap_i2c_remove, 1140 .remove = omap_i2c_remove,
1141 .driver = { 1141 .driver = {
1142 .name = "i2c_omap", 1142 .name = "omap_i2c",
1143 .owner = THIS_MODULE, 1143 .owner = THIS_MODULE,
1144 }, 1144 },
1145}; 1145};
@@ -1161,4 +1161,4 @@ module_exit(omap_i2c_exit_driver);
1161MODULE_AUTHOR("MontaVista Software, Inc. (and others)"); 1161MODULE_AUTHOR("MontaVista Software, Inc. (and others)");
1162MODULE_DESCRIPTION("TI OMAP I2C bus adapter"); 1162MODULE_DESCRIPTION("TI OMAP I2C bus adapter");
1163MODULE_LICENSE("GPL"); 1163MODULE_LICENSE("GPL");
1164MODULE_ALIAS("platform:i2c_omap"); 1164MODULE_ALIAS("platform:omap_i2c");