From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>,
Arnd Bergmann <arnd@arndb.de>
Cc: linux-sh@vger.kernel.org, linux-pm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 3/4] ARM: shmobile: sh73a0: Remove restart callback
Date: Wed, 3 Dec 2014 15:17:06 +0100 [thread overview]
Message-ID: <1417616227-6715-4-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1417616227-6715-1-git-send-email-geert+renesas@glider.be>
Remove the restart handling hack from the sh73a0 generic multiplatform
case.
Restart on DT-based sh73a0 platforms is now handled through the restart
handler registered by the R-Mobile System Controller (SYSC) driver.
This reverts commit cad900819fba0176 ("ARM: shmobile: sh73a0: Add
restart callback").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/setup-sh73a0.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 2ec702c51dd25050..9e5e5ebbd1af641d 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -818,13 +818,6 @@ void __init sh73a0_add_standard_devices_dt(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-#define RESCNT2 IOMEM(0xe6188020)
-static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
-{
- /* Do soft power on reset */
- writel((1 << 31), RESCNT2);
-}
-
static const char *sh73a0_boards_compat_dt[] __initdata = {
"renesas,sh73a0",
NULL,
@@ -836,7 +829,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.init_early = shmobile_init_delay,
.init_machine = sh73a0_add_standard_devices_dt,
.init_late = shmobile_init_late,
- .restart = sh73a0_restart,
.dt_compat = sh73a0_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
1.9.1
next prev parent reply other threads:[~2014-12-03 14:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 14:17 [PATCH 0/4] ARM: shmobile: R-Mobile: Add SYSC restart handler Geert Uytterhoeven
2014-12-03 14:17 ` [PATCH 1/4] " Geert Uytterhoeven
2014-12-04 10:08 ` Arnd Bergmann
2014-12-04 11:47 ` Geert Uytterhoeven
2014-12-04 12:53 ` Geert Uytterhoeven
2014-12-03 14:17 ` [PATCH 2/4] ARM: shmobile: r8a7740: Remove restart callback Geert Uytterhoeven
2014-12-03 14:17 ` Geert Uytterhoeven [this message]
2014-12-03 14:17 ` [PATCH 4/4] ARM: shmobile: kzm9g-reference: " Geert Uytterhoeven
2014-12-04 7:34 ` [PATCH 0/4] ARM: shmobile: R-Mobile: Add SYSC restart handler Simon Horman
2014-12-04 9:39 ` Geert Uytterhoeven
2014-12-04 12:18 ` Simon Horman
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=1417616227-6715-4-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=arnd@arndb.de \
--cc=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).