From patchwork Fri Aug 8 10:59:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4695341 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 1FD7FC0338 for ; Fri, 8 Aug 2014 10:57:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2031D20160 for ; Fri, 8 Aug 2014 10:57:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D27682010C for ; Fri, 8 Aug 2014 10:57:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756583AbaHHK5J (ORCPT ); Fri, 8 Aug 2014 06:57:09 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:59060 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756552AbaHHK5I (ORCPT ); Fri, 8 Aug 2014 06:57:08 -0400 Received: by mail-pd0-f179.google.com with SMTP id v10so935198pde.38 for ; Fri, 08 Aug 2014 03:57:08 -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=JV4kAvf2EKwwIFmojhQUSsO60C+q1iN1jfKS+mXXBDo=; b=N0Lk1cjPDWbgZwY5mmYKWTynNaNBubY7PGNMHvua6H5QjcXGcmzCCzE2E383U5JMzd 8ZqFPsONNHzcLjXyZVFkaKGmvd0/XlLUg6qZp11oRebvmXgOP7Lh9/flLlSFDRA/7HqI XayL8qYKHkcBKxfWTjbGFEo1NAqmLarYwLxx683g672c6iScjHJ39yOw1fP8/m8noKFI lMyokD3gSfCOYDHkImauo/kYPS17evJzOlXXol3mhhk0ayrpkZCnfZo1hCGNjTXSxgx3 UHasv+3N5ycoxKDS1jnUGnMnpfFrQvXQGwCvYMeIGlqMWaYG0UOxBke9HY9cN0J6i31r dZDQ== X-Received: by 10.68.129.99 with SMTP id nv3mr23135803pbb.128.1407495428180; Fri, 08 Aug 2014 03:57:08 -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 fn1sm2600486pbc.77.2014.08.08.03.57.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Aug 2014 03:57:07 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, geert+renesas@glider.be Date: Fri, 08 Aug 2014 19:59:23 +0900 Message-Id: <20140808105923.2628.30007.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: Partial build of pm-rmobile.c 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.5 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 Disconnect Multiplatform PM domain enablement and SoC specific Multiplatform enablement by allowing to build pm-rmobile.c with parts of it disabled. This way it is possible to start using r8a7740 with Multiplatform before PM domain DT is ready. Signed-off-by: Magnus Damm --- Built on top of renesas-devel-v3.16-20140808 arch/arm/mach-shmobile/pm-rmobile.c | 4 ++-- arch/arm/mach-shmobile/pm-rmobile.h | 4 ++-- 2 files changed, 4 insertions(+), 4 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 --- 0001/arch/arm/mach-shmobile/pm-rmobile.c +++ work/arch/arm/mach-shmobile/pm-rmobile.c 2014-08-07 15:36:40.000000000 +0900 @@ -27,7 +27,7 @@ #define PSTR_RETRIES 100 #define PSTR_DELAY_US 10 -#ifdef CONFIG_PM +#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM) static int rmobile_pd_power_down(struct generic_pm_domain *genpd) { struct rmobile_pm_domain *rmobile_pd = to_rmobile_pd(genpd); @@ -151,4 +151,4 @@ void rmobile_add_devices_to_domains(stru rmobile_add_device_to_domain_td(data[j].domain_name, data[j].pdev, &latencies); } -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */ --- 0001/arch/arm/mach-shmobile/pm-rmobile.h +++ work/arch/arm/mach-shmobile/pm-rmobile.h 2014-08-07 15:34:58.000000000 +0900 @@ -36,7 +36,7 @@ struct pm_domain_device { struct platform_device *pdev; }; -#ifdef CONFIG_PM +#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM) extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num); extern void rmobile_add_device_to_domain_td(const char *domain_name, struct platform_device *pdev, @@ -58,6 +58,6 @@ extern void rmobile_add_devices_to_domai static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[], int size) {} -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */ #endif /* PM_RMOBILE_H */