linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Hunter <jonathanh@nvidia.com>
To: Thierry Reding <thierry.reding@gmail.com>,
	David Airlie <airlied@linux.ie>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Alexandre Courbot <gnurou@gmail.com>,
	Wolfram Sang <wsa@the-dreams.de>,
	Linus Walleij <linus.walleij@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org,
	linux-i2c@vger.kernel.org, linux-gpio@vger.kernel.org,
	devicetree@vger.kernel.org, Jon Hunter <jonathanh@nvidia.com>
Subject: [RFC PATCH 08/13] i2c: core: Add support for 'i2c-bus' subnode
Date: Fri, 17 Jun 2016 13:03:42 +0100	[thread overview]
Message-ID: <1466165027-17917-9-git-send-email-jonathanh@nvidia.com> (raw)
In-Reply-To: <1466165027-17917-1-git-send-email-jonathanh@nvidia.com>

If the 'i2c-bus' device-tree node is present for an I2C adapter then
parse this subnode for I2C slaves.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/i2c/i2c-core.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 952d2f0c02c5..f552d97bad32 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1452,7 +1452,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
 
 static void of_i2c_register_devices(struct i2c_adapter *adap)
 {
-	struct device_node *node;
+	struct device_node *bus, *node;
 
 	/* Only register child devices if the adapter has a node pointer set */
 	if (!adap->dev.of_node)
@@ -1460,11 +1460,18 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
 
 	dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");
 
-	for_each_available_child_of_node(adap->dev.of_node, node) {
+	bus = of_get_child_by_name(adap->dev.of_node, "i2c-bus");
+	if (!bus)
+		bus = adap->dev.of_node;
+
+	for_each_available_child_of_node(bus, node) {
 		if (of_node_test_and_set_flag(node, OF_POPULATED))
 			continue;
 		of_i2c_register_device(adap, node);
 	}
+
+	if (bus != adap->dev.of_node)
+		of_node_put(bus);
 }
 
 static int of_dev_node_match(struct device *dev, void *data)
-- 
2.1.4

  parent reply	other threads:[~2016-06-17 12:03 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-17 12:03 [RFC PATCH 00/13] Add support for Tegra DPAUX pinctrl Jon Hunter
2016-06-17 12:03 ` [RFC PATCH 02/13] drm/tegra: Add helper functions for setting up DPAUX pads Jon Hunter
2016-06-17 16:11   ` Thierry Reding
2016-06-20  7:59     ` Jon Hunter
2016-06-17 12:03 ` [RFC PATCH 04/13] drm/tegra: Add sor-safe clock for DPAUX on Tegra210 Jon Hunter
2016-06-17 16:18   ` Thierry Reding
2016-06-20  8:43     ` Jon Hunter
2016-06-20 16:33       ` Thierry Reding
2016-06-17 12:03 ` [RFC PATCH 05/13] drm/tegra: Prepare DPAUX for supporting generic PM domains Jon Hunter
2016-06-17 12:03 ` [RFC PATCH 07/13] dt-bindings: i2c: Add support for 'i2c-bus' subnode Jon Hunter
2016-06-17 16:23   ` Thierry Reding
     [not found]   ` <1466165027-17917-8-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-06-17 16:30     ` Mark Rutland
2016-06-17 16:45       ` Thierry Reding
     [not found]         ` <20160617164525.GL27475-EkSeR96xj6Pcmrwk2tT4+A@public.gmane.org>
2016-06-20 11:15           ` Jon Hunter
2016-06-17 12:03 ` Jon Hunter [this message]
2016-06-17 16:24   ` [RFC PATCH 08/13] i2c: core: " Thierry Reding
2016-06-20  8:57     ` Jon Hunter
2016-06-17 12:03 ` [RFC PATCH 09/13] dt-bindings: drm/tegra: Add DPAUX pinctrl documentation Jon Hunter
2016-06-17 16:31   ` Thierry Reding
2016-06-20  9:10     ` Jon Hunter
2016-06-17 12:03 ` [RFC PATCH 10/13] drm/tegra: Add pinctrl support for DPAUX Jon Hunter
     [not found]   ` <1466165027-17917-11-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-06-17 12:42     ` Jon Hunter
2016-06-17 16:37   ` Thierry Reding
2016-06-20 10:45     ` Jon Hunter
2016-06-17 12:03 ` [RFC PATCH 11/13] arm64: tegra: Add SOR power-domain node Jon Hunter
2016-06-17 16:42   ` Thierry Reding
2016-06-20  9:18     ` Jon Hunter
2016-06-20 16:37       ` Thierry Reding
2016-06-17 16:44   ` Thierry Reding
2016-06-20  9:20     ` Jon Hunter
2016-06-17 12:03 ` [RFC PATCH 12/13] arm64: tegra: Add sor-safe clock to DPAUX binding Jon Hunter
     [not found]   ` <1466165027-17917-13-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-06-17 16:47     ` Thierry Reding
2016-06-20  9:23       ` Jon Hunter
2016-06-20 16:38         ` Thierry Reding
     [not found] ` <1466165027-17917-1-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-06-17 12:03   ` [RFC PATCH 01/13] drm/tegra: Clean-up if probing DPAUX fails Jon Hunter
2016-06-17 12:03   ` [RFC PATCH 03/13] dt-bindings: drm/tegra: Update DPAUX documentation Jon Hunter
2016-06-17 16:13     ` Thierry Reding
     [not found]       ` <20160617161306.GD27475-EkSeR96xj6Pcmrwk2tT4+A@public.gmane.org>
2016-06-20  8:02         ` Jon Hunter
2016-06-17 12:03   ` [RFC PATCH 06/13] pinctrl: pinconf: Add generic helper function for freeing mappings Jon Hunter
     [not found]     ` <1466165027-17917-7-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-06-18  9:04       ` Linus Walleij
2016-06-20  9:26         ` Jon Hunter
2016-06-17 12:03   ` [RFC PATCH 13/13] arm64: tegra: Add DPAUX pinctrl bindings Jon Hunter
2016-06-17 16:50     ` Thierry Reding
2016-06-23  7:46     ` Linus Walleij
2016-06-17 16:56   ` [RFC PATCH 00/13] Add support for Tegra DPAUX pinctrl Thierry Reding
     [not found]     ` <20160617165611.GO27475-EkSeR96xj6Pcmrwk2tT4+A@public.gmane.org>
2016-06-17 16:58       ` Thierry Reding
     [not found]         ` <20160617165842.GP27475-EkSeR96xj6Pcmrwk2tT4+A@public.gmane.org>
2016-06-23  7:49           ` Linus Walleij
2016-06-23  8:04             ` Thierry Reding
     [not found]               ` <20160623080400.GA8136-EkSeR96xj6Pcmrwk2tT4+A@public.gmane.org>
2016-06-23  9:21                 ` Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1466165027-17917-9-git-send-email-jonathanh@nvidia.com \
    --to=jonathanh@nvidia.com \
    --cc=airlied@linux.ie \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gnurou@gmail.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=swarren@wwwdotorg.org \
    --cc=thierry.reding@gmail.com \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).