Subject: + rtc-add-hym8563-rtc-driver-fix.patch added to -mm tree
To: heiko@xxxxxxxxx,fengguang.wu@xxxxxxxxx,sfr@xxxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 18 Dec 2013 13:16:13 -0800
The patch titled
Subject: rtc: hym8563: include clkout code only if COMMON_CLK active
has been added to the -mm tree. Its filename is
rtc-add-hym8563-rtc-driver-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rtc-add-hym8563-rtc-driver-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rtc-add-hym8563-rtc-driver-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Heiko Stuebner <heiko@xxxxxxxxx>
Subject: rtc: hym8563: include clkout code only if COMMON_CLK active
The contents of clk-provide.h, struct clk_hw etc, are only available if
CONFIG_COMMON_CLK is selected. Therefore IS_ENABLED(COMMON_CLK) is not
sufficient and real preprocessor conditions are necessary to keep the code
in question from being compiled on non-COMMON_CLK systems.
Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-hym8563.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff -puN drivers/rtc/rtc-hym8563.c~rtc-add-hym8563-rtc-driver-fix drivers/rtc/rtc-hym8563.c
--- a/drivers/rtc/rtc-hym8563.c~rtc-add-hym8563-rtc-driver-fix
+++ a/drivers/rtc/rtc-hym8563.c
@@ -87,7 +87,9 @@ struct hym8563 {
struct i2c_client *client;
struct rtc_device *rtc;
bool valid;
+#ifdef CONFIG_COMMON_CLK
struct clk_hw clkout_hw;
+#endif
};
/*
@@ -290,6 +292,7 @@ static const struct rtc_class_ops hym856
* Handling of the clkout
*/
+#ifdef CONFIG_COMMON_CLK
#define clkout_hw_to_hym8563(_hw) container_of(_hw, struct hym8563, clkout_hw)
static int clkout_rates[] = {
@@ -423,6 +426,7 @@ static struct clk *hym8563_clkout_regist
return clk;
}
+#endif
/*
* The alarm interrupt is implemented as a level-low interrupt in the
@@ -565,8 +569,9 @@ static int hym8563_probe(struct i2c_clie
if (IS_ERR(hym8563->rtc))
return PTR_ERR(hym8563->rtc);
- if (IS_ENABLED(CONFIG_COMMON_CLK))
- hym8563_clkout_register_clk(hym8563);
+#ifdef CONFIG_COMMON_CLK
+ hym8563_clkout_register_clk(hym8563);
+#endif
return 0;
}
_
Patches currently in -mm which might be from heiko@xxxxxxxxx are
dt-bindings-add-hym8563-binding.patch
rtc-add-hym8563-rtc-driver.patch
rtc-add-hym8563-rtc-driver-fix.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
