Commit a3814e55 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski

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

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: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200806182059.2431-38-krzk@kernel.orgSigned-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent c38758e3
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/clk/samsung.h> #include <linux/clk/samsung.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#ifndef GPIO_SAMSUNG_S3C24XX_H #ifndef GPIO_SAMSUNG_S3C24XX_H
#define GPIO_SAMSUNG_S3C24XX_H #define GPIO_SAMSUNG_S3C24XX_H
#include <mach/map.h>
/* /*
* GPIO sizes for various SoCs: * GPIO sizes for various SoCs:
* *
......
...@@ -9,13 +9,6 @@ ...@@ -9,13 +9,6 @@
#ifndef __ASM_ARCH_HARDWARE_H #ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H
#ifndef __ASSEMBLY__
extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg); 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 */ #endif /* __ASM_ARCH_HARDWARE_H */
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#ifndef __ASM_ARM_ARCH_IO_H #ifndef __ASM_ARM_ARCH_IO_H
#define __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, * ISA style IO, for each machine to sort out mappings for,
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#ifndef __ASM_ARM_REGS_CLOCK #ifndef __ASM_ARM_REGS_CLOCK
#define __ASM_ARM_REGS_CLOCK #define __ASM_ARM_REGS_CLOCK
#include <mach/map.h>
#define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR) #define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)
#define S3C2410_PLLVAL(_m,_p,_s) ((_m) << 12 | ((_p) << 4) | ((_s))) #define S3C2410_PLLVAL(_m,_p,_s) ((_m) << 12 | ((_p) << 4) | ((_s)))
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#ifndef __ASM_ARCH_REGS_GPIO_H #ifndef __ASM_ARCH_REGS_GPIO_H
#define __ASM_ARCH_REGS_GPIO_H #define __ASM_ARCH_REGS_GPIO_H
#include <plat/map-s3c.h>
#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80) #define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)
/* general configuration options */ /* general configuration options */
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#ifndef ___ASM_ARCH_REGS_IRQ_H #ifndef ___ASM_ARCH_REGS_IRQ_H
#define ___ASM_ARCH_REGS_IRQ_H #define ___ASM_ARCH_REGS_IRQ_H
#include <plat/map-s3c.h>
/* interrupt controller */ /* interrupt controller */
#define S3C2410_IRQREG(x) ((x) + S3C24XX_VA_IRQ) #define S3C2410_IRQREG(x) ((x) + S3C24XX_VA_IRQ)
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define __ASM_ARM_REGS_S3C2443_CLOCK #define __ASM_ARM_REGS_S3C2443_CLOCK
#include <linux/delay.h> #include <linux/delay.h>
#include <plat/map-s3c.h>
#define S3C2443_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR) #define S3C2443_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H #ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H
#define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__ #define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__
#include <plat/map-s3c.h>
#define S3C2412_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x)) #define S3C2412_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2412_EBIREG(x) (S3C2412_VA_EBI + (x)) #define S3C2412_EBIREG(x) (S3C2412_VA_EBI + (x))
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include <sound/uda1380.h> #include <sound/uda1380.h>
#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/fb-s3c2410.h>
#include <mach/map.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/fb-s3c2410.h>
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <sound/uda1380.h> #include <sound/uda1380.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H #ifndef __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H
#define __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H __FILE__ #define __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H __FILE__
#include <plat/map-s3c.h>
#define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x)) #define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2410_BWSCON S3C2410_MEMREG(0x00) #define S3C2410_BWSCON S3C2410_MEMREG(0x00)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/hardware.h> #include <mach/map.h>
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include <mach/hardware.h> #include <mach/map.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/hardware.h> #include <mach/map.h>
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
#include <asm/irq.h> #include <asm/irq.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/hardware.h> #include <mach/map.h>
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <asm/irq.h> #include <asm/irq.h>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/hardware.h> #include <mach/map.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/serial_s3c.h> #include <linux/serial_s3c.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-irq.h> #include <mach/regs-irq.h>
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/serial_s3c.h> #include <linux/serial_s3c.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment