iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: s3c24xx: stop including mach/hardware.h from mach/io.h

Browse Source 
A number of other files rely on mach/map.h to be indirectly
included from mach/io.h through mach/hardware.h.

Reduce this to the minimal plat/map-base.h and add explicit
includes everywhere else.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200806182059.2431-38-krzk@kernel.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Arnd Bergmann 2020-08-06 20:20:55 +02:00 committed by Krzysztof Kozlowski
parent c38758e3d5
commit a3814e55b4
22 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
#include <linux/clk/samsung.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <asm/irq.h>
#include <asm/cacheflush.h>

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

@ -14,6 +14,8 @@
#ifndef GPIO_SAMSUNG_S3C24XX_H
#define GPIO_SAMSUNG_S3C24XX_H
#include <mach/map.h>
/*
* GPIO sizes for various SoCs:
*

7
arch/arm/mach-s3c24xx/include/mach/hardware.h
View File

@ -9,13 +9,6 @@
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
#ifndef __ASSEMBLY__
extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);
#endif /* __ASSEMBLY__ */
#include <linux/sizes.h>
#include <mach/map.h>
#endif /* __ASM_ARCH_HARDWARE_H */

3
arch/arm/mach-s3c24xx/include/mach/io.h
View File

@ -10,8 +10,7 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#include <mach/hardware.h>
#include <plat/map-base.h>
/*
* ISA style IO, for each machine to sort out mappings for,

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

@ -9,6 +9,8 @@
#ifndef __ASM_ARM_REGS_CLOCK
#define __ASM_ARM_REGS_CLOCK
#include <mach/map.h>
#define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)
#define S3C2410_PLLVAL(_m,_p,_s) ((_m) << 12 | ((_p) << 4) | ((_s)))

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

@ -10,6 +10,8 @@
#ifndef __ASM_ARCH_REGS_GPIO_H
#define __ASM_ARCH_REGS_GPIO_H
#include <plat/map-s3c.h>
#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)
/* general configuration options */

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

@ -8,6 +8,8 @@
#ifndef ___ASM_ARCH_REGS_IRQ_H
#define ___ASM_ARCH_REGS_IRQ_H
#include <plat/map-s3c.h>
/* interrupt controller */
#define S3C2410_IRQREG(x) ((x) + S3C24XX_VA_IRQ)

1
arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h
View File

@ -11,6 +11,7 @@
#define __ASM_ARM_REGS_S3C2443_CLOCK
#include <linux/delay.h>
#include <plat/map-s3c.h>
#define S3C2443_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)

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

@ -8,6 +8,8 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H
#define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__
#include <plat/map-s3c.h>
#define S3C2412_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2412_EBIREG(x) (S3C2412_VA_EBI + (x))

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

@ -48,6 +48,7 @@
#include <sound/uda1380.h>
#include <linux/platform_data/fb-s3c2410.h>
#include <mach/map.h>
#include <mach/hardware.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>

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

@ -31,6 +31,7 @@
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <linux/platform_data/fb-s3c2410.h>
#include <mach/gpio-samsung.h>

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

@ -46,6 +46,7 @@
#include <sound/uda1380.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>

1
arch/arm/mach-s3c24xx/pm-h1940.S
View File

@ -7,7 +7,6 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>

2
arch/arm/mach-s3c24xx/regs-mem.h
View File

@ -9,6 +9,8 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H
#define __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H __FILE__
#include <plat/map-s3c.h>
#define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2410_BWSCON S3C2410_MEMREG(0x00)

2
arch/arm/mach-s3c24xx/s3c2410.c
View File

@ -25,7 +25,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/gpio-samsung.h>
#include <asm/irq.h>
#include <asm/system_misc.h>

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

@ -29,7 +29,7 @@
#include <asm/irq.h>
#include <asm/system_misc.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>

2
arch/arm/mach-s3c24xx/s3c2416.c
View File

@ -26,7 +26,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/gpio-samsung.h>
#include <asm/proc-fns.h>
#include <asm/irq.h>

2
arch/arm/mach-s3c24xx/s3c2443.c
View File

@ -23,7 +23,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/gpio-samsung.h>
#include <mach/irqs.h>
#include <asm/irq.h>

2
arch/arm/mach-s3c24xx/s3c244x.c
View File

@ -25,7 +25,7 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <asm/irq.h>
#include <mach/regs-clock.h>

1
arch/arm/mach-s3c24xx/sleep-s3c2410.S
View File

@ -13,7 +13,6 @@
#include <linux/linkage.h>
#include <linux/serial_s3c.h>
#include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>

1
arch/arm/mach-s3c24xx/sleep-s3c2412.S
View File

@ -8,7 +8,6 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-irq.h>

1
arch/arm/mach-s3c24xx/sleep.S
View File

@ -13,7 +13,6 @@
#include <linux/linkage.h>
#include <linux/serial_s3c.h>
#include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>