From patchwork Tue Feb 12 00:48:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2126741 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 B2FC23FCA4 for ; Tue, 12 Feb 2013 00:51:24 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U542s-0002Bs-4P; Tue, 12 Feb 2013 00:48:26 +0000 Received: from mail-gh0-f202.google.com ([209.85.160.202]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U542i-0002Aq-VD for linux-arm-kernel@lists.infradead.org; Tue, 12 Feb 2013 00:48:18 +0000 Received: by mail-gh0-f202.google.com with SMTP id z10so663477ghb.5 for ; Mon, 11 Feb 2013 16:48:16 -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=cnluqTHdpJmRrrBnymyAXGYw5o55BbhN2fG5bP8zjfc=; b=EMa3ndQ+L2mEA8PV4n7liuTJX71edZYMZAoXef+Y9YR7ZcQedmI673ak6RGZXD58/r BQ/OgMYOQSXMXzukKcALm4xNmut08B6m8LywPIdF3LcyZu5aJCC6+UcBaKDpNDeOgKur tfNa6D38Hp2tv73zzAtAbAMHOmS9fSpP1yyMZywmqxGHgZ2g/sXBRYsilfWudqubwNTA yqyZ3V+MSxejK+nj5zilOmEwhlZZV11VM1Eo67o+DGYibErEHJNljTf3pCP5J/QC8G2d 34baIyuAa4DQzBVpq1rrdWCiBzshFw/xB97M9bVrwT4opbZhAXE3jTF+MyfFNuBCbL4V 26sw== X-Received: by 10.236.59.8 with SMTP id r8mr7432588yhc.8.1360630095786; Mon, 11 Feb 2013 16:48:15 -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 f47si1342546yhg.4.2013.02.11.16.48.15 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 11 Feb 2013 16:48:15 -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 6F0225A40A5; Mon, 11 Feb 2013 16:48:15 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 30EA480563; Mon, 11 Feb 2013 16:48:15 -0800 (PST) From: Doug Anderson To: linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH v3 1/2] i2c-core: dt: Pick i2c bus number from i2c alias if present Date: Mon, 11 Feb 2013 16:48:04 -0800 Message-Id: <1360630085-26874-2-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: ALoCoQkpD1qXRqRnBf8uGWcNoYSmRO/UCuPd/cfv/2PdKCrNlXawaPtxWLrgW0in6+uFo213IJrGJFsbNmcLef/cAnGvdWspXlVxIBjTwiksiry0KSAu4uJyNFsw9PBEuBuASCBFVTheP5gzutg+9NkKDDL11NVTf3hFu2x6JbsJRr3Hw3xVm7EvzuDipSttM463IZGqxmh6dfnLXrZbUhANEiFuD6ZfKw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130211_194817_092975_C131451F X-CRM114-Status: GOOD ( 17.17 ) 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.160.202 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 , Arnd Bergmann , Padmavathi Venna , Mark Brown , Doug Anderson , Haojian Zhuang , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Thomas Abraham , Ben Dooks , Olof Johansson , Sylwester Nawrocki , 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 This allows you to get the equivalent functionality of i2c_add_numbered_adapter() with all data in the device tree and no special case code in your driver. This is a common device tree technique. For quick reference, the FDT syntax for using an alias to provide an ID looks like: aliases { i2c0 = &i2c_0; i2c1 = &i2c_1; }; Signed-off-by: Doug Anderson --- Changes in v3: - Addressed Wolfram's feedback; rebased atop idr-cleanup series. Changes in v2: None drivers/i2c/i2c-core.c | 54 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 0b599f2..5204818 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -921,13 +921,41 @@ out_list: } /** + * __i2c_add_numbered_adapter - i2c_add_numbered_adapter where nr is never -1 + * @adap: the adapter to register (with adap->nr initialized) + * Context: can sleep + * + * See i2c_add_numbered_adapter() for details. + */ +static int __i2c_add_numbered_adapter(struct i2c_adapter *adap) +{ + int id; + + /* Handled by wrappers */ + if (WARN_ON(adap->nr == -1)) + return -EINVAL; + + if (adap->nr & ~MAX_IDR_MASK) + return -EINVAL; + + mutex_lock(&core_lock); + id = idr_alloc(&i2c_adapter_idr, adap, adap->nr, adap->nr + 1, + GFP_KERNEL); + mutex_unlock(&core_lock); + if (id < 0) + return id == -ENOSPC ? -EBUSY : id; + return i2c_register_adapter(adap); +} + +/** * i2c_add_adapter - declare i2c adapter, use dynamic bus number * @adapter: the adapter to add * Context: can sleep * * This routine is used to declare an I2C adapter when its bus number - * doesn't matter. Examples: for I2C adapters dynamically added by - * USB links or PCI plugin cards. + * doesn't matter or when its bus number is specified by an dt alias. + * Examples of bases when the bus number doesn't matter: I2C adapters + * dynamically added by USB links or PCI plugin cards. * * When this returns zero, a new bus number was allocated and stored * in adap->nr, and the specified adapter became available for clients. @@ -935,8 +963,17 @@ out_list: */ int i2c_add_adapter(struct i2c_adapter *adapter) { + struct device *dev = &adapter->dev; int res; + if (dev->of_node) { + res = of_alias_get_id(dev->of_node, "i2c"); + if (res >= 0) { + adapter->nr = res; + return __i2c_add_numbered_adapter(adapter); + } + } + mutex_lock(&core_lock); res = idr_alloc(&i2c_adapter_idr, adapter, __i2c_first_dynamic_bus_num, 0, GFP_KERNEL); @@ -974,20 +1011,9 @@ EXPORT_SYMBOL(i2c_add_adapter); */ int i2c_add_numbered_adapter(struct i2c_adapter *adap) { - int id; - if (adap->nr == -1) /* -1 means dynamically assign bus id */ return i2c_add_adapter(adap); - if (adap->nr & ~MAX_IDR_MASK) - return -EINVAL; - - mutex_lock(&core_lock); - id = idr_alloc(&i2c_adapter_idr, adap, adap->nr, adap->nr + 1, - GFP_KERNEL); - mutex_unlock(&core_lock); - if (id < 0) - return id == -ENOSPC ? -EBUSY : id; - return i2c_register_adapter(adap); + return __i2c_add_numbered_adapter(adap); } EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);