From patchwork Fri May 31 09:19:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17351 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DC62025CAB for ; Fri, 31 May 2013 09:21:44 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id k13sf1244621wgh.7 for ; Fri, 31 May 2013 02:21:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=mF2jHtPqq9fk4gA0D2S4vEHtzPIpVQM4IV2RUTUOmQY=; b=VQ/rZVh6mCxG4khJJbzJLLqUQFsbtig9xIMbaiXbhvNi8oD2cz+e+R8LSgLsXTU+2n qjt9JZozjpUuSB35wmEgbLq1/gCj2ECtRxIEVo4WixZ+DkeA5GXEKmC8gDUpME9t+e62 7Qc4/YB6ZTQ9n/GdOY0vMT6MKk1wIpFN+RGfKrrJpGhZ/LEaAy/1wgvjTCnagZq9Gd3K lgrD/Urof91B9Tch73ni2Im6Nvx/nHhz3g1E8BoRwCYz6YFT3EBYoCht/fWM+C5LYCV/ u+9o+kTuecWKokldtvY2J2GNHXUOuOQhxC1GW685P6BICSyb6pFCJoJlyjRdGCSXHg4W JRKQ== X-Received: by 10.180.188.98 with SMTP id fz2mr1134809wic.4.1369992103723; Fri, 31 May 2013 02:21:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.185.197 with SMTP id fe5ls164269wic.30.canary; Fri, 31 May 2013 02:21:43 -0700 (PDT) X-Received: by 10.194.173.232 with SMTP id bn8mr8459248wjc.26.1369992103529; Fri, 31 May 2013 02:21:43 -0700 (PDT) Received: from mail-ve0-x234.google.com (mail-ve0-x234.google.com [2607:f8b0:400c:c01::234]) by mx.google.com with ESMTPS id c1si3215435wje.113.2013.05.31.02.21.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:43 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::234 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::234; Received: by mail-ve0-f180.google.com with SMTP id pa12so960799veb.11 for ; Fri, 31 May 2013 02:21:42 -0700 (PDT) X-Received: by 10.52.120.113 with SMTP id lb17mr8010163vdb.1.1369992102471; Fri, 31 May 2013 02:21:42 -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.229.199 with SMTP id jj7csp42459vcb; Fri, 31 May 2013 02:21:41 -0700 (PDT) X-Received: by 10.15.86.74 with SMTP id h50mr12559149eez.97.1369992095704; Fri, 31 May 2013 02:21:35 -0700 (PDT) Received: from eu1sys200aog115.obsmtp.com (eu1sys200aog115.obsmtp.com [207.126.144.139]) by mx.google.com with SMTP id w42si5813197eeo.275.2013.05.31.02.21.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:35 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.139; Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKUahrhpJrhgDNRDSQ/Hbx34TJ1TwqISKQ@postini.com; Fri, 31 May 2013 09:21:35 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id A9EF9FE; Fri, 31 May 2013 09:21:07 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 66B9216B2; Fri, 31 May 2013 09:21:07 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id A799BA8065; Fri, 31 May 2013 11:21:02 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 31 May 2013 11:21:06 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 34/39] i2c: stu300: do not request a specific clock name Date: Fri, 31 May 2013 11:19:09 +0200 Message-ID: <1369991954-17406-35-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> References: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkQrKVF2y7FYyrAxkOErnhbZrH/b9GYE8C/VPr++4PNmWEao7zmfM3hr1GANhFdhjSNg70V X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::234 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: , From: Linus Walleij We have used the default clock associated with the block for a long time, only heuristics in the clock system has made this work anyway. This needs to be done away with as we start probing this driver and its clocks exclusively from the device tree. Acked-by: Wolfram Sang Signed-off-by: Linus Walleij --- drivers/i2c/busses/i2c-stu300.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index 1beaa05a..d1a6b20 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c @@ -868,7 +868,6 @@ stu300_probe(struct platform_device *pdev) struct resource *res; int bus_nr; int ret = 0; - char clk_name[] = "I2C0"; dev = devm_kzalloc(&pdev->dev, sizeof(struct stu300_dev), GFP_KERNEL); if (!dev) { @@ -877,8 +876,7 @@ stu300_probe(struct platform_device *pdev) } bus_nr = pdev->id; - clk_name[3] += (char)bus_nr; - dev->clk = devm_clk_get(&pdev->dev, clk_name); + dev->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(dev->clk)) { dev_err(&pdev->dev, "could not retrieve i2c bus clock\n"); return PTR_ERR(dev->clk);