Commit fc04f27d authored Apr 19, 2017 by Arnd Bergmann Committed by Stephen Boyd Apr 21, 2017

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: c17435c5 ("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>

parent 2158a093

drivers/clk/ti/clk.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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
		*

Admin message