mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Arnd Bergmann 2020-08-06 20:20:37 +02:00 committed by Krzysztof Kozlowski
parent a07c4a8c16
commit 0144e3fce3
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c24xx/include/mach/map.h
View File

@ -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)

1
arch/arm/mach-s3c24xx/s3c2412.c
View File

@ -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"

1
arch/arm/plat-samsung/devs.c
View File

@ -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>

4
drivers/spi/spi-s3c24xx-fiq.S
View File

@ -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

9
arch/arm/plat-samsung/include/plat/regs-spi.h → drivers/spi/spi-s3c24xx-regs.h
View File

@ -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 */

3
drivers/spi/spi-s3c24xx.c
View File

@ -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"
/**