From patchwork Mon Jan 14 18:53:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 1973321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D96D93FE33 for ; Mon, 14 Jan 2013 18:57:53 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TupAb-0006WJ-7s; Mon, 14 Jan 2013 18:54:05 +0000 Received: from mail-vc0-f201.google.com ([209.85.220.201]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TupA5-0006Lz-OC for linux-arm-kernel@lists.infradead.org; Mon, 14 Jan 2013 18:53:35 +0000 Received: by mail-vc0-f201.google.com with SMTP id p1so521885vcq.2 for ; Mon, 14 Jan 2013 10:53:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=s+YSX8m62K9LT1Knm7uUItg5diwJ4AdzysoBJ3TMtYg=; b=lA1ClrSbvH160/f1lh3LyQyPWRQ8ugjCdRFbBvXos7IxGLPJF4BoTiaaQ5LLujx0OW aCbAZggc0xIisykKgjM20SWcSr1537IVM9XU0lbdGhBOhwTJbdk33PFLuT1GABJK5tjg 93cvEoCVsikzy/qVRFoJwXoVnlTGjiZKDKbtqY2BgjsOVyPI6B2nY1QVEA3P4+ZUAvmq toZz1ygTOAuAhJDfyz315NdYzktM0SecyH/0uOIrqxyoaYAL69qaHwUYrGLNbkxb0xmj KHkG2TaKO2VSSmnMrs6Cuz2Eh848A80rw38qgfetSWougf2OzeLPb+iWJ5fwo0VsQby3 SULQ== X-Received: by 10.101.82.5 with SMTP id j5mr7976144anl.8.1358189611208; Mon, 14 Jan 2013 10:53:31 -0800 (PST) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id p19si752581yhi.1.2013.01.14.10.53.31 (version=TLSv1 cipher=AES128-SHA bits=128/128); Mon, 14 Jan 2013 10:53:31 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id DAC15100048; Mon, 14 Jan 2013 10:53:30 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 8822081039; Mon, 14 Jan 2013 10:53:30 -0800 (PST) From: Doug Anderson To: linux-i2c@vger.kernel.org, Mark Brown Subject: [PATCH v2 2/2] i2c: pxa: Use i2c-core to get bus number now Date: Mon, 14 Jan 2013 10:53:22 -0800 Message-Id: <1358189602-24180-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1358189602-24180-1-git-send-email-dianders@chromium.org> References: <1357927027-4857-2-git-send-email-dianders@chromium.org> <1358189602-24180-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQkjji5PkBBBV1k+YsbfDPNWwAbRR/xZZWLjqk+OU43cRO3pGf6S9T2OJ12/Hi9KbD3QzzcfqAy8OKx9nNYxGEPfpqv7HkiwDvo3rzRlFoz4eSmBJXeDFsT3bsk3KSb/S3s2kPP571TMgTIY1X9MSEa+U3TuDeqku2Ge5f7r5RS+ZCKqK+XXE9p/11YxPOoQcqo5WPheDhDjKghMqDeCBhpqRYDuwA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130114_135334_014729_6C856756 X-CRM114-Status: GOOD ( 16.24 ) X-Spam-Score: -0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.201 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.7 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: Kukjin Kim , linux-kernel@vger.kernel.org, Arnd Bergmann , Padmavathi Venna , Haojian Zhuang , Wolfram Sang , Haojian Zhuang , Doug Anderson , linux-samsung-soc@vger.kernel.org, Thomas Abraham , Karol Lewandowski , Ben Dooks , Olof Johansson , Sylwester Nawrocki , Andrew Morton , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The commit: "i2c-core: dt: Pick i2c bus number from i2c alias if present" adds support for automatically picking the bus number based on the alias ID. Remove the now unnecessary code from i2c-pxa that did the same thing. Signed-off-by: Doug Anderson --- Changes in v2: - No longer tweak pdev->id as per Sylwester Nawrocki. - No longer add the dev ID to the adap.name. Other drivers don't include the device ID here and it doesn't make sense with dynamically (or automatically) allocated IDs. - Use dev_name(&dev->dev) to register for the IRQ; this matches what the i2c-s3c2410.c does and handles dynamically allocated IDs. - This change was only compile-tested (corgi_defconfig), since I don't have access to a board that uses this driver. drivers/i2c/busses/i2c-pxa.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 1034d93..705cc9f 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1053,16 +1053,13 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, struct device_node *np = pdev->dev.of_node; const struct of_device_id *of_id = of_match_device(i2c_pxa_dt_ids, &pdev->dev); - int ret; if (!of_id) return 1; - ret = of_alias_get_id(np, "i2c"); - if (ret < 0) { - dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret); - return ret; - } - pdev->id = ret; + + /* For device tree we always use the dynamic or alias-assigned ID */ + i2c->adap.nr = -1; + if (of_get_property(np, "mrvl,i2c-polling", NULL)) i2c->use_pio = 1; if (of_get_property(np, "mrvl,i2c-fast-mode", NULL)) @@ -1100,6 +1097,9 @@ static int i2c_pxa_probe(struct platform_device *dev) goto emalloc; } + /* Default adapter num to device id; i2c_pxa_probe_dt can override. */ + i2c->adap.nr = dev->id; + ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type); if (ret > 0) ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); @@ -1124,9 +1124,7 @@ static int i2c_pxa_probe(struct platform_device *dev) spin_lock_init(&i2c->lock); init_waitqueue_head(&i2c->wait); - i2c->adap.nr = dev->id; - snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u", - i2c->adap.nr); + strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name)); i2c->clk = clk_get(&dev->dev, NULL); if (IS_ERR(i2c->clk)) { @@ -1169,7 +1167,7 @@ static int i2c_pxa_probe(struct platform_device *dev) } else { i2c->adap.algo = &i2c_pxa_algorithm; ret = request_irq(irq, i2c_pxa_handler, IRQF_SHARED, - i2c->adap.name, i2c); + dev_name(&dev->dev), i2c); if (ret) goto ereqirq; }