From patchwork Thu Feb 27 14:18:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 25459 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5BC1B20543 for ; Thu, 27 Feb 2014 14:21:43 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf8994419oag.5 for ; Thu, 27 Feb 2014 06:21:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=s0xwA0vW9O+qEQzGRRMSFSCZ5Yq0oee6g2N8VvhZIFg=; b=m7Ial1ksqyPz7hEEFtspxQYP2WO8TQA/hRC57wKG0FcLRBrjR4wbGsG6mg5nH/r+pc pKhIc4vpGIJp9acLREBlI3EtA0kgrrmd4z67vto+ec8PCZgfJcg1m0UR1kwBhVoqwbyv cJ88KEm6z9vQ1JodP5dMnEtnUX/cAdsqvet2zF6PZZxSwgDB2lmrze4fCHvLcnFoiP+O ktuJCrdNpdfpLDjTNs53jDFP4PMmqIc34tTkygy/3eXnZQWusDW7Y1GBhAwIYqHZocCy sfJPlX4ehEZl+EHCAqOSGmae+uGAq2nX9Fl9t+ttqrV2y+x+Qsvx5W3hBHrInpHHX8ZR vGlQ== X-Gm-Message-State: ALoCoQmz/3SBL2XH+x+/iLEOpnEkF/DFkcvup+UPbt5O/1gMqUZQrn2cgPkFR3XmrYwGsrrxqfvp X-Received: by 10.182.24.5 with SMTP id q5mr4187237obf.23.1393510902690; Thu, 27 Feb 2014 06:21:42 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.41 with SMTP id f38ls635218qge.55.gmail; Thu, 27 Feb 2014 06:21:42 -0800 (PST) X-Received: by 10.58.106.134 with SMTP id gu6mr519379veb.44.1393510902518; Thu, 27 Feb 2014 06:21:42 -0800 (PST) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id si7si1194312vdc.141.2014.02.27.06.21.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 06:21:42 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ij19so2547285vcb.34 for ; Thu, 27 Feb 2014 06:21:42 -0800 (PST) X-Received: by 10.221.29.196 with SMTP id rz4mr10995764vcb.8.1393510902427; Thu, 27 Feb 2014 06:21:42 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp20317vcz; Thu, 27 Feb 2014 06:21:42 -0800 (PST) X-Received: by 10.194.86.233 with SMTP id s9mr8002935wjz.44.1393510901629; Thu, 27 Feb 2014 06:21:41 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id hh8si3825363wjc.166.2014.02.27.06.21.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Feb 2014 06:21:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ1oP-0006Wa-TF; Thu, 27 Feb 2014 14:19:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ1oF-0007Us-3A; Thu, 27 Feb 2014 14:19:35 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ1nm-0007PM-CQ for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2014 14:19:07 +0000 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1REIkQi026071; Thu, 27 Feb 2014 08:18:47 -0600 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1REIkVx000856; Thu, 27 Feb 2014 08:18:46 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Feb 2014 08:18:46 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1REIXBf006792; Thu, 27 Feb 2014 08:18:43 -0600 From: Roger Quadros To: , , Subject: [PATCH v9 3/9] mfd: omap-usb-host: Use proper clock name instead of alias Date: Thu, 27 Feb 2014 16:18:25 +0200 Message-ID: <1393510711-4697-4-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393510711-4697-1-git-send-email-rogerq@ti.com> References: <1393510711-4697-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140227_091906_564260_B9312D64 X-CRM114-Status: GOOD ( 11.08 ) X-Spam-Score: -3.8 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.40 listed in list.dnswl.org] 3.1 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: devicetree@vger.kernel.org, Paul Walmsley , Samuel Ortiz , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, balbi@ti.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Roger Quadros X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Use the proper clock name 'usbhost_120m_fck' instead of the alias 'ehci_logic_fck' Get rid of the 'ehci_logic_fck' alias from the OMAP3 hwmod data as well. CC: Paul Walmsley CC: Lee Jones CC: Samuel Ortiz Signed-off-by: Roger Quadros --- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 ------ drivers/mfd/omap-usb-host.c | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 4c3b1e6..ad87f46 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -1955,10 +1955,6 @@ static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = { .sysc = &omap3xxx_usb_host_hs_sysc, }; -static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = { - { .role = "ehci_logic_fck", .clk = "usbhost_120m_fck", }, -}; - static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = { { .name = "ohci-irq", .irq = 76 + OMAP_INTC_START, }, { .name = "ehci-irq", .irq = 77 + OMAP_INTC_START, }, @@ -1981,8 +1977,6 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { .idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT, }, }, - .opt_clks = omap3xxx_usb_host_hs_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(omap3xxx_usb_host_hs_opt_clks), /* * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index c31baa7..865c276 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -692,10 +692,11 @@ static int usbhs_omap_probe(struct platform_device *pdev) if (need_logic_fck) { omap->ehci_logic_fck = devm_clk_get(dev, - "ehci_logic_fck"); + "usbhost_120m_fck"); if (IS_ERR(omap->ehci_logic_fck)) { ret = PTR_ERR(omap->ehci_logic_fck); - dev_err(dev, "ehci_logic_fck failed:%d\n", ret); + dev_err(dev, "usbhost_120m_fck failed:%d\n", + ret); goto err_mem; } }