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

Groups > linux.kernel > #1654269 > unrolled thread

[PATCH v2 0/7] Improve ap806 clk support on Marvell Armada 7K/8K

Started byGregory CLEMENT <gregory.clement@free-electrons.com>
First post2017-05-31 16:10 +0200
Last post2017-06-02 16:00 +0200
Articles 6 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 0/7] Improve ap806 clk support on Marvell Armada 7K/8K Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-05-31 16:10 +0200
    [PATCH v2 4/7] dt-bindings: ap806: introduce a new binding Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-05-31 16:10 +0200
    [PATCH v2 2/7] dt-bindings: ap806: do not depend anymore of the *-clock-output-names Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-05-31 16:10 +0200
    [PATCH v2 7/7] arm64: dts: marvell: use new binding for the system controller on ap806 Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-05-31 16:10 +0200
    Re: [PATCH v2 0/7] Improve ap806 clk support on Marvell Armada 7K/8K Michael Turquette <mturquette@baylibre.com> - 2017-06-01 12:00 +0200
      Re: [PATCH v2 0/7] Improve ap806 clk support on Marvell Armada 7K/8K Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-06-02 16:00 +0200

#1654269 — [PATCH v2 0/7] Improve ap806 clk support on Marvell Armada 7K/8K

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2017-05-31 16:10 +0200
Subject[PATCH v2 0/7] Improve ap806 clk support on Marvell Armada 7K/8K
Message-ID<tNctX-5S4-3@gated-at.bofh.it>
Hi,

This series modifies the device tree binding of the clock of the AP806
part that we find in the Marvell Armada 7K/8K SoCs.

As for the previsous series the only change in this second version is
about the binding documentation: all the documentation related changes
are now move in their own patches. It allows to provide a stable -dt
branch for theses changes. I also added the acked-by from Rob Herring.

Here again the last two patches modifying the device tree _must_ be
merged through the mvebu tree to avoid future conflict.

For the record:
As for the CP110, we want to be able to ease the integration of new
clocks without breaking the backward compatibility. It is done in
patch 3.

We also want to ease the integration of the pinctrl node in the device
tree. It is the purpose of the patch 5.

In this series (as in the previous one for CP110), even if there is
some change in the device tree binding we paid attention to the
backward compatibility, and the driver can still work with the old
device tree.

Thanks,

Gregory

Gregory CLEMENT (7):
  clk: mvebu: ap806: cosmetic improvement
  dt-bindings: ap806: do not depend anymore of the *-clock-output-names
  clk: mvebu: ap806: do not depend anymore of the *-clock-output-names
  dt-bindings: ap806: introduce a new binding
  clk: mvebu: ap806: introduce a new binding
  arm64: dts: marvell: remove clock-output-names on ap806
  arm64: dts: marvell: use new binding for the system controller on ap806

 Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt |  24 ++++++++++------
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi                             |  23 +++++++--------
 drivers/clk/mvebu/ap806-system-controller.c                               | 107 +++++++++++++++++++++++++++++++++++++++++++++++-------------------------
 3 files changed, 97 insertions(+), 57 deletions(-)

base-commit: 4139fcd6c66df1c3d3fa0a0a7cf7f8a8c601a16c
-- 
git-series 0.9.1

[toc] | [next] | [standalone]

#1654271 — [PATCH v2 4/7] dt-bindings: ap806: introduce a new binding

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2017-05-31 16:10 +0200
Subject[PATCH v2 4/7] dt-bindings: ap806: introduce a new binding
Message-ID<tNctY-5S4-13@gated-at.bofh.it>
In reply to#1654269
This patch updates the documentation according to the changes made in the
patch "clk: mvebu: ap806: introduce a new binding"

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt b/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt
index 3faab71dff9f..888c50e0d64f 100644
--- a/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt
+++ b/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt
@@ -7,6 +7,14 @@ registers giving access to numerous features: clocks, pin-muxing and
 many other SoC configuration items. This DT binding allows to describe
 this system controller.
 
+For the top level node:
+ - compatible: must be: "syscon", "simple-mfd";
+  - reg: register area of the AP806 system controller
+
+Clocks:
+-------
+
+
 The Device Tree node representing the AP806 system controller provides
 a number of clocks:
 
@@ -17,15 +25,17 @@ a number of clocks:
 
 Required properties:
 
- - compatible: must be:
-     "marvell,ap806-system-controller", "syscon"
- - reg: register area of the AP806 system controller
+ - compatible: must be: "marvell,ap806-clock"
  - #clock-cells: must be set to 1
 
 Example:
 
 	syscon: system-controller@6f4000 {
-		compatible = "marvell,ap806-system-controller", "syscon";
-		#clock-cells = <1>;
+		compatible = "syscon", "simple-mfd";
 		reg = <0x6f4000 0x1000>;
+
+		ap_clk: clock {
+			compatible = "marvell,ap806-clock";
+			#clock-cells = <1>;
+		};
 	};
