Merge tag 'tegra-for-4.8-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into i2c/for-next

[wsa: fell through the cracks, applied to 4.9 now]

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

i2c: 'i2c-bus' node support for v4.8-rc1

This includes the device tree binding and I2C core changes to support
the i2c-bus subnode that I2C masters can use to describe their slaves
in a separate namespace and therefore avoid clashing with potentially
other subnodes.

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 98fffa3a09f7..5ab67219f71e 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1680,7 +1680,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)
@@ -1688,11 +1688,17 @@ 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 = of_node_get(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);
         }
+
+        of_node_put(bus);
 }
 
 static int of_dev_node_match(struct device *dev, void *data)