arm: mvebu: Various mvebu clock fixes/improvements

arm: mvebu: Various mvebu clock fixes/improvements

[Thomas Petazzoni]

Andrew,

You'll find enclosed seven patches brigging fixes and improvements to
the CLK support on mvebu platforms. You can either squash them into
your current clk series if you intend to send a new version of it to
Jason, or forward the patches as follow-up patches to Jason after
reviewing.

In summary:

 * Patch 1 fixes a real problem: the gating clocks are not registered
   on Armada 370/XP.

 * Patch 2, 3, 5 and 6 are more cosmetic patches, but I think they are
   good to have.

 * Patch 4 implements a fix that we've been discussing: moving the
   Armada XP CPU clocks down to the individual armada-xp-mv78xxx.dtsi
   files.

 * Patch 7 fixes the references to the SATA clocks on Armada
   370/XP. Without this patch, Armada 370 currently hangs at boot when
   trying to initialize SATA.

Thanks,

Thomas

[PATCH 1/7] clk: mvebu: init all mvebu clock types from mvebu_clocks_init()

[Thomas Petazzoni]

The mvebu_clocks_init() function should register all the mvebu clock
types, so that all mvebu platforms only have to call
mvebu_clocks_init().

This fixes mach-mvebu because mvebu_clk_gating_init() was never called
and therefore none of the gating clocks were registered.

mach-kirkwood and mach-dove are updated to not call
mvebu_clk_gating_init() a second time. Thanks to this, it is no longer
necessary to expose mvebu_clk_gating_init() beyond the clock
framework, so we get rid of its prototype in <linux/clk/mvebu.h> and
we add it in a private drivers/clk/mvebu/clk-gating-ctrl.h header
file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/mach-dove/common.c         |    1 -
 arch/arm/mach-kirkwood/board-dt.c   |    1 -
 drivers/clk/mvebu/clk-gating-ctrl.h |   18 ++++++++++++++++++
 drivers/clk/mvebu/clk.c             |    2 ++
 include/linux/clk/mvebu.h           |    1 -
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/clk/mvebu/clk-gating-ctrl.h

diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 4b09d12..6a2c4dc 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -421,7 +421,6 @@ static void __init dove_legacy_clk_init(void)
 static void __init dove_of_clk_init(void)
 {
 	mvebu_clocks_init();
-	mvebu_clk_gating_init();
 	dove_legacy_clk_init();
 }
 
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index f55393b..40db4a8 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -80,7 +80,6 @@ static void __init kirkwood_legacy_clk_init(void)
 static void __init kirkwood_of_clk_init(void)
 {
 	mvebu_clocks_init();
-	mvebu_clk_gating_init();
 	kirkwood_legacy_clk_init();
 }
 
diff --git a/drivers/clk/mvebu/clk-gating-ctrl.h b/drivers/clk/mvebu/clk-gating-ctrl.h
new file mode 100644
index 0000000..20cc4ad
--- /dev/null
+++ b/drivers/clk/mvebu/clk-gating-ctrl.h
@@ -0,0 +1,18 @@
+/*
+ * Marvell EBU gating clock handling
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __MVEBU_CLK_GATING_H
+#define __MVEBU_CLK_GATING_H
+
+void __init mvebu_clk_gating_init(void);
+
+#endif
diff --git a/drivers/clk/mvebu/clk.c b/drivers/clk/mvebu/clk.c
index dc310d6..3f0e43e 100644
--- a/drivers/clk/mvebu/clk.c
+++ b/drivers/clk/mvebu/clk.c
@@ -17,6 +17,7 @@
 #include <linux/of.h>
 #include "clk-core.h"
 #include "clk-cpu.h"
+#include "clk-gating-ctrl.h"
 
 static const __initconst struct of_device_id clk_match[] = {
 #ifdef CONFIG_MVEBU_CLK_CPU
@@ -33,5 +34,6 @@ static const __initconst struct of_device_id clk_match[] = {
 void __init mvebu_clocks_init(void)
 {
 	mvebu_core_clk_init();
+	mvebu_clk_gating_init();
 	of_clk_init(clk_match);
 }
diff --git a/include/linux/clk/mvebu.h b/include/linux/clk/mvebu.h
index 70c366f..8c4ae71 100644
--- a/include/linux/clk/mvebu.h
+++ b/include/linux/clk/mvebu.h
@@ -18,6 +18,5 @@
 #define __CLK_MVEBU_H_
 
 void __init mvebu_clocks_init(void);
-void mvebu_clk_gating_init(void);
 
 #endif
-- 
1.7.9.5

[PATCH 2/7] clk: mvebu: move clk-cpu compatible strings into the clk-cpu driver

[Thomas Petazzoni]

Both the clk-core and clk-gating drivers define their compatible
string in their own .c file and provide an initialization function to
register the clock types. clk-cpu was not doing the same: it was
defining its compatible string directly in clk.c, and calling
of_clk_init() from here.

For consistency reasons, this patch moves the clk-cpu compatible
string in clk-cpu.c, and implements a proper mvebu_cpu_clk_init()
function like the other two clock drivers.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 drivers/clk/mvebu/clk-cpu.c |   15 +++++++++++++++
 drivers/clk/mvebu/clk-cpu.h |    6 +++++-
 drivers/clk/mvebu/clk.c     |   14 +-------------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 1df027a..3d7c9f1 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -153,3 +153,18 @@ bail_out:
 	kfree(clks);
 	kfree(cpuclk);
 }
+
+static const __initconst struct of_device_id clk_cpu_match[] = {
+	{
+		.compatible = "marvell,armada-xp-cpu-clockctrl",
+		.data = of_cpu_clk_setup,
+	},
+	{
+		/* sentinel */
+	},
+};
+
+void __init mvebu_cpu_clk_init(void)
+{
+	of_clk_init(clk_cpu_match);
+}
diff --git a/drivers/clk/mvebu/clk-cpu.h b/drivers/clk/mvebu/clk-cpu.h
index e208336..08e2aff 100644
--- a/drivers/clk/mvebu/clk-cpu.h
+++ b/drivers/clk/mvebu/clk-cpu.h
@@ -13,6 +13,10 @@
 #ifndef __MVEBU_CLK_CPU_H
 #define __MVEBU_CLK_CPU_H
 
