diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:12:28 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-04-28 20:21:56 -0400 |
commit | d12d42f744f805a9ccc33cd76f04b237cd83ce56 (patch) | |
tree | 436af40f51ce54f4b972bcffd0af5f717f05b7ce /drivers/of | |
parent | d706c1b050274b3bf97d7cb0542c0d070c9ccb8b (diff) |
i2c/of: Allow device node to be passed via i2c_board_info
The struct device_node *of_node pointer is moving out of dev->archdata
and into the struct device proper. of_i2c.c needs to set the of_node
pointer before the device is registered. Since the i2c subsystem
doesn't allow 2 stage allocation and registration of i2c devices, the
of_node pointer needs to be passed via the i2c_board_info structure
so that it is set prior to registration.
This patch adds of_node to struct i2c_board_info (conditional on
CONFIG_OF), sets of_node in i2c_new_device(), and modifies of_i2c.c
to use the new parameter. The calling of dev_archdata_set_node()
from of_i2c will be removed in a subsequent patch when of_node is
removed from archdata and all users are converted over.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/of_i2c.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index a3a708e590d0..e690a2aa6fef 100644 --- a/drivers/of/of_i2c.c +++ b/drivers/of/of_i2c.c | |||
@@ -43,6 +43,7 @@ void of_register_i2c_devices(struct i2c_adapter *adap, | |||
43 | info.addr = be32_to_cpup(addr); | 43 | info.addr = be32_to_cpup(addr); |
44 | 44 | ||
45 | dev_archdata_set_node(&dev_ad, node); | 45 | dev_archdata_set_node(&dev_ad, node); |
46 | info.of_node = node; | ||
46 | info.archdata = &dev_ad; | 47 | info.archdata = &dev_ad; |
47 | 48 | ||
48 | request_module("%s", info.type); | 49 | request_module("%s", info.type); |