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@xxxxxx> 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
>From 8ba38cd5ab635b67a50f8051ce2bdbcfa79253a2 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@xxxxxxxxxx>
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@xxxxxxxxxx>
---
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
