diff mbox

[3/5] arm: omap: usb: device name change for the clk names of usbhs

Message ID 1305122676-27236-4-git-send-email-keshava_mgowda@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Munegowda, Keshava May 11, 2011, 2:04 p.m. UTC 
device name usbhs clocks are changed from
usbhs-omap.0 to usbhs_omap; this is because
in the hwmod registration the device name is set
as usbhs_omap

Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
---
 arch/arm/mach-omap2/clock3xxx_data.c |   28 ++++++++++++++--------------
 arch/arm/mach-omap2/clock44xx_data.c |   10 +++++-----
 drivers/mfd/omap-usb-host.c          |    2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

Comments

Sanjeev Premi May 12, 2011, 10:49 a.m. UTC | #1 
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org 
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of 
> Munegowda, Keshava
> Sent: Wednesday, May 11, 2011 7:35 PM
> To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
> Cc: Munegowda, Keshava; Balbi, Felipe; Gadiyar, Anand; 
> parthab@india.ti.com
> Subject: [PATCH 3/5] arm: omap: usb: device name change for 
> the clk names of usbhs

[snip]...[snip]

> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -27,7 +27,7 @@
>  #include <linux/gpio.h>
>  #include <plat/usb.h>
>  
> -#define USBHS_DRIVER_NAME	"usbhs-omap"
> +#define USBHS_DRIVER_NAME	"usbhs_omap"
>  #define OMAP_EHCI_DEVICE	"ehci-omap"
>  #define OMAP_OHCI_DEVICE	"ohci-omap3"

[sp] Shouldn't we be consistent in using minus/dash and
     underscore in the device names?

~sanjeev

>  
> -- 
> 1.6.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe 
> linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Igor Grinberg May 12, 2011, 11:28 a.m. UTC | #2 
On 05/12/11 13:49, Premi, Sanjeev wrote:

>> -----Original Message-----
>> From: linux-omap-owner@vger.kernel.org 
>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of 
>> Munegowda, Keshava
>> Sent: Wednesday, May 11, 2011 7:35 PM
>> To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
>> Cc: Munegowda, Keshava; Balbi, Felipe; Gadiyar, Anand; 
>> parthab@india.ti.com
>> Subject: [PATCH 3/5] arm: omap: usb: device name change for 
>> the clk names of usbhs
> [snip]...[snip]
>
>> --- a/drivers/mfd/omap-usb-host.c
>> +++ b/drivers/mfd/omap-usb-host.c
>> @@ -27,7 +27,7 @@
>>  #include <linux/gpio.h>
>>  #include <plat/usb.h>
>>  
>> -#define USBHS_DRIVER_NAME	"usbhs-omap"
>> +#define USBHS_DRIVER_NAME	"usbhs_omap"
>>  #define OMAP_EHCI_DEVICE	"ehci-omap"
>>  #define OMAP_OHCI_DEVICE	"ohci-omap3"
>
> [sp] Shouldn't we be consistent in using minus/dash and
>      underscore in the device names?

Also, can't we avoid once again changing the clock names
(at least for a while...)?
Is that really necessary? Can't hwmod use current clock names?
Because, Linus is sooo happy each time he sees that kind of changes....
Munegowda, Keshava May 13, 2011, 6:34 a.m. UTC | #3 
On Thu, May 12, 2011 at 4:58 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
>
>
> On 05/12/11 13:49, Premi, Sanjeev wrote:
>
>>> -----Original Message-----
>>> From: linux-omap-owner@vger.kernel.org
>>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
>>> Munegowda, Keshava
>>> Sent: Wednesday, May 11, 2011 7:35 PM
>>> To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
>>> Cc: Munegowda, Keshava; Balbi, Felipe; Gadiyar, Anand;
>>> parthab@india.ti.com
>>> Subject: [PATCH 3/5] arm: omap: usb: device name change for
>>> the clk names of usbhs
>> [snip]...[snip]
>>
>>> --- a/drivers/mfd/omap-usb-host.c
>>> +++ b/drivers/mfd/omap-usb-host.c
>>> @@ -27,7 +27,7 @@
>>>  #include <linux/gpio.h>
>>>  #include <plat/usb.h>
>>>
>>> -#define USBHS_DRIVER_NAME   "usbhs-omap"
>>> +#define USBHS_DRIVER_NAME   "usbhs_omap"
>>>  #define OMAP_EHCI_DEVICE    "ehci-omap"
>>>  #define OMAP_OHCI_DEVICE    "ohci-omap3"
>>
>> [sp] Shouldn't we be consistent in using minus/dash and
>>      underscore in the device names?
>
> Also, can't we avoid once again changing the clock names
> (at least for a while...)?
> Is that really necessary? Can't hwmod use current clock names?
> Because, Linus is sooo happy each time he sees that kind of changes....
>

