diff mbox

[v8,19/22] ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies

Message ID 1358511445-26656-20-git-send-email-rogerq@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Roger Quadros Jan. 18, 2013, 12:17 p.m. UTC 
We don't need multiple aliases for the OMAP USB host clocks and neither
the dummy clocks so remove them.

CC: Paul Walmsley <paul@pwsan.com>
CC: Rajendra Nayak <rnayak@ti.com>
CC: Benoit Cousson <b-cousson@ti.com>
CC: Mike Turquette <mturquette@linaro.com>

Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
---
 arch/arm/mach-omap2/cclock3xxx_data.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

Comments

Paul Walmsley Jan. 18, 2013, 8:27 p.m. UTC | #1 
Hi Roger,

On Fri, 18 Jan 2013, Roger Quadros wrote:

> We don't need multiple aliases for the OMAP USB host clocks and neither
> the dummy clocks so remove them.
> 
> CC: Paul Walmsley <paul@pwsan.com>
> CC: Rajendra Nayak <rnayak@ti.com>
> CC: Benoit Cousson <b-cousson@ti.com>
> CC: Mike Turquette <mturquette@linaro.com>
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> Reviewed-by: Felipe Balbi <balbi@ti.com>
> Acked-by: Paul Walmsley <paul@pwsan.com>

Per Tony's earlier request, you can drop this patch and patch 20 from your 
series now.  I've got them queued for 3.10 or late 3.9 merge window.

- Paul
Roger Quadros Jan. 21, 2013, 9:35 a.m. UTC | #2 
On 01/18/2013 10:27 PM, Paul Walmsley wrote:
> Hi Roger,
> 
> On Fri, 18 Jan 2013, Roger Quadros wrote:
> 
>> We don't need multiple aliases for the OMAP USB host clocks and neither
>> the dummy clocks so remove them.
>>
>> CC: Paul Walmsley <paul@pwsan.com>
>> CC: Rajendra Nayak <rnayak@ti.com>
>> CC: Benoit Cousson <b-cousson@ti.com>
>> CC: Mike Turquette <mturquette@linaro.com>
>>
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> Reviewed-by: Felipe Balbi <balbi@ti.com>
>> Acked-by: Paul Walmsley <paul@pwsan.com>
> 
> Per Tony's earlier request, you can drop this patch and patch 20 from your 
> series now.  I've got them queued for 3.10 or late 3.9 merge window.
> 

Should have mentioned it earlier, but just this patch without the rest
of the cleanup patches will break USB Host on OMAP3, as the old driver
bails out if optional clock nodes are missing.

Including patch 20 doesn't seem to cause a problem with OMAP4 though.

regards,
-roger
Paul Walmsley Jan. 21, 2013, 3:03 p.m. UTC | #3 
Hi

On Mon, 21 Jan 2013, Roger Quadros wrote:

> On 01/18/2013 10:27 PM, Paul Walmsley wrote:
> > On Fri, 18 Jan 2013, Roger Quadros wrote:
> > 
> >> We don't need multiple aliases for the OMAP USB host clocks and neither
> >> the dummy clocks so remove them.
> >>
> >> CC: Paul Walmsley <paul@pwsan.com>
> >> CC: Rajendra Nayak <rnayak@ti.com>
> >> CC: Benoit Cousson <b-cousson@ti.com>
> >> CC: Mike Turquette <mturquette@linaro.com>
> >>
> >> Signed-off-by: Roger Quadros <rogerq@ti.com>
> >> Reviewed-by: Felipe Balbi <balbi@ti.com>
> >> Acked-by: Paul Walmsley <paul@pwsan.com>
> > 
> > Per Tony's earlier request, you can drop this patch and patch 20 from your 
> > series now.  I've got them queued for 3.10 or late 3.9 merge window.
> > 
> 
> Should have mentioned it earlier, but just this patch without the rest
> of the cleanup patches will break USB Host on OMAP3, as the old driver
> bails out if optional clock nodes are missing.
> 
> Including patch 20 doesn't seem to cause a problem with OMAP4 though.

I've got these two patches queued for merging after your other patches go 
upstream -- e.g., probably 3.10.  Do you foresee any problems with that?

- Paul
Roger Quadros Jan. 22, 2013, 9:28 a.m. UTC | #4 
On 01/21/2013 05:03 PM, Paul Walmsley wrote:
> Hi
> 
> On Mon, 21 Jan 2013, Roger Quadros wrote:
> 
>> On 01/18/2013 10:27 PM, Paul Walmsley wrote:
>>> On Fri, 18 Jan 2013, Roger Quadros wrote:
>>>
>>>> We don't need multiple aliases for the OMAP USB host clocks and neither
>>>> the dummy clocks so remove them.
>>>>
>>>> CC: Paul Walmsley <paul@pwsan.com>
>>>> CC: Rajendra Nayak <rnayak@ti.com>
>>>> CC: Benoit Cousson <b-cousson@ti.com>
>>>> CC: Mike Turquette <mturquette@linaro.com>
>>>>
>>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>>> Reviewed-by: Felipe Balbi <balbi@ti.com>
>>>> Acked-by: Paul Walmsley <paul@pwsan.com>
>>>
>>> Per Tony's earlier request, you can drop this patch and patch 20 from your 
>>> series now.  I've got them queued for 3.10 or late 3.9 merge window.
>>>
>>
>> Should have mentioned it earlier, but just this patch without the rest
>> of the cleanup patches will break USB Host on OMAP3, as the old driver
>> bails out if optional clock nodes are missing.
>>
>> Including patch 20 doesn't seem to cause a problem with OMAP4 though.
> 
> I've got these two patches queued for merging after your other patches go 
> upstream -- e.g., probably 3.10.  Do you foresee any problems with that?
> 

