From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 01/10] ARM: mvebu: add Armada 375 support to the system-controller driver
Date: Wed, 12 Feb 2014 11:23:30 +0100 [thread overview]
Message-ID: <1392200619-3141-2-git-send-email-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <1392200619-3141-1-git-send-email-thomas.petazzoni@free-electrons.com>
The system controller block in the Armada 375 has different register
offsets for the system reset and other related functions. Therefore,
this commit introduces the new "armada-375-system-controller"
compatible string to identify the Armada 375 variant of the system
controller.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
.../devicetree/bindings/arm/mvebu-system-controller.txt | 3 ++-
arch/arm/mach-mvebu/system-controller.c | 14 ++++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt b/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
index 081c6a7..d24ab2e 100644
--- a/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
+++ b/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
@@ -1,12 +1,13 @@
MVEBU System Controller
-----------------------
-MVEBU (Marvell SOCs: Armada 370/XP, Dove, mv78xx0, Kirkwood, Orion5x)
+MVEBU (Marvell SOCs: Armada 370/375/XP, Dove, mv78xx0, Kirkwood, Orion5x)
Required properties:
- compatible: one of:
- "marvell,orion-system-controller"
- "marvell,armada-370-xp-system-controller"
+ - "marvell,armada-375-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 a7fb89a..1806187 100644
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -1,5 +1,5 @@
/*
- * System controller support for Armada 370 and XP platforms.
+ * System controller support for Armada 370, 375 and XP platforms.
*
* Copyright (C) 2012 Marvell
*
@@ -11,7 +11,7 @@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*
- * The Armada 370 and Armada XP SoCs both have a range of
+ * The Armada 370, 375 and Armada XP SoCs have a range of
* miscellaneous registers, that do not belong to a particular device,
* but rather provide system-level features. This basic
* system-controller driver provides a device tree binding for those
@@ -47,6 +47,13 @@ static const struct mvebu_system_controller armada_370_xp_system_controller = {
.system_soft_reset = 0x1,
};
+static const struct mvebu_system_controller armada_375_system_controller = {
+ .rstoutn_mask_offset = 0x54,
+ .system_soft_reset_offset = 0x58,
+ .rstoutn_mask_reset_out_en = 0x1,
+ .system_soft_reset = 0x1,
+};
+
static const struct mvebu_system_controller orion_system_controller = {
.rstoutn_mask_offset = 0x108,
.system_soft_reset_offset = 0x10c,
@@ -61,6 +68,9 @@ static struct of_device_id of_system_controller_table[] = {
}, {
.compatible = "marvell,armada-370-xp-system-controller",
.data = (void *) &armada_370_xp_system_controller,
+ }, {
+ .compatible = "marvell,armada-375-system-controller",
+ .data = (void *) &armada_375_system_controller,
},
{ /* end of list */ },
};
--
1.8.3.2
next prev parent reply other threads:[~2014-02-12 10:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 10:23 [PATCH v2 00/10] Core support for Marvell Armada 375 and 38x Thomas Petazzoni
2014-02-12 10:23 ` Thomas Petazzoni [this message]
2014-02-12 10:23 ` [PATCH v2 02/10] ARM: mvebu: add initial support for the Armada 375 SOCs Thomas Petazzoni
2014-02-12 13:08 ` Arnd Bergmann
2014-02-13 10:55 ` Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 03/10] ARM: mvebu: add workaround for data abort issue on Armada 375 Thomas Petazzoni
2014-02-12 13:10 ` Arnd Bergmann
2014-02-13 10:56 ` Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 04/10] ARM: mvebu: add Device Tree description of the Armada 375 SoC Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 05/10] ARM: mvebu: add Device Tree for the Armada 375 DB board Thomas Petazzoni
2014-02-12 13:12 ` Arnd Bergmann
2014-02-13 10:56 ` Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 06/10] ARM: mvebu: add initial support for the Armada 380/385 SOCs Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 07/10] ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 08/10] ARM: mvebu: add Device Tree for the Armada 385 DB board Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 09/10] ARM: mvebu: update defconfigs for Armada 375 and 38x Thomas Petazzoni
2014-02-12 10:23 ` [PATCH v2 10/10] Documentation: arm: update Marvell documentation about Armada 375/38x Thomas Petazzoni
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=1392200619-3141-2-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.