[PATCH v2 0/6] Armada 370/XP clocksource fixes

[PATCH v2 0/6] Armada 370/XP clocksource fixes

[Ezequiel Garcia]

This small patchset fixes a somewhat minor issue found in the clocksource
driver for Armada 370/XP SoC.

On one side the Armada 370 SoC has no 25 MHz fixed timer.
On the other side the Armada XP SoC cannot work properly without such 25 MHz
fixed timer selected, because otherwise the base clock frequency would vary
when doing cpufreq frequency changes.

Therefore we can consider the SoCs as not being compatible, being better to
have two compatible strings, one for each SoC. The previous compatible and
its behavior has been maintained to preserve backwards compatibility.

In addition, CLOCKSOURCE_OF_DECLARE is used to simplify the initialization.

This patchset is based on v3.11-rc4. Also, to ease maintainer's task this
is based on these two patches which are in linux-next:

  commit be14114934545f52be2ffddbe401ba0951007c59
  Author: Stephen Boyd <sboyd@codeaurora.org>
  "clocksource: time-armada-370-xp: Divorce from local timer API"

  commit 4047c794ae18c467a5ea987265238186bc253f61
  Author: Stephen Boyd <sboyd@codeaurora.org>
  "clocksource: time-armada-370-xp: Fix sparse warning"

Any testing and feedback is highly appreciated!

Changes from v1:

  * Declare TIMER_CTRL register access helpers as static,
    as reported by Andrew Lunn.

  * Add some documentation about the deprecated compatible string
    in the clocksource driver, as suggested by Andrew Lunn.

  * Add to the series a cosmetic patch to use BIT()

  * Rebased on top of two patches for the armada-370-xp clocksource
    driver, that are already in linux-next.

  * Reordered the patches: bare cleanup first, improvements later.

Ezequiel Garcia (6):
  clocksource: armada-370-xp: Use BIT()
  clocksource: armada-370-xp: Simplify TIMER_CTRL register access
  clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
  clocksource: armada-370-xp: Introduce new compatibles
  clocksource: armada-370-xp: Fix device-tree binding
  ARM: mvebu: Fix the Armada 370/XP timer compatible strings

 .../bindings/timer/marvell,armada-370-xp-timer.txt |  29 +++-
 arch/arm/boot/dts/armada-370-xp.dtsi               |   1 -
 arch/arm/boot/dts/armada-370.dtsi                  |   4 +
 arch/arm/boot/dts/armada-xp.dtsi                   |   2 +-
 arch/arm/mach-mvebu/armada-370-xp.c                |   4 +-
 drivers/clocksource/time-armada-370-xp.c           | 155 ++++++++++++++-------
 include/linux/time-armada-370-xp.h                 |  16 ---
 7 files changed, 134 insertions(+), 77 deletions(-)
 delete mode 100644 include/linux/time-armada-370-xp.h

-- 
1.8.1.5

[PATCH v2 1/6] clocksource: armada-370-xp: Use BIT()

[Ezequiel Garcia]

This is a purely cosmetic commit: we replace hardcoded values that
representing bits by BIT(), which is slightly more readable.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 drivers/clocksource/time-armada-370-xp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 847cab6..ed584ec 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -36,13 +36,13 @@
  * Timer block registers.
  */
 #define TIMER_CTRL_OFF		0x0000
-#define  TIMER0_EN		 0x0001
-#define  TIMER0_RELOAD_EN	 0x0002
-#define  TIMER0_25MHZ            0x0800
+#define  TIMER0_EN		 BIT(0)
+#define  TIMER0_RELOAD_EN	 BIT(1)
+#define  TIMER0_25MHZ            BIT(11)
 #define  TIMER0_DIV(div)         ((div) << 19)
-#define  TIMER1_EN		 0x0004
-#define  TIMER1_RELOAD_EN	 0x0008
-#define  TIMER1_25MHZ            0x1000
+#define  TIMER1_EN		 BIT(2)
+#define  TIMER1_RELOAD_EN	 BIT(3)
+#define  TIMER1_25MHZ            BIT(12)
 #define  TIMER1_DIV(div)         ((div) << 22)
 #define TIMER_EVENTS_STATUS	0x0004
 #define  TIMER0_CLR_MASK         (~0x1)
-- 
1.8.1.5

[PATCH v2 2/6] clocksource: armada-370-xp: Simplify TIMER_CTRL register access

[Ezequiel Garcia]

