From patchwork Tue Feb 12 00:48:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 219712 X-Patchwork-Delegate: wolfram@the-dreams.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F35A32C02F8 for ; Tue, 12 Feb 2013 11:54:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932868Ab3BLAyB (ORCPT ); Mon, 11 Feb 2013 19:54:01 -0500 Received: from mail-vc0-f201.google.com ([209.85.220.201]:33909 "EHLO mail-vc0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932674Ab3BLAyA (ORCPT ); Mon, 11 Feb 2013 19:54:00 -0500 X-Greylist: delayed 348 seconds by postgrey-1.27 at vger.kernel.org; Mon, 11 Feb 2013 19:54:00 EST Received: by mail-vc0-f201.google.com with SMTP id n11so665083vch.0 for ; Mon, 11 Feb 2013 16:54:00 -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=QX2dot/6Cy/53hLLjbGuVgWwaTZr28cUM3po5HFt2wI=; b=QtWk4shW34TWzPdmRCOVewqi+B3mdjwqC8CsyTdkstoJHm/zj7Vdvt84dvz4JzJ92L OzeHoCb7sE+NJhyYouOkjNB9nigLKWlciaTEug50V2tNTxDLUoCLTk36C41Ky8mZgPn0 xuq7NSc9OCYIvmOqzEDzSxVU056K7n9XSFHx0zmFhXYBEG2nfjo/vOeNICmgDrih8OXq 3sHFKuqcVkD1d/M56ojStFCVpPQLkF+prby74WA0nezgX81MjrQDLwv/ocz7OTrtk9wC IxAkJ+NESnnjUIIrn2V7zNptqiA9kMXwGN9A0vysQNbR/uXpzIs2F9zBL6uQ5UHj0JfD 77wA== X-Received: by 10.236.111.83 with SMTP id v59mr654264yhg.14.1360630097415; Mon, 11 Feb 2013 16:48:17 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id y44si970723yhl.5.2013.02.11.16.48.17 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 11 Feb 2013 16:48:17 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 36D6431C00F; Mon, 11 Feb 2013 16:48:17 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id E423280563; Mon, 11 Feb 2013 16:48:16 -0800 (PST) From: Doug Anderson To: linux-i2c@vger.kernel.org, Wolfram Sang Cc: Mark Brown , Kukjin Kim , Olof Johansson , Thomas Abraham , Padmavathi Venna , Ben Dooks , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Haojian Zhuang , Arnd Bergmann , Sylwester Nawrocki , Doug Anderson , Andrew Morton , Karol Lewandowski , Haojian Zhuang , linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] i2c: pxa: Use i2c-core to get bus number now Date: Mon, 11 Feb 2013 16:48:05 -0800 Message-Id: <1360630085-26874-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1360630085-26874-1-git-send-email-dianders@chromium.org> References: <1360630085-26874-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQn4srIBlRp1HBecNYqBS9sNzpRvPRRs/uXn9iPTexwCXSsdn24rHTNj6mRmf595Ilu1lOctxHt4NTYWm5gbtZR7w7IE5wrz+Buo9P4lgWoptdsMvjTQOtlmOy+9vnUHZ5LpyqxE7Gwp4awdIsi3MjymvPzbcQk13eyHSQXX82I1W83uIdsfpjstaq7pvFWFMrSjPmYRhito1Bec4tob4rv564qcrw== Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.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 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 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; }