]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
of/i2c: Fill the archdata for I2C devices
authorAnton Vorontsov <avorontsov@ru.mvista.com>
Fri, 28 Nov 2008 09:13:45 +0000 (09:13 +0000)
committerPaul Mackerras <paulus@samba.org>
Wed, 3 Dec 2008 10:03:56 +0000 (21:03 +1100)
For I2C devices we just setting the node pointer in the archdata. This
is needed so that the I2C devices could find their OF tree nodes.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/of/of_i2c.c

index 24bbef777c1914cfb7096cec8f198fdbc7512618..e1b0ad6e918f0bec0a843888e4de826d1cccf825 100644 (file)
@@ -24,6 +24,7 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
 
        for_each_child_of_node(adap_node, node) {
                struct i2c_board_info info = {};
+               struct dev_archdata dev_ad = {};
                const u32 *addr;
                int len;
 
@@ -41,6 +42,9 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
 
                info.addr = *addr;
 
+               dev_archdata_set_node(&dev_ad, node);
+               info.archdata = &dev_ad;
+
                request_module("%s", info.type);
 
                result = i2c_new_device(adap, &info);
@@ -51,6 +55,13 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
                        irq_dispose_mapping(info.irq);
                        continue;
                }
+
+               /*
+                * Get the node to not lose the dev_archdata->of_node.
+                * Currently there is no way to put it back, as well as no
+                * of_unregister_i2c_devices() call.
+                */
+               of_node_get(node);
        }
 }
 EXPORT_SYMBOL(of_register_i2c_devices);