[PATCH v2 0/2] OMAP: I2C and UART device name cleanup

[PATCH v2 0/2] OMAP: I2C and UART device name cleanup

[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 originals name.

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


v1
    http://www.spinics.net/lists/linux-omap/msg41474.html
    
    Merge previous patch #1 and #2 as suggested by Kevin to change the driver name 
    at the same time with the device name in the clockdev.


Benoit Cousson (2):
  I2C: i2c-omap: 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(-)

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Benoit Cousson]

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>
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/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 +-
 drivers/i2c/busses/i2c-omap.c        |    4 ++--
 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 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),
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

[PATCH v2 2/2] OMAP: serial: Change device name: omap-hsuart -> omap_uart

[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

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Kevin Hilman]

Ben,

Benoit Cousson <b-cousson@ti.com> writes:

> 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>
> 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/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 +-
>  drivers/i2c/busses/i2c-omap.c        |    4 ++--
>  7 files changed, 28 insertions(+), 28 deletions(-)

[...]

> 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");

With your ack for the name change in the driver, we can merge this
through the OMAP tree with the other core changes.

Thanks,

Kevin

[PATCH v2 0/2] OMAP: I2C and UART device name cleanup

[Kevin Hilman]

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 originals name.
>
> 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

Acked-by: Kevin Hilman <khilman@deeprootsystems.com>

> Regards,
> Benoit
>
>
> v1
>     http://www.spinics.net/lists/linux-omap/msg41474.html
>     
>     Merge previous patch #1 and #2 as suggested by Kevin to change the driver name 
>     at the same time with the device name in the clockdev.
>
>
> Benoit Cousson (2):
>   I2C: i2c-omap: 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(-)

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Paul Walmsley]

On Thu, 9 Dec 2010, Benoit Cousson wrote:

> 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.

Acked-by: Paul Walmsley <paul@pwsan.com>

- Paul

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Ben Dooks]

On Thu, Dec 09, 2010 at 08:55:28AM -0800, Kevin Hilman wrote:
> Ben,
> 
> > The convention for omap device naming is omap_XXX.
> >
> > Rename the device and driver name in order to stick
> > to this naming convention.

Renaming stuff like this is going to have an impact on the userspace
as anyone looking through /sys's driver heirarchy is going to miss the
old name... 

It all depends if you really want to go ahead with this...

> > Change device name in clock nodes as well.
> >
> > 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/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 +-
> >  drivers/i2c/busses/i2c-omap.c        |    4 ++--
> >  7 files changed, 28 insertions(+), 28 deletions(-)
> 
> [...]
> 
> > 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");
> 
> With your ack for the name change in the driver, we can merge this
> through the OMAP tree with the other core changes.
> 
> Thanks,
> 
> Kevin
> 

-- 
-- 
Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Kevin Hilman]

Ben Dooks <ben-i2c@fluff.org> writes:

> On Thu, Dec 09, 2010 at 08:55:28AM -0800, Kevin Hilman wrote:
>> Ben,
>> 
>> > The convention for omap device naming is omap_XXX.
>> >
>> > Rename the device and driver name in order to stick
>> > to this naming convention.
>
> Renaming stuff like this is going to have an impact on the userspace
> as anyone looking through /sys's driver heirarchy is going to miss the
> old name... 
>
> It all depends if you really want to go ahead with this...
>

Yes, we are aware of the userspace impact, but this name change makes
all devices on OMAP have consistent names and actually improves the
ability to have userspace tools have consistent naming as well.

Kevin

>> > Change device name in clock nodes as well.
>> >
>> > 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/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 +-
>> >  drivers/i2c/busses/i2c-omap.c        |    4 ++--
>> >  7 files changed, 28 insertions(+), 28 deletions(-)
>> 
>> [...]
>> 
>> > 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");
>> 
>> With your ack for the name change in the driver, we can merge this
>> through the OMAP tree with the other core changes.
>> 
>> Thanks,
>> 
>> Kevin
>> 
>
> -- 

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Ben Dooks]

