[RESEND][PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey

[RESEND][PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey

[John Stultz]

This patchset enables the pl031 RTC on the Hi6220 SoC.

I'd like to submit it for review and consideration to be merged.
(But I've not gotten much feedback on it. Do I have the right
people cc'ed?)

Michael/Wei: If you don't object to this, can I get an ack from
one of you so the other can take the change through their tree?

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

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

[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

[RESEND][PATCH 2/2] arm64: dts: hi6220: Add pl031 RTC support

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

Re: [RESEND][PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey

[Rob Herring]

On Thu, Jun 23, 2016 at 3:39 PM, John Stultz <john.stultz@linaro.org> wrote:
> This patchset enables the pl031 RTC on the Hi6220 SoC.
>
> I'd like to submit it for review and consideration to be merged.
> (But I've not gotten much feedback on it. Do I have the right
> people cc'ed?)

Yes. One issue is the DT header causes dependency problems as either
clk or arm-soc maintainers have to take everything. I think it is
desired that you don't use defines in the dts file, so arm-soc can
take it and Michael/Stephen can take the clock changes.

Send the dts file change to arm@kernel.org if you can't get any
response from the sub-arch maintainer.

Rob

>
> Michael/Wei: If you don't object to this, can I get an ack from
> one of you so the other can take the change through their tree?
>
> 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
>

Re: [RESEND][PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey

[Stephen Boyd]

On 06/23, Rob Herring wrote:
> On Thu, Jun 23, 2016 at 3:39 PM, John Stultz <john.stultz@linaro.org> wrote:
> > This patchset enables the pl031 RTC on the Hi6220 SoC.
> >
> > I'd like to submit it for review and consideration to be merged.
> > (But I've not gotten much feedback on it. Do I have the right
> > people cc'ed?)
> 
> Yes. One issue is the DT header causes dependency problems as either
> clk or arm-soc maintainers have to take everything. I think it is
> desired that you don't use defines in the dts file, so arm-soc can
> take it and Michael/Stephen can take the clock changes.
> 
> Send the dts file change to arm@kernel.org if you can't get any
> response from the sub-arch maintainer.

We can also provide a stable branch from clk tree based on
v4.7-rc1 that you base the next patch on while sending through
arm-soc. That sort of design has been working for a few cycles
now.

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

Re: [RESEND][PATCH 2/2] arm64: dts: hi6220: Add pl031 RTC support

[Wei Xu]

Hi John,

On 23/06/2016 21:39, John Stultz wrote:
> 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>
> ---
>  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 {

Sorry for the late reply.
Thanks for the patch!
Except the indent of the rtc1, the others is fine to me.
Acked-by: Wei Xu <xuwei5@hisilicon.com>

As what Stephen said in the cover letter works for me.

Best Regards,
Wei

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

Re: [RESEND][PATCH 0/2] Add pl031 RTC support for Hi6220/HiKey

[John Stultz]

On Tue, Jun 28, 2016 at 10:15 AM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 06/23, Rob Herring wrote:
>> On Thu, Jun 23, 2016 at 3:39 PM, John Stultz <john.stultz@linaro.org> wrote:
>> > This patchset enables the pl031 RTC on the Hi6220 SoC.
>> >
>> > I'd like to submit it for review and consideration to be merged.
>> > (But I've not gotten much feedback on it. Do I have the right
>> > people cc'ed?)
>>
>> Yes. One issue is the DT header causes dependency problems as either
>> clk or arm-soc maintainers have to take everything. I think it is
>> desired that you don't use defines in the dts file, so arm-soc can
>> take it and Michael/Stephen can take the clock changes.
>>
>> Send the dts file change to arm@kernel.org if you can't get any
>> response from the sub-arch maintainer.
>
> We can also provide a stable branch from clk tree based on
> v4.7-rc1 that you base the next patch on while sending through
> arm-soc. That sort of design has been working for a few cycles
> now.

This is fine by me. So do you mind queuing the first patch up?

Also, Since Wei acked the second patch (modulo a whitespace fix which
I'll be resending here shortly), would you want to simply to take
both, or should Wei still pull your branch in and include it into this
tree with the second patch?

I'll resend the set here in a bit, but please let me know which you'd
prefer so we don't end up with confusion around all the options of
who's doing what. :)

thanks
-john