spi / fbdev / cpufreq / usb / mmc / hwmon / ARM: Prepare for multiplatform S3C
Subsystems (24)
Krzysztof Kozlowski
maintainerPATCH v2 40/41 ARM: s3c: make headers local if possible
In reply to Krzysztof KozlowskiFrom: Arnd Bergmann <[email protected]>
A lot of header files are only used internally now, so they can be moved to mach-s3c, out of the visibility of drivers.
---
.../mach-s3c/{include/plat => }/adc-core.h | 0
arch/arm/mach-s3c/adc.c | 2 +-
arch/arm/mach-s3c/bast-ide.c | 2 +-
arch/arm/mach-s3c/bast-irq.c | 2 +-
arch/arm/mach-s3c/common-smdk-s3c24xx.c | 10 +++----
arch/arm/mach-s3c/cpu.c | 4 +--
arch/arm/mach-s3c/{include/plat => }/cpu.h | 0
arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c | 4 +--
arch/arm/mach-s3c/cpuidle-s3c64xx.c | 4 +--
arch/arm/mach-s3c/crag6410.h | 2 +-
arch/arm/mach-s3c/dev-audio-s3c64xx.c | 8 +++---
arch/arm/mach-s3c/dev-backlight-s3c64xx.c | 4 +--
arch/arm/mach-s3c/dev-uart-s3c64xx.c | 4 +--
arch/arm/mach-s3c/dev-uart.c | 2 +-
arch/arm/mach-s3c/devs.c | 22 ++++++++--------
arch/arm/mach-s3c/{include/plat => }/devs.h | 0
.../mach-s3c/{include/mach => }/dma-s3c24xx.h | 0
.../mach-s3c/{include/mach => }/dma-s3c64xx.h | 0
arch/arm/mach-s3c/{include/mach => }/dma.h | 0
arch/arm/mach-s3c/{include/plat => }/fb.h | 0
.../{include/plat => }/gpio-cfg-helpers.h | 0
.../mach-s3c/{include/plat => }/gpio-cfg.h | 0
.../mach-s3c/{include/plat => }/gpio-core.h | 2 +-
.../{include/mach => }/gpio-samsung-s3c24xx.h | 2 +-
.../{include/mach => }/gpio-samsung-s3c64xx.h | 0
arch/arm/mach-s3c/gpio-samsung.c | 18 ++++++-------
.../{include/mach => }/gpio-samsung.h | 0
arch/arm/mach-s3c/gta02.h | 2 +-
arch/arm/mach-s3c/h1940-bluetooth.c | 6 ++---
.../{include/mach => }/hardware-s3c24xx.h | 0
.../mach-s3c/{include/plat => }/iic-core.h | 0
arch/arm/mach-s3c/include/mach/io-s3c24xx.h | 2 +-
.../include/{plat => mach}/map-base.h | 0
arch/arm/mach-s3c/init.c | 4 +--
arch/arm/mach-s3c/iotiming-s3c2410.c | 4 +--
arch/arm/mach-s3c/iotiming-s3c2412.c | 4 +--
arch/arm/mach-s3c/irq-pm-s3c24xx.c | 16 ++++++------
arch/arm/mach-s3c/irq-pm-s3c64xx.c | 8 +++---
arch/arm/mach-s3c/irq-s3c24xx-fiq.S | 4 +--
arch/arm/mach-s3c/irq-s3c24xx.c | 10 +++----
arch/arm/mach-s3c/{include/plat => }/keypad.h | 0
arch/arm/mach-s3c/mach-amlm5900.c | 10 +++----
arch/arm/mach-s3c/mach-anubis.c | 8 +++---
arch/arm/mach-s3c/mach-anw6410.c | 12 ++++-----
arch/arm/mach-s3c/mach-at2440evb.c | 8 +++---
arch/arm/mach-s3c/mach-bast.c | 10 +++----
arch/arm/mach-s3c/mach-crag6410-module.c | 2 +-
arch/arm/mach-s3c/mach-crag6410.c | 20 +++++++-------
arch/arm/mach-s3c/mach-gta02.c | 16 ++++++------
arch/arm/mach-s3c/mach-h1940.c | 20 +++++++-------
arch/arm/mach-s3c/mach-hmt.c | 10 +++----
arch/arm/mach-s3c/mach-jive.c | 14 +++++-----
arch/arm/mach-s3c/mach-mini2440.c | 10 +++----
arch/arm/mach-s3c/mach-mini6410.c | 14 +++++-----
arch/arm/mach-s3c/mach-n30.c | 13 +++++-----
arch/arm/mach-s3c/mach-ncp.c | 8 +++---
arch/arm/mach-s3c/mach-nexcoder.c | 10 +++----
arch/arm/mach-s3c/mach-osiris-dvs.c | 2 +-
arch/arm/mach-s3c/mach-osiris.c | 10 +++----
arch/arm/mach-s3c/mach-otom.c | 9 +++----
arch/arm/mach-s3c/mach-qt2410.c | 10 +++----
arch/arm/mach-s3c/mach-real6410.c | 12 ++++-----
arch/arm/mach-s3c/mach-rx1950.c | 16 ++++++------
arch/arm/mach-s3c/mach-rx3715.c | 12 ++++-----
arch/arm/mach-s3c/mach-s3c2416-dt.c | 6 ++---
arch/arm/mach-s3c/mach-s3c64xx-dt.c | 4 +--
arch/arm/mach-s3c/mach-smartq.c | 14 +++++-----
arch/arm/mach-s3c/mach-smartq5.c | 16 ++++++------
arch/arm/mach-s3c/mach-smartq7.c | 16 ++++++------
arch/arm/mach-s3c/mach-smdk2410.c | 8 +++---
arch/arm/mach-s3c/mach-smdk2413.c | 12 ++++-----
arch/arm/mach-s3c/mach-smdk2416.c | 18 ++++++-------
arch/arm/mach-s3c/mach-smdk2440.c | 10 +++----
arch/arm/mach-s3c/mach-smdk2443.c | 6 ++---
arch/arm/mach-s3c/mach-smdk6400.c | 8 +++---
arch/arm/mach-s3c/mach-smdk6410.c | 16 ++++++------
arch/arm/mach-s3c/mach-tct_hammer.c | 4 +--
arch/arm/mach-s3c/mach-vr1000.c | 10 +++----
arch/arm/mach-s3c/mach-vstms.c | 10 +++----
.../arm/mach-s3c/{include/plat => }/map-s3c.h | 4 +--
.../mach-s3c/{include/mach => }/map-s3c24xx.h | 4 +--
.../mach-s3c/{include/mach => }/map-s3c64xx.h | 4 +--
.../arm/mach-s3c/{include/plat => }/map-s5p.h | 2 +-
arch/arm/mach-s3c/{include/mach => }/map.h | 0
arch/arm/mach-s3c/pl080.c | 4 +--
arch/arm/mach-s3c/platformdata.c | 4 +--
arch/arm/mach-s3c/pm-common.c | 2 +-
.../mach-s3c/{include/plat => }/pm-common.h | 0
.../{include/mach => }/pm-core-s3c24xx.h | 0
.../{include/mach => }/pm-core-s3c64xx.h | 6 ++---
.../arm/mach-s3c/{include/mach => }/pm-core.h | 0
arch/arm/mach-s3c/pm-gpio.c | 6 ++---
arch/arm/mach-s3c/pm-h1940.S | 4 +--
arch/arm/mach-s3c/pm-s3c2410.c | 10 +++----
arch/arm/mach-s3c/pm-s3c2412.c | 8 +++---
arch/arm/mach-s3c/pm-s3c2416.c | 6 ++---
arch/arm/mach-s3c/pm-s3c24xx.c | 12 ++++-----
arch/arm/mach-s3c/pm-s3c64xx.c | 16 ++++++------
arch/arm/mach-s3c/pm.c | 12 ++++-----
arch/arm/mach-s3c/{include/plat => }/pm.h | 2 +-
.../mach-s3c/{include/plat => }/pwm-core.h | 0
.../mach-s3c/{include/plat => }/regs-adc.h | 0
.../{include/mach => }/regs-clock-s3c24xx.h | 2 +-
.../{include/mach => }/regs-clock-s3c64xx.h | 0
.../mach-s3c/{include/mach => }/regs-clock.h | 0
.../{include/mach => }/regs-gpio-s3c24xx.h | 2 +-
.../{include/mach => }/regs-gpio-s3c64xx.h | 0
.../mach-s3c/{include/mach => }/regs-gpio.h | 0
.../{include/mach => }/regs-irq-s3c24xx.h | 2 +-
.../{include/mach => }/regs-irq-s3c64xx.h | 0
.../mach-s3c/{include/mach => }/regs-irq.h | 0
.../{include/plat => }/regs-irqtype.h | 0
arch/arm/mach-s3c/regs-mem-s3c24xx.h | 2 +-
.../{include/mach => }/regs-s3c2443-clock.h | 2 +-
.../{include/mach => }/rtc-core-s3c24xx.h | 0
arch/arm/mach-s3c/s3c2410.c | 18 ++++++-------
arch/arm/mach-s3c/s3c2412.c | 12 ++++-----
.../arm/mach-s3c/{include/mach => }/s3c2412.h | 2 +-
arch/arm/mach-s3c/s3c2416.c | 26 +++++++++----------
arch/arm/mach-s3c/s3c2440.c | 14 +++++-----
arch/arm/mach-s3c/s3c2442.c | 14 +++++-----
arch/arm/mach-s3c/s3c2443.c | 20 +++++++-------
arch/arm/mach-s3c/s3c244x.c | 12 ++++-----
arch/arm/mach-s3c/s3c24xx.c | 16 ++++++------
arch/arm/mach-s3c/s3c6400.c | 10 +++----
arch/arm/mach-s3c/s3c6410.c | 12 ++++-----
arch/arm/mach-s3c/s3c64xx.c | 21 +++++++--------
arch/arm/mach-s3c/{include/plat => }/sdhci.h | 2 +-
arch/arm/mach-s3c/setup-camif-s3c24xx.c | 4 +--
arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c | 6 ++---
arch/arm/mach-s3c/setup-i2c-s3c24xx.c | 7 ++---
arch/arm/mach-s3c/setup-i2c0-s3c64xx.c | 4 +--
arch/arm/mach-s3c/setup-i2c1-s3c64xx.c | 4 +--
arch/arm/mach-s3c/setup-ide-s3c64xx.c | 9 ++++---
arch/arm/mach-s3c/setup-keypad-s3c64xx.c | 6 ++---
arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c | 8 +++---
arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c | 6 ++---
arch/arm/mach-s3c/setup-spi-s3c24xx.c | 6 ++---
arch/arm/mach-s3c/setup-spi-s3c64xx.c | 4 +--
arch/arm/mach-s3c/setup-ts-s3c24xx.c | 4 +--
arch/arm/mach-s3c/setup-usb-phy-s3c64xx.c | 6 ++---
arch/arm/mach-s3c/simtec-audio.c | 8 +++---
arch/arm/mach-s3c/simtec-nor.c | 2 +-
arch/arm/mach-s3c/simtec-pm.c | 6 ++---
arch/arm/mach-s3c/simtec-usb.c | 4 +--
arch/arm/mach-s3c/sleep-s3c2410.S | 6 ++---
arch/arm/mach-s3c/sleep-s3c2412.S | 4 +--
arch/arm/mach-s3c/sleep-s3c24xx.S | 6 ++---
arch/arm/mach-s3c/sleep-s3c64xx.S | 4 +--
.../arm/mach-s3c/{include/plat => }/usb-phy.h | 0
arch/arm/mach-s3c/wakeup-mask.c | 4 +--
.../mach-s3c/{include/plat => }/wakeup-mask.h | 0
152 files changed, 489 insertions(+), 490 deletions(-)
rename arch/arm/mach-s3c/{include/plat => }/adc-core.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/cpu.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/devs.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/dma-s3c24xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/dma-s3c64xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/dma.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/fb.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/gpio-cfg-helpers.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/gpio-cfg.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/gpio-core.h (99%)
rename arch/arm/mach-s3c/{include/mach => }/gpio-samsung-s3c24xx.h (99%)
rename arch/arm/mach-s3c/{include/mach => }/gpio-samsung-s3c64xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/gpio-samsung.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/hardware-s3c24xx.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/iic-core.h (100%)
rename arch/arm/mach-s3c/include/{plat => mach}/map-base.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/keypad.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/map-s3c.h (97%)
rename arch/arm/mach-s3c/{include/mach => }/map-s3c24xx.h (98%)
rename arch/arm/mach-s3c/{include/mach => }/map-s3c64xx.h (98%)
rename arch/arm/mach-s3c/{include/plat => }/map-s5p.h (94%)
rename arch/arm/mach-s3c/{include/mach => }/map.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/pm-common.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/pm-core-s3c24xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/pm-core-s3c64xx.h (96%)
rename arch/arm/mach-s3c/{include/mach => }/pm-core.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/pm.h (98%)
rename arch/arm/mach-s3c/{include/plat => }/pwm-core.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/regs-adc.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/regs-clock-s3c24xx.h (99%)
rename arch/arm/mach-s3c/{include/mach => }/regs-clock-s3c64xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/regs-clock.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/regs-gpio-s3c24xx.h (99%)
rename arch/arm/mach-s3c/{include/mach => }/regs-gpio-s3c64xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/regs-gpio.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/regs-irq-s3c24xx.h (98%)
rename arch/arm/mach-s3c/{include/mach => }/regs-irq-s3c64xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/regs-irq.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/regs-irqtype.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/regs-s3c2443-clock.h (99%)
rename arch/arm/mach-s3c/{include/mach => }/rtc-core-s3c24xx.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/s3c2412.h (96%)
rename arch/arm/mach-s3c/{include/plat => }/sdhci.h (99%)
rename arch/arm/mach-s3c/{include/plat => }/usb-phy.h (100%)
rename arch/arm/mach-s3c/{include/plat => }/wakeup-mask.h (100%)arch/arm/mach-s3c/adc-core.h renamed from arch/arm/mach-s3c/include/plat/adc-core.h +0 -0
arch/arm/mach-s3c/adc.c +1 -1
@@ -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
arch/arm/mach-s3c/bast-ide.c +1 -1
@@ -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"
arch/arm/mach-s3c/bast-irq.c +1 -1
@@ -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"
arch/arm/mach-s3c/common-smdk-s3c24xx.c +5 -5
@@ -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"
arch/arm/mach-s3c/cpu.c +2 -2
@@ -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;
arch/arm/mach-s3c/cpu.h renamed from arch/arm/mach-s3c/include/plat/cpu.h +0 -0
arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c +2 -2
@@ -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>
arch/arm/mach-s3c/cpuidle-s3c64xx.c +2 -2
@@ -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"
arch/arm/mach-s3c/crag6410.h +1 -1
@@ -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)
arch/arm/mach-s3c/dev-audio-s3c64xx.c +4 -4
@@ -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) {
arch/arm/mach-s3c/dev-backlight-s3c64xx.c +2 -2
@@ -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"
arch/arm/mach-s3c/dev-uart-s3c64xx.c +2 -2
@@ -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 */
arch/arm/mach-s3c/dev-uart.c +1 -1
@@ -10,7 +10,7 @@#include <linux/kernel.h> #include <linux/platform_device.h> -#include <plat/devs.h> +#include "devs.h" /* uart devices */
arch/arm/mach-s3c/devs.c +11 -11
@@ -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>
arch/arm/mach-s3c/devs.h renamed from arch/arm/mach-s3c/include/plat/devs.h +0 -0
arch/arm/mach-s3c/dma-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/dma-s3c24xx.h +0 -0
arch/arm/mach-s3c/dma-s3c64xx.h renamed from arch/arm/mach-s3c/include/mach/dma-s3c64xx.h +0 -0
arch/arm/mach-s3c/dma.h renamed from arch/arm/mach-s3c/include/mach/dma.h +0 -0
arch/arm/mach-s3c/fb.h renamed from arch/arm/mach-s3c/include/plat/fb.h +0 -0
arch/arm/mach-s3c/gpio-cfg-helpers.h renamed from arch/arm/mach-s3c/include/plat/gpio-cfg-helpers.h +0 -0
arch/arm/mach-s3c/gpio-cfg.h renamed from arch/arm/mach-s3c/include/plat/gpio-cfg.h +0 -0
arch/arm/mach-s3c/gpio-core.h renamed from arch/arm/mach-s3c/include/plat/gpio-core.h +1 -1
@@ -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)
arch/arm/mach-s3c/gpio-samsung-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h +1 -1
@@ -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:
arch/arm/mach-s3c/gpio-samsung-s3c64xx.h renamed from arch/arm/mach-s3c/include/mach/gpio-samsung-s3c64xx.h +0 -0
arch/arm/mach-s3c/gpio-samsung.c +9 -9
@@ -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)
arch/arm/mach-s3c/gpio-samsung.h renamed from arch/arm/mach-s3c/include/mach/gpio-samsung.h +0 -0
arch/arm/mach-s3c/gta02.h +1 -1
@@ -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)
arch/arm/mach-s3c/h1940-bluetooth.c +3 -3
@@ -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"
arch/arm/mach-s3c/hardware-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/hardware-s3c24xx.h +0 -0
arch/arm/mach-s3c/iic-core.h renamed from arch/arm/mach-s3c/include/plat/iic-core.h +0 -0
arch/arm/mach-s3c/include/mach/io-s3c24xx.h +1 -1
@@ -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,
arch/arm/mach-s3c/include/mach/map-base.h renamed from arch/arm/mach-s3c/include/plat/map-base.h +0 -0
arch/arm/mach-s3c/init.c +2 -2
@@ -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;
arch/arm/mach-s3c/iotiming-s3c2410.c +2 -2
@@ -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>
arch/arm/mach-s3c/iotiming-s3c2412.c +2 -2
@@ -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)
arch/arm/mach-s3c/irq-pm-s3c24xx.c +8 -8
@@ -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>
arch/arm/mach-s3c/irq-pm-s3c64xx.c +4 -4
@@ -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
arch/arm/mach-s3c/irq-s3c24xx-fiq.S +2 -2
@@ -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>
arch/arm/mach-s3c/irq-s3c24xx.c +5 -5
@@ -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
arch/arm/mach-s3c/keypad.h renamed from arch/arm/mach-s3c/include/plat/keypad.h +0 -0
arch/arm/mach-s3c/mach-amlm5900.c +5 -5
@@ -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>
arch/arm/mach-s3c/mach-anubis.c +4 -4
@@ -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"
arch/arm/mach-s3c/mach-anw6410.c +6 -6
@@ -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"
arch/arm/mach-s3c/mach-at2440evb.c +4 -4
@@ -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"
arch/arm/mach-s3c/mach-bast.c +5 -5
@@ -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"
arch/arm/mach-s3c/mach-crag6410-module.c +1 -1
@@ -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"
arch/arm/mach-s3c/mach-crag6410.c +10 -10
@@ -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"
arch/arm/mach-s3c/mach-gta02.c +8 -8
@@ -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"
arch/arm/mach-s3c/mach-h1940.c +10 -10
@@ -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"
arch/arm/mach-s3c/mach-hmt.c +5 -5
@@ -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"
arch/arm/mach-s3c/mach-jive.c +7 -7
@@ -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"
arch/arm/mach-s3c/mach-mini2440.c +5 -5
@@ -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>
arch/arm/mach-s3c/mach-mini6410.c +7 -7
@@ -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>
arch/arm/mach-s3c/mach-n30.c +6 -7
@@ -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>
arch/arm/mach-s3c/mach-ncp.c +4 -4
@@ -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"
arch/arm/mach-s3c/mach-nexcoder.c +5 -5
@@ -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"
arch/arm/mach-s3c/mach-osiris-dvs.c +1 -1
@@ -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)
arch/arm/mach-s3c/mach-osiris.c +5 -5
@@ -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"
arch/arm/mach-s3c/mach-otom.c +4 -5
@@ -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"
arch/arm/mach-s3c/mach-qt2410.c +5 -5
@@ -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"
arch/arm/mach-s3c/mach-real6410.c +6 -6
@@ -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>
arch/arm/mach-s3c/mach-rx1950.c +8 -8
@@ -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"
arch/arm/mach-s3c/mach-rx3715.c +6 -6
@@ -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"
arch/arm/mach-s3c/mach-s3c2416-dt.c +3 -3
@@ -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"
arch/arm/mach-s3c/mach-s3c64xx-dt.c +2 -2
@@ -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"
arch/arm/mach-s3c/mach-smartq.c +7 -7
@@ -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>
arch/arm/mach-s3c/mach-smartq5.c +8 -8
@@ -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"
arch/arm/mach-s3c/mach-smartq7.c +8 -8
@@ -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"
arch/arm/mach-s3c/mach-smdk2410.c +4 -4
@@ -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"
arch/arm/mach-s3c/mach-smdk2413.c +6 -6
@@ -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"
arch/arm/mach-s3c/mach-smdk2416.c +9 -9
@@ -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"
arch/arm/mach-s3c/mach-smdk2440.c +5 -5
@@ -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"
arch/arm/mach-s3c/mach-smdk2443.c +3 -3
@@ -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"
arch/arm/mach-s3c/mach-smdk6400.c +4 -4
@@ -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"
arch/arm/mach-s3c/mach-smdk6410.c +8 -8
@@ -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"
arch/arm/mach-s3c/mach-tct_hammer.c +2 -2
@@ -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>
arch/arm/mach-s3c/mach-vr1000.c +5 -5
@@ -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"
arch/arm/mach-s3c/mach-vstms.c +5 -5
@@ -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"
arch/arm/mach-s3c/map-s3c.h renamed from arch/arm/mach-s3c/include/plat/map-s3c.h +2 -2
@@ -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 */
arch/arm/mach-s3c/map-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/map-s3c24xx.h +2 -2
@@ -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
arch/arm/mach-s3c/map-s3c64xx.h renamed from arch/arm/mach-s3c/include/mach/map-s3c64xx.h +2 -2
@@ -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_
arch/arm/mach-s3c/map-s5p.h renamed from arch/arm/mach-s3c/include/plat/map-s5p.h +1 -1
@@ -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 */
arch/arm/mach-s3c/map.h renamed from arch/arm/mach-s3c/include/mach/map.h +0 -0
arch/arm/mach-s3c/pl080.c +2 -2
@@ -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"
arch/arm/mach-s3c/platformdata.c +2 -2
@@ -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)
arch/arm/mach-s3c/pm-common.c +1 -1
@@ -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 */
arch/arm/mach-s3c/pm-common.h renamed from arch/arm/mach-s3c/include/plat/pm-common.h +0 -0
arch/arm/mach-s3c/pm-core-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/pm-core-s3c24xx.h +0 -0
arch/arm/mach-s3c/pm-core-s3c64xx.h renamed from arch/arm/mach-s3c/include/mach/pm-core-s3c64xx.h +3 -3
@@ -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 ) {
arch/arm/mach-s3c/pm-core.h renamed from arch/arm/mach-s3c/include/mach/pm-core.h +0 -0
arch/arm/mach-s3c/pm-gpio.c +3 -3
@@ -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 */
arch/arm/mach-s3c/pm-h1940.S +2 -2
@@ -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
arch/arm/mach-s3c/pm-s3c2410.c +5 -5
@@ -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"
arch/arm/mach-s3c/pm-s3c2412.c +4 -4
@@ -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"
arch/arm/mach-s3c/pm-s3c2416.c +3 -3
@@ -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"
arch/arm/mach-s3c/pm-s3c24xx.c +6 -6
@@ -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"
arch/arm/mach-s3c/pm-s3c64xx.c +8 -8
@@ -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"
arch/arm/mach-s3c/pm.c +6 -6
@@ -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 */
arch/arm/mach-s3c/pm.h renamed from arch/arm/mach-s3c/include/plat/pm.h +1 -1
@@ -11,7 +11,7 @@* management */ -#include <plat/pm-common.h> +#include "pm-common.h" struct device ;
arch/arm/mach-s3c/pwm-core.h renamed from arch/arm/mach-s3c/include/plat/pwm-core.h +0 -0
arch/arm/mach-s3c/regs-adc.h renamed from arch/arm/mach-s3c/include/plat/regs-adc.h +0 -0
arch/arm/mach-s3c/regs-clock-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/regs-clock-s3c24xx.h +1 -1
@@ -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)
arch/arm/mach-s3c/regs-clock-s3c64xx.h renamed from arch/arm/mach-s3c/include/mach/regs-clock-s3c64xx.h +0 -0
arch/arm/mach-s3c/regs-clock.h renamed from arch/arm/mach-s3c/include/mach/regs-clock.h +0 -0
arch/arm/mach-s3c/regs-gpio-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/regs-gpio-s3c24xx.h +1 -1
@@ -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)
arch/arm/mach-s3c/regs-gpio-s3c64xx.h renamed from arch/arm/mach-s3c/include/mach/regs-gpio-s3c64xx.h +0 -0
arch/arm/mach-s3c/regs-gpio.h renamed from arch/arm/mach-s3c/include/mach/regs-gpio.h +0 -0
arch/arm/mach-s3c/regs-irq-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/regs-irq-s3c24xx.h +1 -1
@@ -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 */
arch/arm/mach-s3c/regs-irq-s3c64xx.h renamed from arch/arm/mach-s3c/include/mach/regs-irq-s3c64xx.h +0 -0
arch/arm/mach-s3c/regs-irq.h renamed from arch/arm/mach-s3c/include/mach/regs-irq.h +0 -0
arch/arm/mach-s3c/regs-irqtype.h renamed from arch/arm/mach-s3c/include/plat/regs-irqtype.h +0 -0
arch/arm/mach-s3c/regs-mem-s3c24xx.h +1 -1
@@ -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))
arch/arm/mach-s3c/regs-s3c2443-clock.h renamed from arch/arm/mach-s3c/include/mach/regs-s3c2443-clock.h +1 -1
@@ -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)
arch/arm/mach-s3c/rtc-core-s3c24xx.h renamed from arch/arm/mach-s3c/include/mach/rtc-core-s3c24xx.h +0 -0
arch/arm/mach-s3c/s3c2410.c +9 -9
@@ -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"
arch/arm/mach-s3c/s3c2412.c +6 -6
@@ -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"
arch/arm/mach-s3c/s3c2412.h renamed from arch/arm/mach-s3c/include/mach/s3c2412.h +1 -1
@@ -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))
arch/arm/mach-s3c/s3c2416.c +13 -13
@@ -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"
arch/arm/mach-s3c/s3c2440.c +7 -7
@@ -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"
arch/arm/mach-s3c/s3c2442.c +7 -7
@@ -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"
arch/arm/mach-s3c/s3c2443.c +10 -10
@@ -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"
arch/arm/mach-s3c/s3c244x.c +6 -6
@@ -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"
arch/arm/mach-s3c/s3c24xx.c +8 -8
@@ -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"
arch/arm/mach-s3c/s3c6400.c +5 -5
@@ -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"
arch/arm/mach-s3c/s3c6410.c +6 -6
@@ -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"
arch/arm/mach-s3c/s3c64xx.c +10 -11
@@ -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"
arch/arm/mach-s3c/sdhci.h renamed from arch/arm/mach-s3c/include/plat/sdhci.h +1 -1
@@ -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.
arch/arm/mach-s3c/setup-camif-s3c24xx.c +2 -2
@@ -5,8 +5,8 @@// Helper functions for S3C24XX/S3C64XX SoC series CAMIF driver #include <linux/gpio.h> -#include <plat/gpio-cfg.h> -#include <mach/gpio-samsung.h> +#include "gpio-cfg.h" +#include "gpio-samsung.h" #include <media/drv-intf/s3c_camif.h> /* Number of camera port pins, without FIELD */
arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c +3 -3
@@ -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 ) {
arch/arm/mach-s3c/setup-i2c-s3c24xx.c +4 -3
@@ -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) {
arch/arm/mach-s3c/setup-i2c0-s3c64xx.c +2 -2
@@ -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) {
arch/arm/mach-s3c/setup-i2c1-s3c64xx.c +2 -2
@@ -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) {
arch/arm/mach-s3c/setup-ide-s3c64xx.c +5 -4
@@ -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;
arch/arm/mach-s3c/setup-keypad-s3c64xx.c +3 -3
@@ -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) {
arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c +4 -4
@@ -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) {
arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c +3 -3
@@ -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) {
arch/arm/mach-s3c/setup-spi-s3c24xx.c +3 -3
@@ -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 )
arch/arm/mach-s3c/setup-spi-s3c64xx.c +2 -2
@@ -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 )
arch/arm/mach-s3c/setup-ts-s3c24xx.c +2 -2
@@ -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
arch/arm/mach-s3c/setup-usb-phy-s3c64xx.c +3 -3
@@ -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"
arch/arm/mach-s3c/simtec-audio.c +4 -4
@@ -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"
arch/arm/mach-s3c/simtec-nor.c +1 -1
@@ -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"
arch/arm/mach-s3c/simtec-pm.c +3 -3
@@ -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"
arch/arm/mach-s3c/simtec-usb.c +2 -2
@@ -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"
arch/arm/mach-s3c/sleep-s3c2410.S +3 -3
@@ -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"
arch/arm/mach-s3c/sleep-s3c2412.S +2 -2
@@ -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
arch/arm/mach-s3c/sleep-s3c24xx.S +3 -3
@@ -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
arch/arm/mach-s3c/sleep-s3c64xx.S +2 -2
@@ -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))
arch/arm/mach-s3c/usb-phy.h renamed from arch/arm/mach-s3c/include/plat/usb-phy.h +0 -0
arch/arm/mach-s3c/wakeup-mask.c +2 -2
@@ -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)
arch/arm/mach-s3c/wakeup-mask.h renamed from arch/arm/mach-s3c/include/plat/wakeup-mask.h +0 -0
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Krzysztof Kozlowski
maintainerPATCH v2 41/41 MAINTAINERS: Add more name matches for Samsung SoC entries
In reply to Krzysztof KozlowskiThe Samsung SoC maintainer entry covers drivers and headers matching "exynos" name but except that there are also files for S3C24xx, S3C64xx and S5Pv210 SoCs. These sometimes do not have a separate entry for a driver maintainer thus might miss review. Add them to the Samsung SoC maintainer entry to cover all SoCs with name matches.
--- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+)
MAINTAINERS +3 -0
@@ -2422,6 +2422,9 @@ F: drivers/soc/samsung/ F: drivers/tty/serial/samsung* F: include/linux/soc/samsung/ N: exynos +N: s3c2410 +N: s3c64xx +N: s5pv210 ARM/SAMSUNG MOBILE MACHINE SUPPORT M: Kyungmin Park <[email protected]>
Signature · 1 line
2.17.1
Quoted 18 lines · Krzysztof Kozlowski
Hi All,
Shortly
=======
This is a continuation of Arnd's work from 2019 [1]. The goal is to cleanup, merge and finally make the Samsung S3C24xx and S3C64xx architectures multiplatform. The multiplatform did not happen yet here... just cleaning up and merging into one mach-s3c.I intend to take it through Samsung SoC tree so all Acks are welcomed.
Changes since v1
================
1. Rebased,
2. Addressed comments (including mine),
3. Few new patches.
Quoted 3 lines
Please see individual changelogs (per patch).
[1] https://patchwork.kernel.org/project/linux-samsung-soc/list/?series=185855&state=*
Thanks a lot for picking up my old branch!
All your additional changes look fine to me, feel free to add
to the patches you added on top my original series.
Arnd
Mark Brown
maintainerQuoted 1 line · Krzysztof Kozlowski
I intend to take it through Samsung SoC tree so all Acks are welcomed.
Any issue with me applying the ASoC bits and sending you a branch? This seems like it might run into some of the subsystem wide cleanups we've got going on.
Krzysztof Kozlowski
maintainerQuoted 7 lines · Mark Brown
Quoted 1 line · Krzysztof Kozlowski
I intend to take it through Samsung SoC tree so all Acks are welcomed.
Any issue with me applying the ASoC bits and sending you a branch? This seems like it might run into some of the subsystem wide cleanups we've got going on.
Five ASoC patches:
- ARM: s3c24xx: move iis pinctrl config into boards
- ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS
- ASoC: samsung: rx1950: turn into platform driver
- ASoC: samsung: neo1973: turn into platform driver
- ASoC: samsung: h1940: turn into platform driver
apply cleanly on current next so I guess they could go through your tree without problems. Providing me a branch would be great in such case, so please go ahead.
Thanks!
Best regards,
Krzysztof
Krzysztof Kozlowski
maintainerQuoted 17 lines · Krzysztof Kozlowski
Hi All,
Shortly
=======
This is a continuation of Arnd's work from 2019 [1]. The goal is to cleanup, merge and finally make the Samsung S3C24xx and S3C64xx architectures multiplatform. The multiplatform did not happen yet here... just cleaning up and merging into one mach-s3c.I intend to take it through Samsung SoC tree so all Acks are welcomed.
Changes since v1
================
1. Rebased,
2. Addressed comments (including mine),
3. Few new patches.
Quoted 4 lines
Please see individual changelogs (per patch).
[1] https://patchwork.kernel.org/project/linux-samsung-soc/list/?series=185855&state=*
Hi All,
I applied second part of the set which finishes this step of S3C cleanup. Thanks to Arnd for the work!
Best regards,
Krzysztof
[ trimmed Cc: list ]
Quoted 17 lines · Krzysztof Kozlowski
Quoted 16 lines · Krzysztof Kozlowski
Hi All,
Shortly
===>> This is a continuation of Arnd's work from 2019 [1]. The goal is to cleanup, merge and finally make the Samsung S3C24xx and S3C64xx architectures multiplatform. The multiplatform did not happen yet here... just cleaning up and merging into one mach-s3c.I intend to take it through Samsung SoC tree so all Acks are welcomed.
Changes since v1
========
1. Rebased,
2. Addressed comments (including mine),
3. Few new patches.
Quoted 6 lines
Quoted 4 lines
Please see individual changelogs (per patch).
[1] https://patchwork.kernel.org/project/linux-samsung-soc/list/?series5855&state=*
Hi All,
Hi Krzysztof,
Quoted 2 lines
I applied second part of the set which finishes this step of S3C cleanup. Thanks to Arnd for the work!
Thank you (& Arnd) for working on this!
PS I've checked fbdev related changes now and they all look good to me.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 2 lines
Best regards,
Krzysztof