Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit d12d42f744f805a9ccc33cd76f04b237cd83ce56

Authored by Grant Likely
1 parent d706c1b050
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 3 changed files with 8 additions and 0 deletions Side-by-side Diff

drivers/i2c/i2c-core.c
Diff comments   View file @ d12d42f
... ... @@ -387,6 +387,9 @@
387 387 client->dev.parent = &client->adapter->dev;
388 388 client->dev.bus = &i2c_bus_type;
389 389 client->dev.type = &i2c_client_type;
  390 +#ifdef CONFIG_OF
  391 + client->dev.of_node = info->of_node;
  392 +#endif
390 393  
391 394 dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
392 395 client->addr);
... ... @@ -43,6 +43,7 @@
43 43 info.addr = be32_to_cpup(addr);
44 44  
45 45 dev_archdata_set_node(&dev_ad, node);
  46 + info.of_node = node;
46 47 info.archdata = &dev_ad;
47 48  
48 49 request_module("%s", info.type);
... ... @@ -34,6 +34,7 @@
34 34 #include <linux/device.h> /* for struct device */
35 35 #include <linux/sched.h> /* for completion */
36 36 #include <linux/mutex.h>
  37 +#include <linux/of.h> /* for struct device_node */
37 38  
38 39 extern struct bus_type i2c_bus_type;
39 40  
... ... @@ -251,6 +252,9 @@
251 252 unsigned short addr;
252 253 void *platform_data;
253 254 struct dev_archdata *archdata;
  255 +#ifdef CONFIG_OF
  256 + struct device_node *of_node;
  257 +#endif
254 258 int irq;
255 259 };
256 260