-- 
git-series 0.9.1

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

#1654276 — [PATCH v2 2/7] dt-bindings: ap806: do not depend anymore of the *-clock-output-names

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2017-05-31 16:10 +0200
Subject[PATCH v2 2/7] dt-bindings: ap806: do not depend anymore of the *-clock-output-names
Message-ID<tNctZ-5S4-29@gated-at.bofh.it>
In reply to#1654269
This patch updates the documentation according to the change made in the
patch "clk: mvebu: ap806: do not depend anymore of the
*-clock-output-names": the clock names are no more part of the binding.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt b/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt
index 8968371d84e2..3faab71dff9f 100644
--- a/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt
+++ b/Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt
@@ -21,15 +21,11 @@ Required properties:
      "marvell,ap806-system-controller", "syscon"
  - reg: register area of the AP806 system controller
  - #clock-cells: must be set to 1
- - clock-output-names: must be defined to:
-    "ap-cpu-cluster-0", "ap-cpu-cluster-1", "ap-fixed", "ap-mss"
 
 Example:
 
 	syscon: system-controller@6f4000 {
 		compatible = "marvell,ap806-system-controller", "syscon";
 		#clock-cells = <1>;
-		clock-output-names = "ap-cpu-cluster-0", "ap-cpu-cluster-1",
-				     "ap-fixed", "ap-mss";
 		reg = <0x6f4000 0x1000>;
 	};
-- 
git-series 0.9.1

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

#1654287 — [PATCH v2 7/7] arm64: dts: marvell: use new binding for the system controller on ap806

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2017-05-31 16:10 +0200
Subject[PATCH v2 7/7] arm64: dts: marvell: use new binding for the system controller on ap806
Message-ID<tNcu0-5S4-55@gated-at.bofh.it>
In reply to#1654269
The new binding for the system controller on ap806 moved the clock into a
subnode. This preliminary step will allow to add gpio and pinctrl
subnodes

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 0c25ec62a2a3..205037e3e7dc 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -193,7 +193,7 @@
 				#size-cells = <0>;
 				cell-index = <0>;
 				interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&ap_syscon 3>;
+				clocks = <&ap_clk 3>;
 				status = "disabled";
 			};
 
@@ -204,7 +204,7 @@
 				#size-cells = <0>;
 				interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
 				timeout-ms = <1000>;
-				clocks = <&ap_syscon 3>;
+				clocks = <&ap_clk 3>;
 				status = "disabled";
 			};
 
@@ -214,7 +214,7 @@
 				reg-shift = <2>;
 				interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 				reg-io-width = <1>;
-				clocks = <&ap_syscon 3>;
+				clocks = <&ap_clk 3>;
 				status = "disabled";
 			};
 
@@ -224,7 +224,7 @@
 				reg-shift = <2>;
 				interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
 				reg-io-width = <1>;
-				clocks = <&ap_syscon 3>;
+				clocks = <&ap_clk 3>;
 				status = "disabled";
 
 			};
@@ -234,17 +234,20 @@
 				reg = <0x6e0000 0x300>;
 				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
 				clock-names = "core";
-				clocks = <&ap_syscon 4>;
+				clocks = <&ap_clk 4>;
 				dma-coherent;
 				marvell,xenon-phy-slow-mode;
 				status = "disabled";
 			};
 
 			ap_syscon: system-controller@6f4000 {
-				compatible = "marvell,ap806-system-controller",
-					     "syscon";
-				#clock-cells = <1>;
+				compatible = "syscon", "simple-mfd";
 				reg = <0x6f4000 0x1000>;
+
+				ap_clk: clock {
+					compatible = "marvell,ap806-clock";
+					#clock-cells = <1>;
+				};
 			};
 		};
 	};
-- 
git-series 0.9.1

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

#1654976

FromMichael Turquette <mturquette@baylibre.com>
Date2017-06-01 12:00 +0200
Message-ID<tNv3D-Uw-33@gated-at.bofh.it>
In reply to#1654269
Hi Gregory,

Quoting Gregory CLEMENT (2017-05-31 23:07:21)
> Hi,
> 
> This series modifies the device tree binding of the clock of the AP806
> part that we find in the Marvell Armada 7K/8K SoCs.
> 
> As for the previsous series the only change in this second version is
> about the binding documentation: all the documentation related changes
> are now move in their own patches. It allows to provide a stable -dt
> branch for theses changes. I also added the acked-by from Rob Herring.
> 
> Here again the last two patches modifying the device tree _must_ be
> merged through the mvebu tree to avoid future conflict.

The approach (and the patches) look good to me. I took the DT binding
description changes (patches 2 & 4) into clk-ap806-dt stable branch:

https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806-dt

Anyone can merge the above branch if they need it as a dep.

