clk: ti: fix building without legacy omap3
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Apr 2017 17:44:56 +0000 (19:44 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Sat, 22 Apr 2017 02:01:39 +0000 (19:01 -0700)
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>
drivers/clk/ti/clk.c

index ddbad7e8d7c91955d5a9233aa09a16e702c89b00..e5a1c8297a1d256fd1d6fc006121b97a6d89e821 100644 (file)
@@ -371,12 +371,6 @@ struct clk __init *ti_clk_register_clk(struct ti_clk *setup)
        return clk;
 }
 
-static const struct of_device_id simple_clk_match_table[] __initconst = {
-       { .compatible = "fixed-clock" },
-       { .compatible = "fixed-factor-clock" },
-       { }
-};
-
 int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks)
 {
        struct clk *clk;
@@ -425,6 +419,12 @@ int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks)
 }
 #endif
 
+static const struct of_device_id simple_clk_match_table[] __initconst = {
+       { .compatible = "fixed-clock" },
+       { .compatible = "fixed-factor-clock" },
+       { }
+};
+
 /**
  * ti_clk_add_aliases - setup clock aliases
  *