From patchwork Wed Oct 14 10:18:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 53641 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 n9EAO8ux003733 for ; Wed, 14 Oct 2009 10:24:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756153AbZJNKYw (ORCPT ); Wed, 14 Oct 2009 06:24:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757459AbZJNKYv (ORCPT ); Wed, 14 Oct 2009 06:24:51 -0400 Received: from qw-out-2122.google.com ([74.125.92.25]:27350 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756153AbZJNKYv (ORCPT ); Wed, 14 Oct 2009 06:24:51 -0400 Received: by qw-out-2122.google.com with SMTP id 9so1169530qwb.37 for ; Wed, 14 Oct 2009 03:23:43 -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=x54LFHs3Cx2ufi2YymWkX/nCwVXqrBgFpnfqNBe4U8A=; b=LhdcXO2rOweI/tCAQkM2t3BTsdMQV05kbA/56kyTB/Qtjv4JrdtYI5l2OjQEksXCOD zu2qT8jQHPti5Uv6pWmk99PnU138iA6zjVvdS+lLjf9m1mAQEreBiPYz3WQByNh8+cI+ 5A+FHGeib8dHacAe9j/XrFyfRcqwM8iPJMqiA= 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=QlUSr7HB55qCxNzo5umj6+ID8SyuEy8wUh8+yn9PlO2AY6yOBDltKXSUbjaO+pkcjm tSrjr3GfSFGmre7JI3+YjWHmgrNExkDTrXWDSnmVS9OxcxgU8VKXlYvrWMv1HQdMaoWb 4wBLUH6cvRP4TDsHC+i+5oTXjmvGPjtwMG9qQ= Received: by 10.224.114.220 with SMTP id f28mr6862518qaq.115.1255515823742; Wed, 14 Oct 2009 03:23:43 -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 22sm2684643qyk.2.2009.10.14.03.23.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 14 Oct 2009 03:23:43 -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:56 +0900 Message-Id: <20091014101856.21842.73069.sendpatchset@rxone.opensource.se> In-Reply-To: <20091014101821.21842.40286.sendpatchset@rxone.opensource.se> References: <20091014101821.21842.40286.sendpatchset@rxone.opensource.se> Subject: [PATCH 04/07] sh: Use immediate data for sh7724 DBSC Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org --- 0004/arch/sh/kernel/cpu/shmobile/sleep.S +++ work/arch/sh/kernel/cpu/shmobile/sleep.S 2009-10-13 15:01:24.000000000 +0900 @@ -117,23 +117,23 @@ skip_mmu_save_disable: #ifdef CONFIG_CPU_SUBTYPE_SH7724 /* DBSC: put memory in self-refresh mode */ mov.l dben_reg, r4 - mov.l dben_data0, r1 + mov #0, r1 mov.l r1, @r4 mov.l dbrfpdn0_reg, r4 - mov.l dbrfpdn0_data0, r1 + mov #0, r1 mov.l r1, @r4 mov.l dbcmdcnt_reg, r4 - mov.l dbcmdcnt_data0, r1 + mov #2, r1 mov.l r1, @r4 mov.l dbcmdcnt_reg, r4 - mov.l dbcmdcnt_data1, r1 + mov #4 r1 mov.l r1, @r4 mov.l dbrfpdn0_reg, r4 - mov.l dbrfpdn0_data1, r1 + mov #1, r1 mov.l r1, @r4 #else /* SBSC: disable power down and put in self-refresh mode */ @@ -253,7 +253,7 @@ skip_mmu_restore: #ifdef CONFIG_CPU_SUBTYPE_SH7724 /* DBSC: put memory in auto-refresh mode */ mov.l dbrfpdn0_reg, k4 - mov.l dbrfpdn0_data0, k1 + mov #0, k1 mov.l k1, @k4 nop /* sleep 140 ns */ @@ -262,19 +262,19 @@ skip_mmu_restore: nop mov.l dbcmdcnt_reg, k4 - mov.l dbcmdcnt_data0, k1 + mov #2, k1 mov.l k1, @k4 mov.l dbcmdcnt_reg, k4 - mov.l dbcmdcnt_data1, k1 + mov #4, k1 mov.l k1, @k4 mov.l dben_reg, k4 - mov.l dben_data1, k1 + mov #1, k1 mov.l k1, @k4 mov.l dbrfpdn0_reg, k4 - mov.l dbrfpdn0_data2, k1 + mov.l dbrfpdn0_data, k1 mov.l k1, @k4 #else /* SBSC: set auto-refresh mode */ @@ -308,15 +308,9 @@ saved_vbr: .long 0 offset_vbr: .long 0x600 #ifdef CONFIG_CPU_SUBTYPE_SH7724 dben_reg: .long 0xfd000010 /* DBEN */ -dben_data0: .long 0 -dben_data1: .long 1 dbrfpdn0_reg: .long 0xfd000040 /* DBRFPDN0 */ -dbrfpdn0_data0: .long 0 -dbrfpdn0_data1: .long 1 -dbrfpdn0_data2: .long 0x00010000 +dbrfpdn0_data: .long 0x00010000 dbcmdcnt_reg: .long 0xfd000014 /* DBCMDCNT */ -dbcmdcnt_data0: .long 2 -dbcmdcnt_data1: .long 4 #else 1: .long 0xfe400008 /* SDCR0 */ 2: .long 0x00000400