Skip to contentSkip to conversation

ARM: make mach/*.h headers more local

PATCH New Arnd Bergmann 6 participants 13 messages Nov 30, 2015 – Dec 3, 2015

Subsystems (5)
Arm (32-bit) Arm sub-architectures Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support OMAP1 support +1 more subsystems
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

cover ARM: make mach/*.h headers more local

I've already posted the mach-pxa cleanup along the same lines, here is another bunch of patches. I'd like to put them into the next/multiplatform branch in arm-soc.

They come from an old script of mine to look for headers that are not used by drivers, and I've done thousands of randconfig builds with them applied, so I'm rather sure that they are all harmless.

Arnd Bergmann (7):
ARM: omap1: make headers more local
ARM: ks8695: make headers more local
ARM: davinci: make headers more local
ARM: iop13xx: make headers more local
ARM: w90x900: make headers more local
ARM: mvebu: remove unused mach/gpio.h
ARM: netx: remove unused mach/param.h

 arch/arm/mach-davinci/board-da830-evm.c            |  2 +-
 arch/arm/mach-davinci/board-da850-evm.c            |  4 +-
 arch/arm/mach-davinci/board-mityomapl138.c         |  2 +-
 arch/arm/mach-davinci/board-omapl138-hawk.c        |  2 +-
 arch/arm/mach-davinci/clock.c                      |  2 +-
 arch/arm/mach-davinci/cp_intc.c                    |  2 +-
 arch/arm/mach-davinci/{include/mach => }/cp_intc.h |  0
 arch/arm/mach-davinci/cpuidle.c                    |  4 +-
 arch/arm/mach-davinci/{include/mach => }/cpuidle.h |  0
 arch/arm/mach-davinci/da830.c                      |  2 +-
 arch/arm/mach-davinci/da850.c                      |  2 +-
 arch/arm/mach-davinci/da8xx-dt.c                   |  2 +-
 arch/arm/mach-davinci/{include/mach => }/ddr2.h    |  0
 arch/arm/mach-davinci/devices-da8xx.c              |  4 +-
 arch/arm/mach-davinci/dm355.c                      |  2 +-
 arch/arm/mach-davinci/dm365.c                      |  2 +-
 arch/arm/mach-davinci/dm644x.c                     |  2 +-
 arch/arm/mach-davinci/dm646x.c                     |  2 +-
 arch/arm/mach-davinci/pm.c                         |  2 +-
 arch/arm/mach-davinci/psc.c                        |  2 +-
 arch/arm/mach-davinci/{include/mach => }/psc.h     |  0
 arch/arm/mach-davinci/sleep.S                      |  4 +-
 arch/arm/mach-davinci/sram.c                       |  2 +-
 arch/arm/mach-davinci/{include/mach => }/sram.h    |  0
 arch/arm/mach-iop13xx/include/mach/pci.h           | 57 ---------------------
 arch/arm/mach-iop13xx/iq81340mc.c                  |  2 +-
 arch/arm/mach-iop13xx/iq81340sc.c                  |  2 +-
 arch/arm/mach-iop13xx/irq.c                        |  2 +-
 arch/arm/mach-iop13xx/{include/mach => }/msi.h     |  0
 arch/arm/mach-iop13xx/pci.c                        |  2 +-
 arch/arm/mach-iop13xx/pci.h                        | 58 ++++++++++++++++++++++
 arch/arm/mach-ks8695/board-acs5k.c                 |  2 +-
 arch/arm/mach-ks8695/board-dsm320.c                |  2 +-
 arch/arm/mach-ks8695/board-micrel.c                |  2 +-
 arch/arm/mach-ks8695/board-og.c                    |  2 +-
 arch/arm/mach-ks8695/board-sg.c                    |  2 +-
 arch/arm/mach-ks8695/cpu.c                         |  2 +-
 arch/arm/mach-ks8695/devices.c                     |  6 +--
 arch/arm/mach-ks8695/{include/mach => }/devices.h  |  0
 arch/arm/mach-ks8695/pci.c                         |  4 +-
 .../arm/mach-ks8695/{include/mach => }/regs-hpna.h |  0
 arch/arm/mach-ks8695/{include/mach => }/regs-lan.h |  0
 arch/arm/mach-ks8695/{include/mach => }/regs-mem.h |  0
 arch/arm/mach-ks8695/{include/mach => }/regs-pci.h |  0
 arch/arm/mach-ks8695/{include/mach => }/regs-sys.h |  0
 arch/arm/mach-ks8695/{include/mach => }/regs-wan.h |  0
 arch/arm/mach-mvebu/include/mach/gpio.h            |  1 -
 arch/arm/mach-netx/include/mach/param.h            | 18 -------
 arch/arm/mach-omap1/board-ams-delta.c              |  2 +-
 arch/arm/mach-omap1/board-fsample.c                |  2 +-
 arch/arm/mach-omap1/board-h2.c                     |  2 +-
 arch/arm/mach-omap1/board-h3.c                     |  2 +-
 arch/arm/mach-omap1/board-innovator.c              |  2 +-
 arch/arm/mach-omap1/board-osk.c                    |  2 +-
 arch/arm/mach-omap1/board-palmte.c                 |  2 +-
 arch/arm/mach-omap1/board-palmtt.c                 |  2 +-
 arch/arm/mach-omap1/board-palmz71.c                |  2 +-
 arch/arm/mach-omap1/board-perseus2.c               |  2 +-
 arch/arm/mach-omap1/board-sx1-mmc.c                |  2 +-
 arch/arm/mach-omap1/board-sx1.c                    |  4 +-
 arch/arm/mach-omap1/{include/mach => }/board-sx1.h |  0
 arch/arm/mach-omap1/{include/mach => }/camera.h    |  0
 arch/arm/mach-omap1/devices.c                      |  2 +-
 arch/arm/mach-omap1/flash.c                        |  2 +-
 arch/arm/mach-omap1/{include/mach => }/flash.h     |  0
 arch/arm/mach-w90x900/cpu.c                        |  4 +-
 .../arm/mach-w90x900/{include/mach => }/regs-ebi.h |  0
 .../arm/mach-w90x900/{include/mach => }/regs-gcr.h |  0
 .../mach-w90x900/{include/mach => }/regs-timer.h   |  0
 .../arm/mach-w90x900/{include/mach => }/regs-usb.h |  0
 arch/arm/mach-w90x900/time.c                       |  2 +-
 71 files changed, 114 insertions(+), 132 deletions(-)
 rename arch/arm/mach-davinci/{include/mach => }/cp_intc.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/cpuidle.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/ddr2.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/psc.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/sram.h (100%)
 delete mode 100644 arch/arm/mach-iop13xx/include/mach/pci.h
 rename arch/arm/mach-iop13xx/{include/mach => }/msi.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/devices.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-lan.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-mem.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-pci.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-sys.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-wan.h (100%)
 delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-netx/include/mach/param.h
 rename arch/arm/mach-omap1/{include/mach => }/board-sx1.h (100%)
 rename arch/arm/mach-omap1/{include/mach => }/camera.h (100%)
 rename arch/arm/mach-omap1/{include/mach => }/flash.h (100%)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-ebi.h (100%)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-gcr.h (100%)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-timer.h (100%)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-usb.h (100%)
Signature · 1 line
2.1.0.rc2
author
#1 lore raw

PATCH 1/7 ARM: omap1: make headers more local

Some header files are never included outside of a mach-omap1 directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-omap1/board-ams-delta.c              | 2 +-
 arch/arm/mach-omap1/board-fsample.c                | 2 +-
 arch/arm/mach-omap1/board-h2.c                     | 2 +-
 arch/arm/mach-omap1/board-h3.c                     | 2 +-
 arch/arm/mach-omap1/board-innovator.c              | 2 +-
 arch/arm/mach-omap1/board-osk.c                    | 2 +-
 arch/arm/mach-omap1/board-palmte.c                 | 2 +-
 arch/arm/mach-omap1/board-palmtt.c                 | 2 +-
 arch/arm/mach-omap1/board-palmz71.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c               | 2 +-
 arch/arm/mach-omap1/board-sx1-mmc.c                | 2 +-
 arch/arm/mach-omap1/board-sx1.c                    | 4 ++--
 arch/arm/mach-omap1/{include/mach => }/board-sx1.h | 0
 arch/arm/mach-omap1/{include/mach => }/camera.h    | 0
 arch/arm/mach-omap1/devices.c                      | 2 +-
 arch/arm/mach-omap1/flash.c                        | 2 +-
 arch/arm/mach-omap1/{include/mach => }/flash.h     | 0
 17 files changed, 15 insertions(+), 15 deletions(-)
 rename arch/arm/mach-omap1/{include/mach => }/board-sx1.h (100%)
 rename arch/arm/mach-omap1/{include/mach => }/camera.h (100%)
 rename arch/arm/mach-omap1/{include/mach => }/flash.h (100%)
arch/arm/mach-omap1/board-ams-delta.c +1 -1
index a95499ea8706..9fc70978823b 100644
@@ -41,7 +41,7 @@
 
 #include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>
-#include <mach/camera.h>
+#include "camera.h"
 #include <mach/usb.h>
 
 #include "iomap.h"
arch/arm/mach-omap1/board-fsample.c +1 -1
index 0fb51d22c8b5..fad95b74bb65 100644
@@ -29,7 +29,7 @@
 
 #include <mach/tc.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <linux/platform_data/keypad-omap.h>
 
 #include <mach/hardware.h>
arch/arm/mach-omap1/board-h2.c +1 -1
index 8340d684d8b6..cd146ed0538d 100644
@@ -42,7 +42,7 @@
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 #include <mach/hardware.h>
 #include <mach/usb.h>
arch/arm/mach-omap1/board-h3.c +1 -1
index 086ff34e072b..f7c8c63dd532 100644
@@ -44,7 +44,7 @@
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <linux/omap-dma.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
arch/arm/mach-omap1/board-innovator.c +1 -1
index ed4e045c2ad8..ae90bd02b3bf 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-osk.c +1 -1
index 0efd165b8227..209aecb0df68 100644
@@ -46,7 +46,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/tc.h>
arch/arm/mach-omap1/board-palmte.c +1 -1
index 1142ae431fe0..e5288cda1a6a 100644
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/tc.h>
 #include <linux/omap-dma.h>
arch/arm/mach-omap1/board-palmtt.c +1 -1
index 54a547a96950..d672495f7441 100644
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
arch/arm/mach-omap1/board-palmz71.c +1 -1
index 87ec04ae40dd..aaf741b0aff6 100644
@@ -36,7 +36,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
arch/arm/mach-omap1/board-perseus2.c +1 -1
index 3d76f05407f0..150b57ba42bf 100644
@@ -30,7 +30,7 @@
 
 #include <mach/tc.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 #include <mach/hardware.h>
arch/arm/mach-omap1/board-sx1-mmc.c +1 -1
index 4fcf19c78a08..a9373570bbb1 100644
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 
 #include <mach/hardware.h>
-#include <mach/board-sx1.h>
+#include "board-sx1.h"
 
 #include "mmc.h"
arch/arm/mach-omap1/board-sx1.c +2 -2
index 939991ea33d5..6c482254b37c 100644
@@ -34,11 +34,11 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
-#include <mach/board-sx1.h>
+#include "board-sx1.h"
 
 #include <mach/hardware.h>
 #include <mach/usb.h>
arch/arm/mach-omap1/board-sx1.h renamed from arch/arm/mach-omap1/include/mach/board-sx1.h +0 -0
similarity index 100%
rename from arch/arm/mach-omap1/include/mach/board-sx1.h
rename to arch/arm/mach-omap1/board-sx1.h
arch/arm/mach-omap1/camera.h renamed from arch/arm/mach-omap1/include/mach/camera.h +0 -0
similarity index 100%
rename from arch/arm/mach-omap1/include/mach/camera.h
rename to arch/arm/mach-omap1/camera.h
arch/arm/mach-omap1/devices.c +1 -1
index 325e6030095e..263c07a566cb 100644
@@ -25,7 +25,7 @@
 #include <mach/mux.h>
 
 #include <mach/omap7xx.h>
-#include <mach/camera.h>
+#include "camera.h"
 #include <mach/hardware.h>
 
 #include "common.h"
arch/arm/mach-omap1/flash.c +1 -1
index b3fb531af94e..99cda402e1e2 100644
@@ -11,7 +11,7 @@
 #include <linux/mtd/map.h>
 
 #include <mach/tc.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 #include <mach/hardware.h>
arch/arm/mach-omap1/flash.h renamed from arch/arm/mach-omap1/include/mach/flash.h +0 -0
similarity index 100%
rename from arch/arm/mach-omap1/include/mach/flash.h
rename to arch/arm/mach-omap1/flash.h
Signature · 1 line
2.1.0.rc2
reviewer
#2 lore raw

PATCH 1/7 ARM: omap1: make headers more local

Quoted 19 lines · Arnd Bergmann

Some header files are never included outside of a mach-omap1 directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-omap1/board-ams-delta.c              | 2 +-
 arch/arm/mach-omap1/board-fsample.c                | 2 +-
 arch/arm/mach-omap1/board-h2.c                     | 2 +-
 arch/arm/mach-omap1/board-h3.c                     | 2 +-
 arch/arm/mach-omap1/board-innovator.c              | 2 +-
 arch/arm/mach-omap1/board-osk.c                    | 2 +-
 arch/arm/mach-omap1/board-palmte.c                 | 2 +-
 arch/arm/mach-omap1/board-palmtt.c                 | 2 +-
 arch/arm/mach-omap1/board-palmz71.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c               | 2 +-
 arch/arm/mach-omap1/board-sx1-mmc.c                | 2 +-
 arch/arm/mach-omap1/board-sx1.c                    | 4 ++--
 arch/arm/mach-omap1/{include/mach => }/board-sx1.h | 0
Quoted 8 lines
 arch/arm/mach-omap1/{include/mach => }/camera.h    | 0
 arch/arm/mach-omap1/devices.c                      | 2 +-
 arch/arm/mach-omap1/flash.c                        | 2 +-
 arch/arm/mach-omap1/{include/mach => }/flash.h     | 0
 17 files changed, 15 insertions(+), 15 deletions(-)
 rename arch/arm/mach-omap1/{include/mach => }/board-sx1.h (100%)
 rename arch/arm/mach-omap1/{include/mach => }/camera.h (100%)
 rename arch/arm/mach-omap1/{include/mach => }/flash.h (100%)

Looks good to me:

Acked-by Tony Lindgren <[email protected]>
author
#3 lore raw

PATCH 2/7 ARM: ks8695: make headers more local

In reply to Arnd Bergmann

Some header files are never included outside of a mach-ks8695 directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-ks8695/board-acs5k.c                  | 2 +-
 arch/arm/mach-ks8695/board-dsm320.c                 | 2 +-
 arch/arm/mach-ks8695/board-micrel.c                 | 2 +-
 arch/arm/mach-ks8695/board-og.c                     | 2 +-
 arch/arm/mach-ks8695/board-sg.c                     | 2 +-
 arch/arm/mach-ks8695/cpu.c                          | 2 +-
 arch/arm/mach-ks8695/devices.c                      | 6 +++---
 arch/arm/mach-ks8695/{include/mach => }/devices.h   | 0
 arch/arm/mach-ks8695/pci.c                          | 4 ++--
 arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-lan.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-mem.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-pci.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-sys.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-wan.h  | 0
 15 files changed, 11 insertions(+), 11 deletions(-)
 rename arch/arm/mach-ks8695/{include/mach => }/devices.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-lan.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-mem.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-pci.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-sys.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-wan.h (100%)
arch/arm/mach-ks8695/board-acs5k.c +1 -1
index 9f9c0441a917..e4d709c8ed32 100644
@@ -33,7 +33,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/devices.h>
+#include "devices.h"
 #include <mach/gpio-ks8695.h>
 
 #include "generic.h"
arch/arm/mach-ks8695/board-dsm320.c +1 -1
index d37c218c3584..13537e9c5485 100644
@@ -28,7 +28,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/devices.h>
+#include "devices.h"
 #include <mach/gpio-ks8695.h>
 
 #include "generic.h"
arch/arm/mach-ks8695/board-micrel.c +1 -1
index 3acbdfd31391..69cfb9935fc1 100644
@@ -19,7 +19,7 @@
 #include <asm/mach/irq.h>
 
 #include <mach/gpio-ks8695.h>
-#include <mach/devices.h>
+#include "devices.h"
 
 #include "generic.h"
arch/arm/mach-ks8695/board-og.c +1 -1
index f2658168eeff..1f4f2f4f25bb 100644
@@ -18,7 +18,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/devices.h>
+#include "devices.h"
 #include <mach/regs-gpio.h>
 #include <mach/gpio-ks8695.h>
 #include "generic.h"
arch/arm/mach-ks8695/board-sg.c +1 -1
index fdf2352d2cf8..46e455c3821b 100644
@@ -16,7 +16,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <mach/devices.h>
+#include "devices.h"
 #include "generic.h"
 
 /*
arch/arm/mach-ks8695/cpu.c +1 -1
index ddb24222918e..474a050da85b 100644
@@ -30,7 +30,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/regs-sys.h>
+#include "regs-sys.h"
 #include <mach/regs-misc.h>
arch/arm/mach-ks8695/devices.c +3 -3
index 47399bc3c024..61cf20beb45f 100644
@@ -24,9 +24,9 @@
 #include <linux/platform_device.h>
 
 #include <mach/irqs.h>
-#include <mach/regs-wan.h>
-#include <mach/regs-lan.h>
-#include <mach/regs-hpna.h>
+#include "regs-wan.h"
+#include "regs-lan.h"
+#include "regs-hpna.h"
 #include <mach/regs-switch.h>
 #include <mach/regs-misc.h>
arch/arm/mach-ks8695/devices.h renamed from arch/arm/mach-ks8695/include/mach/devices.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/devices.h
rename to arch/arm/mach-ks8695/devices.h
arch/arm/mach-ks8695/pci.c +2 -2
index c1bc4c3716ed..577a35f75c8a 100644
@@ -33,8 +33,8 @@
 #include <asm/mach/pci.h>
 #include <mach/hardware.h>
 
-#include <mach/devices.h>
-#include <mach/regs-pci.h>
+#include "devices.h"
+#include "regs-pci.h"
 
 
 static int pci_dbg;
arch/arm/mach-ks8695/regs-hpna.h renamed from arch/arm/mach-ks8695/include/mach/regs-hpna.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-hpna.h
rename to arch/arm/mach-ks8695/regs-hpna.h
arch/arm/mach-ks8695/regs-lan.h renamed from arch/arm/mach-ks8695/include/mach/regs-lan.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-lan.h
rename to arch/arm/mach-ks8695/regs-lan.h
arch/arm/mach-ks8695/regs-mem.h renamed from arch/arm/mach-ks8695/include/mach/regs-mem.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-mem.h
rename to arch/arm/mach-ks8695/regs-mem.h
arch/arm/mach-ks8695/regs-pci.h renamed from arch/arm/mach-ks8695/include/mach/regs-pci.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-pci.h
rename to arch/arm/mach-ks8695/regs-pci.h
arch/arm/mach-ks8695/regs-sys.h renamed from arch/arm/mach-ks8695/include/mach/regs-sys.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-sys.h
rename to arch/arm/mach-ks8695/regs-sys.h
arch/arm/mach-ks8695/regs-wan.h renamed from arch/arm/mach-ks8695/include/mach/regs-wan.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-wan.h
rename to arch/arm/mach-ks8695/regs-wan.h
Signature · 1 line
2.1.0.rc2
#4 lore raw

PATCH 2/7 ARM: ks8695: make headers more local

Hi Arnd,

Quoted 5 lines · Arnd Bergmann

Some header files are never included outside of a mach-ks8695 directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>

Looks good, thanks.

Acked-by Greg Ungerer <[email protected]>

Regards
Greg

Quoted 164 lines
---
 arch/arm/mach-ks8695/board-acs5k.c                  | 2 +-
 arch/arm/mach-ks8695/board-dsm320.c                 | 2 +-
 arch/arm/mach-ks8695/board-micrel.c                 | 2 +-
 arch/arm/mach-ks8695/board-og.c                     | 2 +-
 arch/arm/mach-ks8695/board-sg.c                     | 2 +-
 arch/arm/mach-ks8695/cpu.c                          | 2 +-
 arch/arm/mach-ks8695/devices.c                      | 6 +++---
 arch/arm/mach-ks8695/{include/mach => }/devices.h   | 0
 arch/arm/mach-ks8695/pci.c                          | 4 ++--
 arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-lan.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-mem.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-pci.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-sys.h  | 0
 arch/arm/mach-ks8695/{include/mach => }/regs-wan.h  | 0
 15 files changed, 11 insertions(+), 11 deletions(-)
 rename arch/arm/mach-ks8695/{include/mach => }/devices.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-lan.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-mem.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-pci.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-sys.h (100%)
 rename arch/arm/mach-ks8695/{include/mach => }/regs-wan.h (100%)
arch/arm/mach-ks8695/board-acs5k.c +1 -1
index 9f9c0441a917..e4d709c8ed32 100644
@@ -33,7 +33,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/devices.h>
+#include "devices.h"
 #include <mach/gpio-ks8695.h>
 
 #include "generic.h"
arch/arm/mach-ks8695/board-dsm320.c +1 -1
index d37c218c3584..13537e9c5485 100644
@@ -28,7 +28,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/devices.h>
+#include "devices.h"
 #include <mach/gpio-ks8695.h>
 
 #include "generic.h"
arch/arm/mach-ks8695/board-micrel.c +1 -1
index 3acbdfd31391..69cfb9935fc1 100644
@@ -19,7 +19,7 @@
 #include <asm/mach/irq.h>
 
 #include <mach/gpio-ks8695.h>
-#include <mach/devices.h>
+#include "devices.h"
 
 #include "generic.h"
arch/arm/mach-ks8695/board-og.c +1 -1
index f2658168eeff..1f4f2f4f25bb 100644
@@ -18,7 +18,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/devices.h>
+#include "devices.h"
 #include <mach/regs-gpio.h>
 #include <mach/gpio-ks8695.h>
 #include "generic.h"
arch/arm/mach-ks8695/board-sg.c +1 -1
index fdf2352d2cf8..46e455c3821b 100644
@@ -16,7 +16,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <mach/devices.h>
+#include "devices.h"
 #include "generic.h"
 
 /*
arch/arm/mach-ks8695/cpu.c +1 -1
index ddb24222918e..474a050da85b 100644
@@ -30,7 +30,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/regs-sys.h>
+#include "regs-sys.h"
 #include <mach/regs-misc.h>
arch/arm/mach-ks8695/devices.c +3 -3
index 47399bc3c024..61cf20beb45f 100644
@@ -24,9 +24,9 @@
 #include <linux/platform_device.h>
 
 #include <mach/irqs.h>
-#include <mach/regs-wan.h>
-#include <mach/regs-lan.h>
-#include <mach/regs-hpna.h>
+#include "regs-wan.h"
+#include "regs-lan.h"
+#include "regs-hpna.h"
 #include <mach/regs-switch.h>
 #include <mach/regs-misc.h>
arch/arm/mach-ks8695/devices.h renamed from arch/arm/mach-ks8695/include/mach/devices.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/devices.h
rename to arch/arm/mach-ks8695/devices.h
arch/arm/mach-ks8695/pci.c +2 -2
index c1bc4c3716ed..577a35f75c8a 100644
@@ -33,8 +33,8 @@
 #include <asm/mach/pci.h>
 #include <mach/hardware.h>
 
-#include <mach/devices.h>
-#include <mach/regs-pci.h>
+#include "devices.h"
+#include "regs-pci.h"
 
 
 static int pci_dbg;
arch/arm/mach-ks8695/regs-hpna.h renamed from arch/arm/mach-ks8695/include/mach/regs-hpna.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-hpna.h
rename to arch/arm/mach-ks8695/regs-hpna.h
arch/arm/mach-ks8695/regs-lan.h renamed from arch/arm/mach-ks8695/include/mach/regs-lan.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-lan.h
rename to arch/arm/mach-ks8695/regs-lan.h
arch/arm/mach-ks8695/regs-mem.h renamed from arch/arm/mach-ks8695/include/mach/regs-mem.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-mem.h
rename to arch/arm/mach-ks8695/regs-mem.h
arch/arm/mach-ks8695/regs-pci.h renamed from arch/arm/mach-ks8695/include/mach/regs-pci.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-pci.h
rename to arch/arm/mach-ks8695/regs-pci.h
arch/arm/mach-ks8695/regs-sys.h renamed from arch/arm/mach-ks8695/include/mach/regs-sys.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-sys.h
rename to arch/arm/mach-ks8695/regs-sys.h
arch/arm/mach-ks8695/regs-wan.h renamed from arch/arm/mach-ks8695/include/mach/regs-wan.h +0 -0
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-wan.h
rename to arch/arm/mach-ks8695/regs-wan.h
author
#5 lore raw

PATCH 3/7 ARM: davinci: make headers more local

In reply to Arnd Bergmann

Some header files are never included outside of a mach-davinci directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-davinci/board-da830-evm.c            | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c            | 4 ++--
 arch/arm/mach-davinci/board-mityomapl138.c         | 2 +-
 arch/arm/mach-davinci/board-omapl138-hawk.c        | 2 +-
 arch/arm/mach-davinci/clock.c                      | 2 +-
 arch/arm/mach-davinci/cp_intc.c                    | 2 +-
 arch/arm/mach-davinci/{include/mach => }/cp_intc.h | 0
 arch/arm/mach-davinci/cpuidle.c                    | 4 ++--
 arch/arm/mach-davinci/{include/mach => }/cpuidle.h | 0
 arch/arm/mach-davinci/da830.c                      | 2 +-
 arch/arm/mach-davinci/da850.c                      | 2 +-
 arch/arm/mach-davinci/da8xx-dt.c                   | 2 +-
 arch/arm/mach-davinci/{include/mach => }/ddr2.h    | 0
 arch/arm/mach-davinci/devices-da8xx.c              | 4 ++--
 arch/arm/mach-davinci/dm355.c                      | 2 +-
 arch/arm/mach-davinci/dm365.c                      | 2 +-
 arch/arm/mach-davinci/dm644x.c                     | 2 +-
 arch/arm/mach-davinci/dm646x.c                     | 2 +-
 arch/arm/mach-davinci/pm.c                         | 2 +-
 arch/arm/mach-davinci/psc.c                        | 2 +-
 arch/arm/mach-davinci/{include/mach => }/psc.h     | 0
 arch/arm/mach-davinci/sleep.S                      | 4 ++--
 arch/arm/mach-davinci/sram.c                       | 2 +-
 arch/arm/mach-davinci/{include/mach => }/sram.h    | 0
 24 files changed, 23 insertions(+), 23 deletions(-)
 rename arch/arm/mach-davinci/{include/mach => }/cp_intc.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/cpuidle.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/ddr2.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/psc.h (100%)
 rename arch/arm/mach-davinci/{include/mach => }/sram.h (100%)
arch/arm/mach-davinci/board-da830-evm.c +1 -1
index f8f62fbaa915..3d8cf8cbd98a 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/arch.h>
 
 #include <mach/common.h>
-#include <mach/cp_intc.h>
+#include "cp_intc.h"
 #include <mach/mux.h>
 #include <mach/da8xx.h>
arch/arm/mach-davinci/board-da850-evm.c +2 -2
index 9cc7b818fbf6..8e4539f69fdc 100644
@@ -40,10 +40,10 @@
 #include <linux/spi/flash.h>
 
 #include <mach/common.h>
-#include <mach/cp_intc.h>
+#include "cp_intc.h"
 #include <mach/da8xx.h>
 #include <mach/mux.h>
-#include <mach/sram.h>
+#include "sram.h"
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-davinci/board-mityomapl138.c +1 -1
index 8cfbfe084535..de1316bf643a 100644
@@ -26,7 +26,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/common.h>
-#include <mach/cp_intc.h>
+#include "cp_intc.h"
 #include <mach/da8xx.h>
 #include <linux/platform_data/mtd-davinci.h>
 #include <linux/platform_data/mtd-davinci-aemif.h>
arch/arm/mach-davinci/board-omapl138-hawk.c +1 -1
index 2aac51d0e853..ee624861ca66 100644
@@ -19,7 +19,7 @@
 #include <asm/mach/arch.h>
 
 #include <mach/common.h>
-#include <mach/cp_intc.h>
+#include "cp_intc.h"
 #include <mach/da8xx.h>
 #include <mach/mux.h>
arch/arm/mach-davinci/clock.c +1 -1
index 47281f5c12ea..a23e21aa0d8b 100644
@@ -23,7 +23,7 @@
 #include <mach/hardware.h>
 
 #include <mach/clock.h>
-#include <mach/psc.h>
+#include "psc.h"
 #include <mach/cputype.h>
 #include "clock.h"
arch/arm/mach-davinci/cp_intc.c +1 -1
index 507aad4b8dd9..1a68d2477de6 100644
@@ -19,7 +19,7 @@
 #include <linux/of_irq.h>
 
 #include <mach/common.h>
-#include <mach/cp_intc.h>
+#include "cp_intc.h"
 
 static inline unsigned int cp_intc_read(unsigned offset)
 {
arch/arm/mach-davinci/cp_intc.h renamed from arch/arm/mach-davinci/include/mach/cp_intc.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/cp_intc.h
rename to arch/arm/mach-davinci/cp_intc.h
arch/arm/mach-davinci/cpuidle.c +2 -2
index 306ebc51599a..1b8f08532455 100644
@@ -19,8 +19,8 @@
 #include <linux/export.h>
 #include <asm/cpuidle.h>
 
-#include <mach/cpuidle.h>
-#include <mach/ddr2.h>
+#include "cpuidle.h"
+#include "ddr2.h"
 
 #define DAVINCI_CPUIDLE_MAX_STATES	2
arch/arm/mach-davinci/cpuidle.h renamed from arch/arm/mach-davinci/include/mach/cpuidle.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/cpuidle.h
rename to arch/arm/mach-davinci/cpuidle.h
arch/arm/mach-davinci/da830.c +1 -1
index 115d5736da80..7187e7fc2822 100644
@@ -15,7 +15,7 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/psc.h>
+#include "psc.h"
 #include <mach/irqs.h>
 #include <mach/cputype.h>
 #include <mach/common.h>
arch/arm/mach-davinci/da850.c +1 -1
index 676997895e13..97d8779a9a65 100644
@@ -22,7 +22,7 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/psc.h>
+#include "psc.h"
 #include <mach/irqs.h>
 #include <mach/cputype.h>
 #include <mach/common.h>
arch/arm/mach-davinci/da8xx-dt.c +1 -1
index 06b6451225c1..c4b5808ca7c1 100644
@@ -15,7 +15,7 @@
 #include <asm/mach/arch.h>
 
 #include <mach/common.h>
-#include <mach/cp_intc.h>
+#include "cp_intc.h"
 #include <mach/da8xx.h>
 
 #define DA8XX_NUM_UARTS	3
arch/arm/mach-davinci/ddr2.h renamed from arch/arm/mach-davinci/include/mach/ddr2.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/ddr2.h
rename to arch/arm/mach-davinci/ddr2.h
arch/arm/mach-davinci/devices-da8xx.c +2 -2
index 28c90bc372bd..e88b7a5cde99 100644
@@ -22,8 +22,8 @@
 #include <mach/common.h>
 #include <mach/time.h>
 #include <mach/da8xx.h>
-#include <mach/cpuidle.h>
-#include <mach/sram.h>
+#include "cpuidle.h"
+#include "sram.h"
 
 #include "clock.h"
 #include "asp.h"
arch/arm/mach-davinci/dm355.c +1 -1
index 609950b8c191..c7c1458df23c 100644
@@ -21,7 +21,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/cputype.h>
-#include <mach/psc.h>
+#include "psc.h"
 #include <mach/mux.h>
 #include <mach/irqs.h>
 #include <mach/time.h>
arch/arm/mach-davinci/dm365.c +1 -1
index 2068cbeaeb03..01843fbcc9ea 100644
@@ -26,7 +26,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/cputype.h>
-#include <mach/psc.h>
+#include "psc.h"
 #include <mach/mux.h>
 #include <mach/irqs.h>
 #include <mach/time.h>
arch/arm/mach-davinci/dm644x.c +1 -1
index d38f5049d56e..b28071ae3a57 100644
@@ -19,7 +19,7 @@
 
 #include <mach/cputype.h>
 #include <mach/irqs.h>
-#include <mach/psc.h>
+#include "psc.h"
 #include <mach/mux.h>
 #include <mach/time.h>
 #include <mach/serial.h>
arch/arm/mach-davinci/dm646x.c +1 -1
index 70eb42725eec..cf80786e2471 100644
@@ -20,7 +20,7 @@
 
 #include <mach/cputype.h>
 #include <mach/irqs.h>
-#include <mach/psc.h>
+#include "psc.h"
 #include <mach/mux.h>
 #include <mach/time.h>
 #include <mach/serial.h>
arch/arm/mach-davinci/pm.c +1 -1
index 07e23ba61f3a..8929569b1f8a 100644
@@ -21,7 +21,7 @@
 
 #include <mach/common.h>
 #include <mach/da8xx.h>
-#include <mach/sram.h>
+#include "sram.h"
 #include <mach/pm.h>
 
 #include "clock.h"
arch/arm/mach-davinci/psc.c +1 -1
index 82fdc69d5728..e5dc6bfde5f3 100644
@@ -23,7 +23,7 @@
 #include <linux/io.h>
 
 #include <mach/cputype.h>
-#include <mach/psc.h>
+#include "psc.h"
 
 #include "clock.h"
arch/arm/mach-davinci/psc.h renamed from arch/arm/mach-davinci/include/mach/psc.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/psc.h
rename to arch/arm/mach-davinci/psc.h
arch/arm/mach-davinci/sleep.S +2 -2
index a5336a5e2739..cd350dee4df3 100644
@@ -21,8 +21,8 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/psc.h>
-#include <mach/ddr2.h>
+#include "psc.h"
+#include "ddr2.h"
 
 #include "clock.h"
arch/arm/mach-davinci/sram.c +1 -1
index 8540dddf1fbd..668b6e749768 100644
@@ -14,7 +14,7 @@
 #include <linux/genalloc.h>
 
 #include <mach/common.h>
-#include <mach/sram.h>
+#include "sram.h"
 
 static struct gen_pool *sram_pool;
arch/arm/mach-davinci/sram.h renamed from arch/arm/mach-davinci/include/mach/sram.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/sram.h
rename to arch/arm/mach-davinci/sram.h
Signature · 1 line
2.1.0.rc2
#6 lore raw

PATCH 3/7 ARM: davinci: make headers more local

Quoted 5 lines · Arnd Bergmann

Some header files are never included outside of a mach-davinci directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Sekhar Nori <[email protected]>

Boot tested this on DM644x EVM too.

Thanks,
Sekhar

author
#7 lore raw

PATCH 4/7 ARM: iop13xx: make headers more local

In reply to Arnd Bergmann

Some header files are never included outside of a mach-iop13xx directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-iop13xx/include/mach/pci.h       | 57 -------------------------
 arch/arm/mach-iop13xx/iq81340mc.c              |  2 +-
 arch/arm/mach-iop13xx/iq81340sc.c              |  2 +-
 arch/arm/mach-iop13xx/irq.c                    |  2 +-
 arch/arm/mach-iop13xx/{include/mach => }/msi.h |  0
 arch/arm/mach-iop13xx/pci.c                    |  2 +-
 arch/arm/mach-iop13xx/pci.h                    | 58 ++++++++++++++++++++++++++
 7 files changed, 62 insertions(+), 61 deletions(-)
 delete mode 100644 arch/arm/mach-iop13xx/include/mach/pci.h
 rename arch/arm/mach-iop13xx/{include/mach => }/msi.h (100%)
arch/arm/mach-iop13xx/include/mach/pci.h deleted +0 -57
deleted file mode 100644
index 59f42b535572..000000000000
@@ -1,57 +0,0 @@
-#ifndef _IOP13XX_PCI_H_
-#define _IOP13XX_PCI_H_
-#include <linux/io.h>
-#include <mach/irqs.h>
-
-struct pci_sys_data;
-struct hw_pci;
-int iop13xx_pci_setup(int nr, struct pci_sys_data *sys);
-struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *);
-void iop13xx_atu_select(struct hw_pci *plat_pci);
-void iop13xx_pci_init(void);
-void iop13xx_map_pci_memory(void);
-
-#define IOP_PCI_STATUS_ERROR (PCI_STATUS_PARITY |	     \
-			       PCI_STATUS_SIG_TARGET_ABORT | \
-			       PCI_STATUS_REC_TARGET_ABORT | \
-			       PCI_STATUS_REC_TARGET_ABORT | \
-			       PCI_STATUS_REC_MASTER_ABORT | \
-			       PCI_STATUS_SIG_SYSTEM_ERROR | \
-	 		       PCI_STATUS_DETECTED_PARITY)
-
-#define IOP13XX_ATUE_ATUISR_ERROR (IOP13XX_ATUE_STAT_HALT_ON_ERROR |  \
-				    IOP13XX_ATUE_STAT_ROOT_SYS_ERR |   \
-				    IOP13XX_ATUE_STAT_PCI_IFACE_ERR |  \
-				    IOP13XX_ATUE_STAT_ERR_COR |	       \
-				    IOP13XX_ATUE_STAT_ERR_UNCOR |      \
-				    IOP13XX_ATUE_STAT_CRS |	       \
-				    IOP13XX_ATUE_STAT_DET_PAR_ERR |    \
-				    IOP13XX_ATUE_STAT_EXT_REC_MABORT | \
-				    IOP13XX_ATUE_STAT_SIG_TABORT |     \
-				    IOP13XX_ATUE_STAT_EXT_REC_TABORT | \
-				    IOP13XX_ATUE_STAT_MASTER_DATA_PAR)
-
-#define IOP13XX_ATUX_ATUISR_ERROR (IOP13XX_ATUX_STAT_TX_SCEM |        \
-				    IOP13XX_ATUX_STAT_REC_SCEM |       \
-				    IOP13XX_ATUX_STAT_TX_SERR |	       \
-				    IOP13XX_ATUX_STAT_DET_PAR_ERR |    \
-				    IOP13XX_ATUX_STAT_INT_REC_MABORT | \
-				    IOP13XX_ATUX_STAT_REC_SERR |       \
-				    IOP13XX_ATUX_STAT_EXT_REC_MABORT | \
-				    IOP13XX_ATUX_STAT_EXT_REC_TABORT | \
-				    IOP13XX_ATUX_STAT_EXT_SIG_TABORT | \
-				    IOP13XX_ATUX_STAT_MASTER_DATA_PAR)
-
-/* PCI interrupts
- */
-#define ATUX_INTA IRQ_IOP13XX_XINT0
-#define ATUX_INTB IRQ_IOP13XX_XINT1
-#define ATUX_INTC IRQ_IOP13XX_XINT2
-#define ATUX_INTD IRQ_IOP13XX_XINT3
-
-#define ATUE_INTA IRQ_IOP13XX_ATUE_IMA
-#define ATUE_INTB IRQ_IOP13XX_ATUE_IMB
-#define ATUE_INTC IRQ_IOP13XX_ATUE_IMC
-#define ATUE_INTD IRQ_IOP13XX_ATUE_IMD
-
-#endif /* _IOP13XX_PCI_H_ */
arch/arm/mach-iop13xx/iq81340mc.c +1 -1
index 9cd07d396093..d255ab5ad1a5 100644
@@ -23,7 +23,7 @@
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <mach/pci.h>
+#include "pci.h"
 #include <asm/mach/time.h>
 #include <mach/time.h>