This was actually earlier comment saying use _ as the convention for
hwmod and runtime pm.
only usbhs_omap uses the hwmod; the ehci and ohci drivers are children
of usbhsh and they get the
data from usbhs. Hence the older name of ehci and ochi drivers are
retained as it is.
  if it is really needed,  to change ehci and ohci driver names , then
i can make it as another patch.


>
> --
> Regards,
> Igor.
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sanjeev Premi May 13, 2011, 9:05 a.m. UTC | #4 
> -----Original Message-----
> From: Munegowda, Keshava 
> Sent: Friday, May 13, 2011 12:04 PM
> To: Igor Grinberg
> Cc: Premi, Sanjeev; linux-usb@vger.kernel.org; 
> linux-omap@vger.kernel.org; Balbi, Felipe; Gadiyar, Anand; 
> parthab@india.ti.com
> Subject: Re: [PATCH 3/5] arm: omap: usb: device name change 
> for the clk names of usbhs
> 
> On Thu, May 12, 2011 at 4:58 PM, Igor Grinberg 
> <grinberg@compulab.co.il> wrote:
> >
> >
> > On 05/12/11 13:49, Premi, Sanjeev wrote:
> >
> >>> -----Original Message-----
> >>> From: linux-omap-owner@vger.kernel.org
> >>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
> >>> Munegowda, Keshava
> >>> Sent: Wednesday, May 11, 2011 7:35 PM
> >>> To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
> >>> Cc: Munegowda, Keshava; Balbi, Felipe; Gadiyar, Anand;
> >>> parthab@india.ti.com
> >>> Subject: [PATCH 3/5] arm: omap: usb: device name change for
> >>> the clk names of usbhs
> >> [snip]...[snip]
> >>
> >>> --- a/drivers/mfd/omap-usb-host.c
> >>> +++ b/drivers/mfd/omap-usb-host.c
> >>> @@ -27,7 +27,7 @@
> >>>  #include <linux/gpio.h>
> >>>  #include <plat/usb.h>
> >>>
> >>> -#define USBHS_DRIVER_NAME   "usbhs-omap"
> >>> +#define USBHS_DRIVER_NAME   "usbhs_omap"
> >>>  #define OMAP_EHCI_DEVICE    "ehci-omap"
> >>>  #define OMAP_OHCI_DEVICE    "ohci-omap3"
> >>
> >> [sp] Shouldn't we be consistent in using minus/dash and
> >>      underscore in the device names?
> >
> > Also, can't we avoid once again changing the clock names
> > (at least for a while...)?
> > Is that really necessary? Can't hwmod use current clock names?
> > Because, Linus is sooo happy each time he sees that kind of 
> changes....
> >
> 
> This was actually earlier comment saying use _ as the convention for
> hwmod and runtime pm.
> only usbhs_omap uses the hwmod; the ehci and ohci drivers are children
> of usbhsh and they get the
> data from usbhs. Hence the older name of ehci and ochi drivers are
> retained as it is.
>   if it is really needed,  to change ehci and ohci driver names , then
> i can make it as another patch.

[sp] A common convetion helps. Another patch will definitely help usability.

~sanjeev

