* [PATCH 1/7] ARM: omap1: make headers more local
2015-11-30 23:00 [PATCH 0/7] ARM: make mach/*.h headers more local Arnd Bergmann
@ 2015-11-30 23:00 ` Arnd Bergmann
2015-11-30 23:04 ` Tony Lindgren
2015-11-30 23:00 ` [PATCH 2/7] ARM: ks8695: " Arnd Bergmann
` (5 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Arnd Bergmann @ 2015-11-30 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Arnd Bergmann, Greg Ungerer,
Gregory Clement, linux-omap
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 <arnd@arndb.de>
---
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%)
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index a95499ea8706..9fc70978823b 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -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"
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 0fb51d22c8b5..fad95b74bb65 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 8340d684d8b6..cd146ed0538d 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 086ff34e072b..f7c8c63dd532 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index ed4e045c2ad8..ae90bd02b3bf 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 0efd165b8227..209aecb0df68 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 1142ae431fe0..e5288cda1a6a 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 54a547a96950..d672495f7441 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 87ec04ae40dd..aaf741b0aff6 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 3d76f05407f0..150b57ba42bf 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -30,7 +30,7 @@
#include <mach/tc.h>
#include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
#include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c
index 4fcf19c78a08..a9373570bbb1 100644
--- a/arch/arm/mach-omap1/board-sx1-mmc.c
+++ b/arch/arm/mach-omap1/board-sx1-mmc.c
@@ -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"
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 939991ea33d5..6c482254b37c 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -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>
diff --git a/arch/arm/mach-omap1/include/mach/board-sx1.h b/arch/arm/mach-omap1/board-sx1.h
similarity index 100%
rename from arch/arm/mach-omap1/include/mach/board-sx1.h
rename to arch/arm/mach-omap1/board-sx1.h
diff --git a/arch/arm/mach-omap1/include/mach/camera.h b/arch/arm/mach-omap1/camera.h
similarity index 100%
rename from arch/arm/mach-omap1/include/mach/camera.h
rename to arch/arm/mach-omap1/camera.h
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 325e6030095e..263c07a566cb 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -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"
diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c
index b3fb531af94e..99cda402e1e2 100644
--- a/arch/arm/mach-omap1/flash.c
+++ b/arch/arm/mach-omap1/flash.c
@@ -11,7 +11,7 @@
#include <linux/mtd/map.h>
#include <mach/tc.h>
-#include <mach/flash.h>
+#include "flash.h"
#include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/include/mach/flash.h b/arch/arm/mach-omap1/flash.h
similarity index 100%
rename from arch/arm/mach-omap1/include/mach/flash.h
rename to arch/arm/mach-omap1/flash.h
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 1/7] ARM: omap1: make headers more local
2015-11-30 23:00 ` [PATCH 1/7] ARM: omap1: make " Arnd Bergmann
@ 2015-11-30 23:04 ` Tony Lindgren
0 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2015-11-30 23:04 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Kevin Hilman,
Sekhar Nori, Greg Ungerer, Gregory Clement, linux-omap,
linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [151130 15:02]:
> 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 <arnd@arndb.de>
> ---
> 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%)
Looks good to me:
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/7] ARM: ks8695: make headers more local
2015-11-30 23:00 [PATCH 0/7] ARM: make mach/*.h headers more local Arnd Bergmann
2015-11-30 23:00 ` [PATCH 1/7] ARM: omap1: make " Arnd Bergmann
@ 2015-11-30 23:00 ` Arnd Bergmann
2015-12-01 0:59 ` Greg Ungerer
2015-11-30 23:00 ` [PATCH 3/7] ARM: davinci: " Arnd Bergmann
` (4 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Arnd Bergmann @ 2015-11-30 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Arnd Bergmann, Greg Ungerer,
Gregory Clement, linux-omap
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 <arnd@arndb.de>
---
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%)
diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c
index 9f9c0441a917..e4d709c8ed32 100644
--- a/arch/arm/mach-ks8695/board-acs5k.c
+++ b/arch/arm/mach-ks8695/board-acs5k.c
@@ -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"
diff --git a/arch/arm/mach-ks8695/board-dsm320.c b/arch/arm/mach-ks8695/board-dsm320.c
index d37c218c3584..13537e9c5485 100644
--- a/arch/arm/mach-ks8695/board-dsm320.c
+++ b/arch/arm/mach-ks8695/board-dsm320.c
@@ -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"
diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c
index 3acbdfd31391..69cfb9935fc1 100644
--- a/arch/arm/mach-ks8695/board-micrel.c
+++ b/arch/arm/mach-ks8695/board-micrel.c
@@ -19,7 +19,7 @@
#include <asm/mach/irq.h>
#include <mach/gpio-ks8695.h>
-#include <mach/devices.h>
+#include "devices.h"
#include "generic.h"
diff --git a/arch/arm/mach-ks8695/board-og.c b/arch/arm/mach-ks8695/board-og.c
index f2658168eeff..1f4f2f4f25bb 100644
--- a/arch/arm/mach-ks8695/board-og.c
+++ b/arch/arm/mach-ks8695/board-og.c
@@ -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"
diff --git a/arch/arm/mach-ks8695/board-sg.c b/arch/arm/mach-ks8695/board-sg.c
index fdf2352d2cf8..46e455c3821b 100644
--- a/arch/arm/mach-ks8695/board-sg.c
+++ b/arch/arm/mach-ks8695/board-sg.c
@@ -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"
/*
diff --git a/arch/arm/mach-ks8695/cpu.c b/arch/arm/mach-ks8695/cpu.c
index ddb24222918e..474a050da85b 100644
--- a/arch/arm/mach-ks8695/cpu.c
+++ b/arch/arm/mach-ks8695/cpu.c
@@ -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>
diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c
index 47399bc3c024..61cf20beb45f 100644
--- a/arch/arm/mach-ks8695/devices.c
+++ b/arch/arm/mach-ks8695/devices.c
@@ -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>
diff --git a/arch/arm/mach-ks8695/include/mach/devices.h b/arch/arm/mach-ks8695/devices.h
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/devices.h
rename to arch/arm/mach-ks8695/devices.h
diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c
index c1bc4c3716ed..577a35f75c8a 100644
--- a/arch/arm/mach-ks8695/pci.c
+++ b/arch/arm/mach-ks8695/pci.c
@@ -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;
diff --git a/arch/arm/mach-ks8695/include/mach/regs-hpna.h b/arch/arm/mach-ks8695/regs-hpna.h
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-hpna.h
rename to arch/arm/mach-ks8695/regs-hpna.h
diff --git a/arch/arm/mach-ks8695/include/mach/regs-lan.h b/arch/arm/mach-ks8695/regs-lan.h
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-lan.h
rename to arch/arm/mach-ks8695/regs-lan.h
diff --git a/arch/arm/mach-ks8695/include/mach/regs-mem.h b/arch/arm/mach-ks8695/regs-mem.h
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-mem.h
rename to arch/arm/mach-ks8695/regs-mem.h
diff --git a/arch/arm/mach-ks8695/include/mach/regs-pci.h b/arch/arm/mach-ks8695/regs-pci.h
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-pci.h
rename to arch/arm/mach-ks8695/regs-pci.h
diff --git a/arch/arm/mach-ks8695/include/mach/regs-sys.h b/arch/arm/mach-ks8695/regs-sys.h
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-sys.h
rename to arch/arm/mach-ks8695/regs-sys.h
diff --git a/arch/arm/mach-ks8695/include/mach/regs-wan.h b/arch/arm/mach-ks8695/regs-wan.h
similarity index 100%
rename from arch/arm/mach-ks8695/include/mach/regs-wan.h
rename to arch/arm/mach-ks8695/regs-wan.h
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 2/7] ARM: ks8695: make headers more local
2015-11-30 23:00 ` [PATCH 2/7] ARM: ks8695: " Arnd Bergmann
@ 2015-12-01 0:59 ` Greg Ungerer
0 siblings, 0 replies; 13+ messages in thread
From: Greg Ungerer @ 2015-12-01 0:59 UTC (permalink / raw)
To: Arnd Bergmann, linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Gregory Clement, linux-omap
Hi Arnd,
On 01/12/15 09:00, Arnd Bergmann wrote:
> 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 <arnd@arndb.de>
Looks good, thanks.
Acked-by: Greg Ungerer <gerg@uclinux.org>
Regards
Greg
> ---
> 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%)
>
> diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c
> index 9f9c0441a917..e4d709c8ed32 100644
> --- a/arch/arm/mach-ks8695/board-acs5k.c
> +++ b/arch/arm/mach-ks8695/board-acs5k.c
> @@ -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"
> diff --git a/arch/arm/mach-ks8695/board-dsm320.c b/arch/arm/mach-ks8695/board-dsm320.c
> index d37c218c3584..13537e9c5485 100644
> --- a/arch/arm/mach-ks8695/board-dsm320.c
> +++ b/arch/arm/mach-ks8695/board-dsm320.c
> @@ -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"
> diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c
> index 3acbdfd31391..69cfb9935fc1 100644
> --- a/arch/arm/mach-ks8695/board-micrel.c
> +++ b/arch/arm/mach-ks8695/board-micrel.c
> @@ -19,7 +19,7 @@
> #include <asm/mach/irq.h>
>
> #include <mach/gpio-ks8695.h>
> -#include <mach/devices.h>
> +#include "devices.h"
>
> #include "generic.h"
>
> diff --git a/arch/arm/mach-ks8695/board-og.c b/arch/arm/mach-ks8695/board-og.c
> index f2658168eeff..1f4f2f4f25bb 100644
> --- a/arch/arm/mach-ks8695/board-og.c
> +++ b/arch/arm/mach-ks8695/board-og.c
> @@ -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"
> diff --git a/arch/arm/mach-ks8695/board-sg.c b/arch/arm/mach-ks8695/board-sg.c
> index fdf2352d2cf8..46e455c3821b 100644
> --- a/arch/arm/mach-ks8695/board-sg.c
> +++ b/arch/arm/mach-ks8695/board-sg.c
> @@ -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"
>
> /*
> diff --git a/arch/arm/mach-ks8695/cpu.c b/arch/arm/mach-ks8695/cpu.c
> index ddb24222918e..474a050da85b 100644
> --- a/arch/arm/mach-ks8695/cpu.c
> +++ b/arch/arm/mach-ks8695/cpu.c
> @@ -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>
>
>
> diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c
> index 47399bc3c024..61cf20beb45f 100644
> --- a/arch/arm/mach-ks8695/devices.c
> +++ b/arch/arm/mach-ks8695/devices.c
> @@ -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>
>
> diff --git a/arch/arm/mach-ks8695/include/mach/devices.h b/arch/arm/mach-ks8695/devices.h
> similarity index 100%
> rename from arch/arm/mach-ks8695/include/mach/devices.h
> rename to arch/arm/mach-ks8695/devices.h
> diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c
> index c1bc4c3716ed..577a35f75c8a 100644
> --- a/arch/arm/mach-ks8695/pci.c
> +++ b/arch/arm/mach-ks8695/pci.c
> @@ -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;
> diff --git a/arch/arm/mach-ks8695/include/mach/regs-hpna.h b/arch/arm/mach-ks8695/regs-hpna.h
> similarity index 100%
> rename from arch/arm/mach-ks8695/include/mach/regs-hpna.h
> rename to arch/arm/mach-ks8695/regs-hpna.h
> diff --git a/arch/arm/mach-ks8695/include/mach/regs-lan.h b/arch/arm/mach-ks8695/regs-lan.h
> similarity index 100%
> rename from arch/arm/mach-ks8695/include/mach/regs-lan.h
> rename to arch/arm/mach-ks8695/regs-lan.h
> diff --git a/arch/arm/mach-ks8695/include/mach/regs-mem.h b/arch/arm/mach-ks8695/regs-mem.h
> similarity index 100%
> rename from arch/arm/mach-ks8695/include/mach/regs-mem.h
> rename to arch/arm/mach-ks8695/regs-mem.h
> diff --git a/arch/arm/mach-ks8695/include/mach/regs-pci.h b/arch/arm/mach-ks8695/regs-pci.h
> similarity index 100%
> rename from arch/arm/mach-ks8695/include/mach/regs-pci.h
> rename to arch/arm/mach-ks8695/regs-pci.h
> diff --git a/arch/arm/mach-ks8695/include/mach/regs-sys.h b/arch/arm/mach-ks8695/regs-sys.h
> similarity index 100%
> rename from arch/arm/mach-ks8695/include/mach/regs-sys.h
> rename to arch/arm/mach-ks8695/regs-sys.h
> diff --git a/arch/arm/mach-ks8695/include/mach/regs-wan.h b/arch/arm/mach-ks8695/regs-wan.h
> similarity index 100%
> rename from arch/arm/mach-ks8695/include/mach/regs-wan.h
> rename to arch/arm/mach-ks8695/regs-wan.h
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/7] ARM: davinci: make headers more local
2015-11-30 23:00 [PATCH 0/7] ARM: make mach/*.h headers more local Arnd Bergmann
2015-11-30 23:00 ` [PATCH 1/7] ARM: omap1: make " Arnd Bergmann
2015-11-30 23:00 ` [PATCH 2/7] ARM: ks8695: " Arnd Bergmann
@ 2015-11-30 23:00 ` Arnd Bergmann
2015-12-01 13:15 ` Sekhar Nori
2015-11-30 23:00 ` [PATCH 4/7] ARM: iop13xx: " Arnd Bergmann
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Arnd Bergmann @ 2015-11-30 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Arnd Bergmann, Greg Ungerer,
Gregory Clement, linux-omap
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 <arnd@arndb.de>
---
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%)
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index f8f62fbaa915..3d8cf8cbd98a 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -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>
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 9cc7b818fbf6..8e4539f69fdc 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -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>
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 8cfbfe084535..de1316bf643a 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -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>
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index 2aac51d0e853..ee624861ca66 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -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>
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index 47281f5c12ea..a23e21aa0d8b 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -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"
diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
index 507aad4b8dd9..1a68d2477de6 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -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)
{
diff --git a/arch/arm/mach-davinci/include/mach/cp_intc.h b/arch/arm/mach-davinci/cp_intc.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/cp_intc.h
rename to arch/arm/mach-davinci/cp_intc.h
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index 306ebc51599a..1b8f08532455 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -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
diff --git a/arch/arm/mach-davinci/include/mach/cpuidle.h b/arch/arm/mach-davinci/cpuidle.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/cpuidle.h
rename to arch/arm/mach-davinci/cpuidle.h
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 115d5736da80..7187e7fc2822 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -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>
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 676997895e13..97d8779a9a65 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -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>
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 06b6451225c1..c4b5808ca7c1 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -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
diff --git a/arch/arm/mach-davinci/include/mach/ddr2.h b/arch/arm/mach-davinci/ddr2.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/ddr2.h
rename to arch/arm/mach-davinci/ddr2.h
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 28c90bc372bd..e88b7a5cde99 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -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"
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 609950b8c191..c7c1458df23c 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -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>
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 2068cbeaeb03..01843fbcc9ea 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -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>
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index d38f5049d56e..b28071ae3a57 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -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>
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 70eb42725eec..cf80786e2471 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -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>
diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c
index 07e23ba61f3a..8929569b1f8a 100644
--- a/arch/arm/mach-davinci/pm.c
+++ b/arch/arm/mach-davinci/pm.c
@@ -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"
diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c
index 82fdc69d5728..e5dc6bfde5f3 100644
--- a/arch/arm/mach-davinci/psc.c
+++ b/arch/arm/mach-davinci/psc.c
@@ -23,7 +23,7 @@
#include <linux/io.h>
#include <mach/cputype.h>
-#include <mach/psc.h>
+#include "psc.h"
#include "clock.h"
diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/psc.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/psc.h
rename to arch/arm/mach-davinci/psc.h
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
index a5336a5e2739..cd350dee4df3 100644
--- a/arch/arm/mach-davinci/sleep.S
+++ b/arch/arm/mach-davinci/sleep.S
@@ -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"
diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c
index 8540dddf1fbd..668b6e749768 100644
--- a/arch/arm/mach-davinci/sram.c
+++ b/arch/arm/mach-davinci/sram.c
@@ -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;
diff --git a/arch/arm/mach-davinci/include/mach/sram.h b/arch/arm/mach-davinci/sram.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/sram.h
rename to arch/arm/mach-davinci/sram.h
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/7] ARM: davinci: make headers more local
2015-11-30 23:00 ` [PATCH 3/7] ARM: davinci: " Arnd Bergmann
@ 2015-12-01 13:15 ` Sekhar Nori
0 siblings, 0 replies; 13+ messages in thread
From: Sekhar Nori @ 2015-12-01 13:15 UTC (permalink / raw)
To: Arnd Bergmann, linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Kevin Hilman, Greg Ungerer, Gregory Clement, linux-omap
On Tuesday 01 December 2015 04:30 AM, Arnd Bergmann wrote:
> 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 <arnd@arndb.de>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Boot tested this on DM644x EVM too.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/7] ARM: iop13xx: make headers more local
2015-11-30 23:00 [PATCH 0/7] ARM: make mach/*.h headers more local Arnd Bergmann
` (2 preceding siblings ...)
2015-11-30 23:00 ` [PATCH 3/7] ARM: davinci: " Arnd Bergmann
@ 2015-11-30 23:00 ` Arnd Bergmann
2015-11-30 23:00 ` [PATCH 5/7] ARM: w90x900: " Arnd Bergmann
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2015-11-30 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Arnd Bergmann, Greg Ungerer,
Gregory Clement, linux-omap
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 <arnd@arndb.de>
---
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%)
diff --git a/arch/arm/mach-iop13xx/include/mach/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h
deleted file mode 100644
index 59f42b535572..000000000000
--- a/arch/arm/mach-iop13xx/include/mach/pci.h
+++ /dev/null
@@ -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_ */
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
index 9cd07d396093..d255ab5ad1a5 100644
--- a/arch/arm/mach-iop13xx/iq81340mc.c
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -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>
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
index b3ec11cb707e..33eeaf1fa11d 100644
--- a/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -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>
diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c
index 623d85a4af2d..c702cc4092de 100644
--- a/arch/arm/mach-iop13xx/irq.c
+++ b/arch/arm/mach-iop13xx/irq.c
@@ -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
*/
diff --git a/arch/arm/mach-iop13xx/include/mach/msi.h b/arch/arm/mach-iop13xx/msi.h
similarity index 100%
rename from arch/arm/mach-iop13xx/include/mach/msi.h
rename to arch/arm/mach-iop13xx/msi.h
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 9082b84aeebb..204eb4460271 100644
--- a/arch/arm/mach-iop13xx/pci.c
+++ b/arch/arm/mach-iop13xx/pci.c
@@ -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)))
diff --git a/arch/arm/mach-iop13xx/pci.h b/arch/arm/mach-iop13xx/pci.h
index d45a80b3080e..71b9c57e1fde 100644
--- a/arch/arm/mach-iop13xx/pci.h
+++ b/arch/arm/mach-iop13xx/pci.h
@@ -1,6 +1,64 @@
+#ifndef _IOP13XX_PCI_H_
+#define _IOP13XX_PCI_H_
+#include <linux/io.h>
+#include <mach/irqs.h>
+
#include <linux/types.h>
extern void __iomem *iop13xx_atue_mem_base;
extern void __iomem *iop13xx_atux_mem_base;
extern size_t iop13xx_atue_mem_size;
extern size_t iop13xx_atux_mem_size;
+
+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_ */
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/7] ARM: w90x900: make headers more local
2015-11-30 23:00 [PATCH 0/7] ARM: make mach/*.h headers more local Arnd Bergmann
` (3 preceding siblings ...)
2015-11-30 23:00 ` [PATCH 4/7] ARM: iop13xx: " Arnd Bergmann
@ 2015-11-30 23:00 ` Arnd Bergmann
2015-12-03 8:23 ` Wan ZongShun
2015-11-30 23:00 ` [PATCH 6/7] ARM: mvebu: remove unused mach/gpio.h Arnd Bergmann
2015-11-30 23:00 ` [PATCH 7/7] ARM: netx: remove unused mach/param.h Arnd Bergmann
6 siblings, 1 reply; 13+ messages in thread
From: Arnd Bergmann @ 2015-11-30 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Arnd Bergmann, Greg Ungerer,
Gregory Clement, linux-omap
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 <arnd@arndb.de>
---
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%)
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c
index 213230ee57d1..ca763251ffe0 100644
--- a/arch/arm/mach-w90x900/cpu.c
+++ b/arch/arm/mach-w90x900/cpu.c
@@ -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"
diff --git a/arch/arm/mach-w90x900/include/mach/regs-ebi.h b/arch/arm/mach-w90x900/regs-ebi.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-ebi.h
rename to arch/arm/mach-w90x900/regs-ebi.h
diff --git a/arch/arm/mach-w90x900/include/mach/regs-gcr.h b/arch/arm/mach-w90x900/regs-gcr.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-gcr.h
rename to arch/arm/mach-w90x900/regs-gcr.h
diff --git a/arch/arm/mach-w90x900/include/mach/regs-timer.h b/arch/arm/mach-w90x900/regs-timer.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-timer.h
rename to arch/arm/mach-w90x900/regs-timer.h
diff --git a/arch/arm/mach-w90x900/include/mach/regs-usb.h b/arch/arm/mach-w90x900/regs-usb.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/regs-usb.h
rename to arch/arm/mach-w90x900/regs-usb.h
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c
index cd1966ec9143..cda085245e34 100644
--- a/arch/arm/mach-w90x900/time.c
+++ b/arch/arm/mach-w90x900/time.c
@@ -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"
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 5/7] ARM: w90x900: make headers more local
2015-11-30 23:00 ` [PATCH 5/7] ARM: w90x900: " Arnd Bergmann
@ 2015-12-03 8:23 ` Wan ZongShun
0 siblings, 0 replies; 13+ messages in thread
From: Wan ZongShun @ 2015-12-03 8:23 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Lunn, Jason Cooper, Tony Lindgren, Sekhar Nori,
Kevin Hilman, Greg Ungerer, Gregory Clement, linux-omap,
linux-arm-kernel
2015-12-01 7:00 GMT+08:00 Arnd Bergmann <arnd@arndb.de>:
> 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 <arnd@arndb.de>
Acked-by: Wan Zongshun <mcuos.com@gmail.com>
Thanks!
> ---
> 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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 6/7] ARM: mvebu: remove unused mach/gpio.h
2015-11-30 23:00 [PATCH 0/7] ARM: make mach/*.h headers more local Arnd Bergmann
` (4 preceding siblings ...)
2015-11-30 23:00 ` [PATCH 5/7] ARM: w90x900: " Arnd Bergmann
@ 2015-11-30 23:00 ` Arnd Bergmann
2015-12-01 12:53 ` Gregory CLEMENT
2015-11-30 23:00 ` [PATCH 7/7] ARM: netx: remove unused mach/param.h Arnd Bergmann
6 siblings, 1 reply; 13+ messages in thread
From: Arnd Bergmann @ 2015-11-30 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Arnd Bergmann, Greg Ungerer,
Gregory Clement, linux-omap
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 <arnd@arndb.de>
---
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
diff --git a/arch/arm/mach-mvebu/include/mach/gpio.h b/arch/arm/mach-mvebu/include/mach/gpio.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/arch/arm/mach-mvebu/include/mach/gpio.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 6/7] ARM: mvebu: remove unused mach/gpio.h
2015-11-30 23:00 ` [PATCH 6/7] ARM: mvebu: remove unused mach/gpio.h Arnd Bergmann
@ 2015-12-01 12:53 ` Gregory CLEMENT
0 siblings, 0 replies; 13+ messages in thread
From: Gregory CLEMENT @ 2015-12-01 12:53 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Greg Ungerer, linux-omap,
linux-arm-kernel
Hi Arnd,
On mar., déc. 01 2015, Arnd Bergmann <arnd@arndb.de> wrote:
> 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 <arnd@arndb.de>
Applied on mvebu/cleanup
Thanks,
Gregory
> ---
> 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
>
> diff --git a/arch/arm/mach-mvebu/include/mach/gpio.h b/arch/arm/mach-mvebu/include/mach/gpio.h
> deleted file mode 100644
> index 40a8c178f10d..000000000000
> --- a/arch/arm/mach-mvebu/include/mach/gpio.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* empty */
> --
> 2.1.0.rc2
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 7/7] ARM: netx: remove unused mach/param.h
2015-11-30 23:00 [PATCH 0/7] ARM: make mach/*.h headers more local Arnd Bergmann
` (5 preceding siblings ...)
2015-11-30 23:00 ` [PATCH 6/7] ARM: mvebu: remove unused mach/gpio.h Arnd Bergmann
@ 2015-11-30 23:00 ` Arnd Bergmann
6 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2015-11-30 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Jason Cooper, Wan ZongShun, Tony Lindgren,
Sekhar Nori, Kevin Hilman, Arnd Bergmann, Greg Ungerer,
Gregory Clement, linux-omap
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 <arnd@arndb.de>
---
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
diff --git a/arch/arm/mach-netx/include/mach/param.h b/arch/arm/mach-netx/include/mach/param.h
deleted file mode 100644
index a771459206aa..000000000000
--- a/arch/arm/mach-netx/include/mach/param.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * arch/arm/mach-netx/include/mach/param.h
- *
- * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, 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
- */
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 13+ messages in thread