From patchwork Wed Oct 14 10:18:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 53638 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9EAO8uu003733 for ; Wed, 14 Oct 2009 10:24:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756124AbZJNKYe (ORCPT ); Wed, 14 Oct 2009 06:24:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756135AbZJNKYe (ORCPT ); Wed, 14 Oct 2009 06:24:34 -0400 Received: from qw-out-2122.google.com ([74.125.92.24]:22395 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756124AbZJNKYd (ORCPT ); Wed, 14 Oct 2009 06:24:33 -0400 Received: by qw-out-2122.google.com with SMTP id 9so1169490qwb.37 for ; Wed, 14 Oct 2009 03:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=GgQHG6cLej8Kq/Akks2EUKrbrENeh5wtDDWOAyLfxSY=; b=nfkb3ORGMVfDc1F6PNnpaPBJXpfk6v02uj5x73c/wy3zg3qErXmepj6bdFRphRhnOj 2wus6V2CFMZQJoETvh93IiD44dJXDUWQRAro8kdg/FeDobKtWtqAJJW6fzMQQyhuRzAN U8KGj9gePOG6+8i586iiKVQtgp0pPcTWtMxfg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=Nojp90EvkKyPEytYQrHCRBZ1zyTMLzGA8yRja2q92pToeM9zg1QGYuGtutqo2BIxZS DtcyOHR5kxe5pUKp5EN0PfSqjAVNtcfmL3FEE0fYFsWFR/VCBhRrennXU7TgoOrpWfX2 KooejaoWeCkP5OyTu9/jN8pS/9ip6Iqt7YWLo= Received: by 10.224.96.88 with SMTP id g24mr6787800qan.361.1255515807061; Wed, 14 Oct 2009 03:23:27 -0700 (PDT) Received: from rxone.opensource.se (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 20sm2305870qyk.9.2009.10.14.03.23.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 14 Oct 2009 03:23:26 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Wed, 14 Oct 2009 19:18:39 +0900 Message-Id: <20091014101839.21842.14939.sendpatchset@rxone.opensource.se> In-Reply-To: <20091014101821.21842.40286.sendpatchset@rxone.opensource.se> References: <20091014101821.21842.40286.sendpatchset@rxone.opensource.se> Subject: [PATCH 02/07] sh: Use RSMEM for sh7724 sleep modes Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org --- 0001/arch/sh/kernel/cpu/shmobile/pm.c +++ work/arch/sh/kernel/cpu/shmobile/pm.c 2009-10-13 14:47:04.000000000 +0900 @@ -34,18 +34,22 @@ * U-standby mode is low priority since it needs bootloader hacks */ -#define ILRAM_BASE 0xe5200000 +#ifdef CONFIG_CPU_SUBTYPE_SH7724 +#define RAM_BASE 0xfd800000 /* RSMEM */ +#else +#define RAM_BASE 0xe5200000 /* ILRAM */ +#endif extern const unsigned char sh_mobile_standby[]; extern const unsigned int sh_mobile_standby_size; void sh_mobile_call_standby(unsigned long mode) { - void *onchip_mem = (void *)ILRAM_BASE; + void *onchip_mem = (void *)RAM_BASE; void (*standby_onchip_mem)(unsigned long, unsigned long) = onchip_mem; /* Let assembly snippet in on-chip memory handle the rest */ - standby_onchip_mem(mode, ILRAM_BASE); + standby_onchip_mem(mode, RAM_BASE); } static int sh_pm_enter(suspend_state_t state) @@ -65,9 +69,9 @@ static struct platform_suspend_ops sh_pm static int __init sh_pm_init(void) { - void *onchip_mem = (void *)ILRAM_BASE; + void *onchip_mem = (void *)RAM_BASE; - /* Copy the assembly snippet to the otherwise ununsed ILRAM */ + /* Copy the assembly snippet to the otherwise ununsed on-chip RAM */ memcpy(onchip_mem, sh_mobile_standby, sh_mobile_standby_size); wmb(); ctrl_barrier();