From patchwork Tue May 20 08:01:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4207801 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 B8D81BEEAB for ; Tue, 20 May 2014 08:02:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6423202D1 for ; Tue, 20 May 2014 08:02:49 +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 BB5062020F for ; Tue, 20 May 2014 08:02:48 +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 1Wmexn-0002ie-R3; Tue, 20 May 2014 07:59:55 +0000 Received: from mail-pb0-x232.google.com ([2607:f8b0:400e:c01::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmexN-0002DJ-RO for linux-arm-kernel@lists.infradead.org; Tue, 20 May 2014 07:59:30 +0000 Received: by mail-pb0-f50.google.com with SMTP id ma3so88949pbc.23 for ; Tue, 20 May 2014 00:59: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:in-reply-to:references:subject; bh=eS8YAtlS2VX7pXIOK+fkyhRc+jz9R4HeHsL4okk5/O4=; b=z4oCWgUwxPy0wyD/rFYsVD2M1GLrLMIEXSYONf8GEEhLe2O4xtJTaEdam9uSyE223L P9D1bFxtXLo3/y4jWTaCB42DadTrzeCr1KFNXJ/loZahzXKeyce8TJ7T6dQw0hhXRtTO djoo83umfFRj8R/+nBle8UaWIRGm9Q9y4bTWZ4dMeIfDBx3MsmyoDSMn3k2L8+V1GWxE G5LjDd9bQBgTTGmkuqAiQ9ZHiM6MUDYLqBzbnvWqDgn+CIkyEu84nBOoZFvNrkZxPyIc uML7UHJfaN4Lrz/IJWcaHnJ0C8YmtiOZgPbi+hcmVkm66uDmrvbZmHvM34mRUzvEZZcb Ym1w== X-Received: by 10.68.224.198 with SMTP id re6mr49054145pbc.8.1400572748640; Tue, 20 May 2014 00:59: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 yw3sm1661576pbc.69.2014.05.20.00.59.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 May 2014 00:59:07 -0700 (PDT) From: Magnus Damm To: olof@lixom.net Date: Tue, 20 May 2014 17:01:07 +0900 Message-Id: <20140520080107.13851.8035.sendpatchset@w520> In-Reply-To: <20140520075949.13851.42995.sendpatchset@w520> References: <20140520075949.13851.42995.sendpatchset@w520> Subject: [PATCH 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-20140520_005929_936190_17D8D311 X-CRM114-Status: GOOD ( 12.94 ) X-Spam-Score: -0.1 (/) Cc: horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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.4 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 Move most 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 --- 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(-) --- 0009/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-05-20 01:19:53.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[] = { --- 0009/arch/arm/mach-shmobile/board-koelsch.c +++ work/arch/arm/mach-shmobile/board-koelsch.c 2014-05-20 01:20:09.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[] = { --- 0009/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-05-20 01:21:20.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[] = { --- 0009/arch/arm/mach-shmobile/board-lager.c +++ work/arch/arm/mach-shmobile/board-lager.c 2014-05-20 01:21:57.000000000 +0900 @@ -58,6 +58,7 @@ #include #include "common.h" #include "irqs.h" +#include "rcar-gen2.h" /* * SSI-AK4643 --- 0009/arch/arm/mach-shmobile/clock-r8a7790.c +++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-05-20 01:23:08.000000000 +0900 @@ -25,6 +25,7 @@ #include #include "clock.h" #include "common.h" +#include "rcar-gen2.h" /* * MD EXTAL PLL0 PLL1 PLL3 --- 0009/arch/arm/mach-shmobile/clock-r8a7791.c +++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-05-20 01:22:26.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 --- 0004/arch/arm/mach-shmobile/include/mach/r8a7790.h +++ work/arch/arm/mach-shmobile/include/mach/r8a7790.h 2014-05-20 01:18:31.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-05-20 01:17:56.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__ */ --- 0009/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-05-20 01:24:08.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) \ --- 0009/arch/arm/mach-shmobile/setup-r8a7791.c +++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-05-20 01:23: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), --- 0009/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-05-20 01:24:22.000000000 +0900 @@ -22,9 +22,9 @@ #include #include #include -#include #include #include "common.h" +#include "rcar-gen2.h" #define MODEMR 0xe6160060 --- 0009/arch/arm/mach-shmobile/smp-r8a7791.c +++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-05-20 01:24:54.000000000 +0900 @@ -19,8 +19,8 @@ #include #include #include -#include #include "common.h" +#include "rcar-gen2.h" #define RST 0xe6160000 #define CA15BAR 0x0020