[PATCH 0/2] Marvell Armada 375 and 38x timer support

[PATCH 0/2] Marvell Armada 375 and 38x timer support

[Ezequiel Garcia]

Hello Daniel,

This small series adds support for the two new Marvell ARM SoCs:
the Armada 375 and Armada 38x.

These new SoCs are based on Cortex-A9 CPU cores, and share a
number of peripherals with their predecessors in the mach-mvebu
family. The core support (arch/arm/mach-mvebu) for these SOCs have just
been posted, and we're aiming at having this merged for 3.15.

The A375 SoC timer is modeled matching the A370 timer, while the
A38x SoC timer is modeled matching the AXP timer. However, we'd like
to keep the compatible strings as SoC-specific.

In the past, we've had trouble chosing a common compatible string, resulting
in the introduction of per-SoC compatibles. Such compatible-string change
of course implies breaking backards compatibility, and was only possible
after agreeing that the old compatible wasn't used in production.

So, in order to avoid such problems, we think it's better to keep them
separate.

Gregory CLEMENT (2):
  clocksource: armada-370-xp: Add support for Armada 375
  clocksource: armada-370-xp: Add support for Armada 38x

 .../bindings/timer/marvell,armada-370-xp-timer.txt | 13 ++++++++----
 drivers/clocksource/time-armada-370-xp.c           | 23 +++++++++++++++++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

-- 
1.8.1.5

[PATCH 1/2] clocksource: armada-370-xp: Add support for Armada 375

[Ezequiel Garcia]

From: Gregory CLEMENT <gregory.clement@free-electrons.com>

The Armada 375 has a 25 Mhz fixed clock, but it is non-functional.
Therefore, let's use the A370 initialization for now, using the provided
parent clock.

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 .../bindings/timer/marvell,armada-370-xp-timer.txt          | 13 +++++++++----
 drivers/clocksource/time-armada-370-xp.c                    | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 5 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 f455182..59894fb 100644
--- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
+++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
@@ -1,9 +1,11 @@
-Marvell Armada 370 and Armada XP Timers
----------------------------------------
+Marvell Armada 370, 375 and XP Timers
+-------------------------------------
 
 Required properties:
-- compatible: Should be either "marvell,armada-370-timer" or
-  "marvell,armada-xp-timer" as appropriate.
+- compatible: Should be either:
+    - "marvell,armada-370-timer"
+    - "marvell,armada-375-timer"
+    - "marvell,armada-xp-timer"
 - interrupts: Should contain the list of Global Timer interrupts and
   then local timer interrupts
 - reg: Should contain location and length for timers register. First
@@ -13,6 +15,9 @@ Required properties:
 Clocks required for compatible = "marvell,armada-370-timer":
 - clocks : Must contain a single entry describing the clock input
 
+Clocks required for compatible = "marvell,armada-375-timer":
+- clocks : Must contain a single entry describing the clock input
+
 Clocks required for compatible = "marvell,armada-xp-timer":
 - clocks : Must contain an entry for each entry in clock-names.
 - clock-names : Must include the following entries:
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index ee8691b..87eda6d 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -15,12 +15,15 @@
  * used as clock_event_device.
  *
  * ---
- * Clocksource driver for Armada 370 and Armada XP SoC.
+ * Clocksource driver for Armada 370, Armada 375 and Armada XP SoC.
  * This driver implements one compatible string for each SoC, given
  * each has its own characteristics:
  *
  *   * Armada 370 has no 25 MHz fixed timer.
  *
+ *   * Armada 375 has a non-usable 25 Mhz fixed timer, due to hardware
+ *     issues.
+ *
  *   * 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.
@@ -316,3 +319,11 @@ static void __init armada_370_timer_init(struct device_node *np)
 }
 CLOCKSOURCE_OF_DECLARE(armada_370, "marvell,armada-370-timer",
 		       armada_370_timer_init);
+
+/*
+ * Currently support the Armada 375 timer as identical to the Armada 370.
+ * However, let's keep a SoC-specific compatible string to allow to change
+ * this in the future.
+ */
+CLOCKSOURCE_OF_DECLARE(armada_375, "marvell,armada-375-timer",
+		       armada_370_timer_init);
-- 
1.8.1.5

[PATCH 2/2] clocksource: armada-370-xp: Add support for Armada 38x

