From patchwork Wed Jan 8 08:51:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 308092 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6780B2C007E for ; Wed, 8 Jan 2014 19:52:50 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0orf-0001FI-6f; Wed, 08 Jan 2014 08:51:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0ora-0006lo-Qy; Wed, 08 Jan 2014 08:51:46 +0000 Received: from mail-db8lp0185.outbound.messaging.microsoft.com ([213.199.154.185] helo=db8outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0orN-0006kK-Hx for linux-arm-kernel@lists.infradead.org; Wed, 08 Jan 2014 08:51:35 +0000 Received: from mail205-db8-R.bigfish.com (10.174.8.243) by DB8EHSOBE025.bigfish.com (10.174.4.88) with Microsoft SMTP Server id 14.1.225.22; Wed, 8 Jan 2014 08:51:11 +0000 Received: from mail205-db8 (localhost [127.0.0.1]) by mail205-db8-R.bigfish.com (Postfix) with ESMTP id C2B154400FB; Wed, 8 Jan 2014 08:51:11 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah1fc6h1082kzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h2327h2336h1155h) Received: from mail205-db8 (localhost.localdomain [127.0.0.1]) by mail205-db8 (MessageSwitch) id 1389171069394875_20651; Wed, 8 Jan 2014 08:51:09 +0000 (UTC) Received: from DB8EHSMHS005.bigfish.com (unknown [10.174.8.252]) by mail205-db8.bigfish.com (Postfix) with ESMTP id 5BF2C14004E; Wed, 8 Jan 2014 08:51:09 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS005.bigfish.com (10.174.4.15) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 8 Jan 2014 08:51:09 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.3.158.2; Wed, 8 Jan 2014 08:51:07 +0000 Received: from ubuntu.ap.freescale.net (ubuntu-010192242118.ap.freescale.net [10.192.242.118]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s088p3hH006938; Wed, 8 Jan 2014 01:51:06 -0700 From: Anson Huang To: , Subject: [PATCH V2 2/3] ARM: imx: add suspend in ocram support on i.mx6dl Date: Wed, 8 Jan 2014 16:51:05 +0800 Message-ID: <1389171067-32008-2-git-send-email-b20788@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389171067-32008-1-git-send-email-b20788@freescale.com> References: <1389171067-32008-1-git-send-email-b20788@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140108_035133_923263_188C0FE5 X-CRM114-Status: GOOD ( 12.81 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [213.199.154.185 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org i.MX6DL's suspend in ocram function is derived from i.MX6Q, the only difference is the offset of DDR IO pins, so we need to check cpu type in runtime to set DDR IO to high-Z mode correctly. This patch can lower the DDR IO power from ~26mA@1.5V to ~15mA@1.5V, measured on i.MX6Q/DL SabreSD board, R25. Signed-off-by: Anson Huang --- Changes since V1: Add cpu type check to get correct device node. arch/arm/mach-imx/pm-imx6q.c | 5 +- arch/arm/mach-imx/suspend-imx6.S | 185 +++++++++++++++++++++++++++++++++++++- 2 files changed, 185 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c index 4ade606..19c8de3 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6q.c @@ -342,7 +342,10 @@ void __init imx6q_pm_init(void) pm_info->src_addr[0] = (void *)be32_to_cpu(*of_get_address(node, 0, NULL, NULL)); pm_info->src_addr[1] = base; - node = of_find_compatible_node(NULL, NULL, "fsl,imx6q-iomuxc"); + if (cpu_is_imx6q()) + node = of_find_compatible_node(NULL, NULL, "fsl,imx6q-iomuxc"); + else if (cpu_is_imx6dl()) + node = of_find_compatible_node(NULL, NULL, "fsl,imx6dl-iomuxc"); if (!node) { pr_warn("failed to find iomuxc node!\n"); goto ocram_out; diff --git a/arch/arm/mach-imx/suspend-imx6.S b/arch/arm/mach-imx/suspend-imx6.S index be0f6bf..5e358e7f3 100644 --- a/arch/arm/mach-imx/suspend-imx6.S +++ b/arch/arm/mach-imx/suspend-imx6.S @@ -233,6 +233,163 @@ .endm + .macro imx6dl_ddr_io_save + + ldr r6, [r11, #0x470] /* DRAM_DQM0 */ + ldr r7, [r11, #0x474] /* DRAM_DQM1 */ + ldr r8, [r11, #0x478] /* DRAM_DQM2 */ + ldr r9, [r11, #0x47c] /* DRAM_DQM3 */ + stmfd r10!, {r6-r9} + + ldr r6, [r11, #0x480] /* DRAM_DQM4 */ + ldr r7, [r11, #0x484] /* DRAM_DQM5 */ + ldr r8, [r11, #0x488] /* DRAM_DQM6 */ + ldr r9, [r11, #0x48c] /* DRAM_DQM7 */ + stmfd r10!, {r6-r9} + + ldr r6, [r11, #0x464] /* DRAM_CAS */ + ldr r7, [r11, #0x490] /* DRAM_RAS */ + ldr r8, [r11, #0x4ac] /* DRAM_SDCLK_0 */ + ldr r9, [r11, #0x4b0] /* DRAM_SDCLK_1 */ + stmfd r10!, {r6-r9} + + ldr r8, [r11, #0x750] /* DDRMODE_CTL */ + ldr r9, [r11, #0x760] /* DDRMODE */ + stmfd r10!, {r8-r9} + + ldr r6, [r11, #0x4bc] /* DRAM_SDQS0 */ + ldr r7, [r11, #0x4c0] /* DRAM_SDQS1 */ + ldr r8, [r11, #0x4c4] /* DRAM_SDQS2 */ + ldr r9, [r11, #0x4c8] /* DRAM_SDQS3 */ + stmfd r10!, {r6-r9} + + ldr r6, [r11, #0x4cc] /* DRAM_SDQS4 */ + ldr r7, [r11, #0x4d0] /* DRAM_SDQS5 */ + ldr r8, [r11, #0x4d4] /* DRAM_SDQS6 */ + ldr r9, [r11, #0x4d8] /* DRAM_SDQS7 */ + stmfd r10!, {r6-r9} + + ldr r6, [r11, #0x764] /* GPR_B0DS */ + ldr r7, [r11, #0x770] /* GPR_B1DS */ + ldr r8, [r11, #0x778] /* GPR_B2DS */ + ldr r9, [r11, #0x77c] /* GPR_B3DS */ + stmfd r10!, {r6-r9} + + ldr r6, [r11, #0x780] /* GPR_B4DS */ + ldr r7, [r11, #0x784] /* GPR_B5DS */ + ldr r8, [r11, #0x78c] /* GPR_B6DS */ + ldr r9, [r11, #0x748] /* GPR_B7DS */ + stmfd r10!, {r6-r9} + + ldr r7, [r11, #0x74c] /* GPR_ADDS*/ + ldr r8, [r11, #0x4b4] /* DRAM_SODT0*/ + ldr r9, [r11, #0x4b8] /* DRAM_SODT1*/ + stmfd r10!, {r7-r9} + + .endm + + .macro imx6dl_ddr_io_restore + + ldmea r10!, {r6-r9} + str r6, [r11, #0x470] /* DRAM_DQM0 */ + str r7, [r11, #0x474] /* DRAM_DQM1 */ + str r8, [r11, #0x478] /* DRAM_DQM2 */ + str r9, [r11, #0x47c] /* DRAM_DQM3 */ + + ldmea r10!, {r6-r9} + str r6, [r11, #0x480] /* DRAM_DQM4 */ + str r7, [r11, #0x484] /* DRAM_DQM5 */ + str r8, [r11, #0x488] /* DRAM_DQM6 */ + str r9, [r11, #0x48c] /* DRAM_DQM7 */ + + ldmea r10!, {r6-r9} + str r6, [r11, #0x464] /* DRAM_CAS */ + str r7, [r11, #0x490] /* DRAM_RAS */ + str r8, [r11, #0x4ac] /* DRAM_SDCLK_0 */ + str r9, [r11, #0x4b0] /* DRAM_SDCLK_1 */ + + ldmea r10!, {r8-r9} + str r8, [r11, #0x750] /* DDRMODE_CTL */ + str r9, [r11, #0x760] /* DDRMODE */ + + ldmea r10!, {r6-r9} + str r6, [r11, #0x4bc] /* DRAM_SDQS0 */ + str r7, [r11, #0x4c0] /* DRAM_SDQS1 */ + str r8, [r11, #0x4c4] /* DRAM_SDQS2 */ + str r9, [r11, #0x4c8] /* DRAM_SDQS3 */ + + ldmea r10!, {r6-r9} + str r6, [r11, #0x4cc] /* DRAM_SDQS4 */ + str r7, [r11, #0x4d0] /* DRAM_SDQS5 */ + str r8, [r11, #0x4d4] /* DRAM_SDQS6 */ + str r9, [r11, #0x4d8] /* DRAM_SDQS7 */ + + ldmea r10!, {r6-r9} + str r6, [r11, #0x764] /* GPR_B0DS */ + str r7, [r11, #0x770] /* GPR_B1DS */ + str r8, [r11, #0x778] /* GPR_B2DS */ + str r9, [r11, #0x77c] /* GPR_B3DS */ + + ldmea r10!, {r6-r9} + str r6, [r11, #0x780] /* GPR_B4DS */ + str r7, [r11, #0x784] /* GPR_B5DS */ + str r8, [r11, #0x78c] /* GPR_B6DS */ + str r9, [r11, #0x748] /* GPR_B7DS */ + + ldmea r10!, {r7-r9} + str r7, [r11, #0x74c] /* GPR_ADDS*/ + str r8, [r11, #0x4b4] /* DRAM_SODT0*/ + str r9, [r11, #0x4b8] /* DRAM_SODT1*/ + + .endm + + .macro imx6dl_ddr_io_set_lpm + + mov r9, #0 + str r9, [r11, #0x470] /* DRAM_DQM0 */ + str r9, [r11, #0x474] /* DRAM_DQM1 */ + str r9, [r11, #0x478] /* DRAM_DQM2 */ + str r9, [r11, #0x47c] /* DRAM_DQM3 */ + + str r9, [r11, #0x480] /* DRAM_DQM4 */ + str r9, [r11, #0x484] /* DRAM_DQM5 */ + str r9, [r11, #0x488] /* DRAM_DQM6 */ + str r9, [r11, #0x48c] /* DRAM_DQM7 */ + + str r9, [r11, #0x464] /* DRAM_CAS */ + str r9, [r11, #0x490] /* DRAM_RAS */ + str r9, [r11, #0x4ac] /* DRAM_SDCLK_0 */ + str r9, [r11, #0x4b0] /* DRAM_SDCLK_1 */ + + str r9, [r11, #0x750] /* DDRMODE_CTL */ + str r9, [r11, #0x760] /* DDRMODE */ + + str r9, [r11, #0x4bc] /* DRAM_SDQS0 */ + str r9, [r11, #0x4c0] /* DRAM_SDQS1 */ + str r9, [r11, #0x4c4] /* DRAM_SDQS2 */ + str r9, [r11, #0x4c8] /* DRAM_SDQS3 */ + + str r9, [r11, #0x4cc] /* DRAM_SDQS4 */ + str r9, [r11, #0x4d0] /* DRAM_SDQS5 */ + str r9, [r11, #0x4d4] /* DRAM_SDQS6 */ + str r9, [r11, #0x4d8] /* DRAM_SDQS7 */ + + str r9, [r11, #0x764] /* GPR_B0DS */ + str r9, [r11, #0x770] /* GPR_B1DS */ + str r9, [r11, #0x778] /* GPR_B2DS */ + str r9, [r11, #0x77c] /* GPR_B3DS */ + + str r9, [r11, #0x780] /* GPR_B4DS */ + str r9, [r11, #0x784] /* GPR_B5DS */ + str r9, [r11, #0x78c] /* GPR_B6DS */ + str r9, [r11, #0x748] /* GPR_B7DS */ + + str r9, [r11, #0x74c] /* GPR_ADDS*/ + str r9, [r11, #0x4b4] /* DRAM_SODT0*/ + str r9, [r11, #0x4b8] /* DRAM_SODT1*/ + + .endm + .macro sync_l2_cache /* sync L2 cache to drain L2's buffers to DRAM. */ @@ -291,8 +448,13 @@ ENTRY(imx6_suspend) ldr r11, [r0, #PM_INFO_MX6Q_IOMUXC_V_OFFSET] cmp r1, #MXC_CPU_IMX6Q - bne ddr_io_save_dsm_done + bne dl_io_dsm_save imx6dq_ddr_io_save + b ddr_io_save_dsm_done +dl_io_dsm_save: + cmp r1, #MXC_CPU_IMX6DL + bne ddr_io_save_dsm_done + imx6dl_ddr_io_save ddr_io_save_dsm_done: /* need to sync L2 cache before DSM. */ @@ -320,8 +482,13 @@ poll_dvfs_set_1: ldr r11, [r0, #PM_INFO_MX6Q_IOMUXC_V_OFFSET] cmp r1, #MXC_CPU_IMX6Q - bne ddr_io_set_lpm_dsm_done + bne dl_io_dsm_set_lpm imx6dq_ddr_io_set_lpm + b ddr_io_set_lpm_dsm_done +dl_io_dsm_set_lpm: + cmp r1, #MXC_CPU_IMX6DL + bne ddr_io_set_lpm_dsm_done + imx6dl_ddr_io_set_lpm ddr_io_set_lpm_dsm_done: /* @@ -403,8 +570,13 @@ rbc_loop: ldr r11, [r0, #PM_INFO_MX6Q_IOMUXC_V_OFFSET] cmp r1, #MXC_CPU_IMX6Q - bne ddr_io_restore_done + bne dl_io_restore imx6dq_ddr_io_restore + b ddr_io_restore_done +dl_io_restore: + cmp r1, #MXC_CPU_IMX6DL + bne ddr_io_restore_done + imx6dl_ddr_io_restore ddr_io_restore_done: ldr r11, [r0, #PM_INFO_MX6Q_MMDC_V_OFFSET] @@ -451,8 +623,13 @@ resume: ldr r11, [r0, #PM_INFO_MX6Q_IOMUXC_P_OFFSET] cmp r1, #MXC_CPU_IMX6Q - bne ddr_io_restore_dsm_done + bne dl_io_dsm_restore imx6dq_ddr_io_restore + b ddr_io_restore_dsm_done +dl_io_dsm_restore: + cmp r1, #MXC_CPU_IMX6DL + bne ddr_io_restore_dsm_done + imx6dl_ddr_io_restore ddr_io_restore_dsm_done: ldr r11, [r0, #PM_INFO_MX6Q_MMDC_P_OFFSET]