Enabling drivers that provide clocks on DT on platforms that don't have
CONFIG_OF set fails due to compilation errors. This patch set first adds
some stubs for of_clk_provider functions if CONFIG_OF is not set. Second
it allows those platforms to build and use clk-si5351 i2c clock driver
by removing the dependency on CONFIG_OF.
The above approach has been suggested by Arnd Bergmann and replaces the
corresponding Kconfig patch for clk-si5351 posted earlier. It has been
compile tested with allmodconfig on x86_64 for post v3.9.
Sebastian Hesselbarth (2):
clk: add non CONFIG_OF routines for clk-provider
clk: si5351: Allow to build without CONFIG_OF
drivers/clk/Kconfig | 1 -
include/linux/clk-provider.h | 47 +++++++++++++++++++++++++++++++++++-------
2 files changed, 39 insertions(+), 9 deletions(-)
---
Cc: Mike Turquette <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Peter Ujfalusi <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Daniel Mack <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: Marek Belisko <[email protected]>
Cc: [email protected]
Cc: [email protected]
--
1.7.10.4
With of_clk_provider stubs for CONFIG_OF not set, we can now also enable
clk-si5351 on those architectures.
Signed-off-by: Sebastian Hesselbarth <[email protected]>
---
Cc: Mike Turquette <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Peter Ujfalusi <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Daniel Mack <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: Marek Belisko <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/clk/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 0357ac4..186dd0e 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -58,7 +58,6 @@ config COMMON_CLK_MAX77686
config COMMON_CLK_SI5351
tristate "Clock driver for SiLabs 5351A/B/C"
depends on I2C
- depends on OF
select REGMAP_I2C
select RATIONAL
---help---
--
1.7.10.4
Some drivers that are shared between architectures have HAVE_CLK selected
but don't have OF. To remove compilation errors for drivers that provide
clocks on DT with of_clk_add_provider we would have to enclose these calls
within #ifdef CONFIG_OF, #endif.
This patch adds some stubs for OF related clk-provider functions that
either do nothing or return appropriate values if CONFIG_OF is not set.
So, definition of these routines will always be available.
Signed-off-by: Sebastian Hesselbarth <[email protected]>
Suggested-by: Arnd Bergmann <[email protected]>
---
Cc: Mike Turquette <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Peter Ujfalusi <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Daniel Mack <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: Marek Belisko <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
include/linux/clk-provider.h | 47 +++++++++++++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 8 deletions(-)
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 1186098..265f384 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -423,6 +423,17 @@ struct of_device_id;
typedef void (*of_clk_init_cb_t)(struct device_node *);
+struct clk_onecell_data {
+ struct clk **clks;
+ unsigned int clk_num;
+};
+
+#define CLK_OF_DECLARE(name, compat, fn) \
+ static const struct of_device_id __clk_of_table_##name \
+ __used __section(__clk_of_table) \
+ = { .compatible = compat, .data = fn };
+
+#ifdef CONFIG_OF
int of_clk_add_provider(struct device_node *np,
struct clk *(*clk_src_get)(struct of_phandle_args *args,
void *data),
@@ -430,19 +441,39 @@ int of_clk_add_provider(struct device_node *np,
void of_clk_del_provider(struct device_node *np);
struct clk *of_clk_src_simple_get(struct of_phandle_args *clkspec,
void *data);
-struct clk_onecell_data {
- struct clk **clks;
- unsigned int clk_num;
-};
struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data);
const char *of_clk_get_parent_name(struct device_node *np, int index);
void of_clk_init(const struct of_device_id *matches);
-#define CLK_OF_DECLARE(name, compat, fn) \
- static const struct of_device_id __clk_of_table_##name \
- __used __section(__clk_of_table) \
- = { .compatible = compat, .data = fn };
+#else /* !CONFIG_OF */
+static inline int of_clk_add_provider(struct device_node *np,
+ struct clk *(*clk_src_get)(struct of_phandle_args *args,
+ void *data),
+ void *data)
+{
+ return 0;
+}
+#define of_clk_del_provider(np) \
+ { while (0); }
+static inline struct clk *of_clk_src_simple_get(
+ struct of_phandle_args *clkspec, void *data)
+{
+ return ERR_PTR(-ENOENT);
+}
+static inline struct clk *of_clk_src_onecell_get(
+ struct of_phandle_args *clkspec, void *data)
+{
+ return ERR_PTR(-ENOENT);
+}
+static inline const char *of_clk_get_parent_name(struct device_node *np,
+ int index)
+{
+ return NULL;
+}
+#define of_clk_init(matches) \
+ { while (0); }
+#endif /* CONFIG_OF */
#endif /* CONFIG_COMMON_CLK */
#endif /* CLK_PROVIDER_H */
--
1.7.10.4
On Wednesday 01 May 2013, Sebastian Hesselbarth wrote:
>
> Yesterday 02:58:27
> Enabling drivers that provide clocks on DT on platforms that don't have
> CONFIG_OF set fails due to compilation errors. This patch set first adds
> some stubs for of_clk_provider functions if CONFIG_OF is not set. Second
> it allows those platforms to build and use clk-si5351 i2c clock driver
> by removing the dependency on CONFIG_OF.
>
> The above approach has been suggested by Arnd Bergmann and replaces the
> corresponding Kconfig patch for clk-si5351 posted earlier. It has been
> compile tested with allmodconfig on x86_64 for post v3.9.
>
> Sebastian Hesselbarth (2):
> clk: add non CONFIG_OF routines for clk-provider
> clk: si5351: Allow to build without CONFIG_OF
>
Acked-by: Arnd Bergmann <[email protected]>
Quoting Sebastian Hesselbarth (2013-04-30 17:58:27)
> Enabling drivers that provide clocks on DT on platforms that don't have
> CONFIG_OF set fails due to compilation errors. This patch set first adds
> some stubs for of_clk_provider functions if CONFIG_OF is not set. Second
> it allows those platforms to build and use clk-si5351 i2c clock driver
> by removing the dependency on CONFIG_OF.
>
> The above approach has been suggested by Arnd Bergmann and replaces the
> corresponding Kconfig patch for clk-si5351 posted earlier. It has been
> compile tested with allmodconfig on x86_64 for post v3.9.
>
> Sebastian Hesselbarth (2):
> clk: add non CONFIG_OF routines for clk-provider
> clk: si5351: Allow to build without CONFIG_OF
>
Both are taken into clk-next.
Thanks,
Mike
> drivers/clk/Kconfig | 1 -
> include/linux/clk-provider.h | 47 +++++++++++++++++++++++++++++++++++-------
> 2 files changed, 39 insertions(+), 9 deletions(-)
> ---
> Cc: Mike Turquette <[email protected]>
> Cc: Linus Walleij <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Peter Ujfalusi <[email protected]>
> Cc: Arnd Bergmann <[email protected]>
> Cc: Stephen Warren <[email protected]>
> Cc: Daniel Mack <[email protected]>
> Cc: Lars-Peter Clausen <[email protected]>
> Cc: Guenter Roeck <[email protected]>
> Cc: Marek Belisko <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> --
> 1.7.10.4