Re: [PATCH 07/29] mfd: omap-usb: use clk_prepare_enable and clk_disable_unprepare
Hi Rajendra, On Mon, Jul 02, 2012 at 04:46:21PM +0530, Rajendra Nayak wrote: Hi Samuel, On Monday 02 July 2012 04:48 PM, Samuel Ortiz wrote: Hi Rajendra, On Thu, Jun 14, 2012 at 06:16:56PM +0530, Rajendra Nayak wrote: As we move to Common clk framework use clk_prepare_enable() instead of clk_enable() and similarly clk_disable_unprepare() instead of clk_disable() Signed-off-by: Rajendra Nayakrna...@ti.com Cc: Samuel Ortizsa...@linux.intel.com --- drivers/mfd/omap-usb-host.c | 28 ++-- 1 files changed, 14 insertions(+), 14 deletions(-) Patch applied, many thanks. Sorry, I was asked to base these changes on top of work done by Keshava [1], to split the driver, which is still under review/not pulled. I am waiting for those to settle to repost these changes. Can you please drop this one for now? I just did, although I think Keshava could have based his work on top of yours, as he's rebasing his patchset at the moment. Anyway, patch is removed now. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/29] mfd: omap-usb: use clk_prepare_enable and clk_disable_unprepare
Hi Rajendra, On Thu, Jun 14, 2012 at 06:16:56PM +0530, Rajendra Nayak wrote: As we move to Common clk framework use clk_prepare_enable() instead of clk_enable() and similarly clk_disable_unprepare() instead of clk_disable() Signed-off-by: Rajendra Nayak rna...@ti.com Cc: Samuel Ortiz sa...@linux.intel.com --- drivers/mfd/omap-usb-host.c | 28 ++-- 1 files changed, 14 insertions(+), 14 deletions(-) Patch applied, many thanks. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/29] mfd: omap-usb: use clk_prepare_enable and clk_disable_unprepare
Hi Samuel, On Monday 02 July 2012 04:48 PM, Samuel Ortiz wrote: Hi Rajendra, On Thu, Jun 14, 2012 at 06:16:56PM +0530, Rajendra Nayak wrote: As we move to Common clk framework use clk_prepare_enable() instead of clk_enable() and similarly clk_disable_unprepare() instead of clk_disable() Signed-off-by: Rajendra Nayakrna...@ti.com Cc: Samuel Ortizsa...@linux.intel.com --- drivers/mfd/omap-usb-host.c | 28 ++-- 1 files changed, 14 insertions(+), 14 deletions(-) Patch applied, many thanks. Sorry, I was asked to base these changes on top of work done by Keshava [1], to split the driver, which is still under review/not pulled. I am waiting for those to settle to repost these changes. Can you please drop this one for now? Sorry for the confusion. regards, Rajendra [1] http://permalink.gmane.org/gmane.linux.ports.arm.omap/79306 Cheers, Samuel. -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 07/29] mfd: omap-usb: use clk_prepare_enable and clk_disable_unprepare
As we move to Common clk framework use clk_prepare_enable()
instead of clk_enable() and similarly clk_disable_unprepare()
instead of clk_disable()
Signed-off-by: Rajendra Nayak rna...@ti.com
Cc: Samuel Ortiz sa...@linux.intel.com
---
drivers/mfd/omap-usb-host.c | 28 ++--
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 7e96bb2..d70d2fe 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -438,18 +438,18 @@ static int usbhs_runtime_resume(struct device *dev)
spin_lock_irqsave(omap-lock, flags);
if (omap-ehci_logic_fck !IS_ERR(omap-ehci_logic_fck))
- clk_enable(omap-ehci_logic_fck);
+ clk_prepare_enable(omap-ehci_logic_fck);
if (is_ehci_tll_mode(pdata-port_mode[0])) {
- clk_enable(omap-usbhost_p1_fck);
- clk_enable(omap-usbtll_p1_fck);
+ clk_prepare_enable(omap-usbhost_p1_fck);
+ clk_prepare_enable(omap-usbtll_p1_fck);
}
if (is_ehci_tll_mode(pdata-port_mode[1])) {
- clk_enable(omap-usbhost_p2_fck);
- clk_enable(omap-usbtll_p2_fck);
+ clk_prepare_enable(omap-usbhost_p2_fck);
+ clk_prepare_enable(omap-usbtll_p2_fck);
}
- clk_enable(omap-utmi_p1_fck);
- clk_enable(omap-utmi_p2_fck);
+ clk_prepare_enable(omap-utmi_p1_fck);
+ clk_prepare_enable(omap-utmi_p2_fck);
spin_unlock_irqrestore(omap-lock, flags);
@@ -472,18 +472,18 @@ static int usbhs_runtime_suspend(struct device *dev)
spin_lock_irqsave(omap-lock, flags);
if (is_ehci_tll_mode(pdata-port_mode[0])) {
- clk_disable(omap-usbhost_p1_fck);
- clk_disable(omap-usbtll_p1_fck);
+ clk_disable_unprepare(omap-usbhost_p1_fck);
+ clk_disable_unprepare(omap-usbtll_p1_fck);
}
if (is_ehci_tll_mode(pdata-port_mode[1])) {
- clk_disable(omap-usbhost_p2_fck);
- clk_disable(omap-usbtll_p2_fck);
+ clk_disable_unprepare(omap-usbhost_p2_fck);
+ clk_disable_unprepare(omap-usbtll_p2_fck);
}
- clk_disable(omap-utmi_p2_fck);
- clk_disable(omap-utmi_p1_fck);
+ clk_disable_unprepare(omap-utmi_p2_fck);
+ clk_disable_unprepare(omap-utmi_p1_fck);
if (omap-ehci_logic_fck !IS_ERR(omap-ehci_logic_fck))
- clk_disable(omap-ehci_logic_fck);
+ clk_disable_unprepare(omap-ehci_logic_fck);
spin_unlock_irqrestore(omap-lock, flags);
--
1.7.1
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
