[PATCH v4 0/3] clk: Broadcom BCM63138 support

[PATCH v4 0/3] clk: Broadcom BCM63138 support

[Florian Fainelli]

This patch series adds support for the Broadcom BCM63138 DSL SoCs
clocking framework.

Since the HW is identical to the one found in Broadcom iProc SoCs, but the
integration is different (obviously), there is still a new compatible string
introduced just in case we happen to find issues in the future.

Stephen, could you stage the two patches in a clk-bcm63xx branch that I could
later utilize while doing the arm-soc DT pull request?

Thank you!

Florian Fainelli (3):
  clk: iproc: Extend binding to cover BCM63138
  clk: bcm: Add BCM63138 clock support
  ARM: dts: BCM63xx: Add ARMPLL device tree nodes

 .../bindings/clock/brcm,iproc-clocks.txt           |  5 +++
 arch/arm/boot/dts/bcm63138.dtsi                    | 36 +++++++++++++++++-----
 drivers/clk/bcm/Kconfig                            | 10 ++++++
 drivers/clk/bcm/Makefile                           |  1 +
 drivers/clk/bcm/clk-bcm63xx.c                      | 22 +++++++++++++
 5 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 drivers/clk/bcm/clk-bcm63xx.c

-- 
2.1.0

[PATCH v4 1/3] clk: iproc: Extend binding to cover BCM63138

[Florian Fainelli]

Broadcom BCM63138 DSL SoCs have the same ARMPLL clocking infrastructure
as the Cygnus and iProc chips, add a dedicated compatible string and
document that the ARMPLL node is a valid node for this chip.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
No changes in v4

Changes in v3:

- added Rob's Acked-by tag

No changes in v2

 Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
index ede65a55e21b..0b35e71b39e8 100644
--- a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
@@ -208,3 +208,8 @@ These clock IDs are defined in:
     ch3_unused	lcpll_ports	4	BCM_NS2_LCPLL_PORTS_CH3_UNUSED
     ch4_unused	lcpll_ports	5	BCM_NS2_LCPLL_PORTS_CH4_UNUSED
     ch5_unused	lcpll_ports	6	BCM_NS2_LCPLL_PORTS_CH5_UNUSED
+
+BCM63138
+--------
+PLL and leaf clock compatible strings for BCM63138 are:
+    "brcm,bcm63138-armpll"
-- 
2.1.0

[PATCH v4 2/3] clk: bcm: Add BCM63138 clock support

[Florian Fainelli]

BCM63138 has a simple clocking domain which is primarily the ARMPLL
clocking complex, from which the ARM (CPU), APB and AXI clocks would be
derived from.

Since the ARMPLL controller is entirely compatible with the iProc ARM
PLL, we just initialize it without additional parameters.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
No changes in v4

Changes in v3:

- made default depend on ARCH_BCM_63XX per Stephen Boyd's comment

Changes in v2:
- added COMPILE_TEST per Scott Branden's comment

 drivers/clk/bcm/Kconfig       | 10 ++++++++++
 drivers/clk/bcm/Makefile      |  1 +
 drivers/clk/bcm/clk-bcm63xx.c | 22 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 drivers/clk/bcm/clk-bcm63xx.c

diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
index 85260fb96b36..f2878459199a 100644
--- a/drivers/clk/bcm/Kconfig
+++ b/drivers/clk/bcm/Kconfig
@@ -1,3 +1,13 @@
+config CLK_BCM_63XX
+	bool "Broadcom BCM63xx clock support"
+	depends on ARCH_BCM_63XX || COMPILE_TEST
+	depends on COMMON_CLK
+	select COMMON_CLK_IPROC
+	default ARCH_BCM_63XX
+	help
+	  Enable common clock framework support for Broadcom BCM63xx DSL SoCs
+	  based on the ARM architecture
+
 config CLK_BCM_KONA
 	bool "Broadcom Kona CCU clock support"
 	depends on ARCH_BCM_MOBILE || COMPILE_TEST
diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
index 3fc95060d875..247c26750d8b 100644
--- a/drivers/clk/bcm/Makefile
+++ b/drivers/clk/bcm/Makefile
@@ -1,3 +1,4 @@
+obj-$(CONFIG_CLK_BCM_63XX)	+= clk-bcm63xx.o
 obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona.o
 obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona-setup.o
 obj-$(CONFIG_CLK_BCM_KONA)	+= clk-bcm281xx.o
