From: Arnd Bergmann <arnd@arndb.de>
To: Tero Kristo <t-kristo@ti.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Tony Lindgren <tony@atomide.com>,
linux-omap@vger.kernel.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] clk: ti: fix building without legacy omap3
Date: Wed, 19 Apr 2017 19:44:56 +0200 [thread overview]
Message-ID: <20170419174507.4055014-2-arnd@arndb.de> (raw)
In-Reply-To: <20170419174507.4055014-1-arnd@arndb.de>
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>
---
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
*
--
2.9.0
next prev parent reply other threads:[~2017-04-19 17:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-19 17:44 [PATCH 1/2] clk: ti: divider: try to fix ti_clk_register_divider Arnd Bergmann
2017-04-19 17:44 ` Arnd Bergmann [this message]
2017-04-20 15:25 ` [PATCH 2/2] clk: ti: fix building without legacy omap3 Tero Kristo
2017-04-22 2:23 ` Stephen Boyd
2017-04-19 20:05 ` [PATCH 1/2] clk: ti: divider: try to fix ti_clk_register_divider Tony Lindgren
2017-04-20 15:46 ` Tero Kristo
2017-04-22 1:58 ` Stephen Boyd
2017-04-22 12:08 ` Arnd Bergmann
2017-04-28 18:36 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170419174507.4055014-2-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--cc=t-kristo@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).