-void __init of_cpu_clk_setup(struct device_node *node);
+#ifdef CONFIG_MVEBU_CLK_CPU
+void __init mvebu_cpu_clk_init(void);
+#else
+static inline void mvebu_cpu_clk_init(void) {}
+#endif
 
 #endif
diff --git a/drivers/clk/mvebu/clk.c b/drivers/clk/mvebu/clk.c
index 3f0e43e..e3bc036 100644
--- a/drivers/clk/mvebu/clk.c
+++ b/drivers/clk/mvebu/clk.c
@@ -19,21 +19,9 @@
 #include "clk-cpu.h"
 #include "clk-gating-ctrl.h"
 
-static const __initconst struct of_device_id clk_match[] = {
-#ifdef CONFIG_MVEBU_CLK_CPU
-	{
-		.compatible = "marvell,armada-xp-cpu-clockctrl",
-		.data = of_cpu_clk_setup,
-	},
-#endif
-	{
-		/* sentinel */
-	}
-};
-
 void __init mvebu_clocks_init(void)
 {
 	mvebu_core_clk_init();
 	mvebu_clk_gating_init();
-	of_clk_init(clk_match);
+	mvebu_cpu_clk_init();
 }
-- 
1.7.9.5

[PATCH 3/7] clk: mvebu: rename mvebu_clk_gating_init() to mvebu_gating_clk_init()

[Thomas Petazzoni]

For consistency with mvebu_core_clk_init() and mvebu_cpu_clk_init(),
rename mvebu_clk_gating_init() to mvebu_gating_clk_init(), so we have
the nice sequence:

	mvebu_core_clk_init();
	mvebu_gating_clk_init();
	mvebu_cpu_clk_init();

in mvebu_clocks_init().

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 drivers/clk/mvebu/clk-gating-ctrl.c |    2 +-
 drivers/clk/mvebu/clk-gating-ctrl.h |    2 +-
 drivers/clk/mvebu/clk.c             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c
index e640d5c..745a908 100644
--- a/drivers/clk/mvebu/clk-gating-ctrl.c
+++ b/drivers/clk/mvebu/clk-gating-ctrl.c
@@ -225,7 +225,7 @@ static const __initdata struct of_device_id clk_gating_match[] = {
 	{ }
 };
 
-void __init mvebu_clk_gating_init(void)
+void __init mvebu_gating_clk_init(void)
 {
 	struct device_node *np;
 
diff --git a/drivers/clk/mvebu/clk-gating-ctrl.h b/drivers/clk/mvebu/clk-gating-ctrl.h
index 20cc4ad..f9cde9b 100644
--- a/drivers/clk/mvebu/clk-gating-ctrl.h
+++ b/drivers/clk/mvebu/clk-gating-ctrl.h
@@ -13,6 +13,6 @@
 #ifndef __MVEBU_CLK_GATING_H
 #define __MVEBU_CLK_GATING_H
 
-void __init mvebu_clk_gating_init(void);
+void __init mvebu_gating_clk_init(void);
 
 #endif
diff --git a/drivers/clk/mvebu/clk.c b/drivers/clk/mvebu/clk.c
index e3bc036..855681b 100644
--- a/drivers/clk/mvebu/clk.c
+++ b/drivers/clk/mvebu/clk.c
@@ -22,6 +22,6 @@
 void __init mvebu_clocks_init(void)
 {
 	mvebu_core_clk_init();
-	mvebu_clk_gating_init();
+	mvebu_gating_clk_init();
 	mvebu_cpu_clk_init();
 }
-- 
1.7.9.5

[PATCH 4/7] arm: mvebu: move DT cpu clock nodes to the Armada XP specific .dtsi

[Thomas Petazzoni]

The cpu clock nodes have originally been added in
armada-xp.dtsi. However, this .dtsi file is common to all SoCs in the
Armada XP family: the MV78230, the MV78260 and the MV78460. Those SoCs
differ in a number of ways, but one of the main difference is the
number of CPUs: one CPU in the MV78230, two CPUs in the MV78260 and
four CPUs in the MV78460.

Therefore, this patch moves the cpu clock DT nodes into the
armada-xp-mv78230.dtsi, armada-xp-mv78260.dtsi and
armada-xp-mv78460.dtsi files, instantiating the right number of CPUs
and CPU clocks as needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-xp-mv78230.dtsi |   11 +++++++++++
 arch/arm/boot/dts/armada-xp-mv78260.dtsi |   17 +++++++++++++++++
 arch/arm/boot/dts/armada-xp-mv78460.dtsi |   30 ++++++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-xp.dtsi         |   29 -----------------------------
 4 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index ea35519..0be699b 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -24,6 +24,17 @@
 		gpio1 = &gpio1;
 	};
 