diff --git a/drivers/clk/bcm/clk-bcm63xx.c b/drivers/clk/bcm/clk-bcm63xx.c
new file mode 100644
index 000000000000..fbc17ae5ff2b
--- /dev/null
+++ b/drivers/clk/bcm/clk-bcm63xx.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2015 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/init.h>
+#include <linux/clk-provider.h>
+#include <linux/of.h>
+#include "clk-iproc.h"
+
+static void __init bcm63138_armpll_init(struct device_node *node)
+{
+	iproc_armpll_setup(node);
+}
+CLK_OF_DECLARE(bcm63138_armpll, "brcm,bcm63138-armpll", bcm63138_armpll_init);
-- 
2.1.0

[PATCH v4 3/3] ARM: dts: BCM63xx: Add ARMPLL device tree nodes

[Florian Fainelli]

Add the ARM PLL controller which comes standard with the Cortex-A9 found
on the BCM63138 SoCs. This is the same controller as the one found in
the Broadcom iProc architecture, however, we have a separate compatible
string to indicate the integration difference, since the hardware is
different.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes in v4:
- properly reflect the HW clocking and make it clear that periph_clk
  is feeding into the ARM PLL clock domain

No changes in v2 or v3

 arch/arm/boot/dts/bcm63138.dtsi | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
index 34cd64051250..d0560e8cd6de 100644
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -43,18 +43,31 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		arm_timer_clk: arm_timer_clk {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <500000000>;
-		};
-
+		/* UBUS peripheral clock */
 		periph_clk: periph_clk {
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <50000000>;
 			clock-output-names = "periph";
 		};
+
+		/* peripheral clock for system timer */
+		axi_clk: axi_clk {
+			#clock-cells = <0>;
+			compatible = "fixed-factor-clock";
+			clocks = <&armpll>;
+			clock-div = <2>;
+			clock-mult = <1>;
+		};
+
+		/* APB bus clock */
+		apb_clk: apb_clk {
+			#clock-cells = <0>;
+			compatible = "fixed-factor-clock";
+			clocks = <&armpll>;
+			clock-div = <4>;
+			clock-mult = <1>;
+		};
 	};
 
 	/* ARM bus */
@@ -93,14 +106,14 @@
 			compatible = "arm,cortex-a9-global-timer";
 			reg = <0x1e200 0x20>;
 			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&arm_timer_clk>;
