Skip to contentSkip to conversation

ARM: shmobile: Rework include path for SoC files

PATCH Superseded Magnus Damm 2 participants 16 messages Feb 24, 2014 – Mar 10, 2014

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

cover ARM: shmobile: Rework include path for SoC files

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 <[email protected]>

---

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(-)
author maintainer
#1 lore raw

PATCH 1/12 ARM: shmobile: Add temporary include workaround

From: Magnus Damm <[email protected]>

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 <[email protected]>

---

 arch/arm/mach-shmobile/Makefile |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-shmobile/Makefile +2 -0
@@ -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
author maintainer
#2 lore raw

PATCH 1/12 ARM: shmobile: Add temporary include workaround

Quoted 15 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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 <[email protected]>

---

 arch/arm/mach-shmobile/Makefile |    2 ++
 1 file changed, 2 insertions(+)

arch/arm/mach-shmobile/Makefile 2014-02-24 13:03:32.000000000 +0900 line 11

Quoted 8 lines
arch/arm/mach-shmobile/Makefile 2014-02-24 13:03:32.000000000 +0900 renamed from arch/arm/mach-shmobile/Makefile +2 -0
@@ -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

author maintainer
#3 lore raw

PATCH 2/12 ARM: shmobile: Rework include path for sh7372

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert sh7372 SoC code use of include files from
the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock-sh7372.c +2 -2
@@ -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)
arch/arm/mach-shmobile/intc-sh7372.c +2 -2
@@ -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>
arch/arm/mach-shmobile/pm-sh7372.c +3 -3
@@ -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)
arch/arm/mach-shmobile/setup-sh7372.c +4 -4
@@ -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>
author maintainer
#4 lore raw

PATCH 3/12 ARM: shmobile: Rework include path for sh73a0

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert sh73a0 SoC code use of include files from
the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock-sh73a0.c +2 -2
@@ -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)
arch/arm/mach-shmobile/intc-sh73a0.c +3 -3
@@ -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>
arch/arm/mach-shmobile/pm-sh73a0.c +1 -1
@@ -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)
arch/arm/mach-shmobile/setup-sh73a0.c +4 -4
@@ -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>
arch/arm/mach-shmobile/smp-sh73a0.c +2 -2
@@ -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>
author maintainer
#5 lore raw

PATCH 4/12 ARM: shmobile: Rework include path for EMEV2

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert EMEV2 SoC code use of include files from
the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock-emev2.c +1 -1
@@ -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
arch/arm/mach-shmobile/setup-emev2.c +2 -2
@@ -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>
arch/arm/mach-shmobile/smp-emev2.c +2 -2
@@ -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>
author maintainer
#6 lore raw

PATCH 5/12 ARM: shmobile: Rework include path for r8a7740

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert r8a7740 SoC code use of include files from the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock-r8a7740.c +3 -3
@@ -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 |
arch/arm/mach-shmobile/pm-r8a7740.c +2 -2
@@ -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)
arch/arm/mach-shmobile/setup-r8a7740.c +5 -5
@@ -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>
author maintainer
#7 lore raw

PATCH 6/12 ARM: shmobile: Rework include path for r8a7778

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert r8a7778 SoC code use of include files from the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/clock-r8a7778.c |    4 ++--
 arch/arm/mach-shmobile/setup-r8a7778.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-shmobile/clock-r8a7778.c +2 -2
@@ -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)
arch/arm/mach-shmobile/setup-r8a7778.c +3 -3
@@ -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>
author maintainer
#8 lore raw

PATCH 7/12 ARM: shmobile: Rework include path for r8a7779

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert r8a7779 SoC code use of include files from the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock-r8a7779.c +2 -2
@@ -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
arch/arm/mach-shmobile/pm-r8a7779.c +3 -3
@@ -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
arch/arm/mach-shmobile/setup-r8a7779.c +3 -3
@@ -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>
arch/arm/mach-shmobile/smp-r8a7779.c +3 -3
@@ -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>
author maintainer
#9 lore raw

PATCH 8/12 ARM: shmobile: Rework include path for r8a7790

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert r8a7790 SoC code use of include files from the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock-r8a7790.c +3 -3
@@ -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
arch/arm/mach-shmobile/pm-r8a7790.c +2 -2
@@ -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
arch/arm/mach-shmobile/setup-r8a7790.c +4 -4
@@ -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 */
arch/arm/mach-shmobile/smp-r8a7790.c +3 -3
@@ -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
author maintainer
#10 lore raw

PATCH 9/12 ARM: shmobile: Rework include path for r8a7791

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert r8a7791 SoC code use of include files from the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock-r8a7791.c +2 -2
@@ -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
arch/arm/mach-shmobile/setup-r8a7791.c +4 -4
@@ -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 = {
arch/arm/mach-shmobile/smp-r8a7791.c +2 -2
@@ -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
author maintainer
#11 lore raw

PATCH 10/12 ARM: shmobile: Rework include path for r8a73a4

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/clock-r8a73a4.c |    4 ++--
 arch/arm/mach-shmobile/setup-r8a73a4.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-shmobile/clock-r8a73a4.c +2 -2
@@ -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
arch/arm/mach-shmobile/setup-r8a73a4.c +4 -4
@@ -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[] = {
author maintainer
#12 lore raw

PATCH 11/12 ARM: shmobile: Rework include path for r7s72100

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert r7s72100 SoC code use of include files from the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/clock-r7s72100.c |    4 ++--
 arch/arm/mach-shmobile/setup-r7s72100.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-shmobile/clock-r7s72100.c +2 -2
@@ -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
arch/arm/mach-shmobile/setup-r7s72100.c +3 -3
@@ -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)				\
author maintainer
#13 lore raw

PATCH 12/12 ARM: shmobile: Rework include path for common bits

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Convert remaining shared mach-shmobile code use of include files from the style <mach/something.h> to "something.h".

Signed-off-by Magnus Damm <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/clock.c +2 -2
@@ -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)
 {
arch/arm/mach-shmobile/console.c +1 -1
@@ -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)
arch/arm/mach-shmobile/platsmp-apmu.c +1 -1
@@ -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;
arch/arm/mach-shmobile/platsmp-scu.c +1 -1
@@ -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)
arch/arm/mach-shmobile/platsmp.c +1 -1
@@ -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[];
arch/arm/mach-shmobile/pm-rcar.c +1 -1
@@ -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;
arch/arm/mach-shmobile/pm-rmobile.c +1 -1
@@ -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)
arch/arm/mach-shmobile/setup-rcar-gen2.c +2 -2
@@ -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
#14 lore raw

cover ARM: shmobile: Rework include path for SoC files

In reply to Magnus Damm
Quoted 15 lines · Magnus Damm

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

Quoted 8 lines

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 <[email protected]>

Thanks, I have queued this up.

#15 lore raw

cover ARM: shmobile: Rework include path for SoC files

Quoted 23 lines · Simon Horman
Quoted 22 lines · Magnus Damm

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.

Quoted 3 lines
Quoted 1 line
Signed-off-by Magnus Damm <[email protected]>

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.