diff --git a/arch/arm/mach-s3c/include/plat/adc-core.h b/arch/arm/mach-s3c/adc-core.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/adc-core.h rename to arch/arm/mach-s3c/adc-core.h diff --git a/arch/arm/mach-s3c/adc.c b/arch/arm/mach-s3c/adc.c index e35e04417cce4a9abc2acd7614874f3d98cac00e..0232520d3c13c33550c1a082ec554e67ea63ee45 100644 --- a/arch/arm/mach-s3c/adc.c +++ b/arch/arm/mach-s3c/adc.c @@ -19,7 +19,7 @@ #include <linux/io.h> #include <linux/regulator/consumer.h> -#include <plat/regs-adc.h> +#include "regs-adc.h" #include <linux/soc/samsung/s3c-adc.h> /* This driver is designed to control the usage of the ADC block between diff --git a/arch/arm/mach-s3c/bast-ide.c b/arch/arm/mach-s3c/bast-ide.c index ee6fbb407640060ffce4e9d6f7e6da3ff52c25ce..da64db1811d88d2be8c0018f6f04bf4f9833c3b4 100644 --- a/arch/arm/mach-s3c/bast-ide.c +++ b/arch/arm/mach-s3c/bast-ide.c @@ -19,7 +19,7 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/map.h> +#include "map.h" #include <mach/irqs.h> #include "bast.h" diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c index 141a35d58dd749edef5da0a95c244d066e2c2fb1..d299f124e6dc5979b549b839afe73bfb40e1745e 100644 --- a/arch/arm/mach-s3c/bast-irq.c +++ b/arch/arm/mach-s3c/bast-irq.c @@ -15,7 +15,7 @@ #include <asm/mach-types.h> #include <asm/mach/irq.h> -#include <mach/regs-irq.h> +#include "regs-irq.h" #include <mach/irqs.h> #include "bast.h" diff --git a/arch/arm/mach-s3c/common-smdk-s3c24xx.c b/arch/arm/mach-s3c/common-smdk-s3c24xx.c index e3281dc3af130820bd6eba4e68ab9621f96327cb..353bc22ce448252a8857561f41d936de5c2c34a5 100644 --- a/arch/arm/mach-s3c/common-smdk-s3c24xx.c +++ b/arch/arm/mach-s3c/common-smdk-s3c24xx.c @@ -31,14 +31,14 @@ #include <asm/mach-types.h> #include <asm/irq.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <linux/platform_data/leds-s3c24xx.h> #include <linux/platform_data/mtd-nand-s3c2410.h> -#include <plat/gpio-cfg.h> -#include <plat/devs.h> -#include <plat/pm.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "pm.h" #include "common-smdk-s3c24xx.h" diff --git a/arch/arm/mach-s3c/cpu.c b/arch/arm/mach-s3c/cpu.c index 8acba21bbf4bd10a43c5b1e886922890152ae97b..6e9772555f0d1a1ad05993693568af4a9cc5b6fb 100644 --- a/arch/arm/mach-s3c/cpu.c +++ b/arch/arm/mach-s3c/cpu.c @@ -10,8 +10,8 @@ #include <linux/init.h> #include <linux/io.h> -#include <plat/map-base.h> -#include <plat/cpu.h> +#include <mach/map-base.h> +#include "cpu.h" unsigned long samsung_cpu_id; diff --git a/arch/arm/mach-s3c/include/plat/cpu.h b/arch/arm/mach-s3c/cpu.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/cpu.h rename to arch/arm/mach-s3c/cpu.h diff --git a/arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c b/arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c index 17b70d635236bf3691d5f9f763107ad91a16e188..c1784d8facdf03a8f43370b8f7fb9e5ede6af7e3 100644 --- a/arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c +++ b/arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c @@ -12,8 +12,8 @@ #include <linux/io.h> #include <linux/clk.h> -#include <mach/map.h> -#include <mach/regs-clock.h> +#include "map.h" +#include "regs-clock.h" #include <linux/soc/samsung/s3c-cpufreq-core.h> diff --git a/arch/arm/mach-s3c/cpuidle-s3c64xx.c b/arch/arm/mach-s3c/cpuidle-s3c64xx.c index a629f4d2fa3b89db76b00ce5cfb29f308d397727..b1c5f43d49224e131102984649b4975b440320b0 100644 --- a/arch/arm/mach-s3c/cpuidle-s3c64xx.c +++ b/arch/arm/mach-s3c/cpuidle-s3c64xx.c @@ -13,8 +13,8 @@ #include <asm/cpuidle.h> -#include <plat/cpu.h> -#include <mach/map.h> +#include "cpu.h" +#include "map.h" #include "regs-sys-s3c64xx.h" #include "regs-syscon-power-s3c64xx.h" diff --git a/arch/arm/mach-s3c/crag6410.h b/arch/arm/mach-s3c/crag6410.h index 00d9aa114aa7b43e14f6fc6326c48f427c30c447..f39ea2ca7a75e5a90f39cf00317e058bbc454269 100644 --- a/arch/arm/mach-s3c/crag6410.h +++ b/arch/arm/mach-s3c/crag6410.h @@ -8,7 +8,7 @@ #ifndef MACH_CRAG6410_H #define MACH_CRAG6410_H -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" #define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START #define BANFF_PMIC_IRQ_BASE (IRQ_BOARD_START + 64) diff --git a/arch/arm/mach-s3c/dev-audio-s3c64xx.c b/arch/arm/mach-s3c/dev-audio-s3c64xx.c index 1d3124db6afc887760f2967597468c285d5b7af2..fc2f077afd2411b930aec7af8fe763fdf43d8ef0 100644 --- a/arch/arm/mach-s3c/dev-audio-s3c64xx.c +++ b/arch/arm/mach-s3c/dev-audio-s3c64xx.c @@ -11,12 +11,12 @@ #include <linux/export.h> #include <mach/irqs.h> -#include <mach/map.h> +#include "map.h" -#include <plat/devs.h> +#include "devs.h" #include <linux/platform_data/asoc-s3c.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "gpio-samsung.h" static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) { diff --git a/arch/arm/mach-s3c/dev-backlight-s3c64xx.c b/arch/arm/mach-s3c/dev-backlight-s3c64xx.c index 53bf14f5467fec050422cddb343e47b9cb3c766e..65488b61e50ceb7aac7c9ae25520c5da4ceafaa2 100644 --- a/arch/arm/mach-s3c/dev-backlight-s3c64xx.c +++ b/arch/arm/mach-s3c/dev-backlight-s3c64xx.c @@ -11,8 +11,8 @@ #include <linux/io.h> #include <linux/pwm_backlight.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> +#include "devs.h" +#include "gpio-cfg.h" #include "backlight-s3c64xx.h" diff --git a/arch/arm/mach-s3c/dev-uart-s3c64xx.c b/arch/arm/mach-s3c/dev-uart-s3c64xx.c index 021a2b7926fa9cc761c9e991349c0819d459890e..8288e8d6c092918f50b5d28449710b15340d86ca 100644 --- a/arch/arm/mach-s3c/dev-uart-s3c64xx.c +++ b/arch/arm/mach-s3c/dev-uart-s3c64xx.c @@ -15,10 +15,10 @@ #include <asm/mach/arch.h> #include <asm/mach/irq.h> -#include <mach/map.h> +#include "map.h" #include <mach/irqs.h> -#include <plat/devs.h> +#include "devs.h" /* Serial port registrations */ diff --git a/arch/arm/mach-s3c/dev-uart.c b/arch/arm/mach-s3c/dev-uart.c index 7476a5dbae77945e74d8a46f935c3dc48f0e2bd6..3d1f7f2fd7c71e29a49a957ed236c5a9c12d1382 100644 --- a/arch/arm/mach-s3c/dev-uart.c +++ b/arch/arm/mach-s3c/dev-uart.c @@ -10,7 +10,7 @@ #include <linux/kernel.h> #include <linux/platform_device.h> -#include <plat/devs.h> +#include "devs.h" /* uart devices */ diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c index e23204132b273320730c8943a2885ec648449e08..06dec64848f9a97dd4512c1bda859cc9d79dd27e 100644 --- a/arch/arm/mach-s3c/devs.c +++ b/arch/arm/mach-s3c/devs.c @@ -39,31 +39,31 @@ #include <asm/mach/irq.h> #include <mach/irqs.h> -#include <mach/map.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" #ifdef CONFIG_PLAT_S3C24XX -#include <mach/regs-s3c2443-clock.h> +#include "regs-s3c2443-clock.h" #endif /* CONFIG_PLAT_S3C24XX */ -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> +#include "cpu.h" +#include "devs.h" #include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/ata-samsung_cf.h> -#include <plat/fb.h> +#include "fb.h" #include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/hwmon-s3c.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/keypad.h> +#include "keypad.h" #include <linux/platform_data/mmc-s3cmci.h> #include <linux/platform_data/mtd-nand-s3c2410.h> -#include <plat/pwm-core.h> -#include <plat/sdhci.h> +#include "pwm-core.h" +#include "sdhci.h" #include <linux/platform_data/touchscreen-s3c2410.h> #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-ohci-s3c2410.h> -#include <plat/usb-phy.h> +#include "usb-phy.h" #include <linux/platform_data/asoc-s3c.h> #include <linux/platform_data/spi-s3c64xx.h> diff --git a/arch/arm/mach-s3c/include/plat/devs.h b/arch/arm/mach-s3c/devs.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/devs.h rename to arch/arm/mach-s3c/devs.h diff --git a/arch/arm/mach-s3c/include/mach/dma-s3c24xx.h b/arch/arm/mach-s3c/dma-s3c24xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/dma-s3c24xx.h rename to arch/arm/mach-s3c/dma-s3c24xx.h diff --git a/arch/arm/mach-s3c/include/mach/dma-s3c64xx.h b/arch/arm/mach-s3c/dma-s3c64xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/dma-s3c64xx.h rename to arch/arm/mach-s3c/dma-s3c64xx.h diff --git a/arch/arm/mach-s3c/include/mach/dma.h b/arch/arm/mach-s3c/dma.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/dma.h rename to arch/arm/mach-s3c/dma.h diff --git a/arch/arm/mach-s3c/include/plat/fb.h b/arch/arm/mach-s3c/fb.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/fb.h rename to arch/arm/mach-s3c/fb.h diff --git a/arch/arm/mach-s3c/include/plat/gpio-cfg-helpers.h b/arch/arm/mach-s3c/gpio-cfg-helpers.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/gpio-cfg-helpers.h rename to arch/arm/mach-s3c/gpio-cfg-helpers.h diff --git a/arch/arm/mach-s3c/include/plat/gpio-cfg.h b/arch/arm/mach-s3c/gpio-cfg.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/gpio-cfg.h rename to arch/arm/mach-s3c/gpio-cfg.h diff --git a/arch/arm/mach-s3c/include/plat/gpio-core.h b/arch/arm/mach-s3c/gpio-core.h similarity index 99% rename from arch/arm/mach-s3c/include/plat/gpio-core.h rename to arch/arm/mach-s3c/gpio-core.h index c0bfceb88340c52d9d093f2dcedd2db0aad896c3..b361c8c0d66925624fa4dc5ecba54c9e5dc51313 100644 --- a/arch/arm/mach-s3c/include/plat/gpio-core.h +++ b/arch/arm/mach-s3c/gpio-core.h @@ -11,7 +11,7 @@ #define __PLAT_SAMSUNG_GPIO_CORE_H /* Bring in machine-local definitions, especially S3C_GPIO_END */ -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" #include <linux/gpio/driver.h> #define GPIOCON_OFF (0x00) diff --git a/arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h b/arch/arm/mach-s3c/gpio-samsung-s3c24xx.h similarity index 99% rename from arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h rename to arch/arm/mach-s3c/gpio-samsung-s3c24xx.h index f8a114891f165c4b475230158937cc0ef30ac33a..c29fdc95f883e9a008332a95bb641b1760eb9ef0 100644 --- a/arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h +++ b/arch/arm/mach-s3c/gpio-samsung-s3c24xx.h @@ -14,7 +14,7 @@ #ifndef GPIO_SAMSUNG_S3C24XX_H #define GPIO_SAMSUNG_S3C24XX_H -#include <mach/map.h> +#include "map.h" /* * GPIO sizes for various SoCs: diff --git a/arch/arm/mach-s3c/include/mach/gpio-samsung-s3c64xx.h b/arch/arm/mach-s3c/gpio-samsung-s3c64xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/gpio-samsung-s3c64xx.h rename to arch/arm/mach-s3c/gpio-samsung-s3c64xx.h diff --git a/arch/arm/mach-s3c/gpio-samsung.c b/arch/arm/mach-s3c/gpio-samsung.c index 8955fd6752650c2ffedaacf40ec38cd9cf44783f..76ef415789f25c554ddc5c3a1a5f0230dac97380 100644 --- a/arch/arm/mach-s3c/gpio-samsung.c +++ b/arch/arm/mach-s3c/gpio-samsung.c @@ -27,15 +27,15 @@ #include <asm/irq.h> #include <mach/irqs.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/gpio-core.h> -#include <plat/gpio-cfg.h> -#include <plat/gpio-cfg-helpers.h> -#include <plat/pm.h> +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "pm.h" int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip, unsigned int off, samsung_gpio_pull_t pull) diff --git a/arch/arm/mach-s3c/include/mach/gpio-samsung.h b/arch/arm/mach-s3c/gpio-samsung.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/gpio-samsung.h rename to arch/arm/mach-s3c/gpio-samsung.h diff --git a/arch/arm/mach-s3c/gta02.h b/arch/arm/mach-s3c/gta02.h index d5610ba829a47883092aa0556a25c18fbeb84875..043ae382bfc5e07fb77354ac7d6b43a2fabfa53f 100644 --- a/arch/arm/mach-s3c/gta02.h +++ b/arch/arm/mach-s3c/gta02.h @@ -6,7 +6,7 @@ #ifndef __MACH_S3C24XX_GTA02_H #define __MACH_S3C24XX_GTA02_H __FILE__ -#include <mach/regs-gpio.h> +#include "regs-gpio.h" #define GTA02_GPIO_AUX_LED S3C2410_GPB(2) #define GTA02_GPIO_USB_PULLUP S3C2410_GPB(9) diff --git a/arch/arm/mach-s3c/h1940-bluetooth.c b/arch/arm/mach-s3c/h1940-bluetooth.c index 8533e7521b50a8b7c1ddd87f85597d7960cfc684..59edcf8a620d37822d1d2162cb0d9c52ccd928c2 100644 --- a/arch/arm/mach-s3c/h1940-bluetooth.c +++ b/arch/arm/mach-s3c/h1940-bluetooth.c @@ -13,9 +13,9 @@ #include <linux/gpio.h> #include <linux/rfkill.h> -#include <plat/gpio-cfg.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" #include "h1940.h" diff --git a/arch/arm/mach-s3c/include/mach/hardware-s3c24xx.h b/arch/arm/mach-s3c/hardware-s3c24xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/hardware-s3c24xx.h rename to arch/arm/mach-s3c/hardware-s3c24xx.h diff --git a/arch/arm/mach-s3c/include/plat/iic-core.h b/arch/arm/mach-s3c/iic-core.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/iic-core.h rename to arch/arm/mach-s3c/iic-core.h diff --git a/arch/arm/mach-s3c/include/mach/io-s3c24xx.h b/arch/arm/mach-s3c/include/mach/io-s3c24xx.h index 9b78b0a3d48648978923173303db4fa473556bb1..738b775d33366155ec087ac6f9e86867b4366c10 100644 --- a/arch/arm/mach-s3c/include/mach/io-s3c24xx.h +++ b/arch/arm/mach-s3c/include/mach/io-s3c24xx.h @@ -10,7 +10,7 @@ #ifndef __ASM_ARM_ARCH_IO_S3C24XX_H #define __ASM_ARM_ARCH_IO_S3C24XX_H -#include <plat/map-base.h> +#include <mach/map-base.h> /* * ISA style IO, for each machine to sort out mappings for, diff --git a/arch/arm/mach-s3c/include/plat/map-base.h b/arch/arm/mach-s3c/include/mach/map-base.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/map-base.h rename to arch/arm/mach-s3c/include/mach/map-base.h diff --git a/arch/arm/mach-s3c/init.c b/arch/arm/mach-s3c/init.c index e9acf02ef3c38ae92ba40d829123b54969e82ac6..9d92f03e9bc1fb1dd4111fcf941b98d5b85fca85 100644 --- a/arch/arm/mach-s3c/init.c +++ b/arch/arm/mach-s3c/init.c @@ -23,8 +23,8 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> -#include <plat/devs.h> +#include "cpu.h" +#include "devs.h" static struct cpu_table *cpu; diff --git a/arch/arm/mach-s3c/iotiming-s3c2410.c b/arch/arm/mach-s3c/iotiming-s3c2410.c index d91f26efd07a90020a03f5de356ef6527e1d96ae..28d9f473e24a012d0cb524887ae7668706d551ad 100644 --- a/arch/arm/mach-s3c/iotiming-s3c2410.c +++ b/arch/arm/mach-s3c/iotiming-s3c2410.c @@ -14,8 +14,8 @@ #include <linux/io.h> #include <linux/slab.h> -#include <mach/map.h> -#include <mach/regs-clock.h> +#include "map.h" +#include "regs-clock.h" #include <linux/soc/samsung/s3c-cpufreq-core.h> diff --git a/arch/arm/mach-s3c/iotiming-s3c2412.c b/arch/arm/mach-s3c/iotiming-s3c2412.c index a22b5611697dd18fe68cd7851fe6bb6fd1db7679..003f89c4dc53788993842b7197b1c7b7159607ee 100644 --- a/arch/arm/mach-s3c/iotiming-s3c2412.c +++ b/arch/arm/mach-s3c/iotiming-s3c2412.c @@ -23,10 +23,10 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/cpu.h> +#include "cpu.h" #include <linux/soc/samsung/s3c-cpufreq-core.h> -#include <mach/s3c2412.h> +#include "s3c2412.h" #define print_ns(x) ((x) / 10), ((x) % 10) diff --git a/arch/arm/mach-s3c/irq-pm-s3c24xx.c b/arch/arm/mach-s3c/irq-pm-s3c24xx.c index e0131b16a4af4ad4e1c4312711cee3acfff5085d..4d5e28312d910568c9ec627780844c7fa1228562 100644 --- a/arch/arm/mach-s3c/irq-pm-s3c24xx.c +++ b/arch/arm/mach-s3c/irq-pm-s3c24xx.c @@ -13,14 +13,14 @@ #include <linux/syscore_ops.h> #include <linux/io.h> -#include <plat/cpu.h> -#include <plat/pm.h> -#include <plat/map-base.h> -#include <plat/map-s3c.h> - -#include <mach/regs-irq.h> -#include <mach/regs-gpio.h> -#include <mach/pm-core.h> +#include "cpu.h" +#include "pm.h" +#include <mach/map-base.h> +#include "map-s3c.h" + +#include "regs-irq.h" +#include "regs-gpio.h" +#include "pm-core.h" #include <asm/irq.h> diff --git a/arch/arm/mach-s3c/irq-pm-s3c64xx.c b/arch/arm/mach-s3c/irq-pm-s3c64xx.c index 31b221190479eebeeacaedf81abb5ad1aa5096bc..4a1e935bada1916e8459ab94a916148c8e7b0bf8 100644 --- a/arch/arm/mach-s3c/irq-pm-s3c64xx.c +++ b/arch/arm/mach-s3c/irq-pm-s3c64xx.c @@ -20,11 +20,11 @@ #include <linux/io.h> #include <linux/of.h> -#include <mach/map.h> +#include "map.h" -#include <mach/regs-gpio.h> -#include <plat/cpu.h> -#include <plat/pm.h> +#include "regs-gpio.h" +#include "cpu.h" +#include "pm.h" /* We handled all the IRQ types in this code, to save having to make several * small files to handle each different type separately. Having the EINT_GRP diff --git a/arch/arm/mach-s3c/irq-s3c24xx-fiq.S b/arch/arm/mach-s3c/irq-s3c24xx-fiq.S index 2a84535a14fd7f6d3e937baa9807b522da3a50d0..b54cbd0122413c09a4d71beba2bc72350647c33d 100644 --- a/arch/arm/mach-s3c/irq-s3c24xx-fiq.S +++ b/arch/arm/mach-s3c/irq-s3c24xx-fiq.S @@ -10,8 +10,8 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <mach/map.h> -#include <mach/regs-irq.h> +#include "map.h" +#include "regs-irq.h" #include <linux/spi/s3c24xx-fiq.h> diff --git a/arch/arm/mach-s3c/irq-s3c24xx.c b/arch/arm/mach-s3c/irq-s3c24xx.c index 3965347cacf0280bcf2674e2761b585f2379a613..79b5f19af7a52a20b9c33b236522e045a7d2961f 100644 --- a/arch/arm/mach-s3c/irq-s3c24xx.c +++ b/arch/arm/mach-s3c/irq-s3c24xx.c @@ -26,12 +26,12 @@ #include <asm/mach/irq.h> #include <mach/irqs.h> -#include <mach/regs-irq.h> -#include <mach/regs-gpio.h> +#include "regs-irq.h" +#include "regs-gpio.h" -#include <plat/cpu.h> -#include <plat/regs-irqtype.h> -#include <plat/pm.h> +#include "cpu.h" +#include "regs-irqtype.h" +#include "pm.h" #define S3C_IRQTYPE_NONE 0 #define S3C_IRQTYPE_EINT 1 diff --git a/arch/arm/mach-s3c/include/plat/keypad.h b/arch/arm/mach-s3c/keypad.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/keypad.h rename to arch/arm/mach-s3c/keypad.h diff --git a/arch/arm/mach-s3c/mach-amlm5900.c b/arch/arm/mach-s3c/mach-amlm5900.c index 724240e1b6621fa07818cdd3fa6c4642a6edf19e..f73a5223663badba5b7555471acc5a90aaa91e99 100644 --- a/arch/arm/mach-s3c/mach-amlm5900.c +++ b/arch/arm/mach-s3c/mach-amlm5900.c @@ -31,13 +31,13 @@ #include <asm/mach-types.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/gpio-cfg.h> +#include "devs.h" +#include "cpu.h" +#include "gpio-cfg.h" #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> diff --git a/arch/arm/mach-s3c/mach-anubis.c b/arch/arm/mach-s3c/mach-anubis.c index 83b2f7fb268ee596a551dbaa1205e956779f36c9..522bb10e8a19823ede45329c3c83fa61fdda023e 100644 --- a/arch/arm/mach-s3c/mach-anubis.c +++ b/arch/arm/mach-s3c/mach-anubis.c @@ -27,8 +27,8 @@ #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> @@ -39,8 +39,8 @@ #include <net/ax88796.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include <linux/platform_data/asoc-s3c24xx_simtec.h> #include "anubis.h" diff --git a/arch/arm/mach-s3c/mach-anw6410.c b/arch/arm/mach-s3c/mach-anw6410.c index ff183ced8e6e4e490d613d6f68e5cad3f55ffad3..b4f08e5c98589a04448bb2012489002e20a74965 100644 --- a/arch/arm/mach-s3c/mach-anw6410.c +++ b/arch/arm/mach-s3c/mach-anw6410.c @@ -30,19 +30,19 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/map.h> +#include "map.h" #include <asm/irq.h> #include <asm/mach-types.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/fb.h> +#include "fb.h" -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include <mach/irqs.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include "s3c64xx.h" #include "regs-modem-s3c64xx.h" diff --git a/arch/arm/mach-s3c/mach-at2440evb.c b/arch/arm/mach-s3c/mach-at2440evb.c index 1ae61ae913d44e37e1048637bd24dc2c82156c71..13d014bc8371362ceebb90dc7d60a23616a6204c 100644 --- a/arch/arm/mach-s3c/mach-at2440evb.c +++ b/arch/arm/mach-s3c/mach-at2440evb.c @@ -28,8 +28,8 @@ #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> @@ -38,8 +38,8 @@ #include <linux/mtd/nand_ecc.h> #include <linux/mtd/partitions.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include <linux/platform_data/mmc-s3cmci.h> #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-bast.c b/arch/arm/mach-s3c/mach-bast.c index f971cbf99d290ed504a99e69099d2702727ea69d..1cb2193256e1a7eb719279e854c802f61e4a1847 100644 --- a/arch/arm/mach-s3c/mach-bast.c +++ b/arch/arm/mach-s3c/mach-bast.c @@ -41,13 +41,13 @@ #include <asm/mach-types.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" -#include <plat/cpu.h> +#include "cpu.h" #include <linux/soc/samsung/s3c-cpu-freq.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> +#include "devs.h" +#include "gpio-cfg.h" #include "bast.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-crag6410-module.c b/arch/arm/mach-s3c/mach-crag6410-module.c index 43b587e79d2168cbe1fc0d8fd7d3ed4d63ef66aa..407ad493493e3de8bc6f1ea7342fb8e4e67993ff 100644 --- a/arch/arm/mach-s3c/mach-crag6410-module.c +++ b/arch/arm/mach-s3c/mach-crag6410-module.c @@ -27,7 +27,7 @@ #include <linux/platform_data/spi-s3c64xx.h> -#include <plat/cpu.h> +#include "cpu.h" #include <mach/irqs.h> #include "crag6410.h" diff --git a/arch/arm/mach-s3c/mach-crag6410.c b/arch/arm/mach-s3c/mach-crag6410.c index 8e7f637833f27838edaa7f73e6d24650a42f3cd3..0bfcb79cc0a633afb647a72f08280277c2485c7b 100644 --- a/arch/arm/mach-s3c/mach-crag6410.c +++ b/arch/arm/mach-s3c/mach-crag6410.c @@ -44,22 +44,22 @@ #include <asm/mach-types.h> #include <video/samsung_fimd.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <mach/irqs.h> -#include <plat/fb.h> -#include <plat/sdhci.h> -#include <plat/gpio-cfg.h> +#include "fb.h" +#include "sdhci.h" +#include "gpio-cfg.h" #include <linux/platform_data/spi-s3c64xx.h> -#include <plat/keypad.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "keypad.h" +#include "devs.h" +#include "cpu.h" #include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/pm.h> +#include "pm.h" #include "s3c64xx.h" #include "crag6410.h" diff --git a/arch/arm/mach-s3c/mach-gta02.c b/arch/arm/mach-s3c/mach-gta02.c index b4fb58632555eaa49a7da990cb90525dbbc4d9a4..9e5cb05f3ef104fd1e84fee0bbb51b65f4b15f1e 100644 --- a/arch/arm/mach-s3c/mach-gta02.c +++ b/arch/arm/mach-s3c/mach-gta02.c @@ -59,14 +59,14 @@ #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/regs-gpio.h> -#include <mach/regs-irq.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> -#include <plat/pm.h> +#include "regs-gpio.h" +#include "regs-irq.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "devs.h" +#include "gpio-cfg.h" +#include "pm.h" #include "s3c24xx.h" #include "gta02.h" diff --git a/arch/arm/mach-s3c/mach-h1940.c b/arch/arm/mach-s3c/mach-h1940.c index c8e4c4d6a979ee05c67c4fb6d14dae1d3e1c4366..da9ac61f79488d5e2fc6a4dccc24781212d2d008 100644 --- a/arch/arm/mach-s3c/mach-h1940.c +++ b/arch/arm/mach-s3c/mach-h1940.c @@ -48,16 +48,16 @@ #include <sound/uda1380.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/map.h> -#include <mach/hardware-s3c24xx.h> -#include <mach/regs-clock.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> -#include <plat/pm.h> +#include "map.h" +#include "hardware-s3c24xx.h" +#include "regs-clock.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "devs.h" +#include "gpio-cfg.h" +#include "pm.h" #include "s3c24xx.h" #include "h1940.h" diff --git a/arch/arm/mach-s3c/mach-hmt.c b/arch/arm/mach-s3c/mach-hmt.c index e0d8cc30a0f033717f8b5604996372c80895c0af..29510e27f90f3d0a9dc6bc1aaeb07f52f626d4a7 100644 --- a/arch/arm/mach-s3c/mach-hmt.c +++ b/arch/arm/mach-s3c/mach-hmt.c @@ -25,19 +25,19 @@ #include <asm/mach/irq.h> #include <video/samsung_fimd.h> -#include <mach/map.h> +#include "map.h" #include <mach/irqs.h> #include <asm/irq.h> #include <asm/mach-types.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <mach/gpio-samsung.h> -#include <plat/fb.h> +#include "gpio-samsung.h" +#include "fb.h" #include <linux/platform_data/mtd-nand-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include "s3c64xx.h" diff --git a/arch/arm/mach-s3c/mach-jive.c b/arch/arm/mach-s3c/mach-jive.c index 2e7119d34179d01138a37e19469bf8d042ec3391..5c3037bf647d1d113af6882725f702e6c00fbc94 100644 --- a/arch/arm/mach-s3c/mach-jive.c +++ b/arch/arm/mach-s3c/mach-jive.c @@ -31,10 +31,10 @@ #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <mach/hardware-s3c24xx.h> -#include <mach/regs-gpio.h> +#include "hardware-s3c24xx.h" +#include "regs-gpio.h" #include <linux/platform_data/fb-s3c2410.h> -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" #include <asm/mach-types.h> @@ -43,10 +43,10 @@ #include <linux/mtd/nand_ecc.h> #include <linux/mtd/partitions.h> -#include <plat/gpio-cfg.h> -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/pm.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" +#include "pm.h" #include <linux/platform_data/usb-s3c2410_udc.h> #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-mini2440.c b/arch/arm/mach-s3c/mach-mini2440.c index 83de1ba22cda3e38d827b0478eaaff7fec5af5e8..48e436a2f6390082e880f80475938d282aed6739 100644 --- a/arch/arm/mach-s3c/mach-mini2440.c +++ b/arch/arm/mach-s3c/mach-mini2440.c @@ -33,10 +33,10 @@ #include <linux/platform_data/fb-s3c2410.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> +#include "regs-gpio.h" #include <linux/platform_data/leds-s3c24xx.h> #include <mach/irqs.h> -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> #include <linux/platform_data/mmc-s3cmci.h> @@ -47,9 +47,9 @@ #include <linux/mtd/nand_ecc.h> #include <linux/mtd/partitions.h> -#include <plat/gpio-cfg.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" #include <sound/s3c24xx_uda134x.h> diff --git a/arch/arm/mach-s3c/mach-mini6410.c b/arch/arm/mach-s3c/mach-mini6410.c index 9bd6581619b9e9a3b539dbfa38c698a42d28f52a..1580bb8ee2c775d2092e58c1f03de5c025779f1e 100644 --- a/arch/arm/mach-s3c/mach-mini6410.c +++ b/arch/arm/mach-s3c/mach-mini6410.c @@ -23,17 +23,17 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <linux/soc/samsung/s3c-adc.h> -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/fb.h> +#include "cpu.h" +#include "devs.h" +#include "fb.h" #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/mmc-sdhci-s3c.h> -#include <plat/sdhci.h> +#include "sdhci.h" #include <linux/platform_data/touchscreen-s3c2410.h> #include <mach/irqs.h> diff --git a/arch/arm/mach-s3c/mach-n30.c b/arch/arm/mach-s3c/mach-n30.c index d79bd9b8e25eba070d294231ec01b0e6d0874199..8a9382326d2913a31adb1ef7cf37a74b016f1ae2 100644 --- a/arch/arm/mach-s3c/mach-n30.c +++ b/arch/arm/mach-s3c/mach-n30.c @@ -27,15 +27,15 @@ #include <linux/io.h> #include <linux/mmc/host.h> -#include <mach/hardware-s3c24xx.h> +#include "hardware-s3c24xx.h" #include <asm/irq.h> #include <asm/mach-types.h> #include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/leds-s3c24xx.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" #include <asm/mach/arch.h> #include <asm/mach/irq.h> @@ -43,9 +43,8 @@ #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> +#include "cpu.h" +#include "devs.h" #include <linux/platform_data/mmc-s3cmci.h> #include <linux/platform_data/usb-s3c2410_udc.h> diff --git a/arch/arm/mach-s3c/mach-ncp.c b/arch/arm/mach-s3c/mach-ncp.c index ed4dd67add9796d0e161ffe53917f4270c2af40b..3480ba8184b19ad8729905b15e4d3360b83b3855 100644 --- a/arch/arm/mach-s3c/mach-ncp.c +++ b/arch/arm/mach-s3c/mach-ncp.c @@ -25,16 +25,16 @@ #include <asm/mach/irq.h> #include <mach/irqs.h> -#include <mach/map.h> +#include "map.h" #include <asm/irq.h> #include <asm/mach-types.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/fb.h> +#include "fb.h" -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include "s3c64xx.h" diff --git a/arch/arm/mach-s3c/mach-nexcoder.c b/arch/arm/mach-s3c/mach-nexcoder.c index 84610a91e7328a2ffac70e1ac468fa2665b28775..7e96c546f359171e49be2480082ae85add1c2799 100644 --- a/arch/arm/mach-s3c/mach-nexcoder.c +++ b/arch/arm/mach-s3c/mach-nexcoder.c @@ -32,13 +32,13 @@ #include <asm/mach-types.h> //#include <asm/debug-ll.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/gpio-cfg.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-osiris-dvs.c b/arch/arm/mach-s3c/mach-osiris-dvs.c index 1250520b3bcc07d48ee5ea5b0c0e2456f817cc1c..2e283aedab65c01623367bac0d12e4eb0ab5298f 100644 --- a/arch/arm/mach-s3c/mach-osiris-dvs.c +++ b/arch/arm/mach-s3c/mach-osiris-dvs.c @@ -15,7 +15,7 @@ #include <linux/mfd/tps65010.h> #include <linux/soc/samsung/s3c-cpu-freq.h> -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" #define OSIRIS_GPIO_DVS S3C2410_GPB(5) diff --git a/arch/arm/mach-s3c/mach-osiris.c b/arch/arm/mach-s3c/mach-osiris.c index 90cf7d8cb07d96d5c878919dc15b87f5ddd4ad32..d0675c558d89b85d140f21b96a76ac71e1fa6477 100644 --- a/arch/arm/mach-s3c/mach-osiris.c +++ b/arch/arm/mach-s3c/mach-osiris.c @@ -36,13 +36,13 @@ #include <linux/mtd/nand_ecc.h> #include <linux/mtd/partitions.h> -#include <plat/cpu.h> +#include "cpu.h" #include <linux/soc/samsung/s3c-cpu-freq.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> +#include "devs.h" +#include "gpio-cfg.h" -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include "s3c24xx.h" #include "osiris.h" diff --git a/arch/arm/mach-s3c/mach-otom.c b/arch/arm/mach-s3c/mach-otom.c index 32482f052ac735d502e317753e890a53f829edf2..fc8f78396159bd59bc9af4fa5c796c607a5930d8 100644 --- a/arch/arm/mach-s3c/mach-otom.c +++ b/arch/arm/mach-s3c/mach-otom.c @@ -22,12 +22,11 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "gpio-samsung.h" +#include "gpio-cfg.h" -#include <plat/cpu.h> -#include <plat/devs.h> +#include "cpu.h" +#include "devs.h" #include "s3c24xx.h" #include "otom.h" diff --git a/arch/arm/mach-s3c/mach-qt2410.c b/arch/arm/mach-s3c/mach-qt2410.c index ea7af23b0ac70ee79de92b52c9a14d05cc98ec83..cba41466b2618aaba333ac86572d8da4980c92a9 100644 --- a/arch/arm/mach-s3c/mach-qt2410.c +++ b/arch/arm/mach-s3c/mach-qt2410.c @@ -36,12 +36,12 @@ #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" -#include <plat/gpio-cfg.h> -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/pm.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" +#include "pm.h" #include "s3c24xx.h" #include "common-smdk-s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-real6410.c b/arch/arm/mach-s3c/mach-real6410.c index 099a99e5b6d2738b9f0540c8f9f272525d07de74..63819560fc4cb7b65fbecad7f20b986e791f5863 100644 --- a/arch/arm/mach-s3c/mach-real6410.c +++ b/arch/arm/mach-s3c/mach-real6410.c @@ -24,15 +24,15 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <mach/irqs.h> #include <linux/soc/samsung/s3c-adc.h> -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/fb.h> +#include "cpu.h" +#include "devs.h" +#include "fb.h" #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/touchscreen-s3c2410.h> diff --git a/arch/arm/mach-s3c/mach-rx1950.c b/arch/arm/mach-s3c/mach-rx1950.c index 13614b3721095b94085e886bb30b47adb8f34199..99dabe7309efedd1a305ba0932e4360c11506b98 100644 --- a/arch/arm/mach-s3c/mach-rx1950.c +++ b/arch/arm/mach-s3c/mach-rx1950.c @@ -46,14 +46,14 @@ #include <sound/uda1380.h> -#include <mach/hardware-s3c24xx.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pm.h> -#include <plat/gpio-cfg.h> +#include "hardware-s3c24xx.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "devs.h" +#include "pm.h" +#include "gpio-cfg.h" #include "s3c24xx.h" #include "h1940.h" diff --git a/arch/arm/mach-s3c/mach-rx3715.c b/arch/arm/mach-s3c/mach-rx3715.c index 1c07301767995838f89f6a3411e364e1affaf51c..4d6e9d9c8e0798693e5fdad2672726afad98d740 100644 --- a/arch/arm/mach-s3c/mach-rx3715.c +++ b/arch/arm/mach-s3c/mach-rx3715.c @@ -35,13 +35,13 @@ #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pm.h> +#include "cpu.h" +#include "devs.h" +#include "pm.h" #include "s3c24xx.h" #include "h1940.h" diff --git a/arch/arm/mach-s3c/mach-s3c2416-dt.c b/arch/arm/mach-s3c/mach-s3c2416-dt.c index 2924e230e79d2da01b9d52bf14fb1e814e0740c5..418544d3015db852f2e041d41326c7ba1af6574b 100644 --- a/arch/arm/mach-s3c/mach-s3c2416-dt.c +++ b/arch/arm/mach-s3c/mach-s3c2416-dt.c @@ -16,10 +16,10 @@ #include <linux/serial_s3c.h> #include <asm/mach/arch.h> -#include <mach/map.h> +#include "map.h" -#include <plat/cpu.h> -#include <plat/pm.h> +#include "cpu.h" +#include "pm.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-s3c64xx-dt.c b/arch/arm/mach-s3c/mach-s3c64xx-dt.c index cd1da9602c86f3a5a178bc4424768ce63bf277b0..00169c1038620f095ff31364d9107106e563d769 100644 --- a/arch/arm/mach-s3c/mach-s3c64xx-dt.c +++ b/arch/arm/mach-s3c/mach-s3c64xx-dt.c @@ -8,8 +8,8 @@ #include <asm/mach/map.h> #include <asm/system_misc.h> -#include <plat/cpu.h> -#include <mach/map.h> +#include "cpu.h" +#include "map.h" #include "s3c64xx.h" diff --git a/arch/arm/mach-s3c/mach-smartq.c b/arch/arm/mach-s3c/mach-smartq.c index 3a9ca85d09c54d67321cafacd232edbfe6b7b6b3..da44a2610506307167bc3109261f6b973e3423a1 100644 --- a/arch/arm/mach-s3c/mach-smartq.c +++ b/arch/arm/mach-s3c/mach-smartq.c @@ -18,17 +18,17 @@ #include <asm/mach-types.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" -#include <plat/cpu.h> -#include <plat/devs.h> +#include "cpu.h" +#include "devs.h" #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/gpio-cfg.h> +#include "gpio-cfg.h" #include <linux/platform_data/hwmon-s3c.h> #include <linux/platform_data/usb-ohci-s3c2410.h> -#include <plat/sdhci.h> +#include "sdhci.h" #include <linux/platform_data/touchscreen-s3c2410.h> #include <video/platform_lcd.h> diff --git a/arch/arm/mach-s3c/mach-smartq5.c b/arch/arm/mach-s3c/mach-smartq5.c index f67cc50cb5b9542917ee60807fd698645b28222c..5d5e3c241629a0fd5f218ff971aa5acd0bd85202 100644 --- a/arch/arm/mach-s3c/mach-smartq5.c +++ b/arch/arm/mach-s3c/mach-smartq5.c @@ -15,14 +15,14 @@ #include <video/samsung_fimd.h> #include <mach/irqs.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/fb.h> -#include <plat/gpio-cfg.h> +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "devs.h" +#include "fb.h" +#include "gpio-cfg.h" #include "s3c64xx.h" #include "mach-smartq.h" diff --git a/arch/arm/mach-s3c/mach-smartq7.c b/arch/arm/mach-s3c/mach-smartq7.c index af58147c67212332c38a49cdc09fa5019a45236f..16b62e337d8dd5e8b7012185c978b8c1880a33a3 100644 --- a/arch/arm/mach-s3c/mach-smartq7.c +++ b/arch/arm/mach-s3c/mach-smartq7.c @@ -15,14 +15,14 @@ #include <video/samsung_fimd.h> #include <mach/irqs.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/fb.h> -#include <plat/gpio-cfg.h> +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "devs.h" +#include "fb.h" +#include "gpio-cfg.h" #include "s3c64xx.h" #include "mach-smartq.h" diff --git a/arch/arm/mach-s3c/mach-smdk2410.c b/arch/arm/mach-s3c/mach-smdk2410.c index 411216c465221ea4582cc71e88cf4d5dcd936599..c6f0d0abf515119c4cc170622e01838c328e354c 100644 --- a/arch/arm/mach-s3c/mach-smdk2410.c +++ b/arch/arm/mach-s3c/mach-smdk2410.c @@ -19,8 +19,8 @@ #include <linux/serial_s3c.h> #include <linux/platform_device.h> #include <linux/io.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "gpio-samsung.h" +#include "gpio-cfg.h" #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -31,8 +31,8 @@ #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include "s3c24xx.h" #include "common-smdk-s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-smdk2413.c b/arch/arm/mach-s3c/mach-smdk2413.c index 2ebf78cf0f3f1c56730e45c43127da88384c7681..67ca5c8556848e9844736b29c29c96d0aa277e02 100644 --- a/arch/arm/mach-s3c/mach-smdk2413.c +++ b/arch/arm/mach-s3c/mach-smdk2413.c @@ -23,23 +23,23 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware-s3c24xx.h> #include <asm/hardware/iomd.h> #include <asm/setup.h> #include <asm/irq.h> #include <asm/mach-types.h> //#include <asm/debug-ll.h> -#include <mach/regs-gpio.h> +#include "hardware-s3c24xx.h" +#include "regs-gpio.h" #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/i2c-s3c2410.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "gpio-samsung.h" +#include "gpio-cfg.h" -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include "s3c24xx.h" #include "common-smdk-s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-smdk2416.c b/arch/arm/mach-s3c/mach-smdk2416.c index 3bf3322740fc2ecb0803a48cb5d485acbc754e82..3e28f65a6f839cd7f4c167e6dac9adf691fe531b 100644 --- a/arch/arm/mach-s3c/mach-smdk2416.c +++ b/arch/arm/mach-s3c/mach-smdk2416.c @@ -25,26 +25,26 @@ #include <asm/mach/irq.h> #include <video/samsung_fimd.h> -#include <mach/hardware-s3c24xx.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/regs-s3c2443-clock.h> -#include <mach/gpio-samsung.h> +#include "hardware-s3c24xx.h" +#include "regs-gpio.h" +#include "regs-s3c2443-clock.h" +#include "gpio-samsung.h" #include <linux/platform_data/leds-s3c24xx.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/gpio-cfg.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" #include <linux/platform_data/mtd-nand-s3c2410.h> -#include <plat/sdhci.h> +#include "sdhci.h" #include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/s3c-hsudc.h> -#include <plat/fb.h> +#include "fb.h" #include "s3c24xx.h" #include "common-smdk-s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-smdk2440.c b/arch/arm/mach-s3c/mach-smdk2440.c index cc40316bc294a56937693fe8cdaff691fadf7b58..596a76702edb43a5c6c4d7568b54c314fc5dad74 100644 --- a/arch/arm/mach-s3c/mach-smdk2440.c +++ b/arch/arm/mach-s3c/mach-smdk2440.c @@ -26,15 +26,15 @@ #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" #include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include "s3c24xx.h" #include "common-smdk-s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-smdk2443.c b/arch/arm/mach-s3c/mach-smdk2443.c index 85a3f73fd0a14207753ba9dad1106750f84c7b5f..ee6af7ad4429e2122a9696ec59f3aaad0ff9a129 100644 --- a/arch/arm/mach-s3c/mach-smdk2443.c +++ b/arch/arm/mach-s3c/mach-smdk2443.c @@ -25,13 +25,13 @@ #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> +#include "regs-gpio.h" #include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include "s3c24xx.h" #include "common-smdk-s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-smdk6400.c b/arch/arm/mach-s3c/mach-smdk6400.c index 18ee5e203ca042a42aa4474c4dfe12692122c15e..8f7c5071e113492e701cd74aae8c38fdebd6b38f 100644 --- a/arch/arm/mach-s3c/mach-smdk6400.c +++ b/arch/arm/mach-s3c/mach-smdk6400.c @@ -23,12 +23,12 @@ #include <asm/mach/irq.h> #include <mach/irqs.h> -#include <mach/map.h> +#include "map.h" -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include <linux/platform_data/i2c-s3c2410.h> -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" #include "s3c64xx.h" diff --git a/arch/arm/mach-s3c/mach-smdk6410.c b/arch/arm/mach-s3c/mach-smdk6410.c index 371a605daa3036f4787e8ec85984d9ba9caaf4fe..9614916f12941d9ea081bde05b6aadcd921f4070 100644 --- a/arch/arm/mach-s3c/mach-smdk6410.c +++ b/arch/arm/mach-s3c/mach-smdk6410.c @@ -46,23 +46,23 @@ #include <asm/mach/irq.h> #include <mach/irqs.h> -#include <mach/map.h> +#include "map.h" #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" #include <linux/platform_data/ata-samsung_cf.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/fb.h> -#include <plat/gpio-cfg.h> +#include "fb.h" +#include "gpio-cfg.h" -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include <linux/soc/samsung/s3c-adc.h> #include <linux/platform_data/touchscreen-s3c2410.h> -#include <plat/keypad.h> +#include "keypad.h" #include "backlight-s3c64xx.h" #include "s3c64xx.h" diff --git a/arch/arm/mach-s3c/mach-tct_hammer.c b/arch/arm/mach-s3c/mach-tct_hammer.c index 53a550b915e0679cddfb0fed407e3e9d8cf4c22b..3570cfdd817d521dcb881e65a2ec52dbd2852b3c 100644 --- a/arch/arm/mach-s3c/mach-tct_hammer.c +++ b/arch/arm/mach-s3c/mach-tct_hammer.c @@ -29,8 +29,8 @@ #include <asm/mach-types.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> diff --git a/arch/arm/mach-s3c/mach-vr1000.c b/arch/arm/mach-s3c/mach-vr1000.c index b63ece0def04e818d36fada25a97666397d5f7e2..2f7f61d188ebe6c497a3c487dc48ecfe51a55982 100644 --- a/arch/arm/mach-s3c/mach-vr1000.c +++ b/arch/arm/mach-s3c/mach-vr1000.c @@ -35,12 +35,12 @@ #include <linux/platform_data/i2c-s3c2410.h> #include <linux/platform_data/asoc-s3c24xx_simtec.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> +#include "cpu.h" +#include "devs.h" #include "bast.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-vstms.c b/arch/arm/mach-s3c/mach-vstms.c index 0bd289705a010b900f672d97c8b616bd5320969a..3cf798cffbfb0d8e98208e094cb817477bfa5e66 100644 --- a/arch/arm/mach-s3c/mach-vstms.c +++ b/arch/arm/mach-s3c/mach-vstms.c @@ -28,17 +28,17 @@ #include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" #include <linux/platform_data/fb-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> #include <linux/platform_data/mtd-nand-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> +#include "devs.h" +#include "cpu.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/include/plat/map-s3c.h b/arch/arm/mach-s3c/map-s3c.h similarity index 97% rename from arch/arm/mach-s3c/include/plat/map-s3c.h rename to arch/arm/mach-s3c/map-s3c.h index bf247d836684a964fbcffa82d86068edc0be045e..a18fdd3d6ae2221254e633254166d1655b17a912 100644 --- a/arch/arm/mach-s3c/include/plat/map-s3c.h +++ b/arch/arm/mach-s3c/map-s3c.h @@ -9,7 +9,7 @@ #ifndef __ASM_PLAT_MAP_S3C_H #define __ASM_PLAT_MAP_S3C_H __FILE__ -#include <mach/map.h> +#include "map.h" #define S3C24XX_VA_IRQ S3C_VA_IRQ #define S3C24XX_VA_MEMCTRL S3C_VA_MEM @@ -65,6 +65,6 @@ extern void __iomem *s3c24xx_va_gpio2; #define S3C24XX_VA_GPIO2 S3C24XX_VA_GPIO #endif -#include <plat/map-s5p.h> +#include "map-s5p.h" #endif /* __ASM_PLAT_MAP_S3C_H */ diff --git a/arch/arm/mach-s3c/include/mach/map-s3c24xx.h b/arch/arm/mach-s3c/map-s3c24xx.h similarity index 98% rename from arch/arm/mach-s3c/include/mach/map-s3c24xx.h rename to arch/arm/mach-s3c/map-s3c24xx.h index a20c9fd0d855e500329ce62a99b9cd497291ef89..b5dba78a9dd7ce8796b825b0e53aaf634f8aa462 100644 --- a/arch/arm/mach-s3c/include/mach/map-s3c24xx.h +++ b/arch/arm/mach-s3c/map-s3c24xx.h @@ -9,8 +9,8 @@ #ifndef __ASM_ARCH_MAP_H #define __ASM_ARCH_MAP_H -#include <plat/map-base.h> -#include <plat/map-s3c.h> +#include <mach/map-base.h> +#include "map-s3c.h" /* * interrupt controller is the first thing we put in, to make diff --git a/arch/arm/mach-s3c/include/mach/map-s3c64xx.h b/arch/arm/mach-s3c/map-s3c64xx.h similarity index 98% rename from arch/arm/mach-s3c/include/mach/map-s3c64xx.h rename to arch/arm/mach-s3c/map-s3c64xx.h index 9372a535b7ba8b646aca6792f2317679d253a6b4..d7740d2a77c4d37b6d25a7b2d29813cb8ea45519 100644 --- a/arch/arm/mach-s3c/include/mach/map-s3c64xx.h +++ b/arch/arm/mach-s3c/map-s3c64xx.h @@ -11,8 +11,8 @@ #ifndef __ASM_ARCH_MAP_H #define __ASM_ARCH_MAP_H __FILE__ -#include <plat/map-base.h> -#include <plat/map-s3c.h> +#include <mach/map-base.h> +#include "map-s3c.h" /* * Post-mux Chip Select Regions Xm0CSn_ diff --git a/arch/arm/mach-s3c/include/plat/map-s5p.h b/arch/arm/mach-s3c/map-s5p.h similarity index 94% rename from arch/arm/mach-s3c/include/plat/map-s5p.h rename to arch/arm/mach-s3c/map-s5p.h index 3812085f876161c358b33725309ae268b3e8f854..cd237924e34d9f22ec08ddc83345875249daf7be 100644 --- a/arch/arm/mach-s3c/include/plat/map-s5p.h +++ b/arch/arm/mach-s3c/map-s5p.h @@ -15,6 +15,6 @@ #define VA_VIC2 VA_VIC(2) #define VA_VIC3 VA_VIC(3) -#include <plat/map-s3c.h> +#include "map-s3c.h" #endif /* __ASM_PLAT_MAP_S5P_H */ diff --git a/arch/arm/mach-s3c/include/mach/map.h b/arch/arm/mach-s3c/map.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/map.h rename to arch/arm/mach-s3c/map.h diff --git a/arch/arm/mach-s3c/pl080.c b/arch/arm/mach-s3c/pl080.c index 3cbc755f7cd07b9bab83b6b74531a8836884fa8b..4730f080c73622853a277b4ec974b38fc0cd70bd 100644 --- a/arch/arm/mach-s3c/pl080.c +++ b/arch/arm/mach-s3c/pl080.c @@ -10,9 +10,9 @@ #include <linux/amba/pl08x.h> #include <linux/of.h> -#include <plat/cpu.h> +#include "cpu.h" #include <mach/irqs.h> -#include <mach/map.h> +#include "map.h" #include "regs-sys-s3c64xx.h" diff --git a/arch/arm/mach-s3c/platformdata.c b/arch/arm/mach-s3c/platformdata.c index cbc3b4b45c74dec2df3c753676ee0d144b069d52..e643c81aef45114ea1894db7ca66f11fc6210ff6 100644 --- a/arch/arm/mach-s3c/platformdata.c +++ b/arch/arm/mach-s3c/platformdata.c @@ -9,8 +9,8 @@ #include <linux/string.h> #include <linux/platform_device.h> -#include <plat/devs.h> -#include <plat/sdhci.h> +#include "devs.h" +#include "sdhci.h" void __init *s3c_set_platdata(void *pd, size_t pdsize, struct platform_device *pdev) diff --git a/arch/arm/mach-s3c/pm-common.c b/arch/arm/mach-s3c/pm-common.c index 2da0d352441fda251437292b799f3972053bace1..618bd4499cae2a4234d206a6898341096d84ad84 100644 --- a/arch/arm/mach-s3c/pm-common.c +++ b/arch/arm/mach-s3c/pm-common.c @@ -12,7 +12,7 @@ #include <linux/io.h> #include <linux/kernel.h> -#include <plat/pm-common.h> +#include "pm-common.h" /* helper functions to save and restore register state */ diff --git a/arch/arm/mach-s3c/include/plat/pm-common.h b/arch/arm/mach-s3c/pm-common.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/pm-common.h rename to arch/arm/mach-s3c/pm-common.h diff --git a/arch/arm/mach-s3c/include/mach/pm-core-s3c24xx.h b/arch/arm/mach-s3c/pm-core-s3c24xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/pm-core-s3c24xx.h rename to arch/arm/mach-s3c/pm-core-s3c24xx.h diff --git a/arch/arm/mach-s3c/include/mach/pm-core-s3c64xx.h b/arch/arm/mach-s3c/pm-core-s3c64xx.h similarity index 96% rename from arch/arm/mach-s3c/include/mach/pm-core-s3c64xx.h rename to arch/arm/mach-s3c/pm-core-s3c64xx.h index 33cf242734a05cbf658ff699e1ea79217301ebc1..06f564e5cf6311b9e0196b3ae6f9bc52bd023062 100644 --- a/arch/arm/mach-s3c/include/mach/pm-core-s3c64xx.h +++ b/arch/arm/mach-s3c/pm-core-s3c64xx.h @@ -14,9 +14,9 @@ #include <linux/serial_s3c.h> #include <linux/delay.h> -#include <mach/regs-gpio.h> -#include <mach/regs-clock.h> -#include <mach/map.h> +#include "regs-gpio.h" +#include "regs-clock.h" +#include "map.h" static inline void s3c_pm_debug_init_uart(void) { diff --git a/arch/arm/mach-s3c/include/mach/pm-core.h b/arch/arm/mach-s3c/pm-core.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/pm-core.h rename to arch/arm/mach-s3c/pm-core.h diff --git a/arch/arm/mach-s3c/pm-gpio.c b/arch/arm/mach-s3c/pm-gpio.c index cb2e3bc79336854df7fe2f78276207cfead9dbd2..cfdbc23379988d2e75d290b63899d65eb153a264 100644 --- a/arch/arm/mach-s3c/pm-gpio.c +++ b/arch/arm/mach-s3c/pm-gpio.c @@ -13,10 +13,10 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" -#include <plat/gpio-core.h> -#include <plat/pm.h> +#include "gpio-core.h" +#include "pm.h" /* PM GPIO helpers */ diff --git a/arch/arm/mach-s3c/pm-h1940.S b/arch/arm/mach-s3c/pm-h1940.S index f9ee515e1cbe846906879b90a770f5fda1273f79..3bf6685123cba7dfde5e582799e00e4c2ec99466 100644 --- a/arch/arm/mach-s3c/pm-h1940.S +++ b/arch/arm/mach-s3c/pm-h1940.S @@ -7,9 +7,9 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <mach/map.h> +#include "map.h" -#include <mach/regs-gpio.h> +#include "regs-gpio.h" .text .global h1940_pm_return diff --git a/arch/arm/mach-s3c/pm-s3c2410.c b/arch/arm/mach-s3c/pm-s3c2410.c index ffd0d6c2324f1c9a3192e81d6d610835c5fbf77e..a664198837353e6fc5c7e3b4caca7f4cd51cd92a 100644 --- a/arch/arm/mach-s3c/pm-s3c2410.c +++ b/arch/arm/mach-s3c/pm-s3c2410.c @@ -16,12 +16,12 @@ #include <asm/mach-types.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" -#include <plat/gpio-cfg.h> -#include <plat/cpu.h> -#include <plat/pm.h> +#include "gpio-cfg.h" +#include "cpu.h" +#include "pm.h" #include "h1940.h" diff --git a/arch/arm/mach-s3c/pm-s3c2412.c b/arch/arm/mach-s3c/pm-s3c2412.c index 1caf53b65dc12f3d9bcf67fbe2d3144d74fa4e4a..6a9604477c9ee50aac9d4e95fa4d6ad5b3c39baf 100644 --- a/arch/arm/mach-s3c/pm-s3c2412.c +++ b/arch/arm/mach-s3c/pm-s3c2412.c @@ -20,11 +20,11 @@ #include <asm/irq.h> #include <mach/irqs.h> -#include <mach/regs-gpio.h> +#include "regs-gpio.h" -#include <plat/cpu.h> -#include <plat/pm.h> -#include <plat/wakeup-mask.h> +#include "cpu.h" +#include "pm.h" +#include "wakeup-mask.h" #include "regs-dsc-s3c24xx.h" #include "s3c2412-power.h" diff --git a/arch/arm/mach-s3c/pm-s3c2416.c b/arch/arm/mach-s3c/pm-s3c2416.c index 9a2f05e279d4803fa333c0ef8afd2ee141028bbc..f69ad84cf4ff1f6ea11b8640ea61abfac5f0c820 100644 --- a/arch/arm/mach-s3c/pm-s3c2416.c +++ b/arch/arm/mach-s3c/pm-s3c2416.c @@ -11,10 +11,10 @@ #include <asm/cacheflush.h> -#include <mach/regs-s3c2443-clock.h> +#include "regs-s3c2443-clock.h" -#include <plat/cpu.h> -#include <plat/pm.h> +#include "cpu.h" +#include "pm.h" #include "s3c2412-power.h" diff --git a/arch/arm/mach-s3c/pm-s3c24xx.c b/arch/arm/mach-s3c/pm-s3c24xx.c index 0c583cbe41b264b59380c14fdb5d6900fd5a1317..3a8f5c38882ebee878c880836a33887a5e29e3cb 100644 --- a/arch/arm/mach-s3c/pm-s3c24xx.c +++ b/arch/arm/mach-s3c/pm-s3c24xx.c @@ -21,15 +21,15 @@ #include <linux/serial_s3c.h> #include <linux/io.h> -#include <mach/regs-clock.h> -#include <mach/regs-gpio.h> -#include <mach/regs-irq.h> -#include <mach/gpio-samsung.h> +#include "regs-clock.h" +#include "regs-gpio.h" +#include "regs-irq.h" +#include "gpio-samsung.h" #include <asm/mach/time.h> -#include <plat/gpio-cfg.h> -#include <plat/pm.h> +#include "gpio-cfg.h" +#include "pm.h" #include "regs-mem-s3c24xx.h" diff --git a/arch/arm/mach-s3c/pm-s3c64xx.c b/arch/arm/mach-s3c/pm-s3c64xx.c index 03393664a7979314173f14c0199eb580a268b4e7..4f1778123dee54a198e7c3dcbdc88edaa1a6cf81 100644 --- a/arch/arm/mach-s3c/pm-s3c64xx.c +++ b/arch/arm/mach-s3c/pm-s3c64xx.c @@ -14,17 +14,17 @@ #include <linux/gpio.h> #include <linux/pm_domain.h> -#include <mach/map.h> +#include "map.h" #include <mach/irqs.h> -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pm.h> -#include <plat/wakeup-mask.h> +#include "cpu.h" +#include "devs.h" +#include "pm.h" +#include "wakeup-mask.h" -#include <mach/regs-gpio.h> -#include <mach/regs-clock.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "regs-clock.h" +#include "gpio-samsung.h" #include "regs-gpio-memport-s3c64xx.h" #include "regs-modem-s3c64xx.h" diff --git a/arch/arm/mach-s3c/pm.c b/arch/arm/mach-s3c/pm.c index 03c22a9dee21efcdfbc903c4b5c855fb7a30519d..c563bb9d92be0e2eafc20a18a388002d2911cf7f 100644 --- a/arch/arm/mach-s3c/pm.c +++ b/arch/arm/mach-s3c/pm.c @@ -18,16 +18,16 @@ #include <asm/cacheflush.h> #include <asm/suspend.h> -#include <mach/map.h> -#include <mach/regs-clock.h> -#include <mach/regs-irq.h> +#include "map.h" +#include "regs-clock.h" +#include "regs-irq.h" #include <mach/irqs.h> #include <asm/irq.h> -#include <plat/cpu.h> -#include <plat/pm.h> -#include <mach/pm-core.h> +#include "cpu.h" +#include "pm.h" +#include "pm-core.h" /* for external use */ diff --git a/arch/arm/mach-s3c/include/plat/pm.h b/arch/arm/mach-s3c/pm.h similarity index 98% rename from arch/arm/mach-s3c/include/plat/pm.h rename to arch/arm/mach-s3c/pm.h index 2746137f97944484f7ad0c814b4e3ae63e4dec30..eed61e5854576ebe637860a3044715d0d7ac9ae3 100644 --- a/arch/arm/mach-s3c/include/plat/pm.h +++ b/arch/arm/mach-s3c/pm.h @@ -11,7 +11,7 @@ * management */ -#include <plat/pm-common.h> +#include "pm-common.h" struct device; diff --git a/arch/arm/mach-s3c/include/plat/pwm-core.h b/arch/arm/mach-s3c/pwm-core.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/pwm-core.h rename to arch/arm/mach-s3c/pwm-core.h diff --git a/arch/arm/mach-s3c/include/plat/regs-adc.h b/arch/arm/mach-s3c/regs-adc.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/regs-adc.h rename to arch/arm/mach-s3c/regs-adc.h diff --git a/arch/arm/mach-s3c/include/mach/regs-clock-s3c24xx.h b/arch/arm/mach-s3c/regs-clock-s3c24xx.h similarity index 99% rename from arch/arm/mach-s3c/include/mach/regs-clock-s3c24xx.h rename to arch/arm/mach-s3c/regs-clock-s3c24xx.h index da4e7b3aeba652aec0f274b38f64cd79eb9230a5..933ddb5eedec19d7b303392bd5490969630aa037 100644 --- a/arch/arm/mach-s3c/include/mach/regs-clock-s3c24xx.h +++ b/arch/arm/mach-s3c/regs-clock-s3c24xx.h @@ -9,7 +9,7 @@ #ifndef __ASM_ARM_REGS_CLOCK #define __ASM_ARM_REGS_CLOCK -#include <mach/map.h> +#include "map.h" #define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR) diff --git a/arch/arm/mach-s3c/include/mach/regs-clock-s3c64xx.h b/arch/arm/mach-s3c/regs-clock-s3c64xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/regs-clock-s3c64xx.h rename to arch/arm/mach-s3c/regs-clock-s3c64xx.h diff --git a/arch/arm/mach-s3c/include/mach/regs-clock.h b/arch/arm/mach-s3c/regs-clock.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/regs-clock.h rename to arch/arm/mach-s3c/regs-clock.h diff --git a/arch/arm/mach-s3c/include/mach/regs-gpio-s3c24xx.h b/arch/arm/mach-s3c/regs-gpio-s3c24xx.h similarity index 99% rename from arch/arm/mach-s3c/include/mach/regs-gpio-s3c24xx.h rename to arch/arm/mach-s3c/regs-gpio-s3c24xx.h index 51827d5577b6fe3d7a91ab2e656549721a637ee7..9a7e262268a7b78e35252cfea6b0b31bb4a66d2d 100644 --- a/arch/arm/mach-s3c/include/mach/regs-gpio-s3c24xx.h +++ b/arch/arm/mach-s3c/regs-gpio-s3c24xx.h @@ -10,7 +10,7 @@ #ifndef __ASM_ARCH_REGS_GPIO_H #define __ASM_ARCH_REGS_GPIO_H -#include <plat/map-s3c.h> +#include "map-s3c.h" #define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80) diff --git a/arch/arm/mach-s3c/include/mach/regs-gpio-s3c64xx.h b/arch/arm/mach-s3c/regs-gpio-s3c64xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/regs-gpio-s3c64xx.h rename to arch/arm/mach-s3c/regs-gpio-s3c64xx.h diff --git a/arch/arm/mach-s3c/include/mach/regs-gpio.h b/arch/arm/mach-s3c/regs-gpio.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/regs-gpio.h rename to arch/arm/mach-s3c/regs-gpio.h diff --git a/arch/arm/mach-s3c/include/mach/regs-irq-s3c24xx.h b/arch/arm/mach-s3c/regs-irq-s3c24xx.h similarity index 98% rename from arch/arm/mach-s3c/include/mach/regs-irq-s3c24xx.h rename to arch/arm/mach-s3c/regs-irq-s3c24xx.h index 2921b48c56b2dc3394813e8cf8038ccb82b7d0d0..c0b97b203415788b42774630a78c0e1b60ab6233 100644 --- a/arch/arm/mach-s3c/include/mach/regs-irq-s3c24xx.h +++ b/arch/arm/mach-s3c/regs-irq-s3c24xx.h @@ -8,7 +8,7 @@ #ifndef ___ASM_ARCH_REGS_IRQ_H #define ___ASM_ARCH_REGS_IRQ_H -#include <plat/map-s3c.h> +#include "map-s3c.h" /* interrupt controller */ diff --git a/arch/arm/mach-s3c/include/mach/regs-irq-s3c64xx.h b/arch/arm/mach-s3c/regs-irq-s3c64xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/regs-irq-s3c64xx.h rename to arch/arm/mach-s3c/regs-irq-s3c64xx.h diff --git a/arch/arm/mach-s3c/include/mach/regs-irq.h b/arch/arm/mach-s3c/regs-irq.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/regs-irq.h rename to arch/arm/mach-s3c/regs-irq.h diff --git a/arch/arm/mach-s3c/include/plat/regs-irqtype.h b/arch/arm/mach-s3c/regs-irqtype.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/regs-irqtype.h rename to arch/arm/mach-s3c/regs-irqtype.h diff --git a/arch/arm/mach-s3c/regs-mem-s3c24xx.h b/arch/arm/mach-s3c/regs-mem-s3c24xx.h index 5048ab8f06c2144de70c669b497a3b628ed39e19..8fed34a1672a20d8dbb11c031c366878ed344a42 100644 --- a/arch/arm/mach-s3c/regs-mem-s3c24xx.h +++ b/arch/arm/mach-s3c/regs-mem-s3c24xx.h @@ -9,7 +9,7 @@ #ifndef __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H #define __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H __FILE__ -#include <plat/map-s3c.h> +#include "map-s3c.h" #define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x)) diff --git a/arch/arm/mach-s3c/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c/regs-s3c2443-clock.h similarity index 99% rename from arch/arm/mach-s3c/include/mach/regs-s3c2443-clock.h rename to arch/arm/mach-s3c/regs-s3c2443-clock.h index fefef7233f4b4c19097b90724e43c8d7c79798cd..b3b670d463db31e3b5c6a1a78dced5007f7e3b9a 100644 --- a/arch/arm/mach-s3c/include/mach/regs-s3c2443-clock.h +++ b/arch/arm/mach-s3c/regs-s3c2443-clock.h @@ -11,7 +11,7 @@ #define __ASM_ARM_REGS_S3C2443_CLOCK #include <linux/delay.h> -#include <plat/map-s3c.h> +#include "map-s3c.h" #define S3C2443_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR) diff --git a/arch/arm/mach-s3c/include/mach/rtc-core-s3c24xx.h b/arch/arm/mach-s3c/rtc-core-s3c24xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/rtc-core-s3c24xx.h rename to arch/arm/mach-s3c/rtc-core-s3c24xx.h diff --git a/arch/arm/mach-s3c/s3c2410.c b/arch/arm/mach-s3c/s3c2410.c index 0013125b03ee1018a3ba3d67902e182b06b6320f..4153e67f0e867d81ab027237bd4c3e673f82b89a 100644 --- a/arch/arm/mach-s3c/s3c2410.c +++ b/arch/arm/mach-s3c/s3c2410.c @@ -25,21 +25,21 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/map.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "gpio-samsung.h" #include <asm/irq.h> #include <asm/system_misc.h> -#include <mach/regs-clock.h> +#include "regs-clock.h" -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pm.h> +#include "cpu.h" +#include "devs.h" +#include "pm.h" -#include <plat/gpio-core.h> -#include <plat/gpio-cfg.h> -#include <plat/gpio-cfg-helpers.h> +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/s3c2412.c b/arch/arm/mach-s3c/s3c2412.c index 5fbea5b4276daace87c9fd4ce546e845f34a3853..35f4addd110b556b4deec18f72b76d4b9685eae2 100644 --- a/arch/arm/mach-s3c/s3c2412.c +++ b/arch/arm/mach-s3c/s3c2412.c @@ -29,13 +29,13 @@ #include <asm/irq.h> #include <asm/system_misc.h> -#include <mach/map.h> -#include <mach/regs-clock.h> -#include <mach/regs-gpio.h> +#include "map.h" +#include "regs-clock.h" +#include "regs-gpio.h" -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pm.h> +#include "cpu.h" +#include "devs.h" +#include "pm.h" #include "s3c24xx.h" #include "nand-core-s3c24xx.h" diff --git a/arch/arm/mach-s3c/include/mach/s3c2412.h b/arch/arm/mach-s3c/s3c2412.h similarity index 96% rename from arch/arm/mach-s3c/include/mach/s3c2412.h rename to arch/arm/mach-s3c/s3c2412.h index 1ae369c81bebd12864da35619b283b47bb359d29..ed09a0e13bd820b82d58ea0412302224be33b045 100644 --- a/arch/arm/mach-s3c/include/mach/s3c2412.h +++ b/arch/arm/mach-s3c/s3c2412.h @@ -8,7 +8,7 @@ #ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H #define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__ -#include <plat/map-s3c.h> +#include "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-s3c/s3c2416.c b/arch/arm/mach-s3c/s3c2416.c index f24476c16e4a55717916d69feeab8db89e744120..34b7c101becfdc34a01bedcca1acc139ccc78c56 100644 --- a/arch/arm/mach-s3c/s3c2416.c +++ b/arch/arm/mach-s3c/s3c2416.c @@ -26,25 +26,25 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/map.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "gpio-samsung.h" #include <asm/proc-fns.h> #include <asm/irq.h> #include <asm/system_misc.h> -#include <mach/regs-s3c2443-clock.h> -#include <mach/rtc-core-s3c24xx.h> +#include "regs-s3c2443-clock.h" +#include "rtc-core-s3c24xx.h" -#include <plat/gpio-core.h> -#include <plat/gpio-cfg.h> -#include <plat/gpio-cfg-helpers.h> -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/sdhci.h> -#include <plat/pm.h> +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "devs.h" +#include "cpu.h" +#include "sdhci.h" +#include "pm.h" -#include <plat/iic-core.h> -#include <plat/adc-core.h> +#include "iic-core.h" +#include "adc-core.h" #include "s3c24xx.h" #include "fb-core-s3c24xx.h" diff --git a/arch/arm/mach-s3c/s3c2440.c b/arch/arm/mach-s3c/s3c2440.c index 234b08e57046f0b9deab65158ade1ae827bfc438..c6cdee4987e895377eee7b86c019b93ae28be470 100644 --- a/arch/arm/mach-s3c/s3c2440.c +++ b/arch/arm/mach-s3c/s3c2440.c @@ -23,16 +23,16 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/gpio-samsung.h> #include <asm/irq.h> -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/pm.h> +#include "devs.h" +#include "cpu.h" +#include "pm.h" -#include <plat/gpio-core.h> -#include <plat/gpio-cfg.h> -#include <plat/gpio-cfg-helpers.h> +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "gpio-samsung.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/s3c2442.c b/arch/arm/mach-s3c/s3c2442.c index 29d82315339d95fe7ddec4ad91d3fb97fcbbc322..0c0e30b6688f705ef80c44b4eab3c32b66c1b6cf 100644 --- a/arch/arm/mach-s3c/s3c2442.c +++ b/arch/arm/mach-s3c/s3c2442.c @@ -21,18 +21,18 @@ #include <linux/clk.h> #include <linux/io.h> -#include <mach/gpio-samsung.h> #include <linux/atomic.h> #include <asm/irq.h> -#include <mach/regs-clock.h> +#include "regs-clock.h" -#include <plat/cpu.h> -#include <plat/pm.h> +#include "cpu.h" +#include "pm.h" -#include <plat/gpio-core.h> -#include <plat/gpio-cfg.h> -#include <plat/gpio-cfg-helpers.h> +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "gpio-samsung.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/s3c2443.c b/arch/arm/mach-s3c/s3c2443.c index d070e738eafb42d6bbb7c350d60b419a6dfd576a..45fde50b202cfa36228451bb5901560481f7755f 100644 --- a/arch/arm/mach-s3c/s3c2443.c +++ b/arch/arm/mach-s3c/s3c2443.c @@ -23,21 +23,21 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/map.h> -#include <mach/gpio-samsung.h> +#include "map.h" +#include "gpio-samsung.h" #include <mach/irqs.h> #include <asm/irq.h> #include <asm/system_misc.h> -#include <mach/regs-s3c2443-clock.h> -#include <mach/rtc-core-s3c24xx.h> +#include "regs-s3c2443-clock.h" +#include "rtc-core-s3c24xx.h" -#include <plat/gpio-core.h> -#include <plat/gpio-cfg.h> -#include <plat/gpio-cfg-helpers.h> -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/adc-core.h> +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "devs.h" +#include "cpu.h" +#include "adc-core.h" #include "s3c24xx.h" #include "fb-core-s3c24xx.h" diff --git a/arch/arm/mach-s3c/s3c244x.c b/arch/arm/mach-s3c/s3c244x.c index 9d8464178412e57f9851a04d6d37ffa58c04191d..bae93598f009f1aa162f559f76504e16497cf497 100644 --- a/arch/arm/mach-s3c/s3c244x.c +++ b/arch/arm/mach-s3c/s3c244x.c @@ -25,15 +25,15 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/map.h> +#include "map.h" #include <asm/irq.h> -#include <mach/regs-clock.h> -#include <mach/regs-gpio.h> +#include "regs-clock.h" +#include "regs-gpio.h" -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/pm.h> +#include "devs.h" +#include "cpu.h" +#include "pm.h" #include "s3c24xx.h" #include "nand-core-s3c24xx.h" diff --git a/arch/arm/mach-s3c/s3c24xx.c b/arch/arm/mach-s3c/s3c24xx.c index d854cf9d290bea4896f160bc1bc1258aa6c239ee..db049dd943248f2c129d3e2daa88b9480f5d0845 100644 --- a/arch/arm/mach-s3c/s3c24xx.c +++ b/arch/arm/mach-s3c/s3c24xx.c @@ -22,9 +22,9 @@ #include <linux/dmaengine.h> #include <linux/clk/samsung.h> -#include <mach/hardware-s3c24xx.h> -#include <mach/map.h> -#include <mach/regs-clock.h> +#include "hardware-s3c24xx.h" +#include "map.h" +#include "regs-clock.h" #include <asm/irq.h> #include <asm/cacheflush.h> #include <asm/system_info.h> @@ -33,12 +33,12 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/regs-gpio.h> -#include <mach/dma.h> +#include "regs-gpio.h" +#include "dma-s3c24xx.h" -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pwm-core.h> +#include "cpu.h" +#include "devs.h" +#include "pwm-core.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/s3c6400.c b/arch/arm/mach-s3c/s3c6400.c index 86be7eeef6e1e5ff2efb12cc156acca63933f3fb..802f4fb7462de8bd154eb6e65de4b26008016966 100644 --- a/arch/arm/mach-s3c/s3c6400.c +++ b/arch/arm/mach-s3c/s3c6400.c @@ -28,12 +28,12 @@ #include <asm/irq.h> -#include <mach/regs-clock.h> +#include "regs-clock.h" -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/sdhci.h> -#include <plat/iic-core.h> +#include "cpu.h" +#include "devs.h" +#include "sdhci.h" +#include "iic-core.h" #include "s3c64xx.h" #include "onenand-core-s3c64xx.h" diff --git a/arch/arm/mach-s3c/s3c6410.c b/arch/arm/mach-s3c/s3c6410.c index 0f253d42358120d3943241003d14aa8c38e140e9..dae17d5fd0926917892409a29dbfe16b0c37748e 100644 --- a/arch/arm/mach-s3c/s3c6410.c +++ b/arch/arm/mach-s3c/s3c6410.c @@ -30,13 +30,13 @@ #include <asm/irq.h> #include <linux/soc/samsung/s3c-pm.h> -#include <mach/regs-clock.h> +#include "regs-clock.h" -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/sdhci.h> -#include <plat/adc-core.h> -#include <plat/iic-core.h> +#include "cpu.h" +#include "devs.h" +#include "sdhci.h" +#include "adc-core.h" +#include "iic-core.h" #include "ata-core-s3c64xx.h" #include "s3c64xx.h" diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c index fcb09629811360c4240828c2973b4699c6ade082..ef79aaf1aced9f5d6913af1db67b0434d372d96f 100644 --- a/arch/arm/mach-s3c/s3c64xx.c +++ b/arch/arm/mach-s3c/s3c64xx.c @@ -35,18 +35,17 @@ #include <asm/mach/map.h> #include <asm/system_misc.h> -#include <mach/map.h> +#include "map.h" #include <mach/irqs.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pm.h> -#include <plat/gpio-cfg.h> -#include <plat/pwm-core.h> -#include <plat/regs-irqtype.h> - +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "devs.h" +#include "pm.h" +#include "gpio-cfg.h" +#include "pwm-core.h" +#include "regs-irqtype.h" #include "s3c64xx.h" #include "irq-uart-s3c64xx.h" diff --git a/arch/arm/mach-s3c/include/plat/sdhci.h b/arch/arm/mach-s3c/sdhci.h similarity index 99% rename from arch/arm/mach-s3c/include/plat/sdhci.h rename to arch/arm/mach-s3c/sdhci.h index 5731e42ea208802cc25d2a17d0558e5c9f4a5dc4..9f9d419e58d7fa6dcb0a44e81962991e3fa410fe 100644 --- a/arch/arm/mach-s3c/include/plat/sdhci.h +++ b/arch/arm/mach-s3c/sdhci.h @@ -15,7 +15,7 @@ #define __PLAT_S3C_SDHCI_H __FILE__ #include <linux/platform_data/mmc-sdhci-s3c.h> -#include <plat/devs.h> +#include "devs.h" /* s3c_sdhci_set_platdata() - common helper for setting SDHCI platform data * @pd: The default platform data for this device. diff --git a/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c b/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c index 2c7178b26ebb52c9e1d50d8d7debca8908f513c6..cfa34b55ca214645b5704749829342c3e994c674 100644 --- a/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c @@ -12,9 +12,9 @@ #include <linux/fb.h> #include <linux/gpio.h> -#include <plat/fb.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> +#include "fb.h" +#include "gpio-cfg.h" +#include "gpio-samsung.h" void s3c64xx_fb_gpio_setup_24bpp(void) { diff --git a/arch/arm/mach-s3c/setup-i2c-s3c24xx.c b/arch/arm/mach-s3c/setup-i2c-s3c24xx.c index 1be5372e0261f8b1e35b9c34dc88449d13295fc1..0d88366b234ce9754d9dadfb490941035772a257 100644 --- a/arch/arm/mach-s3c/setup-i2c-s3c24xx.c +++ b/arch/arm/mach-s3c/setup-i2c-s3c24xx.c @@ -10,10 +10,11 @@ struct platform_device; -#include <plat/gpio-cfg.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> + +#include "gpio-cfg.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" void s3c_i2c0_cfg_gpio(struct platform_device *dev) { diff --git a/arch/arm/mach-s3c/setup-i2c0-s3c64xx.c b/arch/arm/mach-s3c/setup-i2c0-s3c64xx.c index 552eb50da38c4250dff8b9d879a5d1251ea17b09..a6ef8d2bc995296df43b6bb291d54d1d6f34574e 100644 --- a/arch/arm/mach-s3c/setup-i2c0-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-i2c0-s3c64xx.c @@ -14,8 +14,8 @@ struct platform_device; /* don't need the contents */ #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "gpio-samsung.h" void s3c_i2c0_cfg_gpio(struct platform_device *dev) { diff --git a/arch/arm/mach-s3c/setup-i2c1-s3c64xx.c b/arch/arm/mach-s3c/setup-i2c1-s3c64xx.c index d231f0fc508df2b674cdd8a83034296446e7168b..0fe37363d26eba59baf9ee5a45763e49d24af81e 100644 --- a/arch/arm/mach-s3c/setup-i2c1-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-i2c1-s3c64xx.c @@ -14,8 +14,8 @@ struct platform_device; /* don't need the contents */ #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "gpio-samsung.h" void s3c_i2c1_cfg_gpio(struct platform_device *dev) { diff --git a/arch/arm/mach-s3c/setup-ide-s3c64xx.c b/arch/arm/mach-s3c/setup-ide-s3c64xx.c index 810139a807ce58239d71b10462e44595eb45ff06..f11f2b02e49f85c94e146ff27f560ba634030823 100644 --- a/arch/arm/mach-s3c/setup-ide-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-ide-s3c64xx.c @@ -9,12 +9,13 @@ #include <linux/gpio.h> #include <linux/io.h> -#include <mach/map.h> -#include <mach/regs-clock.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> #include <linux/platform_data/ata-samsung_cf.h> +#include "map.h" +#include "regs-clock.h" +#include "gpio-cfg.h" +#include "gpio-samsung.h" + void s3c64xx_ide_setup_gpio(void) { u32 reg; diff --git a/arch/arm/mach-s3c/setup-keypad-s3c64xx.c b/arch/arm/mach-s3c/setup-keypad-s3c64xx.c index 3519610252739f7d2ff06747277d4d6ae9358790..8463ad37c6ab2fa14e0782de83c02f3813f98b5a 100644 --- a/arch/arm/mach-s3c/setup-keypad-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-keypad-s3c64xx.c @@ -6,9 +6,9 @@ // GPIO configuration for S3C64XX KeyPad device #include <linux/gpio.h> -#include <plat/gpio-cfg.h> -#include <plat/keypad.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "keypad.h" +#include "gpio-samsung.h" void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) { diff --git a/arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c b/arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c index ff5c0a51ded5d240edb8eab01c191ad1481070c4..02131b3a731de4eaad067e2d2a7f78fd66a0d7ab 100644 --- a/arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c +++ b/arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c @@ -14,10 +14,10 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> -#include <plat/sdhci.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" +#include "sdhci.h" void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) { diff --git a/arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c b/arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c index 138455af4937b8a29b7d400cff3e27dc831fee31..646ff949acd5938381e319be17248f2df7b14bb4 100644 --- a/arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c @@ -13,9 +13,9 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <plat/gpio-cfg.h> -#include <plat/sdhci.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "sdhci.h" +#include "gpio-samsung.h" void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) { diff --git a/arch/arm/mach-s3c/setup-spi-s3c24xx.c b/arch/arm/mach-s3c/setup-spi-s3c24xx.c index c8b897cbc7ce260f87bccaf490958ab456a20350..93fa1bbc9d5c4c284fcfce497642a31650b1a0cf 100644 --- a/arch/arm/mach-s3c/setup-spi-s3c24xx.c +++ b/arch/arm/mach-s3c/setup-spi-s3c24xx.c @@ -8,10 +8,10 @@ #include <linux/gpio.h> #include <linux/platform_device.h> -#include <plat/gpio-cfg.h> +#include "gpio-cfg.h" -#include <mach/hardware-s3c24xx.h> -#include <mach/regs-gpio.h> +#include "hardware-s3c24xx.h" +#include "regs-gpio.h" #ifdef CONFIG_S3C64XX_DEV_SPI0 int s3c64xx_spi0_cfg_gpio(void) diff --git a/arch/arm/mach-s3c/setup-spi-s3c64xx.c b/arch/arm/mach-s3c/setup-spi-s3c64xx.c index 03c9d296bb0f75fbe372af09153a47e305ce9252..efcf78d41585389d82ed1d83a1966e21b5b047e5 100644 --- a/arch/arm/mach-s3c/setup-spi-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-spi-s3c64xx.c @@ -5,8 +5,8 @@ #include <linux/gpio.h> #include <linux/platform_data/spi-s3c64xx.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "gpio-samsung.h" #ifdef CONFIG_S3C64XX_DEV_SPI0 int s3c64xx_spi0_cfg_gpio(void) diff --git a/arch/arm/mach-s3c/setup-ts-s3c24xx.c b/arch/arm/mach-s3c/setup-ts-s3c24xx.c index 65ec67e0759f5d5f901d2e8e8b933d93a01eb351..57363eaeb7e80a2cbe345d6b3513d9af80961832 100644 --- a/arch/arm/mach-s3c/setup-ts-s3c24xx.c +++ b/arch/arm/mach-s3c/setup-ts-s3c24xx.c @@ -12,8 +12,8 @@ struct platform_device; /* don't need the contents */ #include <linux/platform_data/touchscreen-s3c2410.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "gpio-samsung.h" /** * s3c24xx_ts_cfg_gpio - configure gpio for s3c2410 systems diff --git a/arch/arm/mach-s3c/setup-usb-phy-s3c64xx.c b/arch/arm/mach-s3c/setup-usb-phy-s3c64xx.c index d29b3bf63ad898098e809a9c9fc9fa5fe03c1b5b..500d105afd6b76978067258f004a68272c764c3d 100644 --- a/arch/arm/mach-s3c/setup-usb-phy-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-usb-phy-s3c64xx.c @@ -8,9 +8,9 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/platform_device.h> -#include <mach/map.h> -#include <plat/cpu.h> -#include <plat/usb-phy.h> +#include "map.h" +#include "cpu.h" +#include "usb-phy.h" #include "regs-sys-s3c64xx.h" #include "regs-usb-hsotg-phy-s3c64xx.h" diff --git a/arch/arm/mach-s3c/simtec-audio.c b/arch/arm/mach-s3c/simtec-audio.c index af87261e6a590fee478bbc4fca0222070953c3b7..487485bcc2ab53b92ae14ef1ee9fafd6d09a1513 100644 --- a/arch/arm/mach-s3c/simtec-audio.c +++ b/arch/arm/mach-s3c/simtec-audio.c @@ -12,12 +12,12 @@ #include <linux/device.h> #include <linux/io.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" #include <linux/platform_data/asoc-s3c24xx_simtec.h> -#include <plat/devs.h> +#include "devs.h" #include "bast.h" #include "simtec.h" diff --git a/arch/arm/mach-s3c/simtec-nor.c b/arch/arm/mach-s3c/simtec-nor.c index 26b18497e9595f543b3c69cb7d535d425787b409..a6fba056a7475a3dd43a5fd15f814e131b6674e0 100644 --- a/arch/arm/mach-s3c/simtec-nor.c +++ b/arch/arm/mach-s3c/simtec-nor.c @@ -21,7 +21,7 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/map.h> +#include "map.h" #include "bast.h" #include "simtec.h" diff --git a/arch/arm/mach-s3c/simtec-pm.c b/arch/arm/mach-s3c/simtec-pm.c index 4d8248763eb6382767d2f72fcd59a1396d25e2c5..490256a766e24bc5f8a59d18e312963cf8f2ddeb 100644 --- a/arch/arm/mach-s3c/simtec-pm.c +++ b/arch/arm/mach-s3c/simtec-pm.c @@ -19,12 +19,12 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/map.h> -#include <mach/regs-gpio.h> +#include "map.h" +#include "regs-gpio.h" #include <asm/mach-types.h> -#include <plat/pm.h> +#include "pm.h" #include "regs-mem-s3c24xx.h" diff --git a/arch/arm/mach-s3c/simtec-usb.c b/arch/arm/mach-s3c/simtec-usb.c index 693a2a9a73497f43d7243eb35d71b2bf841d4b84..18fe0642743a8fa4c74608ad2862cc6ddb64db68 100644 --- a/arch/arm/mach-s3c/simtec-usb.c +++ b/arch/arm/mach-s3c/simtec-usb.c @@ -23,12 +23,12 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/gpio-samsung.h> +#include "gpio-samsung.h" #include <mach/irqs.h> #include <asm/irq.h> #include <linux/platform_data/usb-ohci-s3c2410.h> -#include <plat/devs.h> +#include "devs.h" #include "bast.h" #include "simtec.h" diff --git a/arch/arm/mach-s3c/sleep-s3c2410.S b/arch/arm/mach-s3c/sleep-s3c2410.S index 0340297596e9f1dab2d7a6529990ff2ea9035726..04aded98782b119eeade5f4047a9a990a2a27ac2 100644 --- a/arch/arm/mach-s3c/sleep-s3c2410.S +++ b/arch/arm/mach-s3c/sleep-s3c2410.S @@ -13,10 +13,10 @@ #include <linux/linkage.h> #include <linux/serial_s3c.h> #include <asm/assembler.h> -#include <mach/map.h> +#include "map.h" -#include <mach/regs-gpio.h> -#include <mach/regs-clock.h> +#include "regs-gpio.h" +#include "regs-clock.h" #include "regs-mem-s3c24xx.h" diff --git a/arch/arm/mach-s3c/sleep-s3c2412.S b/arch/arm/mach-s3c/sleep-s3c2412.S index 434f5082b2edb4ff322f784803505025dc013362..b4b61737fbb29e3c98d35b45ee660b59967cc480 100644 --- a/arch/arm/mach-s3c/sleep-s3c2412.S +++ b/arch/arm/mach-s3c/sleep-s3c2412.S @@ -8,9 +8,9 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <mach/map.h> +#include "map.h" -#include <mach/regs-irq.h> +#include "regs-irq.h" .text diff --git a/arch/arm/mach-s3c/sleep-s3c24xx.S b/arch/arm/mach-s3c/sleep-s3c24xx.S index 4bda4a413584ff468252a9bb55532d31c8e3a1b0..4b2af91f3dce6c3066894c4b74201aa25be0c4d0 100644 --- a/arch/arm/mach-s3c/sleep-s3c24xx.S +++ b/arch/arm/mach-s3c/sleep-s3c24xx.S @@ -13,10 +13,10 @@ #include <linux/linkage.h> #include <linux/serial_s3c.h> #include <asm/assembler.h> -#include <mach/map.h> +#include "map.h" -#include <mach/regs-gpio.h> -#include <mach/regs-clock.h> +#include "regs-gpio.h" +#include "regs-clock.h" /* * S3C24XX_DEBUG_RESUME is dangerous if your bootloader does not diff --git a/arch/arm/mach-s3c/sleep-s3c64xx.S b/arch/arm/mach-s3c/sleep-s3c64xx.S index 39e16a07a5e4b43daac12d8d386b650cb9f98d0b..739e53fbce09046f8457e5dc8f406f1470b03bff 100644 --- a/arch/arm/mach-s3c/sleep-s3c64xx.S +++ b/arch/arm/mach-s3c/sleep-s3c64xx.S @@ -11,12 +11,12 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <mach/map.h> +#include "map.h" #undef S3C64XX_VA_GPIO #define S3C64XX_VA_GPIO (0x0) -#include <mach/regs-gpio.h> +#include "regs-gpio.h" #define LL_UART (S3C_PA_UART + (0x400 * CONFIG_S3C_LOWLEVEL_UART_PORT)) diff --git a/arch/arm/mach-s3c/include/plat/usb-phy.h b/arch/arm/mach-s3c/usb-phy.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/usb-phy.h rename to arch/arm/mach-s3c/usb-phy.h diff --git a/arch/arm/mach-s3c/wakeup-mask.c b/arch/arm/mach-s3c/wakeup-mask.c index 24f96fb80738b50bf44d190ee7f1dbb5176ea0f1..b490e7527c663f3410c0f0367059c96abfa7dc55 100644 --- a/arch/arm/mach-s3c/wakeup-mask.c +++ b/arch/arm/mach-s3c/wakeup-mask.c @@ -11,8 +11,8 @@ #include <linux/irq.h> #include <linux/io.h> -#include <plat/wakeup-mask.h> -#include <plat/pm.h> +#include "wakeup-mask.h" +#include "pm.h" void samsung_sync_wakemask(void __iomem *reg, const struct samsung_wakeup_mask *mask, int nr_mask) diff --git a/arch/arm/mach-s3c/include/plat/wakeup-mask.h b/arch/arm/mach-s3c/wakeup-mask.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/wakeup-mask.h rename to arch/arm/mach-s3c/wakeup-mask.h diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c index 9b5e67664ba3c420f3ff9519355dc136a9f3f499..3c0c7aa63b8cdd1c0b4adbe00d68ec02537da9a2 100644 --- a/drivers/leds/leds-s3c24xx.c +++ b/drivers/leds/leds-s3c24xx.c @@ -16,8 +16,6 @@ #include <linux/module.h> #include <linux/platform_data/leds-s3c24xx.h> -#include <mach/regs-gpio.h> - /* our context */ struct s3c24xx_gpio_led {