* [PATCH 0/3] OMAP: I2C and UART device name cleanup
@ 2010-12-06 10:41 Benoit Cousson
2010-12-06 10:41 ` [PATCH 1/3] OMAP: clock: Change device name in clock nodes: i2c_omap -> omap_i2c Benoit Cousson
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Benoit Cousson @ 2010-12-06 10:41 UTC (permalink / raw)
To: paul, khilman; +Cc: linux-omap, Benoit Cousson
Hi All,
In order to enforce a little bit of consistency in the omap devices name,
the convention for omap devices name will be now omap_XXX. All the drivers
adapted to hwmod will be named like that during the on-going adaptations.
The I2C and UART drivers are already adapted to hwmod but with
the original names.
Rename i2c and uart using this convention:
i2c_omap -> omap_i2c
omap-hsuart -> omap_uart
Tested on OMAP4 ES2 on Panda / sdp4430. Some more validation will be needed on OMAP2 & 3.
This series is based on Kevin's pm-hwmod-i2c branch and is available here:
git://gitorious.org/omap-pm/linux.git for_2.6.38/device_name
Regards,
Benoit
Benoit Cousson (3):
OMAP: clock: Change device name in clock nodes: i2c_omap -> omap_i2c
OMAP: i2c: Change device name: i2c_omap -> omap_i2c
OMAP: serial: Change device name: omap-hsuart -> omap_uart
arch/arm/mach-omap1/clock_data.c | 6 +++---
arch/arm/mach-omap2/clock2420_data.c | 8 ++++----
arch/arm/mach-omap2/clock2430_data.c | 8 ++++----
arch/arm/mach-omap2/clock3xxx_data.c | 12 ++++++------
arch/arm/mach-omap2/clock44xx_data.c | 16 ++++++++--------
arch/arm/plat-omap/i2c.c | 2 +-
arch/arm/plat-omap/include/plat/omap-serial.h | 2 +-
drivers/i2c/busses/i2c-omap.c | 4 ++--
8 files changed, 29 insertions(+), 29 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] OMAP: clock: Change device name in clock nodes: i2c_omap -> omap_i2c
2010-12-06 10:41 [PATCH 0/3] OMAP: I2C and UART device name cleanup Benoit Cousson
@ 2010-12-06 10:41 ` Benoit Cousson
2010-12-06 10:41 ` [PATCH 2/3] OMAP: i2c: Change device name: " Benoit Cousson
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Benoit Cousson @ 2010-12-06 10:41 UTC (permalink / raw)
To: paul, khilman; +Cc: linux-omap, Benoit Cousson, Rajendra Nayak
The convention for omap device naming is omap_XXX.
Rename the device name used in clock dev noded in order to stick
to this naming convention.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap1/clock_data.c | 6 +++---
arch/arm/mach-omap2/clock2420_data.c | 8 ++++----
arch/arm/mach-omap2/clock2430_data.c | 8 ++++----
arch/arm/mach-omap2/clock3xxx_data.c | 12 ++++++------
arch/arm/mach-omap2/clock44xx_data.c | 16 ++++++++--------
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index af54114..aa6dd67 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[] = {
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 21f8562..ed61ac2 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[] = {
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 e32afcb..1bded4e 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[] = {
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 d85ecd5..ee8aa39 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[] = {
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 1599836..217cce4 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[] = {
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),
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] OMAP: i2c: Change device name: i2c_omap -> omap_i2c
2010-12-06 10:41 [PATCH 0/3] OMAP: I2C and UART device name cleanup Benoit Cousson
2010-12-06 10:41 ` [PATCH 1/3] OMAP: clock: Change device name in clock nodes: i2c_omap -> omap_i2c Benoit Cousson
@ 2010-12-06 10:41 ` Benoit Cousson
2010-12-06 10:41 ` [PATCH 3/3] OMAP: serial: Change device name: omap-hsuart -> omap_uart Benoit Cousson
2010-12-07 22:20 ` [PATCH 0/3] OMAP: I2C and UART device name cleanup Kevin Hilman
3 siblings, 0 replies; 5+ messages in thread
From: Benoit Cousson @ 2010-12-06 10:41 UTC (permalink / raw)
To: paul, khilman; +Cc: linux-omap, Benoit Cousson, Rajendra Nayak, Ben Dooks
The convention for omap device naming is omap_XXX.
Rename the device and driver name in order to stick
to this naming convention.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
c: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Ben Dooks <ben-i2c@fluff.org>
---
arch/arm/plat-omap/i2c.c | 2 +-
drivers/i2c/busses/i2c-omap.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index a5bff9c..0a271ad 100644
--- 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 760b8be..9d09083 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 = {
.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");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] OMAP: serial: Change device name: omap-hsuart -> omap_uart
2010-12-06 10:41 [PATCH 0/3] OMAP: I2C and UART device name cleanup Benoit Cousson
2010-12-06 10:41 ` [PATCH 1/3] OMAP: clock: Change device name in clock nodes: i2c_omap -> omap_i2c Benoit Cousson
2010-12-06 10:41 ` [PATCH 2/3] OMAP: i2c: Change device name: " Benoit Cousson
@ 2010-12-06 10:41 ` Benoit Cousson
2010-12-07 22:20 ` [PATCH 0/3] OMAP: I2C and UART device name cleanup Kevin Hilman
3 siblings, 0 replies; 5+ messages in thread
From: Benoit Cousson @ 2010-12-06 10:41 UTC (permalink / raw)
To: paul, khilman; +Cc: linux-omap, Benoit Cousson
The naming convention for omap_device is omap_XXX.
Rename the device and driver name in order to stick
to this naming convention.
Remove the hs prefix that is implicit for every OMAP uarts.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Acked-by: Govindraj Raja <govindraj.raja@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
---
arch/arm/plat-omap/include/plat/omap-serial.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index c8dae02..cc71426 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -22,7 +22,7 @@
#include <plat/mux.h>
-#define DRIVER_NAME "omap-hsuart"
+#define DRIVER_NAME "omap_uart"
/*
* Use tty device name as ttyO, [O -> OMAP]
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] OMAP: I2C and UART device name cleanup
2010-12-06 10:41 [PATCH 0/3] OMAP: I2C and UART device name cleanup Benoit Cousson
` (2 preceding siblings ...)
2010-12-06 10:41 ` [PATCH 3/3] OMAP: serial: Change device name: omap-hsuart -> omap_uart Benoit Cousson
@ 2010-12-07 22:20 ` Kevin Hilman
3 siblings, 0 replies; 5+ messages in thread
From: Kevin Hilman @ 2010-12-07 22:20 UTC (permalink / raw)
To: Benoit Cousson; +Cc: paul, linux-omap
Benoit Cousson <b-cousson@ti.com> writes:
> Hi All,
>
> In order to enforce a little bit of consistency in the omap devices name,
> the convention for omap devices name will be now omap_XXX. All the drivers
> adapted to hwmod will be named like that during the on-going adaptations.
>
> The I2C and UART drivers are already adapted to hwmod but with
> the original names.
>
> Rename i2c and uart using this convention:
> i2c_omap -> omap_i2c
> omap-hsuart -> omap_uart
>
> Tested on OMAP4 ES2 on Panda / sdp4430. Some more validation will be needed on OMAP2 & 3.
>
> This series is based on Kevin's pm-hwmod-i2c branch and is available here:
> git://gitorious.org/omap-pm/linux.git for_2.6.38/device_name
>
>
> Regards,
> Benoit
>
>
> Benoit Cousson (3):
> OMAP: clock: Change device name in clock nodes: i2c_omap -> omap_i2c
> OMAP: i2c: Change device name: i2c_omap -> omap_i2c
These two should probably be combined, as they cannot work
separately.
> OMAP: serial: Change device name: omap-hsuart -> omap_uart
>
Also, can you Cc linux-arm-kernel when you post updated version?
Thanks,
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-07 22:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-06 10:41 [PATCH 0/3] OMAP: I2C and UART device name cleanup Benoit Cousson
2010-12-06 10:41 ` [PATCH 1/3] OMAP: clock: Change device name in clock nodes: i2c_omap -> omap_i2c Benoit Cousson
2010-12-06 10:41 ` [PATCH 2/3] OMAP: i2c: Change device name: " Benoit Cousson
2010-12-06 10:41 ` [PATCH 3/3] OMAP: serial: Change device name: omap-hsuart -> omap_uart Benoit Cousson
2010-12-07 22:20 ` [PATCH 0/3] OMAP: I2C and UART device name cleanup Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).