From patchwork Wed Aug 18 02:55:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Munegowda, Keshava" X-Patchwork-Id: 120179 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7IEtlCD011710 for ; Wed, 18 Aug 2010 14:55:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753774Ab0HROzc (ORCPT ); Wed, 18 Aug 2010 10:55:32 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:57159 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753752Ab0HROzb (ORCPT ); Wed, 18 Aug 2010 10:55:31 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o7IEtUwO016510 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 18 Aug 2010 09:55:30 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o7IEtSjf019787; Wed, 18 Aug 2010 09:55:28 -0500 (CDT) Received: from localhost (a0393220-desktop.apr.dhcp.ti.com [172.24.137.6]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o7IEtPf17202; Wed, 18 Aug 2010 09:55:26 -0500 (CDT) From: Keshava Munegowda To: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org Cc: Keshava Munegowda , Anand Gadiyar Subject: [PATCH 4/5] usb: ohci: omap: Update clock names to be same across OMAP3 and OMAP4 Date: Wed, 18 Aug 2010 08:25:44 +0530 Message-Id: <1282100145-27485-5-git-send-email-keshava_mgowda@ti.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1282100145-27485-4-git-send-email-keshava_mgowda@ti.com> References: <1282100145-27485-1-git-send-email-keshava_mgowda@ti.com> <1282100145-27485-2-git-send-email-keshava_mgowda@ti.com> <1282100145-27485-3-git-send-email-keshava_mgowda@ti.com> <1282100145-27485-4-git-send-email-keshava_mgowda@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 18 Aug 2010 14:55:48 +0000 (UTC) Index: kernel-omap4-base/drivers/usb/host/ohci-omap3.c =================================================================== --- kernel-omap4-base.orig/drivers/usb/host/ohci-omap3.c +++ kernel-omap4-base/drivers/usb/host/ohci-omap3.c @@ -135,8 +135,8 @@ struct ohci_hcd_omap3 { struct device *dev; struct clk *usbhost_ick; - struct clk *usbhost2_120m_fck; - struct clk *usbhost1_48m_fck; + struct clk *usbhost_hs_fck; + struct clk *usbhost_fs_fck; struct clk *usbtll_fck; struct clk *usbtll_ick; @@ -157,11 +157,11 @@ static void ohci_omap3_clock_power(struc clk_enable(omap->usbtll_ick); clk_enable(omap->usbtll_fck); clk_enable(omap->usbhost_ick); - clk_enable(omap->usbhost1_48m_fck); - clk_enable(omap->usbhost2_120m_fck); + clk_enable(omap->usbhost_fs_fck); + clk_enable(omap->usbhost_hs_fck); } else { - clk_disable(omap->usbhost2_120m_fck); - clk_disable(omap->usbhost1_48m_fck); + clk_disable(omap->usbhost_hs_fck); + clk_disable(omap->usbhost_fs_fck); clk_disable(omap->usbhost_ick); clk_disable(omap->usbtll_fck); clk_disable(omap->usbtll_ick); @@ -297,18 +297,18 @@ static int omap3_start_ohci(struct ohci_ goto err_host_ick; } - omap->usbhost2_120m_fck = clk_get(omap->dev, "usbhost_120m_fck"); - if (IS_ERR(omap->usbhost2_120m_fck)) { + omap->usbhost_hs_fck = clk_get(omap->dev, "usbhost_120m_fck"); + if (IS_ERR(omap->usbhost_hs_fck)) { dev_err(omap->dev, "could not get usbhost_120m_fck\n"); - ret = PTR_ERR(omap->usbhost2_120m_fck); - goto err_host_120m_fck; + ret = PTR_ERR(omap->usbhost_hs_fck); + goto err_host_hs_fck; } - omap->usbhost1_48m_fck = clk_get(omap->dev, "usbhost_48m_fck"); - if (IS_ERR(omap->usbhost1_48m_fck)) { + omap->usbhost_fs_fck = clk_get(omap->dev, "usbhost_48m_fck"); + if (IS_ERR(omap->usbhost_fs_fck)) { dev_err(omap->dev, "could not get usbhost_48m_fck\n"); - ret = PTR_ERR(omap->usbhost1_48m_fck); - goto err_host_48m_fck; + ret = PTR_ERR(omap->usbhost_fs_fck); + goto err_host_fs_fck; } omap->usbtll_fck = clk_get(omap->dev, "usbtll_fck"); @@ -434,12 +434,12 @@ err_tll_ick: clk_put(omap->usbtll_fck); err_tll_fck: - clk_put(omap->usbhost1_48m_fck); + clk_put(omap->usbhost_fs_fck); -err_host_48m_fck: - clk_put(omap->usbhost2_120m_fck); +err_host_fs_fck: + clk_put(omap->usbhost_hs_fck); -err_host_120m_fck: +err_host_hs_fck: clk_put(omap->usbhost_ick); err_host_ick: @@ -501,14 +501,14 @@ static void omap3_stop_ohci(struct ohci_ omap->usbhost_ick = NULL; } - if (omap->usbhost1_48m_fck != NULL) { - clk_put(omap->usbhost1_48m_fck); - omap->usbhost1_48m_fck = NULL; + if (omap->usbhost_fs_fck != NULL) { + clk_put(omap->usbhost_fs_fck); + omap->usbhost_fs_fck = NULL; } - if (omap->usbhost2_120m_fck != NULL) { - clk_put(omap->usbhost2_120m_fck); - omap->usbhost2_120m_fck = NULL; + if (omap->usbhost_hs_fck != NULL) { + clk_put(omap->usbhost_hs_fck); + omap->usbhost_hs_fck = NULL; } if (omap->usbtll_ick != NULL) {