[Ezequiel Garcia]

From: Gregory CLEMENT <gregory.clement@free-electrons.com>

The Armada 38x has a 25 Mhz fixed clock. Therefore, we can model it
as compatible to the Armada XP timer for now. Nevertheless, we introduce
a new compatible string to allow future changes.

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-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 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 87eda6d..9fd20b2 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -24,6 +24,8 @@
  *   * Armada 375 has a non-usable 25 Mhz fixed timer, due to hardware
  *     issues.
  *
+ *   * Armada 380 has a 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.
@@ -327,3 +329,11 @@ CLOCKSOURCE_OF_DECLARE(armada_370, "marvell,armada-370-timer",
  */
 CLOCKSOURCE_OF_DECLARE(armada_375, "marvell,armada-375-timer",
 		       armada_370_timer_init);
+
+/*
+ * Support the Armada 38x timer as identical to the Armada XP, using the
+ * available 25 MHz clock. We maintain a SoC-specific compatible string to
+ * allow to change this in the future.
+ */
+CLOCKSOURCE_OF_DECLARE(armada_380, "marvell,armada-380-timer",
+		       armada_xp_timer_init);
-- 
1.8.1.5

[PATCH 0/2] Marvell Armada 375 and 38x timer support

[Daniel Lezcano]

On 02/10/2014 08:07 PM, Ezequiel Garcia wrote:
> Hello Daniel,
>
> This small series adds support for the two new Marvell ARM SoCs:
> the Armada 375 and Armada 38x.
>
> These new SoCs are based on Cortex-A9 CPU cores, and share a
> number of peripherals with their predecessors in the mach-mvebu
> family. The core support (arch/arm/mach-mvebu) for these SOCs have just
> been posted, and we're aiming at having this merged for 3.15.
>
> The A375 SoC timer is modeled matching the A370 timer, while the
> A38x SoC timer is modeled matching the AXP timer. However, we'd like
> to keep the compatible strings as SoC-specific.
>
> In the past, we've had trouble chosing a common compatible string, resulting
> in the introduction of per-SoC compatibles. Such compatible-string change
> of course implies breaking backards compatibility, and was only possible
> after agreeing that the old compatible wasn't used in production.
>
> So, in order to avoid such problems, we think it's better to keep them
> separate.
>
> Gregory CLEMENT (2):
>    clocksource: armada-370-xp: Add support for Armada 375
>    clocksource: armada-370-xp: Add support for Armada 38x
>
>   .../bindings/timer/marvell,armada-370-xp-timer.txt | 13 ++++++++----
>   drivers/clocksource/time-armada-370-xp.c           | 23 +++++++++++++++++++++-
>   2 files changed, 31 insertions(+), 5 deletions(-)

Applied to my tree for 3.15.

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 0/2] Marvell Armada 375 and 38x timer support

[Jason Cooper]

Daniel,

On Tue, Feb 11, 2014 at 02:03:57PM +0100, Daniel Lezcano wrote:
> On 02/10/2014 08:07 PM, Ezequiel Garcia wrote:
> >Hello Daniel,
> >
> >This small series adds support for the two new Marvell ARM SoCs:
> >the Armada 375 and Armada 38x.
> >
> >These new SoCs are based on Cortex-A9 CPU cores, and share a
> >number of peripherals with their predecessors in the mach-mvebu
> >family. The core support (arch/arm/mach-mvebu) for these SOCs have just
> >been posted, and we're aiming at having this merged for 3.15.
> >
> >The A375 SoC timer is modeled matching the A370 timer, while the
> >A38x SoC timer is modeled matching the AXP timer. However, we'd like
> >to keep the compatible strings as SoC-specific.
> >
> >In the past, we've had trouble chosing a common compatible string, resulting
> >in the introduction of per-SoC compatibles. Such compatible-string change
> >of course implies breaking backards compatibility, and was only possible
> >after agreeing that the old compatible wasn't used in production.
> >
> >So, in order to avoid such problems, we think it's better to keep them
> >separate.
> >
> >Gregory CLEMENT (2):
> >   clocksource: armada-370-xp: Add support for Armada 375
> >   clocksource: armada-370-xp: Add support for Armada 38x
> >
> >  .../bindings/timer/marvell,armada-370-xp-timer.txt | 13 ++++++++----
> >  drivers/clocksource/time-armada-370-xp.c           | 23 +++++++++++++++++++++-
> >  2 files changed, 31 insertions(+), 5 deletions(-)
> 
> Applied to my tree for 3.15.

