tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Arnd Bergmann and committed by
Krzysztof Kozlowski 0144e3fc a07c4a8c

+9 -11
+2
arch/arm/mach-s3c24xx/include/mach/map.h
··· 86 86 #define S3C2410_PA_SPI (0x59000000) 87 87 #define S3C2443_PA_SPI0 (0x52000000) 88 88 #define S3C2443_PA_SPI1 S3C2410_PA_SPI 89 + #define S3C2410_SPI1 (0x20) 90 + #define S3C2412_SPI1 (0x100) 89 91 90 92 /* SDI */ 91 93 #define S3C2410_PA_SDI (0x5A000000)
-1
arch/arm/mach-s3c24xx/s3c2412.c
··· 37 37 #include <plat/cpu-freq.h> 38 38 #include <plat/devs.h> 39 39 #include <plat/pm.h> 40 - #include <plat/regs-spi.h> 41 40 42 41 #include "common.h" 43 42 #include "nand-core.h"
-1
arch/arm/plat-samsung/devs.c
··· 61 61 #include <linux/platform_data/usb-s3c2410_udc.h> 62 62 #include <linux/platform_data/usb-ohci-s3c2410.h> 63 63 #include <plat/usb-phy.h> 64 - #include <plat/regs-spi.h> 65 64 #include <linux/platform_data/asoc-s3c.h> 66 65 #include <linux/platform_data/spi-s3c64xx.h> 67 66
+3 -6
arch/arm/plat-samsung/include/plat/regs-spi.h drivers/spi/spi-s3c24xx-regs.h
··· 5 5 * S3C2410 SPI register definition 6 6 */ 7 7 8 - #ifndef __ASM_ARCH_REGS_SPI_H 9 - #define __ASM_ARCH_REGS_SPI_H 10 - 11 - #define S3C2410_SPI1 (0x20) 12 - #define S3C2412_SPI1 (0x100) 8 + #ifndef __SPI_S3C2410_H 9 + #define __SPI_S3C2410_H 13 10 14 11 #define S3C2410_SPCON (0x00) 15 12 ··· 38 41 #define S3C2410_SPTDAT (0x10) 39 42 #define S3C2410_SPRDAT (0x14) 40 43 41 - #endif /* __ASM_ARCH_REGS_SPI_H */ 44 + #endif /* __SPI_S3C2410_H */
+3 -1
drivers/spi/spi-s3c24xx-fiq.S
··· 12 12 13 13 #include <mach/map.h> 14 14 #include <mach/regs-irq.h> 15 - #include <plat/regs-spi.h> 16 15 17 16 #include "spi-s3c24xx-fiq.h" 17 + 18 + #define S3C2410_SPTDAT (0x10) 19 + #define S3C2410_SPRDAT (0x14) 18 20 19 21 .text 20 22
+1 -2
drivers/spi/spi-s3c24xx.c
··· 21 21 #include <linux/spi/s3c24xx.h> 22 22 #include <linux/module.h> 23 23 24 - #include <plat/regs-spi.h> 25 - 26 24 #include <asm/fiq.h> 27 25 26 + #include "spi-s3c24xx-regs.h" 28 27 #include "spi-s3c24xx-fiq.h" 29 28 30 29 /**