Commit 4939e27d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull another devicetree update from Grant Likely:
 "Here's a couple more devicetree changes that I missed in the first
  pull by putting the tag in the wrong place.

  Two minor devicetree fixups for v3.8.  Addition of dummy inlines and
  constification of node argument to of_parse_phandle_with_args()."

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  of: *node argument to of_parse_phandle_with_args should be const
  of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined
parents c2714334 93c667ca
...@@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(of_parse_phandle); ...@@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(of_parse_phandle);
* To get a device_node of the `node2' node you may call this: * To get a device_node of the `node2' node you may call this:
* of_parse_phandle_with_args(node3, "list", "#list-cells", 1, &args); * of_parse_phandle_with_args(node3, "list", "#list-cells", 1, &args);
*/ */
int of_parse_phandle_with_args(struct device_node *np, const char *list_name, int of_parse_phandle_with_args(const struct device_node *np, const char *list_name,
const char *cells_name, int index, const char *cells_name, int index,
struct of_phandle_args *out_args) struct of_phandle_args *out_args)
{ {
......
...@@ -273,7 +273,7 @@ extern int of_modalias_node(struct device_node *node, char *modalias, int len); ...@@ -273,7 +273,7 @@ extern int of_modalias_node(struct device_node *node, char *modalias, int len);
extern struct device_node *of_parse_phandle(const struct device_node *np, extern struct device_node *of_parse_phandle(const struct device_node *np,
const char *phandle_name, const char *phandle_name,
int index); int index);
extern int of_parse_phandle_with_args(struct device_node *np, extern int of_parse_phandle_with_args(const struct device_node *np,
const char *list_name, const char *cells_name, int index, const char *list_name, const char *cells_name, int index,
struct of_phandle_args *out_args); struct of_phandle_args *out_args);
......
...@@ -29,6 +29,18 @@ static inline void of_i2c_register_devices(struct i2c_adapter *adap) ...@@ -29,6 +29,18 @@ static inline void of_i2c_register_devices(struct i2c_adapter *adap)
{ {
return; return;
} }
static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
{
return NULL;
}
/* must call put_device() when done with returned i2c_adapter device */
static inline struct i2c_adapter *of_find_i2c_adapter_by_node(
struct device_node *node)
{
return NULL;
}
#endif /* CONFIG_OF_I2C */ #endif /* CONFIG_OF_I2C */
#endif /* __LINUX_OF_I2C_H */ #endif /* __LINUX_OF_I2C_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment