linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey
@ 2016-06-09  0:09 John Stultz
  2016-06-09  0:09 ` [PATCH 1/2] clk: hi6220: Add RTC clock for pl031 John Stultz
  2016-06-09  0:09 ` [PATCH 2/2] arm64: dts: hi6220: Add pl031 RTC support John Stultz
  0 siblings, 2 replies; 4+ messages in thread
From: John Stultz @ 2016-06-09  0:09 UTC (permalink / raw)
  To: lkml
  Cc: John Stultz, Michael Turquette, Stephen Boyd, Rob Herring,
	Pawel Moll, Wei Xu, Guodong Xu, Zhangfei Gao

This patchset enables the pl031 RTC on the Hi6220 SoC.

I wanted to submit it out for review and consideration to be merged.

Please let me know how best these two patches should go upstream
(independently via separate maintainers trees, or acked and through
one?).

thanks
-john

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>
Cc: Zhangfei Gao <zhangfei.gao@linaro.org>


Zhangfei Gao (2):
  clk: hi6220: Add RTC clock for pl031
  arm64: dts: hi6220: Add pl031 RTC support

 arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 16 ++++++++++++++++
 drivers/clk/hisilicon/clk-hi6220.c        |  2 ++
 include/dt-bindings/clock/hi6220-clock.h  |  5 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

-- 
1.9.1

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] clk: hi6220: Add RTC clock for pl031
  2016-06-09  0:09 [PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey John Stultz
@ 2016-06-09  0:09 ` John Stultz
  2016-06-16  1:13   ` John Stultz
  2016-06-09  0:09 ` [PATCH 2/2] arm64: dts: hi6220: Add pl031 RTC support John Stultz
  1 sibling, 1 reply; 4+ messages in thread
From: John Stultz @ 2016-06-09  0:09 UTC (permalink / raw)
  To: lkml
  Cc: Zhangfei Gao, Michael Turquette, Stephen Boyd, Rob Herring,
	Pawel Moll, Wei Xu, Guodong Xu, John Stultz

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>
---
 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] arm64: dts: hi6220: Add pl031 RTC support
  2016-06-09  0:09 [PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey John Stultz
  2016-06-09  0:09 ` [PATCH 1/2] clk: hi6220: Add RTC clock for pl031 John Stultz
@ 2016-06-09  0:09 ` John Stultz
  1 sibling, 0 replies; 4+ messages in thread
From: John Stultz @ 2016-06-09  0:09 UTC (permalink / raw)
  To: lkml
  Cc: Zhangfei Gao, Michael Turquette, Stephen Boyd, Rob Herring,
	Pawel Moll, Wei Xu, Guodong Xu, John Stultz

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

Add pl031 rtc0 and rtc1 support to hi6220 dtsi

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 and tweaked commit description,
 added rtc1 entry as suggested by Guodong]
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
v2: Add rtc1 entry as suggested by Guodong

 arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 189d215..12510b5 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -336,6 +336,22 @@
 			clock-names = "timer1", "timer2", "apb_pclk";
 		};
 
+		rtc0: rtc@f8003000 {
+			compatible = "arm,pl031", "arm,primecell";
+			reg = <0x0 0xf8003000 0x0 0x1000>;
+			interrupts = <0 12 4>;
+			clocks = <&ao_ctrl HI6220_RTC0_PCLK>;
+			clock-names = "apb_pclk";
+		};
+
+		 rtc1: rtc@f8004000 {
+			compatible = "arm,pl031", "arm,primecell";
+			reg = <0x0 0xf8004000 0x0 0x1000>;
+			interrupts = <0 8 4>;
+			clocks = <&ao_ctrl HI6220_RTC1_PCLK>;
+			clock-names = "apb_pclk";
+		};
+
 		pmx0: pinmux@f7010000 {
 			compatible = "pinctrl-single";
 			reg = <0x0 0xf7010000  0x0 0x27c>;
-- 
1.9.1

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] clk: hi6220: Add RTC clock for pl031
  2016-06-09  0:09 ` [PATCH 1/2] clk: hi6220: Add RTC clock for pl031 John Stultz
@ 2016-06-16  1:13   ` John Stultz
  0 siblings, 0 replies; 4+ messages in thread
From: John Stultz @ 2016-06-16  1:13 UTC (permalink / raw)
  To: lkml
  Cc: Zhangfei Gao, Michael Turquette, Stephen Boyd, Rob Herring,
	Pawel Moll, Wei Xu, Guodong Xu, John Stultz

On Wed, Jun 8, 2016 at 5:09 PM, John Stultz <john.stultz@linaro.org> 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>
> ---
>  drivers/clk/hisilicon/clk-hi6220.c       | 2 ++
>  include/dt-bindings/clock/hi6220-clock.h | 5 +++--
>  2 files changed, 5 insertions(+), 2 deletions(-)


Ping?  Any comments/feedback on this?

thanks
-john

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-06-16  1:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-09  0:09 [PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey John Stultz
2016-06-09  0:09 ` [PATCH 1/2] clk: hi6220: Add RTC clock for pl031 John Stultz
2016-06-16  1:13   ` John Stultz
2016-06-09  0:09 ` [PATCH 2/2] arm64: dts: hi6220: Add pl031 RTC support John Stultz

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).