From patchwork Fri Mar 1 16:57:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2202381 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 7633740079 for ; Fri, 1 Mar 2013 17:01:14 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UBTHl-0005IB-Fj; Fri, 01 Mar 2013 16:58:17 +0000 Received: from mail-yh0-x24a.google.com ([2607:f8b0:4002:c01::24a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UBTHc-0005Gs-45 for linux-arm-kernel@lists.infradead.org; Fri, 01 Mar 2013 16:58:09 +0000 Received: by mail-yh0-f74.google.com with SMTP id z6so352447yhz.1 for ; Fri, 01 Mar 2013 08:58:05 -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=YmBEZs2/eQGELKe4YUD7XdSj6oai/CQ9djDEJiFs2nY=; b=LvcpTErlqH2zLuwnacBHZBg5FzaQXKqfnbSiQmp9LQ/HrEqMEKEshpl4h2OuY5J1mn KBfNo4pT90msHHv8dRjuUOdV8xIDVMuL0KlxllqaA8BMhPP1X5JdLh8LSpizLUcDcqOk swBgAg379EPskCQQcudsbUG7442eiEURWNeJR9/fYWlrvziBwkv0acjlLjXFGJ0ZELrd pkaGvunfxeEg+9wvl79K/7+4Zg9oF+hzXNogGUbooCzq5C5Atf4uY3xG5eXp2KM1r4gn s6pKFzWSE8T/J4NtXkpU1rFj/Ud/f+xGml1Yk+rjswNlLritfxGVBupztw8v+5BFkISk DvJg== X-Received: by 10.236.68.231 with SMTP id l67mr6428615yhd.29.1362157085682; Fri, 01 Mar 2013 08:58:05 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id f64si814125yhj.7.2013.03.01.08.58.05 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2013 08:58:05 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 68B9A5A4123; Fri, 1 Mar 2013 08:58:05 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 19A19804D3; Fri, 1 Mar 2013 08:58:04 -0800 (PST) From: Doug Anderson To: linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH v4 2/2] i2c: pxa: Use i2c-core to get bus number now Date: Fri, 1 Mar 2013 08:57:32 -0800 Message-Id: <1362157052-16738-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1362157052-16738-1-git-send-email-dianders@chromium.org> References: <1360630085-26874-1-git-send-email-dianders@chromium.org> <1362157052-16738-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQkYQp4sueDjjVHhHeGZIZtVeFp9wk8Kjt3yG+DtShflv4f+KUnP0mCC2IOzWweNnteNXCbCUgOyT0/TrtA0emxmNR9gDMMqFNEi8HpZJyqHMV9zualK3QybqIKYQE4bn70fqP5OxbtIv5GfbYtcHcN505ImzdstILQkNYBATrAvHn81bDwSE6DVE39AVfRKY0iZVKsCEofFi7XGREgDSntazKDC3A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130301_115808_339753_5D1773F2 X-CRM114-Status: GOOD ( 14.93 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 , Arnd Bergmann , Padmavathi Venna , Mark Brown , Doug Anderson , Haojian Zhuang , linux-kernel@vger.kernel.org, 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.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" 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 v4: None Changes in v3: None 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 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 1e88e8d..ea6d45d 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; }