From: Arnd Bergmann <arnd@arndb.de> To: Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Andi Shyti <andi@etezian.org>, Mark Brown <broonie@kernel.org> Cc: linux-samsung-soc@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Date: Thu, 10 Oct 2019 22:29:57 +0200 [thread overview] Message-ID: <20191010203043.1241612-13-arnd@arndb.de> (raw) In-Reply-To: <20191010203043.1241612-1-arnd@arndb.de> 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> --- arch/arm/mach-s3c24xx/include/mach/map.h | 2 ++ arch/arm/mach-s3c24xx/s3c2412.c | 1 - arch/arm/plat-samsung/devs.c | 1 - drivers/spi/spi-s3c24xx-fiq.S | 4 +++- .../include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h | 3 --- drivers/spi/spi-s3c24xx.c | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (95%) 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 6e4c1cb07104..fd94a35e22f8 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -59,7 +59,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 similarity index 95% rename from arch/arm/plat-samsung/include/plat/regs-spi.h rename to drivers/spi/spi-s3c24xx-regs.h index 607844311566..37b93ff7c7fe 100644 --- a/arch/arm/plat-samsung/include/plat/regs-spi.h +++ b/drivers/spi/spi-s3c24xx-regs.h @@ -8,9 +8,6 @@ #ifndef __ASM_ARCH_REGS_SPI_H #define __ASM_ARCH_REGS_SPI_H -#define S3C2410_SPI1 (0x20) -#define S3C2412_SPI1 (0x100) - #define S3C2410_SPCON (0x00) #define S3C2410_SPCON_SMOD_DMA (2 << 5) /* DMA mode */ diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index 2d6e37f25e2d..2f395e4861f6 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" /** -- 2.20.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de> To: Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Andi Shyti <andi@etezian.org>, Mark Brown <broonie@kernel.org> Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Date: Thu, 10 Oct 2019 22:29:57 +0200 [thread overview] Message-ID: <20191010203043.1241612-13-arnd@arndb.de> (raw) Message-ID: <20191010202957.1dQJaCBVu4RDyUPQZhnzaIx1hBJdgwX1ZX1fYo3Nwaw@z> (raw) In-Reply-To: <20191010203043.1241612-1-arnd@arndb.de> 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> --- arch/arm/mach-s3c24xx/include/mach/map.h | 2 ++ arch/arm/mach-s3c24xx/s3c2412.c | 1 - arch/arm/plat-samsung/devs.c | 1 - drivers/spi/spi-s3c24xx-fiq.S | 4 +++- .../include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h | 3 --- drivers/spi/spi-s3c24xx.c | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (95%) 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 6e4c1cb07104..fd94a35e22f8 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -59,7 +59,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 similarity index 95% rename from arch/arm/plat-samsung/include/plat/regs-spi.h rename to drivers/spi/spi-s3c24xx-regs.h index 607844311566..37b93ff7c7fe 100644 --- a/arch/arm/plat-samsung/include/plat/regs-spi.h +++ b/drivers/spi/spi-s3c24xx-regs.h @@ -8,9 +8,6 @@ #ifndef __ASM_ARCH_REGS_SPI_H #define __ASM_ARCH_REGS_SPI_H -#define S3C2410_SPI1 (0x20) -#define S3C2412_SPI1 (0x100) - #define S3C2410_SPCON (0x00) #define S3C2410_SPCON_SMOD_DMA (2 << 5) /* DMA mode */ diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index 2d6e37f25e2d..2f395e4861f6 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" /** -- 2.20.0
next prev parent reply other threads:[~2019-10-10 20:29 UTC|newest] Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-10 20:28 [PATCH 00/36] ARM: samsung platform cleanup Arnd Bergmann 2019-10-10 20:28 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 02/36] ARM: s3c: simplify mach/io.h Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 03/36] usb: gadget: s3c: use platform resources Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:06 ` Krzysztof Kozlowski 2019-10-23 12:46 ` Krzysztof Kozlowski 2019-10-23 13:26 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 04/36] usb: gadget: s3c-hsudc: remove platform header dependency Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:09 ` Krzysztof Kozlowski 2019-10-23 12:21 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 05/36] ARM: samsung: make pm-debug platform independent Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:27 ` Krzysztof Kozlowski 2019-10-23 12:13 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 06/36] ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:12 ` Krzysztof Kozlowski 2019-10-23 12:22 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 07/36] ARM: exynos: use private samsung_cpu_id copy Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:54 ` Krzysztof Kozlowski 2019-10-23 12:37 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 08/36] ARM: exynos: stop selecting PLAT_SAMSUNG Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-15 14:12 ` Ulf Hansson 2019-10-23 10:57 ` Krzysztof Kozlowski 2019-10-23 12:43 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 09/36] ARM: samsung: move pm check code to drivers/soc Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 11:32 ` Krzysztof Kozlowski 2019-10-23 12:45 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 10/36] ARM: s5pv210: use private pm save/restore Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 11:55 ` Krzysztof Kozlowski 2019-10-23 13:12 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-11 5:51 ` Uwe Kleine-König 2019-10-11 5:51 ` Uwe Kleine-König 2019-10-22 14:01 ` Arnd Bergmann 2019-10-22 15:53 ` Uwe Kleine-König 2019-10-22 16:20 ` Arnd Bergmann 2019-10-15 14:13 ` Ulf Hansson 2019-10-15 14:23 ` Thierry Reding 2019-10-23 12:14 ` Krzysztof Kozlowski 2019-10-23 13:17 ` Arnd Bergmann 2019-10-23 14:12 ` Krzysztof Kozlowski 2019-10-10 20:29 ` [PATCH 12/36] ARM: s3c64xx: remove mach/hardware.h Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-16 10:09 ` Charles Keepax 2019-10-10 20:29 ` Arnd Bergmann [this message] 2019-10-10 20:29 ` [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Arnd Bergmann 2019-10-23 12:32 ` Krzysztof Kozlowski 2019-10-23 13:21 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 14/36] ARM: s3c: move irqchip driver back into platform Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-10 22:20 ` Guenter Roeck 2019-10-10 22:20 ` Guenter Roeck 2019-10-10 22:29 ` Dmitry Torokhov 2019-10-10 22:29 ` Dmitry Torokhov 2019-10-10 22:44 ` Sebastian Reichel 2019-10-10 22:44 ` Sebastian Reichel 2019-10-23 12:37 ` Krzysztof Kozlowski 2019-10-23 13:23 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 16/36] ARM: s3c: move spi fiq handler into platform Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 17/36] ARM: s3c: h1940-audio: turn into platform driver Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 18/36] ARM: s3c: gta02-audio: " Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 19/36] ARM: s3c: rx1950: " Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 20/36] ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-11 10:50 ` Mark Brown 2019-10-11 10:50 ` Mark Brown 2019-10-10 20:30 ` [PATCH 21/36] ARM: s3c: move iis pinctrl config into boards Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 12:50 ` Krzysztof Kozlowski 2019-10-23 13:29 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 22/36] ARM: s3c: leds: move setpull() calls into board files Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 23/36] ARM: s3c: move s3cmci pinctrl handling " Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-15 14:12 ` Ulf Hansson 2019-10-16 13:12 ` Linus Walleij 2019-10-10 20:30 ` [PATCH 24/36] ARM: s3c: include mach/irqs.h where needed Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 25/36] ARM: s3c: spi: avoid hardcoding fiq number in driver Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 26/36] ARM: s3c: bast: avoid irq_desc array usage Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 27/36] ARM: s3c: fix mmc gpio lookup tables Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 28/36] fbdev: s3c2410fb: remove mach header dependency Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:13 ` Krzysztof Kozlowski 2019-10-23 13:35 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 29/36] ARM: s3c: cpufreq: split out registers Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 30/36] ARM: s3c: remove cpufreq header dependencies Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:38 ` Krzysztof Kozlowski 2019-10-23 13:46 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 31/36] ARM: s3c: cpufreq: use global s3c2412_cpufreq_setrefresh Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:44 ` Krzysztof Kozlowski 2019-10-23 13:57 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 32/36] ARM: s3c: iotiming: make functions static Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 33/36] ARM: s3c: move low-level clk reg access into platform code Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:49 ` Krzysztof Kozlowski 2019-10-23 13:54 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 21:02 ` Russell King - ARM Linux admin 2019-10-10 21:02 ` Russell King - ARM Linux admin 2019-10-10 21:53 ` Arnd Bergmann 2019-10-10 21:53 ` Arnd Bergmann 2019-10-15 14:52 ` [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Tomasz Figa 2019-10-10 21:07 ` [PATCH 35/36] ARM: s3c: move into a common directory Arnd Bergmann 2019-10-10 21:07 ` Arnd Bergmann 2019-10-23 14:05 ` Krzysztof Kozlowski 2019-10-10 21:07 ` [PATCH 36/36] ARM: s3c: make headers local if possible Arnd Bergmann 2019-10-10 21:07 ` Arnd Bergmann 2019-10-23 13:10 ` [PATCH 00/36] ARM: samsung platform cleanup Krzysztof Kozlowski 2019-10-23 13:39 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191010203043.1241612-13-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=andi@etezian.org \ --cc=broonie@kernel.org \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).