Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1434131 > unrolled thread

[PATCH 1/2 v3] clk: hi6220: Add RTC clock for pl031

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 1/2 v3] clk: hi6220: Add RTC clock for pl031 John Stultz <john.stultz@linaro.org> - 2016-06-30 03:00 +0200
    Re: [PATCH 1/2 v3] clk: hi6220: Add RTC clock for pl031 Stephen Boyd <sboyd@codeaurora.org> - 2016-06-30 21:20 +0200
      Re: [PATCH 1/2 v3] clk: hi6220: Add RTC clock for pl031 John Stultz <john.stultz@linaro.org> - 2016-06-30 21:30 +0200

#1434131 — [PATCH 1/2 v3] clk: hi6220: Add RTC clock for pl031

From: Zhangfei Gao <zhangfei.gao@linaro.org>

Adds clk support for the pl031 RTC on hi6220

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Guodong Xu <guodong.xu@linaro.org>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
[jstultz: Forward ported, tweaked commit description]
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
v3: No changes from v1, version noted just to be consistent
    with the other patch in this patchset.

 drivers/clk/hisilicon/clk-hi6220.c       | 2 ++
 include/dt-bindings/clock/hi6220-clock.h | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/hisilicon/clk-hi6220.c b/drivers/clk/hisilicon/clk-hi6220.c
index f02cb41..76de9a7 100644
--- a/drivers/clk/hisilicon/clk-hi6220.c
+++ b/drivers/clk/hisilicon/clk-hi6220.c
@@ -68,6 +68,8 @@ static struct hisi_gate_clock hi6220_separated_gate_clks_ao[] __initdata = {
 	{ HI6220_TIMER7_PCLK, "timer7_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 22, 0, },
 	{ HI6220_TIMER8_PCLK, "timer8_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 23, 0, },
 	{ HI6220_UART0_PCLK,  "uart0_pclk",  "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 24, 0, },
+	{ HI6220_RTC0_PCLK,   "rtc0_pclk",   "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 25, 0, },
+	{ HI6220_RTC1_PCLK,   "rtc1_pclk",   "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 26, 0, },
 };
 
 static void __init hi6220_clk_ao_init(struct device_node *np)
diff --git a/include/dt-bindings/clock/hi6220-clock.h b/include/dt-bindings/clock/hi6220-clock.h
index 70ee383..6b03c84 100644
--- a/include/dt-bindings/clock/hi6220-clock.h
+++ b/include/dt-bindings/clock/hi6220-clock.h
@@ -55,8 +55,9 @@
 #define HI6220_TIMER7_PCLK	34
 #define HI6220_TIMER8_PCLK	35
 #define HI6220_UART0_PCLK	36
-
-#define HI6220_AO_NR_CLKS	37
+#define HI6220_RTC0_PCLK	37
+#define HI6220_RTC1_PCLK	38
+#define HI6220_AO_NR_CLKS	39
 
 /* clk in Hi6220 systrl */
 /* gate clock */
-- 
1.9.1

[toc] | [next] | [standalone]

#1434801

On 06/29, John Stultz wrote:
> From: Zhangfei Gao <zhangfei.gao@linaro.org>
> 
> Adds clk support for the pl031 RTC on hi6220
> 
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@codeaurora.org>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Pawel Moll <pawel.moll@arm.com>
> Cc: Wei Xu <xuwei5@hisilicon.com>
> Cc: Guodong Xu <guodong.xu@linaro.org>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> [jstultz: Forward ported, tweaked commit description]
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---

Applied to clk-hi6220-rtc and merged into clk-next.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[toc] | [prev] | [next] | [standalone]

#1434805

On Thu, Jun 30, 2016 at 12:15 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 06/29, John Stultz wrote:
>> From: Zhangfei Gao <zhangfei.gao@linaro.org>
>>
>> Adds clk support for the pl031 RTC on hi6220
>>
>> Cc: Michael Turquette <mturquette@baylibre.com>
>> Cc: Stephen Boyd <sboyd@codeaurora.org>
>> Cc: Rob Herring <robh+dt@kernel.org>
>> Cc: Pawel Moll <pawel.moll@arm.com>
>> Cc: Wei Xu <xuwei5@hisilicon.com>
>> Cc: Guodong Xu <guodong.xu@linaro.org>
>> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
>> [jstultz: Forward ported, tweaked commit description]
>> Signed-off-by: John Stultz <john.stultz@linaro.org>
>> ---
>
> Applied to clk-hi6220-rtc and merged into clk-next.

Great! Thanks!

Wei: Could you merge
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
clk-hi6220-rtc  into your tree, then apply patch 2/2?

thanks
-john

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web