ARM: OMAP4: HWMOD: make 'ocp2scp_usb_phy_phy_48m" as the main clock
Subsystems (4)
PATCH 1/1 ARM: OMAP4: HWMOD: make 'ocp2scp_usb_phy_phy_48m" as the main clock
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.
--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -7
@@ -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), };/*
Signature · 1 line
1.7.10.4
Hi Kishon,
Quoted 5 lines · Kishon Vijay Abraham I
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
Quoted 41 lines
Cc Keerthy <[email protected]>Cc Beno?t Cousson <[email protected]>Cc Paul Walmsley <[email protected]>Signed-off-by Kishon Vijay Abraham I <[email protected]>--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1
-7@@ -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), };/*
Hi,
Quoted 10 lines · Benoit Cousson
Hi Kishon,
Quoted 5 lines · Kishon Vijay Abraham I
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?
Yeah.
Thanks
Kishon
Paul Walmsley
maintainerHi
Quoted 10 lines · Kishon Vijay Abraham I
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.Cc Keerthy <[email protected]>Cc Beno?t Cousson <[email protected]>Cc Paul Walmsley <[email protected]>Signed-off-by Kishon Vijay Abraham I <[email protected]>
This patch is missing the "big comment" that I requested in the hwmod data:
http://marc.info/?l=linux-omap&m=136544098331552&w=2
Once that's added, it should be good to go.
- Paul
Paul Walmsley
maintainerPATCH v2 1/1 ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
From: Kishon Vijay Abraham I <[email protected]>
Commit 92702df3570e ("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.
[paul at pwsan.com: add comment to the hwmod data to try to prevent any
future mistakes here]
---
Nothing further received from Kishon per the request:
http://marc.info/?l=linux-omap&m=136554118302342&w=2
Since the deadline for v3.9-rc fixes is quite close, have added the comment myself, and have confirmed that this patch does not cause additional PM regressions on 4460 Panda-ES in the tests here.
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +11 -7
@@ -2714,16 +2714,22 @@ 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" , +/* +* ocp2scp_usb_phy_phy_48m is provided by the OMAP4 PRCM IP +* block as an "optional clock," and normally should never be +* specified as the main_clk for an OMAP IP block. However it +* turns out that this clock is actually the main clock for +* the ocp2scp_usb_phy IP block: +* http://lists.infradead.org/pipermail/linux-arm-kernel/2012-September/119943.html +* So listing ocp2scp_usb_phy_phy_48m as a main_clk here seems +* to be the best workaround. +*/ + .main_clk ="ocp2scp_usb_phy_phy_48m" , .prcm = { .omap4 = { .clkctrl_offs =OMAP4_CM_L3INIT_USBPHYOCP2SCP_CLKCTRL_OFFSET ,
@@ -2732,8 +2738,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), };/*
Signature · 1 line
1.7.10.4
Re: [PATCH v2] ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
Hi,
Quoted 12 lines · Paul Walmsley
From: Kishon Vijay Abraham I <[email protected]>
Commit
92702df3570e("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.Cc Keerthy <[email protected]>Cc Beno?t Cousson <[email protected]>Cc Paul Walmsley <[email protected]>Signed-off-by Kishon Vijay Abraham I <[email protected]>
Quoted 8 lines
[paul at pwsan.com: add comment to the hwmod data to try to prevent any
future mistakes here]Signed-off-by Paul Walmsley <[email protected]>---
Nothing further received from Kishon per the request:
Sorry. Missed reading this mail.
Thanks
Kishon