From patchwork Wed Sep 18 12:14:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 20418 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 46911246E9 for ; Wed, 18 Sep 2013 12:15:21 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id cm18sf4784828qab.8 for ; Wed, 18 Sep 2013 05:15:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=ec7MsJIctcQNhnAjORetwfAy3iJqcUT0ex5Mp6iAba8=; b=fdJhTkoS/Wdty53llpCn5M1NQvXeFULi43/n3YFBQgqmdMpl1+mkLXy2UvzJZT99ME jcTQOVFUW7qyn0IDl33o0F7DrHUfQhG5LXL+DWANnh7cJRkCF6Vv4S99P4pLE2vIPt9I 4WNceSTLgIJ6KdeowFKXGHJSsFOco9DBGlYNZ8xFUGL2Lfg+uVFbriZLnYrMXRQ/qD08 xrzUp5K07b6AYlLiTNjZP8PsYI1Z9xM7jYsKKtr++4OtrsGkflGftycVBqE/DvsdMupk qLsXJrruS9tFMV87145BEOGbN4yjVlefqI6vCArkSJx8TGf3qwrGKoouKLMMVo2lQ6Nm WRzA== X-Gm-Message-State: ALoCoQnH6repb47gU6wMi8Nhmie9c87XHRQr0yh89eEDU98cddGhbwXAt14uaqfwyMsD+vfybJYc X-Received: by 10.236.180.2 with SMTP id i2mr9511667yhm.4.1379506521059; Wed, 18 Sep 2013 05:15:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.65 with SMTP id 1ls3305727qek.72.gmail; Wed, 18 Sep 2013 05:15:21 -0700 (PDT) X-Received: by 10.221.51.206 with SMTP id vj14mr37765535vcb.17.1379506520979; Wed, 18 Sep 2013 05:15:20 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id vh9si426531vcb.100.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id hu8so2616616vcb.17 for ; Wed, 18 Sep 2013 05:15:20 -0700 (PDT) X-Received: by 10.58.169.193 with SMTP id ag1mr426405vec.26.1379506520905; Wed, 18 Sep 2013 05:15:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp214513vcz; Wed, 18 Sep 2013 05:15:20 -0700 (PDT) X-Received: by 10.14.87.135 with SMTP id y7mr2482658eee.69.1379506517401; Wed, 18 Sep 2013 05:15:17 -0700 (PDT) Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by mx.google.com with ESMTPS id f3si1540581eet.59.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:17 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.49 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.83.49; Received: by mail-ee0-f49.google.com with SMTP id d41so3372263eek.22 for ; Wed, 18 Sep 2013 05:15:17 -0700 (PDT) X-Received: by 10.14.209.133 with SMTP id s5mr390158eeo.104.1379506516932; Wed, 18 Sep 2013 05:15:16 -0700 (PDT) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginmedia.com. [92.233.57.238]) by mx.google.com with ESMTPSA id b45sm2382210eef.4.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:16 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@linaro.org, Lee Jones , Felipe Balbi Subject: [PATCH 30/41] usb: musb: ux500: Don't supply a con_id when requesting the clock Date: Wed, 18 Sep 2013 13:14:27 +0100 Message-Id: <1379506478-16625-31-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1379506478-16625-1-git-send-email-lee.jones@linaro.org> References: <1379506478-16625-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , If we supply a con_id then the clock framework will search for that name in MUSB's Device Tree node for the 'clock-names' property. If it's absent the clock request will fail. However, if we don't supply the con_id then clk_get() will call into clk_sys() which will use the device name to search for the appropriate clock, which is much more natural than forcing 'usb'. Cc: Felipe Balbi Signed-off-by: Lee Jones --- drivers/usb/musb/ux500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index fce71b6..5543b89 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -259,7 +259,7 @@ static int ux500_probe(struct platform_device *pdev) goto err1; } - clk = clk_get(&pdev->dev, "usb"); + clk = clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) { dev_err(&pdev->dev, "failed to get clock\n"); ret = PTR_ERR(clk);