That should be fine. Thanks :).

--
cheers,
-roger
Roger Quadros Feb. 5, 2013, 11:22 a.m. UTC | #5 
Hi Paul,

On 01/21/2013 05:03 PM, Paul Walmsley wrote:
> Hi
> 
> On Mon, 21 Jan 2013, Roger Quadros wrote:
> 
>> On 01/18/2013 10:27 PM, Paul Walmsley wrote:
>>> On Fri, 18 Jan 2013, Roger Quadros wrote:
>>>
>>>> We don't need multiple aliases for the OMAP USB host clocks and neither
>>>> the dummy clocks so remove them.
>>>>
>>>> CC: Paul Walmsley <paul@pwsan.com>
>>>> CC: Rajendra Nayak <rnayak@ti.com>
>>>> CC: Benoit Cousson <b-cousson@ti.com>
>>>> CC: Mike Turquette <mturquette@linaro.com>
>>>>
>>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>>> Reviewed-by: Felipe Balbi <balbi@ti.com>
>>>> Acked-by: Paul Walmsley <paul@pwsan.com>
>>>
>>> Per Tony's earlier request, you can drop this patch and patch 20 from your 
>>> series now.  I've got them queued for 3.10 or late 3.9 merge window.
>>>
>>
>> Should have mentioned it earlier, but just this patch without the rest
>> of the cleanup patches will break USB Host on OMAP3, as the old driver
>> bails out if optional clock nodes are missing.
>>
>> Including patch 20 doesn't seem to cause a problem with OMAP4 though.
> 
> I've got these two patches queued for merging after your other patches go 
> upstream -- e.g., probably 3.10.  Do you foresee any problems with that?
> 

FYI, the usbhost patches are already in linux-next.

cheers,
-roger
Paul Walmsley Feb. 11, 2013, 7:49 p.m. UTC | #6 
Hi Roger,

On Tue, 5 Feb 2013, Roger Quadros wrote:

> FYI, the usbhost patches are already in linux-next.

Thanks, I think I'll wait for 3.10 cleanup to send the clock cleanup 
patches, they seem non-critical...


- Paul
Paul Walmsley June 9, 2013, 7:15 a.m. UTC | #7 
Hi Roger,

On Tue, 5 Feb 2013, Roger Quadros wrote:

> On 01/21/2013 05:03 PM, Paul Walmsley wrote:
> > Hi
> > 
> > On Mon, 21 Jan 2013, Roger Quadros wrote:
> > 
> >> On 01/18/2013 10:27 PM, Paul Walmsley wrote:
> >>> On Fri, 18 Jan 2013, Roger Quadros wrote:
> >>>
> >>>> We don't need multiple aliases for the OMAP USB host clocks and neither
> >>>> the dummy clocks so remove them.
> >>>>
> >>>> CC: Paul Walmsley <paul@pwsan.com>
> >>>> CC: Rajendra Nayak <rnayak@ti.com>
> >>>> CC: Benoit Cousson <b-cousson@ti.com>
> >>>> CC: Mike Turquette <mturquette@linaro.com>
> >>>>
> >>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
> >>>> Reviewed-by: Felipe Balbi <balbi@ti.com>
> >>>> Acked-by: Paul Walmsley <paul@pwsan.com>
> >>>
> >>> Per Tony's earlier request, you can drop this patch and patch 20 from your 
> >>> series now.  I've got them queued for 3.10 or late 3.9 merge window.
> >>>
> >>
> >> Should have mentioned it earlier, but just this patch without the rest
> >> of the cleanup patches will break USB Host on OMAP3, as the old driver
> >> bails out if optional clock nodes are missing.
> >>
> >> Including patch 20 doesn't seem to cause a problem with OMAP4 though.
> > 
> > I've got these two patches queued for merging after your other patches go 
> > upstream -- e.g., probably 3.10.  Do you foresee any problems with that?
> > 
> 
> FYI, the usbhost patches are already in linux-next.

Queued this patch for v3.11; looks like I missed it for v3.10.

- Paul
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c
index 6ef8758..b58ec96 100644
--- a/arch/arm/mach-omap2/cclock3xxx_data.c
+++ b/arch/arm/mach-omap2/cclock3xxx_data.c
@@ -3291,8 +3291,6 @@  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",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs_tll",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"core_96m_fck",	&core_96m_fck,	CK_3XXX),
 	CLK(NULL,	"mmchs3_fck",	&mmchs3_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"mmchs2_fck",	&mmchs2_fck,	CK_3XXX),
@@ -3329,8 +3327,6 @@  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",	"usbtll_ick",	&usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs_tll",	"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,	"mmchs3_ick",	&mmchs3_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"icr_ick",	&icr_ick,	CK_34XX | CK_36XX),
@@ -3393,17 +3389,10 @@  static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"usbhost_120m_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(NULL,	"usbhost_ick",	&usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-	CLK("usbhs_omap",	"usbhost_ick",	&usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"utmi_p1_gfclk",	&dummy_ck,	CK_3XXX),
 	CLK(NULL,	"utmi_p2_gfclk",	&dummy_ck,	CK_3XXX),
 	CLK(NULL,	"xclk60mhsp1_ck",	&dummy_ck,	CK_3XXX),
 	CLK(NULL,	"xclk60mhsp2_ck",	&dummy_ck,	CK_3XXX),
-	CLK(NULL,	"usb_host_hs_utmi_p1_clk",	&dummy_ck,	CK_3XXX),
-	CLK(NULL,	"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_tll",	"usb_tll_hs_usb_ch0_clk",	&dummy_ck,	CK_3XXX),
-	CLK("usbhs_tll",	"usb_tll_hs_usb_ch1_clk",	&dummy_ck,	CK_3XXX),
 	CLK(NULL,	"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),