From: Hans de Goede <hdegoede@redhat.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: David Herrmann <dh.herrmann@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Luc Verhaegen <libv@skynet.be>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Grant Likely <grant.likely@linaro.org>
Subject: Re: linux-next: build failure after merge of the omap_dss2 tree
Date: Tue, 25 Nov 2014 12:20:43 +0100 [thread overview]
Message-ID: <5474660B.8070507@redhat.com> (raw)
In-Reply-To: <5474615F.20407@ti.com>
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
Hi Tomi,
On 11/25/2014 12:00 PM, Tomi Valkeinen wrote:
> On 18/11/14 17:07, David Herrmann wrote:
>> Hi
>>
>> On Tue, Nov 18, 2014 at 3:53 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>>> Hi,
>>>
>>> Thanks Stephen!
>>>
>>> Hans, have you had a look at this? kbuild test bot also reported this.
>>
>> The fix from Stephen should not go to main-line. It breaks simplefb on
>> x86 without OF. Imo, linux/clk.h should provide a fallback if OF is
>> not defined (like it already does for of_clk_get() and friends).
>>
>> Hans, any comments?
>
> Hans, ping.
Sorry I somehow missed this thread so far, I did see the kbuild mail, but
it looked like a false positive to me, for the compile error case I already fixed
in the last revision of the patch, adding #ifdef CONFIG_OF around the offending code.
But on closer inspection I see that the entirety of linux/clk-provider.h is wrapped
in one huge #ifdef CONFIG_COMMON_CLK and then later on also has:
#ifdef CONFIG_OF
...
int of_clk_get_parent_count(struct device_node *np);
...
#endif
So we need both CONFIG_OF and CONFIG_COMMON_CLK, the attached patch
should fix this.
Regards,
Hans
[-- Attachment #2: 0001-simplefb-Fix-build-errors-when-CONFIG_COMMON_CLK-is-.patch --]
[-- Type: text/x-patch, Size: 1027 bytes --]
>From 8ba38cd5ab635b67a50f8051ce2bdbcfa79253a2 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 25 Nov 2014 12:13:30 +0100
Subject: [PATCH v2] simplefb: Fix build errors when CONFIG_COMMON_CLK is not
defined
Both CONFIG_OF and CONFIG_COMMON_CLK must be defined to be able to use of
clocks.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/video/fbdev/simplefb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 8be9754..b2ae925 100644
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -169,13 +169,13 @@ static int simplefb_parse_pd(struct platform_device *pdev,
struct simplefb_par {
u32 palette[PSEUDO_PALETTE_SIZE];
-#ifdef CONFIG_OF
+#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
int clk_count;
struct clk **clks;
#endif
};
-#ifdef CONFIG_OF
+#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
/*
* Clock handling code.
*
--
2.1.0
next prev parent reply other threads:[~2014-11-25 11:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 8:09 linux-next: build failure after merge of the omap_dss2 tree Stephen Rothwell
2014-11-18 14:53 ` Tomi Valkeinen
2014-11-18 15:07 ` David Herrmann
2014-11-25 11:00 ` Tomi Valkeinen
2014-11-25 11:20 ` Hans de Goede [this message]
2014-11-25 12:11 ` Tomi Valkeinen
2014-11-25 22:07 ` Stephen Rothwell
2014-11-26 8:16 ` Tomi Valkeinen
-- strict thread matches above, loose matches on Subject: below --
2014-03-05 3:32 Stephen Rothwell
2014-03-05 7:01 ` Tomi Valkeinen
2014-03-04 3:35 Stephen Rothwell
2014-03-04 6:58 ` Tomi Valkeinen
2013-04-26 5:10 Stephen Rothwell
2013-04-26 5:31 ` Tomi Valkeinen
2013-04-26 5:56 ` Stephen Rothwell
2013-04-26 6:57 ` Tomi Valkeinen
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=5474660B.8070507@redhat.com \
--to=hdegoede@redhat.com \
--cc=dh.herrmann@gmail.com \
--cc=geert@linux-m68k.org \
--cc=grant.likely@linaro.org \
--cc=libv@skynet.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=sfr@canb.auug.org.au \
--cc=tomi.valkeinen@ti.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).