> 
> 
> >
> > --
> > Regards,
> > Igor.
> >
> >
> --
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Munegowda, Keshava May 13, 2011, 9:40 a.m. UTC | #5 
On Fri, May 13, 2011 at 2:35 PM, Premi, Sanjeev <premi@ti.com> wrote:
>> -----Original Message-----
>> From: Munegowda, Keshava
>> Sent: Friday, May 13, 2011 12:04 PM
>> To: Igor Grinberg
>> Cc: Premi, Sanjeev; linux-usb@vger.kernel.org;
>> linux-omap@vger.kernel.org; Balbi, Felipe; Gadiyar, Anand;
>> parthab@india.ti.com
>> Subject: Re: [PATCH 3/5] arm: omap: usb: device name change
>> for the clk names of usbhs
>>
>> On Thu, May 12, 2011 at 4:58 PM, Igor Grinberg
>> <grinberg@compulab.co.il> wrote:
>> >
>> >
>> > On 05/12/11 13:49, Premi, Sanjeev wrote:
>> >
>> >>> -----Original Message-----
>> >>> From: linux-omap-owner@vger.kernel.org
>> >>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
>> >>> Munegowda, Keshava
>> >>> Sent: Wednesday, May 11, 2011 7:35 PM
>> >>> To: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org
>> >>> Cc: Munegowda, Keshava; Balbi, Felipe; Gadiyar, Anand;
>> >>> parthab@india.ti.com
>> >>> Subject: [PATCH 3/5] arm: omap: usb: device name change for
>> >>> the clk names of usbhs
>> >> [snip]...[snip]
>> >>
>> >>> --- a/drivers/mfd/omap-usb-host.c
>> >>> +++ b/drivers/mfd/omap-usb-host.c
>> >>> @@ -27,7 +27,7 @@
>> >>>  #include <linux/gpio.h>
>> >>>  #include <plat/usb.h>
>> >>>
>> >>> -#define USBHS_DRIVER_NAME   "usbhs-omap"
>> >>> +#define USBHS_DRIVER_NAME   "usbhs_omap"
>> >>>  #define OMAP_EHCI_DEVICE    "ehci-omap"
>> >>>  #define OMAP_OHCI_DEVICE    "ohci-omap3"
>> >>
>> >> [sp] Shouldn't we be consistent in using minus/dash and
>> >>      underscore in the device names?
>> >
>> > Also, can't we avoid once again changing the clock names
>> > (at least for a while...)?
>> > Is that really necessary? Can't hwmod use current clock names?
>> > Because, Linus is sooo happy each time he sees that kind of
>> changes....
>> >
>>
>> This was actually earlier comment saying use _ as the convention for
>> hwmod and runtime pm.
>> only usbhs_omap uses the hwmod; the ehci and ohci drivers are children
>> of usbhsh and they get the
>> data from usbhs. Hence the older name of ehci and ochi drivers are
>> retained as it is.
>>   if it is really needed,  to change ehci and ohci driver names , then
>> i can make it as another patch.
>
> [sp] A common convetion helps. Another patch will definitely help usability.
>
> ~sanjeev

sure, I will send ASAP.

>
>>
>>
>> >
>> > --
>> > Regards,
>> > Igor.
>> >
>> >
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 75b119b..fabe482 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3285,7 +3285,7 @@  static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"cpefuse_fck",	&cpefuse_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"ts_fck",	&ts_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs-omap.0",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK("usbhs_omap",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK("omap-mcbsp.1",	"prcm_fck",	&core_96m_fck,	CK_3XXX),
 	CLK("omap-mcbsp.5",	"prcm_fck",	&core_96m_fck,	CK_3XXX),
 	CLK(NULL,	"core_96m_fck",	&core_96m_fck,	CK_3XXX),
