From patchwork Thu Mar 21 11:07:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 229626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id EAD8D2C00DE for ; Thu, 21 Mar 2013 22:07:45 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UIdLP-0004R2-IU; Thu, 21 Mar 2013 11:07:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UIdLE-0004Pu-Pk for kernel-team@lists.ubuntu.com; Thu, 21 Mar 2013 11:07:28 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UIdLE-00011R-Mi for kernel-team@lists.ubuntu.com; Thu, 21 Mar 2013 11:07:28 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] mfd: omap-usb-host: Fix clk warnings at boot Date: Thu, 21 Mar 2013 12:07:26 +0100 Message-Id: <1363864046-11794-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363864046-11794-1-git-send-email-paolo.pisati@canonical.com> References: <1363864046-11794-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Roger Quadros utmi_p1_gfclk and utmi_p2_gfclk are just clock multiplexers and don't have a gate. So don't call clk_enable/disable on them. Gets rid of warnings like below [ 0.716613] ------------[ cut here ]------------ [ 0.716644] WARNING: at drivers/clk/clk.c:522 __clk_enable+0x94/0xa4() [ 0.716674] Modules linked in: [ 0.716735] [] (unwind_backtrace+0x0/0xf0) from [] (warn_slowpath_common+0x4c/0x64) [ 0.716766] [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_null+0x1c/0x24) [ 0.716766] [] (warn_slowpath_null+0x1c/0x24) from [] (__clk_enable+0x94/0xa4) [ 0.716796] [] (__clk_enable+0x94/0xa4) from [] (clk_enable+0x20/0x3c) [ 0.716857] [] (clk_enable+0x20/0x3c) from [] (usbhs_runtime_resume+0x1c/0x34) [ 0.716888] [] (usbhs_runtime_resume+0x1c/0x34) from [] (pm_generic_runtime_resume+0x2c/0x38) [ 0.716918] [] (pm_generic_runtime_resume+0x2c/0x38) from [] (__rpm_callback+0x2c/0x60) [ 0.716949] [] (__rpm_callback+0x2c/0x60) from [] (rpm_resume+0x39c/0x60c) [ 0.716979] [] (rpm_resume+0x39c/0x60c) from [] (__pm_runtime_resume+0x48/0x60) [ 0.717010] [] (__pm_runtime_resume+0x48/0x60) from [] (usbhs_omap_probe+0x1f8/0x85c) [ 0.717041] [] (usbhs_omap_probe+0x1f8/0x85c) from [] (platform_drv_probe+0x18/0x1c) [ 0.717041] [] (platform_drv_probe+0x18/0x1c) from [] (driver_probe_device+0x74/0x218) [ 0.717071] [] (driver_probe_device+0x74/0x218) from [] (__driver_attach+0x94/0x98) [ 0.717132] [] (__driver_attach+0x94/0x98) from [] (bus_for_each_dev+0x4c/0x80) [ 0.717132] [] (bus_for_each_dev+0x4c/0x80) from [] (bus_add_driver+0x174/0x240) [ 0.717163] [] (bus_add_driver+0x174/0x240) from [] (driver_register+0x78/0x14c) [ 0.717193] [] (driver_register+0x78/0x14c) from [] (platform_driver_probe+0x18/0x9c) [ 0.717224] [] (platform_driver_probe+0x18/0x9c) from [] (do_one_initcall+0xfc/0x168) [ 0.717254] [] (do_one_initcall+0xfc/0x168) from [] (kernel_init_freeable+0xfc/0x1cc) [ 0.717285] [] (kernel_init_freeable+0xfc/0x1cc) from [] (kernel_init+0x8/0xe4) [ 0.717315] [] (kernel_init+0x8/0xe4) from [] (ret_from_fork+0x14/0x24) [ 0.717498] ---[ end trace 3ac11fdde949a96e ]--- Signed-off-by: Roger Quadros Tested-by: Kevin Hilman Signed-off-by: Paolo Pisati --- drivers/mfd/omap-usb-host.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 05164d7..f6f5b18 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -299,9 +299,6 @@ static int usbhs_runtime_resume(struct device *dev) if (is_ehci_tll_mode(pdata->port_mode[1])) clk_enable(omap->usbhost_p2_fck); - clk_enable(omap->utmi_p1_fck); - clk_enable(omap->utmi_p2_fck); - spin_unlock_irqrestore(&omap->lock, flags); return 0; @@ -327,9 +324,6 @@ static int usbhs_runtime_suspend(struct device *dev) if (is_ehci_tll_mode(pdata->port_mode[1])) clk_disable(omap->usbhost_p2_fck); - clk_disable(omap->utmi_p2_fck); - clk_disable(omap->utmi_p1_fck); - if (omap->ehci_logic_fck && !IS_ERR(omap->ehci_logic_fck)) clk_disable(omap->ehci_logic_fck);