From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
Date: Tue, 20 May 2014 07:59:10 +0000 [thread overview]
Message-ID: <20140520080107.13851.8035.sendpatchset@w520> (raw)
In-Reply-To: <20140520075949.13851.42995.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Move most of rcar-gen2.h so it can be used as #include "rcar-gen2.h"
instead of the old style #include <mach/rcar-gen2.h>. Also clean up
the r8a7790 case to follow the same style as r8a7791.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
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 <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#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 <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.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-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 <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#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 <sound/simple_card.h>
#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 <mach/r8a7790.h>
#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 <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/rcar-gen2.h>
#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 <mach/rcar-gen2.h>
-
/* 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 <linux/serial_sci.h>
#include <linux/sh_timer.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#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 <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#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 <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include "common.h"
+#include "rcar-gen2.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
WARNING: multiple messages have this Message-ID (diff)
From: magnus.damm@gmail.com (Magnus Damm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
Date: Tue, 20 May 2014 17:01:07 +0900 [thread overview]
Message-ID: <20140520080107.13851.8035.sendpatchset@w520> (raw)
In-Reply-To: <20140520075949.13851.42995.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Move most of rcar-gen2.h so it can be used as #include "rcar-gen2.h"
instead of the old style #include <mach/rcar-gen2.h>. Also clean up
the r8a7790 case to follow the same style as r8a7791.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
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 <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#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 <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.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-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 <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#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 <sound/simple_card.h>
#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 <mach/r8a7790.h>
#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 <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/rcar-gen2.h>
#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 <mach/rcar-gen2.h>
-
/* 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 <linux/serial_sci.h>
#include <linux/sh_timer.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#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 <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#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 <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include "common.h"
+#include "rcar-gen2.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
next prev parent reply other threads:[~2014-05-20 7:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 7:59 [PATCH 00/08] ARM: shmobile: Rework include path (Try 2, Part 1) Magnus Damm
2014-05-20 7:59 ` Magnus Damm
2014-05-20 7:58 ` [PATCH 02/08] ARM: shmobile: Move dma-register.h Magnus Damm
2014-05-20 8:00 ` Magnus Damm
2014-05-20 7:58 ` [PATCH 03/08] ARM: shmobile: Move clock.h Magnus Damm
2014-05-20 8:00 ` Magnus Damm
2014-05-20 7:58 ` [PATCH 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm
2014-05-20 8:00 ` Magnus Damm
2014-05-20 7:58 ` [PATCH 05/08] ARM: shmobile: Move common.h Magnus Damm
2014-05-20 8:00 ` Magnus Damm
2014-05-20 7:58 ` [PATCH 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h Magnus Damm
2014-05-20 8:00 ` Magnus Damm
2014-05-20 7:59 ` [PATCH 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case Magnus Damm
2014-05-20 8:00 ` Magnus Damm
2014-05-20 7:59 ` Magnus Damm [this message]
2014-05-20 8:01 ` [PATCH 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Magnus Damm
2014-05-20 7:59 ` [PATCH 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm
2014-05-20 7:59 ` Magnus Damm
2014-06-06 9:11 ` [PATCH 00/08] ARM: shmobile: Rework include path (Try 2, Part 1) Geert Uytterhoeven
2014-06-06 9:11 ` Geert Uytterhoeven
2014-06-06 10:14 ` Simon Horman
2014-06-06 10:14 ` Simon Horman
2014-06-06 10:24 ` Arnd Bergmann
2014-06-06 10:24 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140520080107.13851.8035.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.