From: andrew@lunn•ch (Andrew Lunn)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 3/9] arm: mach-mvebu: add source files
Date: Tue, 3 Jul 2012 17:16:48 +0200 [thread overview]
Message-ID: <20120703151648.GG17534@lunn.ch> (raw)
In-Reply-To: <1341243574-3258-4-git-send-email-thomas.petazzoni@free-electrons.com>
On Mon, Jul 02, 2012 at 05:39:28PM +0200, Thomas Petazzoni wrote:
> From: Gregory CLEMENT <gregory.clement@free-electrons•com>
>
> [ben.dooks at codethink.co.uk: fixup style error in system-controller]
> [ben.dooks at codethink.co.uk: check result of of_match_node()]
>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons•com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons•com>
> Signed-off-by: Lior Amsalem <alior@marvell•com>
> ---
> arch/arm/mach-mvebu/Kconfig | 7 +++
> arch/arm/mach-mvebu/Makefile | 1 +
> arch/arm/mach-mvebu/Makefile.boot | 1 +
> arch/arm/mach-mvebu/common.h | 20 ++++++
> arch/arm/mach-mvebu/system-controller.c | 105 +++++++++++++++++++++++++++++++
> 5 files changed, 134 insertions(+)
> create mode 100644 arch/arm/mach-mvebu/Kconfig
> create mode 100644 arch/arm/mach-mvebu/Makefile
> create mode 100644 arch/arm/mach-mvebu/Makefile.boot
> create mode 100644 arch/arm/mach-mvebu/common.h
> create mode 100644 arch/arm/mach-mvebu/system-controller.c
>
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> new file mode 100644
> index 0000000..72d39e5
> --- /dev/null
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -0,0 +1,7 @@
> +if ARCH_MVEBU
> +
> +menu "Marvell SOC with device tree"
> +
> +endmenu
> +
> +endif
> diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
> new file mode 100644
> index 0000000..7366ae7
> --- /dev/null
> +++ b/arch/arm/mach-mvebu/Makefile
> @@ -0,0 +1 @@
> +obj-y += system-controller.o
> diff --git a/arch/arm/mach-mvebu/Makefile.boot b/arch/arm/mach-mvebu/Makefile.boot
> new file mode 100644
> index 0000000..b327175
> --- /dev/null
> +++ b/arch/arm/mach-mvebu/Makefile.boot
> @@ -0,0 +1 @@
> +zreladdr-y := 0x00008000
> diff --git a/arch/arm/mach-mvebu/common.h b/arch/arm/mach-mvebu/common.h
> new file mode 100644
> index 0000000..f0eaa21
> --- /dev/null
> +++ b/arch/arm/mach-mvebu/common.h
> @@ -0,0 +1,20 @@
> +/*
> + * Core functions for Marvell System On Chip
> + *
> + * Copyright (C) 2012 Marvell
> + *
> + * Lior Amsalem <alior@marvell•com>
> + * Gregory CLEMENT <gregory.clement@free-electrons•com>
> + * 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 __ARCH_MVEBU_COMMON_H
> +#define __ARCH_MVEBU_COMMON_H
> +
> +void mvebu_restart(char mode, const char *cmd);
> +
> +#endif
> diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
> new file mode 100644
> index 0000000..b8079df
> --- /dev/null
> +++ b/arch/arm/mach-mvebu/system-controller.c
> @@ -0,0 +1,105 @@
> +/*
> + * System controller support for Armada 370 and XP platforms.
> + *
> + * Copyright (C) 2012 Marvell
> + *
> + * Lior Amsalem <alior@marvell•com>
> + * Gregory CLEMENT <gregory.clement@free-electrons•com>
> + * 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.
> + *
> + * The Armada 370 and Armada XP SoCs both 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
> + * registers, and implements utility functions offering various
> + * features related to those registers.
> + *
> + * For now, the feature set is limited to restarting the platform by a
> + * soft-reset, but it might be extended in the future.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/init.h>
> +#include <linux/of_address.h>
> +#include <linux/io.h>
> +
> +static void __iomem *system_controller_base;
> +
> +struct mvebu_system_controller {
> + u32 rstoutn_mask_offset;
> + u32 system_soft_reset_offset;
> +
> + u32 rstoutn_mask_reset_out_en;
> + u32 system_soft_reset;
> +};
> +static struct mvebu_system_controller *mvebu_sc;
> +
> +const struct mvebu_system_controller armada_370_xp_system_controller = {
> + .rstoutn_mask_offset = 0x60,
> + .system_soft_reset_offset = 0x64,
> + .rstoutn_mask_reset_out_en = 0x1,
> + .system_soft_reset = 0x1,
> +};
> +
> +const struct mvebu_system_controller orion_system_controller = {
> + .rstoutn_mask_offset = 0x108,
> + .system_soft_reset_offset = 0x10c,
> + .rstoutn_mask_reset_out_en = 0x4,
> + .system_soft_reset = 0x1,
> +};
> +
> +static struct of_device_id of_system_controller_table[] = {
> + {
> + .compatible = "marvell,orion-system-controller",
> + .data = (void *) &orion_system_controller,
> + }, {
> + .compatible = "marvell,armada-370-xp-system-controller",
> + .data = (void *) &armada_370_xp_system_controller,
> + },
> + { /* end of list */ },
> +};
> +
> +void mvebu_restart(char mode, const char *cmd)
> +{
> + if (!system_controller_base) {
> + pr_err("Cannot restart, system-controller not available: check the device tree\n");
> + } else {
> + /*
> + * Enable soft reset to assert RSTOUTn.
> + */
> + writel(mvebu_sc->rstoutn_mask_reset_out_en,
> + system_controller_base +
> + mvebu_sc->rstoutn_mask_offset);
> + /*
> + * Assert soft reset.
> + */
> + writel(mvebu_sc->system_soft_reset,
> + system_controller_base +
> + mvebu_sc->system_soft_reset_offset);
> + }
> +
> + while (1)
> + ;
> +}
> +
> +static int __init mvebu_system_controller_init(void)
> +{
> + struct device_node *np;
> +
> + np = of_find_matching_node(NULL, of_system_controller_table);
> + if (np) {
> + const struct of_device_id *match =
> + of_match_node(of_system_controller_table, np);
> + BUG_ON(!match);
> + system_controller_base = of_iomap(np, 0);
> + mvebu_sc = (struct mvebu_system_controller *)match->data;
> + }
> +
> + return 0;
> +}
> +
> +arch_initcall(mvebu_system_controller_init);
> --
> 1.7.9.5
>
Acked-by: Andrew Lunn <andrew@lunn•ch>
I also already sent a tested-by: which you failed to add. I don't
think the changed are particularly significant, so please keep it.
Andrew
next prev parent reply other threads:[~2012-07-03 15:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-02 15:39 [PATCH v7] arm: Add basic support for new Marvell Armada 370 and Armada XP SoC Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 1/9] clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver Thomas Petazzoni
2012-07-02 17:40 ` Thomas Gleixner
2012-07-03 15:12 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 2/9] arm: mach-mvebu: add header Thomas Petazzoni
2012-07-02 18:33 ` Andrew Lunn
2012-07-02 19:08 ` Thomas Petazzoni
2012-07-02 19:16 ` Andrew Lunn
2012-07-02 21:31 ` Arnd Bergmann
2012-07-03 3:48 ` Nicolas Pitre
2012-07-03 7:09 ` Andrew Lunn
2012-07-03 7:20 ` Thomas Petazzoni
2012-07-03 15:13 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 3/9] arm: mach-mvebu: add source files Thomas Petazzoni
2012-07-03 15:16 ` Andrew Lunn [this message]
2012-07-02 15:39 ` [PATCH 4/9] arm: mach-mvebu: add support for Armada 370 and Armada XP with DT Thomas Petazzoni
2012-07-03 15:36 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 5/9] arm: mach-mvebu: add documentation for new device tree bindings Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 6/9] arm: mach-mvebu: add defconfig Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 7/9] arm: mach-mvebu: add compilation/configuration change Thomas Petazzoni
2012-07-03 15:41 ` Andrew Lunn
2012-07-02 15:39 ` [PATCH 8/9] arm: mach-mvebu: add entry to MAINTAINERS Thomas Petazzoni
2012-07-02 15:39 ` [PATCH 9/9] ARM: mvebu: MPIC: read number of interrupts from control register Thomas Petazzoni
2012-07-03 17:20 ` [PATCH v7] arm: Add basic support for new Marvell Armada 370 and Armada XP SoC Ben Dooks
2012-07-04 12:11 ` Yehuda Yitschak
2012-07-04 13:54 ` Lior Amsalem
-- strict thread matches above, loose matches on Subject: below --
2012-07-02 11:33 [PATCH v6] " Thomas Petazzoni
2012-07-02 11:33 ` [PATCH 3/9] arm: mach-mvebu: add source files 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=20120703151648.GG17534@lunn.ch \
--to=andrew@lunn$(echo .)ch \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox