From patchwork Tue Jun 17 07:47:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4364771 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 22048BEEAA for ; Tue, 17 Jun 2014 07:52:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0304F20256 for ; Tue, 17 Jun 2014 07:52:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE6292020A for ; Tue, 17 Jun 2014 07:52:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wwo6z-00043q-SF; Tue, 17 Jun 2014 07:47:21 +0000 Received: from mail-pd0-x22b.google.com ([2607:f8b0:400e:c02::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wwo5f-0003FR-UK for linux-arm-kernel@lists.infradead.org; Tue, 17 Jun 2014 07:46:01 +0000 Received: by mail-pd0-f171.google.com with SMTP id fp1so2024659pdb.2 for ; Tue, 17 Jun 2014 00:45:39 -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=j3nOxJ8HBLEJ9HenvOyAFY3aRGmYI8dm5+yxdbDDJB0=; b=fRkuZnf8LaFCdT2+omjmvEbVwYPpVbjCqjRyzq8I9IY4jDAAjcvqEgaNWyBpebAZlM PTsq2ImX8ijaoLHKQudD/O+hcIUqe9L6NU8rcI6vzPTwrWyiafu/qNI91P7jn725NBgQ hh0W9Lo7IuzZ6a3QxtBGsYO0MbbJxkJVm6fP0VT4NGuCuK3isv5pDhX8goS+pEn7TJDq 3Hovuu3Tf+FvILwI7dktQs8u1oWYE6pqGijj34t/WDRedifu6rvqzoJnV1jdK2OXOk+s gkYDx+vTFZRk/WUeHOj7pihYJn1q1wdrXlHAXS3YwAZkRrq+kSEM31VOKKwVyc2cSJah t7kg== X-Received: by 10.66.139.233 with SMTP id rb9mr30182147pab.5.1402991139085; Tue, 17 Jun 2014 00:45:39 -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 fl6sm80974378pab.43.2014.06.17.00.45.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 00:45:38 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 17 Jun 2014 16:47:45 +0900 Message-Id: <20140617074745.30008.34580.sendpatchset@w520> In-Reply-To: <20140617074658.30008.53021.sendpatchset@w520> References: <20140617074658.30008.53021.sendpatchset@w520> Subject: [PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140617_004600_064094_172AD7A5 X-CRM114-Status: GOOD ( 14.63 ) X-Spam-Score: -0.8 (/) Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, geert@linux-m68k.org, olof@lixom.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Change location of pm-rmobile.h so it can be used as #include "pm-rmobile.h" instead of the old style #include . Also clean up the sh7372 and sh73a0 header files to get rid of unused include files. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-armadillo800eva.c | 1 arch/arm/mach-shmobile/board-mackerel.c | 2 arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 63 ---------------------- arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 arch/arm/mach-shmobile/include/mach/sh7372.h | 4 - arch/arm/mach-shmobile/pm-r8a7740.c | 2 arch/arm/mach-shmobile/pm-rmobile.c | 2 arch/arm/mach-shmobile/pm-rmobile.h | 63 ++++++++++++++++++++++ arch/arm/mach-shmobile/pm-sh7372.c | 2 arch/arm/mach-shmobile/setup-r8a7740.c | 2 arch/arm/mach-shmobile/setup-sh7372.c | 1 11 files changed, 71 insertions(+), 73 deletions(-) --- 0006/arch/arm/mach-shmobile/board-armadillo800eva.c +++ work/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-06-17 16:09:25.000000000 +0900 @@ -61,6 +61,7 @@ #include #include "common.h" #include "irqs.h" +#include "pm-rmobile.h" #include "sh-gpio.h" /* --- 0006/arch/arm/mach-shmobile/board-mackerel.c +++ work/arch/arm/mach-shmobile/board-mackerel.c 2014-06-17 16:09:25.000000000 +0900 @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -62,6 +63,7 @@ #include #include "common.h" #include "irqs.h" +#include "pm-rmobile.h" #include "sh-gpio.h" /* --- 0001/arch/arm/mach-shmobile/include/mach/pm-rmobile.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2012 Renesas Solutions Corp. - * - * Kuninori Morimoto - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#ifndef PM_RMOBILE_H -#define PM_RMOBILE_H - -#include - -#define DEFAULT_DEV_LATENCY_NS 250000 - -struct platform_device; - -struct rmobile_pm_domain { - struct generic_pm_domain genpd; - struct dev_power_governor *gov; - int (*suspend)(void); - void (*resume)(void); - unsigned int bit_shift; - bool no_debug; -}; - -static inline -struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d) -{ - return container_of(d, struct rmobile_pm_domain, genpd); -} - -struct pm_domain_device { - const char *domain_name; - struct platform_device *pdev; -}; - -#ifdef CONFIG_PM -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, - struct gpd_timing_data *td); - -static inline void rmobile_add_device_to_domain(const char *domain_name, - struct platform_device *pdev) -{ - rmobile_add_device_to_domain_td(domain_name, pdev, NULL); -} - -extern void rmobile_add_devices_to_domains(struct pm_domain_device data[], - int size); -#else - -#define rmobile_init_domains(domains, num) do { } while (0) -#define rmobile_add_device_to_domain_td(name, pdev, td) do { } while (0) -#define rmobile_add_device_to_domain(name, pdev) do { } while (0) - -static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[], - int size) {} -#endif /* CONFIG_PM */ - -#endif /* PM_RMOBILE_H */ --- 0001/arch/arm/mach-shmobile/include/mach/r8a7740.h +++ work/arch/arm/mach-shmobile/include/mach/r8a7740.h 2014-06-17 16:09:25.000000000 +0900 @@ -19,8 +19,6 @@ #ifndef __ASM_R8A7740_H__ #define __ASM_R8A7740_H__ -#include - /* * MD_CKx pin */ --- 0001/arch/arm/mach-shmobile/include/mach/sh7372.h +++ work/arch/arm/mach-shmobile/include/mach/sh7372.h 2014-06-17 16:09:25.000000000 +0900 @@ -11,10 +11,6 @@ #ifndef __ASM_SH7372_H__ #define __ASM_SH7372_H__ -#include -#include -#include - /* DMA slave IDs */ enum { SHDMA_SLAVE_INVALID, --- 0006/arch/arm/mach-shmobile/pm-r8a7740.c +++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-06-17 16:09:25.000000000 +0900 @@ -10,8 +10,8 @@ */ #include #include -#include #include "common.h" +#include "pm-rmobile.h" #ifdef CONFIG_PM static int r8a7740_pd_a4s_suspend(void) --- 0001/arch/arm/mach-shmobile/pm-rmobile.c +++ work/arch/arm/mach-shmobile/pm-rmobile.c 2014-06-17 16:09:25.000000000 +0900 @@ -17,7 +17,7 @@ #include #include #include -#include +#include "pm-rmobile.h" /* SYSC */ #define SPDCR IOMEM(0xe6180008) --- /dev/null +++ work/arch/arm/mach-shmobile/pm-rmobile.h 2014-06-17 16:09:26.000000000 +0900 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2012 Renesas Solutions Corp. + * + * Kuninori Morimoto + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef PM_RMOBILE_H +#define PM_RMOBILE_H + +#include + +#define DEFAULT_DEV_LATENCY_NS 250000 + +struct platform_device; + +struct rmobile_pm_domain { + struct generic_pm_domain genpd; + struct dev_power_governor *gov; + int (*suspend)(void); + void (*resume)(void); + unsigned int bit_shift; + bool no_debug; +}; + +static inline +struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d) +{ + return container_of(d, struct rmobile_pm_domain, genpd); +} + +struct pm_domain_device { + const char *domain_name; + struct platform_device *pdev; +}; + +#ifdef CONFIG_PM +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, + struct gpd_timing_data *td); + +static inline void rmobile_add_device_to_domain(const char *domain_name, + struct platform_device *pdev) +{ + rmobile_add_device_to_domain_td(domain_name, pdev, NULL); +} + +extern void rmobile_add_devices_to_domains(struct pm_domain_device data[], + int size); +#else + +#define rmobile_init_domains(domains, num) do { } while (0) +#define rmobile_add_device_to_domain_td(name, pdev, td) do { } while (0) +#define rmobile_add_device_to_domain(name, pdev) do { } while (0) + +static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[], + int size) {} +#endif /* CONFIG_PM */ + +#endif /* PM_RMOBILE_H */ --- 0006/arch/arm/mach-shmobile/pm-sh7372.c +++ work/arch/arm/mach-shmobile/pm-sh7372.c 2014-06-17 16:09:25.000000000 +0900 @@ -26,8 +26,8 @@ #include #include #include -#include #include "common.h" +#include "pm-rmobile.h" /* DBG */ #define DBGREG1 IOMEM(0xe6100020) --- 0006/arch/arm/mach-shmobile/setup-r8a7740.c +++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-06-17 16:09:25.000000000 +0900 @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "pm-rmobile.h" static struct map_desc r8a7740_io_desc[] __initdata = { /* --- 0006/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 16:09:25.000000000 +0900 @@ -41,6 +41,7 @@ #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "pm-rmobile.h" static struct map_desc sh7372_io_desc[] __initdata = { /* create a 1:1 entity map for 0xe6xxxxxx