All of lore.kernel.org
 help / color / mirror / Atom feed
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/11] ARM: mvebu: add Armada 380/385 support to the system-controller driver
Date: Mon, 10 Feb 2014 18:23:17 +0100	[thread overview]
Message-ID: <1392053002-19831-7-git-send-email-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <1392053002-19831-1-git-send-email-thomas.petazzoni@free-electrons.com>

This commit adds support for the Armada 380/385 SoCs in the
system-controller driver. Since this SoC has the same system
controller registers layout than the Armada 370/XP at least for the
few features currently supported by the driver, this commit simply
adds a new compatible string that provides the same behavior than the
one provided for Armada 370/XP.

Note that we intentionally do not use the same compatible string as
Armada 370/XP, as the current system-controller driver is far from
exploiting all the possibilities of the hardware, and we may in the
future discover differences between Armada 370/XP and Armada 380/385.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 Documentation/devicetree/bindings/arm/mvebu-system-controller.txt | 3 ++-
 arch/arm/mach-mvebu/system-controller.c                           | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt b/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
index d24ab2e..3559972 100644
--- a/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
+++ b/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
@@ -1,6 +1,6 @@
 MVEBU System Controller
 -----------------------
-MVEBU (Marvell SOCs: Armada 370/375/XP, Dove, mv78xx0, Kirkwood, Orion5x)
+MVEBU (Marvell SOCs: Armada 370/375/38x/XP, Dove, mv78xx0, Kirkwood, Orion5x)
 
 Required properties:
 
@@ -8,6 +8,7 @@ Required properties:
 	- "marvell,orion-system-controller"
 	- "marvell,armada-370-xp-system-controller"
 	- "marvell,armada-375-system-controller"
+	- "marvell,armada-380-system-controller"
 - reg: Should contain system controller registers location and length.
 
 Example:
diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
index 1806187..b4e8bb2 100644
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -71,6 +71,14 @@ static struct of_device_id of_system_controller_table[] = {
 	}, {
 		.compatible = "marvell,armada-375-system-controller",
 		.data = (void *) &armada_375_system_controller,
+	}, {
+		/*
+		 * As far as RSTOUTn and System soft reset registers
+		 * are concerned, Armada 38x is similar to Armada
+		 * 370/XP
+		 */
+		.compatible = "marvell,armada-380-system-controller",
+		.data = (void *) &armada_370_xp_system_controller,
 	},
 	{ /* end of list */ },
 };
-- 
1.8.3.2

  parent reply	other threads:[~2014-02-10 17:23 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-10 17:23 [PATCH 00/11] Core support for Marvell Armada 375 and 38x Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 01/11] ARM: mvebu: add Armada 375 support to the system-controller driver Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 02/11] ARM: mvebu: add initial support for the Armada 375 SOCs Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 03/11] ARM: mvebu: add workaround for data abort issue on Armada 375 Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 04/11] ARM: mvebu: add Device Tree description of the Armada 375 SoC Thomas Petazzoni
2014-02-10 17:35   ` Jason Cooper
2014-02-10 17:37     ` Gregory CLEMENT
2014-02-10 17:23 ` [PATCH 05/11] ARM: mvebu: add Device Tree for the Armada 375 DB board Thomas Petazzoni
2014-02-10 17:37   ` Andrew Lunn
2014-02-10 17:47     ` Thomas Petazzoni
2014-02-10 17:23 ` Thomas Petazzoni [this message]
2014-02-10 17:39   ` [PATCH 06/11] ARM: mvebu: add Armada 380/385 support to the system-controller driver Jason Cooper
2014-02-10 17:47     ` Thomas Petazzoni
2014-02-10 18:48       ` Jason Cooper
2014-02-10 19:03         ` Thomas Petazzoni
2014-02-11 14:22     ` Grant Likely
2014-02-11 15:24       ` Thomas Petazzoni
2014-02-11 15:30         ` Jason Cooper
2014-02-11 15:50           ` Gregory CLEMENT
2014-02-10 17:23 ` [PATCH 07/11] ARM: mvebu: add initial support for the Armada 380/385 SOCs Thomas Petazzoni
2014-02-10 17:44   ` Andrew Lunn
2014-02-10 17:55     ` Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 08/11] ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 09/11] ARM: mvebu: add Device Tree for the Armada 385 DB board Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 10/11] ARM: mvebu: update defconfigs for Armada 375 and 38x Thomas Petazzoni
2014-02-10 17:23 ` [PATCH 11/11] Documentation: arm: update Marvell documentation about Armada 375/38x Thomas Petazzoni
2014-02-10 17:47 ` [PATCH 00/11] Core support for Marvell Armada 375 and 38x Jason Gunthorpe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392053002-19831-7-git-send-email-thomas.petazzoni@free-electrons.com \
    --to=thomas.petazzoni@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.