arch/arm/mach-iop13xx/iq81340sc.c +1 -1
index b3ec11cb707e..33eeaf1fa11d 100644
@@ -23,7 +23,7 @@
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <mach/pci.h>
+#include "pci.h"
 #include <asm/mach/time.h>
 #include <mach/time.h>
arch/arm/mach-iop13xx/irq.c +1 -1
index 623d85a4af2d..c702cc4092de 100644
@@ -25,7 +25,7 @@
 #include <asm/irq.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <mach/msi.h>
+#include "msi.h"
 
 /* INTCTL0 CP6 R0 Page 4
  */
arch/arm/mach-iop13xx/msi.h renamed from arch/arm/mach-iop13xx/include/mach/msi.h +0 -0
similarity index 100%
rename from arch/arm/mach-iop13xx/include/mach/msi.h
rename to arch/arm/mach-iop13xx/msi.h
arch/arm/mach-iop13xx/pci.c +1 -1
index 9082b84aeebb..204eb4460271 100644
@@ -27,7 +27,7 @@
 #include <asm/sizes.h>
 #include <asm/signal.h>
 #include <asm/mach/pci.h>
-#include <mach/pci.h>
+#include "pci.h"
 
 #define IOP13XX_PCI_DEBUG 0
 #define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG && printk(x)))
