From patchwork Thu Aug 28 07:05:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 4796581 Return-Path: X-Original-To: patchwork-ltsi-dev@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 3134FC0338 for ; Thu, 28 Aug 2014 07:59:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56EE7201C0 for ; Thu, 28 Aug 2014 07:58:59 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (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 6FE81201B9 for ; Thu, 28 Aug 2014 07:58:58 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 92B0F1173; Thu, 28 Aug 2014 07:29:48 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 9075E1161 for ; Thu, 28 Aug 2014 07:29:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from kirsty.vergenet.net (kirsty.vergenet.net [202.4.237.240]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id CFC681F88A for ; Thu, 28 Aug 2014 07:29:45 +0000 (UTC) Received: from ayumi.isobedori.kobe.vergenet.net (p4222-ipbfp1605kobeminato.hyogo.ocn.ne.jp [114.154.95.222]) by kirsty.vergenet.net (Postfix) with ESMTP id 4EA67267485; Thu, 28 Aug 2014 17:09:19 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id D1428EDE8E0; Thu, 28 Aug 2014 16:09:17 +0900 (JST) From: Simon Horman To: ltsi-dev@lists.linuxfoundation.org Date: Thu, 28 Aug 2014 16:05:55 +0900 Message-Id: <1409209620-24487-830-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1409209620-24487-1-git-send-email-horms+renesas@verge.net.au> References: <1409209620-24487-1-git-send-email-horms+renesas@verge.net.au> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Cc: Magnus Damm Subject: [LTSI-dev] [PATCH LTSI-3.14 829/894] ARM: shmobile: Move r8a73a4.h X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven Change location of r8a73a4.h so it can be included as "r8a73a4.h" instead of the old style Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman (cherry picked from commit fac49568b0d19e039e216ca6d13bc534ebf12c34) Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +++- arch/arm/mach-shmobile/board-ape6evm.c | 4 +++- arch/arm/mach-shmobile/include/mach/r8a73a4.h | 19 ------------------- arch/arm/mach-shmobile/r8a73a4.h | 19 +++++++++++++++++++ arch/arm/mach-shmobile/setup-r8a73a4.c | 4 +++- 5 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 arch/arm/mach-shmobile/include/mach/r8a73a4.h create mode 100644 arch/arm/mach-shmobile/r8a73a4.h diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c index 76e4ff1..2f7723e 100644 --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c @@ -24,10 +24,12 @@ #include #include #include -#include + #include #include + #include "common.h" +#include "r8a73a4.h" static void __init ape6evm_add_standard_devices(void) { diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c index 8f8da25..4855678 100644 --- a/arch/arm/mach-shmobile/board-ape6evm.c +++ b/arch/arm/mach-shmobile/board-ape6evm.c @@ -33,11 +33,13 @@ #include #include #include -#include + #include #include + #include "common.h" #include "irqs.h" +#include "r8a73a4.h" /* LEDS */ static struct gpio_led ape6evm_leds[] = { diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/include/mach/r8a73a4.h deleted file mode 100644 index ce8bdd1..0000000 --- a/arch/arm/mach-shmobile/include/mach/r8a73a4.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __ASM_R8A73A4_H__ -#define __ASM_R8A73A4_H__ - -/* DMA slave IDs */ -enum { - SHDMA_SLAVE_INVALID, - SHDMA_SLAVE_MMCIF0_TX, - SHDMA_SLAVE_MMCIF0_RX, - SHDMA_SLAVE_MMCIF1_TX, - SHDMA_SLAVE_MMCIF1_RX, -}; - -void r8a73a4_add_standard_devices(void); -void r8a73a4_add_dt_devices(void); -void r8a73a4_clock_init(void); -void r8a73a4_pinmux_init(void); -void r8a73a4_init_early(void); - -#endif /* __ASM_R8A73A4_H__ */ diff --git a/arch/arm/mach-shmobile/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h new file mode 100644 index 0000000..ce8bdd1 --- /dev/null +++ b/arch/arm/mach-shmobile/r8a73a4.h @@ -0,0 +1,19 @@ +#ifndef __ASM_R8A73A4_H__ +#define __ASM_R8A73A4_H__ + +/* DMA slave IDs */ +enum { + SHDMA_SLAVE_INVALID, + SHDMA_SLAVE_MMCIF0_TX, + SHDMA_SLAVE_MMCIF0_RX, + SHDMA_SLAVE_MMCIF1_TX, + SHDMA_SLAVE_MMCIF1_RX, +}; + +void r8a73a4_add_standard_devices(void); +void r8a73a4_add_dt_devices(void); +void r8a73a4_clock_init(void); +void r8a73a4_pinmux_init(void); +void r8a73a4_init_early(void); + +#endif /* __ASM_R8A73A4_H__ */ diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c index da94d9b..f470b3c 100644 --- a/arch/arm/mach-shmobile/setup-r8a73a4.c +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c @@ -24,11 +24,13 @@ #include #include #include -#include + #include + #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "r8a73a4.h" static const struct resource pfc_resources[] = { DEFINE_RES_MEM(0xe6050000, 0x9000),