On Thu, Dec 09, 2010 at 08:55:28AM -0800, Kevin Hilman wrote:
> Ben,
> 
> Benoit Cousson <b-cousson@ti.com> writes:
> 
> > 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>
> > 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>
Acked-by: Ben Dooks <ben-linux@fluff.org>
> > ---
> >  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 +-
> >  drivers/i2c/busses/i2c-omap.c        |    4 ++--
> >  7 files changed, 28 insertions(+), 28 deletions(-)
> 
> [...]
> 
> > 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");
> 
> With your ack for the name change in the driver, we can merge this
> through the OMAP tree with the other core changes.
> 
> Thanks,
> 
> Kevin
> 

-- 
-- 
Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[aaro.koskinen at nokia.com]

Hi,

Kevin Hilman [khilman at deeprootsystems.com]:
> Ben Dooks <ben-i2c@fluff.org> writes:
> > Renaming stuff like this is going to have an impact on the userspace
> > as anyone looking through /sys's driver heirarchy is going to miss the
> > old name...
> >
> > It all depends if you really want to go ahead with this...
>
> Yes, we are aware of the userspace impact, but this name change makes
> all devices on OMAP have consistent names and actually improves the
> ability to have userspace tools have consistent naming as well.

So there are no imporant users, or if there is, they are prepared for this change?

>> >  drivers/i2c/busses/i2c-omap.c        |    4 ++--

What about the .c / .ko file name?

A.

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Ben Dooks]

On Thu, Dec 09, 2010 at 10:18:48PM +0000, aaro.koskinen at nokia.com wrote:
> Hi,
> 
> Kevin Hilman [khilman at deeprootsystems.com]:
> > Ben Dooks <ben-i2c@fluff.org> writes:
> > > Renaming stuff like this is going to have an impact on the userspace
> > > as anyone looking through /sys's driver heirarchy is going to miss the
> > > old name...
> > >
> > > It all depends if you really want to go ahead with this...
> >
> > Yes, we are aware of the userspace impact, but this name change makes
> > all devices on OMAP have consistent names and actually improves the
> > ability to have userspace tools have consistent naming as well.
> 
> So there are no imporant users, or if there is, they are prepared for this change?
> 
> >> >  drivers/i2c/busses/i2c-omap.c        |    4 ++--
> 
> What about the .c / .ko file name?

Pretty much everyone is in the form of i2c-xxx.c, so I would prefer it
to stay that way.

-- 
Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Ben Dooks]

On Thu, Dec 09, 2010 at 10:18:48PM +0000, aaro.koskinen at nokia.com wrote:
> Hi,
> 
> Kevin Hilman [khilman at deeprootsystems.com]:
> > Ben Dooks <ben-i2c@fluff.org> writes:
> > > Renaming stuff like this is going to have an impact on the userspace
> > > as anyone looking through /sys's driver heirarchy is going to miss the
> > > old name...
> > >
> > > It all depends if you really want to go ahead with this...
> >
> > Yes, we are aware of the userspace impact, but this name change makes
> > all devices on OMAP have consistent names and actually improves the
> > ability to have userspace tools have consistent naming as well.
> 
> So there are no imporant users, or if there is, they are prepared for this change?
> 
> >> >  drivers/i2c/busses/i2c-omap.c        |    4 ++--
> 
> What about the .c / .ko file name?

Pretty much everything in the drivers/i2c/busses directory is named
i2c-<something>.c, and I would like to keep it that way.

-- 
Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Cousson, Benoit]

On 12/9/2010 11:18 PM, aaro.koskinen at nokia.com wrote:
> Hi,
>
> Kevin Hilman [khilman at deeprootsystems.com]:
>> Ben Dooks<ben-i2c@fluff.org>  writes:
>>> Renaming stuff like this is going to have an impact on the userspace
>>> as anyone looking through /sys's driver heirarchy is going to miss the
>>> old name...
>>>
>>> It all depends if you really want to go ahead with this...
>>
>> Yes, we are aware of the userspace impact, but this name change makes
>> all devices on OMAP have consistent names and actually improves the
>> ability to have userspace tools have consistent naming as well.
>
> So there are no imporant users, or if there is, they are prepared for this change?

