linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: geert+renesas@glider.be (Geert Uytterhoeven)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: shmobile: sh73a0: Remove restart callback
Date: Mon, 23 Feb 2015 16:59:29 +0100	[thread overview]
Message-ID: <1424707169-23007-4-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1424707169-23007-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
R-Mobile reset driver.

This basically reverts commit cad900819fba0176 ("ARM: shmobile: sh73a0:
Add restart callback").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
To avoid losing functionality, this depends on:
  - commit fa0f8d6700857457 ("power: reset: Add reset driver for
    R-Mobile platforms"), which is in v4.0-rc1,
  - commit 126693a80f451ecd ("ARM: shmobile: sh73a0 dtsi: Add PM domain
    support"), which is in sh73a0-multiplatform-for-v3.21,
  - "ARM: shmobile: Enable R-Mobile reset driver in multiplatform
    defconfig", which is the first patch of this series.
---
 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 d17d2682dfa8bd0c..e63c2c2558171498 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -814,13 +814,6 @@ void __init sh73a0_add_early_devices(void)
 	shmobile_setup_console();
 }
 
-#define RESCNT2 IOMEM(0xe6188020)
-static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
-{
-	/* Do soft power on reset */
-	writel((1 << 31), RESCNT2);
-}
-
 #ifdef CONFIG_USE_OF
 
 static void __init sh73a0_generic_init(void)
@@ -843,7 +836,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
 	.init_early	= shmobile_init_delay,
 	.init_machine	= sh73a0_generic_init,
 	.init_late	= shmobile_init_late,
-	.restart	= sh73a0_restart,
 	.dt_compat	= sh73a0_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
-- 
1.9.1

  parent reply	other threads:[~2015-02-23 15:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-23 15:59 [PATCH 0/3] Enable R-Mobile Reset Driver Geert Uytterhoeven
2015-02-23 15:59 ` [PATCH 1/3] ARM: shmobile: Enable R-Mobile reset driver in multiplatform defconfig Geert Uytterhoeven
2015-02-23 15:59 ` [PATCH 2/3] ARM: shmobile: r8a7740: Remove restart callback Geert Uytterhoeven
2015-02-23 15:59 ` Geert Uytterhoeven [this message]
2015-02-24  1:46 ` [PATCH 0/3] Enable R-Mobile Reset Driver 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=1424707169-23007-4-git-send-email-geert+renesas@glider.be \
    --to=geert+renesas@glider.be \
    --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 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).