The driver changes (patches 1, 3 & 5) are merged on into clk-ap806,
which is based on top of clk-ap806-dt:

https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806

Everything has been merged into clk-next. I did not touch the .dts files
at all.

Regards,
Mike

> 
> For the record:
> As for the CP110, we want to be able to ease the integration of new
> clocks without breaking the backward compatibility. It is done in
> patch 3.
> 
> We also want to ease the integration of the pinctrl node in the device
> tree. It is the purpose of the patch 5.
> 
> In this series (as in the previous one for CP110), even if there is
> some change in the device tree binding we paid attention to the
> backward compatibility, and the driver can still work with the old
> device tree.
> 
> Thanks,
> 
> Gregory
> 
> Gregory CLEMENT (7):
>   clk: mvebu: ap806: cosmetic improvement
>   dt-bindings: ap806: do not depend anymore of the *-clock-output-names
>   clk: mvebu: ap806: do not depend anymore of the *-clock-output-names
>   dt-bindings: ap806: introduce a new binding
>   clk: mvebu: ap806: introduce a new binding
>   arm64: dts: marvell: remove clock-output-names on ap806
>   arm64: dts: marvell: use new binding for the system controller on ap806
> 
>  Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt |  24 ++++++++++------
>  arch/arm64/boot/dts/marvell/armada-ap806.dtsi                             |  23 +++++++--------
>  drivers/clk/mvebu/ap806-system-controller.c                               | 107 +++++++++++++++++++++++++++++++++++++++++++++++-------------------------
>  3 files changed, 97 insertions(+), 57 deletions(-)
> 
> base-commit: 4139fcd6c66df1c3d3fa0a0a7cf7f8a8c601a16c
> -- 
> git-series 0.9.1

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

#1656228

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2017-06-02 16:00 +0200
Message-ID<tNVhp-1Vg-31@gated-at.bofh.it>
In reply to#1654976
Hi Michael,
 
 On jeu., juin 01 2017, Michael Turquette <mturquette@baylibre.com> wrote:

> Hi Gregory,
>
> Quoting Gregory CLEMENT (2017-05-31 23:07:21)
>> Hi,
>> 
>> This series modifies the device tree binding of the clock of the AP806
>> part that we find in the Marvell Armada 7K/8K SoCs.
>> 
>> As for the previsous series the only change in this second version is
>> about the binding documentation: all the documentation related changes
>> are now move in their own patches. It allows to provide a stable -dt
>> branch for theses changes. I also added the acked-by from Rob Herring.
>> 
>> Here again the last two patches modifying the device tree _must_ be
>> merged through the mvebu tree to avoid future conflict.
>
> The approach (and the patches) look good to me. I took the DT binding
> description changes (patches 2 & 4) into clk-ap806-dt stable branch:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806-dt
>
> Anyone can merge the above branch if they need it as a dep.
>
> The driver changes (patches 1, 3 & 5) are merged on into clk-ap806,
> which is based on top of clk-ap806-dt:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806
>
> Everything has been merged into clk-next. I did not touch the .dts files
> at all.
>

Perfect I will take care of the dts patch.

What about the other series on cp110?
a clk_cp110-dt branch will be needed too for the pinctrl series.

Thanks,

Gregory


> Regards,
> Mike
>
>> 
>> For the record:
>> As for the CP110, we want to be able to ease the integration of new
>> clocks without breaking the backward compatibility. It is done in
>> patch 3.
>> 
>> We also want to ease the integration of the pinctrl node in the device
>> tree. It is the purpose of the patch 5.
>> 
>> In this series (as in the previous one for CP110), even if there is
>> some change in the device tree binding we paid attention to the
>> backward compatibility, and the driver can still work with the old
>> device tree.
>> 
>> Thanks,
>> 
>> Gregory
>> 
>> Gregory CLEMENT (7):
>>   clk: mvebu: ap806: cosmetic improvement
>>   dt-bindings: ap806: do not depend anymore of the *-clock-output-names
>>   clk: mvebu: ap806: do not depend anymore of the *-clock-output-names
>>   dt-bindings: ap806: introduce a new binding
>>   clk: mvebu: ap806: introduce a new binding
>>   arm64: dts: marvell: remove clock-output-names on ap806
>>   arm64: dts: marvell: use new binding for the system controller on ap806
>> 
>>  Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt |  24 ++++++++++------
>>  arch/arm64/boot/dts/marvell/armada-ap806.dtsi                             |  23 +++++++--------
>>  drivers/clk/mvebu/ap806-system-controller.c                               | 107 +++++++++++++++++++++++++++++++++++++++++++++++-------------------------
>>  3 files changed, 97 insertions(+), 57 deletions(-)
>> 
>> base-commit: 4139fcd6c66df1c3d3fa0a0a7cf7f8a8c601a16c
>> -- 
>> git-series 0.9.1
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web