arch/arm/mach-iop13xx/pci.h +58 -0

64 lines not on this page · raw message

Signature · 1 line
2.1.0.rc2
author
#8 lore raw

PATCH 5/7 ARM: w90x900: make headers more local

In reply to Arnd Bergmann

Some header files are never included outside of a mach-w90x900 directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-w90x900/cpu.c                           | 4 ++--
 arch/arm/mach-w90x900/{include/mach => }/regs-ebi.h   | 0
 arch/arm/mach-w90x900/{include/mach => }/regs-gcr.h   | 0
 arch/arm/mach-w90x900/{include/mach => }/regs-timer.h | 0
 arch/arm/mach-w90x900/{include/mach => }/regs-usb.h   | 0
 arch/arm/mach-w90x900/time.c                          | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-ebi.h (100%)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-gcr.h (100%)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-timer.h (100%)
 rename arch/arm/mach-w90x900/{include/mach => }/regs-usb.h (100%)
arch/arm/mach-w90x900/cpu.c +2 -2
index 213230ee57d1..ca763251ffe0 100644
@@ -33,8 +33,8 @@
 #include <mach/hardware.h>
 #include <mach/regs-serial.h>
 #include <mach/regs-clock.h>
-#include <mach/regs-ebi.h>
-#include <mach/regs-timer.h>
+#include "regs-ebi.h"
+#include "regs-timer.h"
 
 #include "cpu.h"
 #include "clock.h"
