From: Chris Brand <chris.brand@broadcom.com>
To: Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Florian Fainelli <f.fainelli@gmail.com>,
Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
Russell King <linux@arm.linux.org.uk>,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
devicetree@vger.kernel.org,
Raymond Ngun <raymond.ngun@broadcom.com>,
Markus Mayer <markus.mayer@broadcom.com>
Subject: [PATCH 2/6] arm: bcm21664: Remove reset code
Date: Thu, 5 May 2016 13:48:50 -0700 [thread overview]
Message-ID: <1462481334-8943-3-git-send-email-chris.brand@broadcom.com> (raw)
In-Reply-To: <1462481334-8943-1-git-send-email-chris.brand@broadcom.com>
The kona reset driver now provides this functionality.
Signed-off-by: Chris Brand <chris.brand@broadcom.com>
---
arch/arm/mach-bcm/board_bcm21664.c | 42 --------------------------------------
1 file changed, 42 deletions(-)
diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c
index 82ad5687771f..65b3db06e57a 100644
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@ -11,53 +11,12 @@
* GNU General Public License for more details.
*/
-#include <linux/of_address.h>
#include <linux/of_platform.h>
-#include <linux/io.h>
#include <asm/mach/arch.h>
#include "kona_l2_cache.h"
-#define RSTMGR_DT_STRING "brcm,bcm21664-resetmgr"
-
-#define RSTMGR_REG_WR_ACCESS_OFFSET 0
-#define RSTMGR_REG_CHIP_SOFT_RST_OFFSET 4
-
-#define RSTMGR_WR_PASSWORD 0xa5a5
-#define RSTMGR_WR_PASSWORD_SHIFT 8
-#define RSTMGR_WR_ACCESS_ENABLE 1
-
-static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
-{
- void __iomem *base;
- struct device_node *resetmgr;
-
- resetmgr = of_find_compatible_node(NULL, NULL, RSTMGR_DT_STRING);
- if (!resetmgr) {
- pr_emerg("Couldn't find " RSTMGR_DT_STRING "\n");
- return;
- }
- base = of_iomap(resetmgr, 0);
- if (!base) {
- pr_emerg("Couldn't map " RSTMGR_DT_STRING "\n");
- return;
- }
-
- /*
- * A soft reset is triggered by writing a 0 to bit 0 of the soft reset
- * register. To write to that register we must first write the password
- * and the enable bit in the write access enable register.
- */
- writel((RSTMGR_WR_PASSWORD << RSTMGR_WR_PASSWORD_SHIFT) |
- RSTMGR_WR_ACCESS_ENABLE,
- base + RSTMGR_REG_WR_ACCESS_OFFSET);
- writel(0, base + RSTMGR_REG_CHIP_SOFT_RST_OFFSET);
-
- /* Wait for reset */
- while (1);
-}
-
static void __init bcm21664_init(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
@@ -71,6 +30,5 @@ static const char * const bcm21664_dt_compat[] = {
DT_MACHINE_START(BCM21664_DT, "BCM21664 Broadcom Application Processor")
.init_machine = bcm21664_init,
- .restart = bcm21664_restart,
.dt_compat = bcm21664_dt_compat,
MACHINE_END
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: chris.brand@broadcom.com (Chris Brand)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] arm: bcm21664: Remove reset code
Date: Thu, 5 May 2016 13:48:50 -0700 [thread overview]
Message-ID: <1462481334-8943-3-git-send-email-chris.brand@broadcom.com> (raw)
In-Reply-To: <1462481334-8943-1-git-send-email-chris.brand@broadcom.com>
The kona reset driver now provides this functionality.
Signed-off-by: Chris Brand <chris.brand@broadcom.com>
---
arch/arm/mach-bcm/board_bcm21664.c | 42 --------------------------------------
1 file changed, 42 deletions(-)
diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c
index 82ad5687771f..65b3db06e57a 100644
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@ -11,53 +11,12 @@
* GNU General Public License for more details.
*/
-#include <linux/of_address.h>
#include <linux/of_platform.h>
-#include <linux/io.h>
#include <asm/mach/arch.h>
#include "kona_l2_cache.h"
-#define RSTMGR_DT_STRING "brcm,bcm21664-resetmgr"
-
-#define RSTMGR_REG_WR_ACCESS_OFFSET 0
-#define RSTMGR_REG_CHIP_SOFT_RST_OFFSET 4
-
-#define RSTMGR_WR_PASSWORD 0xa5a5
-#define RSTMGR_WR_PASSWORD_SHIFT 8
-#define RSTMGR_WR_ACCESS_ENABLE 1
-
-static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
-{
- void __iomem *base;
- struct device_node *resetmgr;
-
- resetmgr = of_find_compatible_node(NULL, NULL, RSTMGR_DT_STRING);
- if (!resetmgr) {
- pr_emerg("Couldn't find " RSTMGR_DT_STRING "\n");
- return;
- }
- base = of_iomap(resetmgr, 0);
- if (!base) {
- pr_emerg("Couldn't map " RSTMGR_DT_STRING "\n");
- return;
- }
-
- /*
- * A soft reset is triggered by writing a 0 to bit 0 of the soft reset
- * register. To write to that register we must first write the password
- * and the enable bit in the write access enable register.
- */
- writel((RSTMGR_WR_PASSWORD << RSTMGR_WR_PASSWORD_SHIFT) |
- RSTMGR_WR_ACCESS_ENABLE,
- base + RSTMGR_REG_WR_ACCESS_OFFSET);
- writel(0, base + RSTMGR_REG_CHIP_SOFT_RST_OFFSET);
-
- /* Wait for reset */
- while (1);
-}
-
static void __init bcm21664_init(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
@@ -71,6 +30,5 @@ static const char * const bcm21664_dt_compat[] = {
DT_MACHINE_START(BCM21664_DT, "BCM21664 Broadcom Application Processor")
.init_machine = bcm21664_init,
- .restart = bcm21664_restart,
.dt_compat = bcm21664_dt_compat,
MACHINE_END
--
1.9.1
next prev parent reply other threads:[~2016-05-05 20:48 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 20:48 [PATCH 0/6] Support BCM23550 SoC Chris Brand
2016-05-05 20:48 ` Chris Brand
2016-05-05 20:48 ` [PATCH 1/6] power: Introduce Broadcom kona reset driver Chris Brand
2016-05-05 20:48 ` Chris Brand
2016-05-05 20:48 ` Chris Brand [this message]
2016-05-05 20:48 ` [PATCH 2/6] arm: bcm21664: Remove reset code Chris Brand
2016-05-05 20:48 ` [PATCH 3/6] docs: Document BCM23550 bindings Chris Brand
2016-05-05 20:48 ` Chris Brand
2016-05-09 19:41 ` Rob Herring
2016-05-09 19:41 ` Rob Herring
2016-05-09 22:27 ` Chris Brand
2016-05-09 22:27 ` Chris Brand
2016-05-05 20:48 ` [PATCH 4/6] arm: Add support for Broadcom BCM23550 SoC Chris Brand
2016-05-05 20:48 ` Chris Brand
2016-05-05 20:48 ` [PATCH 5/6] arm: BCM23550 SMP support Chris Brand
2016-05-05 20:48 ` Chris Brand
2016-05-05 20:48 ` [PATCH 6/6] arm: dt: bcm23550: Add device tree files Chris Brand
2016-05-05 20:48 ` Chris Brand
2016-05-05 21:05 ` Arnd Bergmann
2016-05-05 21:05 ` Arnd Bergmann
2016-05-05 21:05 ` Arnd Bergmann
2016-05-06 17:49 ` Chris Brand
2016-05-06 17:49 ` Chris Brand
2016-05-05 21:09 ` [PATCH 0/6] Support BCM23550 SoC Arnd Bergmann
2016-05-05 21:09 ` Arnd Bergmann
2016-05-05 21:09 ` Arnd Bergmann
2016-05-09 22:31 ` Chris Brand
2016-05-09 22:31 ` Chris Brand
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=1462481334-8943-3-git-send-email-chris.brand@broadcom.com \
--to=chris.brand@broadcom.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=f.fainelli@gmail.com \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=markus.mayer@broadcom.com \
--cc=pawel.moll@arm.com \
--cc=raymond.ngun@broadcom.com \
--cc=rjui@broadcom.com \
--cc=robh+dt@kernel.org \
--cc=sbranden@broadcom.com \
--cc=sre@kernel.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.