Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1627592

Re: [PATCH 2/2] clk: ti: fix building without legacy omap3

Show all headers | View raw

On 19/04/17 20:44, Arnd Bergmann wrote:
> 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>

This one is clear... I think I should start running the single SoC build 
testing script again before posting stuff, this is an area where I seem 
to fail repeatedly... sorry about that.

Acked-by: Tero Kristo <t-kristo@ti.com>

> ---
>  drivers/clk/ti/clk.c | 12 ++++++------
>  1 file 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)
>  	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
>   *
>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/2] clk: ti: fix building without legacy omap3 Arnd Bergmann <arnd@arndb.de> - 2017-04-19 19:50 +0200
  Re: [PATCH 2/2] clk: ti: fix building without legacy omap3 Tero Kristo <t-kristo@ti.com> - 2017-04-20 17:30 +0200
  Re: [PATCH 2/2] clk: ti: fix building without legacy omap3 Stephen Boyd <sboyd@codeaurora.org> - 2017-04-22 04:30 +0200

csiph-web