arch/arm/mach-w90x900/regs-ebi.h renamed from arch/arm/mach-w90x900/include/mach/regs-ebi.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-ebi.h
rename to arch/arm/mach-w90x900/regs-ebi.h
arch/arm/mach-w90x900/regs-gcr.h renamed from arch/arm/mach-w90x900/include/mach/regs-gcr.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-gcr.h
rename to arch/arm/mach-w90x900/regs-gcr.h
arch/arm/mach-w90x900/regs-timer.h renamed from arch/arm/mach-w90x900/include/mach/regs-timer.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-timer.h
rename to arch/arm/mach-w90x900/regs-timer.h
arch/arm/mach-w90x900/regs-usb.h renamed from arch/arm/mach-w90x900/include/mach/regs-usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-usb.h
rename to arch/arm/mach-w90x900/regs-usb.h
arch/arm/mach-w90x900/time.c +1 -1
index cd1966ec9143..cda085245e34 100644
@@ -31,7 +31,7 @@
 #include <asm/mach/time.h>
 
 #include <mach/map.h>
-#include <mach/regs-timer.h>
+#include "regs-timer.h"
 
 #include "nuc9xx.h"
Signature · 1 line
2.1.0.rc2
#9 lore raw

PATCH 5/7 ARM: w90x900: make headers more local

