From 964dba283439a4db50dae61d3afe6e438b7fc30f Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Fri, 24 Feb 2012 14:58:34 -0700 Subject: devicetree: Add empty of_platform_populate() for !CONFIG_OF_ADDRESS (sparc) Sparc has its own helpers for translating address ranges when the device tree is parsed at boot time, and it isn't able to use of_platform_populate(). However, there are some device drivers that want to use that function on other DT enabled platforms (ie. TWL4030). This patch adds an empty of_platform_populate() implementation that returns an error when CONFIG_OF_ADDRESS is not selected. Signed-off-by: Grant Likely Cc: Benoit Cousson Cc: Samuel Ortiz --- include/linux/of_platform.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'include/linux/of_platform.h') diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 040ce2f6e8de..242fa3563e2e 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -81,7 +81,7 @@ extern struct platform_device *of_device_alloc(struct device_node *np, struct device *parent); extern struct platform_device *of_find_device_by_node(struct device_node *np); -#if !defined(CONFIG_SPARC) /* SPARC has its own device registration method */ +#ifdef CONFIG_OF_ADDRESS /* device reg helpers depend on OF_ADDRESS */ /* Platform devices and busses creation */ extern struct platform_device *of_platform_device_create(struct device_node *np, const char *bus_id, @@ -94,7 +94,15 @@ extern int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup, struct device *parent); -#endif /* !CONFIG_SPARC */ +#else +static inline int of_platform_populate(struct device_node *root, + const struct of_device_id *matches, + const struct of_dev_auxdata *lookup, + struct device *parent) +{ + return -ENODEV; +} +#endif /* !CONFIG_OF_ADDRESS */ #endif /* CONFIG_OF_DEVICE */ -- cgit v1.2.3 From e7cc3aca0f6a36b018934264ee20bee45dc13e29 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Fri, 2 Mar 2012 21:05:31 -0700 Subject: dt: fix twl4030 for non-dt compile on x86 twl4030 still doesn't build correctly for x86 allmodconfig. This fix solves the missing symbol errors. Signed-off-by: Grant Likely Acked-by: Benoit Cousson --- drivers/mfd/twl-core.c | 1 + include/linux/of_platform.h | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'include/linux/of_platform.h') diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 4970d43952db..54727ef005d6 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 242fa3563e2e..b47d2040c9f2 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -94,7 +94,12 @@ extern int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup, struct device *parent); -#else +#endif /* CONFIG_OF_ADDRESS */ + +#endif /* CONFIG_OF_DEVICE */ + +#if !defined(CONFIG_OF_ADDRESS) +struct of_dev_auxdata; static inline int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup, @@ -104,6 +109,4 @@ static inline int of_platform_populate(struct device_node *root, } #endif /* !CONFIG_OF_ADDRESS */ -#endif /* CONFIG_OF_DEVICE */ - #endif /* _LINUX_OF_PLATFORM_H */ -- cgit v1.2.3