* [PATCH 00/12] ARM: shmobile: Rework include path for SoC files
@ 2014-02-24 5:40 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:40 UTC (permalink / raw)
To: linux-arm-kernel
ARM: shmobile: Rework include path for SoC files
[PATCH 01/12] ARM: shmobile: Add temporary include workaround
[PATCH 02/12] ARM: shmobile: Rework include path for sh7372
[PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
[PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
[PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
[PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
[PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
[PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
[PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
[PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
[PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
[PATCH 12/12] ARM: shmobile: Rework include path for common bits
Start converting the mach-shmobile subarchitecture from <mach/something.h>
to "something.h". This series covers shared code base and SoC code,
however actual header files are not moved yet. Upcoming series that
depend on this one will have to convert board code as well. When SoCs
code and board code have been converted then actual header files can
be moved and temporary include path workarounds can be removed.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
Written against renesas.git tag renesas-devel-v3.14-rc3-20140224
arch/arm/mach-shmobile/Makefile | 2 ++
arch/arm/mach-shmobile/clock-emev2.c | 2 +-
arch/arm/mach-shmobile/clock-r7s72100.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a73a4.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a7740.c | 6 +++---
arch/arm/mach-shmobile/clock-r8a7778.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++---
arch/arm/mach-shmobile/clock-r8a7791.c | 4 ++--
arch/arm/mach-shmobile/clock-sh7372.c | 4 ++--
arch/arm/mach-shmobile/clock-sh73a0.c | 4 ++--
arch/arm/mach-shmobile/clock.c | 4 ++--
arch/arm/mach-shmobile/console.c | 2 +-
arch/arm/mach-shmobile/intc-sh7372.c | 4 ++--
arch/arm/mach-shmobile/intc-sh73a0.c | 6 +++---
arch/arm/mach-shmobile/platsmp-apmu.c | 2 +-
arch/arm/mach-shmobile/platsmp-scu.c | 2 +-
arch/arm/mach-shmobile/platsmp.c | 2 +-
arch/arm/mach-shmobile/pm-r8a7740.c | 4 ++--
arch/arm/mach-shmobile/pm-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/pm-r8a7790.c | 4 ++--
arch/arm/mach-shmobile/pm-rcar.c | 2 +-
arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
arch/arm/mach-shmobile/pm-sh7372.c | 6 +++---
arch/arm/mach-shmobile/pm-sh73a0.c | 2 +-
arch/arm/mach-shmobile/setup-emev2.c | 4 ++--
arch/arm/mach-shmobile/setup-r7s72100.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a73a4.c | 8 ++++----
arch/arm/mach-shmobile/setup-r8a7740.c | 10 +++++-----
arch/arm/mach-shmobile/setup-r8a7778.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a7790.c | 8 ++++----
arch/arm/mach-shmobile/setup-r8a7791.c | 8 ++++----
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ++--
arch/arm/mach-shmobile/setup-sh7372.c | 8 ++++----
arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++----
arch/arm/mach-shmobile/smp-emev2.c | 4 ++--
arch/arm/mach-shmobile/smp-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/smp-r8a7790.c | 6 +++---
arch/arm/mach-shmobile/smp-r8a7791.c | 4 ++--
arch/arm/mach-shmobile/smp-sh73a0.c | 4 ++--
41 files changed, 97 insertions(+), 95 deletions(-)
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 00/12] ARM: shmobile: Rework include path for SoC files
@ 2014-02-24 5:40 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:40 UTC (permalink / raw)
To: linux-arm-kernel
ARM: shmobile: Rework include path for SoC files
[PATCH 01/12] ARM: shmobile: Add temporary include workaround
[PATCH 02/12] ARM: shmobile: Rework include path for sh7372
[PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
[PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
[PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
[PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
[PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
[PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
[PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
[PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
[PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
[PATCH 12/12] ARM: shmobile: Rework include path for common bits
Start converting the mach-shmobile subarchitecture from <mach/something.h>
to "something.h". This series covers shared code base and SoC code,
however actual header files are not moved yet. Upcoming series that
depend on this one will have to convert board code as well. When SoCs
code and board code have been converted then actual header files can
be moved and temporary include path workarounds can be removed.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
Written against renesas.git tag renesas-devel-v3.14-rc3-20140224
arch/arm/mach-shmobile/Makefile | 2 ++
arch/arm/mach-shmobile/clock-emev2.c | 2 +-
arch/arm/mach-shmobile/clock-r7s72100.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a73a4.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a7740.c | 6 +++---
arch/arm/mach-shmobile/clock-r8a7778.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++--
arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++---
arch/arm/mach-shmobile/clock-r8a7791.c | 4 ++--
arch/arm/mach-shmobile/clock-sh7372.c | 4 ++--
arch/arm/mach-shmobile/clock-sh73a0.c | 4 ++--
arch/arm/mach-shmobile/clock.c | 4 ++--
arch/arm/mach-shmobile/console.c | 2 +-
arch/arm/mach-shmobile/intc-sh7372.c | 4 ++--
arch/arm/mach-shmobile/intc-sh73a0.c | 6 +++---
arch/arm/mach-shmobile/platsmp-apmu.c | 2 +-
arch/arm/mach-shmobile/platsmp-scu.c | 2 +-
arch/arm/mach-shmobile/platsmp.c | 2 +-
arch/arm/mach-shmobile/pm-r8a7740.c | 4 ++--
arch/arm/mach-shmobile/pm-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/pm-r8a7790.c | 4 ++--
arch/arm/mach-shmobile/pm-rcar.c | 2 +-
arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
arch/arm/mach-shmobile/pm-sh7372.c | 6 +++---
arch/arm/mach-shmobile/pm-sh73a0.c | 2 +-
arch/arm/mach-shmobile/setup-emev2.c | 4 ++--
arch/arm/mach-shmobile/setup-r7s72100.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a73a4.c | 8 ++++----
arch/arm/mach-shmobile/setup-r8a7740.c | 10 +++++-----
arch/arm/mach-shmobile/setup-r8a7778.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a7790.c | 8 ++++----
arch/arm/mach-shmobile/setup-r8a7791.c | 8 ++++----
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ++--
arch/arm/mach-shmobile/setup-sh7372.c | 8 ++++----
arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++----
arch/arm/mach-shmobile/smp-emev2.c | 4 ++--
arch/arm/mach-shmobile/smp-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/smp-r8a7790.c | 6 +++---
arch/arm/mach-shmobile/smp-r8a7791.c | 4 ++--
arch/arm/mach-shmobile/smp-sh73a0.c | 4 ++--
41 files changed, 97 insertions(+), 95 deletions(-)
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 01/12] ARM: shmobile: Add temporary include workaround
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:41 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Add temporary include path in the mach-shmobile Makefile to
aid coversion from using <mach/something.h> to "something.h"
in the source files.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/Makefile | 2 ++
1 file changed, 2 insertions(+)
--- 0001/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile 2014-02-24 13:03:32.000000000 +0900
@@ -4,6 +4,8 @@
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
+ccflags-y := -I$(srctree)/arch/arm/mach-shmobile/include/mach
+
# Common objects
obj-y := timer.o console.o
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 01/12] ARM: shmobile: Add temporary include workaround
@ 2014-02-24 5:41 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Add temporary include path in the mach-shmobile Makefile to
aid coversion from using <mach/something.h> to "something.h"
in the source files.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/Makefile | 2 ++
1 file changed, 2 insertions(+)
--- 0001/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile 2014-02-24 13:03:32.000000000 +0900
@@ -4,6 +4,8 @@
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
+ccflags-y := -I$(srctree)/arch/arm/mach-shmobile/include/mach
+
# Common objects
obj-y := timer.o console.o
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 02/12] ARM: shmobile: Rework include path for sh7372
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:41 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert sh7372 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-sh7372.c | 4 ++--
arch/arm/mach-shmobile/intc-sh7372.c | 4 ++--
arch/arm/mach-shmobile/pm-sh7372.c | 6 +++---
arch/arm/mach-shmobile/setup-sh7372.c | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-sh7372.c
+++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-02-24 13:13:46.000000000 +0900
@@ -21,8 +21,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
/* SH7372 registers */
#define FRQCRA IOMEM(0xe6150000)
--- 0001/arch/arm/mach-shmobile/intc-sh7372.c
+++ work/arch/arm/mach-shmobile/intc-sh7372.c 2014-02-24 13:13:46.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/sh_intc.h>
-#include <mach/intc.h>
-#include <mach/irqs.h>
+#include "intc.h"
+#include "irqs.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
--- 0001/arch/arm/mach-shmobile/pm-sh7372.c
+++ work/arch/arm/mach-shmobile/pm-sh7372.c 2014-02-24 13:26:42.000000000 +0900
@@ -25,9 +25,9 @@
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
-#include <mach/common.h>
-#include <mach/sh7372.h>
-#include <mach/pm-rmobile.h>
+#include "common.h"
+#include "sh7372.h"
+#include "pm-rmobile.h"
/* DBG */
#define DBGREG1 IOMEM(0xe6100020)
--- 0001/arch/arm/mach-shmobile/setup-sh7372.c
+++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-02-24 13:13:46.000000000 +0900
@@ -34,10 +34,10 @@
#include <linux/pm_domain.h>
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/sh7372.h>
-#include <mach/common.h>
+#include "dma-register.h"
+#include "irqs.h"
+#include "sh7372.h"
+#include "common.h"
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 02/12] ARM: shmobile: Rework include path for sh7372
@ 2014-02-24 5:41 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert sh7372 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-sh7372.c | 4 ++--
arch/arm/mach-shmobile/intc-sh7372.c | 4 ++--
arch/arm/mach-shmobile/pm-sh7372.c | 6 +++---
arch/arm/mach-shmobile/setup-sh7372.c | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-sh7372.c
+++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-02-24 13:13:46.000000000 +0900
@@ -21,8 +21,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
/* SH7372 registers */
#define FRQCRA IOMEM(0xe6150000)
--- 0001/arch/arm/mach-shmobile/intc-sh7372.c
+++ work/arch/arm/mach-shmobile/intc-sh7372.c 2014-02-24 13:13:46.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/sh_intc.h>
-#include <mach/intc.h>
-#include <mach/irqs.h>
+#include "intc.h"
+#include "irqs.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
--- 0001/arch/arm/mach-shmobile/pm-sh7372.c
+++ work/arch/arm/mach-shmobile/pm-sh7372.c 2014-02-24 13:26:42.000000000 +0900
@@ -25,9 +25,9 @@
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
-#include <mach/common.h>
-#include <mach/sh7372.h>
-#include <mach/pm-rmobile.h>
+#include "common.h"
+#include "sh7372.h"
+#include "pm-rmobile.h"
/* DBG */
#define DBGREG1 IOMEM(0xe6100020)
--- 0001/arch/arm/mach-shmobile/setup-sh7372.c
+++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-02-24 13:13:46.000000000 +0900
@@ -34,10 +34,10 @@
#include <linux/pm_domain.h>
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/sh7372.h>
-#include <mach/common.h>
+#include "dma-register.h"
+#include "irqs.h"
+#include "sh7372.h"
+#include "common.h"
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:41 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert sh73a0 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-sh73a0.c | 4 ++--
arch/arm/mach-shmobile/intc-sh73a0.c | 6 +++---
arch/arm/mach-shmobile/pm-sh73a0.c | 2 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++----
arch/arm/mach-shmobile/smp-sh73a0.c | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-sh73a0.c
+++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-02-24 13:20:15.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <asm/processor.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
#define FRQCRA IOMEM(0xe6150000)
#define FRQCRB IOMEM(0xe6150004)
--- 0001/arch/arm/mach-shmobile/intc-sh73a0.c
+++ work/arch/arm/mach-shmobile/intc-sh73a0.c 2014-02-24 13:21:27.000000000 +0900
@@ -25,9 +25,9 @@
#include <linux/sh_intc.h>
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic.h>
-#include <mach/intc.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
+#include "intc.h"
+#include "irqs.h"
+#include "sh73a0.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
--- 0001/arch/arm/mach-shmobile/pm-sh73a0.c
+++ work/arch/arm/mach-shmobile/pm-sh73a0.c 2014-02-24 13:23:21.000000000 +0900
@@ -9,7 +9,7 @@
*/
#include <linux/suspend.h>
-#include <mach/common.h>
+#include "common.h"
#ifdef CONFIG_SUSPEND
static int sh73a0_enter_suspend(suspend_state_t suspend_state)
--- 0001/arch/arm/mach-shmobile/setup-sh73a0.c
+++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-02-24 13:20:41.000000000 +0900
@@ -33,10 +33,10 @@
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
-#include <mach/common.h>
+#include "dma-register.h"
+#include "irqs.h"
+#include "sh73a0.h"
+#include "common.h"
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
--- 0001/arch/arm/mach-shmobile/smp-sh73a0.c
+++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2014-02-24 13:21:54.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/sh73a0.h>
+#include "common.h"
+#include "sh73a0.h"
#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
@ 2014-02-24 5:41 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert sh73a0 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-sh73a0.c | 4 ++--
arch/arm/mach-shmobile/intc-sh73a0.c | 6 +++---
arch/arm/mach-shmobile/pm-sh73a0.c | 2 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++----
arch/arm/mach-shmobile/smp-sh73a0.c | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-sh73a0.c
+++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-02-24 13:20:15.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <asm/processor.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
#define FRQCRA IOMEM(0xe6150000)
#define FRQCRB IOMEM(0xe6150004)
--- 0001/arch/arm/mach-shmobile/intc-sh73a0.c
+++ work/arch/arm/mach-shmobile/intc-sh73a0.c 2014-02-24 13:21:27.000000000 +0900
@@ -25,9 +25,9 @@
#include <linux/sh_intc.h>
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic.h>
-#include <mach/intc.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
+#include "intc.h"
+#include "irqs.h"
+#include "sh73a0.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
--- 0001/arch/arm/mach-shmobile/pm-sh73a0.c
+++ work/arch/arm/mach-shmobile/pm-sh73a0.c 2014-02-24 13:23:21.000000000 +0900
@@ -9,7 +9,7 @@
*/
#include <linux/suspend.h>
-#include <mach/common.h>
+#include "common.h"
#ifdef CONFIG_SUSPEND
static int sh73a0_enter_suspend(suspend_state_t suspend_state)
--- 0001/arch/arm/mach-shmobile/setup-sh73a0.c
+++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-02-24 13:20:41.000000000 +0900
@@ -33,10 +33,10 @@
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
-#include <mach/common.h>
+#include "dma-register.h"
+#include "irqs.h"
+#include "sh73a0.h"
+#include "common.h"
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
--- 0001/arch/arm/mach-shmobile/smp-sh73a0.c
+++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2014-02-24 13:21:54.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/sh73a0.h>
+#include "common.h"
+#include "sh73a0.h"
#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:41 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert EMEV2 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-emev2.c | 2 +-
arch/arm/mach-shmobile/setup-emev2.c | 4 ++--
arch/arm/mach-shmobile/smp-emev2.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-emev2.c
+++ work/arch/arm/mach-shmobile/clock-emev2.c 2014-02-24 13:28:21.000000000 +0900
@@ -21,7 +21,7 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
+#include "common.h"
#define EMEV2_SMU_BASE 0xe0110000
--- 0001/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-02-24 13:28:37.000000000 +0900
@@ -20,8 +20,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of_platform.h>
-#include <mach/common.h>
-#include <mach/emev2.h>
+#include "common.h"
+#include "emev2.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- 0001/arch/arm/mach-shmobile/smp-emev2.c
+++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-02-24 13:28:58.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/emev2.h>
+#include "common.h"
+#include "emev2.h"
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
@ 2014-02-24 5:41 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert EMEV2 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-emev2.c | 2 +-
arch/arm/mach-shmobile/setup-emev2.c | 4 ++--
arch/arm/mach-shmobile/smp-emev2.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-emev2.c
+++ work/arch/arm/mach-shmobile/clock-emev2.c 2014-02-24 13:28:21.000000000 +0900
@@ -21,7 +21,7 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
+#include "common.h"
#define EMEV2_SMU_BASE 0xe0110000
--- 0001/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-02-24 13:28:37.000000000 +0900
@@ -20,8 +20,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of_platform.h>
-#include <mach/common.h>
-#include <mach/emev2.h>
+#include "common.h"
+#include "emev2.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- 0001/arch/arm/mach-shmobile/smp-emev2.c
+++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-02-24 13:28:58.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/emev2.h>
+#include "common.h"
+#include "emev2.h"
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:41 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7740 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7740.c | 6 +++---
arch/arm/mach-shmobile/pm-r8a7740.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7740.c | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7740.c
+++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-02-24 13:31:41.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r8a7740.h>
+#include "clock.h"
+#include "common.h"
+#include "r8a7740.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
--- 0001/arch/arm/mach-shmobile/pm-r8a7740.c
+++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-02-24 13:32:24.000000000 +0900
@@ -10,8 +10,8 @@
*/
#include <linux/console.h>
#include <linux/suspend.h>
-#include <mach/pm-rmobile.h>
-#include <mach/common.h>
+#include "pm-rmobile.h"
+#include "common.h"
#ifdef CONFIG_PM
static int r8a7740_pd_a4s_suspend(void)
--- 0001/arch/arm/mach-shmobile/setup-r8a7740.c
+++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-02-24 13:31:18.000000000 +0900
@@ -31,11 +31,11 @@
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/dma-register.h>
-#include <mach/r8a7740.h>
-#include <mach/pm-rmobile.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
+#include "dma-register.h"
+#include "r8a7740.h"
+#include "pm-rmobile.h"
+#include "common.h"
+#include "irqs.h"
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
@ 2014-02-24 5:41 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7740 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7740.c | 6 +++---
arch/arm/mach-shmobile/pm-r8a7740.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7740.c | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7740.c
+++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-02-24 13:31:41.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r8a7740.h>
+#include "clock.h"
+#include "common.h"
+#include "r8a7740.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
--- 0001/arch/arm/mach-shmobile/pm-r8a7740.c
+++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-02-24 13:32:24.000000000 +0900
@@ -10,8 +10,8 @@
*/
#include <linux/console.h>
#include <linux/suspend.h>
-#include <mach/pm-rmobile.h>
-#include <mach/common.h>
+#include "pm-rmobile.h"
+#include "common.h"
#ifdef CONFIG_PM
static int r8a7740_pd_a4s_suspend(void)
--- 0001/arch/arm/mach-shmobile/setup-r8a7740.c
+++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-02-24 13:31:18.000000000 +0900
@@ -31,11 +31,11 @@
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/dma-register.h>
-#include <mach/r8a7740.h>
-#include <mach/pm-rmobile.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
+#include "dma-register.h"
+#include "r8a7740.h"
+#include "pm-rmobile.h"
+#include "common.h"
+#include "irqs.h"
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:41 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7778 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7778.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7778.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7778.c
+++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-02-24 13:38:19.000000000 +0900
@@ -39,8 +39,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)
--- 0001/arch/arm/mach-shmobile/setup-r8a7778.c
+++ work/arch/arm/mach-shmobile/setup-r8a7778.c 2014-02-24 13:37:06.000000000 +0900
@@ -37,9 +37,9 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.h>
-#include <mach/irqs.h>
-#include <mach/r8a7778.h>
-#include <mach/common.h>
+#include "irqs.h"
+#include "r8a7778.h"
+#include "common.h"
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
@ 2014-02-24 5:41 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7778 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7778.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7778.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7778.c
+++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-02-24 13:38:19.000000000 +0900
@@ -39,8 +39,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)
--- 0001/arch/arm/mach-shmobile/setup-r8a7778.c
+++ work/arch/arm/mach-shmobile/setup-r8a7778.c 2014-02-24 13:37:06.000000000 +0900
@@ -37,9 +37,9 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.h>
-#include <mach/irqs.h>
-#include <mach/r8a7778.h>
-#include <mach/common.h>
+#include "irqs.h"
+#include "r8a7778.h"
+#include "common.h"
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:42 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7779 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++--
arch/arm/mach-shmobile/pm-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/smp-r8a7779.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7779.c
+++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-02-24 13:40:01.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
/*
* MD1 = 1 MD1 = 0
--- 0001/arch/arm/mach-shmobile/pm-r8a7779.c
+++ work/arch/arm/mach-shmobile/pm-r8a7779.c 2014-02-24 13:40:40.000000000 +0900
@@ -19,9 +19,9 @@
#include <linux/interrupt.h>
#include <linux/console.h>
#include <asm/io.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7779.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7779.h"
/* SYSC */
#define SYSCIER 0x0c
--- 0001/arch/arm/mach-shmobile/setup-r8a7779.c
+++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2014-02-24 13:40:19.000000000 +0900
@@ -40,9 +40,9 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
-#include <mach/irqs.h>
-#include <mach/r8a7779.h>
-#include <mach/common.h>
+#include "irqs.h"
+#include "r8a7779.h"
+#include "common.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
--- 0001/arch/arm/mach-shmobile/smp-r8a7779.c
+++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-02-24 13:41:01.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7779.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7779.h"
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
@ 2014-02-24 5:42 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7779 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++--
arch/arm/mach-shmobile/pm-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/setup-r8a7779.c | 6 +++---
arch/arm/mach-shmobile/smp-r8a7779.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7779.c
+++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-02-24 13:40:01.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
/*
* MD1 = 1 MD1 = 0
--- 0001/arch/arm/mach-shmobile/pm-r8a7779.c
+++ work/arch/arm/mach-shmobile/pm-r8a7779.c 2014-02-24 13:40:40.000000000 +0900
@@ -19,9 +19,9 @@
#include <linux/interrupt.h>
#include <linux/console.h>
#include <asm/io.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7779.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7779.h"
/* SYSC */
#define SYSCIER 0x0c
--- 0001/arch/arm/mach-shmobile/setup-r8a7779.c
+++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2014-02-24 13:40:19.000000000 +0900
@@ -40,9 +40,9 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
-#include <mach/irqs.h>
-#include <mach/r8a7779.h>
-#include <mach/common.h>
+#include "irqs.h"
+#include "r8a7779.h"
+#include "common.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
--- 0001/arch/arm/mach-shmobile/smp-r8a7779.c
+++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-02-24 13:41:01.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7779.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7779.h"
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:42 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7790 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++---
arch/arm/mach-shmobile/pm-r8a7790.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7790.c | 8 ++++----
arch/arm/mach-shmobile/smp-r8a7790.c | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7790.c
+++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-02-24 13:44:02.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r8a7790.h>
+#include "clock.h"
+#include "common.h"
+#include "r8a7790.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0001/arch/arm/mach-shmobile/pm-r8a7790.c
+++ work/arch/arm/mach-shmobile/pm-r8a7790.c 2014-02-24 13:44:26.000000000 +0900
@@ -12,8 +12,8 @@
#include <linux/kernel.h>
#include <asm/io.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7790.h>
+#include "pm-rcar.h"
+#include "r8a7790.h"
/* SYSC */
#define SYSCIER 0x0c
--- 0001/arch/arm/mach-shmobile/setup-r8a7790.c
+++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-02-24 13:43:31.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/r8a7790.h>
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "r8a7790.h"
#include <asm/mach/arch.h>
/* Audio-DMAC */
--- 0001/arch/arm/mach-shmobile/smp-r8a7790.c
+++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-02-24 13:46:10.000000000 +0900
@@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7790.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7790.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
@ 2014-02-24 5:42 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7790 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++---
arch/arm/mach-shmobile/pm-r8a7790.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7790.c | 8 ++++----
arch/arm/mach-shmobile/smp-r8a7790.c | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7790.c
+++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-02-24 13:44:02.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r8a7790.h>
+#include "clock.h"
+#include "common.h"
+#include "r8a7790.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0001/arch/arm/mach-shmobile/pm-r8a7790.c
+++ work/arch/arm/mach-shmobile/pm-r8a7790.c 2014-02-24 13:44:26.000000000 +0900
@@ -12,8 +12,8 @@
#include <linux/kernel.h>
#include <asm/io.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7790.h>
+#include "pm-rcar.h"
+#include "r8a7790.h"
/* SYSC */
#define SYSCIER 0x0c
--- 0001/arch/arm/mach-shmobile/setup-r8a7790.c
+++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-02-24 13:43:31.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/r8a7790.h>
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "r8a7790.h"
#include <asm/mach/arch.h>
/* Audio-DMAC */
--- 0001/arch/arm/mach-shmobile/smp-r8a7790.c
+++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-02-24 13:46:10.000000000 +0900
@@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7790.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7790.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:42 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7791 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7791.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7791.c | 8 ++++----
arch/arm/mach-shmobile/smp-r8a7791.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7791.c
+++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-02-24 13:49:45.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0001/arch/arm/mach-shmobile/setup-r8a7791.c
+++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-02-24 13:49:04.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
+#include "common.h"
+#include "irqs.h"
+#include "r8a7791.h"
+#include "rcar-gen2.h"
#include <asm/mach/arch.h>
static const struct resource pfc_resources[] __initconst = {
--- 0001/arch/arm/mach-shmobile/smp-r8a7791.c
+++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-02-24 13:48:39.000000000 +0900
@@ -18,8 +18,8 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
-#include <mach/r8a7791.h>
+#include "common.h"
+#include "r8a7791.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
@ 2014-02-24 5:42 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r8a7791 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a7791.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a7791.c | 8 ++++----
arch/arm/mach-shmobile/smp-r8a7791.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a7791.c
+++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-02-24 13:49:45.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0001/arch/arm/mach-shmobile/setup-r8a7791.c
+++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-02-24 13:49:04.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
+#include "common.h"
+#include "irqs.h"
+#include "r8a7791.h"
+#include "rcar-gen2.h"
#include <asm/mach/arch.h>
static const struct resource pfc_resources[] __initconst = {
--- 0001/arch/arm/mach-shmobile/smp-r8a7791.c
+++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-02-24 13:48:39.000000000 +0900
@@ -18,8 +18,8 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
-#include <mach/r8a7791.h>
+#include "common.h"
+#include "r8a7791.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:42 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a73a4.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a73a4.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-02-24 13:53:46.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
#define CPG_BASE 0xe6150000
#define CPG_LEN 0x270
--- 0001/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2014-02-24 13:52:49.000000000 +0900
@@ -24,10 +24,10 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/r8a73a4.h>
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "r8a73a4.h"
#include <asm/mach/arch.h>
static const struct resource pfc_resources[] = {
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
@ 2014-02-24 5:42 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r8a73a4.c | 4 ++--
arch/arm/mach-shmobile/setup-r8a73a4.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-02-24 13:53:46.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
#define CPG_BASE 0xe6150000
#define CPG_LEN 0x270
--- 0001/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2014-02-24 13:52:49.000000000 +0900
@@ -24,10 +24,10 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/r8a73a4.h>
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "r8a73a4.h"
#include <asm/mach/arch.h>
static const struct resource pfc_resources[] = {
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:42 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r7s72100 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r7s72100.c | 4 ++--
arch/arm/mach-shmobile/setup-r7s72100.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r7s72100.c
+++ work/arch/arm/mach-shmobile/clock-r7s72100.c 2014-02-24 13:57:37.000000000 +0900
@@ -19,8 +19,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
-#include <mach/r7s72100.h>
+#include "common.h"
+#include "r7s72100.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010
--- 0001/arch/arm/mach-shmobile/setup-r7s72100.c
+++ work/arch/arm/mach-shmobile/setup-r7s72100.c 2014-02-24 13:56:17.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/of_platform.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r7s72100.h>
+#include "common.h"
+#include "irqs.h"
+#include "r7s72100.h"
#include <asm/mach/arch.h>
#define R7S72100_SCIF(index, baseaddr, irq) \
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
@ 2014-02-24 5:42 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert r7s72100 SoC code use of include files from
the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock-r7s72100.c | 4 ++--
arch/arm/mach-shmobile/setup-r7s72100.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock-r7s72100.c
+++ work/arch/arm/mach-shmobile/clock-r7s72100.c 2014-02-24 13:57:37.000000000 +0900
@@ -19,8 +19,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
-#include <mach/r7s72100.h>
+#include "common.h"
+#include "r7s72100.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010
--- 0001/arch/arm/mach-shmobile/setup-r7s72100.c
+++ work/arch/arm/mach-shmobile/setup-r7s72100.c 2014-02-24 13:56:17.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/of_platform.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r7s72100.h>
+#include "common.h"
+#include "irqs.h"
+#include "r7s72100.h"
#include <asm/mach/arch.h>
#define R7S72100_SCIF(index, baseaddr, irq) \
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 12/12] ARM: shmobile: Rework include path for common bits
2014-02-24 5:40 ` Magnus Damm
@ 2014-02-24 5:42 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert remaining shared mach-shmobile code use of include
files from the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock.c | 4 ++--
arch/arm/mach-shmobile/console.c | 2 +-
arch/arm/mach-shmobile/platsmp-apmu.c | 2 +-
arch/arm/mach-shmobile/platsmp-scu.c | 2 +-
arch/arm/mach-shmobile/platsmp.c | 2 +-
arch/arm/mach-shmobile/pm-rcar.c | 2 +-
arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock.c
+++ work/arch/arm/mach-shmobile/clock.c 2014-02-24 13:59:37.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/init.h>
#include <linux/sh_clk.h>
#include <linux/export.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
{
--- 0001/arch/arm/mach-shmobile/console.c
+++ work/arch/arm/mach-shmobile/console.c 2014-02-24 13:59:57.000000000 +0900
@@ -19,7 +19,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <mach/common.h>
+#include "common.h"
#include <asm/mach/map.h>
void __init shmobile_setup_console(void)
--- 0001/arch/arm/mach-shmobile/platsmp-apmu.c
+++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2014-02-24 14:00:18.000000000 +0900
@@ -16,7 +16,7 @@
#include <asm/cacheflush.h>
#include <asm/cp15.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
static struct {
void __iomem *iomem;
--- 0001/arch/arm/mach-shmobile/platsmp-scu.c
+++ work/arch/arm/mach-shmobile/platsmp-scu.c 2014-02-24 14:00:26.000000000 +0900
@@ -15,7 +15,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
-#include <mach/common.h>
+#include "common.h"
static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)
--- 0001/arch/arm/mach-shmobile/platsmp.c
+++ work/arch/arm/mach-shmobile/platsmp.c 2014-02-24 14:00:07.000000000 +0900
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
extern unsigned long shmobile_smp_fn[];
extern unsigned long shmobile_smp_arg[];
--- 0001/arch/arm/mach-shmobile/pm-rcar.c
+++ work/arch/arm/mach-shmobile/pm-rcar.c 2014-02-24 14:00:42.000000000 +0900
@@ -13,7 +13,7 @@
#include <linux/mm.h>
#include <linux/spinlock.h>
#include <asm/io.h>
-#include <mach/pm-rcar.h>
+#include "pm-rcar.h"
static void __iomem *rcar_sysc_base;
--- 0001/arch/arm/mach-shmobile/pm-rmobile.c
+++ work/arch/arm/mach-shmobile/pm-rmobile.c 2014-02-24 14:00:53.000000000 +0900
@@ -17,7 +17,7 @@
#include <linux/pm.h>
#include <linux/pm_clock.h>
#include <asm/io.h>
-#include <mach/pm-rmobile.h>
+#include "pm-rmobile.h"
/* SYSC */
#define SPDCR IOMEM(0xe6180008)
--- 0001/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-02-24 14:01:09.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <mach/common.h>
-#include <mach/rcar-gen2.h>
+#include "common.h"
+#include "rcar-gen2.h"
#include <asm/mach/arch.h>
#define MODEMR 0xe6160060
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 12/12] ARM: shmobile: Rework include path for common bits
@ 2014-02-24 5:42 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 5:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Convert remaining shared mach-shmobile code use of include
files from the style <mach/something.h> to "something.h".
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/clock.c | 4 ++--
arch/arm/mach-shmobile/console.c | 2 +-
arch/arm/mach-shmobile/platsmp-apmu.c | 2 +-
arch/arm/mach-shmobile/platsmp-scu.c | 2 +-
arch/arm/mach-shmobile/platsmp.c | 2 +-
arch/arm/mach-shmobile/pm-rcar.c | 2 +-
arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
--- 0001/arch/arm/mach-shmobile/clock.c
+++ work/arch/arm/mach-shmobile/clock.c 2014-02-24 13:59:37.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/init.h>
#include <linux/sh_clk.h>
#include <linux/export.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
{
--- 0001/arch/arm/mach-shmobile/console.c
+++ work/arch/arm/mach-shmobile/console.c 2014-02-24 13:59:57.000000000 +0900
@@ -19,7 +19,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <mach/common.h>
+#include "common.h"
#include <asm/mach/map.h>
void __init shmobile_setup_console(void)
--- 0001/arch/arm/mach-shmobile/platsmp-apmu.c
+++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2014-02-24 14:00:18.000000000 +0900
@@ -16,7 +16,7 @@
#include <asm/cacheflush.h>
#include <asm/cp15.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
static struct {
void __iomem *iomem;
--- 0001/arch/arm/mach-shmobile/platsmp-scu.c
+++ work/arch/arm/mach-shmobile/platsmp-scu.c 2014-02-24 14:00:26.000000000 +0900
@@ -15,7 +15,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
-#include <mach/common.h>
+#include "common.h"
static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)
--- 0001/arch/arm/mach-shmobile/platsmp.c
+++ work/arch/arm/mach-shmobile/platsmp.c 2014-02-24 14:00:07.000000000 +0900
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
extern unsigned long shmobile_smp_fn[];
extern unsigned long shmobile_smp_arg[];
--- 0001/arch/arm/mach-shmobile/pm-rcar.c
+++ work/arch/arm/mach-shmobile/pm-rcar.c 2014-02-24 14:00:42.000000000 +0900
@@ -13,7 +13,7 @@
#include <linux/mm.h>
#include <linux/spinlock.h>
#include <asm/io.h>
-#include <mach/pm-rcar.h>
+#include "pm-rcar.h"
static void __iomem *rcar_sysc_base;
--- 0001/arch/arm/mach-shmobile/pm-rmobile.c
+++ work/arch/arm/mach-shmobile/pm-rmobile.c 2014-02-24 14:00:53.000000000 +0900
@@ -17,7 +17,7 @@
#include <linux/pm.h>
#include <linux/pm_clock.h>
#include <asm/io.h>
-#include <mach/pm-rmobile.h>
+#include "pm-rmobile.h"
/* SYSC */
#define SPDCR IOMEM(0xe6180008)
--- 0001/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-02-24 14:01:09.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <mach/common.h>
-#include <mach/rcar-gen2.h>
+#include "common.h"
+#include "rcar-gen2.h"
#include <asm/mach/arch.h>
#define MODEMR 0xe6160060
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 01/12] ARM: shmobile: Add temporary include workaround
2014-02-24 5:41 ` Magnus Damm
@ 2014-02-24 6:25 ` Magnus Damm
-1 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 6:25 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 24, 2014 at 2:41 PM, Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Add temporary include path in the mach-shmobile Makefile to
> aid coversion from using <mach/something.h> to "something.h"
> in the source files.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
> arch/arm/mach-shmobile/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> --- 0001/arch/arm/mach-shmobile/Makefile
> +++ work/arch/arm/mach-shmobile/Makefile 2014-02-24 13:03:32.000000000 +0900
> @@ -4,6 +4,8 @@
>
> ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
>
> +ccflags-y := -I$(srctree)/arch/arm/mach-shmobile/include/mach
> +
> # Common objects
> obj-y := timer.o console.o
>
Just noticed, I managed to send an old version of this patch. The
above should be "ccflags-y += ..." which is needed for multiplatform,
Cheers,
/ magnus
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 01/12] ARM: shmobile: Add temporary include workaround
@ 2014-02-24 6:25 ` Magnus Damm
0 siblings, 0 replies; 32+ messages in thread
From: Magnus Damm @ 2014-02-24 6:25 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 24, 2014 at 2:41 PM, Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Add temporary include path in the mach-shmobile Makefile to
> aid coversion from using <mach/something.h> to "something.h"
> in the source files.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
> arch/arm/mach-shmobile/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> --- 0001/arch/arm/mach-shmobile/Makefile
> +++ work/arch/arm/mach-shmobile/Makefile 2014-02-24 13:03:32.000000000 +0900
> @@ -4,6 +4,8 @@
>
> ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
>
> +ccflags-y := -I$(srctree)/arch/arm/mach-shmobile/include/mach
> +
> # Common objects
> obj-y := timer.o console.o
>
Just noticed, I managed to send an old version of this patch. The
above should be "ccflags-y += ..." which is needed for multiplatform,
Cheers,
/ magnus
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 00/12] ARM: shmobile: Rework include path for SoC files
2014-02-24 5:40 ` Magnus Damm
@ 2014-03-07 2:38 ` Simon Horman
-1 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-03-07 2:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 24, 2014 at 02:40:58PM +0900, Magnus Damm wrote:
> ARM: shmobile: Rework include path for SoC files
>
> [PATCH 01/12] ARM: shmobile: Add temporary include workaround
> [PATCH 02/12] ARM: shmobile: Rework include path for sh7372
> [PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
> [PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
> [PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
> [PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
> [PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
> [PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
> [PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
> [PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
> [PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
> [PATCH 12/12] ARM: shmobile: Rework include path for common bits
>
> Start converting the mach-shmobile subarchitecture from <mach/something.h>
> to "something.h". This series covers shared code base and SoC code,
> however actual header files are not moved yet. Upcoming series that
> depend on this one will have to convert board code as well. When SoCs
> code and board code have been converted then actual header files can
> be moved and temporary include path workarounds can be removed.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
Thanks, I have queued this up.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 00/12] ARM: shmobile: Rework include path for SoC files
@ 2014-03-07 2:38 ` Simon Horman
0 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-03-07 2:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 24, 2014 at 02:40:58PM +0900, Magnus Damm wrote:
> ARM: shmobile: Rework include path for SoC files
>
> [PATCH 01/12] ARM: shmobile: Add temporary include workaround
> [PATCH 02/12] ARM: shmobile: Rework include path for sh7372
> [PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
> [PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
> [PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
> [PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
> [PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
> [PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
> [PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
> [PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
> [PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
> [PATCH 12/12] ARM: shmobile: Rework include path for common bits
>
> Start converting the mach-shmobile subarchitecture from <mach/something.h>
> to "something.h". This series covers shared code base and SoC code,
> however actual header files are not moved yet. Upcoming series that
> depend on this one will have to convert board code as well. When SoCs
> code and board code have been converted then actual header files can
> be moved and temporary include path workarounds can be removed.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
Thanks, I have queued this up.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 00/12] ARM: shmobile: Rework include path for SoC files
2014-03-07 2:38 ` Simon Horman
@ 2014-03-10 8:47 ` Simon Horman
-1 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-03-10 8:47 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 07, 2014 at 11:38:16AM +0900, Simon Horman wrote:
> On Mon, Feb 24, 2014 at 02:40:58PM +0900, Magnus Damm wrote:
> > ARM: shmobile: Rework include path for SoC files
> >
> > [PATCH 01/12] ARM: shmobile: Add temporary include workaround
> > [PATCH 02/12] ARM: shmobile: Rework include path for sh7372
> > [PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
> > [PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
> > [PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
> > [PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
> > [PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
> > [PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
> > [PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
> > [PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
> > [PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
> > [PATCH 12/12] ARM: shmobile: Rework include path for common bits
> >
> > Start converting the mach-shmobile subarchitecture from <mach/something.h>
> > to "something.h". This series covers shared code base and SoC code,
> > however actual header files are not moved yet. Upcoming series that
> > depend on this one will have to convert board code as well. When SoCs
> > code and board code have been converted then actual header files can
> > be moved and temporary include path workarounds can be removed.
> >
> > Signed-off-by: Magnus Damm <damm@opensource.se>
>
> Thanks, I have queued this up.
As Olof has indicated that he is not happy with the first patch of
the series I have dropped the entire series for now.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 00/12] ARM: shmobile: Rework include path for SoC files
@ 2014-03-10 8:47 ` Simon Horman
0 siblings, 0 replies; 32+ messages in thread
From: Simon Horman @ 2014-03-10 8:47 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 07, 2014 at 11:38:16AM +0900, Simon Horman wrote:
> On Mon, Feb 24, 2014 at 02:40:58PM +0900, Magnus Damm wrote:
> > ARM: shmobile: Rework include path for SoC files
> >
> > [PATCH 01/12] ARM: shmobile: Add temporary include workaround
> > [PATCH 02/12] ARM: shmobile: Rework include path for sh7372
> > [PATCH 03/12] ARM: shmobile: Rework include path for sh73a0
> > [PATCH 04/12] ARM: shmobile: Rework include path for EMEV2
> > [PATCH 05/12] ARM: shmobile: Rework include path for r8a7740
> > [PATCH 06/12] ARM: shmobile: Rework include path for r8a7778
> > [PATCH 07/12] ARM: shmobile: Rework include path for r8a7779
> > [PATCH 08/12] ARM: shmobile: Rework include path for r8a7790
> > [PATCH 09/12] ARM: shmobile: Rework include path for r8a7791
> > [PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4
> > [PATCH 11/12] ARM: shmobile: Rework include path for r7s72100
> > [PATCH 12/12] ARM: shmobile: Rework include path for common bits
> >
> > Start converting the mach-shmobile subarchitecture from <mach/something.h>
> > to "something.h". This series covers shared code base and SoC code,
> > however actual header files are not moved yet. Upcoming series that
> > depend on this one will have to convert board code as well. When SoCs
> > code and board code have been converted then actual header files can
> > be moved and temporary include path workarounds can be removed.
> >
> > Signed-off-by: Magnus Damm <damm@opensource.se>
>
> Thanks, I have queued this up.
As Olof has indicated that he is not happy with the first patch of
the series I have dropped the entire series for now.
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2014-03-10 8:47 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-24 5:40 [PATCH 00/12] ARM: shmobile: Rework include path for SoC files Magnus Damm
2014-02-24 5:40 ` Magnus Damm
2014-02-24 5:41 ` [PATCH 01/12] ARM: shmobile: Add temporary include workaround Magnus Damm
2014-02-24 5:41 ` Magnus Damm
2014-02-24 6:25 ` Magnus Damm
2014-02-24 6:25 ` Magnus Damm
2014-02-24 5:41 ` [PATCH 02/12] ARM: shmobile: Rework include path for sh7372 Magnus Damm
2014-02-24 5:41 ` Magnus Damm
2014-02-24 5:41 ` [PATCH 03/12] ARM: shmobile: Rework include path for sh73a0 Magnus Damm
2014-02-24 5:41 ` Magnus Damm
2014-02-24 5:41 ` [PATCH 04/12] ARM: shmobile: Rework include path for EMEV2 Magnus Damm
2014-02-24 5:41 ` Magnus Damm
2014-02-24 5:41 ` [PATCH 05/12] ARM: shmobile: Rework include path for r8a7740 Magnus Damm
2014-02-24 5:41 ` Magnus Damm
2014-02-24 5:41 ` [PATCH 06/12] ARM: shmobile: Rework include path for r8a7778 Magnus Damm
2014-02-24 5:41 ` Magnus Damm
2014-02-24 5:42 ` [PATCH 07/12] ARM: shmobile: Rework include path for r8a7779 Magnus Damm
2014-02-24 5:42 ` Magnus Damm
2014-02-24 5:42 ` [PATCH 08/12] ARM: shmobile: Rework include path for r8a7790 Magnus Damm
2014-02-24 5:42 ` Magnus Damm
2014-02-24 5:42 ` [PATCH 09/12] ARM: shmobile: Rework include path for r8a7791 Magnus Damm
2014-02-24 5:42 ` Magnus Damm
2014-02-24 5:42 ` [PATCH 10/12] ARM: shmobile: Rework include path for r8a73a4 Magnus Damm
2014-02-24 5:42 ` Magnus Damm
2014-02-24 5:42 ` [PATCH 11/12] ARM: shmobile: Rework include path for r7s72100 Magnus Damm
2014-02-24 5:42 ` Magnus Damm
2014-02-24 5:42 ` [PATCH 12/12] ARM: shmobile: Rework include path for common bits Magnus Damm
2014-02-24 5:42 ` Magnus Damm
2014-03-07 2:38 ` [PATCH 00/12] ARM: shmobile: Rework include path for SoC files Simon Horman
2014-03-07 2:38 ` Simon Horman
2014-03-10 8:47 ` Simon Horman
2014-03-10 8:47 ` Simon Horman
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.