From patchwork Tue Jun 17 07:48: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: 4364721 Return-Path: X-Original-To: patchwork-linux-arm@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 8374F9F36A for ; Tue, 17 Jun 2014 07:50:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7CE9820279 for ; Tue, 17 Jun 2014 07:50:54 +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 8B4542020A for ; Tue, 17 Jun 2014 07:50:53 +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 1Wwo7J-0004CX-9L; Tue, 17 Jun 2014 07:47:41 +0000 Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wwo5y-0003Nb-KZ for linux-arm-kernel@lists.infradead.org; Tue, 17 Jun 2014 07:46:19 +0000 Received: by mail-pa0-f53.google.com with SMTP id ey11so1960303pad.40 for ; Tue, 17 Jun 2014 00:45:54 -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=25w+LE24fHZtL9/4RE00OrkPYysNvYt/+4OWG0SOoDs=; b=r98pSPpTlWafQPebeMLNlzP2QmJnhdSZ/ceJDG4NB85TspxUZ4TQMt5NMawBGGmT6h LKjTvnE3wjZSntOlpFgCvkM80UXq2Uxrb3+NNCBdCmufLMM1GDuIRRGMrR186BvJqGV2 fN42hcpH6O0kpryjIkriwTrzC6PtOEg/n7+T8fgq7s1bH7+GG2z1l42k5cAAKaC7Gd0F guDkAW7tzrIErmbMGrpcFzbGJKSGDAiW6rLlZq9/uxuxpNc5mT7QYEgH/4euVgRKpkoY J/V/EZUHqFSheyVpRbLWLKfCgma6R05pSnQst3Dd4kg6I7sGJHp6ZFNKMzQZUCwOHnwq LF+A== X-Received: by 10.67.24.102 with SMTP id ih6mr7312406pad.99.1402991154858; Tue, 17 Jun 2014 00:45:54 -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 ln2sm81006834pab.35.2014.06.17.00.45.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 00:45:54 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 17 Jun 2014 16:48:01 +0900 Message-Id: <20140617074801.30008.11376.sendpatchset@w520> In-Reply-To: <20140617074658.30008.53021.sendpatchset@w520> References: <20140617074658.30008.53021.sendpatchset@w520> Subject: [PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140617_004618_767084_664853A6 X-CRM114-Status: GOOD ( 12.56 ) 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 rcar-gen2.h so it can be used as #include "rcar-gen2.h" instead of the old style #include . Also clean up the r8a7790 case to follow the same style as r8a7791. 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-koelsch-reference.c | 2 +- arch/arm/mach-shmobile/board-koelsch.c | 2 +- arch/arm/mach-shmobile/board-lager-reference.c | 2 +- arch/arm/mach-shmobile/board-lager.c | 1 + arch/arm/mach-shmobile/clock-r8a7790.c | 1 + arch/arm/mach-shmobile/clock-r8a7791.c | 2 +- arch/arm/mach-shmobile/include/mach/r8a7790.h | 2 -- arch/arm/mach-shmobile/include/mach/rcar-gen2.h | 8 -------- arch/arm/mach-shmobile/rcar-gen2.h | 8 ++++++++ arch/arm/mach-shmobile/setup-r8a7790.c | 1 + arch/arm/mach-shmobile/setup-r8a7791.c | 2 +- arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) --- 0006/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-17 16:15:58.000000000 +0900 @@ -23,12 +23,12 @@ #include #include #include -#include #include #include #include "clock.h" #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0006/arch/arm/mach-shmobile/board-koelsch.c +++ work/arch/arm/mach-shmobile/board-koelsch.c 2014-06-17 16:15:58.000000000 +0900 @@ -46,11 +46,11 @@ #include #include #include -#include #include #include #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* DU */ static struct rcar_du_encoder_data koelsch_du_encoders[] = { --- 0006/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:15:58.000000000 +0900 @@ -22,12 +22,12 @@ #include #include #include -#include #include #include #include "clock.h" #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* DU */ static struct rcar_du_encoder_data lager_du_encoders[] = { --- 0006/arch/arm/mach-shmobile/board-lager.c +++ work/arch/arm/mach-shmobile/board-lager.c 2014-06-17 16:15:58.000000000 +0900 @@ -58,6 +58,7 @@ #include #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* * SSI-AK4643 --- 0006/arch/arm/mach-shmobile/clock-r8a7790.c +++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-06-17 16:15:58.000000000 +0900 @@ -25,6 +25,7 @@ #include #include "clock.h" #include "common.h" +#include "rcar-gen2.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0006/arch/arm/mach-shmobile/clock-r8a7791.c +++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-06-17 16:15:58.000000000 +0900 @@ -23,9 +23,9 @@ #include #include #include -#include #include "clock.h" #include "common.h" +#include "rcar-gen2.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0001/arch/arm/mach-shmobile/include/mach/r8a7790.h +++ work/arch/arm/mach-shmobile/include/mach/r8a7790.h 2014-06-17 16:15:58.000000000 +0900 @@ -1,8 +1,6 @@ #ifndef __ASM_R8A7790_H__ #define __ASM_R8A7790_H__ -#include - /* DMA slave IDs */ enum { RCAR_DMA_SLAVE_INVALID, --- 0001/arch/arm/mach-shmobile/include/mach/rcar-gen2.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,8 +0,0 @@ -#ifndef __ASM_RCAR_GEN2_H__ -#define __ASM_RCAR_GEN2_H__ - -void rcar_gen2_timer_init(void); -#define MD(nr) BIT(nr) -u32 rcar_gen2_read_mode_pins(void); - -#endif /* __ASM_RCAR_GEN2_H__ */ --- /dev/null +++ work/arch/arm/mach-shmobile/rcar-gen2.h 2014-06-17 16:15:59.000000000 +0900 @@ -0,0 +1,8 @@ +#ifndef __ASM_RCAR_GEN2_H__ +#define __ASM_RCAR_GEN2_H__ + +void rcar_gen2_timer_init(void); +#define MD(nr) BIT(nr) +u32 rcar_gen2_read_mode_pins(void); + +#endif /* __ASM_RCAR_GEN2_H__ */ --- 0006/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-17 16:15:58.000000000 +0900 @@ -31,6 +31,7 @@ #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "rcar-gen2.h" /* Audio-DMAC */ #define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \ --- 0006/arch/arm/mach-shmobile/setup-r8a7791.c +++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-06-17 16:15:58.000000000 +0900 @@ -27,10 +27,10 @@ #include #include #include -#include #include #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" static const struct resource pfc_resources[] __initconst = { DEFINE_RES_MEM(0xe6060000, 0x250), --- 0006/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-06-17 16:15:58.000000000 +0900 @@ -22,9 +22,9 @@ #include #include #include -#include #include #include "common.h" +#include "rcar-gen2.h" #define MODEMR 0xe6160060 --- 0006/arch/arm/mach-shmobile/smp-r8a7791.c +++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-06-17 16:15:58.000000000 +0900 @@ -19,8 +19,8 @@ #include #include #include -#include #include "common.h" +#include "rcar-gen2.h" #define RST 0xe6160000 #define CA15BAR 0x0020