From patchwork Thu Jun 5 05:16:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4303091 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 7A0ABBEEA7 for ; Thu, 5 Jun 2014 05:14:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B614520179 for ; Thu, 5 Jun 2014 05:14:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1A88201F7 for ; Thu, 5 Jun 2014 05:14:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751306AbaFEFN7 (ORCPT ); Thu, 5 Jun 2014 01:13:59 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:43020 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752123AbaFEFN5 (ORCPT ); Thu, 5 Jun 2014 01:13:57 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so564554pbb.33 for ; Wed, 04 Jun 2014 22:13:57 -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=arXJ+qXDgwwqncLYgWvyqikfI0a2GMvJypwXDE6DpBs=; b=RP5+dj8VQWVb4i3Xohv70HT9ueFLs9JOqDKKj70jgvZQ6kOfcoyepsieqeBWOE7I6o PxVEO7R0P1s2Hykf2KgvVSgEJ4k+dKQVVj2C9+KmcT7nF/jkHilycsPSDrYreePRNHvX e8532pwbFQ2UnwuemyD7Ci0uOV3AwUNt6adXqBv126Sd/7Vtrb5aM0lOinKFrM5qSfjZ gBiQDLrNFAZbH363v16Rm+2YT0UYLW8VP73l3sQfyz0v7VaJpVh6vvvhxqq5EgiSqzeW UXcFXcTfxAQY++SqIQgHg2D4DgjmxHHfI0fiM3uu5Bgreuaa3XmBh5PQjpLESTOQWAHO V8Gg== X-Received: by 10.68.97.129 with SMTP id ea1mr71753304pbb.73.1401945237393; Wed, 04 Jun 2014 22:13:57 -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 sm8sm17611236pbc.92.2014.06.04.22.13.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jun 2014 22:13:56 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, keita.kobayashi.ym@renesas.com Date: Thu, 05 Jun 2014 14:16:01 +0900 Message-Id: <20140605051601.18075.60382.sendpatchset@w520> In-Reply-To: <20140605051505.18075.76727.sendpatchset@w520> References: <20140605051505.18075.76727.sendpatchset@w520> Subject: [PATCH 07/08] ARM: shmobile: Hook up r8a7790 PM code for Multiplatform 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 Extend the r8a7790 multiplatform code to call r8a7790_pm_init() at ->init_machine() timing to allow setup of APMU Suspend-to-RAM in the case when SMP is disabled. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/setup-r8a7790.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 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 --- 0001/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-05 12:53:53.000000000 +0900 @@ -281,6 +281,7 @@ static struct resource cmt0_resources[] void __init r8a7790_add_dt_devices(void) { + r8a7790_pm_init(); r8a7790_register_cmt(0); } @@ -308,6 +309,11 @@ void __init r8a7790_add_standard_devices } #ifdef CONFIG_USE_OF +static void __init r8a7790_init_machine(void) +{ + r8a7790_pm_init(); + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); +} static const char * const r8a7790_boards_compat_dt[] __initconst = { "renesas,r8a7790", @@ -318,6 +324,7 @@ DT_MACHINE_START(R8A7790_DT, "Generic R8 .smp = smp_ops(r8a7790_smp_ops), .init_early = shmobile_init_delay, .init_time = rcar_gen2_timer_init, + .init_machine = r8a7790_init_machine, .dt_compat = r8a7790_boards_compat_dt, MACHINE_END #endif /* CONFIG_USE_OF */