From patchwork Thu May 23 17:31:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17171 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E79672395B for ; Thu, 23 May 2013 17:33:33 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id m1sf4816664ves.7 for ; Thu, 23 May 2013 10:32:38 -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=1vgqeXxN4nBzJhOjhJd2dTyJHoSfJW1rkxkNeBck3AA=; b=AIh4qaJ5PDIOljTpfRX2ar38Chagjcvneff9vl9WmrPz1MbZPA4d4dBV4syHCQ2yjm Fl5i6LePxBnLyCRSiYzjy1+NEyV8zcnkdKD4+mclx2lORsUAv3HAsQxHxeSLNBRkuSG/ KvlNHadus6npJ7TJAm9ncYRJM2SKt5a0I8hRwd9uWD8nhU6N3PDQWSWXVmQOv2aM9jGj 75BMRY0vQzdsPYKj1Ifn6qiHZ3XCsVPqa7r91pDrVTGXwM7AbIG7Bwdq/1KiFfWOan5r yeIvke8mJnXwzOcT4DSIidK8f84y+kympsyKA6Yu1CE8YSRCSIYk6cUSb+FBnlH4XXQI pfhQ== X-Received: by 10.236.112.226 with SMTP id y62mr6559546yhg.14.1369330358413; Thu, 23 May 2013 10:32:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.129.198 with SMTP id ny6ls1565013qeb.75.gmail; Thu, 23 May 2013 10:32:38 -0700 (PDT) X-Received: by 10.221.9.9 with SMTP id ou9mr6018696vcb.15.1369330358193; Thu, 23 May 2013 10:32:38 -0700 (PDT) Received: from mail-vb0-x233.google.com (mail-vb0-x233.google.com [2607:f8b0:400c:c02::233]) by mx.google.com with ESMTPS id tn5si6962042vdc.0.2013.05.23.10.32.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 May 2013 10:32:38 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::233 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:c02::233; Received: by mail-vb0-f51.google.com with SMTP id x16so2356780vbf.38 for ; Thu, 23 May 2013 10:32:38 -0700 (PDT) X-Received: by 10.52.34.114 with SMTP id y18mr5120626vdi.56.1369330358015; Thu, 23 May 2013 10:32:38 -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.126.138 with SMTP id c10csp62541vcs; Thu, 23 May 2013 10:32:37 -0700 (PDT) X-Received: by 10.14.216.201 with SMTP id g49mr33657841eep.42.1369330338241; Thu, 23 May 2013 10:32:18 -0700 (PDT) Received: from eu1sys200aog124.obsmtp.com (eu1sys200aog124.obsmtp.com [207.126.144.157]) by mx.google.com with SMTP id c5si17206261eep.135.2013.05.23.10.31.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 May 2013 10:32:18 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.157 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.157; Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob124.postini.com ([207.126.147.11]) with SMTP ID DSNKUZ5Sgnl8WAs9NtKY99CIh8MhHxJLLt5g@postini.com; Thu, 23 May 2013 17:32:17 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 7CA6AE3; Thu, 23 May 2013 17:31:42 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 32B1D5CD; Thu, 23 May 2013 17:31:42 +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 relay1.stm.gmessaging.net (Postfix) with ESMTPS id 6139E24C2C0; Thu, 23 May 2013 19:31:32 +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; Thu, 23 May 2013 19:31:41 +0200 From: Linus Walleij To: , Rob Herring , Mike Turquette Cc: , Arnd Bergmann , Linus Walleij , Wolfram Sang Subject: [PATCH 4/6] i2c: stu300: do not request a specific clock name Date: Thu, 23 May 2013 19:31:26 +0200 Message-ID: <1369330288-14856-5-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369330288-14856-1-git-send-email-linus.walleij@stericsson.com> References: <1369330288-14856-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQk41/OZVJKi/FRXOQdyTYkHhEai6KLcytToQ25cUckLVALGQ32huBVWrMVsILvBFm9wnqLt X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::233 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. Cc: Wolfram Sang Signed-off-by: Linus Walleij --- Hi Wolfram: seeking an ACK for this to take it through the ARM SoC tree with the rest of my device tree clock patches for U300. --- 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);