[v2,20/41] ARM: s3c24xx: move regs-spi.h into spi driver

Message ID	20200806182059.2431-20-krzk@kernel.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=5lch=BQ=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DDA522CAF From: Krzysztof Kozlowski <krzk@kernel.org> To: linux-kernel@vger.kernel.org Subject: [PATCH v2 20/41] ARM: s3c24xx: move regs-spi.h into spi driver Date: Thu, 6 Aug 2020 20:20:37 +0200 Message-Id: <20200806182059.2431-20-krzk@kernel.org> In-Reply-To: <20200806181932.2253-1-krzk@kernel.org> References: <20200806181932.2253-1-krzk@kernel.org> summary: Content analysis details: (-1.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [194.230.155.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender Precedence: list Cc: linux-samsung-soc@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Russell King <linux@armlinux.org.uk>, Krzysztof Kozlowski <krzk@kernel.org>, linux-spi@vger.kernel.org, Mark Brown <broonie@kernel.org>, Kukjin Kim <kgene@kernel.org>, Andi Shyti <andi@etezian.org>, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
Series	[v2,01/41] ARM: s3c: Remove unneeded machine header includes \| expand [v2,01/41] ARM: s3c: Remove unneeded machine header includes [v2,02/41] mmc: s3cmci: Remove unneeded machine header include [v2,03/41] ARM: s3c24xx: fix mmc gpio lookup tables [v2,04/41] ARM: s3c24xx: iotiming: make functions static [v2,05/41] ARM: s3c24xx: make S3C24XX_MISCCR access indirect [v2,06/41] ARM: s3c24xx: pass pointer to clk driver via platform data [v2,07/41] ARM: s3c24xx: simplify mach/io.h [v2,08/41] usb: gadget: s3c: use platform resources [v2,09/41] usb: gadget: s3c-hsudc: remove platform header dependency [v2,10/41] ARM: samsung: don't build plat/pm-common for Exynos [v2,11/41] ARM: samsung: remove s3c_pm_debug_init() [v2,12/41] ARM: samsung: make pm-debug platform independent [v2,13/41] ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug [v2,14/41] ARM: exynos: use private samsung_cpu_id copy [v2,15/41] ARM: exynos: stop selecting PLAT_SAMSUNG [v2,16/41] ARM: samsung: move pm check code to drivers/soc [v2,17/41] ARM: s5pv210: use private pm save/restore [v2,18/41] ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG [v2,19/41] ARM: s3c64xx: remove mach/hardware.h [v2,20/41] ARM: s3c24xx: move regs-spi.h into spi driver [v2,21/41] ARM: s3c24xx: move irqchip driver back into platform [v2,22/41] ARM: s3c: adc: move header to linux/soc/samsung [v2,23/41] ARM: s3c24xx: move spi fiq handler into platform [v2,24/41] ASoC: samsung: h1940: turn into platform driver [v2,25/41] ASoC: samsung: neo1973: turn into platform driver [v2,26/41] ASoC: samsung: rx1950: turn into platform driver [v2,28/41] ARM: s3c24xx: move iis pinctrl config into boards [v2,29/41] ARM: s3c24xx: move s3cmci pinctrl handling into board files [v2,30/41] ARM: s3c24xx: include mach/irqs.h where needed [v2,31/41] ARM: s3c24xx: spi: avoid hardcoding fiq number in driver [v2,32/41] ARM: s3c24xx: bast: avoid irq_desc array usage [v2,33/41] fbdev: s3c2410fb: remove mach header dependency [v2,34/41] cpufreq: s3c24xx: split out registers [v2,35/41] ARM: s3c: remove cpufreq header dependencies [v2,36/41] cpufreq: s3c2412: use global s3c2412_cpufreq_setrefresh [v2,37/41] cpufreq: s3c24xx: move low-level clk reg access into platform code [v2,38/41] ARM: s3c24xx: stop including mach/hardware.h from mach/io.h [v2,40/41] ARM: s3c: make headers local if possible

Message ID

20200806182059.2431-20-krzk@kernel.org (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DDA522CAF
From: Krzysztof Kozlowski <krzk@kernel.org>
To: linux-kernel@vger.kernel.org
Subject: [PATCH v2 20/41] ARM: s3c24xx: move regs-spi.h into spi driver
Date: Thu,  6 Aug 2020 20:20:37 +0200
Message-Id: <20200806182059.2431-20-krzk@kernel.org>
In-Reply-To: <20200806181932.2253-1-krzk@kernel.org>
References: <20200806181932.2253-1-krzk@kernel.org>
Precedence: list
Cc: linux-samsung-soc@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
 Russell King <linux@armlinux.org.uk>, Krzysztof Kozlowski <krzk@kernel.org>,
 linux-spi@vger.kernel.org, Mark Brown <broonie@kernel.org>,
 Kukjin Kim <kgene@kernel.org>, Andi Shyti <andi@etezian.org>,
 linux-arm-kernel@lists.infradead.org
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: 
 linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Series

[v2,01/41] ARM: s3c: Remove unneeded machine header includes | expand

Commit Message

Krzysztof Kozlowski Aug. 6, 2020, 6:20 p.m. UTC

From: Arnd Bergmann <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>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 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 +++-
 .../plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h    | 9 +++------
 drivers/spi/spi-s3c24xx.c                                | 3 +--
 6 files changed, 9 insertions(+), 11 deletions(-)
 rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (89%)

Comments

Mark Brown Aug. 7, 2020, 11:34 a.m. UTC | #1

On Thu, Aug 06, 2020 at 08:20:37PM +0200, Krzysztof Kozlowski wrote:
> From: Arnd Bergmann <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.

Acked-by: Mark Brown <broonie@kernel.org>

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
similarity index 89%
rename from arch/arm/plat-samsung/include/plat/regs-spi.h
rename to 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 7742170fca91..92be0c6d798a 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"
 
 /**

[v2,20/41] ARM: s3c24xx: move regs-spi.h into spi driver

Commit Message

Comments

Patch