@@ -3321,7 +3321,7 @@  static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"pka_ick",	&pka_ick,	CK_34XX | CK_36XX),
 	CLK(NULL,	"core_l4_ick",	&core_l4_ick,	CK_3XXX),
 	CLK(NULL,	"usbtll_ick",	&usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs-omap.0",	"usbtll_ick",	&usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK("usbhs_omap",	"usbtll_ick",	&usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK("omap_hsmmc.2",	"ick",	&mmchs3_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"icr_ick",	&icr_ick,	CK_34XX | CK_36XX),
 	CLK("omap-aes",	"ick",	&aes2_ick,	CK_34XX | CK_36XX),
@@ -3367,20 +3367,20 @@  static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"cam_ick",	&cam_ick,	CK_34XX | CK_36XX),
 	CLK(NULL,	"csi2_96m_fck",	&csi2_96m_fck,	CK_34XX | CK_36XX),
 	CLK(NULL,	"usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs-omap.0",	"hs_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK("usbhs_omap",	"hs_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs-omap.0",	"fs_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK("usbhs_omap",	"fs_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"usbhost_ick",	&usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs-omap.0",	"usbhost_ick",	&usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs-omap.0",	"utmi_p1_gfclk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"utmi_p2_gfclk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"xclk60mhsp1_ck",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"xclk60mhsp2_ck",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"usb_host_hs_utmi_p1_clk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"usb_host_hs_utmi_p2_clk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"usb_tll_hs_usb_ch0_clk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"usb_tll_hs_usb_ch1_clk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs-omap.0",	"init_60m_fclk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"usbhost_ick",	&usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK("usbhs_omap",	"utmi_p1_gfclk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"utmi_p2_gfclk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"xclk60mhsp1_ck",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"xclk60mhsp2_ck",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"usb_host_hs_utmi_p1_clk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"usb_host_hs_utmi_p2_clk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"usb_tll_hs_usb_ch0_clk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"usb_tll_hs_usb_ch1_clk",	&dummy_ck,	CK_3XXX),
+	CLK("usbhs_omap",	"init_60m_fclk",	&dummy_ck,	CK_3XXX),
 	CLK(NULL,	"usim_fck",	&usim_fck,	CK_3430ES2PLUS | CK_36XX),
 	CLK(NULL,	"gpt1_fck",	&gpt1_fck,	CK_3XXX),
 	CLK(NULL,	"wkup_32k_fck",	&wkup_32k_fck,	CK_3XXX),
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index 8c96567..34e91eb 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -3205,7 +3205,7 @@  static struct omap_clk omap44xx_clks[] = {
 	CLK(NULL,	"uart3_fck",			&uart3_fck,	CK_443X),
 	CLK(NULL,	"uart4_fck",			&uart4_fck,	CK_443X),
 	CLK(NULL,	"usb_host_fs_fck",		&usb_host_fs_fck,	CK_443X),
-	CLK("usbhs-omap.0",	"fs_fck",		&usb_host_fs_fck,	CK_443X),
+	CLK("usbhs_omap",	"fs_fck",		&usb_host_fs_fck,	CK_443X),
 	CLK(NULL,	"utmi_p1_gfclk",		&utmi_p1_gfclk,	CK_443X),
 	CLK(NULL,	"usb_host_hs_utmi_p1_clk",	&usb_host_hs_utmi_p1_clk,	CK_443X),
 	CLK(NULL,	"utmi_p2_gfclk",		&utmi_p2_gfclk,	CK_443X),
@@ -3217,8 +3217,8 @@  static struct omap_clk omap44xx_clks[] = {
 	CLK(NULL,	"usb_host_hs_hsic480m_p2_clk",	&usb_host_hs_hsic480m_p2_clk,	CK_443X),
 	CLK(NULL,	"usb_host_hs_func48mclk",	&usb_host_hs_func48mclk,	CK_443X),
 	CLK(NULL,	"usb_host_hs_fck",		&usb_host_hs_fck,	CK_443X),
-	CLK("usbhs-omap.0",	"hs_fck",		&usb_host_hs_fck,	CK_443X),
-	CLK("usbhs-omap.0",	"usbhost_ick",		&dummy_ck,		CK_443X),
+	CLK("usbhs_omap",	"hs_fck",		&usb_host_hs_fck,	CK_443X),
+	CLK("usbhs_omap",	"usbhost_ick",		&dummy_ck,		CK_443X),
 	CLK(NULL,	"otg_60m_gfclk",		&otg_60m_gfclk,	CK_443X),
 	CLK(NULL,	"usb_otg_hs_xclk",		&usb_otg_hs_xclk,	CK_443X),
 	CLK("musb-omap2430",	"ick",				&usb_otg_hs_ick,	CK_443X),
@@ -3227,8 +3227,8 @@  static struct omap_clk omap44xx_clks[] = {
 	CLK(NULL,	"usb_tll_hs_usb_ch0_clk",	&usb_tll_hs_usb_ch0_clk,	CK_443X),
 	CLK(NULL,	"usb_tll_hs_usb_ch1_clk",	&usb_tll_hs_usb_ch1_clk,	CK_443X),
 	CLK(NULL,	"usb_tll_hs_ick",		&usb_tll_hs_ick,	CK_443X),
-	CLK("usbhs-omap.0",	"usbtll_ick",		&usb_tll_hs_ick,	CK_443X),
-	CLK("usbhs-omap.0",	"usbtll_fck",		&dummy_ck,	CK_443X),
+	CLK("usbhs_omap",	"usbtll_ick",		&usb_tll_hs_ick,	CK_443X),
+	CLK("usbhs_omap",	"usbtll_fck",		&dummy_ck,	CK_443X),
 	CLK(NULL,	"usim_ck",			&usim_ck,	CK_443X),
 	CLK(NULL,	"usim_fclk",			&usim_fclk,	CK_443X),
 	CLK(NULL,	"usim_fck",			&usim_fck,	CK_443X),
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 55c5d47..48ada2d 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -27,7 +27,7 @@ 
 #include <linux/gpio.h>
 #include <plat/usb.h>
 
-#define USBHS_DRIVER_NAME	"usbhs-omap"
+#define USBHS_DRIVER_NAME	"usbhs_omap"
 #define OMAP_EHCI_DEVICE	"ehci-omap"
 #define OMAP_OHCI_DEVICE	"ohci-omap3"