diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-04-19 13:44:56 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-04-21 22:01:39 -0400 |
commit | fc04f27dfc4280ef35540ab40fa14c24ff8cc799 (patch) | |
tree | a491a0e30bbeebb2bd8309d60d33671f6e14f2f2 | |
parent | 2158a09395b3751db99663b2efdcce0ae09ca133 (diff) |
clk: ti: fix building without legacy omap3
When CONFIG_ATAGS or CONFIG_OMAP3 is disabled, we get a build error:
In file included from include/linux/clk-provider.h:15:0,
from drivers/clk/ti/clk.c:19:
drivers/clk/ti/clk.c: In function 'ti_clk_add_aliases':
drivers/clk/ti/clk.c:438:29: error: 'simple_clk_match_table' undeclared (first use in this function); did you mean 'simple_attr_write'?
Moving the match table down fixes it.
Fixes: c17435c56bb1 ("clk: ti: add API for creating aliases automatically for simple clock types")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/ti/clk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index ddbad7e8d7c9..e5a1c8297a1d 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c | |||
@@ -371,12 +371,6 @@ struct clk __init *ti_clk_register_clk(struct ti_clk *setup) | |||
371 | return clk; | 371 | return clk; |
372 | } | 372 | } |
373 | 373 | ||
374 | static const struct of_device_id simple_clk_match_table[] __initconst = { | ||
375 | { .compatible = "fixed-clock" }, | ||
376 | { .compatible = "fixed-factor-clock" }, | ||
377 | { } | ||
378 | }; | ||
379 | |||
380 | int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks) | 374 | int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks) |
381 | { | 375 | { |
382 | struct clk *clk; | 376 | struct clk *clk; |
@@ -425,6 +419,12 @@ int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks) | |||
425 | } | 419 | } |
426 | #endif | 420 | #endif |
427 | 421 | ||
422 | static const struct of_device_id simple_clk_match_table[] __initconst = { | ||
423 | { .compatible = "fixed-clock" }, | ||
424 | { .compatible = "fixed-factor-clock" }, | ||
425 | { } | ||
426 | }; | ||
427 | |||
428 | /** | 428 | /** |
429 | * ti_clk_add_aliases - setup clock aliases | 429 | * ti_clk_add_aliases - setup clock aliases |
430 | * | 430 | * |