2015-12-01 7:00 GMT+08:00 Arnd Bergmann <[email protected]>:

Quoted 5 lines

Some header files are never included outside of a mach-w90x900 directory and do not need to be made visible in include/mach, so let's just move them all down one level.

Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Wan Zongshun <[email protected]>

Thanks!

Quoted 5 lines
---
 arch/arm/mach-w90x900/cpu.c                           | 4 ++--
 arch/arm/mach-w90x900/{include/mach => }/regs-ebi.h   | 0
 arch/arm/mach-w90x900/{include/mach => }/regs-gcr.h   | 0
 arch/arm/mach-w90x900/{include/mach => }/regs-timer.h | 0
author
#10 lore raw

PATCH 6/7 ARM: mvebu: remove unused mach/gpio.h

In reply to Arnd Bergmann

This file was left over from a cleanup of asm/gpio.h and has not been used in a while. Let's just remove it now, so the arch/arm/mach-mvebu/include/ directory can also disappear.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-mvebu/include/mach/gpio.h | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
arch/arm/mach-mvebu/include/mach/gpio.h deleted +0 -1
deleted file mode 100644
index 40a8c178f10d..000000000000
@@ -1 +0,0 @@
-/* empty */
Signature · 1 line
2.1.0.rc2
#11 lore raw

