diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:13:00 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:13:00 +0100 |
commit | a7dbb27336aed71feed4832421d5e314bf4acc90 (patch) | |
tree | 30be4e33921e9674ec00b6cab6ff312749a6d58f /drivers/i2c | |
parent | 99f4aafa139ea9f6e0eebecbddb3c9a216853e81 (diff) | |
parent | a49a52dab6f99dec1557c530dacb392cb945bc12 (diff) | |
download | barebox-a7dbb27336aed71feed4832421d5e314bf4acc90.tar.gz |
Merge branch 'for-next/of-overlay' into next
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/i2c.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c index efcad29342..4c7b7008ce 100644 --- a/drivers/i2c/i2c.c +++ b/drivers/i2c/i2c.c @@ -420,6 +420,10 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) { struct device_node *n; + /* Only register child devices if the adapter has a node pointer set */ + if (!IS_ENABLED(CONFIG_OFDEVICE) || !adap->dev.of_node) + return; + for_each_available_child_of_node(adap->dev.of_node, n) { struct i2c_board_info info = {}; struct i2c_client *result; @@ -471,15 +475,7 @@ int of_i2c_register_devices_by_node(struct device_node *node) return 0; } -static int i2c_bus_detect(struct device *dev) -{ - struct i2c_adapter *adap = container_of(dev, struct i2c_adapter, dev); - - of_i2c_register_devices(adap); - return 0; -} - -static int i2c_hw_detect(struct device *dev) +static void i2c_hw_rescan(struct device *dev) { struct i2c_adapter *adap; @@ -489,8 +485,6 @@ static int i2c_hw_detect(struct device *dev) of_i2c_register_devices(adap); break; } - - return 0; } /** @@ -720,7 +714,6 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adapter) } adapter->dev.id = adapter->nr; - adapter->dev.detect = i2c_bus_detect; dev_set_name(&adapter->dev, "i2c"); ret = register_device(&adapter->dev); @@ -732,11 +725,12 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adapter) /* populate children from any i2c device tables */ scan_boardinfo(adapter); + of_i2c_register_devices(adapter); + hw_dev = adapter->dev.parent; if (hw_dev && dev_of_node(hw_dev)) { - if (!hw_dev->detect) - hw_dev->detect = i2c_hw_detect; - i2c_hw_detect(hw_dev); + if (!hw_dev->rescan) + hw_dev->rescan = i2c_hw_rescan; } return 0; |