From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benoit Cousson Subject: Re: [PATCH] ARM: OMAP4: HWMOD: make 'ocp2scp_usb_phy_phy_48m" as the main clock Date: Tue, 9 Apr 2013 10:54:03 +0200 Message-ID: <5163D72B.5040205@ti.com> References: <1365496101-7829-1-git-send-email-kishon@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1365496101-7829-1-git-send-email-kishon@ti.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Kishon Vijay Abraham I Cc: Paul Walmsley , linux@arm.linux.org.uk, tony@atomide.com, Keerthy , rnayak@ti.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-omap@vger.kernel.org SGkgS2lzaG9uLAoKT24gMDQvMDkvMjAxMyAxMDoyOCBBTSwgS2lzaG9uIFZpamF5IEFicmFoYW0g SSB3cm90ZToKPiBjb21taXQgOTI3MDJkIChBUk06IE9NQVA0OiBQTTogZml4IFBNIHJlZ3Jlc3Np b24gaW50cm9kdWNlZCBieSByZWNlbnQKPiBjbG9jayBjbGVhbnVwKSBtYWtlcyB0aGUgJ29jcDJz Y3BfdXNiX3BoeV9waHlfNDhtJyBhcyBvcHRpb25hbAo+IGZ1bmN0aW9uYWwgY2xvY2sgY2F1c2lu ZyByZWdyZXNzaW9uIGluIE1VU0IuIEJ1dCB0aGlzIDQ4TUh6IGNsb2NrIGlzIGEKPiBtYW5kYXRv cnkgY2xvY2sgZm9yIHVzYiBwaHkgYXR0YWNoZWQgdG8gb2NwMnNjcCBhbmQgaGVuY2UgbWFkZSBh cyB0aGUgbWFpbgo+IGNsb2NrIGZvciBvY3Ayc2NwLgoKSXQgaXMgYSBmaXggZm9yIDMuOS1yY1g/ CgpSZWdhcmRzLApCZW5vaXQKCj4gCj4gQ2M6IEtlZXJ0aHkgPGota2VlcnRoeUB0aS5jb20+Cj4g Q2M6IEJlbm/DrnQgQ291c3NvbiA8Yi1jb3Vzc29uQHRpLmNvbT4KPiBDYzogUGF1bCBXYWxtc2xl eSA8cGF1bEBwd3Nhbi5jb20+Cj4gU2lnbmVkLW9mZi1ieTogS2lzaG9uIFZpamF5IEFicmFoYW0g SSA8a2lzaG9uQHRpLmNvbT4KPiAtLS0KPiAgYXJjaC9hcm0vbWFjaC1vbWFwMi9vbWFwX2h3bW9k XzQ0eHhfZGF0YS5jIHwgICAgOCArLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp b24oKyksIDcgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtb21h cDIvb21hcF9od21vZF80NHh4X2RhdGEuYyBiL2FyY2gvYXJtL21hY2gtb21hcDIvb21hcF9od21v ZF80NHh4X2RhdGEuYwo+IGluZGV4IDllMDU3NjUuLmMxZmIwOTAgMTAwNjQ0Cj4gLS0tIGEvYXJj aC9hcm0vbWFjaC1vbWFwMi9vbWFwX2h3bW9kXzQ0eHhfZGF0YS5jCj4gKysrIGIvYXJjaC9hcm0v bWFjaC1vbWFwMi9vbWFwX2h3bW9kXzQ0eHhfZGF0YS5jCj4gQEAgLTI3MTQsMTYgKzI3MTQsMTIg QEAgc3RhdGljIHN0cnVjdCBvbWFwX29jcDJzY3BfZGV2IG9jcDJzY3BfZGV2X2F0dHJbXSA9IHsK PiAgCXsgfQo+ICB9Owo+ICAKPiAtc3RhdGljIHN0cnVjdCBvbWFwX2h3bW9kX29wdF9jbGsgb2Nw MnNjcF91c2JfcGh5X29wdF9jbGtzW10gPSB7Cj4gLQl7IC5yb2xlID0gIjQ4bWh6IiwgLmNsayA9 ICJvY3Ayc2NwX3VzYl9waHlfcGh5XzQ4bSIgfSwKPiAtfTsKPiAtCj4gIC8qIG9jcDJzY3BfdXNi X3BoeSAqLwo+ICBzdGF0aWMgc3RydWN0IG9tYXBfaHdtb2Qgb21hcDQ0eHhfb2NwMnNjcF91c2Jf cGh5X2h3bW9kID0gewo+ICAJLm5hbWUJCT0gIm9jcDJzY3BfdXNiX3BoeSIsCj4gIAkuY2xhc3MJ CT0gJm9tYXA0NHh4X29jcDJzY3BfaHdtb2RfY2xhc3MsCj4gIAkuY2xrZG1fbmFtZQk9ICJsM19p bml0X2Nsa2RtIiwKPiAtCS5tYWluX2Nsawk9ICJmdW5jXzQ4bV9mY2xrIiwKPiArCS5tYWluX2Ns awk9ICJvY3Ayc2NwX3VzYl9waHlfcGh5XzQ4bSIsCj4gIAkucHJjbSA9IHsKPiAgCQkub21hcDQg PSB7Cj4gIAkJCS5jbGtjdHJsX29mZnMgPSBPTUFQNF9DTV9MM0lOSVRfVVNCUEhZT0NQMlNDUF9D TEtDVFJMX09GRlNFVCwKPiBAQCAtMjczMiw4ICsyNzI4LDYgQEAgc3RhdGljIHN0cnVjdCBvbWFw X2h3bW9kIG9tYXA0NHh4X29jcDJzY3BfdXNiX3BoeV9od21vZCA9IHsKPiAgCQl9LAo+ICAJfSwK PiAgCS5kZXZfYXR0cgk9IG9jcDJzY3BfZGV2X2F0dHIsCj4gLQkub3B0X2Nsa3MJPSBvY3Ayc2Nw X3VzYl9waHlfb3B0X2Nsa3MsCj4gLQkub3B0X2Nsa3NfY250CT0gQVJSQVlfU0laRShvY3Ayc2Nw X3VzYl9waHlfb3B0X2Nsa3MpLAo+ICB9Owo+ICAKPiAgLyoKPiAKCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcg bGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmlu ZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: b-cousson@ti.com (Benoit Cousson) Date: Tue, 9 Apr 2013 10:54:03 +0200 Subject: [PATCH] ARM: OMAP4: HWMOD: make 'ocp2scp_usb_phy_phy_48m" as the main clock In-Reply-To: <1365496101-7829-1-git-send-email-kishon@ti.com> References: <1365496101-7829-1-git-send-email-kishon@ti.com> Message-ID: <5163D72B.5040205@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Kishon, On 04/09/2013 10:28 AM, Kishon Vijay Abraham I wrote: > commit 92702d (ARM: OMAP4: PM: fix PM regression introduced by recent > clock cleanup) makes the 'ocp2scp_usb_phy_phy_48m' as optional > functional clock causing regression in MUSB. But this 48MHz clock is a > mandatory clock for usb phy attached to ocp2scp and hence made as the main > clock for ocp2scp. It is a fix for 3.9-rcX? Regards, Benoit > > Cc: Keerthy > Cc: Beno?t Cousson > Cc: Paul Walmsley > Signed-off-by: Kishon Vijay Abraham I > --- > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > index 9e05765..c1fb090 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > @@ -2714,16 +2714,12 @@ static struct omap_ocp2scp_dev ocp2scp_dev_attr[] = { > { } > }; > > -static struct omap_hwmod_opt_clk ocp2scp_usb_phy_opt_clks[] = { > - { .role = "48mhz", .clk = "ocp2scp_usb_phy_phy_48m" }, > -}; > - > /* ocp2scp_usb_phy */ > static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { > .name = "ocp2scp_usb_phy", > .class = &omap44xx_ocp2scp_hwmod_class, > .clkdm_name = "l3_init_clkdm", > - .main_clk = "func_48m_fclk", > + .main_clk = "ocp2scp_usb_phy_phy_48m", > .prcm = { > .omap4 = { > .clkctrl_offs = OMAP4_CM_L3INIT_USBPHYOCP2SCP_CLKCTRL_OFFSET, > @@ -2732,8 +2728,6 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { > }, > }, > .dev_attr = ocp2scp_dev_attr, > - .opt_clks = ocp2scp_usb_phy_opt_clks, > - .opt_clks_cnt = ARRAY_SIZE(ocp2scp_usb_phy_opt_clks), > }; > > /* > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935160Ab3DIIyX (ORCPT ); Tue, 9 Apr 2013 04:54:23 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:46896 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935034Ab3DIIyU (ORCPT ); Tue, 9 Apr 2013 04:54:20 -0400 Message-ID: <5163D72B.5040205@ti.com> Date: Tue, 9 Apr 2013 10:54:03 +0200 From: Benoit Cousson Organization: Texas Instruments User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Kishon Vijay Abraham I CC: , , , , , , Keerthy , Paul Walmsley Subject: Re: [PATCH] ARM: OMAP4: HWMOD: make 'ocp2scp_usb_phy_phy_48m" as the main clock References: <1365496101-7829-1-git-send-email-kishon@ti.com> In-Reply-To: <1365496101-7829-1-git-send-email-kishon@ti.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Kishon, On 04/09/2013 10:28 AM, Kishon Vijay Abraham I wrote: > commit 92702d (ARM: OMAP4: PM: fix PM regression introduced by recent > clock cleanup) makes the 'ocp2scp_usb_phy_phy_48m' as optional > functional clock causing regression in MUSB. But this 48MHz clock is a > mandatory clock for usb phy attached to ocp2scp and hence made as the main > clock for ocp2scp. It is a fix for 3.9-rcX? Regards, Benoit > > Cc: Keerthy > Cc: Benoît Cousson > Cc: Paul Walmsley > Signed-off-by: Kishon Vijay Abraham I > --- > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > index 9e05765..c1fb090 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > @@ -2714,16 +2714,12 @@ static struct omap_ocp2scp_dev ocp2scp_dev_attr[] = { > { } > }; > > -static struct omap_hwmod_opt_clk ocp2scp_usb_phy_opt_clks[] = { > - { .role = "48mhz", .clk = "ocp2scp_usb_phy_phy_48m" }, > -}; > - > /* ocp2scp_usb_phy */ > static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { > .name = "ocp2scp_usb_phy", > .class = &omap44xx_ocp2scp_hwmod_class, > .clkdm_name = "l3_init_clkdm", > - .main_clk = "func_48m_fclk", > + .main_clk = "ocp2scp_usb_phy_phy_48m", > .prcm = { > .omap4 = { > .clkctrl_offs = OMAP4_CM_L3INIT_USBPHYOCP2SCP_CLKCTRL_OFFSET, > @@ -2732,8 +2728,6 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { > }, > }, > .dev_attr = ocp2scp_dev_attr, > - .opt_clks = ocp2scp_usb_phy_opt_clks, > - .opt_clks_cnt = ARRAY_SIZE(ocp2scp_usb_phy_opt_clks), > }; > > /* >