From mboxrd@z Thu Jan 1 00:00:00 1970 From: Magnus Damm Date: Tue, 20 May 2014 07:59:10 +0000 Subject: [PATCH 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Message-Id: <20140520080107.13851.8035.sendpatchset@w520> List-Id: References: <20140520075949.13851.42995.sendpatchset@w520> In-Reply-To: <20140520075949.13851.42995.sendpatchset@w520> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org 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