From: Olof Johansson <olof@lixom.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mike Turquette <mturquette@linaro.org>,
Stephen Boyd <sboyd@codeaurora.org>,
Tony Lindgren <tony@atomide.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tero Kristo <t-kristo@ti.com>
Subject: Re: linux-next: build failure after merge of the clk tree
Date: Thu, 13 Aug 2015 13:04:21 +0200 [thread overview]
Message-ID: <20150813110421.GA21502@localhost> (raw)
In-Reply-To: <20150727141117.1153348e@canb.auug.org.au>
On Mon, Jul 27, 2015 at 02:11:17PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/clk/ti/clk-814x.c:11:25: error: array type has incomplete element type
> static struct ti_dt_clk dm814_clks[] = {
> ^
> drivers/clk/ti/clk-814x.c:12:2: error: implicit declaration of function 'DT_CLK' [-Werror=implicit-function-declaration]
> DT_CLK(NULL, "devosc_ck", "devosc_ck"),
> ^
> drivers/clk/ti/clk-814x.c:21:2: error: field name not in record or union initializer
> { .node_name = NULL },
> ^
> drivers/clk/ti/clk-814x.c:21:2: error: (near initialization for 'dm814_clks')
> drivers/clk/ti/clk-814x.c: In function 'dm814x_dt_clk_init':
> drivers/clk/ti/clk-814x.c:26:2: error: implicit declaration of function 'ti_dt_clocks_register' [-Werror=implicit-function-declaration]
> ti_dt_clocks_register(dm814_clks);
> ^
> drivers/clk/ti/clk-814x.c:28:2: error: implicit declaration of function 'omap2_clk_enable_init_clocks' [-Werror=implicit-function-declaration]
> omap2_clk_enable_init_clocks(NULL, 0);
> ^
> drivers/clk/ti/clk-814x.c: At top level:
> drivers/clk/ti/clk-814x.c:11:25: warning: 'dm814_clks' defined but not used [-Wunused-variable]
> static struct ti_dt_clk dm814_clks[] = {
> ^
>
> Caused by commit
>
> 9cf705de06a2 ("ARM: OMAP2+: Add support for initializing dm814x clocks")
>
> from the omap tree interacting with commit
>
> a3314e9cf69c ("clk: ti: move some public definitions to private header")
>
> from the clk tree.
>
> I have applied the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 27 Jul 2015 14:07:23 +1000
> Subject: [PATCH] clk: ti: fix for definition movement
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/clk/ti/clk-814x.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/clk/ti/clk-814x.c b/drivers/clk/ti/clk-814x.c
> index d490d427cc20..e172920798ea 100644
> --- a/drivers/clk/ti/clk-814x.c
> +++ b/drivers/clk/ti/clk-814x.c
> @@ -8,6 +8,8 @@
> #include <linux/clk-provider.h>
> #include <linux/clk/ti.h>
>
> +#include "clock.h"
> +
> static struct ti_dt_clk dm814_clks[] = {
> DT_CLK(NULL, "devosc_ck", "devosc_ck"),
> DT_CLK(NULL, "mpu_ck", "mpu_ck"),
Thanks, I've now applied this to the same branch where 9cf705de06a2 was merged.
-Olof
next prev parent reply other threads:[~2015-08-13 12:28 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 4:11 linux-next: build failure after merge of the clk tree Stephen Rothwell
2015-08-03 10:08 ` Tony Lindgren
2015-08-07 23:56 ` Stephen Boyd
2015-08-13 11:04 ` Olof Johansson [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-03 23:04 Stephen Rothwell
2024-01-04 0:59 ` Stephen Boyd
2023-04-02 23:59 Stephen Rothwell
2023-04-05 0:28 ` Stephen Rothwell
2020-05-11 0:55 Stephen Rothwell
2020-05-13 3:20 ` Stephen Boyd
2020-05-13 3:28 ` Stephen Boyd
2020-01-07 21:47 Stephen Rothwell
2019-07-02 0:01 Stephen Rothwell
2019-07-02 1:14 ` Stephen Rothwell
2019-07-02 2:03 ` Stephen Rothwell
2019-07-05 1:24 ` Stephen Rothwell
2019-07-12 17:53 ` Stephen Boyd
2019-05-02 23:25 Stephen Rothwell
2019-05-03 15:55 ` Stephen Boyd
2018-11-29 22:03 Stephen Rothwell
2018-01-01 21:51 Stephen Rothwell
2018-01-02 19:58 ` Stephen Boyd
2017-12-10 23:16 Stephen Rothwell
2017-12-14 0:57 ` Stephen Boyd
2017-06-05 0:14 Stephen Rothwell
2015-08-12 7:19 Stephen Rothwell
2015-08-12 7:45 ` Geert Uytterhoeven
2015-08-12 8:23 ` Stephen Boyd
2015-08-12 8:03 ` Stephen Boyd
2015-02-27 3:08 Stephen Rothwell
2015-02-27 17:42 ` Stephen Boyd
2015-03-04 9:56 ` Geert Uytterhoeven
2015-03-05 0:15 ` Mike Turquette
2015-02-26 2:14 Stephen Rothwell
2015-02-26 9:09 ` Krzysztof Kozlowski
2015-02-27 0:01 ` Mike Turquette
2015-02-27 0:06 ` Stephen Rothwell
2014-12-16 3:45 Stephen Rothwell
[not found] ` <20141216072034.29014.12434@quantum>
2014-12-17 3:47 ` Stephen Rothwell
2014-01-29 3:32 Stephen Rothwell
2014-01-29 10:02 ` Sebastian Hesselbarth
2013-04-15 5:04 Stephen Rothwell
2013-04-15 7:03 ` Sebastian Hesselbarth
2013-04-16 0:42 ` Mike Turquette
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=20150813110421.GA21502@localhost \
--to=olof@lixom.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=sboyd@codeaurora.org \
--cc=sfr@canb.auug.org.au \
--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).