+			clocks = <&axi_clk>;
 		};
 
 		local_timer: local-timer@1e600 {
 			compatible = "arm,cortex-a9-twd-timer";
 			reg = <0x1e600 0x20>;
 			interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&arm_timer_clk>;
+			clocks = <&axi_clk>;
 		};
 
 		twd_watchdog: watchdog@1e620 {
@@ -109,6 +122,13 @@
 			interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
+		armpll: armpll {
+			#clock-cells = <0>;
+			compatible = "brcm,bcm63138-armpll";
+			clocks = <&periph_clk>;
+			reg = <0x20000 0xf00>;
+		};
+
 		pmb0: reset-controller@4800c0 {
 			compatible = "brcm,bcm63138-pmb";
 			reg = <0x4800c0 0x10>;
-- 
2.1.0

Re: [PATCH v4 0/3] clk: Broadcom BCM63138 support

[Florian Fainelli]

On 29/10/15 18:23, Florian Fainelli wrote:
> This patch series adds support for the Broadcom BCM63138 DSL SoCs
> clocking framework.
> 
> Since the HW is identical to the one found in Broadcom iProc SoCs, but the
> integration is different (obviously), there is still a new compatible string
> introduced just in case we happen to find issues in the future.
> 
> Stephen, could you stage the two patches in a clk-bcm63xx branch that I could
> later utilize while doing the arm-soc DT pull request?

Stephen, can you queue the first two patches in a topic branch for me to
merge as part of the commit adding the DTS changes?

Thanks!

> 
> Thank you!
> 
> Florian Fainelli (3):
>   clk: iproc: Extend binding to cover BCM63138
>   clk: bcm: Add BCM63138 clock support
>   ARM: dts: BCM63xx: Add ARMPLL device tree nodes
> 
>  .../bindings/clock/brcm,iproc-clocks.txt           |  5 +++
>  arch/arm/boot/dts/bcm63138.dtsi                    | 36 +++++++++++++++++-----
>  drivers/clk/bcm/Kconfig                            | 10 ++++++
>  drivers/clk/bcm/Makefile                           |  1 +
>  drivers/clk/bcm/clk-bcm63xx.c                      | 22 +++++++++++++
>  5 files changed, 66 insertions(+), 8 deletions(-)
>  create mode 100644 drivers/clk/bcm/clk-bcm63xx.c
> 


-- 
Florian

Re: [PATCH v4 0/3] clk: Broadcom BCM63138 support

[Florian Fainelli]

On 19/11/15 17:00, Florian Fainelli wrote:
> On 29/10/15 18:23, Florian Fainelli wrote:
>> This patch series adds support for the Broadcom BCM63138 DSL SoCs
>> clocking framework.
>>
>> Since the HW is identical to the one found in Broadcom iProc SoCs, but the
>> integration is different (obviously), there is still a new compatible string
>> introduced just in case we happen to find issues in the future.
>>
>> Stephen, could you stage the two patches in a clk-bcm63xx branch that I could
>> later utilize while doing the arm-soc DT pull request?
> 
> Stephen, can you queue the first two patches in a topic branch for me to
> merge as part of the commit adding the DTS changes?

Well, now that I look back at the changes, you can actually merge the
two patches in clk-next, and the DTS changes can come in before or
after, it does not really matter, this would not cause breakage or
anything. Sorry for the noise.

> 
> Thanks!
> 
>>
>> Thank you!
>>
>> Florian Fainelli (3):
>>   clk: iproc: Extend binding to cover BCM63138
>>   clk: bcm: Add BCM63138 clock support
>>   ARM: dts: BCM63xx: Add ARMPLL device tree nodes
>>
>>  .../bindings/clock/brcm,iproc-clocks.txt           |  5 +++
>>  arch/arm/boot/dts/bcm63138.dtsi                    | 36 +++++++++++++++++-----
>>  drivers/clk/bcm/Kconfig                            | 10 ++++++
>>  drivers/clk/bcm/Makefile                           |  1 +
>>  drivers/clk/bcm/clk-bcm63xx.c                      | 22 +++++++++++++
>>  5 files changed, 66 insertions(+), 8 deletions(-)
>>  create mode 100644 drivers/clk/bcm/clk-bcm63xx.c
>>
> 
> 


-- 
Florian

Re: [PATCH v4 0/3] clk: Broadcom BCM63138 support

[Stephen Boyd]

On 11/19, Florian Fainelli wrote:
> On 19/11/15 17:00, Florian Fainelli wrote:
> > On 29/10/15 18:23, Florian Fainelli wrote:
> >> This patch series adds support for the Broadcom BCM63138 DSL SoCs
> >> clocking framework.
> >>
> >> Since the HW is identical to the one found in Broadcom iProc SoCs, but the
> >> integration is different (obviously), there is still a new compatible string
> >> introduced just in case we happen to find issues in the future.
> >>
> >> Stephen, could you stage the two patches in a clk-bcm63xx branch that I could
> >> later utilize while doing the arm-soc DT pull request?
> > 
> > Stephen, can you queue the first two patches in a topic branch for me to
> > merge as part of the commit adding the DTS changes?
> 
> Well, now that I look back at the changes, you can actually merge the
> two patches in clk-next, and the DTS changes can come in before or
> after, it does not really matter, this would not cause breakage or
> anything. Sorry for the noise.

Really? I thought if the clk patches aren't there then the dts
change would cause some clocks to be orphaned. If that's ok with
you it's ok with me.

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

Re: [PATCH v4 0/3] clk: Broadcom BCM63138 support

[Florian Fainelli]

On 20/11/15 10:46, Stephen Boyd wrote:
> On 11/19, Florian Fainelli wrote:
>> On 19/11/15 17:00, Florian Fainelli wrote:
>>> On 29/10/15 18:23, Florian Fainelli wrote:
>>>> This patch series adds support for the Broadcom BCM63138 DSL SoCs
>>>> clocking framework.
>>>>
>>>> Since the HW is identical to the one found in Broadcom iProc SoCs, but the
>>>> integration is different (obviously), there is still a new compatible string
>>>> introduced just in case we happen to find issues in the future.
>>>>
>>>> Stephen, could you stage the two patches in a clk-bcm63xx branch that I could
>>>> later utilize while doing the arm-soc DT pull request?
>>>
>>> Stephen, can you queue the first two patches in a topic branch for me to
>>> merge as part of the commit adding the DTS changes?
>>
>> Well, now that I look back at the changes, you can actually merge the
>> two patches in clk-next, and the DTS changes can come in before or
>> after, it does not really matter, this would not cause breakage or
>> anything. Sorry for the noise.
> 
> Really? I thought if the clk patches aren't there then the dts
> change would cause some clocks to be orphaned. If that's ok with
> you it's ok with me.

Woah, I guess I was not thinking very clearly yesterday, yes, we need to
bundle these changes together, so if you are still okay with the topic
branch for me to include as a merge commit, that's fine with me as well.

/me needs to think twice before typing.
-- 
Florian

Re: [PATCH v4 1/3] clk: iproc: Extend binding to cover BCM63138

[Stephen Boyd]

On 10/29, Florian Fainelli wrote:
> Broadcom BCM63138 DSL SoCs have the same ARMPLL clocking infrastructure
> as the Cygnus and iProc chips, add a dedicated compatible string and
> document that the ARMPLL node is a valid node for this chip.
> 
> Acked-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

Applied to clk-bcm63xx

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

Re: [PATCH v4 2/3] clk: bcm: Add BCM63138 clock support

[Stephen Boyd]

On 10/29, Florian Fainelli wrote:
> BCM63138 has a simple clocking domain which is primarily the ARMPLL
> clocking complex, from which the ARM (CPU), APB and AXI clocks would be
> derived from.
> 
> Since the ARMPLL controller is entirely compatible with the iProc ARM
> PLL, we just initialize it without additional parameters.
> 
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

Applied to clk-bcm63xx

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

Re: [PATCH v4 0/3] clk: Broadcom BCM63138 support

[Stephen Boyd]

On 11/20, Florian Fainelli wrote:
> On 20/11/15 10:46, Stephen Boyd wrote:
> > On 11/19, Florian Fainelli wrote:
> >> On 19/11/15 17:00, Florian Fainelli wrote:
> >>> On 29/10/15 18:23, Florian Fainelli wrote:
> >>>> This patch series adds support for the Broadcom BCM63138 DSL SoCs
> >>>> clocking framework.
> >>>>
> >>>> Since the HW is identical to the one found in Broadcom iProc SoCs, but the
> >>>> integration is different (obviously), there is still a new compatible string
> >>>> introduced just in case we happen to find issues in the future.
> >>>>
> >>>> Stephen, could you stage the two patches in a clk-bcm63xx branch that I could
> >>>> later utilize while doing the arm-soc DT pull request?
> >>>
> >>> Stephen, can you queue the first two patches in a topic branch for me to
> >>> merge as part of the commit adding the DTS changes?
> >>
> >> Well, now that I look back at the changes, you can actually merge the
> >> two patches in clk-next, and the DTS changes can come in before or
> >> after, it does not really matter, this would not cause breakage or
> >> anything. Sorry for the noise.
> > 
> > Really? I thought if the clk patches aren't there then the dts
> > change would cause some clocks to be orphaned. If that's ok with
> > you it's ok with me.
> 
> Woah, I guess I was not thinking very clearly yesterday, yes, we need to
> bundle these changes together, so if you are still okay with the topic
> branch for me to include as a merge commit, that's fine with me as well.

Ok. Done.

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

Re: [PATCH v4 3/3] ARM: dts: BCM63xx: Add ARMPLL device tree nodes

[Florian Fainelli]

On 29/10/15 18:23, Florian Fainelli wrote:
> Add the ARM PLL controller which comes standard with the Cortex-A9 found
> on the BCM63138 SoCs. This is the same controller as the one found in
> the Broadcom iProc architecture, however, we have a separate compatible
> string to indicate the integration difference, since the hardware is
> different.
> 
> Signed-off-by: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Applied to devicetree/next with a merge commit of clk/clk-bcm63xx to
resolve dependencies.
-- 
Florian
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 3/3] ARM: dts: BCM63xx: Add ARMPLL device tree nodes

[Florian Fainelli]

On 29/10/15 18:23, Florian Fainelli wrote:
> Add the ARM PLL controller which comes standard with the Cortex-A9 found
> on the BCM63138 SoCs. This is the same controller as the one found in
> the Broadcom iProc architecture, however, we have a separate compatible
> string to indicate the integration difference, since the hardware is
> different.
> 
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Applied to devicetree/next with a merge commit of clk/clk-bcm63xx to
resolve dependencies.
-- 
Florian