linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: anarsoul@gmail.com (Vasily Khoruzhick)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/5] Add suspend/resume support for RX1950
Date: Tue, 11 May 2010 09:55:10 +0300	[thread overview]
Message-ID: <1273560911-18153-5-git-send-email-anarsoul@gmail.com> (raw)
In-Reply-To: <1273560911-18153-1-git-send-email-anarsoul@gmail.com>

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 arch/arm/mach-s3c2410/pm.c |    4 ++--
 arch/arm/mm/mmu.c          |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 966119c..6a61486 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -60,10 +60,10 @@ static void s3c2410_pm_prepare(void)
 		__raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
 	}
 
-	/* the RX3715 uses similar code and the same H1940 and the
+	/* RX3715 and RX1950 use similar to H1940 code and the
 	 * same offsets for resume and checksum pointers */
 
-	if (machine_is_rx3715()) {
+	if (machine_is_rx3715() || machine_is_rx1950()) {
 		void *base = phys_to_virt(H1940_SUSPEND_CHECK);
 		unsigned long ptr;
 		unsigned long calc = 0;
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 241c24a..45a1bc2 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -869,9 +869,10 @@ void __init reserve_node_zero(pg_data_t *pgdat)
 	if (machine_is_p720t())
 		res_size = 0x00014000;
 
-	/* H1940 and RX3715 need to reserve this for suspend */
+	/* H1940, RX3715 and RX1950 need to reserve this for suspend */
 
-	if (machine_is_h1940() || machine_is_rx3715()) {
+	if (machine_is_h1940() || machine_is_rx3715()
+		|| machine_is_rx1950()) {
 		reserve_bootmem_node(pgdat, 0x30003000, 0x1000,
 				BOOTMEM_DEFAULT);
 		reserve_bootmem_node(pgdat, 0x30081000, 0x1000,
-- 
1.7.0.4

  parent reply	other threads:[~2010-05-11  6:55 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-11  6:55 [PATCH v2 0/5] HP iPAQ RX1950 patch series Vasily Khoruzhick
2010-05-11  6:55 ` [PATCH v2 1/5] Add HP iPAQ RX1950 machine support Vasily Khoruzhick
2010-05-11  6:55 ` [PATCH v2 2/5] MAINTAINERS: Add entry for HP iPAQ rx1950 Vasily Khoruzhick
2010-05-11  6:55 ` [PATCH v2 3/5] Locate kernel at 0x30108000 if PM_H1940 is enabled Vasily Khoruzhick
2010-05-11  6:55 ` Vasily Khoruzhick [this message]
2010-05-11  6:55 ` [PATCH v2 5/5] rx1950: configure GPG13-15 as input before suspend Vasily Khoruzhick
2010-05-12  0:48 ` [PATCH v2 0/5] HP iPAQ RX1950 patch series Ben Dooks
2010-05-12  7:18   ` Vasily Khoruzhick
  -- strict thread matches above, loose matches on Subject: below --
2009-09-26 21:04 [PATCH v2 4/5] Add suspend/resume support for rx1950 Vasily Khoruzhick
2009-09-27  6:19 ` Ben Dooks
2009-09-27  7:01   ` Vasily Khoruzhick
2009-09-27  7:08     ` Ben Dooks

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=1273560911-18153-5-git-send-email-anarsoul@gmail.com \
    --to=anarsoul@gmail.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 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).