Please hold off until we've resolved the discussion regarding adding
unneeded compatible strings.  It's under patch 6 in the main series
adding support for this new SoC.

  [PATCH 06/11] ARM: mvebu: add Armada 380/385 support to the system-controller driver

thx,

Jason.

[PATCH 0/2] Marvell Armada 375 and 38x timer support

[Daniel Lezcano]

On 02/11/2014 02:07 PM, Jason Cooper wrote:
> Daniel,
>
> On Tue, Feb 11, 2014 at 02:03:57PM +0100, Daniel Lezcano wrote:
>> On 02/10/2014 08:07 PM, Ezequiel Garcia wrote:
>>> Hello Daniel,
>>>
>>> This small series adds support for the two new Marvell ARM SoCs:
>>> the Armada 375 and Armada 38x.
>>>
>>> These new SoCs are based on Cortex-A9 CPU cores, and share a
>>> number of peripherals with their predecessors in the mach-mvebu
>>> family. The core support (arch/arm/mach-mvebu) for these SOCs have just
>>> been posted, and we're aiming at having this merged for 3.15.
>>>
>>> The A375 SoC timer is modeled matching the A370 timer, while the
>>> A38x SoC timer is modeled matching the AXP timer. However, we'd like
>>> to keep the compatible strings as SoC-specific.
>>>
>>> In the past, we've had trouble chosing a common compatible string, resulting
>>> in the introduction of per-SoC compatibles. Such compatible-string change
>>> of course implies breaking backards compatibility, and was only possible
>>> after agreeing that the old compatible wasn't used in production.
>>>
>>> So, in order to avoid such problems, we think it's better to keep them
>>> separate.
>>>
>>> Gregory CLEMENT (2):
>>>    clocksource: armada-370-xp: Add support for Armada 375
>>>    clocksource: armada-370-xp: Add support for Armada 38x
>>>
>>>   .../bindings/timer/marvell,armada-370-xp-timer.txt | 13 ++++++++----
>>>   drivers/clocksource/time-armada-370-xp.c           | 23 +++++++++++++++++++++-
>>>   2 files changed, 31 insertions(+), 5 deletions(-)
>>
>> Applied to my tree for 3.15.
>
> Please hold off until we've resolved the discussion regarding adding
> unneeded compatible strings.  It's under patch 6 in the main series
> adding support for this new SoC.
>
>    [PATCH 06/11] ARM: mvebu: add Armada 380/385 support to the system-controller driver

Ok, thanks for the heads up.

   -- 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 0/2] Marvell Armada 375 and 38x timer support

[Ezequiel Garcia]

Daniel,

On Tue, Feb 11, 2014 at 02:09:03PM +0100, Daniel Lezcano wrote:
> >>
> >> Applied to my tree for 3.15.
> >
> > Please hold off until we've resolved the discussion regarding adding
> > unneeded compatible strings.  It's under patch 6 in the main series
> > adding support for this new SoC.
> >

Yes, please drop it for now.

> >    [PATCH 06/11] ARM: mvebu: add Armada 380/385 support to the system-controller driver
> 
> Ok, thanks for the heads up.
> 

Ah, my bad! I should have added a warning about the discussion as I did
for the MBus patches. See:

http://www.spinics.net/lists/arm-kernel/msg306480.html

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

[PATCH 0/2] Marvell Armada 375 and 38x timer support

[Gregory CLEMENT]

