From patchwork Fri Jun 6 07:21:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4310201 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E83449F387 for ; Fri, 6 Jun 2014 07:19:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A7B6201C8 for ; Fri, 6 Jun 2014 07:19:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32A1D201C7 for ; Fri, 6 Jun 2014 07:19:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752207AbaFFHTA (ORCPT ); Fri, 6 Jun 2014 03:19:00 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:34709 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751419AbaFFHTA (ORCPT ); Fri, 6 Jun 2014 03:19:00 -0400 Received: by mail-pd0-f182.google.com with SMTP id r10so2231404pdi.27 for ; Fri, 06 Jun 2014 00:19:00 -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=v1KLxvT3mjawt0P/DOnMwJGF5+U0jmmDbCeeoB6Ck1I=; b=G2nnwK0jsha80tE3Gb17sf3nUXwHXhsG2RsM6nKfbDjrbH6qP6XaDOoOE7AJHyPsv1 XVQEL+0K2rfWDZ/u8GzB0+/FZ6LcKzMywrASHVRwmey8xNhJg7OyXFvlV8Rcp0xHfX9S VQmQdxvQYEiygte+8LZf18ig9Ifck8v17UgCeJeRESLS047DbjMgv1bYEpGbBTwnP5Q2 gFsgHm5MyzCG8EyMCicCC/Go87WXcxa6zChIq7LzTQO1/ZVfkXoBTT5u6yHxQNZy8f4x WL/FeLqXfnwNh+XhxXZikWfXQGjYrM0TaQrBO9Wpilr6W+tds5qAWqYituj+Degt0JJP Rn7A== X-Received: by 10.68.196.137 with SMTP id im9mr5383665pbc.105.1402039139889; Fri, 06 Jun 2014 00:18:59 -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 gz11sm32097355pbd.1.2014.06.06.00.18.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jun 2014 00:18:59 -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:03 +0900 Message-Id: <20140606072103.14868.14329.sendpatchset@w520> In-Reply-To: <20140606072010.14868.5474.sendpatchset@w520> References: <20140606072010.14868.5474.sendpatchset@w520> Subject: [PATCH v2 05/07] ARM: shmobile: Allow r8a7790 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 r8a7790 even though SMP is disabled in the kernel config. Also initialize Suspend-to-RAM from pm-r8a7790.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-r8a7790.c | 1 + arch/arm/mach-shmobile/smp-r8a7790.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 --- 0002/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-06-05 11:59:50.000000000 +0900 @@ -36,12 +36,13 @@ endif # CPU reset vector handling objects cpu-y := platsmp.o headsmp.o +cpu-$(CONFIG_ARCH_R8A7790) += 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 platsmp-apmu.o +smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o platsmp-apmu.o smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o @@ -53,7 +54,7 @@ obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o 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 +obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o $(cpu-y) obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o # IRQ objects --- 0004/arch/arm/mach-shmobile/pm-r8a7790.c +++ work/arch/arm/mach-shmobile/pm-r8a7790.c 2014-06-05 11:43:02.000000000 +0900 @@ -78,4 +78,5 @@ void __init r8a7790_pm_init(void) iounmap(p); r8a7790_sysc_init(); + shmobile_smp_apmu_suspend_init(); } --- 0004/arch/arm/mach-shmobile/smp-r8a7790.c +++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-06-05 11:42:49.000000000 +0900 @@ -39,7 +39,6 @@ static void __init r8a7790_smp_prepare_c /* turn on power to SCU */ r8a7790_pm_init(); - shmobile_smp_apmu_suspend_init(); rcar_sysc_power_up(&r8a7790_ca15_scu); rcar_sysc_power_up(&r8a7790_ca7_scu); }