This commit creates two functions to access the TIMER_CTRL register:
one for global one for the per-cpu. This makes the code much more
readable. In addition, since the TIMER_CTRL register is also used for
watchdog, this is preparation work for future thread-safe improvements.

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 drivers/clocksource/time-armada-370-xp.c | 62 +++++++++++++++-----------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index ed584ec..bbb727c 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -72,6 +72,18 @@ static u32 ticks_per_jiffy;
 
 static struct clock_event_device __percpu *armada_370_xp_evt;
 
+static void timer_ctrl_clrset(u32 clr, u32 set)
+{
+       writel((readl(timer_base + TIMER_CTRL_OFF) & ~clr) | set,
+               timer_base + TIMER_CTRL_OFF);
+}
+
+static void local_timer_ctrl_clrset(u32 clr, u32 set)
+{
+       writel((readl(local_base + TIMER_CTRL_OFF) & ~clr) | set,
+               local_base + TIMER_CTRL_OFF);
+}
+
 static u32 notrace armada_370_xp_read_sched_clock(void)
 {
 	return ~readl(timer_base + TIMER0_VAL_OFF);
@@ -84,7 +96,6 @@ static int
 armada_370_xp_clkevt_next_event(unsigned long delta,
 				struct clock_event_device *dev)
 {
-	u32 u;
 	/*
 	 * Clear clockevent timer interrupt.
 	 */
@@ -98,11 +109,8 @@ armada_370_xp_clkevt_next_event(unsigned long delta,
 	/*
 	 * Enable the timer.
 	 */
-	u = readl(local_base + TIMER_CTRL_OFF);
-	u = ((u & ~TIMER0_RELOAD_EN) | TIMER0_EN |
-	     TIMER0_DIV(TIMER_DIVIDER_SHIFT));
-	writel(u, local_base + TIMER_CTRL_OFF);
-
+	local_timer_ctrl_clrset(TIMER0_RELOAD_EN,
+				TIMER0_EN | TIMER0_DIV(TIMER_DIVIDER_SHIFT));
 	return 0;
 }
 
@@ -110,8 +118,6 @@ static void
 armada_370_xp_clkevt_mode(enum clock_event_mode mode,
 			  struct clock_event_device *dev)
 {
-	u32 u;
-
 	if (mode == CLOCK_EVT_MODE_PERIODIC) {
 
 		/*
@@ -123,18 +129,14 @@ armada_370_xp_clkevt_mode(enum clock_event_mode mode,
 		/*
 		 * Enable timer.
 		 */
-
-		u = readl(local_base + TIMER_CTRL_OFF);
-
-		writel((u | TIMER0_EN | TIMER0_RELOAD_EN |
-			TIMER0_DIV(TIMER_DIVIDER_SHIFT)),
-			local_base + TIMER_CTRL_OFF);
+		local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN |
+					   TIMER0_EN |
+					   TIMER0_DIV(TIMER_DIVIDER_SHIFT));
 	} else {
 		/*
 		 * Disable timer.
 		 */
-		u = readl(local_base + TIMER_CTRL_OFF);
-		writel(u & ~TIMER0_EN, local_base + TIMER_CTRL_OFF);
+		local_timer_ctrl_clrset(TIMER0_EN, 0);
 
 		/*
 		 * ACK pending timer interrupt.
@@ -163,14 +165,14 @@ static irqreturn_t armada_370_xp_timer_interrupt(int irq, void *dev_id)
  */
 static int armada_370_xp_timer_setup(struct clock_event_device *evt)
 {
-	u32 u;
+	u32 clr = 0, set = 0;
 	int cpu = smp_processor_id();
 
-	u = readl(local_base + TIMER_CTRL_OFF);
 	if (timer25Mhz)
-		writel(u | TIMER0_25MHZ, local_base + TIMER_CTRL_OFF);
+		set = TIMER0_25MHZ;
 	else
-		writel(u & ~TIMER0_25MHZ, local_base + TIMER_CTRL_OFF);
+		clr = TIMER0_25MHZ;
+	local_timer_ctrl_clrset(clr, set);
 
 	evt->name		= "armada_370_xp_per_cpu_tick",
 	evt->features		= CLOCK_EVT_FEAT_ONESHOT |
@@ -219,7 +221,7 @@ static struct notifier_block armada_370_xp_timer_cpu_nb = {
 
 void __init armada_370_xp_timer_init(void)
 {
-	u32 u;
+	u32 clr = 0, set = 0;
 	struct device_node *np;
 	int res;
 
@@ -230,23 +232,19 @@ void __init armada_370_xp_timer_init(void)
 
 	if (of_find_property(np, "marvell,timer-25Mhz", NULL)) {
 		/* The fixed 25MHz timer is available so let's use it */
-		u = readl(timer_base + TIMER_CTRL_OFF);
-		writel(u | TIMER0_25MHZ,
-		       timer_base + TIMER_CTRL_OFF);
+		set = TIMER0_25MHZ;
 		timer_clk = 25000000;
 	} else {
 		unsigned long rate = 0;
 		struct clk *clk = of_clk_get(np, 0);
 		WARN_ON(IS_ERR(clk));
 		rate =  clk_get_rate(clk);
-
-		u = readl(timer_base + TIMER_CTRL_OFF);
-		writel(u & ~(TIMER0_25MHZ),
-		       timer_base + TIMER_CTRL_OFF);
-
 		timer_clk = rate / TIMER_DIVIDER;
+
+		clr = TIMER0_25MHZ;
 		timer25Mhz = false;
 	}
+	timer_ctrl_clrset(clr, set);
 
 	/*
 	 * We use timer 0 as clocksource, and private(local) timer 0
@@ -268,10 +266,8 @@ void __init armada_370_xp_timer_init(void)
 	writel(0xffffffff, timer_base + TIMER0_VAL_OFF);
 	writel(0xffffffff, timer_base + TIMER0_RELOAD_OFF);
 
-	u = readl(timer_base + TIMER_CTRL_OFF);
-
-	writel((u | TIMER0_EN | TIMER0_RELOAD_EN |
-		TIMER0_DIV(TIMER_DIVIDER_SHIFT)), timer_base + TIMER_CTRL_OFF);
+	timer_ctrl_clrset(0, TIMER0_EN | TIMER0_RELOAD_EN |
+			     TIMER0_DIV(TIMER_DIVIDER_SHIFT));
 
 	clocksource_mmio_init(timer_base + TIMER0_VAL_OFF,
 			      "armada_370_xp_clocksource",
-- 
1.8.1.5

[PATCH v2 3/6] clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE

[Ezequiel Garcia]

This is almost cosmetic: we achieve a bit of consistency with
other clocksource drivers by using the CLOCKSOURCE_OF_DECLARE
macro for the boilerplate code.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/mach-mvebu/armada-370-xp.c      |  4 ++--
 drivers/clocksource/time-armada-370-xp.c |  7 +++----
 include/linux/time-armada-370-xp.h       | 16 ----------------
 3 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 include/linux/time-armada-370-xp.h

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 97cbb80..4ea03ad 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -18,7 +18,7 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
-#include <linux/time-armada-370-xp.h>
+#include <linux/clocksource.h>
 #include <linux/dma-mapping.h>
 #include <linux/mbus.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -69,7 +69,7 @@ static void __init armada_370_xp_mbus_init(void)
 static void __init armada_370_xp_timer_and_clk_init(void)
 {
 	of_clk_init(NULL);
-	armada_370_xp_timer_init();
+	clocksource_of_init();
 	coherency_init();
 	armada_370_xp_mbus_init();
 #ifdef CONFIG_CACHE_L2X0
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index bbb727c..a781dce 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -30,7 +30,6 @@
 #include <linux/module.h>
 #include <linux/sched_clock.h>
 #include <linux/percpu.h>
-#include <linux/time-armada-370-xp.h>
 
 /*
  * Timer block registers.
@@ -219,13 +218,11 @@ static struct notifier_block armada_370_xp_timer_cpu_nb = {
 	.notifier_call = armada_370_xp_timer_cpu_notify,
 };
 
-void __init armada_370_xp_timer_init(void)
+static void __init armada_370_xp_timer_init(struct device_node *np)
 {
 	u32 clr = 0, set = 0;
-	struct device_node *np;
 	int res;
 
-	np = of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-timer");
 	timer_base = of_iomap(np, 0);
 	WARN_ON(!timer_base);
 	local_base = of_iomap(np, 1);
@@ -289,3 +286,5 @@ void __init armada_370_xp_timer_init(void)
 	if (!res)
 		armada_370_xp_timer_setup(this_cpu_ptr(armada_370_xp_evt));
 }
+CLOCKSOURCE_OF_DECLARE(armada_370_xp, "marvell,armada-370-xp-timer",
+		       armada_370_xp_timer_init);
diff --git a/include/linux/time-armada-370-xp.h b/include/linux/time-armada-370-xp.h
deleted file mode 100644
index 6fb0856..0000000
--- a/include/linux/time-armada-370-xp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Marvell Armada 370/XP SoC timer handling.
- *
- * Copyright (C) 2012 Marvell
- *
- * Lior Amsalem <alior@marvell.com>
- * Gregory CLEMENT <gregory.clement@free-electrons.com>
- * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- */
-#ifndef __TIME_ARMADA_370_XPPRCMU_H
-#define __TIME_ARMADA_370_XPPRCMU_H
-
-void armada_370_xp_timer_init(void);
-
-#endif
-- 
1.8.1.5

[PATCH v2 4/6] clocksource: armada-370-xp: Introduce new compatibles

[Ezequiel Garcia]

The Armada XP SoC clocksource driver cannot work without the 25 MHz
fixed timer. Therefore it's appropriate to introduce a new compatible
string and use it to set the 25 MHz fixed timer.

The 'marvell,timer-25MHz' property will be marked as deprecated.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 drivers/clocksource/time-armada-370-xp.c | 78 ++++++++++++++++++++++++++------
 1 file changed, 65 insertions(+), 13 deletions(-)

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index a781dce..da0d0e0 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -13,6 +13,25 @@
  *
  * Timer 0 is used as free-running clocksource, while timer 1 is
  * used as clock_event_device.
+ *
+ * ---
+ *
+ * The "marvell,armada-370-xp-timer" compatible and the "marvell,timer-25Mhz"
+ * property are deprecated. Instead, DT nodes should use one compatible for
+ * each SoC as appropriate.
+ *
+ * See Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
+ *
+ * The rationale behind this is that the Armada 370 SoC and the Armada XP SoC
+ * timers are not really compatible:
+ *   * Armada 370 has no 25 MHz fixed timer.
+ *   * Armada XP cannot work properly without such 25 MHz fixed timer as
+ *     doing otherwise leads to using a clocksource whose frequency varies when
+ *     doing cpufreq frequency changes.
+ *
+ * Please note the deprecated compatible string "marvell,armada-370-xp-timer"
+ * and its behavior are kept only to maintain backwards compatibility,
+ * and should not be used in any new device trees.
  */
 
 #include <linux/init.h>
@@ -218,7 +237,7 @@ static struct notifier_block armada_370_xp_timer_cpu_nb = {
 	.notifier_call = armada_370_xp_timer_cpu_notify,
 };
 
-static void __init armada_370_xp_timer_init(struct device_node *np)
+static void __init armada_370_xp_timer_common_init(struct device_node *np)
 {
 	u32 clr = 0, set = 0;
 	int res;
@@ -227,20 +246,10 @@ static void __init armada_370_xp_timer_init(struct device_node *np)
 	WARN_ON(!timer_base);
 	local_base = of_iomap(np, 1);
 
-	if (of_find_property(np, "marvell,timer-25Mhz", NULL)) {
-		/* The fixed 25MHz timer is available so let's use it */
+	if (timer25Mhz)
 		set = TIMER0_25MHZ;
-		timer_clk = 25000000;
-	} else {
-		unsigned long rate = 0;
-		struct clk *clk = of_clk_get(np, 0);
-		WARN_ON(IS_ERR(clk));
-		rate =  clk_get_rate(clk);
-		timer_clk = rate / TIMER_DIVIDER;
-
+	else
 		clr = TIMER0_25MHZ;
-		timer25Mhz = false;
-	}
 	timer_ctrl_clrset(clr, set);
 
 	/*
@@ -286,5 +295,48 @@ static void __init armada_370_xp_timer_init(struct device_node *np)
 	if (!res)
 		armada_370_xp_timer_setup(this_cpu_ptr(armada_370_xp_evt));
 }
+
+static void __init armada_370_xp_timer_init(struct device_node *np)
+{
+	if (of_find_property(np, "marvell,timer-25Mhz", NULL)) {
+		/* The fixed 25MHz timer is required */
+		timer_clk = 25000000;
+	} else {
+		unsigned long rate = 0;
+		struct clk *clk = of_clk_get(np, 0);
+		WARN_ON(IS_ERR(clk));
+		rate =  clk_get_rate(clk);
+		timer_clk = rate / TIMER_DIVIDER;
+		timer25Mhz = false;
+	}
+
+	armada_370_xp_timer_common_init(np);
+}
+/* This one is DEPRECATED, but we keep it here for compatibility */
 CLOCKSOURCE_OF_DECLARE(armada_370_xp, "marvell,armada-370-xp-timer",
 		       armada_370_xp_timer_init);
+
+static void __init armada_xp_timer_init(struct device_node *np)
+{
+	/* The fixed 25MHz timer is required */
+	timer_clk = 25000000;
+
+	armada_370_xp_timer_common_init(np);
+}
+CLOCKSOURCE_OF_DECLARE(armada_xp, "marvell,armada-xp-timer",
+		       armada_xp_timer_init);
+
+static void __init armada_370_timer_init(struct device_node *np)
+{
+	unsigned long rate = 0;
+	struct clk *clk = of_clk_get(np, 0);
+
+	WARN_ON(IS_ERR(clk));
+	rate =  clk_get_rate(clk);
+	timer_clk = rate / TIMER_DIVIDER;
+	timer25Mhz = false;
+
+	armada_370_xp_timer_common_init(np);
+}
+CLOCKSOURCE_OF_DECLARE(armada_370, "marvell,armada-370-timer",
+		       armada_370_timer_init);
-- 
1.8.1.5

[PATCH v2 5/6] clocksource: armada-370-xp: Fix device-tree binding

[Ezequiel Garcia]

This commit fixes the DT binding for the Armada 370/XP SoC timer.
The old "marvell,armada-370-xp-timer" compatible is marked deprecated and
new compatible strings: "marvell,armada-xp-timer" and "marvell,armada-370-timer"
are added instead.

Cc: devicetree at vger.kernel.org
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 .../bindings/timer/marvell,armada-370-xp-timer.txt | 29 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
index 3638112..d6aeb5b 100644
--- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
+++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
@@ -2,7 +2,9 @@ Marvell Armada 370 and Armada XP Timers
 ---------------------------------------
 
 Required properties:
-- compatible: Should be "marvell,armada-370-xp-timer"
+- compatible: Should be either "marvell,armada-370-timer" or
+  "marvell,armada-xp-timer" as appropriate.
+  The older "marvell,armada-370-xp-timer" is DEPRECATED and shouldn't be used.
 - interrupts: Should contain the list of Global Timer interrupts and
   then local timer interrupts
 - reg: Should contain location and length for timers register. First
@@ -11,5 +13,26 @@ Required properties:
 - clocks: clock driving the timer hardware
 
 Optional properties:
-- marvell,timer-25Mhz: Tells whether the Global timer supports the 25
-  Mhz fixed mode (available on Armada XP and not on Armada 370)
+- marvell,timer-25Mhz [DEPRECATED]:
+  Tells whether the Global timer supports the 25 Mhz fixed mode
+  (available on Armada XP and not on Armada 370).
+
+Examples:
+
+- Armada 370:
+
+	timer {
+		compatible = "marvell,armada-370-timer";
+		reg = <0x20300 0x30>, <0x21040 0x30>;
+		interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
+		clocks = <&coreclk 2>;
+	};
+
+- Armada XP:
+
+	timer {
+		compatible = "marvell,armada-xp-timer";
+		reg = <0x20300 0x30>, <0x21040 0x30>;
+		interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
+		clocks = <&coreclk 2>;
+	};
-- 
1.8.1.5

[PATCH v2 6/6] ARM: mvebu: Fix the Armada 370/XP timer compatible strings

[Ezequiel Garcia]

The "marvell,armada-370-xp-timer" compatible string, together with
the "marvell,timer-25Mhz" property are deprecated and should be
removed from current DT.

Instead, the timer DT nodes are now required to have an appropriate
compatible string, which should be either "marvell,armada-370-timer"
or "marvell,armada-xp-timer", depending on SoC.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/boot/dts/armada-370-xp.dtsi | 1 -
 arch/arm/boot/dts/armada-370.dtsi    | 4 ++++
 arch/arm/boot/dts/armada-xp.dtsi     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 90b1176..3ed5de4 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -81,7 +81,6 @@
 			};
 
 			timer at 20300 {
-				compatible = "marvell,armada-370-xp-timer";
 				reg = <0x20300 0x30>, <0x21040 0x30>;
 				interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
 				clocks = <&coreclk 2>;
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index fa3dfc6..f7b9fc6 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -104,6 +104,10 @@
 				interrupts = <91>;
 			};
 
+			timer at 20300 {
+				compatible = "marvell,armada-370-timer";
+			};
+
 			coreclk: mvebu-sar at 18230 {
 				compatible = "marvell,armada-370-core-clock";
 				reg = <0x18230 0x08>;
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 416eb94..549151e 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -62,7 +62,7 @@
 			};
 
 			timer at 20300 {
-				marvell,timer-25Mhz;
+				compatible = "marvell,armada-xp-timer";
 			};
 
 			coreclk: mvebu-sar at 18230 {
-- 
1.8.1.5

[PATCH v2 0/6] Armada 370/XP clocksource fixes

[Andrew Lunn]

On Thu, Aug 08, 2013 at 08:32:26AM -0300, Ezequiel Garcia wrote:
> This small patchset fixes a somewhat minor issue found in the clocksource
> driver for Armada 370/XP SoC.
> 
> On one side the Armada 370 SoC has no 25 MHz fixed timer.
> On the other side the Armada XP SoC cannot work properly without such 25 MHz
> fixed timer selected, because otherwise the base clock frequency would vary
> when doing cpufreq frequency changes.
> 
> Therefore we can consider the SoCs as not being compatible, being better to
> have two compatible strings, one for each SoC. The previous compatible and
> its behavior has been maintained to preserve backwards compatibility.
> 
> In addition, CLOCKSOURCE_OF_DECLARE is used to simplify the initialization.
> 
> This patchset is based on v3.11-rc4. Also, to ease maintainer's task this
> is based on these two patches which are in linux-next:
> 
>   commit be14114934545f52be2ffddbe401ba0951007c59
>   Author: Stephen Boyd <sboyd@codeaurora.org>
>   "clocksource: time-armada-370-xp: Divorce from local timer API"
> 
>   commit 4047c794ae18c467a5ea987265238186bc253f61
>   Author: Stephen Boyd <sboyd@codeaurora.org>
>   "clocksource: time-armada-370-xp: Fix sparse warning"
> 
> Any testing and feedback is highly appreciated!

Hi Ezequiel

Sorry, i don't have access to hardware to test on at the moment.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

     Andrew

[PATCH v2 5/6] clocksource: armada-370-xp: Fix device-tree binding

[Jason Cooper]

On Thu, Aug 08, 2013 at 08:32:31AM -0300, Ezequiel Garcia wrote:
> This commit fixes the DT binding for the Armada 370/XP SoC timer.
> The old "marvell,armada-370-xp-timer" compatible is marked deprecated and
> new compatible strings: "marvell,armada-xp-timer" and "marvell,armada-370-timer"
> are added instead.

I'd add a note in here explaining how this makes the property,
"marvell,timer-25MHz" unnecessary.

> 
> Cc: devicetree at vger.kernel.org
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
>  .../bindings/timer/marvell,armada-370-xp-timer.txt | 29 +++++++++++++++++++---
>  1 file changed, 26 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
> index 3638112..d6aeb5b 100644
> --- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
> +++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
...
> @@ -11,5 +13,26 @@ Required properties:
>  - clocks: clock driving the timer hardware
>  
>  Optional properties:
> -- marvell,timer-25Mhz: Tells whether the Global timer supports the 25
> -  Mhz fixed mode (available on Armada XP and not on Armada 370)
> +- marvell,timer-25Mhz [DEPRECATED]:
> +  Tells whether the Global timer supports the 25 Mhz fixed mode
> +  (available on Armada XP and not on Armada 370).

Are there any vendors shipping Armada platforms with DT support out of
the box?  If not, I'm inclined to just drop this, but I'll defer to the
DT maintainers opinion.

thx,

Jason.

[PATCH v2 0/6] Armada 370/XP clocksource fixes

[Jason Cooper]

Daniel,

Are you going to be able to take patches 1-5 for v3.12?  Assuming the DT
maintainers are ok with the binding change, of course.

thx,

Jason.

On Thu, Aug 08, 2013 at 08:32:26AM -0300, Ezequiel Garcia wrote:
> This small patchset fixes a somewhat minor issue found in the clocksource
> driver for Armada 370/XP SoC.
> 
> On one side the Armada 370 SoC has no 25 MHz fixed timer.
> On the other side the Armada XP SoC cannot work properly without such 25 MHz
> fixed timer selected, because otherwise the base clock frequency would vary
> when doing cpufreq frequency changes.
> 
> Therefore we can consider the SoCs as not being compatible, being better to
> have two compatible strings, one for each SoC. The previous compatible and
> its behavior has been maintained to preserve backwards compatibility.
> 
> In addition, CLOCKSOURCE_OF_DECLARE is used to simplify the initialization.
> 
> This patchset is based on v3.11-rc4. Also, to ease maintainer's task this
> is based on these two patches which are in linux-next:
> 
>   commit be14114934545f52be2ffddbe401ba0951007c59
>   Author: Stephen Boyd <sboyd@codeaurora.org>
>   "clocksource: time-armada-370-xp: Divorce from local timer API"
> 
>   commit 4047c794ae18c467a5ea987265238186bc253f61
>   Author: Stephen Boyd <sboyd@codeaurora.org>
>   "clocksource: time-armada-370-xp: Fix sparse warning"
> 
> Any testing and feedback is highly appreciated!
> 
> Changes from v1:
> 
>   * Declare TIMER_CTRL register access helpers as static,
>     as reported by Andrew Lunn.
> 
>   * Add some documentation about the deprecated compatible string
>     in the clocksource driver, as suggested by Andrew Lunn.
> 
>   * Add to the series a cosmetic patch to use BIT()
> 
>   * Rebased on top of two patches for the armada-370-xp clocksource
>     driver, that are already in linux-next.
> 
>   * Reordered the patches: bare cleanup first, improvements later.
> 
> Ezequiel Garcia (6):
>   clocksource: armada-370-xp: Use BIT()
>   clocksource: armada-370-xp: Simplify TIMER_CTRL register access
>   clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
>   clocksource: armada-370-xp: Introduce new compatibles
>   clocksource: armada-370-xp: Fix device-tree binding
>   ARM: mvebu: Fix the Armada 370/XP timer compatible strings
> 
>  .../bindings/timer/marvell,armada-370-xp-timer.txt |  29 +++-
>  arch/arm/boot/dts/armada-370-xp.dtsi               |   1 -
>  arch/arm/boot/dts/armada-370.dtsi                  |   4 +
>  arch/arm/boot/dts/armada-xp.dtsi                   |   2 +-
>  arch/arm/mach-mvebu/armada-370-xp.c                |   4 +-
>  drivers/clocksource/time-armada-370-xp.c           | 155 ++++++++++++++-------
>  include/linux/time-armada-370-xp.h                 |  16 ---
>  7 files changed, 134 insertions(+), 77 deletions(-)
>  delete mode 100644 include/linux/time-armada-370-xp.h
> 
> -- 
> 1.8.1.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v2 5/6] clocksource: armada-370-xp: Fix device-tree binding

[Jason Cooper]

Mark, Ian, Rob, (DT guys)

On Thu, Aug 08, 2013 at 10:09:35AM -0400, Jason Cooper wrote:
> On Thu, Aug 08, 2013 at 08:32:31AM -0300, Ezequiel Garcia wrote:
> > This commit fixes the DT binding for the Armada 370/XP SoC timer.
> > The old "marvell,armada-370-xp-timer" compatible is marked deprecated and
> > new compatible strings: "marvell,armada-xp-timer" and "marvell,armada-370-timer"
> > are added instead.
> 
> I'd add a note in here explaining how this makes the property,
> "marvell,timer-25MHz" unnecessary.
> 
> > 
> > Cc: devicetree at vger.kernel.org
> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > ---
> >  .../bindings/timer/marvell,armada-370-xp-timer.txt | 29 +++++++++++++++++++---
> >  1 file changed, 26 insertions(+), 3 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
> > index 3638112..d6aeb5b 100644
> > --- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
> > +++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
> ...
> > @@ -11,5 +13,26 @@ Required properties:
> >  - clocks: clock driving the timer hardware
> >  
> >  Optional properties:
> > -- marvell,timer-25Mhz: Tells whether the Global timer supports the 25
> > -  Mhz fixed mode (available on Armada XP and not on Armada 370)
> > +- marvell,timer-25Mhz [DEPRECATED]:
> > +  Tells whether the Global timer supports the 25 Mhz fixed mode
> > +  (available on Armada XP and not on Armada 370).
> 
> Are there any vendors shipping Armada platforms with DT support out of
> the box?  If not, I'm inclined to just drop this, but I'll defer to the
> DT maintainers opinion.

Do you think it's ok to drop "marvell,timer-25Mhz" property?  It's
Marvell-specific, and there are no marvell boards shipping with DT boot
yet.

thx,

Jason.

[PATCH v2 0/6] Armada 370/XP clocksource fixes

[Daniel Lezcano]

On 08/09/2013 02:44 PM, Jason Cooper wrote:
> Daniel,
> 
> Are you going to be able to take patches 1-5 for v3.12?  Assuming the DT
> maintainers are ok with the binding change, of course.

Yes, I will pick them up for 3.12 as soon as dt maintainers ack the patches.

Thanks
  -- Daniel


-- 
 <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH v2 0/6] Armada 370/XP clocksource fixes

[Daniel Lezcano]

On 08/09/2013 02:44 PM, Jason Cooper wrote:
> Daniel,
> 
> Are you going to be able to take patches 1-5 for v3.12?  Assuming the DT
> maintainers are ok with the binding change, of course.

Ezequiel,

I would like to send a PR to Thomas.

Could you please prepare the V3 taking into account Jason's comments.

Ian, Rob, Mark, are you ok with Jason's comments ?

Thanks
  -- Daniel

> On Thu, Aug 08, 2013 at 08:32:26AM -0300, Ezequiel Garcia wrote:
>> This small patchset fixes a somewhat minor issue found in the clocksource
>> driver for Armada 370/XP SoC.
>>
>> On one side the Armada 370 SoC has no 25 MHz fixed timer.
>> On the other side the Armada XP SoC cannot work properly without such 25 MHz
>> fixed timer selected, because otherwise the base clock frequency would vary
>> when doing cpufreq frequency changes.
>>
>> Therefore we can consider the SoCs as not being compatible, being better to
>> have two compatible strings, one for each SoC. The previous compatible and
>> its behavior has been maintained to preserve backwards compatibility.
>>
>> In addition, CLOCKSOURCE_OF_DECLARE is used to simplify the initialization.
>>
>> This patchset is based on v3.11-rc4. Also, to ease maintainer's task this
>> is based on these two patches which are in linux-next:
>>
>>   commit be14114934545f52be2ffddbe401ba0951007c59
>>   Author: Stephen Boyd <sboyd@codeaurora.org>
>>   "clocksource: time-armada-370-xp: Divorce from local timer API"
>>
>>   commit 4047c794ae18c467a5ea987265238186bc253f61
>>   Author: Stephen Boyd <sboyd@codeaurora.org>
>>   "clocksource: time-armada-370-xp: Fix sparse warning"
>>
>> Any testing and feedback is highly appreciated!
>>
>> Changes from v1:
>>
>>   * Declare TIMER_CTRL register access helpers as static,
>>     as reported by Andrew Lunn.
>>
>>   * Add some documentation about the deprecated compatible string
>>     in the clocksource driver, as suggested by Andrew Lunn.
>>
>>   * Add to the series a cosmetic patch to use BIT()
>>
>>   * Rebased on top of two patches for the armada-370-xp clocksource
>>     driver, that are already in linux-next.
>>
>>   * Reordered the patches: bare cleanup first, improvements later.
>>
>> Ezequiel Garcia (6):
>>   clocksource: armada-370-xp: Use BIT()
>>   clocksource: armada-370-xp: Simplify TIMER_CTRL register access
>>   clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
>>   clocksource: armada-370-xp: Introduce new compatibles
>>   clocksource: armada-370-xp: Fix device-tree binding
>>   ARM: mvebu: Fix the Armada 370/XP timer compatible strings
>>
>>  .../bindings/timer/marvell,armada-370-xp-timer.txt |  29 +++-
>>  arch/arm/boot/dts/armada-370-xp.dtsi               |   1 -
>>  arch/arm/boot/dts/armada-370.dtsi                  |   4 +
>>  arch/arm/boot/dts/armada-xp.dtsi                   |   2 +-
>>  arch/arm/mach-mvebu/armada-370-xp.c                |   4 +-
>>  drivers/clocksource/time-armada-370-xp.c           | 155 ++++++++++++++-------
>>  include/linux/time-armada-370-xp.h                 |  16 ---
>>  7 files changed, 134 insertions(+), 77 deletions(-)
>>  delete mode 100644 include/linux/time-armada-370-xp.h
>>
>> -- 
>> 1.8.1.5
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel


-- 
 <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH v2 0/6] Armada 370/XP clocksource fixes

[Ezequiel Garcia]

Daniel,

On Mon, Aug 12, 2013 at 02:52:40PM +0200, Daniel Lezcano wrote:
> On 08/09/2013 02:44 PM, Jason Cooper wrote:
> > Daniel,
> > 
> > Are you going to be able to take patches 1-5 for v3.12?  Assuming the DT
> > maintainers are ok with the binding change, of course.
> 
> Ezequiel,
> 
> I would like to send a PR to Thomas.
> 
> Could you please prepare the V3 taking into account Jason's comments.
> 

Sure. I can do that.

> Ian, Rob, Mark, are you ok with Jason's comments ?
> 

So, if there are no objections I'll drop the old compatible string
entirely and introduce only the new (and correct) ones.

Thanks,
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com