diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index f987de1a61c252ea7dcbc97bbd0c2600d8ee2711..30b0dcd20f17e503b4944e5709aace4f29f9c154 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h index 2ad22b2d459bc1b09dcc065ba2fda8a65f188cf3..f8a114891f165c4b475230158937cc0ef30ac33a 100644 --- a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +++ b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h @@ -14,6 +14,8 @@ #ifndef GPIO_SAMSUNG_S3C24XX_H #define GPIO_SAMSUNG_S3C24XX_H +#include <mach/map.h> + /* * GPIO sizes for various SoCs: * diff --git a/arch/arm/mach-s3c24xx/include/mach/hardware.h b/arch/arm/mach-s3c24xx/include/mach/hardware.h index f28ac6c78d8229d73b65e7e6f4fc1e366ff6e7b9..c732ea54984c16d459fb7a4e5eb8dcf3304e4e6d 100644 --- a/arch/arm/mach-s3c24xx/include/mach/hardware.h +++ b/arch/arm/mach-s3c24xx/include/mach/hardware.h @@ -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 */ diff --git a/arch/arm/mach-s3c24xx/include/mach/io.h b/arch/arm/mach-s3c24xx/include/mach/io.h index 3e8bff26cdd5ddb52e827317b8d7aa40d5dc0ac2..bcddf615adb6f55236d73b9e58565523e1bdf532 100644 --- a/arch/arm/mach-s3c24xx/include/mach/io.h +++ b/arch/arm/mach-s3c24xx/include/mach/io.h @@ -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, diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h index 7ca3dd4f13c0130ba1c4cfba211d03389069fbbd..da4e7b3aeba652aec0f274b38f64cd79eb9230a5 100644 --- a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h +++ b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h @@ -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))) diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h b/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h index 594e967c0673851f5e23bd135f99d4440d6ad352..51827d5577b6fe3d7a91ab2e656549721a637ee7 100644 --- a/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h +++ b/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h @@ -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 */ diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-irq.h b/arch/arm/mach-s3c24xx/include/mach/regs-irq.h index 8d8e669e3903591112dec0297444a47ff5fcb199..2921b48c56b2dc3394813e8cf8038ccb82b7d0d0 100644 --- a/arch/arm/mach-s3c24xx/include/mach/regs-irq.h +++ b/arch/arm/mach-s3c24xx/include/mach/regs-irq.h @@ -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) diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h index 682759549e63173aa1babdbf865d195ceec0cbc1..fefef7233f4b4c19097b90724e43c8d7c79798cd 100644 --- a/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h +++ b/arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h @@ -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) diff --git a/arch/arm/mach-s3c24xx/include/mach/s3c2412.h b/arch/arm/mach-s3c24xx/include/mach/s3c2412.h index 4ff83f956cfb30a02d97a2b07ba03dc01cc424cb..1ae369c81bebd12864da35619b283b47bb359d29 100644 --- a/arch/arm/mach-s3c24xx/include/mach/s3c2412.h +++ b/arch/arm/mach-s3c24xx/include/mach/s3c2412.h @@ -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)) diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index d458258988356e547b79f8a01839820df6381e9b..3cb56fc9db5cc344de6d4ba004900495307c9713 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c index ec6c40ea8f8639747d2e96158909388d31cfa61d..9ef8733be3fdb0ff7cf34f3107b3be24a65c453b 100644 --- a/arch/arm/mach-s3c24xx/mach-jive.c +++ b/arch/arm/mach-s3c24xx/mach-jive.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 2513ce7fa026d21cd49f908aa5a567f346108232..af6300076b0a40b741e2fc45f93d3201f004b4e4 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -46,6 +46,7 @@ #include <sound/uda1380.h> +#include <mach/hardware.h> #include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> diff --git a/arch/arm/mach-s3c24xx/pm-h1940.S b/arch/arm/mach-s3c24xx/pm-h1940.S index a7bbe336ac6b6d28760434e05c6f9b57039dcd43..f9ee515e1cbe846906879b90a770f5fda1273f79 100644 --- a/arch/arm/mach-s3c24xx/pm-h1940.S +++ b/arch/arm/mach-s3c24xx/pm-h1940.S @@ -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> diff --git a/arch/arm/mach-s3c24xx/regs-mem.h b/arch/arm/mach-s3c24xx/regs-mem.h index 2f3bc48b589019e9609f5029d5bf13f7e35f6eea..5048ab8f06c2144de70c669b497a3b628ed39e19 100644 --- a/arch/arm/mach-s3c24xx/regs-mem.h +++ b/arch/arm/mach-s3c24xx/regs-mem.h @@ -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) diff --git a/arch/arm/mach-s3c24xx/s3c2410.c b/arch/arm/mach-s3c24xx/s3c2410.c index 8427c150dd22024507f3993388044a026f35ef4f..44bf3e1e77f1324aa254a522b0c5e3a7db884fc2 100644 --- a/arch/arm/mach-s3c24xx/s3c2410.c +++ b/arch/arm/mach-s3c24xx/s3c2410.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c index 209f952a6c98026cd19da085926ed8a8ce7bd382..75648dcc2c1de664eb9c159f0ae9573f821d29be 100644 --- a/arch/arm/mach-s3c24xx/s3c2412.c +++ b/arch/arm/mach-s3c24xx/s3c2412.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c index 9514196cad8cfc728675decdcc25df9f66e858c8..6576187b46381c083098ee9c6c43d578724084bc 100644 --- a/arch/arm/mach-s3c24xx/s3c2416.c +++ b/arch/arm/mach-s3c24xx/s3c2416.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c index 3c05d04bbbeb697686189f1d95724f9be01f108f..74794a55b01599091988e68a11a411d483c189fb 100644 --- a/arch/arm/mach-s3c24xx/s3c2443.c +++ b/arch/arm/mach-s3c24xx/s3c2443.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c index f5bd489bac850dfb8ca27e633f8a121788e6c6ce..0ca188d0ffe5fc19bd974c043572283d720f8223 100644 --- a/arch/arm/mach-s3c24xx/s3c244x.c +++ b/arch/arm/mach-s3c24xx/s3c244x.c @@ -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> diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S index 659f9eff9de2d808ea6557d00a64eee53cec2415..e4f6f64e78266b03e2433ca2d0d5d2f5e0846703 100644 --- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S +++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S @@ -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> diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S index c373f1ca862bca608b72e4bbce8b7624603e8cd7..434f5082b2edb4ff322f784803505025dc013362 100644 --- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S +++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S @@ -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> diff --git a/arch/arm/mach-s3c24xx/sleep.S b/arch/arm/mach-s3c24xx/sleep.S index f0f11ad60c52c4bc262ebb7194a0ab46f597bf39..4bda4a413584ff468252a9bb55532d31c8e3a1b0 100644 --- a/arch/arm/mach-s3c24xx/sleep.S +++ b/arch/arm/mach-s3c24xx/sleep.S @@ -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>