On 11/02/2014 14:07, Jason Cooper wrote:
> Daniel,
> 
> On Tue, Feb 11, 2014 at 02:03:57PM +0100, Daniel Lezcano wrote:
>> On 02/10/2014 08:07 PM, Ezequiel Garcia wrote:
>>> Hello Daniel,
>>>
>>> This small series adds support for the two new Marvell ARM SoCs:
>>> the Armada 375 and Armada 38x.
>>>
>>> These new SoCs are based on Cortex-A9 CPU cores, and share a
>>> number of peripherals with their predecessors in the mach-mvebu
>>> family. The core support (arch/arm/mach-mvebu) for these SOCs have just
>>> been posted, and we're aiming at having this merged for 3.15.
>>>
>>> The A375 SoC timer is modeled matching the A370 timer, while the
>>> A38x SoC timer is modeled matching the AXP timer. However, we'd like
>>> to keep the compatible strings as SoC-specific.
>>>
>>> In the past, we've had trouble chosing a common compatible string, resulting
>>> in the introduction of per-SoC compatibles. Such compatible-string change
>>> of course implies breaking backards compatibility, and was only possible
>>> after agreeing that the old compatible wasn't used in production.
>>>
>>> So, in order to avoid such problems, we think it's better to keep them
>>> separate.
>>>
>>> Gregory CLEMENT (2):
>>>   clocksource: armada-370-xp: Add support for Armada 375
>>>   clocksource: armada-370-xp: Add support for Armada 38x
>>>
>>>  .../bindings/timer/marvell,armada-370-xp-timer.txt | 13 ++++++++----
>>>  drivers/clocksource/time-armada-370-xp.c           | 23 +++++++++++++++++++++-
>>>  2 files changed, 31 insertions(+), 5 deletions(-)
>>
>> Applied to my tree for 3.15.
> 
> Please hold off until we've resolved the discussion regarding adding
> unneeded compatible strings.  It's under patch 6 in the main series
> adding support for this new SoC.
> 
>   [PATCH 06/11] ARM: mvebu: add Armada 380/385 support to the system-controller driver
> 

I still believe that having different compatible strings for
different IP even if at first sight they look similar.

Moreover we are already aware of some issue on this SoC such as
the 25Mhz timer which don't work (yet) on Armada 375.


Thanks,

Gregory

> thx,
> 
> Jason.
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at 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

[PATCH 0/2] Marvell Armada 375 and 38x timer support

[Ezequiel Garcia]

Daniel,

On Mon, Feb 10, 2014 at 04:07:52PM -0300, Ezequiel Garcia wrote:
> 
> This small series adds support for the two new Marvell ARM SoCs:
> the Armada 375 and Armada 38x.
> 

Please omit these patches entirely, we don't need them.

The new agreement [1] is to add SoC-specific compatible strings and also
declare the nodes as compatibles with the already supported SoC,
whenever appropriate.

[..]
> The A375 SoC timer is modeled matching the A370 timer, while the
> A38x SoC timer is modeled matching the AXP timer.
> 

So, as per the statement above, the devicetree for Armada 375 and
Armada 38x would have these timer nodes, respectively:

  timer {
      compatible = "marvell,armada-375-timer", "marvell,armada-370-timer"
  }

  timer {
      compatible = "marvell,armada-380-timer", "marvell,armada-xp-timer"
  }

(Because the Armada 375 timer uses the provided parent clock, whereas the
Armada 380 timer uses the fixed 25 MHz clock).

Therefore, we don't need any changes in the clocksource driver for now.

[1] http://www.spinics.net/lists/arm-kernel/msg306727.html
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

[PATCH 0/2] Marvell Armada 375 and 38x timer support

[Daniel Lezcano]

On 02/11/2014 05:03 PM, Ezequiel Garcia wrote:
> Daniel,
>
> On Mon, Feb 10, 2014 at 04:07:52PM -0300, Ezequiel Garcia wrote:
>>
>> This small series adds support for the two new Marvell ARM SoCs:
>> the Armada 375 and Armada 38x.
>>
>
> Please omit these patches entirely, we don't need them.

Roger.

> The new agreement [1] is to add SoC-specific compatible strings and also
> declare the nodes as compatibles with the already supported SoC,
> whenever appropriate.
>
> [..]
>> The A375 SoC timer is modeled matching the A370 timer, while the
>> A38x SoC timer is modeled matching the AXP timer.
>>
>
> So, as per the statement above, the devicetree for Armada 375 and
> Armada 38x would have these timer nodes, respectively:
>
>    timer {
>        compatible = "marvell,armada-375-timer", "marvell,armada-370-timer"
>    }
>
>    timer {
>        compatible = "marvell,armada-380-timer", "marvell,armada-xp-timer"
>    }
>
> (Because the Armada 375 timer uses the provided parent clock, whereas the
> Armada 380 timer uses the fixed 25 MHz clock).
>
> Therefore, we don't need any changes in the clocksource driver for now.
>
> [1] http://www.spinics.net/lists/arm-kernel/msg306727.html
>


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