+	cpus {
+	    #address-cells = <1>;
+	    #size-cells = <0>;
+
+	    cpu at 0 {
+		compatible = "marvell,sheeva-v7";
+		reg = <0>;
+		clocks = <&cpuclk 0>;
+	    };
+	}
+
 	soc {
 		pinctrl {
 			compatible = "marvell,mv78230-pinctrl";
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 2057863..4417b87 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -25,6 +25,23 @@
 		gpio2 = &gpio2;
 	};
 
+	cpus {
+	    #address-cells = <1>;
+	    #size-cells = <0>;
+
+	    cpu at 0 {
+		compatible = "marvell,sheeva-v7";
+		reg = <0>;
+		clocks = <&cpuclk 0>;
+	    };
+
+	    cpu at 1 {
+		compatible = "marvell,sheeva-v7";
+		reg = <1>;
+		clocks = <&cpuclk 1>;
+	    };
+	};
+
 	soc {
 		pinctrl {
 			compatible = "marvell,mv78260-pinctrl";
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index ffac983..1313c3e 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -25,6 +25,36 @@
 		gpio2 = &gpio2;
 	};
 
+
+	cpus {
+	    #address-cells = <1>;
+	    #size-cells = <0>;
+
+	    cpu at 0 {
+		compatible = "marvell,sheeva-v7";
+		reg = <0>;
+		clocks = <&cpuclk 0>;
+	    };
+
+	    cpu at 1 {
+		compatible = "marvell,sheeva-v7";
+		reg = <1>;
+		clocks = <&cpuclk 1>;
+	    };
+
+	    cpu at 2 {
+		compatible = "marvell,sheeva-v7";
+		reg = <2>;
+		clocks = <&cpuclk 2>;
+	    };
+
+	    cpu at 3 {
+		compatible = "marvell,sheeva-v7";
+		reg = <3>;
+		clocks = <&cpuclk 3>;
+	    };
+	};
+
 	soc {
 		pinctrl {
 			compatible = "marvell,mv78460-pinctrl";
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 84cb87d..a3824ac 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -34,35 +34,6 @@
 		    <0xd0021870 0x58>;
 	};
 
-	cpus {
-	    #address-cells = <1>;
-	    #size-cells = <0>;
-
-	    cpu at 0 {
-		compatible = "marvell,sheeva-v7";
-		reg = <0>;
-		clocks = <&cpuclk 0>;
-	    };
-
-	    cpu at 1 {
-		compatible = "marvell,sheeva-v7";
-		reg = <1>;
-		clocks = <&cpuclk 1>;
-	    };
-
-	    cpu at 2 {
-		compatible = "marvell,sheeva-v7";
-		reg = <2>;
-		clocks = <&cpuclk 2>;
-	    };
-
-	    cpu at 3 {
-		compatible = "marvell,sheeva-v7";
-		reg = <3>;
-		clocks = <&cpuclk 3>;
-	    };
-	};
-
 	soc {
 		serial at d0012200 {
 				compatible = "ns16550";
-- 
1.7.9.5

[PATCH 5/7] clk: mvebu: rename *-core-clocks to *-core-clock

[Thomas Petazzoni]

Most of the existing clock drivers have a compatible string that ends
with "-clock", so change the compatible strings of the mvebu
clk-core.c driver to not have the final 's' in '*-core-clocks'.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../devicetree/bindings/clock/mvebu-core-clock.txt |   12 ++++++------
 arch/arm/boot/dts/armada-370.dtsi                  |    2 +-
 arch/arm/boot/dts/armada-xp.dtsi                   |    2 +-
 arch/arm/boot/dts/dove.dtsi                        |    2 +-
 arch/arm/boot/dts/kirkwood.dtsi                    |    2 +-
 drivers/clk/mvebu/clk-core.c                       |   10 +++++-----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
index ffb3d69..1e66294 100644
--- a/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
+++ b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
@@ -19,11 +19,11 @@ The following is a list of provided IDs and clock names on Kirkwood and Dove:
 
 Required properties:
 - compatible : shall be one of the following:
-	"marvell,armada-370-core-clocks" - For Armada 370 SoC core clocks
-	"marvell,armada-xp-core-clocks" - For Armada XP SoC core clocks
-	"marvell,dove-core-clocks" - for Dove SoC core clocks
-	"marvell,kirkwood-core-clocks" - for Kirkwood SoC (except mv88f6180)
-	"marvell,mv88f6180-core-clocks" - for Kirkwood MV88f6180 SoC
+	"marvell,armada-370-core-clock" - For Armada 370 SoC core clocks
+	"marvell,armada-xp-core-clock" - For Armada XP SoC core clocks
+	"marvell,dove-core-clock" - for Dove SoC core clocks
+	"marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180)
+	"marvell,mv88f6180-core-clock" - for Kirkwood MV88f6180 SoC
 - reg : shall be the register address of the Sample-At-Reset (SAR) register
 - #clock-cells : from common clock binding; shall be set to 1
 
@@ -34,7 +34,7 @@ Optional properties:
 Example:
 
 core_clk: core-clocks at d0214 {
-	compatible = "marvell,dove-core-clocks";
+	compatible = "marvell,dove-core-clock";
 	reg = <0xd0214 0x4>;
 	#clock-cells = <1>;
 };
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index d4fac86..1ed9e5c 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -83,7 +83,7 @@
 		};
 
 		coreclk: mvebu-sar at d0018230 {
-			compatible = "marvell,armada-370-core-clocks";
+			compatible = "marvell,armada-370-core-clock";
 			reg = <0xd0018230 0x08>;
 			#clock-cells = <1>;
 		};
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index a3824ac..d05515c 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -55,7 +55,7 @@
 		};
 
 		coreclk: mvebu-sar at d0018230 {
-			compatible = "marvell,armada-xp-core-clocks";
+			compatible = "marvell,armada-xp-core-clock";
 			reg = <0xd0018230 0x08>;
 			#clock-cells = <1>;
 		};
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 8c8ab621..b524ee3 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -32,7 +32,7 @@
 		};
 
 		core_clk: core-clocks at d0214 {
-			compatible = "marvell,dove-core-clocks";
+			compatible = "marvell,dove-core-clock";
 			reg = <0xd0214 0x4>;
 			#clock-cells = <1>;
 		};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 46bfa3c..0e94750 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -24,7 +24,7 @@
 		#size-cells = <1>;
 
 		core_clk: core-clocks at 10030 {
-                	compatible = "marvell,kirkwood-core-clocks";
+			compatible = "marvell,kirkwood-core-clock";
 			reg = <0x10030 0x4>;
 	        	#clock-cells = <1>;
 		};
diff --git a/drivers/clk/mvebu/clk-core.c b/drivers/clk/mvebu/clk-core.c
index 7e715ae..69056a7 100644
--- a/drivers/clk/mvebu/clk-core.c
+++ b/drivers/clk/mvebu/clk-core.c
@@ -634,28 +634,28 @@ static const struct core_clocks mv88f6180_core_clocks = {
 static const __initdata struct of_device_id clk_core_match[] = {
 #ifdef CONFIG_MACH_ARMADA_370_XP
 	{
-		.compatible = "marvell,armada-370-core-clocks",
+		.compatible = "marvell,armada-370-core-clock",
 		.data = &armada_370_core_clocks,
 	},
 	{
-		.compatible = "marvell,armada-xp-core-clocks",
+		.compatible = "marvell,armada-xp-core-clock",
 		.data = &armada_xp_core_clocks,
 	},
 #endif
 #ifdef CONFIG_ARCH_DOVE
 	{
-		.compatible = "marvell,dove-core-clocks",
+		.compatible = "marvell,dove-core-clock",
 		.data = &dove_core_clocks,
 	},
 #endif
 
 #ifdef CONFIG_ARCH_KIRKWOOD
 	{
-		.compatible = "marvell,kirkwood-core-clocks",
+		.compatible = "marvell,kirkwood-core-clock",
 		.data = &kirkwood_core_clocks,
 	},
 	{
-		.compatible = "marvell,mv88f6180-core-clocks",
+		.compatible = "marvell,mv88f6180-core-clock",
 		.data = &mv88f6180_core_clocks,
 	},
 #endif
-- 
1.7.9.5

[PATCH 6/7] clk: mvebu: rename armada-xp-cpu-clockctrl to armada-xp-cpu-clock

[Thomas Petazzoni]

Most of the existing clock drivers have a compatible string that ends
with "-clock", so change the "armada-xp-cpu-clockctrl" compatible
strings of the mvebu clk-cpu.c driver to "armada-xp-cpu-clock".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../devicetree/bindings/clock/mvebu-cpu-clock.txt  |    4 ++--
 arch/arm/boot/dts/armada-xp.dtsi                   |    2 +-
 drivers/clk/mvebu/clk-cpu.c                        |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
index 1fb5a64..feb8301 100644
--- a/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
+++ b/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
@@ -2,14 +2,14 @@ Device Tree Clock bindings for cpu clock of Marvell EBU platforms
 
 Required properties:
 - compatible : shall be one of the following:
-	"marvell,armada-xp-cpu-clockctrl" - cpu clocks for Armada XP
+	"marvell,armada-xp-cpu-clock" - cpu clocks for Armada XP
 - reg : Address and length of the clock complex register set
 - #clock-cells : should be set to 1.
 - clocks : shall be the input parent clock phandle for the clock.
 
 cpuclk: clock-complex at d0018700 {
 	#clock-cells = <1>;
-	compatible = "marvell,armada-xp-cpu-clockctrl";
+	compatible = "marvell,armada-xp-cpu-clock";
 	reg = <0xd0018700 0xA0>;
 	clocks = <&coreclk 1>;
 }
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index d05515c..781127e 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -62,7 +62,7 @@
 
 		cpuclk: clock-complex at d0018700 {
 			#clock-cells = <1>;
-			compatible = "marvell,armada-xp-cpu-clockctrl";
+			compatible = "marvell,armada-xp-cpu-clock";
 			reg = <0xd0018700 0xA0>;
 			clocks = <&coreclk 1>;
 		};
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 3d7c9f1..44f541a 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -156,7 +156,7 @@ bail_out:
 
 static const __initconst struct of_device_id clk_cpu_match[] = {
 	{
-		.compatible = "marvell,armada-xp-cpu-clockctrl",
+		.compatible = "marvell,armada-xp-cpu-clock",
 		.data = of_cpu_clk_setup,
 	},
 	{
-- 
1.7.9.5

[PATCH 7/7] arm: mvebu: fix SATA clocks on Armada 370/XP

[Thomas Petazzoni]

The Armada 370/XP have gatable clocks for the SATA0 and SATA1 ports,
and are not connected directly to the core clocks. Therefore, we
adjust the clock references to reflect this.

Note that the clock references are moved down from the common
armada-370-xp.dtsi to the more specific armada-370.dtsi and
armada-xp.dtsi because the gatable clock driver is different on both
SoCs. Also, the Armada XP has two more "SATA Link" clocks that we may
have to use in the future.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-370-xp.dtsi |    1 -
 arch/arm/boot/dts/armada-370.dtsi    |    5 +++++
 arch/arm/boot/dts/armada-xp.dtsi     |    5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 08ec354..c0414ae 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -94,7 +94,6 @@
 			compatible = "marvell,orion-sata";
 			reg = <0xd00a0000 0x2400>;
 			interrupts = <55>;
-			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 1ed9e5c..5901995 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -82,6 +82,11 @@
 			interrupts = <91>;
 		};
 
+		sata at d00a0000 {
+			clocks = <&gateclk 15>, <&gateclk 30>;
+			clock-names = "0", "1";
+		};
+
 		coreclk: mvebu-sar at d0018230 {
 			compatible = "marvell,armada-370-core-clock";
 			reg = <0xd0018230 0x08>;
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 781127e..be4c7cf 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -92,5 +92,10 @@
 				interrupts = <14>;
 				status = "disabled";
 		};
+
+		sata at d00a0000 {
+			clocks = <&gateclk 15>, <&gateclk 30>;
+			clock-names = "0", "1";
+		};
 	};
 };
-- 
1.7.9.5

[PATCH 1/7] clk: mvebu: init all mvebu clock types from mvebu_clocks_init()

[Andrew Lunn]

On Mon, Nov 19, 2012 at 05:52:37PM +0100, Thomas Petazzoni wrote:
> The mvebu_clocks_init() function should register all the mvebu clock
> types, so that all mvebu platforms only have to call
> mvebu_clocks_init().
> 
> This fixes mach-mvebu because mvebu_clk_gating_init() was never called
> and therefore none of the gating clocks were registered.
> 
> mach-kirkwood and mach-dove are updated to not call
> mvebu_clk_gating_init() a second time. Thanks to this, it is no longer
> necessary to expose mvebu_clk_gating_init() beyond the clock
> framework, so we get rid of its prototype in <linux/clk/mvebu.h> and
> we add it in a private drivers/clk/mvebu/clk-gating-ctrl.h header
> file.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/mach-dove/common.c         |    1 -
>  arch/arm/mach-kirkwood/board-dt.c   |    1 -
>  drivers/clk/mvebu/clk-gating-ctrl.h |   18 ++++++++++++++++++
>  drivers/clk/mvebu/clk.c             |    2 ++
>  include/linux/clk/mvebu.h           |    1 -
>  5 files changed, 20 insertions(+), 3 deletions(-)
>  create mode 100644 drivers/clk/mvebu/clk-gating-ctrl.h
> 
> diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
> index 4b09d12..6a2c4dc 100644
> --- a/arch/arm/mach-dove/common.c
> +++ b/arch/arm/mach-dove/common.c
> @@ -421,7 +421,6 @@ static void __init dove_legacy_clk_init(void)
>  static void __init dove_of_clk_init(void)
>  {
>  	mvebu_clocks_init();
> -	mvebu_clk_gating_init();
>  	dove_legacy_clk_init();
>  }
>  
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index f55393b..40db4a8 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -80,7 +80,6 @@ static void __init kirkwood_legacy_clk_init(void)
>  static void __init kirkwood_of_clk_init(void)
>  {
>  	mvebu_clocks_init();
> -	mvebu_clk_gating_init();
>  	kirkwood_legacy_clk_init();
>  }
>  
> diff --git a/drivers/clk/mvebu/clk-gating-ctrl.h b/drivers/clk/mvebu/clk-gating-ctrl.h
> new file mode 100644
> index 0000000..20cc4ad
> --- /dev/null
> +++ b/drivers/clk/mvebu/clk-gating-ctrl.h
> @@ -0,0 +1,18 @@
> +/*
> + * Marvell EBU gating clock handling
> + *
> + * Copyright (C) 2012 Marvell
> + *
> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +#ifndef __MVEBU_CLK_GATING_H
> +#define __MVEBU_CLK_GATING_H
> +
> +void __init mvebu_clk_gating_init(void);
> +
> +#endif
> diff --git a/drivers/clk/mvebu/clk.c b/drivers/clk/mvebu/clk.c
> index dc310d6..3f0e43e 100644
> --- a/drivers/clk/mvebu/clk.c
> +++ b/drivers/clk/mvebu/clk.c
> @@ -17,6 +17,7 @@
>  #include <linux/of.h>
>  #include "clk-core.h"
>  #include "clk-cpu.h"
> +#include "clk-gating-ctrl.h"
>  
>  static const __initconst struct of_device_id clk_match[] = {
>  #ifdef CONFIG_MVEBU_CLK_CPU
> @@ -33,5 +34,6 @@ static const __initconst struct of_device_id clk_match[] = {
>  void __init mvebu_clocks_init(void)
>  {
>  	mvebu_core_clk_init();
> +	mvebu_clk_gating_init();
>  	of_clk_init(clk_match);
>  }

Hi Thomas

You have a minor problem here.

obj-$(CONFIG_MVEBU_CLK_GATING)  += clk-gating-ctrl.o

There is no guarantee mvebu_clk_gating_init() exists. In fact, orion5x
does not have gated clocks, so won't be selecting this option.

     Andrew

arm: mvebu: Various mvebu clock fixes/improvements

[Andrew Lunn]

On Mon, Nov 19, 2012 at 05:52:36PM +0100, Thomas Petazzoni wrote:
> Andrew,
> 
> You'll find enclosed seven patches brigging fixes and improvements to
> the CLK support on mvebu platforms. You can either squash them into
> your current clk series if you intend to send a new version of it to
> Jason, or forward the patches as follow-up patches to Jason after
> reviewing.
> 
> In summary:
> 
>  * Patch 1 fixes a real problem: the gating clocks are not registered
>    on Armada 370/XP.
> 
>  * Patch 2, 3, 5 and 6 are more cosmetic patches, but I think they are
>    good to have.
> 
>  * Patch 4 implements a fix that we've been discussing: moving the
>    Armada XP CPU clocks down to the individual armada-xp-mv78xxx.dtsi
>    files.
> 
>  * Patch 7 fixes the references to the SATA clocks on Armada
>    370/XP. Without this patch, Armada 370 currently hangs at boot when
>    trying to initialize SATA.

Hi Thomas

You probably want patch 1 last. Anybody bisecting this changeset if
going to have a hung 370/XP.

      Andrew

[PATCH 4/7] arm: mvebu: move DT cpu clock nodes to the Armada XP specific .dtsi

[Andrew Lunn]

On Mon, Nov 19, 2012 at 05:52:40PM +0100, Thomas Petazzoni wrote:
> The cpu clock nodes have originally been added in
> armada-xp.dtsi. However, this .dtsi file is common to all SoCs in the
> Armada XP family: the MV78230, the MV78260 and the MV78460. Those SoCs
> differ in a number of ways, but one of the main difference is the
> number of CPUs: one CPU in the MV78230, two CPUs in the MV78260 and
> four CPUs in the MV78460.
> 
> Therefore, this patch moves the cpu clock DT nodes into the
> armada-xp-mv78230.dtsi, armada-xp-mv78260.dtsi and
> armada-xp-mv78460.dtsi files, instantiating the right number of CPUs
> and CPU clocks as needed.

Hi Thomas

This is only part of the story:

void __init of_cpu_clk_setup(struct device_node *node)
{
        struct cpu_clk *cpuclk;
        void __iomem *clock_complex_base = of_iomap(node, 0);
        int cpu;
        if (clock_complex_base == NULL) {
                pr_err("%s: clock-complex base register not set\n",
                        __func__);
                return;
        }

        cpuclk = kzalloc(MAX_CPU * sizeof(*cpuclk), GFP_KERNEL);
        clks = kzalloc(MAX_CPU * sizeof(*clks), GFP_KERNEL);

        if (WARN_ON(!cpuclk))
                return;
        for (cpu = 0; cpu < MAX_CPU; cpu++) {
                struct clk_init_data init;
                struct clk *clk;
                struct clk *parent_clk;
                char *clk_name = kzalloc(5, GFP_KERNEL);

                sprintf(clk_name, "cpu%d", cpu);
                parent_clk = of_clk_get(node, 0);

...

                clk = clk_register(NULL, &cpuclk[cpu].hw);
                if (WARN_ON(IS_ERR(clk)))
                        goto bail_out;
                clks[cpu] = clk;
        }

You are still registering 4 clocks as far as i can see.

    Andrew

[PATCH 1/7] clk: mvebu: init all mvebu clock types from mvebu_clocks_init()

[Thomas Petazzoni]

Dear Andrew Lunn,

On Mon, 19 Nov 2012 19:25:13 +0100, Andrew Lunn wrote:

> You have a minor problem here.
> 
> obj-$(CONFIG_MVEBU_CLK_GATING)  += clk-gating-ctrl.o
> 
> There is no guarantee mvebu_clk_gating_init() exists. In fact, orion5x
> does not have gated clocks, so won't be selecting this option.

Correct, I will do the same as I did in PATCH 2/7 for the CPU clocks.

Thanks for the review,

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

arm: mvebu: Various mvebu clock fixes/improvements

[Thomas Petazzoni]

Dear Andrew Lunn,

On Mon, 19 Nov 2012 19:27:01 +0100, Andrew Lunn wrote:
> On Mon, Nov 19, 2012 at 05:52:36PM +0100, Thomas Petazzoni wrote:
> > Andrew,
> > 
> > You'll find enclosed seven patches brigging fixes and improvements to
> > the CLK support on mvebu platforms. You can either squash them into
> > your current clk series if you intend to send a new version of it to
> > Jason, or forward the patches as follow-up patches to Jason after
> > reviewing.
> > 
> > In summary:
> > 
> >  * Patch 1 fixes a real problem: the gating clocks are not registered
> >    on Armada 370/XP.
> > 
> >  * Patch 2, 3, 5 and 6 are more cosmetic patches, but I think they are
> >    good to have.
> > 
> >  * Patch 4 implements a fix that we've been discussing: moving the
> >    Armada XP CPU clocks down to the individual armada-xp-mv78xxx.dtsi
> >    files.
> > 
> >  * Patch 7 fixes the references to the SATA clocks on Armada
> >    370/XP. Without this patch, Armada 370 currently hangs at boot when
> >    trying to initialize SATA.
> 
> Hi Thomas
> 
> You probably want patch 1 last. Anybody bisecting this changeset if
> going to have a hung 370/XP.

Took me a while to figure out why: it's the fact that gating clocks are
getting registered that I was seeing the SATA hang on Armada 370/XP.
Sure, I'll put PATCH 1 last in the series then.

Thanks!

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

[PATCH 4/7] arm: mvebu: move DT cpu clock nodes to the Armada XP specific .dtsi

[Thomas Petazzoni]

Dear Andrew Lunn,

On Mon, 19 Nov 2012 19:38:03 +0100, Andrew Lunn wrote:

> This is only part of the story:
> 
> void __init of_cpu_clk_setup(struct device_node *node)

[...]

>         for (cpu = 0; cpu < MAX_CPU; cpu++) {

[...]

> You are still registering 4 clocks as far as i can see.

Aah, correct. I'll fix this and resend!

Thanks for the review,

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

arm: mvebu: Various mvebu clock fixes/improvements

[Thomas Petazzoni]

Andrew,

On Mon, 19 Nov 2012 19:27:01 +0100, Andrew Lunn wrote:

> > In summary:
> > 
> >  * Patch 1 fixes a real problem: the gating clocks are not registered
> >    on Armada 370/XP.
> > 
> >  * Patch 2, 3, 5 and 6 are more cosmetic patches, but I think they are
> >    good to have.
> > 
> >  * Patch 4 implements a fix that we've been discussing: moving the
> >    Armada XP CPU clocks down to the individual armada-xp-mv78xxx.dtsi
> >    files.
> > 
> >  * Patch 7 fixes the references to the SATA clocks on Armada
> >    370/XP. Without this patch, Armada 370 currently hangs at boot when
> >    trying to initialize SATA.
> 
> Hi Thomas
> 
> You probably want patch 1 last. Anybody bisecting this changeset if
> going to have a hung 370/XP.

Unfortunately, I don't think putting patch 1 last will work either: in
patch 7, I change the SATA clocks to point to the gating clocks. So if
patch 1 is not there, those clocks do not exist and the driver fails to
clk_get() those clocks.

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

arm: mvebu: Various mvebu clock fixes/improvements

[Andrew Lunn]

On Tue, Nov 20, 2012 at 10:40:42AM +0100, Thomas Petazzoni wrote:
> Andrew,
> 
> On Mon, 19 Nov 2012 19:27:01 +0100, Andrew Lunn wrote:
> 
> > > In summary:
> > > 
> > >  * Patch 1 fixes a real problem: the gating clocks are not registered
> > >    on Armada 370/XP.
> > > 
> > >  * Patch 2, 3, 5 and 6 are more cosmetic patches, but I think they are
> > >    good to have.
> > > 
> > >  * Patch 4 implements a fix that we've been discussing: moving the
> > >    Armada XP CPU clocks down to the individual armada-xp-mv78xxx.dtsi
> > >    files.
> > > 
> > >  * Patch 7 fixes the references to the SATA clocks on Armada
> > >    370/XP. Without this patch, Armada 370 currently hangs at boot when
> > >    trying to initialize SATA.
> > 
> > Hi Thomas
> > 
> > You probably want patch 1 last. Anybody bisecting this changeset if
> > going to have a hung 370/XP.
> 
> Unfortunately, I don't think putting patch 1 last will work either: in
> patch 7, I change the SATA clocks to point to the gating clocks. So if
> patch 1 is not there, those clocks do not exist and the driver fails to
> clk_get() those clocks.

I don't think that is fatal. Orion5x does not have those clocks. The
PCI version of the SATA devices also does not have those clocks.

    Andrew

arm: mvebu: Various mvebu clock fixes/improvements

[Thomas Petazzoni]

Dear Andrew Lunn,

On Tue, 20 Nov 2012 10:43:45 +0100, Andrew Lunn wrote:

> > Unfortunately, I don't think putting patch 1 last will work either: in
> > patch 7, I change the SATA clocks to point to the gating clocks. So if
> > patch 1 is not there, those clocks do not exist and the driver fails to
> > clk_get() those clocks.
> 
> I don't think that is fatal. Orion5x does not have those clocks. The
> PCI version of the SATA devices also does not have those clocks.

Hum, I will check this. But I think that the point that lead me to look
into the clocks is that when I added:

	clocks = <&gate_clk xx>;

to my Ethernet DT nodes, then clk_get() was returning an error, until I
enabled the gating clocks. But I'll double check that.

Thanks,

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

arm: mvebu: Various mvebu clock fixes/improvements

[Thomas Petazzoni]

On Tue, 20 Nov 2012 11:06:36 +0100, Thomas Petazzoni wrote:

> Hum, I will check this. But I think that the point that lead me to look
> into the clocks is that when I added:
> 
> 	clocks = <&gate_clk xx>;
> 
> to my Ethernet DT nodes, then clk_get() was returning an error, until I
> enabled the gating clocks. But I'll double check that.

It is indeed not fatal with SATA because the driver tries to get the
clock, and if it can't, the driver just gives up.

However, with the mvneta driver, it really wants the clock (the driver
needs at some point to do a clk_get_rate(), so we have to have a
clock), and in this case, not having the gating clocks is an issue.

That said, since the mvneta driver is new, I don't mind if it is
non-functional up to the point where the gating clocks are enabled.

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

arm: mvebu: Various mvebu clock fixes/improvements

[Thomas Petazzoni]

Andrew,

On Mon, 19 Nov 2012 19:27:01 +0100, Andrew Lunn wrote:

> >  * Patch 1 fixes a real problem: the gating clocks are not
> > registered on Armada 370/XP.
> > 
> >  * Patch 2, 3, 5 and 6 are more cosmetic patches, but I think they
> > are good to have.
> > 
> >  * Patch 4 implements a fix that we've been discussing: moving the
> >    Armada XP CPU clocks down to the individual
> > armada-xp-mv78xxx.dtsi files.
> > 
> >  * Patch 7 fixes the references to the SATA clocks on Armada
> >    370/XP. Without this patch, Armada 370 currently hangs at boot
> > when trying to initialize SATA.
> 
> Hi Thomas
> 
> You probably want patch 1 last. Anybody bisecting this changeset if
> going to have a hung 370/XP.

In the end, here is how I fixed this:

 * The clk patches are going to be pulled first by Jason. It enables
   gating clocks on all platforms, and it boots fine on Armada 370,
   Armada XP and Kirkwood.

 * The entire Armada 370/XP SATA patches are going to be pulled by
   Jason *after* the clk patches. So the SATA DT entries will from the
   beginning have the correct 'clocks' property, so that when you boot
   clk + sata, it works ok on Armada 370 and Armada XP.

I hope that's ok for you.

Thanks!

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