From patchwork Tue Oct 28 20:36:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pantelis Antoniou X-Patchwork-Id: 5179701 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B0A5E9F349 for ; Tue, 28 Oct 2014 20:38:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C83E32017A for ; Tue, 28 Oct 2014 20:38:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C06E52016C for ; Tue, 28 Oct 2014 20:38:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754939AbaJ1Ugm (ORCPT ); Tue, 28 Oct 2014 16:36:42 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:53290 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753228AbaJ1Ugj (ORCPT ); Tue, 28 Oct 2014 16:36:39 -0400 Received: by mail-wg0-f42.google.com with SMTP id k14so418234wgh.15 for ; Tue, 28 Oct 2014 13:36:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YnCpo5ziz1UFIbA1TzvDNHlwT2i1INYJRwcS5c8KhUI=; b=DgO6nePCOf4lLmb1C6WdfOE7qAw/0qQVvpQ1tgXblk3+L3TRYovMJfU0WRqAKXv6Ul egkl3fizEV703LPEkQAycSGFCbTEgjbmhX9n950bMMfpuiHa5+abVEc4aB4Kt0/6ooT4 oYcouWMHUGzLiyr0jR4e7MiHq1a860OUurIaiBLTbRD1dmJJmx93PRvghWgiLUtXp2he F9UHJ+OQvQv5C+2L8vtw+AGV65/VCJuqz3YOC6Hr0FECQKWScxLvr2SZE5NA43Pz51J0 yN+YYZr2lK9Q5iE2M6Xu9lFVJncuB7WTCaD7ZtEZKo7O/i2ob17FMxYDhzHVby2+SG1E I5yg== X-Gm-Message-State: ALoCoQkY8b+KmSee8jPfN9Gr3rvizac9cM0qhRhzwNpCgqPhi1vAw+iXFUbOUYmI0ZljPzCj2554 X-Received: by 10.180.75.116 with SMTP id b20mr30453096wiw.49.1414528598303; Tue, 28 Oct 2014 13:36:38 -0700 (PDT) Received: from sles11esa.localdomain ([195.97.110.117]) by mx.google.com with ESMTPSA id td9sm3371380wic.15.2014.10.28.13.36.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 28 Oct 2014 13:36:37 -0700 (PDT) From: Pantelis Antoniou To: Grant Likely Cc: Rob Herring , Stephen Warren , Matt Porter , Koen Kooi , Greg Kroah-Hartman , Alison Chaiken , Dinh Nguyen , Jan Lubbe , Alexander Sverdlin , Michael Stickel , Guenter Roeck , Dirk Behme , Alan Tull , Sascha Hauer , Michael Bohan , Ionut Nicu , Michal Simek , Matt Ranostay , Joel Becker , devicetree@vger.kernel.org, Wolfram Sang , linux-i2c@vger.kernel.org, Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Pete Popov , Dan Malek , Georgi Vlaev , Pantelis Antoniou , Pantelis Antoniou Subject: [PATCH v8 5/8] of: i2c: Export single device registration method Date: Tue, 28 Oct 2014 22:36:02 +0200 Message-Id: <1414528565-10907-6-git-send-email-pantelis.antoniou@konsulko.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1414528565-10907-1-git-send-email-pantelis.antoniou@konsulko.com> References: <1414528565-10907-1-git-send-email-pantelis.antoniou@konsulko.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Dynamically inserting i2c client device nodes requires the use of a single device registration method. Rework and export it. Signed-off-by: Pantelis Antoniou Acked-by: Grant Likely Reviewed-by: Wolfram Sang --- drivers/i2c/i2c-core.c | 99 +++++++++++++++++++++++++++----------------------- include/linux/i2c.h | 10 +++++ 2 files changed, 64 insertions(+), 45 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 2f90ac6..e6da9d3 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -54,6 +54,7 @@ #include #include #include +#include #include "i2c-core.h" @@ -1370,63 +1371,71 @@ static void i2c_scan_static_board_info(struct i2c_adapter *adapter) /* OF support code */ #if IS_ENABLED(CONFIG_OF) -static void of_i2c_register_devices(struct i2c_adapter *adap) +struct i2c_client * +of_i2c_register_device(struct i2c_adapter *adap, + struct device_node *node) { - void *result; - struct device_node *node; + struct i2c_client *result; + struct i2c_board_info info = {}; + struct dev_archdata dev_ad = {}; + const __be32 *addr; + int len; - /* Only register child devices if the adapter has a node pointer set */ - if (!adap->dev.of_node) - return; + dev_dbg(&adap->dev, "of_i2c: register %s\n", node->full_name); - dev_dbg(&adap->dev, "of_i2c: walking child nodes\n"); + if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) { + dev_err(&adap->dev, "of_i2c: modalias failure on %s\n", + node->full_name); + return ERR_PTR(-EINVAL); + } - for_each_available_child_of_node(adap->dev.of_node, node) { - struct i2c_board_info info = {}; - struct dev_archdata dev_ad = {}; - const __be32 *addr; - int len; + addr = of_get_property(node, "reg", &len); + if (!addr || (len < sizeof(int))) { + dev_err(&adap->dev, "of_i2c: invalid reg on %s\n", + node->full_name); + return ERR_PTR(-EINVAL); + } - dev_dbg(&adap->dev, "of_i2c: register %s\n", node->full_name); + info.addr = be32_to_cpup(addr); + if (info.addr > (1 << 10) - 1) { + dev_err(&adap->dev, "of_i2c: invalid addr=%x on %s\n", + info.addr, node->full_name); + return ERR_PTR(-EINVAL); + } - if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) { - dev_err(&adap->dev, "of_i2c: modalias failure on %s\n", - node->full_name); - continue; - } + info.irq = irq_of_parse_and_map(node, 0); + info.of_node = of_node_get(node); + info.archdata = &dev_ad; - addr = of_get_property(node, "reg", &len); - if (!addr || (len < sizeof(int))) { - dev_err(&adap->dev, "of_i2c: invalid reg on %s\n", - node->full_name); - continue; - } + if (of_get_property(node, "wakeup-source", NULL)) + info.flags |= I2C_CLIENT_WAKE; - info.addr = be32_to_cpup(addr); - if (info.addr > (1 << 10) - 1) { - dev_err(&adap->dev, "of_i2c: invalid addr=%x on %s\n", - info.addr, node->full_name); - continue; - } + request_module("%s%s", I2C_MODULE_PREFIX, info.type); - info.irq = irq_of_parse_and_map(node, 0); - info.of_node = of_node_get(node); - info.archdata = &dev_ad; + result = i2c_new_device(adap, &info); + if (result == NULL) { + dev_err(&adap->dev, "of_i2c: Failure registering %s\n", + node->full_name); + of_node_put(node); + irq_dispose_mapping(info.irq); + return ERR_PTR(-EINVAL); + } + return result; +} +EXPORT_SYMBOL(of_i2c_register_device); - if (of_get_property(node, "wakeup-source", NULL)) - info.flags |= I2C_CLIENT_WAKE; +static void of_i2c_register_devices(struct i2c_adapter *adap) +{ + struct device_node *node; - request_module("%s%s", I2C_MODULE_PREFIX, info.type); + /* Only register child devices if the adapter has a node pointer set */ + if (!adap->dev.of_node) + return; - result = i2c_new_device(adap, &info); - if (result == NULL) { - dev_err(&adap->dev, "of_i2c: Failure registering %s\n", - node->full_name); - of_node_put(node); - irq_dispose_mapping(info.irq); - continue; - } - } + dev_dbg(&adap->dev, "of_i2c: walking child nodes\n"); + + for_each_available_child_of_node(adap->dev.of_node, node) + of_i2c_register_device(adap, node); } static int of_dev_node_match(struct device *dev, void *data) diff --git a/include/linux/i2c.h b/include/linux/i2c.h index b556e0a..22a8f44 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -558,6 +558,9 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap) #endif /* I2C */ #if IS_ENABLED(CONFIG_OF) +struct i2c_client * +of_i2c_register_device(struct i2c_adapter *adap, struct device_node *node); + /* must call put_device() when done with returned i2c_client device */ extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node); @@ -566,6 +569,13 @@ extern struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) #else +static inline struct i2c_client * +of_i2c_register_device(struct i2c_adapter *adap, + struct device_node *node) +{ + return ERR_PTR(-ENODEV); +} + static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) { return NULL;