diff options
| author | Jon Hunter <jonathanh@nvidia.com> | 2016-06-29 10:17:53 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2016-06-30 11:02:17 +0200 |
| commit | 7e4c224abfe8e2a00f56a2ef0198e6de3ca1852c (patch) | |
| tree | 71c09d9f026728b214dcded5b25db41747b9500a /drivers/i2c | |
| parent | 98b00488459e9d27d8e42b6d241f309f26ffde07 (diff) | |
| download | linux-7e4c224abfe8e2a00f56a2ef0198e6de3ca1852c.tar.gz | |
i2c: core: Add support for 'i2c-bus' subnode
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> Acked-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index af11b658984d..ed7002dd9401 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1411,7 +1411,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) @@ -1419,11 +1419,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) |