From patchwork Fri Jun 6 07:21:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4310221 Return-Path: X-Original-To: patchwork-linux-sh@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 B7685BEEAA for ; Fri, 6 Jun 2014 07:19:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3E25201C8 for ; Fri, 6 Jun 2014 07:19:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05970201C7 for ; Fri, 6 Jun 2014 07:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752309AbaFFHTQ (ORCPT ); Fri, 6 Jun 2014 03:19:16 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:38355 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbaFFHTQ (ORCPT ); Fri, 6 Jun 2014 03:19:16 -0400 Received: by mail-pb0-f43.google.com with SMTP id up15so2283173pbc.30 for ; Fri, 06 Jun 2014 00:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=R13U+OoacaetkMQYpEtTQfzMP9UI/69iLuj/sH8BkSE=; b=D1L5hjUaVyRfjSl7ckYsRt/cyPS+uI7kN2XpBJOVgpb9w6G8ztbcUmuB9wuM/znoro C7hw6mwnMSI4NPeTlcnZNergXHsKjNfXTCQCqpq/oiTZ4MTwc7Fxw178dXGZ3wB2a1IF nepPrKnir1WCC2zVzLp2mHQGUVZv22GBsoX0YznmekVDd5SZfEiGvshiGsmFC8cNy8ku rzR5gL8Tph1WKMIsvOF9gVsk9of0qFRyVdPk5mbiUyZL0szmmKcvkoELNZxtBNlxW+lD 5SueHH1e+EuV0DxxnFignSr5RxsBo7Agq/O1hNu9gie0KTLcy8AN/SX93uhyxNCCGiyw FKug== X-Received: by 10.68.215.3 with SMTP id oe3mr5255516pbc.109.1402039155899; Fri, 06 Jun 2014 00:19:15 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id ak1sm32023981pbc.58.2014.06.06.00.19.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jun 2014 00:19:14 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, geert@linux-m68k.org, keita.kobayashi.ym@renesas.com Date: Fri, 06 Jun 2014 16:21:19 +0900 Message-Id: <20140606072119.14868.66441.sendpatchset@w520> In-Reply-To: <20140606072010.14868.5474.sendpatchset@w520> References: <20140606072010.14868.5474.sendpatchset@w520> Subject: [PATCH v2 07/07] ARM: shmobile: Allow r8a7791 to build non-SMP APMU code Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Build the APMU for r8a7791 even though SMP is disabled in the kernel config. Also initialize Suspend-to-RAM from pm-r8a7791.c to in the future cover both UP and SMP use cases of the APMU. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Makefile | 5 +++-- arch/arm/mach-shmobile/pm-r8a7791.c | 1 + arch/arm/mach-shmobile/smp-r8a7791.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0014/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-06-06 15:00:42.000000000 +0900 @@ -37,13 +37,14 @@ endif # CPU reset vector handling objects cpu-y := platsmp.o headsmp.o cpu-$(CONFIG_ARCH_R8A7790) += platsmp-apmu.o +cpu-$(CONFIG_ARCH_R8A7791) += platsmp-apmu.o # SMP objects smp-y := $(cpu-y) smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o platsmp-scu.o smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o platsmp-scu.o smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o -smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o platsmp-apmu.o +smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o # PM objects @@ -55,7 +56,7 @@ obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o $(cpu-y) -obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o +obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o $(cpu-y) # IRQ objects obj-$(CONFIG_ARCH_SH7372) += entry-intc.o --- 0015/arch/arm/mach-shmobile/pm-r8a7791.c +++ work/arch/arm/mach-shmobile/pm-r8a7791.c 2014-06-06 15:01:29.000000000 +0900 @@ -68,4 +68,5 @@ void __init r8a7791_pm_init(void) iounmap(p); r8a7791_sysc_init(); + shmobile_smp_apmu_suspend_init(); } --- 0015/arch/arm/mach-shmobile/smp-r8a7791.c +++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-06-06 15:01:05.000000000 +0900 @@ -28,7 +28,6 @@ static void __init r8a7791_smp_prepare_c shmobile_smp_apmu_prepare_cpus(max_cpus); r8a7791_pm_init(); - shmobile_smp_apmu_suspend_init(); } static int r8a7791_smp_boot_secondary(unsigned int cpu,