From patchwork Mon Nov 21 03:36:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengzhou Liu X-Patchwork-Id: 697123 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tMZPH2bvnz9t17 for ; Mon, 21 Nov 2016 14:50:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8654C4B9AD; Mon, 21 Nov 2016 04:50:05 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1IzzMMvzG-oK; Mon, 21 Nov 2016 04:50:05 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 00AE24B98A; Mon, 21 Nov 2016 04:50:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 659164B98A for ; Mon, 21 Nov 2016 04:50:01 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QITk52jaO_u8 for ; Mon, 21 Nov 2016 04:50:01 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0073.outbound.protection.outlook.com [104.47.32.73]) by theia.denx.de (Postfix) with ESMTPS id A845A4B951 for ; Mon, 21 Nov 2016 04:49:57 +0100 (CET) Received: from BLUPR0301CA0033.namprd03.prod.outlook.com (10.162.113.171) by DM5PR03MB2476.namprd03.prod.outlook.com (10.168.233.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10; Mon, 21 Nov 2016 03:49:54 +0000 Received: from BN1BFFO11FD036.protection.gbl (2a01:111:f400:7c10::1:138) by BLUPR0301CA0033.outlook.office365.com (2a01:111:e400:5259::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8 via Frontend Transport; Mon, 21 Nov 2016 03:49:54 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD036.mail.protection.outlook.com (10.58.144.99) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Mon, 21 Nov 2016 03:49:52 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:514; Count:8 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uAL3nnuo003644; Sun, 20 Nov 2016 20:49:50 -0700 From: Shengzhou Liu To: , Date: Mon, 21 Nov 2016 11:36:47 +0800 Message-ID: <1479699408-15218-1-git-send-email-Shengzhou.Liu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-IncomingHeaderCount: 8 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131241737936689242; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(336004)(339900001)(189002)(199003)(626004)(305945005)(7846002)(48376002)(5660300001)(8666005)(189998001)(81166006)(81156014)(8936002)(356003)(50226002)(104016004)(6666003)(6636002)(86362001)(47776003)(87936001)(8676002)(97736004)(68736007)(5003940100001)(85426001)(4326007)(106466001)(105606002)(77096005)(50466002)(5001770100001)(92566002)(38730400001)(36756003)(2906002)(50986999)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2476; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD036; 1:8MErEvTc1hYqXteWRriWobiSBycKms+XHvVrHhHRGWti29zfBTg8NtEUmUzhxaAURqchS9GLCyoLfY5x+cR1N4Cp1FgpMaEA356CLNSvlvQvhikLRWL9Z2y46UI+mdW76ZVGiWSlsYlL25Jn/8DPu5romh9mm7en6G6Nc4RP80yITuP3SPl3z93+EUbHyc0XVGMwzP+G9Rrr8isIHd8eDbeHXntRV4w4cU51IHkLaXtug4XFUUQ4OGtub38nlMZ+CMKa7vJl5MzsruKVxSlHfee1h/ZyOEU9z4xdfmkOYDE11q0hG6veRB/TyJxk7Ok1xfKMNUSZHtXIXOaKihUJxWltQvXoh9A8SE9VhZGzoBpOdNUO6IfC7XwYQoaV0fXaZDDLbB80KORH8l2CUA2Zek7CB8BjrKRZrs9d+z8jOp/ui23JEM0szS4Z8um494pWcnBrgNQXmR/sNCBCS41tYEJMBSrKQOIb8uUYAr1tgdW1q5s+GM7+rv2o+mdQ40PfkOHR2JZmZ6fN5fOoe/7oSal6ZRmbSOZMnZxCcji+kH/HEN6XcfyaBobUL5jf2X5znLRWPq11MmKivZmMm0GwX6FGOyfOq9GUxtt53tyJI0/kMl0fGEUs19MTh0mOVEo0ogUDL9qsLFHPCxMGwCaNLX1rQJjr1pcMm+5UVAzihcafebhj5bUGhfr1jQp06RBnCavfDz9yV/2U8ZPWxG80b9WkllqtLoq6cMnypJgPUY8= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 2:JAoG4ZWBgqBcC/KZBt56MO043kMacd5RXNzmnuG/bycTgSQxMlm0WxO548Mj4QDGhuAdsGidJd0ugKU/HG5vBDBnksKoospwe5P1nQbjjk9IpTjaATpU5LQID+z+TUIlsUjqZ79mxV8nMGdHjD5mUmOAQPaSqnUUN9LpHrzrorg=; 3:URGXssRJcwH9+lY5sjkHjSLmhx/T0WoXq1sYbeHiTL0u9vL8q5NNAd2M2AKbQVwChZy5ZH+eqDBVZ/6L9Y8q/BMTAq1fWBe/FKfCe5ZWfK46YbAdR6rHZqgK6/j8LUZxOBl5NdtKHmv6i9gRvriDpMajNqAHFZa+J+S10TiPGIadpADPYP25UdXh0VDNLDGn+pHWodixcZ8ArhAE7zvOfO4FlHRQBCEqBq14cfr5CmgpzRxtBx+Hg8Uz/VgHY75Uq4y2tq1PNqxQvTZlQHTHQA==; 25:jjlxtToIh1fqoiSMr8Phl5RJRS3xvQhXj8b/IYyIsvlmdv94eYHirRZHx9VWvOekS1P80mNG6bIWxpvbpgvzgeHVUJ5skpu4R3EZ13nfI6LYebtv25PDeznfOdh/yT04hjTZe0eEpSoEGrDieLdDw6tXWRBjzGQLpXMTuxxrmewq5nT29p4iQrwYAW+thMoLWsGXgvYWG9ikbXHEiF+UrXhDvu1pu75vkxti4wGhvORAGF3cOsuNNITdM4y1gEd9+kcFq+kaFeLJhOd7XkmBU1MWDUlRx2nHQXrns3NjNxyZ6Doq+Yp3sBo3VJi6tJ5cKpaC9Wl8/ja+VLB1Saa5448xyrIaptUTcJWhah6nrCgYtlMcTdA6Ozit6FM89bgtysNOXnknSnZZxVicfxeo1ZJWy1+Z9VZMURC103HW7UNj86w/3M867wh5p96Z0KwXEVVuyVkIL0drHYIwF/cdGA== X-MS-Office365-Filtering-Correlation-Id: b8361c67-276e-4fa2-6bf1-08d411c173cd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2476; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 31:3UVx9BTIVZg5mfvFel+Hlh9gCBPsQheTqezIpzDz85e6KWVZvC5R9EtHkkwYJKwbyfIyc0Va2McgLcjnG+iciP12ehTVlzdNbal24D93V1dCXelKVk0zz1IX6co9tHl4fEIoWMBOveWI38kx7xdyKcHyoobQrtC0GmPJTKb1MVpJtBxYSiCQsmiIrCf1PfUlJAKmqbUmMfSr9X+oP4wj3FXeqKOAdokPY8mulFl7roCXuFWDGp24dp+ZN76wpfUgAwHWsu0x2HqpnV0aux9dTlSHdnoY6IuvVLfZ1YroPzo=; 4:LkxOTO61Sd7Z3aPcOHAbp4AU7S+JxVtFM1xk5gzfkRhDuQmIorDV8/I//C+u0o76tDtxfhsIWzeqGVhIe5B6ReucGYHuwbJqBA9bSgyvXZ8ENP1Ez1fMfv5v2PEzL3fLg6VwxIOwFp1D3QKrFOHfBlzwikYDVq9zg+5qpZDjCVBC+QyTS8FyAzDtQgAdvfxilFaw8PAzPNhBMEug+HzSSZokNbl6pWIiHbOmkxFlODi0FyjNQyCnuz470ovQTCkA7QRPoJSAKVhwKGNZeyjfAhuDtNsZB97o11+xpAjxvqppXvVdrNCIUsxD0UGfVAba2ixZOxznlEzI9Znaknkd46ov4+LhAkP/zE5jyrw62m05r/fzTyVWrtLZJG4O2F2GkkAQuUjJdjGRk18r6c1VZb0ZaS/CmTP2NMxptyF/vVzmXFRcTBAUOToEMwte6LqlHBz5rK045DRvyxZokGXEcwGrZnPghUhR51qt8P/1CiUwlbu+wsURvvItGqRly8qrh/4h6QxwtFDpEfZt9nq+DOcL2/ERsSVKS+LZV8KmaMiinpVAWMds5lFmJe+53RMp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095035)(601004)(2401047)(13024025)(13018025)(13015025)(13017025)(8121501046)(5005006)(13023025)(3002001)(10201501046)(6055026)(6096035); SRVR:DM5PR03MB2476; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2476; X-Forefront-PRVS: 01334458E5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2476; 23:4iyngejUAcmzl1iTbEPGilWvCqxkPznazG+djWsXU?= =?us-ascii?Q?Q5/ppnhzZHuFiRBKI2O5LeYyYsR31q5QUtWHuinby++7cfL8OYytbvcusYP3?= =?us-ascii?Q?FsAdPhreNV1IjHmSsGVBru2LBH4Km/T+CvfIC4CDLjzQjpsJAGQ1Q70+5Eep?= =?us-ascii?Q?ohsx4MgO3KLoM1jpX3lgEMZVNhyxXbOYjgBEIkAnneOudfH2bzl5DkF3Gs04?= =?us-ascii?Q?GeyZy2klDaqtQ5UeR0J/Z+EuNKLzbHaZBuG7xcxYdJvTeA6iuSzWQmwDiosZ?= =?us-ascii?Q?EDzN+M0Y3iwEYEMlKtZwCkfWJmWnAFJiASfXTj5DdZhiqRDcDHfrH007CRG6?= =?us-ascii?Q?2MnVhbXOYh24VaRC+ixab96w94HQAlGUnwhZrC+yHUj70KHRW9icGgGV5CoU?= =?us-ascii?Q?9SNHytgZrtq6RsRfpIk/rYeygU2jX8DoIpUuVAeRD9bwbcwkflagyWYrNrk6?= =?us-ascii?Q?rcGl3LpRGpmboA+KpDOWZ/i7zL5cb9jFwM6P0CZx8aZVzX/LzxfROayxpJiJ?= =?us-ascii?Q?0wFmgEkhLiLIbC+G1TUHnfluUKUT3BnJYkTF8rSjr9P55sa3ZlhjzODJ9/Hm?= =?us-ascii?Q?Fdk239IUYyGLKnbq3DFtFsSyHmE/axwYBKPdutYHlzF/bncrDa5/zybwuJxc?= =?us-ascii?Q?b+HXqhRM2atbS5j6l9FPkzaTpM7ged+6oQGG00HN9ZcrBXMI6Kqp2gY36GUe?= =?us-ascii?Q?mwbgLW5bnZwzQuTJq6MB5i79lDNGZ49WILYNPrkPPXKm0X4h3HYQ25wXRpuj?= =?us-ascii?Q?f5GHDDFi9au23X2H5cUR3Gwn5WqIqDyvpxdRuvKSQyEe84usbPiKdHBhu2f8?= =?us-ascii?Q?Z7RlxruvqbbiYaPhjGXB5/vE9znhCOgrhiNRiI6oymonvc5LTytHIxl6K84d?= =?us-ascii?Q?6XG7I7Oav5GZWFNbGFCtUKGquMSs/nv2lNzBivC5N0CFwLq1ezmKvzUpVxSf?= =?us-ascii?Q?JoDoSRJwYZafbrl/QM2WlPIJUbTW56DM5M4UvfmnUyFq6mcurcsLmcecxZZi?= =?us-ascii?Q?wss1cz7LhAh0g/2OwX9d1DLgGyHr6Sc7YTQZLTxEyRL3CXXYPbgmSAdEmFDA?= =?us-ascii?Q?HiMXjw=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 6:KF1h2vbLVjfFQiDq7qGf1KbzRIC+HM3JTunKe/Jw3O3U6CLsaCZHcobdx1wJ4PWZ2t4lb044lzWdPn0QmXEwRscT64NAPJu2xI7mdq7EPOFkFmgwcte4pMKnzp7Mn4DtTdLKBElkBnTBARoEH7g+/FHJTwey09TbjMU42aDzOd8OnEEBROcuJRbTxgYIAYtJR44QKOv39ZLBoBH5fSFDxSmBkv7LCH+xZcCF0L+56795K/zjyI1MSkwwV/GXdymoPxw8BRxBtPBB0MNZcunzBRiuh6UhXMnRz4sq9zRulKpIItdoF3wnA0X1tJ8Yo9qutnd9LZ58vwc19NMUHVXzPQ==; 5:8vO2Az2lcwbrQtmb/IJH9gyQ9txdG9uRrleAkdy8ORf2Phd/uMFq6KAXaNBLYZVOsYxri67jVPJ2rYUMZdMsJPB+CiEWMyqxR4mPnS/Dl35NUjiMmJQnoju+i3cs9vifhVzciq35/9qJScGKOdbxatUPX3r90qkZN37cmy3vwIBncusE+vUDi6HctVp8ZR/Z; 24:DT9JBO348msUqX8cAHLlFXb94LrBpJr3yMpRycqqwp+iZhsZy7JSRzTB7xjbimlui81QgFnjWcxM1UA2eWosfo/5h05KqjEmChDet5ODN6c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2476; 7:LvcnciSasOxmPj49wUVFk0RaubFQkn44jxC8rPyxVC2SiBFudxcYugJYvpbqICyAXqkLNKhhOKVYvejneXBPLZrOo9Zzcat8o1yxvX5rw4QyiDxFO/DDimXqSncHGI9D0fkhDslDeNNBOETTJ2bt+8xMOF64gsAPeJpdz7PK+E/6Y73nX0dvB6dewiP1vsSNIO1A/Byx+aJxa3AoP7ldnqU+WR28Fe6UkSQoH5vw06jDFlrS9jj5aPUGierTeCEOTwxbD7yMjnh8xN7b5SBnWUehTGkdLjCbk7ZHr7FR09fCz9iu1zq2KNZDLAIbd763fokQSOaFFZfjixjHDps0B3ZZy+d5Vl3Tm0jQah/T6eo= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2016 03:49:52.3273 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2476 Subject: [U-Boot] [PATCH 1/4 v2] fsl/ddr: Fix compiling warning X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fix following warning in case multiple erratum macro was not defined. warning: unused variable 'tmp' warning: unused variable 'ddr_freq' Signed-off-by: Shengzhou Liu --- v2: fix compile issue on some platforms. drivers/ddr/fsl/fsl_ddr_gen4.c | 57 ++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c index 042af09..30f60e0 100644 --- a/drivers/ddr/fsl/fsl_ddr_gen4.c +++ b/drivers/ddr/fsl/fsl_ddr_gen4.c @@ -47,13 +47,9 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, { unsigned int i, bus_width; struct ccsr_ddr __iomem *ddr; - u32 temp_sdram_cfg; + u32 temp32; u32 total_gb_size_per_controller; int timeout; -#if defined(CONFIG_SYS_FSL_ERRATUM_A008511) || \ - defined(CONFIG_SYS_FSL_ERRATUM_A009801) - u32 temp32; -#endif #ifdef CONFIG_SYS_FSL_ERRATUM_A008511 u32 mr6; @@ -61,11 +57,6 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, u32 vref_seq2[3] = {0xc0, 0xf0, 0x70}; /* for range 2 */ u32 *vref_seq = vref_seq1; #endif -#if defined(CONFIG_SYS_FSL_ERRATUM_A009942) | \ - defined(CONFIG_SYS_FSL_ERRATUM_A010165) - ulong ddr_freq; - u32 tmp; -#endif #ifdef CONFIG_FSL_DDR_BIST u32 mtcr, err_detect, err_sbe; u32 cs0_bnds, cs1_bnds, cs2_bnds, cs3_bnds, cs0_config; @@ -73,7 +64,9 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, #ifdef CONFIG_FSL_DDR_BIST char buffer[CONFIG_SYS_CBSIZE]; #endif - +#if defined(CONFIG_SYS_FSL_ERRATUM_A009942) + u32 ddr_freq; +#endif switch (ctrl_num) { case 0: ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR; @@ -279,22 +272,22 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, #ifdef CONFIG_SYS_FSL_ERRATUM_A009942 ddr_freq = get_ddr_freq(ctrl_num) / 1000000; - tmp = ddr_in32(&ddr->debug[28]); + temp32 = ddr_in32(&ddr->debug[28]); if (ddr_freq <= 1333) - ddr_out32(&ddr->debug[28], tmp | 0x0080006a); + ddr_out32(&ddr->debug[28], temp32 | 0x0080006a); else if (ddr_freq <= 1600) - ddr_out32(&ddr->debug[28], tmp | 0x0070006f); + ddr_out32(&ddr->debug[28], temp32 | 0x0070006f); else if (ddr_freq <= 1867) - ddr_out32(&ddr->debug[28], tmp | 0x00700076); + ddr_out32(&ddr->debug[28], temp32 | 0x00700076); else if (ddr_freq <= 2133) - ddr_out32(&ddr->debug[28], tmp | 0x0060007b); + ddr_out32(&ddr->debug[28], temp32 | 0x0060007b); #endif #ifdef CONFIG_SYS_FSL_ERRATUM_A010165 - ddr_freq = get_ddr_freq(ctrl_num) / 1000000; - if ((ddr_freq > 1900) && (ddr_freq < 2300)) { - tmp = ddr_in32(&ddr->debug[28]); - ddr_out32(&ddr->debug[28], tmp | 0x000a0000); + temp32 = get_ddr_freq(ctrl_num) / 1000000; + if ((temp32 > 1900) && (temp32 < 2300)) { + temp32 = ddr_in32(&ddr->debug[28]); + ddr_out32(&ddr->debug[28], temp32 | 0x000a0000); } #endif /* @@ -312,9 +305,9 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, step2: /* Set, but do not enable the memory */ - temp_sdram_cfg = regs->ddr_sdram_cfg; - temp_sdram_cfg &= ~(SDRAM_CFG_MEM_EN); - ddr_out32(&ddr->sdram_cfg, temp_sdram_cfg); + temp32 = regs->ddr_sdram_cfg; + temp32 &= ~(SDRAM_CFG_MEM_EN); + ddr_out32(&ddr->sdram_cfg, temp32); /* * 500 painful micro-seconds must elapse between @@ -329,18 +322,18 @@ step2: #ifdef CONFIG_DEEP_SLEEP if (is_warm_boot()) { /* enter self-refresh */ - temp_sdram_cfg = ddr_in32(&ddr->sdram_cfg_2); - temp_sdram_cfg |= SDRAM_CFG2_FRC_SR; - ddr_out32(&ddr->sdram_cfg_2, temp_sdram_cfg); + temp32 = ddr_in32(&ddr->sdram_cfg_2); + temp32 |= SDRAM_CFG2_FRC_SR; + ddr_out32(&ddr->sdram_cfg_2, temp32); /* do board specific memory setup */ board_mem_sleep_setup(); - temp_sdram_cfg = (ddr_in32(&ddr->sdram_cfg) | SDRAM_CFG_BI); + temp32 = (ddr_in32(&ddr->sdram_cfg) | SDRAM_CFG_BI); } else #endif - temp_sdram_cfg = ddr_in32(&ddr->sdram_cfg) & ~SDRAM_CFG_BI; + temp32 = ddr_in32(&ddr->sdram_cfg) & ~SDRAM_CFG_BI; /* Let the controller go */ - ddr_out32(&ddr->sdram_cfg, temp_sdram_cfg | SDRAM_CFG_MEM_EN); + ddr_out32(&ddr->sdram_cfg, temp32 | SDRAM_CFG_MEM_EN); mb(); isb(); @@ -483,9 +476,9 @@ step2: #ifdef CONFIG_DEEP_SLEEP if (is_warm_boot()) { /* exit self-refresh */ - temp_sdram_cfg = ddr_in32(&ddr->sdram_cfg_2); - temp_sdram_cfg &= ~SDRAM_CFG2_FRC_SR; - ddr_out32(&ddr->sdram_cfg_2, temp_sdram_cfg); + temp32 = ddr_in32(&ddr->sdram_cfg_2); + temp32 &= ~SDRAM_CFG2_FRC_SR; + ddr_out32(&ddr->sdram_cfg_2, temp32); } #endif