summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-14 15:37:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-14 15:37:46 -0800
commit4939e27d46fee2609f2112f85f7f7cbd952075dc (patch)
tree0f83542cb7e51d167000ce91f493bd8fdc30bdfa
parentc2714334b944abbeaaadda8cddde619eff0292a1 (diff)
parent93c667ca2598bd84f1bd3f2fa176af69707699fe (diff)
downloadop-kernel-dev-4939e27d46fee2609f2112f85f7f7cbd952075dc.zip
op-kernel-dev-4939e27d46fee2609f2112f85f7f7cbd952075dc.tar.gz
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
-rw-r--r--drivers/of/base.c2
-rw-r--r--include/linux/of.h2
-rw-r--r--include/linux/of_i2c.h12
3 files changed, 14 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 538e3cf..be84640 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(of_parse_phandle);
* To get a device_node of the `node2' node you may call this:
* 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,
struct of_phandle_args *out_args)
{
diff --git a/include/linux/of.h b/include/linux/of.h
index 60053bd..6cfea9a 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -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,
const char *phandle_name,
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,
struct of_phandle_args *out_args);
diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h
index 1cb775f..cfb545c 100644
--- a/include/linux/of_i2c.h
+++ b/include/linux/of_i2c.h
@@ -29,6 +29,18 @@ static inline void of_i2c_register_devices(struct i2c_adapter *adap)
{
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 /* __LINUX_OF_I2C_H */
OpenPOWER on IntegriCloud