diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-04-15 16:17:12 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-29 02:08:44 -0400 |
| commit | 5b7cc90496aaff4f0eb1750b91dedec342d69760 (patch) | |
| tree | f97d41461a3019e2827903dff9160a20c926c092 | |
| parent | 67e38f578aaebf34fc1278bbe45a78ee8c73dd33 (diff) | |
ARM: ep93xx: move private headers out of mach/*
gpio-ep93xx.h, hardware.h, and platform.h are only used in
arch/arm/mach-ep93xx, so we can move them one there and no
longer expose them to device drivers.
Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-ep93xx/adssphere.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/edb93xx.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/gesbc9312.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/gpio-ep93xx.h (renamed from arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/hardware.h (renamed from arch/arm/mach-ep93xx/include/mach/hardware.h) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/platform.h (renamed from arch/arm/mach-ep93xx/include/mach/platform.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/vision_ep9307.c | 4 |
14 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index bda6c3a5c923..5d3a3e302012 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/sizes.h> | 16 | #include <linux/sizes.h> |
| 17 | 17 | ||
| 18 | #include <mach/hardware.h> | 18 | #include "hardware.h" |
| 19 | 19 | ||
| 20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
| 21 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 9f43362eb62d..b9f523d9dc8c 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/clkdev.h> | 22 | #include <linux/clkdev.h> |
| 23 | #include <linux/soc/cirrus/ep93xx.h> | 23 | #include <linux/soc/cirrus/ep93xx.h> |
| 24 | 24 | ||
| 25 | #include <mach/hardware.h> | 25 | #include "hardware.h" |
| 26 | 26 | ||
| 27 | #include <asm/div64.h> | 27 | #include <asm/div64.h> |
| 28 | 28 | ||
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 3d245668846d..cc1382f879af 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -39,13 +39,13 @@ | |||
| 39 | #include <linux/usb/ohci_pdriver.h> | 39 | #include <linux/usb/ohci_pdriver.h> |
| 40 | #include <linux/random.h> | 40 | #include <linux/random.h> |
| 41 | 41 | ||
| 42 | #include <mach/hardware.h> | 42 | #include "hardware.h" |
| 43 | #include <linux/platform_data/video-ep93xx.h> | 43 | #include <linux/platform_data/video-ep93xx.h> |
| 44 | #include <linux/platform_data/keypad-ep93xx.h> | 44 | #include <linux/platform_data/keypad-ep93xx.h> |
| 45 | #include <linux/platform_data/spi-ep93xx.h> | 45 | #include <linux/platform_data/spi-ep93xx.h> |
| 46 | #include <linux/soc/cirrus/ep93xx.h> | 46 | #include <linux/soc/cirrus/ep93xx.h> |
| 47 | 47 | ||
| 48 | #include <mach/gpio-ep93xx.h> | 48 | #include "gpio-ep93xx.h" |
| 49 | 49 | ||
| 50 | #include <asm/mach/arch.h> | 50 | #include <asm/mach/arch.h> |
| 51 | #include <asm/mach/map.h> | 51 | #include <asm/mach/map.h> |
| @@ -125,7 +125,7 @@ void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits) | |||
| 125 | /** | 125 | /** |
| 126 | * ep93xx_chip_revision() - returns the EP93xx chip revision | 126 | * ep93xx_chip_revision() - returns the EP93xx chip revision |
| 127 | * | 127 | * |
| 128 | * See <mach/platform.h> for more information. | 128 | * See "platform.h" for more information. |
| 129 | */ | 129 | */ |
| 130 | unsigned int ep93xx_chip_revision(void) | 130 | unsigned int ep93xx_chip_revision(void) |
| 131 | { | 131 | { |
diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c index 88a4c9b089a5..821427107b11 100644 --- a/arch/arm/mach-ep93xx/dma.c +++ b/arch/arm/mach-ep93xx/dma.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
| 27 | 27 | ||
| 28 | #include <linux/platform_data/dma-ep93xx.h> | 28 | #include <linux/platform_data/dma-ep93xx.h> |
| 29 | #include <mach/hardware.h> | 29 | #include "hardware.h" |
| 30 | 30 | ||
| 31 | #include "soc.h" | 31 | #include "soc.h" |
| 32 | 32 | ||
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index 8e89ec8b6f0f..d96dd014dd23 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c | |||
| @@ -32,10 +32,10 @@ | |||
| 32 | 32 | ||
| 33 | #include <sound/cs4271.h> | 33 | #include <sound/cs4271.h> |
| 34 | 34 | ||
| 35 | #include <mach/hardware.h> | 35 | #include "hardware.h" |
| 36 | #include <linux/platform_data/video-ep93xx.h> | 36 | #include <linux/platform_data/video-ep93xx.h> |
| 37 | #include <linux/platform_data/spi-ep93xx.h> | 37 | #include <linux/platform_data/spi-ep93xx.h> |
| 38 | #include <mach/gpio-ep93xx.h> | 38 | #include "gpio-ep93xx.h" |
| 39 | 39 | ||
| 40 | #include <asm/mach-types.h> | 40 | #include <asm/mach-types.h> |
| 41 | #include <asm/mach/arch.h> | 41 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 0cca5b183309..ac48e3476587 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/sizes.h> | 16 | #include <linux/sizes.h> |
| 17 | 17 | ||
| 18 | #include <mach/hardware.h> | 18 | #include "hardware.h" |
| 19 | 19 | ||
| 20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
| 21 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h b/arch/arm/mach-ep93xx/gpio-ep93xx.h index 242af4a401ea..242af4a401ea 100644 --- a/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h +++ b/arch/arm/mach-ep93xx/gpio-ep93xx.h | |||
diff --git a/arch/arm/mach-ep93xx/include/mach/hardware.h b/arch/arm/mach-ep93xx/hardware.h index 8938906e780a..e7d850e04782 100644 --- a/arch/arm/mach-ep93xx/include/mach/hardware.h +++ b/arch/arm/mach-ep93xx/hardware.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #ifndef __ASM_ARCH_HARDWARE_H | 6 | #ifndef __ASM_ARCH_HARDWARE_H |
| 7 | #define __ASM_ARCH_HARDWARE_H | 7 | #define __ASM_ARCH_HARDWARE_H |
| 8 | 8 | ||
| 9 | #include <mach/platform.h> | 9 | #include "platform.h" |
| 10 | 10 | ||
| 11 | /* | 11 | /* |
| 12 | * The EP93xx has two external crystal oscillators. To generate the | 12 | * The EP93xx has two external crystal oscillators. To generate the |
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 373583c29825..c7f64e4ff6c7 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | 18 | ||
| 19 | #include <mach/hardware.h> | 19 | #include "hardware.h" |
| 20 | 20 | ||
| 21 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
| 22 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/platform.h index b4045a186239..b4045a186239 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/platform.h | |||
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 80ccb984d521..adc17289cc23 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
| 28 | #include <linux/gpio/machine.h> | 28 | #include <linux/gpio/machine.h> |
| 29 | 29 | ||
| 30 | #include <mach/hardware.h> | 30 | #include "hardware.h" |
| 31 | #include <mach/gpio-ep93xx.h> | 31 | #include "gpio-ep93xx.h" |
| 32 | 32 | ||
| 33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
| 34 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index cf0cb58b3454..f8f89551dbed 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
| @@ -25,9 +25,9 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/mtd/platnand.h> | 26 | #include <linux/mtd/platnand.h> |
| 27 | 27 | ||
| 28 | #include <mach/hardware.h> | 28 | #include "hardware.h" |
| 29 | #include <linux/platform_data/video-ep93xx.h> | 29 | #include <linux/platform_data/video-ep93xx.h> |
| 30 | #include <mach/gpio-ep93xx.h> | 30 | #include "gpio-ep93xx.h" |
| 31 | 31 | ||
| 32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 85b74ac943f0..bba6aa5d7106 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
| @@ -23,8 +23,8 @@ | |||
| 23 | #include <linux/mmc/host.h> | 23 | #include <linux/mmc/host.h> |
| 24 | #include <linux/platform_data/spi-ep93xx.h> | 24 | #include <linux/platform_data/spi-ep93xx.h> |
| 25 | 25 | ||
| 26 | #include <mach/gpio-ep93xx.h> | 26 | #include "gpio-ep93xx.h" |
| 27 | #include <mach/hardware.h> | 27 | #include "hardware.h" |
| 28 | #include <mach/irqs.h> | 28 | #include <mach/irqs.h> |
| 29 | 29 | ||
| 30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index 767ee64628dc..66e2b34aa779 100644 --- a/arch/arm/mach-ep93xx/vision_ep9307.c +++ b/arch/arm/mach-ep93xx/vision_ep9307.c | |||
| @@ -31,10 +31,10 @@ | |||
| 31 | 31 | ||
| 32 | #include <sound/cs4271.h> | 32 | #include <sound/cs4271.h> |
| 33 | 33 | ||
| 34 | #include <mach/hardware.h> | 34 | #include "hardware.h" |
| 35 | #include <linux/platform_data/video-ep93xx.h> | 35 | #include <linux/platform_data/video-ep93xx.h> |
| 36 | #include <linux/platform_data/spi-ep93xx.h> | 36 | #include <linux/platform_data/spi-ep93xx.h> |
| 37 | #include <mach/gpio-ep93xx.h> | 37 | #include "gpio-ep93xx.h" |
| 38 | 38 | ||
| 39 | #include <asm/mach-types.h> | 39 | #include <asm/mach-types.h> |
| 40 | #include <asm/mach/map.h> | 40 | #include <asm/mach/map.h> |