Well, I do not know any user of that today. Do you have some in mind?

Benoit

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Tony Lindgren]

* Cousson, Benoit <b-cousson@ti.com> [101210 00:29]:
> On 12/9/2010 11:18 PM, aaro.koskinen at nokia.com wrote:
> >Hi,
> >
> >Kevin Hilman [khilman at deeprootsystems.com]:
> >>Ben Dooks<ben-i2c@fluff.org>  writes:
> >>>Renaming stuff like this is going to have an impact on the userspace
> >>>as anyone looking through /sys's driver heirarchy is going to miss the
> >>>old name...
> >>>
> >>>It all depends if you really want to go ahead with this...
> >>
> >>Yes, we are aware of the userspace impact, but this name change makes
> >>all devices on OMAP have consistent names and actually improves the
> >>ability to have userspace tools have consistent naming as well.
> >
> >So there are no imporant users, or if there is, they are prepared for this change?
> 
> Well, I do not know any user of that today. Do you have some in mind?

Sounds like it's safe for me to take these two.

Tony

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> * Cousson, Benoit <b-cousson@ti.com> [101210 00:29]:
>> On 12/9/2010 11:18 PM, aaro.koskinen at nokia.com wrote:
>> >Hi,
>> >
>> >Kevin Hilman [khilman at deeprootsystems.com]:
>> >>Ben Dooks<ben-i2c@fluff.org>  writes:
>> >>>Renaming stuff like this is going to have an impact on the userspace
>> >>>as anyone looking through /sys's driver heirarchy is going to miss the
>> >>>old name...
>> >>>
>> >>>It all depends if you really want to go ahead with this...
>> >>
>> >>Yes, we are aware of the userspace impact, but this name change makes
>> >>all devices on OMAP have consistent names and actually improves the
>> >>ability to have userspace tools have consistent naming as well.
>> >
>> >So there are no imporant users, or if there is, they are prepared for this change?
>> 
>> Well, I do not know any user of that today. Do you have some in mind?
>
> Sounds like it's safe for me to take these two.

These should probably go via Paul's integration branch to avoid
conflicts with the other omap_device/omap_hwmod code.

Kevin

[PATCH v2 1/2] I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c

[Tony Lindgren]

* Kevin Hilman <khilman@deeprootsystems.com> [101220 08:07]:
> Tony Lindgren <tony@atomide.com> writes:
> 
> > * Cousson, Benoit <b-cousson@ti.com> [101210 00:29]:
> >> On 12/9/2010 11:18 PM, aaro.koskinen at nokia.com wrote:
> >> >Hi,
> >> >
> >> >Kevin Hilman [khilman at deeprootsystems.com]:
> >> >>Ben Dooks<ben-i2c@fluff.org>  writes:
> >> >>>Renaming stuff like this is going to have an impact on the userspace
> >> >>>as anyone looking through /sys's driver heirarchy is going to miss the
> >> >>>old name...
> >> >>>
> >> >>>It all depends if you really want to go ahead with this...
> >> >>
> >> >>Yes, we are aware of the userspace impact, but this name change makes
> >> >>all devices on OMAP have consistent names and actually improves the
> >> >>ability to have userspace tools have consistent naming as well.
> >> >
> >> >So there are no imporant users, or if there is, they are prepared for this change?
> >> 
> >> Well, I do not know any user of that today. Do you have some in mind?
> >
> > Sounds like it's safe for me to take these two.
> 
> These should probably go via Paul's integration branch to avoid
> conflicts with the other omap_device/omap_hwmod code.

Well Paul acked it.. Will check with him what he wants to do.

Tony