PATCH 6/7 ARM: mvebu: remove unused mach/gpio.h

Hi Arnd,

Quoted 5 lines · Arnd Bergmann

This file was left over from a cleanup of asm/gpio.h and has not been used in a while. Let's just remove it now, so the arch/arm/mach-mvebu/include/ directory can also disappear.

Signed-off-by Arnd Bergmann <[email protected]>

Applied on mvebu/cleanup

Thanks,

Gregory

Quoted 15 lines
---
 arch/arm/mach-mvebu/include/mach/gpio.h | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
arch/arm/mach-mvebu/include/mach/gpio.h deleted +0 -1
deleted file mode 100644
index 40a8c178f10d..000000000000
@@ -1 +0,0 @@
-/* empty */
Signature · 1 line
2.1.0.rc2
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#12 lore raw

PATCH 7/7 ARM: netx: remove unused mach/param.h

In reply to Arnd Bergmann

I could not find any users of this file, past or present, and it contains only a comment, so let's remove it.

Signed-off-by Arnd Bergmann <[email protected]>
---
 arch/arm/mach-netx/include/mach/param.h | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 arch/arm/mach-netx/include/mach/param.h
arch/arm/mach-netx/include/mach/param.h deleted +0 -18
deleted file mode 100644
index a771459206aa..000000000000
@@ -1,18 +0,0 @@
-/*
- *  arch/arm/mach-netx/include/mach/param.h
- *
- * Copyright (C) 2005 Sascha Hauer <[email protected]>, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
Signature · 1 line
2.1.0.rc2