diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-08-06 21:20:37 +0300 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2020-08-19 22:40:14 +0300 |
| commit | 0144e3fce3d601561fb51d0362316ca745c830df (patch) | |
| tree | cc6f08d2d815bab5cbc35a5684cbc53ce03c0565 | |
| parent | a07c4a8c169bc072cceeda1c98a7c37fdde498a3 (diff) | |
| download | linux-0144e3fce3d601561fb51d0362316ca745c830df.tar.xz | |
ARM: s3c24xx: move regs-spi.h into spi driver
The file is mostly specific to the driver, the few bits that
are actually used by the platform code get moved to mach/map.h
instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20200806182059.2431-20-krzk@kernel.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/map.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c2412.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 1 | ||||
| -rw-r--r-- | drivers/spi/spi-s3c24xx-fiq.S | 4 | ||||
| -rw-r--r-- | drivers/spi/spi-s3c24xx-regs.h (renamed from arch/arm/plat-samsung/include/plat/regs-spi.h) | 9 | ||||
| -rw-r--r-- | drivers/spi/spi-s3c24xx.c | 3 |
6 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/map.h b/arch/arm/mach-s3c24xx/include/mach/map.h index bca93112f57d..a20c9fd0d855 100644 --- a/arch/arm/mach-s3c24xx/include/mach/map.h +++ b/arch/arm/mach-s3c24xx/include/mach/map.h @@ -86,6 +86,8 @@ #define S3C2410_PA_SPI (0x59000000) #define S3C2443_PA_SPI0 (0x52000000) #define S3C2443_PA_SPI1 S3C2410_PA_SPI +#define S3C2410_SPI1 (0x20) +#define S3C2412_SPI1 (0x100) /* SDI */ #define S3C2410_PA_SDI (0x5A000000) diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c index 8fe4d4670dcb..c3fb3e6c0dd8 100644 --- a/arch/arm/mach-s3c24xx/s3c2412.c +++ b/arch/arm/mach-s3c24xx/s3c2412.c @@ -37,7 +37,6 @@ #include <plat/cpu-freq.h> #include <plat/devs.h> #include <plat/pm.h> -#include <plat/regs-spi.h> #include "common.h" #include "nand-core.h" diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 0607d2984841..0ed3a4b9fc12 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -61,7 +61,6 @@ #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-ohci-s3c2410.h> #include <plat/usb-phy.h> -#include <plat/regs-spi.h> #include <linux/platform_data/asoc-s3c.h> #include <linux/platform_data/spi-s3c64xx.h> diff --git a/drivers/spi/spi-s3c24xx-fiq.S b/drivers/spi/spi-s3c24xx-fiq.S index e95d6282109e..9d5f8f1e5e81 100644 --- a/drivers/spi/spi-s3c24xx-fiq.S +++ b/drivers/spi/spi-s3c24xx-fiq.S @@ -12,10 +12,12 @@ #include <mach/map.h> #include <mach/regs-irq.h> -#include <plat/regs-spi.h> #include "spi-s3c24xx-fiq.h" +#define S3C2410_SPTDAT (0x10) +#define S3C2410_SPRDAT (0x14) + .text @ entry to these routines is as follows, with the register names diff --git a/arch/arm/plat-samsung/include/plat/regs-spi.h b/drivers/spi/spi-s3c24xx-regs.h index 607844311566..f51464ab5677 100644 --- a/arch/arm/plat-samsung/include/plat/regs-spi.h +++ b/drivers/spi/spi-s3c24xx-regs.h @@ -5,11 +5,8 @@ * S3C2410 SPI register definition */ -#ifndef __ASM_ARCH_REGS_SPI_H -#define __ASM_ARCH_REGS_SPI_H - -#define S3C2410_SPI1 (0x20) -#define S3C2412_SPI1 (0x100) +#ifndef __SPI_S3C2410_H +#define __SPI_S3C2410_H #define S3C2410_SPCON (0x00) @@ -41,4 +38,4 @@ #define S3C2410_SPTDAT (0x10) #define S3C2410_SPRDAT (0x14) -#endif /* __ASM_ARCH_REGS_SPI_H */ +#endif /* __SPI_S3C2410_H */ diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index 2cb3b611c294..0691248c7c0d 100644 --- a/drivers/spi/spi-s3c24xx.c +++ b/drivers/spi/spi-s3c24xx.c @@ -21,10 +21,9 @@ #include <linux/spi/s3c24xx.h> #include <linux/module.h> -#include <plat/regs-spi.h> - #include <asm/fiq.h> +#include "spi-s3c24xx-regs.h" #include "spi-s3c24xx-fiq.h" /** |