From patchwork Mon Jun 17 03:28:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2730261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 40ECFC0AB1 for ; Mon, 17 Jun 2013 03:29:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6968E20180 for ; Mon, 17 Jun 2013 03:29:33 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 676B82017E for ; Mon, 17 Jun 2013 03:29:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoQ88-00026S-UO; Mon, 17 Jun 2013 03:29:21 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoQ86-0003nA-Cv; Mon, 17 Jun 2013 03:29:18 +0000 Received: from mail-pd0-f180.google.com ([209.85.192.180]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoQ83-0003me-Vk for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 03:29:16 +0000 Received: by mail-pd0-f180.google.com with SMTP id 10so2308987pdi.39 for ; Sun, 16 Jun 2013 20:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=njl0iNp9Ng4S744QF+bEHdRP8IKkw9/Uu+3+Qrl339g=; b=huY2adRBOE6QBf1aIqKd70yPFgPUNFvCbnUKv8xXzcARV5DIb4PJZuIt2P93Mv2tFf SujjvVl5/0Ykh9x+PhA1/1b0Uptuq5YSFfvy+qKw9Nu3dOhGDXhRvL3q5hAGK6KRsD/F mX9+yuxRsiq6qn5VWSNa7WJAVog8bMBVnRKzFnAPETJ3kgDB74JXpFEcVCGKxnVK0CEL IFjr3wZ3u3CAHmEQRSoHTrF3RPEQimy8QsZAXM0J4291v4fbOXTQzRzzF4zRfSyOmU+5 MiTILEl3RhGpewfC1sDr8XO/WOo8mqUXYcRaDwihI1hoUhTKbaGkhBKWbGt25CoY/Jx/ b4wQ== X-Received: by 10.67.1.33 with SMTP id bd1mr11241712pad.75.1371439729366; Sun, 16 Jun 2013 20:28:49 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id fl2sm12884202pab.23.2013.06.16.20.28.46 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 16 Jun 2013 20:28:48 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Mon, 17 Jun 2013 12:28:48 +0900 Message-Id: <20130617032848.21337.29264.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: sh7372 build fix for SUSPEND=n && CPU_IDLE=n X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130616_232916_113851_3E5F507D X-CRM114-Status: UNSURE ( 8.16 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, olof@lixom.net, g.liakhovetski@gmx.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Move the code using cpu_resume() into a function being wrappend in #ifdef CONFIG_SUSPEND || CONFIG_CPU_IDLE. This fixes a build error triggered by ap4evb_defconfig. Signed-off-by: Magnus Damm --- Applies to renesas-next-20130613 arch/arm/mach-shmobile/pm-sh7372.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- 0001/arch/arm/mach-shmobile/pm-sh7372.c +++ work/arch/arm/mach-shmobile/pm-sh7372.c 2013-06-17 12:03:18.000000000 +0900 @@ -351,6 +351,9 @@ static void sh7372_enter_a4s_common(int static void sh7372_pm_setup_smfram(void) { + /* pass physical address of cpu_resume() to assembly resume code */ + sh7372_cpu_resume = virt_to_phys(cpu_resume); + memcpy((void *)SMFRAM, sh7372_resume_core_standby_sysc, 0x100); } #else @@ -524,9 +527,6 @@ void __init sh7372_pm_init(void) /* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */ __raw_writel(0, PDNSEL); - /* pass physical address of cpu_resume() to assembly resume code */ - sh7372_cpu_resume = virt_to_phys(cpu_resume); - sh7372_pm_setup_smfram(); sh7372_suspend_init();