ARM: samsung platform cleanup
Subsystems (25)
PATCH 35/36 ARM: s3c: move into a common directory
In reply to Arnd Bergmanns3c24xx and s3c64xx have a lot in common, but are split across three separate directories, which makes the interaction of the header files more complicated than necessary.
Move all three directories into a new mach-s3c, with a minimal set of changes to each file.
---
MAINTAINERS | 16 +++++++---------
arch/arm/Kconfig | 5 +----
arch/arm/Makefile | 5 +----
arch/arm/{plat-samsung => mach-s3c}/Kconfig | 3 +++
.../Kconfig => mach-s3c/Kconfig.s3c24xx} | 0
.../Kconfig => mach-s3c/Kconfig.s3c64xx} | 0
arch/arm/{plat-samsung => mach-s3c}/Makefile | 9 ++++++++-
.../arm/{mach-s3c24xx => mach-s3c}/Makefile.boot | 0
.../Makefile => mach-s3c/Makefile.s3c24xx} | 10 +++++-----
.../Makefile => mach-s3c/Makefile.s3c64xx} | 14 +++++++-------
arch/arm/{plat-samsung => mach-s3c}/adc.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/ata-core.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/backlight.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/bast.h | 0
.../arm/{mach-s3c24xx => mach-s3c}/common-smdk.c | 0
.../arm/{mach-s3c24xx => mach-s3c}/common-smdk.h | 0
arch/arm/{plat-samsung => mach-s3c}/cpu.c | 0
.../{mach-s3c24xx => mach-s3c}/cpufreq-utils.c | 0
arch/arm/{mach-s3c64xx => mach-s3c}/cpuidle.c | 0
arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/dev-audio.c | 0
.../{mach-s3c64xx => mach-s3c}/dev-backlight.c | 0
.../dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} | 0
arch/arm/{plat-samsung => mach-s3c}/dev-uart.c | 0
arch/arm/{plat-samsung => mach-s3c}/devs.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/fb-core.h | 0
.../{plat-samsung => mach-s3c}/gpio-samsung.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h | 0
.../{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h | 0
.../include/mach/dma-s3c24xx.h} | 0
.../include/mach/dma-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/dma.h | 7 +++++++
.../include/mach/gpio-samsung-s3c24xx.h} | 0
.../include/mach/gpio-samsung-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/gpio-samsung.h | 7 +++++++
.../include/mach/hardware.h | 0
.../{mach-s3c24xx => mach-s3c}/include/mach/io.h | 0
.../include/mach/irqs-s3c24xx.h} | 0
.../include/mach/irqs-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/irqs.h | 7 +++++++
.../include/mach/map-s3c24xx.h} | 0
.../include/mach/map-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/map.h | 7 +++++++
.../include/mach/pm-core-s3c24xx.h} | 0
.../include/mach/pm-core-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/pm-core.h | 7 +++++++
.../include/mach/regs-clock-s3c24xx.h} | 0
.../include/mach/regs-clock-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/regs-clock.h | 7 +++++++
.../include/mach/regs-gpio-s3c24xx.h} | 0
.../include/mach/regs-gpio-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/regs-gpio.h | 7 +++++++
.../include/mach/regs-irq-s3c24xx.h} | 0
.../include/mach/regs-irq-s3c64xx.h} | 0
arch/arm/mach-s3c/include/mach/regs-irq.h | 7 +++++++
.../include/mach/regs-s3c2443-clock.h | 0
.../include/mach/rtc-core.h | 0
.../include/mach/s3c2412.h | 0
.../include/plat/adc-core.h | 0
.../include/plat/cpu.h | 0
.../include/plat/devs.h | 0
.../{plat-samsung => mach-s3c}/include/plat/fb.h | 0
.../include/plat/gpio-cfg-helpers.h | 0
.../include/plat/gpio-cfg.h | 0
.../include/plat/gpio-core.h | 0
.../include/plat/iic-core.h | 0
.../include/plat/keypad.h | 0
.../include/plat/map-base.h | 0
.../include/plat/map-s3c.h | 0
.../include/plat/map-s5p.h | 0
.../include/plat/pm-common.h | 0
.../{plat-samsung => mach-s3c}/include/plat/pm.h | 0
.../include/plat/pwm-core.h | 0
.../include/plat/regs-adc.h | 0
.../include/plat/regs-irqtype.h | 0
.../include/plat/samsung-time.h | 0
.../include/plat/sdhci.h | 0
.../include/plat/usb-phy.h | 0
.../include/plat/wakeup-mask.h | 0
arch/arm/{plat-samsung => mach-s3c}/init.c | 0
.../iotiming-s3c2410.c | 0
.../iotiming-s3c2412.c | 0
.../irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} | 0
.../irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} | 0
.../irq-s3c24xx-fiq-exports.c | 0
.../{mach-s3c24xx => mach-s3c}/irq-s3c24xx-fiq.S | 0
.../arm/{mach-s3c24xx => mach-s3c}/irq-s3c24xx.c | 0
arch/arm/{mach-s3c64xx => mach-s3c}/irq-uart.h | 0
.../{mach-s3c24xx => mach-s3c}/mach-amlm5900.c | 2 +-
.../arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c | 2 +-
.../{mach-s3c64xx => mach-s3c}/mach-anw6410.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-at2440evb.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c | 2 +-
.../mach-crag6410-module.c | 0
.../{mach-s3c64xx => mach-s3c}/mach-crag6410.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c | 2 +-
arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-mini2440.c | 2 +-
.../{mach-s3c64xx => mach-s3c}/mach-mini6410.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c | 2 +-
arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-nexcoder.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c | 0
.../arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c | 2 +-
.../arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c | 2 +-
.../{mach-s3c64xx => mach-s3c}/mach-real6410.c | 2 +-
.../arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c | 2 +-
.../arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c | 2 +-
.../{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c | 2 +-
.../arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c | 2 +-
.../arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h | 0
.../{mach-s3c64xx => mach-s3c}/mach-smartq5.c | 2 +-
.../{mach-s3c64xx => mach-s3c}/mach-smartq7.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-smdk2410.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-smdk2413.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-smdk2416.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-smdk2440.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-smdk2443.c | 2 +-
.../{mach-s3c64xx => mach-s3c}/mach-smdk6400.c | 2 +-
.../{mach-s3c64xx => mach-s3c}/mach-smdk6410.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c | 2 +-
.../arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/nand-core.h | 0
.../{mach-s3c64xx => mach-s3c}/onenand-core.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/otom.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c | 0
.../{plat-samsung => mach-s3c}/platformdata.c | 0
.../arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c | 0
.../pll-s3c2440-12000000.c | 0
.../pll-s3c2440-16934400.c | 0
arch/arm/{plat-samsung => mach-s3c}/pm-common.c | 0
arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S | 0
arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c | 0
.../{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} | 0
.../{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} | 0
arch/arm/{plat-samsung => mach-s3c}/pm.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/regs-dsc.h | 0
.../regs-gpio-memport.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/regs-mem.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/regs-modem.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/regs-srom.h | 0
arch/arm/{mach-s3c64xx => mach-s3c}/regs-sys.h | 0
.../regs-syscon-power.h | 0
.../regs-usb-hsotg-phy.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c | 2 +-
.../{mach-s3c24xx => mach-s3c}/s3c2412-power.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c | 2 +-
arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c | 2 +-
.../common.c => mach-s3c/s3c24xx.c} | 2 +-
.../common.h => mach-s3c/s3c24xx.h} | 0
arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c | 2 +-
arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c | 2 +-
.../common.c => mach-s3c/s3c64xx.c} | 2 +-
.../common.h => mach-s3c/s3c64xx.h} | 0
.../arm/{mach-s3c24xx => mach-s3c}/setup-camif.c | 0
.../{mach-s3c64xx => mach-s3c}/setup-fb-24bpp.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/setup-i2c.c | 0
arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c0.c | 0
arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c1.c | 0
arch/arm/{mach-s3c64xx => mach-s3c}/setup-ide.c | 0
.../{mach-s3c64xx => mach-s3c}/setup-keypad.c | 0
.../setup-sdhci-gpio-s3c24xx.c} | 0
.../setup-sdhci-gpio-s3c64xx.c} | 0
.../setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} | 0
.../setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} | 0
arch/arm/{mach-s3c24xx => mach-s3c}/setup-ts.c | 0
.../{mach-s3c64xx => mach-s3c}/setup-usb-phy.c | 0
.../{mach-s3c24xx => mach-s3c}/simtec-audio.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c | 0
arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h | 0
.../{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S | 0
.../{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S | 0
.../sleep.S => mach-s3c/sleep-s3c24xx.S} | 0
.../sleep.S => mach-s3c/sleep-s3c64xx.S} | 0
arch/arm/{mach-s3c24xx => mach-s3c}/spi-core.h | 0
arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h | 0
.../arm/{plat-samsung => mach-s3c}/wakeup-mask.c | 0
.../{plat-samsung => mach-s3c}/watchdog-reset.c | 0
.../{mach-s3c64xx => mach-s3c}/watchdog-reset.h | 0
198 files changed, 134 insertions(+), 76 deletions(-)
rename arch/arm/{plat-samsung => mach-s3c}/Kconfig (98%)
rename arch/arm/{mach-s3c24xx/Kconfig => mach-s3c/Kconfig.s3c24xx} (100%)
rename arch/arm/{mach-s3c64xx/Kconfig => mach-s3c/Kconfig.s3c64xx} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/Makefile (83%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot (100%)
rename arch/arm/{mach-s3c24xx/Makefile => mach-s3c/Makefile.s3c24xx} (92%)
rename arch/arm/{mach-s3c64xx/Makefile => mach-s3c/Makefile.s3c64xx} (83%)
rename arch/arm/{plat-samsung => mach-s3c}/adc.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/ata-core.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/backlight.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/common-smdk.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/common-smdk.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/cpu.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/cpufreq-utils.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/cpuidle.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-audio.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-backlight.c (100%)
rename arch/arm/{mach-s3c64xx/dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/dev-uart.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/devs.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/fb-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach/dma.h => mach-s3c/include/mach/dma-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/dma.h => mach-s3c/include/mach/dma-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/dma.h
rename arch/arm/{mach-s3c24xx/include/mach/gpio-samsung.h => mach-s3c/include/mach/gpio-samsung-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/gpio-samsung.h => mach-s3c/include/mach/gpio-samsung-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/gpio-samsung.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/hardware.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/io.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/irqs.h
rename arch/arm/{mach-s3c24xx/include/mach/map.h => mach-s3c/include/mach/map-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/map.h => mach-s3c/include/mach/map-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/map.h
rename arch/arm/{mach-s3c24xx/include/mach/pm-core.h => mach-s3c/include/mach/pm-core-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/pm-core.h => mach-s3c/include/mach/pm-core-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/pm-core.h
rename arch/arm/{mach-s3c24xx/include/mach/regs-clock.h => mach-s3c/include/mach/regs-clock-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-clock.h => mach-s3c/include/mach/regs-clock-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/regs-clock.h
rename arch/arm/{mach-s3c24xx/include/mach/regs-gpio.h => mach-s3c/include/mach/regs-gpio-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-gpio.h => mach-s3c/include/mach/regs-gpio-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/regs-gpio.h
rename arch/arm/{mach-s3c24xx/include/mach/regs-irq.h => mach-s3c/include/mach/regs-irq-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-irq.h => mach-s3c/include/mach/regs-irq-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/regs-irq.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/regs-s3c2443-clock.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/rtc-core.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/s3c2412.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/adc-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/cpu.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/devs.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/fb.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/gpio-cfg-helpers.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/gpio-cfg.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/gpio-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/iic-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/keypad.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/map-base.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/map-s3c.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/map-s5p.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/pm-common.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/pm.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/pwm-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/regs-adc.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/regs-irqtype.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/samsung-time.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/sdhci.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/usb-phy.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/wakeup-mask.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/init.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c (100%)
rename arch/arm/{mach-s3c24xx/irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/irq-s3c24xx-fiq-exports.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/irq-s3c24xx-fiq.S (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/irq-s3c24xx.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/irq-uart.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-at2440evb.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410-module.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/nand-core.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/onenand-core.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/otom.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/platformdata.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-12000000.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-16934400.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/pm-common.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c (100%)
rename arch/arm/{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/pm.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/regs-dsc.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-gpio-memport.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/regs-mem.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-modem.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-srom.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-sys.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-syscon-power.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-usb-hsotg-phy.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c (99%)
rename arch/arm/{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} (99%)
rename arch/arm/{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c (99%)
rename arch/arm/{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} (99%)
rename arch/arm/{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-camif.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-fb-24bpp.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-i2c.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c0.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c1.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-ide.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-keypad.c (100%)
rename arch/arm/{mach-s3c24xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c64xx.c} (100%)
rename arch/arm/{mach-s3c24xx/setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-ts.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-usb-phy.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S (100%)
rename arch/arm/{mach-s3c24xx/sleep.S => mach-s3c/sleep-s3c24xx.S} (100%)
rename arch/arm/{mach-s3c64xx/sleep.S => mach-s3c/sleep-s3c64xx.S} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/spi-core.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/watchdog-reset.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/watchdog-reset.h (100%)MAINTAINERS +7 -9
@@ -2042,8 +2042,8 @@ ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT L: [email protected] (subscribers-only) W: http://wiki.openmoko.org/wiki/Neo_FreeRunner S: Orphan -F: arch/arm/mach-s3c24xx/mach-gta02.c -F: arch/arm/mach-s3c24xx/gta02.h +F: arch/arm/mach-s3c/mach-gta02.c +F: arch/arm/mach-s3c/gta02.h ARM/Orion SoC/Technologic Systems TS-78xx platform support M: Alexander Clouter <[email protected]>
@@ -2221,9 +2221,7 @@ F: arch/arm/boot/dts/s3c* F: arch/arm/boot/dts/s5p* F: arch/arm/boot/dts/exynos* F: arch/arm64/boot/dts/exynos/ -F: arch/arm/plat-samsung/ -F: arch/arm/mach-s3c24*/ -F: arch/arm/mach-s3c64xx/ +F: arch/arm/mach-s3c/ F: arch/arm/mach-s5p*/ F: arch/arm/mach-exynos*/ F: drivers/*/*s3c24*
@@ -14846,9 +14844,9 @@ P: Vincent Sanders <[email protected]> M: Simtec Linux Team <[email protected]> W: http://www.simtec.co.uk/products/EB2410ITX/ S: Supported -F: arch/arm/mach-s3c24xx/mach-bast.c -F: arch/arm/mach-s3c24xx/bast-ide.c -F: arch/arm/mach-s3c24xx/bast-irq.c +F: arch/arm/mach-s3c/mach-bast.c +F: arch/arm/mach-s3c/bast-ide.c +F: arch/arm/mach-s3c/bast-irq.c SIPHASH PRF ROUTINES M: Jason A. Donenfeld <[email protected]>
@@ -17600,7 +17598,7 @@ F: Documentation/devicetree/bindings/regulator/arizona-regulator.txt F: Documentation/devicetree/bindings/mfd/arizona.txt F: Documentation/devicetree/bindings/mfd/wm831x.txt F: Documentation/devicetree/bindings/sound/wlf,arizona.txt -F: arch/arm/mach-s3c64xx/mach-crag6410* +F: arch/arm/mach-s3c/mach-crag6410* F: drivers/clk/clk-wm83*.c F: drivers/extcon/extcon-arizona.c F: drivers/leds/leds-wm83*.c
arch/arm/Kconfig +1 -4
@@ -635,7 +635,6 @@ source "arch/arm/mach-dove/Kconfig" source "arch/arm/mach-ep93xx/Kconfig" source "arch/arm/mach-exynos/Kconfig" -source "arch/arm/plat-samsung/Kconfig" source "arch/arm/mach-footbridge/Kconfig"
@@ -704,9 +703,7 @@ source "arch/arm/mach-realview/Kconfig" source "arch/arm/mach-rockchip/Kconfig" -source "arch/arm/mach-s3c24xx/Kconfig" - -source "arch/arm/mach-s3c64xx/Kconfig" +source "arch/arm/mach-s3c/Kconfig" source "arch/arm/mach-s5pv210/Kconfig"
arch/arm/Makefile +1 -4
@@ -210,8 +210,7 @@ machine-$(CONFIG_ARCH_RDA) += rda machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc -machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx -machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx +machine-$(CONFIG_PLAT_SAMSUNG) += s3c machine-$(CONFIG_ARCH_S5PV210) += s5pv210 machine-$(CONFIG_ARCH_SA1100) += sa1100 machine-$(CONFIG_ARCH_RENESAS) += shmobile
@@ -234,10 +233,8 @@ machine-$(CONFIG_PLAT_SPEAR) += spear # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. plat-$(CONFIG_ARCH_OMAP) += omap -plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_PLAT_ORION) += orion plat-$(CONFIG_PLAT_PXA) += pxa -plat-$(CONFIG_PLAT_S3C24XX) += samsung plat-$(CONFIG_PLAT_VERSATILE) += versatile ifeq ($(CONFIG_ARCH_EBSA110),y)
arch/arm/mach-s3c/Kconfig renamed from arch/arm/plat-samsung/Kconfig +3 -0
@@ -2,6 +2,9 @@ # # Copyright 2009 Simtec Electronics +source "arch/arm/mach-s3c/Kconfig.s3c24xx" +source "arch/arm/mach-s3c/Kconfig.s3c64xx" + config PLAT_SAMSUNG bool depends on PLAT_S3C24XX || ARCH_S3C64XX
arch/arm/mach-s3c/Kconfig.s3c24xx renamed from arch/arm/mach-s3c24xx/Kconfig +0 -0
arch/arm/mach-s3c/Kconfig.s3c64xx renamed from arch/arm/mach-s3c64xx/Kconfig +0 -0
arch/arm/mach-s3c/Makefile renamed from arch/arm/plat-samsung/Makefile +8 -1
@@ -2,9 +2,16 @@ # # Copyright 2009 Simtec Electronics -ccflags-$(CONFIG_ARCH_S3C64XX) := -I$(srctree)/arch/arm/mach-s3c64xx/include ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include +ifdef CONFIG_ARCH_S3C24XX +include $(src)/Makefile.s3c24xx +endif + +ifdef CONFIG_ARCH_S3C64XX +include $(src)/Makefile.s3c64xx +endif + # Objects we always build independent of SoC choice obj-y += init.o cpu.o
arch/arm/mach-s3c/Makefile.boot renamed from arch/arm/mach-s3c24xx/Makefile.boot +0 -0
arch/arm/mach-s3c/Makefile.s3c24xx renamed from arch/arm/mach-s3c24xx/Makefile +5 -5
@@ -7,7 +7,7 @@ # core -obj-y += common.o +obj-y += s3c24xx.o obj-y += irq-s3c24xx.o obj-$(CONFIG_SPI_S3C24XX_FIQ) += irq-s3c24xx-fiq.o obj-$(CONFIG_SPI_S3C24XX_FIQ) += irq-s3c24xx-fiq-exports.o
@@ -33,8 +33,8 @@ obj-$(CONFIG_CPU_S3C2443) += s3c2443.o # PM -obj-$(CONFIG_PM) += pm.o -obj-$(CONFIG_PM_SLEEP) += irq-pm.o sleep.o +obj-$(CONFIG_PM) += pm-s3c24xx.o +obj-$(CONFIG_PM_SLEEP) += irq-pm-s3c24xx.o sleep-s3c24xx.o # common code
@@ -96,8 +96,8 @@ obj-$(CONFIG_MACH_OSIRIS_DVS) += mach-osiris-dvs.o # device setup -obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o -obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o +obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio-s3c24xx.o +obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi-s3c24xx.o obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o obj-$(CONFIG_S3C_SETUP_CAMIF) += setup-camif.o
arch/arm/mach-s3c/Makefile.s3c64xx renamed from arch/arm/mach-s3c64xx/Makefile +7 -7
@@ -8,17 +8,17 @@ asflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -I$(srctree) # PM -obj-$(CONFIG_PM) += pm.o -obj-$(CONFIG_PM_SLEEP) += sleep.o +obj-$(CONFIG_PM) += pm-s3c64xx.o +obj-$(CONFIG_PM_SLEEP) += sleep-s3c64xx.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o ifdef CONFIG_SAMSUNG_ATAGS -obj-$(CONFIG_PM_SLEEP) += irq-pm.o +obj-$(CONFIG_PM_SLEEP) += irq-pm-s3c64xx.o # Core -obj-y += common.o +obj-y += s3c64xx.o obj-$(CONFIG_CPU_S3C6400) += s3c6400.o obj-$(CONFIG_CPU_S3C6410) += s3c6410.o
@@ -28,7 +28,7 @@ obj-$(CONFIG_S3C64XX_PL080) += pl080.o # Device support -obj-y += dev-uart.o +obj-y += dev-uart-s3c64xx.o obj-y += dev-audio.o # Device setup
@@ -38,8 +38,8 @@ obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o -obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o -obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o +obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio-s3c64xx.o +obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi-s3c64xx.o obj-$(CONFIG_S3C64XX_SETUP_USB_PHY) += setup-usb-phy.o obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT) += dev-backlight.o
arch/arm/mach-s3c/adc.c renamed from arch/arm/plat-samsung/adc.c +0 -0
arch/arm/mach-s3c/anubis.h renamed from arch/arm/mach-s3c24xx/anubis.h +0 -0
arch/arm/mach-s3c/ata-core.h renamed from arch/arm/mach-s3c64xx/ata-core.h +0 -0
arch/arm/mach-s3c/backlight.h renamed from arch/arm/mach-s3c64xx/backlight.h +0 -0
arch/arm/mach-s3c/bast-ide.c renamed from arch/arm/mach-s3c24xx/bast-ide.c +0 -0
arch/arm/mach-s3c/bast-irq.c renamed from arch/arm/mach-s3c24xx/bast-irq.c +0 -0
arch/arm/mach-s3c/bast.h renamed from arch/arm/mach-s3c24xx/bast.h +0 -0
arch/arm/mach-s3c/common-smdk.c renamed from arch/arm/mach-s3c24xx/common-smdk.c +0 -0
arch/arm/mach-s3c/common-smdk.h renamed from arch/arm/mach-s3c24xx/common-smdk.h +0 -0
arch/arm/mach-s3c/cpu.c renamed from arch/arm/plat-samsung/cpu.c +0 -0
arch/arm/mach-s3c/cpufreq-utils.c renamed from arch/arm/mach-s3c24xx/cpufreq-utils.c +0 -0
arch/arm/mach-s3c/cpuidle.c renamed from arch/arm/mach-s3c64xx/cpuidle.c +0 -0
arch/arm/mach-s3c/crag6410.h renamed from arch/arm/mach-s3c64xx/crag6410.h +0 -0
arch/arm/mach-s3c/dev-audio.c renamed from arch/arm/mach-s3c64xx/dev-audio.c +0 -0
arch/arm/mach-s3c/dev-backlight.c renamed from arch/arm/mach-s3c64xx/dev-backlight.c +0 -0
arch/arm/mach-s3c/dev-uart-s3c64xx.c renamed from arch/arm/mach-s3c64xx/dev-uart.c +0 -0
arch/arm/mach-s3c/dev-uart.c renamed from arch/arm/plat-samsung/dev-uart.c +0 -0
arch/arm/mach-s3c/devs.c renamed from arch/arm/plat-samsung/devs.c +0 -0
arch/arm/mach-s3c/fb-core.h renamed from arch/arm/mach-s3c24xx/fb-core.h +0 -0
arch/arm/mach-s3c/gpio-samsung.c renamed from arch/arm/plat-samsung/gpio-samsung.c +0 -0
arch/arm/mach-s3c/gta02.h renamed from arch/arm/mach-s3c24xx/gta02.h +0 -0
arch/arm/mach-s3c/h1940-bluetooth.c renamed from arch/arm/mach-s3c24xx/h1940-bluetooth.c +0 -0
arch/arm/mach-s3c/h1940.h renamed from arch/arm/mach-s3c24xx/h1940.h +0 -0
arch/arm/mach-s3c/include/mach/dma-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/dma.h +0 -0
arch/arm/mach-s3c/include/mach/dma-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/dma.h +0 -0
arch/arm/mach-s3c/include/mach/dma.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "dma-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "dma-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +0 -0
arch/arm/mach-s3c/include/mach/gpio-samsung-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h +0 -0
arch/arm/mach-s3c/include/mach/gpio-samsung.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "gpio-samsung-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "gpio-samsung-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/hardware.h renamed from arch/arm/mach-s3c24xx/include/mach/hardware.h +0 -0
arch/arm/mach-s3c/include/mach/io.h renamed from arch/arm/mach-s3c24xx/include/mach/io.h +0 -0
arch/arm/mach-s3c/include/mach/irqs-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/irqs.h +0 -0
arch/arm/mach-s3c/include/mach/irqs-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/irqs.h +0 -0
arch/arm/mach-s3c/include/mach/irqs.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "irqs-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "irqs-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/map-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/map.h +0 -0
arch/arm/mach-s3c/include/mach/map-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/map.h +0 -0
arch/arm/mach-s3c/include/mach/map.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "map-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "map-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/pm-core-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/pm-core.h +0 -0
arch/arm/mach-s3c/include/mach/pm-core-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/pm-core.h +0 -0
arch/arm/mach-s3c/include/mach/pm-core.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "pm-core-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "pm-core-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/regs-clock-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/regs-clock.h +0 -0
arch/arm/mach-s3c/include/mach/regs-clock-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/regs-clock.h +0 -0
arch/arm/mach-s3c/include/mach/regs-clock.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "regs-clock-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "regs-clock-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/regs-gpio-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/regs-gpio.h +0 -0
arch/arm/mach-s3c/include/mach/regs-gpio-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/regs-gpio.h +0 -0
arch/arm/mach-s3c/include/mach/regs-gpio.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "regs-gpio-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "regs-gpio-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/regs-irq-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/regs-irq.h +0 -0
arch/arm/mach-s3c/include/mach/regs-irq-s3c64xx.h renamed from arch/arm/mach-s3c64xx/include/mach/regs-irq.h +0 -0
arch/arm/mach-s3c/include/mach/regs-irq.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifdef CONFIG_ARCH_S3C24XX +#include "regs-irq-s3c24xx.h" +#endif + +#ifdef CONFIG_ARCH_S3C64XX +#include "regs-irq-s3c64xx.h" +#endif
arch/arm/mach-s3c/include/mach/regs-s3c2443-clock.h renamed from arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h +0 -0
arch/arm/mach-s3c/include/mach/rtc-core.h renamed from arch/arm/mach-s3c24xx/include/mach/rtc-core.h +0 -0
arch/arm/mach-s3c/include/mach/s3c2412.h renamed from arch/arm/mach-s3c24xx/include/mach/s3c2412.h +0 -0
arch/arm/mach-s3c/include/plat/adc-core.h renamed from arch/arm/plat-samsung/include/plat/adc-core.h +0 -0
arch/arm/mach-s3c/include/plat/cpu.h renamed from arch/arm/plat-samsung/include/plat/cpu.h +0 -0
arch/arm/mach-s3c/include/plat/devs.h renamed from arch/arm/plat-samsung/include/plat/devs.h +0 -0
arch/arm/mach-s3c/include/plat/fb.h renamed from arch/arm/plat-samsung/include/plat/fb.h +0 -0
arch/arm/mach-s3c/include/plat/gpio-cfg-helpers.h renamed from arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h +0 -0
arch/arm/mach-s3c/include/plat/gpio-cfg.h renamed from arch/arm/plat-samsung/include/plat/gpio-cfg.h +0 -0
arch/arm/mach-s3c/include/plat/gpio-core.h renamed from arch/arm/plat-samsung/include/plat/gpio-core.h +0 -0
arch/arm/mach-s3c/include/plat/iic-core.h renamed from arch/arm/plat-samsung/include/plat/iic-core.h +0 -0
arch/arm/mach-s3c/include/plat/keypad.h renamed from arch/arm/plat-samsung/include/plat/keypad.h +0 -0
arch/arm/mach-s3c/include/plat/map-base.h renamed from arch/arm/plat-samsung/include/plat/map-base.h +0 -0
arch/arm/mach-s3c/include/plat/map-s3c.h renamed from arch/arm/plat-samsung/include/plat/map-s3c.h +0 -0
arch/arm/mach-s3c/include/plat/map-s5p.h renamed from arch/arm/plat-samsung/include/plat/map-s5p.h +0 -0
arch/arm/mach-s3c/include/plat/pm-common.h renamed from arch/arm/plat-samsung/include/plat/pm-common.h +0 -0
arch/arm/mach-s3c/include/plat/pm.h renamed from arch/arm/plat-samsung/include/plat/pm.h +0 -0
arch/arm/mach-s3c/include/plat/pwm-core.h renamed from arch/arm/plat-samsung/include/plat/pwm-core.h +0 -0
arch/arm/mach-s3c/include/plat/regs-adc.h renamed from arch/arm/plat-samsung/include/plat/regs-adc.h +0 -0
arch/arm/mach-s3c/include/plat/regs-irqtype.h renamed from arch/arm/plat-samsung/include/plat/regs-irqtype.h +0 -0
arch/arm/mach-s3c/include/plat/samsung-time.h renamed from arch/arm/plat-samsung/include/plat/samsung-time.h +0 -0
arch/arm/mach-s3c/include/plat/sdhci.h renamed from arch/arm/plat-samsung/include/plat/sdhci.h +0 -0
arch/arm/mach-s3c/include/plat/usb-phy.h renamed from arch/arm/plat-samsung/include/plat/usb-phy.h +0 -0
arch/arm/mach-s3c/include/plat/wakeup-mask.h renamed from arch/arm/plat-samsung/include/plat/wakeup-mask.h +0 -0
arch/arm/mach-s3c/init.c renamed from arch/arm/plat-samsung/init.c +0 -0
arch/arm/mach-s3c/iotiming-s3c2410.c renamed from arch/arm/mach-s3c24xx/iotiming-s3c2410.c +0 -0
arch/arm/mach-s3c/iotiming-s3c2412.c renamed from arch/arm/mach-s3c24xx/iotiming-s3c2412.c +0 -0
arch/arm/mach-s3c/irq-pm-s3c24xx.c renamed from arch/arm/mach-s3c24xx/irq-pm.c +0 -0
arch/arm/mach-s3c/irq-pm-s3c64xx.c renamed from arch/arm/mach-s3c64xx/irq-pm.c +0 -0
arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c renamed from arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c +0 -0
arch/arm/mach-s3c/irq-s3c24xx-fiq.S renamed from arch/arm/mach-s3c24xx/irq-s3c24xx-fiq.S +0 -0
arch/arm/mach-s3c/irq-s3c24xx.c renamed from arch/arm/mach-s3c24xx/irq-s3c24xx.c +0 -0
arch/arm/mach-s3c/irq-uart.h renamed from arch/arm/mach-s3c64xx/irq-uart.h +0 -0
arch/arm/mach-s3c/mach-amlm5900.c renamed from arch/arm/mach-s3c24xx/mach-amlm5900.c +1 -1
@@ -47,7 +47,7 @@#include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" static struct resource amlm5900_nor_resource =DEFINE_RES_MEM (0x00000000 ,SZ_16M );
arch/arm/mach-s3c/mach-anubis.c renamed from arch/arm/mach-s3c24xx/mach-anubis.c +1 -1
@@ -46,7 +46,7 @@#include <plat/samsung-time.h> #include "anubis.h" -#include "common.h" +#include "s3c24xx.h" #include "simtec.h" #define COPYRIGHT ", Copyright 2005-2009 Simtec Electronics"
arch/arm/mach-s3c/mach-anw6410.c renamed from arch/arm/mach-s3c64xx/mach-anw6410.c +1 -1
@@ -45,7 +45,7 @@#include <mach/gpio-samsung.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #include "regs-modem.h" /* DM9000 */
arch/arm/mach-s3c/mach-at2440evb.c renamed from arch/arm/mach-s3c24xx/mach-at2440evb.c +1 -1
@@ -44,7 +44,7 @@#include <linux/platform_data/mmc-s3cmci.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" static struct map_desc at2440evb_iodesc[]__initdata = {/* Nothing here */
arch/arm/mach-s3c/mach-bast.c renamed from arch/arm/mach-s3c24xx/mach-bast.c +1 -1
@@ -52,7 +52,7 @@#include <plat/samsung-time.h> #include "bast.h" -#include "common.h" +#include "s3c24xx.h" #include "simtec.h" #define COPYRIGHT ", Copyright 2004-2008 Simtec Electronics"
arch/arm/mach-s3c/mach-crag6410-module.c renamed from arch/arm/mach-s3c64xx/mach-crag6410-module.c +0 -0
arch/arm/mach-s3c/mach-crag6410.c renamed from arch/arm/mach-s3c64xx/mach-crag6410.c +1 -1
@@ -62,7 +62,7 @@#include <plat/pm.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #include "crag6410.h" #include "regs-gpio-memport.h" #include "regs-modem.h"
arch/arm/mach-s3c/mach-gta02.c renamed from arch/arm/mach-s3c24xx/mach-gta02.c +1 -1
@@ -70,7 +70,7 @@#include <plat/pm.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "gta02.h" static struct pcf50633 *gta02_pcf;
arch/arm/mach-s3c/mach-h1940.c renamed from arch/arm/mach-s3c24xx/mach-h1940.c +1 -1
@@ -60,7 +60,7 @@#include <plat/pm.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "h1940.h" #define H1940_LATCH ((void __force __iomem *)0xF8000000)
arch/arm/mach-s3c/mach-hmt.c renamed from arch/arm/mach-s3c64xx/mach-hmt.c +1 -1
@@ -40,7 +40,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #define UCON S3C2410_UCON_DEFAULT#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)
arch/arm/mach-s3c/mach-jive.c renamed from arch/arm/mach-s3c24xx/mach-jive.c +1 -1
@@ -50,7 +50,7 @@#include <linux/platform_data/usb-s3c2410_udc.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "s3c2412-power.h" static struct map_desc jive_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-mini2440.c renamed from arch/arm/mach-s3c24xx/mach-mini2440.c +1 -1
@@ -55,7 +55,7 @@#include <sound/s3c24xx_uda134x.h> -#include "common.h" +#include "s3c24xx.h" #define MACH_MINI2440_DM9K_BASE (S3C2410_CS4 + 0x300)
arch/arm/mach-s3c/mach-mini6410.c renamed from arch/arm/mach-s3c64xx/mach-mini6410.c +1 -1
@@ -41,7 +41,7 @@#include <video/samsung_fimd.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #include "regs-modem.h" #include "regs-srom.h"
arch/arm/mach-s3c/mach-n30.c renamed from arch/arm/mach-s3c24xx/mach-n30.c +1 -1
@@ -49,7 +49,7 @@#include <linux/platform_data/usb-s3c2410_udc.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" static struct map_desc n30_iodesc[]__initdata = {/* nothing here yet */
arch/arm/mach-s3c/mach-ncp.c renamed from arch/arm/mach-s3c64xx/mach-ncp.c +1 -1
@@ -37,7 +37,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #define UCON S3C2410_UCON_DEFAULT#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE
arch/arm/mach-s3c/mach-nexcoder.c renamed from arch/arm/mach-s3c24xx/mach-nexcoder.c +1 -1
@@ -42,7 +42,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" static struct map_desc nexcoder_iodesc[]__initdata = {/* nothing here yet */
arch/arm/mach-s3c/mach-osiris-dvs.c renamed from arch/arm/mach-s3c24xx/mach-osiris-dvs.c +0 -0
arch/arm/mach-s3c/mach-osiris.c renamed from arch/arm/mach-s3c24xx/mach-osiris.c +1 -1
@@ -46,7 +46,7 @@#include <mach/regs-gpio.h> #include <mach/gpio-samsung.h> -#include "common.h" +#include "s3c24xx.h" #include "osiris.h" #include "regs-mem.h"
arch/arm/mach-s3c/mach-otom.c renamed from arch/arm/mach-s3c24xx/mach-otom.c +1 -1
@@ -31,7 +31,7 @@#include <plat/devs.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "otom.h" static struct map_desc otom11_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-qt2410.c renamed from arch/arm/mach-s3c24xx/mach-qt2410.c +1 -1
@@ -45,7 +45,7 @@#include <plat/pm.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "common-smdk.h" static struct map_desc qt2410_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-real6410.c renamed from arch/arm/mach-s3c64xx/mach-real6410.c +1 -1
@@ -40,7 +40,7 @@#include <video/samsung_fimd.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #include "regs-modem.h" #include "regs-srom.h"
arch/arm/mach-s3c/mach-rx1950.c renamed from arch/arm/mach-s3c24xx/mach-rx1950.c +1 -1
@@ -56,7 +56,7 @@#include <plat/samsung-time.h> #include <plat/gpio-cfg.h> -#include "common.h" +#include "s3c24xx.h" #include "h1940.h" #define LCD_PWM_PERIOD 192960
arch/arm/mach-s3c/mach-rx3715.c renamed from arch/arm/mach-s3c24xx/mach-rx3715.c +1 -1
@@ -45,7 +45,7 @@#include <plat/pm.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "h1940.h" static struct map_desc rx3715_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-s3c2416-dt.c renamed from arch/arm/mach-s3c24xx/mach-s3c2416-dt.c +1 -1
@@ -21,7 +21,7 @@#include <plat/cpu.h> #include <plat/pm.h> -#include "common.h" +#include "s3c24xx.h" static void __init s3c2416_dt_map_io (void ) {
arch/arm/mach-s3c/mach-s3c64xx-dt.c renamed from arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +1 -1
@@ -11,7 +11,7 @@#include <plat/cpu.h> #include <mach/map.h> -#include "common.h" +#include "s3c64xx.h" #include "watchdog-reset.h" /*
arch/arm/mach-s3c/mach-smartq.c renamed from arch/arm/mach-s3c64xx/mach-smartq.c +1 -1
@@ -35,7 +35,7 @@#include <video/platform_lcd.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #include "mach-smartq.h" #include "regs-modem.h"
arch/arm/mach-s3c/mach-smartq.h renamed from arch/arm/mach-s3c64xx/mach-smartq.h +0 -0
arch/arm/mach-s3c/mach-smartq5.c renamed from arch/arm/mach-s3c64xx/mach-smartq5.c +1 -1
@@ -25,7 +25,7 @@#include <plat/gpio-cfg.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #include "mach-smartq.h" static struct gpio_led smartq5_leds[] = {
arch/arm/mach-s3c/mach-smartq7.c renamed from arch/arm/mach-s3c64xx/mach-smartq7.c +1 -1
@@ -25,7 +25,7 @@#include <plat/gpio-cfg.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #include "mach-smartq.h" static struct gpio_led smartq7_leds[] = {
arch/arm/mach-s3c/mach-smdk2410.c renamed from arch/arm/mach-s3c24xx/mach-smdk2410.c +1 -1
@@ -36,7 +36,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "common-smdk.h" static struct map_desc smdk2410_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-smdk2413.c renamed from arch/arm/mach-s3c24xx/mach-smdk2413.c +1 -1
@@ -42,7 +42,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "common-smdk.h" static struct map_desc smdk2413_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-smdk2416.c renamed from arch/arm/mach-s3c24xx/mach-smdk2416.c +1 -1
@@ -47,7 +47,7 @@#include <plat/fb.h> -#include "common.h" +#include "s3c24xx.h" #include "common-smdk.h" static struct map_desc smdk2416_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-smdk2440.c renamed from arch/arm/mach-s3c24xx/mach-smdk2440.c +1 -1
@@ -38,7 +38,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "common-smdk.h" static struct map_desc smdk2440_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-smdk2443.c renamed from arch/arm/mach-s3c24xx/mach-smdk2443.c +1 -1
@@ -35,7 +35,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" #include "common-smdk.h" static struct map_desc smdk2443_iodesc[]__initdata = {
arch/arm/mach-s3c/mach-smdk6400.c renamed from arch/arm/mach-s3c64xx/mach-smdk6400.c +1 -1
@@ -31,7 +31,7 @@#include <mach/gpio-samsung.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c64xx.h" #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
arch/arm/mach-s3c/mach-smdk6410.c renamed from arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -1
@@ -66,7 +66,7 @@#include <plat/samsung-time.h> #include "backlight.h" -#include "common.h" +#include "s3c64xx.h" #include "regs-modem.h" #include "regs-srom.h" #include "regs-sys.h"
arch/arm/mach-s3c/mach-tct_hammer.c renamed from arch/arm/mach-s3c24xx/mach-tct_hammer.c +1 -1
@@ -39,7 +39,7 @@#include <linux/mtd/physmap.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" static struct resource tct_hammer_nor_resource =DEFINE_RES_MEM (0x00000000 ,SZ_16M );
arch/arm/mach-s3c/mach-vr1000.c renamed from arch/arm/mach-s3c24xx/mach-vr1000.c +1 -1
@@ -44,7 +44,7 @@#include <plat/samsung-time.h> #include "bast.h" -#include "common.h" +#include "s3c24xx.h" #include "simtec.h" #include "vr1000.h"
arch/arm/mach-s3c/mach-vstms.c renamed from arch/arm/mach-s3c24xx/mach-vstms.c +1 -1
@@ -42,7 +42,7 @@#include <plat/cpu.h> #include <plat/samsung-time.h> -#include "common.h" +#include "s3c24xx.h" static struct map_desc vstms_iodesc[]__initdata = { };
arch/arm/mach-s3c/nand-core.h renamed from arch/arm/mach-s3c24xx/nand-core.h +0 -0
arch/arm/mach-s3c/onenand-core.h renamed from arch/arm/mach-s3c64xx/onenand-core.h +0 -0
arch/arm/mach-s3c/osiris.h renamed from arch/arm/mach-s3c24xx/osiris.h +0 -0
arch/arm/mach-s3c/otom.h renamed from arch/arm/mach-s3c24xx/otom.h +0 -0
arch/arm/mach-s3c/pl080.c renamed from arch/arm/mach-s3c64xx/pl080.c +0 -0
arch/arm/mach-s3c/platformdata.c renamed from arch/arm/plat-samsung/platformdata.c +0 -0
arch/arm/mach-s3c/pll-s3c2410.c renamed from arch/arm/mach-s3c24xx/pll-s3c2410.c +0 -0
arch/arm/mach-s3c/pll-s3c2440-12000000.c renamed from arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c +0 -0
arch/arm/mach-s3c/pll-s3c2440-16934400.c renamed from arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c +0 -0
arch/arm/mach-s3c/pm-common.c renamed from arch/arm/plat-samsung/pm-common.c +0 -0
arch/arm/mach-s3c/pm-gpio.c renamed from arch/arm/plat-samsung/pm-gpio.c +0 -0
arch/arm/mach-s3c/pm-h1940.S renamed from arch/arm/mach-s3c24xx/pm-h1940.S +0 -0
arch/arm/mach-s3c/pm-s3c2410.c renamed from arch/arm/mach-s3c24xx/pm-s3c2410.c +0 -0
arch/arm/mach-s3c/pm-s3c2412.c renamed from arch/arm/mach-s3c24xx/pm-s3c2412.c +0 -0
arch/arm/mach-s3c/pm-s3c2416.c renamed from arch/arm/mach-s3c24xx/pm-s3c2416.c +0 -0
arch/arm/mach-s3c/pm-s3c24xx.c renamed from arch/arm/mach-s3c24xx/pm.c +0 -0
arch/arm/mach-s3c/pm-s3c64xx.c renamed from arch/arm/mach-s3c64xx/pm.c +0 -0
arch/arm/mach-s3c/pm.c renamed from arch/arm/plat-samsung/pm.c +0 -0
arch/arm/mach-s3c/regs-dsc.h renamed from arch/arm/mach-s3c24xx/regs-dsc.h +0 -0
arch/arm/mach-s3c/regs-gpio-memport.h renamed from arch/arm/mach-s3c64xx/regs-gpio-memport.h +0 -0
arch/arm/mach-s3c/regs-mem.h renamed from arch/arm/mach-s3c24xx/regs-mem.h +0 -0
arch/arm/mach-s3c/regs-modem.h renamed from arch/arm/mach-s3c64xx/regs-modem.h +0 -0
arch/arm/mach-s3c/regs-srom.h renamed from arch/arm/mach-s3c64xx/regs-srom.h +0 -0
arch/arm/mach-s3c/regs-sys.h renamed from arch/arm/mach-s3c64xx/regs-sys.h +0 -0
arch/arm/mach-s3c/regs-syscon-power.h renamed from arch/arm/mach-s3c64xx/regs-syscon-power.h +0 -0
arch/arm/mach-s3c/regs-usb-hsotg-phy.h renamed from arch/arm/mach-s3c64xx/regs-usb-hsotg-phy.h +0 -0
arch/arm/mach-s3c/s3c2410.c renamed from arch/arm/mach-s3c24xx/s3c2410.c +1 -1
@@ -41,7 +41,7 @@#include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> -#include "common.h" +#include "s3c24xx.h" /* Initial IO mappings */
arch/arm/mach-s3c/s3c2412-power.h renamed from arch/arm/mach-s3c24xx/s3c2412-power.h +0 -0
arch/arm/mach-s3c/s3c2412.c renamed from arch/arm/mach-s3c24xx/s3c2412.c +1 -1
@@ -37,7 +37,7 @@#include <plat/devs.h> #include <plat/pm.h> -#include "common.h" +#include "s3c24xx.h" #include "nand-core.h" #include "regs-dsc.h" #include "s3c2412-power.h"
arch/arm/mach-s3c/s3c2416.c renamed from arch/arm/mach-s3c24xx/s3c2416.c +1 -1
@@ -46,7 +46,7 @@#include <plat/iic-core.h> #include <plat/adc-core.h> -#include "common.h" +#include "s3c24xx.h" #include "fb-core.h" #include "nand-core.h" #include "spi-core.h"
arch/arm/mach-s3c/s3c2440.c renamed from arch/arm/mach-s3c24xx/s3c2440.c +1 -1
@@ -35,7 +35,7 @@#include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> -#include "common.h" +#include "s3c24xx.h" static struct device s3c2440_dev = { .bus = &s3c2440_subsys,
arch/arm/mach-s3c/s3c2442.c renamed from arch/arm/mach-s3c24xx/s3c2442.c +1 -1
@@ -35,7 +35,7 @@#include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> -#include "common.h" +#include "s3c24xx.h" static struct device s3c2442_dev = { .bus = &s3c2442_subsys,
arch/arm/mach-s3c/s3c2443.c renamed from arch/arm/mach-s3c24xx/s3c2443.c +0 -0
arch/arm/mach-s3c/s3c244x.c renamed from arch/arm/mach-s3c24xx/s3c244x.c +1 -1
@@ -35,7 +35,7 @@#include <plat/cpu.h> #include <plat/pm.h> -#include "common.h" +#include "s3c24xx.h" #include "nand-core.h" #include "regs-dsc.h"
arch/arm/mach-s3c/s3c24xx.c renamed from arch/arm/mach-s3c24xx/common.c +1 -1
@@ -38,7 +38,7 @@#include <plat/devs.h> #include <plat/pwm-core.h> -#include "common.h" +#include "s3c24xx.h" /* table of supported CPUs */
arch/arm/mach-s3c/s3c24xx.h renamed from arch/arm/mach-s3c24xx/common.h +0 -0
arch/arm/mach-s3c/s3c6400.c renamed from arch/arm/mach-s3c64xx/s3c6400.c +1 -1
@@ -35,7 +35,7 @@#include <plat/sdhci.h> #include <plat/iic-core.h> -#include "common.h" +#include "s3c64xx.h" #include "onenand-core.h" void __init s3c6400_map_io (void )
arch/arm/mach-s3c/s3c6410.c renamed from arch/arm/mach-s3c64xx/s3c6410.c +1 -1
@@ -39,7 +39,7 @@#include <plat/iic-core.h> #include "ata-core.h" -#include "common.h" +#include "s3c64xx.h" #include "onenand-core.h" void __init s3c6410_map_io (void )
arch/arm/mach-s3c/s3c64xx.c renamed from arch/arm/mach-s3c64xx/common.c +1 -1
@@ -46,7 +46,7 @@#include <plat/pwm-core.h> #include <plat/regs-irqtype.h> -#include "common.h" +#include "s3c64xx.h" #include "irq-uart.h" #include "watchdog-reset.h"
arch/arm/mach-s3c/s3c64xx.h renamed from arch/arm/mach-s3c64xx/common.h +0 -0
arch/arm/mach-s3c/setup-camif.c renamed from arch/arm/mach-s3c24xx/setup-camif.c +0 -0
arch/arm/mach-s3c/setup-fb-24bpp.c renamed from arch/arm/mach-s3c64xx/setup-fb-24bpp.c +0 -0
arch/arm/mach-s3c/setup-i2c.c renamed from arch/arm/mach-s3c24xx/setup-i2c.c +0 -0
arch/arm/mach-s3c/setup-i2c0.c renamed from arch/arm/mach-s3c64xx/setup-i2c0.c +0 -0
arch/arm/mach-s3c/setup-i2c1.c renamed from arch/arm/mach-s3c64xx/setup-i2c1.c +0 -0
arch/arm/mach-s3c/setup-ide.c renamed from arch/arm/mach-s3c64xx/setup-ide.c +0 -0
arch/arm/mach-s3c/setup-keypad.c renamed from arch/arm/mach-s3c64xx/setup-keypad.c +0 -0
arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c renamed from arch/arm/mach-s3c24xx/setup-sdhci-gpio.c +0 -0
arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c renamed from arch/arm/mach-s3c64xx/setup-sdhci-gpio.c +0 -0
arch/arm/mach-s3c/setup-spi-s3c24xx.c renamed from arch/arm/mach-s3c24xx/setup-spi.c +0 -0
arch/arm/mach-s3c/setup-spi-s3c64xx.c renamed from arch/arm/mach-s3c64xx/setup-spi.c +0 -0
arch/arm/mach-s3c/setup-ts.c renamed from arch/arm/mach-s3c24xx/setup-ts.c +0 -0
arch/arm/mach-s3c/setup-usb-phy.c renamed from arch/arm/mach-s3c64xx/setup-usb-phy.c +0 -0
arch/arm/mach-s3c/simtec-audio.c renamed from arch/arm/mach-s3c24xx/simtec-audio.c +0 -0
arch/arm/mach-s3c/simtec-nor.c renamed from arch/arm/mach-s3c24xx/simtec-nor.c +0 -0
arch/arm/mach-s3c/simtec-pm.c renamed from arch/arm/mach-s3c24xx/simtec-pm.c +0 -0
arch/arm/mach-s3c/simtec-usb.c renamed from arch/arm/mach-s3c24xx/simtec-usb.c +0 -0
arch/arm/mach-s3c/simtec.h renamed from arch/arm/mach-s3c24xx/simtec.h +0 -0
arch/arm/mach-s3c/sleep-s3c2410.S renamed from arch/arm/mach-s3c24xx/sleep-s3c2410.S +0 -0
arch/arm/mach-s3c/sleep-s3c2412.S renamed from arch/arm/mach-s3c24xx/sleep-s3c2412.S +0 -0
arch/arm/mach-s3c/sleep-s3c24xx.S renamed from arch/arm/mach-s3c24xx/sleep.S +0 -0
arch/arm/mach-s3c/sleep-s3c64xx.S renamed from arch/arm/mach-s3c64xx/sleep.S +0 -0
arch/arm/mach-s3c/spi-core.h renamed from arch/arm/mach-s3c24xx/spi-core.h +0 -0
arch/arm/mach-s3c/vr1000.h renamed from arch/arm/mach-s3c24xx/vr1000.h +0 -0
arch/arm/mach-s3c/wakeup-mask.c renamed from arch/arm/plat-samsung/wakeup-mask.c +0 -0
arch/arm/mach-s3c/watchdog-reset.c renamed from arch/arm/plat-samsung/watchdog-reset.c +0 -0
arch/arm/mach-s3c/watchdog-reset.h renamed from arch/arm/mach-s3c64xx/watchdog-reset.h +0 -0
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerRe: [PATCH 35/36] ARM: s3c: move into a common directory
Quoted 8 lines · Arnd Bergmann
s3c24xx and s3c64xx have a lot in common, but are split across three separate directories, which makes the interaction of the header files more complicated than necessary.
Move all three directories into a new mach-s3c, with a minimal set of changes to each file.
Signed-off-by Arnd Bergmann <[email protected]>
(...)
Quoted 10 lines
rename arch/arm/{plat-samsung => mach-s3c}/Kconfig (98%)
rename arch/arm/{mach-s3c24xx/Kconfig => mach-s3c/Kconfig.s3c24xx} (100%)
rename arch/arm/{mach-s3c64xx/Kconfig => mach-s3c/Kconfig.s3c64xx} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/Makefile (83%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot (100%)
rename arch/arm/{mach-s3c24xx/Makefile => mach-s3c/Makefile.s3c24xx} (92%)
rename arch/arm/{mach-s3c64xx/Makefile => mach-s3c/Makefile.s3c64xx} (83%)
rename arch/arm/{plat-samsung => mach-s3c}/adc.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/ata-core.h (100%)Looks like generic file now (shared between S3C24xx and S3C64xx) so I would prefer to add a -s3c64xx suffix to make it clear.
Quoted 1 line
rename arch/arm/{mach-s3c64xx => mach-s3c}/backlight.h (100%)The same.
Quoted 5 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/bast.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/common-smdk.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/common-smdk.h (100%)The same as SMDK is a common name (Samsung Developers Kit, or something like this).
Quoted 2 lines
rename arch/arm/{plat-samsung => mach-s3c}/cpu.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/cpufreq-utils.c (100%)Suffix.
Quoted 1 line
rename arch/arm/{mach-s3c64xx => mach-s3c}/cpuidle.c (100%)Suffix.
Quoted 2 lines
rename arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-audio.c (100%)Suffix.
Quoted 1 line
rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-backlight.c (100%)Suffix.
Quoted 4 lines
rename arch/arm/{mach-s3c64xx/dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/dev-uart.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/devs.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/fb-core.h (100%)Suffix.
Quoted 11 lines
rename arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h (100%)
rename arch/arm/{mach-s3c24xx/include/mach/dma.h => mach-s3c/include/mach/dma-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/dma.h => mach-s3c/include/mach/dma-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/dma.h
rename arch/arm/{mach-s3c24xx/include/mach/gpio-samsung.h => mach-s3c/include/mach/gpio-samsung-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/gpio-samsung.h => mach-s3c/include/mach/gpio-samsung-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/gpio-samsung.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/hardware.h (100%)Suffix.
Quoted 1 line
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/io.h (100%)Suffix.
Quoted 12 lines
rename arch/arm/{mach-s3c24xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/irqs.h
rename arch/arm/{mach-s3c24xx/include/mach/map.h => mach-s3c/include/mach/map-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/map.h => mach-s3c/include/mach/map-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/map.h
rename arch/arm/{mach-s3c24xx/include/mach/pm-core.h => mach-s3c/include/mach/pm-core-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/pm-core.h => mach-s3c/include/mach/pm-core-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/pm-core.h
rename arch/arm/{mach-s3c24xx/include/mach/regs-clock.h => mach-s3c/include/mach/regs-clock-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-clock.h => mach-s3c/include/mach/regs-clock-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/regs-clock.hQuoted 8 lines
rename arch/arm/{mach-s3c24xx/include/mach/regs-gpio.h => mach-s3c/include/mach/regs-gpio-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-gpio.h => mach-s3c/include/mach/regs-gpio-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/regs-gpio.h
rename arch/arm/{mach-s3c24xx/include/mach/regs-irq.h => mach-s3c/include/mach/regs-irq-s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx/include/mach/regs-irq.h => mach-s3c/include/mach/regs-irq-s3c64xx.h} (100%)
create mode 100644 arch/arm/mach-s3c/include/mach/regs-irq.h
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/regs-s3c2443-clock.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/rtc-core.h (100%)Suffix.
Quoted 23 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/s3c2412.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/adc-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/cpu.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/devs.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/fb.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/gpio-cfg-helpers.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/gpio-cfg.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/gpio-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/iic-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/keypad.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/map-base.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/map-s3c.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/map-s5p.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/pm-common.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/pm.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/pwm-core.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/regs-adc.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/regs-irqtype.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/samsung-time.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/sdhci.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/usb-phy.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/include/plat/wakeup-mask.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/init.c (100%)Quoted 8 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c (100%)
rename arch/arm/{mach-s3c24xx/irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/irq-s3c24xx-fiq-exports.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/irq-s3c24xx-fiq.S (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/irq-s3c24xx.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/irq-uart.h (100%)Suffix.
Quoted 32 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-at2440evb.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410-module.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c (99%)Quoted 8 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c (99%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/nand-core.h (100%)Suffix.
Quoted 1 line
rename arch/arm/{mach-s3c64xx => mach-s3c}/onenand-core.h (100%)Suffix.
Quoted 16 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/otom.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/platformdata.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-12000000.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-16934400.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/pm-common.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c (100%)
rename arch/arm/{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} (100%)
rename arch/arm/{plat-samsung => mach-s3c}/pm.c (100%)Quoted 8 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/regs-dsc.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-gpio-memport.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/regs-mem.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-modem.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-srom.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-sys.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-syscon-power.h (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/regs-usb-hsotg-phy.h (100%)Suffix to all regs above.
Quoted 13 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c (99%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c (98%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c (99%)
rename arch/arm/{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} (99%)
rename arch/arm/{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c (98%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c (99%)
rename arch/arm/{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} (99%)Quoted 8 lines
rename arch/arm/{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-camif.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-fb-24bpp.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-i2c.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c0.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-i2c1.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-ide.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-keypad.c (100%)Suffix to all setup above.
Quoted 5 lines
rename arch/arm/{mach-s3c24xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c64xx.c} (100%)
rename arch/arm/{mach-s3c24xx/setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} (100%)
rename arch/arm/{mach-s3c64xx/setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/setup-ts.c (100%)Suffix.
Quoted 1 line
rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-usb-phy.c (100%)Suffix.
Quoted 10 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S (100%)
rename arch/arm/{mach-s3c24xx/sleep.S => mach-s3c/sleep-s3c24xx.S} (100%)
rename arch/arm/{mach-s3c64xx/sleep.S => mach-s3c/sleep-s3c64xx.S} (100%)
rename arch/arm/{mach-s3c24xx => mach-s3c}/spi-core.h (100%)Suffix.
Quoted 4 lines
rename arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h (100%)
rename arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c (100%)
rename arch/arm/{plat-samsung => mach-s3c}/watchdog-reset.c (100%)
rename arch/arm/{mach-s3c64xx => mach-s3c}/watchdog-reset.h (100%)Suffix.
Rest looks reasonable.
Best regards,
Krzysztof
PATCH 36/36 ARM: s3c: make headers local if possible
In reply to Arnd BergmannA 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 | 3 +--
arch/arm/mach-s3c/common-smdk.c | 11 ++++----
arch/arm/mach-s3c/cpu.c | 4 +--
arch/arm/mach-s3c/{include/plat => }/cpu.h | 0
arch/arm/mach-s3c/cpufreq-utils.c | 4 +--
arch/arm/mach-s3c/cpuidle.c | 4 +--
arch/arm/mach-s3c/crag6410.h | 2 +-
arch/arm/mach-s3c/dev-audio.c | 9 +++----
arch/arm/mach-s3c/dev-backlight.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 | 23 ++++++++--------
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 | 7 +++--
.../mach-s3c/{include/mach => }/hardware.h | 0
.../mach-s3c/{include/plat => }/iic-core.h | 0
arch/arm/mach-s3c/include/mach/io.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 | 13 +++++-----
arch/arm/mach-s3c/mach-anubis.c | 11 ++++----
arch/arm/mach-s3c/mach-anw6410.c | 14 +++++-----
arch/arm/mach-s3c/mach-at2440evb.c | 11 ++++----
arch/arm/mach-s3c/mach-bast.c | 13 +++++-----
arch/arm/mach-s3c/mach-crag6410-module.c | 2 +-
arch/arm/mach-s3c/mach-crag6410.c | 22 ++++++++--------
arch/arm/mach-s3c/mach-gta02.c | 19 +++++++-------
arch/arm/mach-s3c/mach-h1940.c | 22 ++++++++--------
arch/arm/mach-s3c/mach-hmt.c | 12 ++++-----
arch/arm/mach-s3c/mach-jive.c | 16 ++++++------
arch/arm/mach-s3c/mach-mini2440.c | 13 +++++-----
arch/arm/mach-s3c/mach-mini6410.c | 16 ++++++------
arch/arm/mach-s3c/mach-n30.c | 14 +++++-----
arch/arm/mach-s3c/mach-ncp.c | 10 +++----
arch/arm/mach-s3c/mach-nexcoder.c | 13 +++++-----
arch/arm/mach-s3c/mach-osiris-dvs.c | 2 +-
arch/arm/mach-s3c/mach-osiris.c | 13 +++++-----
arch/arm/mach-s3c/mach-otom.c | 15 +++++------
arch/arm/mach-s3c/mach-qt2410.c | 13 +++++-----
arch/arm/mach-s3c/mach-real6410.c | 14 +++++-----
arch/arm/mach-s3c/mach-rx1950.c | 18 ++++++-------
arch/arm/mach-s3c/mach-rx3715.c | 17 ++++++------
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 | 16 ++++++------
arch/arm/mach-s3c/mach-smartq5.c | 18 ++++++-------
arch/arm/mach-s3c/mach-smartq7.c | 18 ++++++-------
arch/arm/mach-s3c/mach-smdk2410.c | 11 ++++----
arch/arm/mach-s3c/mach-smdk2413.c | 14 +++++-----
arch/arm/mach-s3c/mach-smdk2416.c | 20 +++++++-------
arch/arm/mach-s3c/mach-smdk2440.c | 13 +++++-----
arch/arm/mach-s3c/mach-smdk2443.c | 9 +++----
arch/arm/mach-s3c/mach-smdk6400.c | 10 +++----
arch/arm/mach-s3c/mach-smdk6410.c | 18 ++++++-------
arch/arm/mach-s3c/mach-tct_hammer.c | 7 +++--
arch/arm/mach-s3c/mach-vr1000.c | 15 +++++------
arch/arm/mach-s3c/mach-vstms.c | 13 +++++-----
.../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 | 11 ++++----
arch/arm/mach-s3c/pm-s3c2412.c | 9 +++----
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.h | 2 +-
.../{include/mach => }/regs-s3c2443-clock.h | 2 +-
.../mach-s3c/{include/mach => }/rtc-core.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 | 15 +++++------
arch/arm/mach-s3c/s3c2442.c | 15 +++++------
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 +++++++--------
.../{include/plat => }/samsung-time.h | 0
arch/arm/mach-s3c/{include/plat => }/sdhci.h | 2 +-
arch/arm/mach-s3c/setup-camif.c | 4 +--
arch/arm/mach-s3c/setup-fb-24bpp.c | 6 ++---
arch/arm/mach-s3c/setup-i2c.c | 7 +++--
arch/arm/mach-s3c/setup-i2c0.c | 4 +--
arch/arm/mach-s3c/setup-i2c1.c | 4 +--
arch/arm/mach-s3c/setup-ide.c | 8 +++---
arch/arm/mach-s3c/setup-keypad.c | 6 ++---
arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c | 6 ++---
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.c | 5 ++--
arch/arm/mach-s3c/setup-usb-phy.c | 6 ++---
arch/arm/mach-s3c/simtec-audio.c | 9 +++----
arch/arm/mach-s3c/simtec-nor.c | 2 +-
arch/arm/mach-s3c/simtec-pm.c | 8 +++---
arch/arm/mach-s3c/simtec-usb.c | 5 ++--
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
drivers/mmc/host/s3cmci.c | 3 ---
154 files changed, 524 insertions(+), 560 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.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.h (100%)
rename arch/arm/mach-s3c/{include/mach => }/s3c2412.h (96%)
rename arch/arm/mach-s3c/{include/plat => }/samsung-time.h (100%)
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 -2
@@ -15,8 +15,7 @@#include <asm/mach-types.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> -#include <mach/regs-irq.h> +#include "regs-irq.h" #include <mach/irqs.h> #include "bast.h"
arch/arm/mach-s3c/common-smdk.c +5 -6
@@ -28,17 +28,16 @@#include <asm/mach/irq.h> #include <asm/mach-types.h> -#include <mach/hardware.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.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.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.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.h" #include "regs-syscon-power.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.c +4 -5
@@ -11,13 +11,12 @@#include <linux/export.h> #include <mach/irqs.h> -#include <mach/map.h> -#include <mach/dma.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.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.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 -12
@@ -38,30 +38,29 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/dma.h> #include <mach/irqs.h> -#include <mach/map.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> -#include <mach/regs-s3c2443-clock.h> +#include "map.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" +#include "regs-s3c2443-clock.h" -#include <plat/cpu.h> -#include <plat/devs.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 -4
@@ -13,10 +13,9 @@#include <linux/gpio.h> #include <linux/rfkill.h> -#include <plat/gpio-cfg.h> -#include <mach/hardware.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.h renamed from arch/arm/mach-s3c/include/mach/hardware.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.h +1 -1
@@ -10,7 +10,7 @@#ifndef __ASM_ARM_ARCH_IO_H#define __ASM_ARM_ARCH_IO_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 +6 -7
@@ -27,25 +27,24 @@#include <asm/mach/irq.h> #include <asm/mach/flash.h> -#include <mach/hardware.h> #include <asm/irq.h> #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> #include <linux/mtd/map.h> #include <linux/mtd/physmap.h> -#include <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c24xx.h"
arch/arm/mach-s3c/mach-anubis.c +5 -6
@@ -24,12 +24,11 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.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/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h>
@@ -40,10 +39,10 @@#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 <plat/samsung-time.h> +#include "samsung-time.h" #include "anubis.h" #include "s3c24xx.h"
arch/arm/mach-s3c/mach-anw6410.c +7 -7
@@ -30,20 +30,20 @@#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 <plat/samsung-time.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "samsung-time.h" #include "s3c64xx.h" #include "regs-modem.h"
arch/arm/mach-s3c/mach-at2440evb.c +5 -6
@@ -24,13 +24,12 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <linux/platform_data/fb-s3c2410.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/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h>
@@ -39,10 +38,10 @@#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 <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c24xx.h"
arch/arm/mach-s3c/mach-bast.c +6 -7
@@ -40,16 +40,15 @@#include <asm/mach/irq.h> #include <asm/mach-types.h> -#include <mach/hardware.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 <plat/samsung-time.h> +#include "devs.h" +#include "gpio-cfg.h" +#include "samsung-time.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 +11 -11
@@ -44,23 +44,23 @@#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 <plat/samsung-time.h> +#include "pm.h" +#include "samsung-time.h" #include "s3c64xx.h" #include "crag6410.h"
arch/arm/mach-s3c/mach-gta02.c +9 -10
@@ -59,16 +59,15 @@#include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/hardware.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 <plat/samsung-time.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 "samsung-time.h" #include "s3c24xx.h" #include "gta02.h"
arch/arm/mach-s3c/mach-h1940.c +11 -11
@@ -48,17 +48,17 @@#include <sound/uda1380.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/map.h> -#include <mach/hardware.h> -#include <mach/regs-clock.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/gpio-cfg.h> -#include <plat/pm.h> -#include <plat/samsung-time.h> +#include "map.h" +#include "hardware.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 "samsung-time.h" #include "s3c24xx.h" #include "h1940.h"
arch/arm/mach-s3c/mach-hmt.c +6 -6
@@ -25,20 +25,20 @@#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 <plat/samsung-time.h> +#include "devs.h" +#include "cpu.h" +#include "samsung-time.h" #include "s3c64xx.h"
arch/arm/mach-s3c/mach-jive.c +8 -8
@@ -31,10 +31,10 @@#include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <mach/hardware.h> -#include <mach/regs-gpio.h> +#include "hardware.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,12 +43,12 @@#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 <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c24xx.h" #include "s3c2412-power.h"
arch/arm/mach-s3c/mach-mini2440.c +6 -7
@@ -31,13 +31,12 @@#include <asm/mach/map.h> #include <linux/platform_data/fb-s3c2410.h> -#include <mach/hardware.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>
@@ -48,10 +47,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/samsung-time.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" +#include "samsung-time.h" #include <sound/s3c24xx_uda134x.h>
arch/arm/mach-s3c/mach-mini6410.c +8 -8
@@ -23,23 +23,23 @@#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> #include <video/platform_lcd.h> #include <video/samsung_fimd.h> -#include <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c64xx.h" #include "regs-modem.h"
arch/arm/mach-s3c/mach-n30.c +7 -7
@@ -27,15 +27,15 @@#include <linux/io.h> #include <linux/mmc/host.h> -#include <mach/hardware.h> +#include "hardware.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,11 +43,11 @@#include <linux/platform_data/i2c-s3c2410.h> -#include <plat/cpu.h> -#include <plat/devs.h> +#include "cpu.h" +#include "devs.h" #include <linux/platform_data/mmc-s3cmci.h> #include <linux/platform_data/usb-s3c2410_udc.h> -#include <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c24xx.h"
arch/arm/mach-s3c/mach-ncp.c +5 -5
@@ -25,17 +25,17 @@#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 <plat/samsung-time.h> +#include "devs.h" +#include "cpu.h" +#include "samsung-time.h" #include "s3c64xx.h"
arch/arm/mach-s3c/mach-nexcoder.c +6 -7
@@ -28,19 +28,18 @@#include <asm/mach/irq.h> #include <asm/setup.h> -#include <mach/hardware.h> #include <asm/irq.h> #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 <plat/samsung-time.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" +#include "samsung-time.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 +6 -7
@@ -36,15 +36,14 @@#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 <plat/samsung-time.h> +#include "devs.h" +#include "gpio-cfg.h" +#include "samsung-time.h" -#include <mach/hardware.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 +7 -8
@@ -22,14 +22,13 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/samsung-time.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" + +#include "cpu.h" +#include "devs.h" +#include "samsung-time.h" #include "s3c24xx.h" #include "otom.h"
arch/arm/mach-s3c/mach-qt2410.c +6 -7
@@ -28,7 +28,6 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach-types.h>
@@ -37,13 +36,13 @@#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 <plat/samsung-time.h> +#include "gpio-cfg.h" +#include "devs.h" +#include "cpu.h" +#include "pm.h" +#include "samsung-time.h" #include "s3c24xx.h" #include "common-smdk.h"
arch/arm/mach-s3c/mach-real6410.c +7 -7
@@ -24,21 +24,21 @@#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> #include <video/platform_lcd.h> #include <video/samsung_fimd.h> -#include <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c64xx.h" #include "regs-modem.h"
arch/arm/mach-s3c/mach-rx1950.c +9 -9
@@ -46,15 +46,15 @@#include <sound/uda1380.h> -#include <mach/hardware.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/samsung-time.h> -#include <plat/gpio-cfg.h> +#include "hardware.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "devs.h" +#include "pm.h" +#include "samsung-time.h" +#include "gpio-cfg.h" #include "s3c24xx.h" #include "h1940.h"
arch/arm/mach-s3c/mach-rx3715.c +8 -9
@@ -35,15 +35,14 @@#include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/pm.h> -#include <plat/samsung-time.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" + +#include "cpu.h" +#include "devs.h" +#include "pm.h" +#include "samsung-time.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" #include "watchdog-reset.h"
arch/arm/mach-s3c/mach-smartq.c +8 -8
@@ -19,21 +19,21 @@#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> -#include <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c64xx.h" #include "mach-smartq.h"
arch/arm/mach-s3c/mach-smartq5.c +9 -9
@@ -15,15 +15,15 @@#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 <plat/samsung-time.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 "samsung-time.h" #include "s3c64xx.h" #include "mach-smartq.h"
arch/arm/mach-s3c/mach-smartq7.c +9 -9
@@ -15,15 +15,15 @@#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 <plat/samsung-time.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 "samsung-time.h" #include "s3c64xx.h" #include "mach-smartq.h"
arch/arm/mach-s3c/mach-smdk2410.c +5 -6
@@ -19,22 +19,21 @@#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> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach-types.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/devs.h> -#include <plat/cpu.h> -#include <plat/samsung-time.h> +#include "devs.h" +#include "cpu.h" +#include "samsung-time.h" #include "s3c24xx.h" #include "common-smdk.h"
arch/arm/mach-s3c/mach-smdk2413.c +7 -7
@@ -23,24 +23,24 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> +#include "hardware.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 "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 <plat/samsung-time.h> +#include "devs.h" +#include "cpu.h" +#include "samsung-time.h" #include "s3c24xx.h" #include "common-smdk.h"
arch/arm/mach-s3c/mach-smdk2416.c +10 -10
@@ -25,27 +25,27 @@#include <asm/mach/irq.h> #include <video/samsung_fimd.h> -#include <mach/hardware.h> +#include "hardware.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 "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/samsung-time.h> +#include "samsung-time.h" -#include <plat/fb.h> +#include "fb.h" #include "s3c24xx.h" #include "common-smdk.h"
arch/arm/mach-s3c/mach-smdk2440.c +6 -7
@@ -23,20 +23,19 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #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 <plat/samsung-time.h> +#include "devs.h" +#include "cpu.h" +#include "samsung-time.h" #include "s3c24xx.h" #include "common-smdk.h"
arch/arm/mach-s3c/mach-smdk2443.c +4 -5
@@ -22,18 +22,17 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #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 <plat/samsung-time.h> +#include "devs.h" +#include "cpu.h" +#include "samsung-time.h" #include "s3c24xx.h" #include "common-smdk.h"
arch/arm/mach-s3c/mach-smdk6400.c +5 -5
@@ -23,13 +23,13 @@#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 <plat/samsung-time.h> +#include "gpio-samsung.h" +#include "samsung-time.h" #include "s3c64xx.h"
arch/arm/mach-s3c/mach-smdk6410.c +9 -9
@@ -46,24 +46,24 @@#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 <plat/samsung-time.h> +#include "keypad.h" +#include "samsung-time.h" #include "backlight.h" #include "s3c64xx.h"
arch/arm/mach-s3c/mach-tct_hammer.c +3 -4
@@ -25,19 +25,18 @@#include <asm/mach/irq.h> #include <asm/mach/flash.h> -#include <mach/hardware.h> #include <asm/irq.h> #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> #include <linux/mtd/map.h> #include <linux/mtd/physmap.h> -#include <plat/samsung-time.h> +#include "samsung-time.h" #include "s3c24xx.h"
arch/arm/mach-s3c/mach-vr1000.c +7 -8
@@ -34,14 +34,13 @@#include <linux/platform_data/i2c-s3c2410.h> #include <linux/platform_data/asoc-s3c24xx_simtec.h> -#include <mach/hardware.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> - -#include <plat/cpu.h> -#include <plat/devs.h> -#include <plat/samsung-time.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" + +#include "cpu.h" +#include "devs.h" +#include "samsung-time.h" #include "bast.h" #include "s3c24xx.h"
arch/arm/mach-s3c/mach-vstms.c +6 -7
@@ -24,23 +24,22 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> #include <asm/setup.h> #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 <plat/samsung-time.h> +#include "devs.h" +#include "cpu.h" +#include "samsung-time.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.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 -6
@@ -16,13 +16,12 @@#include <asm/mach-types.h> -#include <mach/hardware.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 -5
@@ -19,14 +19,13 @@#include <asm/cacheflush.h> #include <asm/irq.h> -#include <mach/hardware.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.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.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.h" #include "regs-modem.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.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.h renamed from arch/arm/mach-s3c/include/mach/rtc-core.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.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.h> +#include "regs-s3c2443-clock.h" +#include "rtc-core.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.h"
arch/arm/mach-s3c/s3c2440.c +7 -8
@@ -23,17 +23,16 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> -#include <mach/gpio-samsung.h> +#include "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 "s3c24xx.h"
arch/arm/mach-s3c/s3c2442.c +7 -8
@@ -21,19 +21,18 @@#include <linux/clk.h> #include <linux/io.h> -#include <mach/hardware.h> -#include <mach/gpio-samsung.h> +#include "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 "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.h> +#include "regs-s3c2443-clock.h" +#include "rtc-core.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 "fb-core.h" #include "nand-core.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.h"
arch/arm/mach-s3c/s3c24xx.c +8 -8
@@ -20,9 +20,9 @@#include <linux/platform_data/dma-s3c24xx.h> #include <linux/dmaengine.h> -#include <mach/hardware.h> -#include <mach/map.h> -#include <mach/regs-clock.h> +#include "hardware.h" +#include "map.h" +#include "regs-clock.h" #include <asm/irq.h> #include <asm/cacheflush.h> #include <asm/system_info.h>
@@ -31,12 +31,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.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.h" #include "s3c64xx.h"
arch/arm/mach-s3c/s3c64xx.c +10 -11
@@ -34,18 +34,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.h" #include "watchdog-reset.h"
arch/arm/mach-s3c/samsung-time.h renamed from arch/arm/mach-s3c/include/plat/samsung-time.h +0 -0
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.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" /* Number of camera port pins, without FIELD */ #define S3C_CAMIF_NUM_GPIOS 13
arch/arm/mach-s3c/setup-fb-24bpp.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.c +3 -4
@@ -10,11 +10,10 @@struct platform_device ; -#include <plat/gpio-cfg.h> +#include "gpio-cfg.h" #include <linux/platform_data/i2c-s3c2410.h> -#include <mach/hardware.h> -#include <mach/regs-gpio.h> -#include <mach/gpio-samsung.h> +#include "regs-gpio.h" +#include "gpio-samsung.h" void s3c_i2c0_cfg_gpio (struct platform_device *dev) {
arch/arm/mach-s3c/setup-i2c0.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.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.c +4 -4
@@ -9,10 +9,10 @@#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 "map.h" +#include "regs-clock.h" +#include "gpio-cfg.h" +#include "gpio-samsung.h" #include <linux/platform_data/ata-samsung_cf.h> void s3c64xx_ide_setup_gpio (void )
arch/arm/mach-s3c/setup-keypad.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 +3 -3
@@ -14,9 +14,9 @@#include <linux/io.h> #include <linux/gpio.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" 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.h> -#include <mach/regs-gpio.h> +#include "hardware.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
@@ -4,8 +4,8 @@// http://www.samsung.com/ #include <linux/gpio.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.c +2 -3
@@ -10,9 +10,8 @@struct platform_device ;/* don't need the contents */ -#include <plat/gpio-cfg.h> -#include <mach/hardware.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.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.h" #include "regs-usb-hsotg-phy.h"
arch/arm/mach-s3c/simtec-audio.c +4 -5
@@ -12,13 +12,12 @@#include <linux/device.h> #include <linux/io.h> -#include <mach/hardware.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 -5
@@ -19,14 +19,12 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/hardware.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.h"
arch/arm/mach-s3c/simtec-usb.c +2 -3
@@ -23,13 +23,12 @@#include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <mach/hardware.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.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
drivers/mmc/host/s3cmci.c +0 -3
@@ -24,9 +24,6 @@#include <linux/of.h> #include <linux/of_device.h> #include <linux/mmc/slot-gpio.h> - -#include <mach/dma.h> -#include <linux/platform_data/mmc-s3cmci.h> #include "s3cmci.h"
Signature · 1 line
2.20.0
Krzysztof Kozlowski
maintainerQuoted 15 lines · Arnd Bergmann
I've spent some time looking at the remaining ARMv4/ARMv5 platforms that are not part of
ARCH_MULTIPLATFORM, and tried to get them closer to that. Here is what came out of that for the samsung platforms:* Exynos and s5pv210 are made independent of plat-samsung
* device drivers stop using mach/*.h headers for s3c24xx (and other platforms not in this series)
* s3c24xx and s3c64xx get merged into mach-s3c, removing the need for plat-samsung (I have other patches for the remaining plat-* directories)
*mach/io.hgets cleaned up to only be needed for BAST PC104 mode (looking for ideas to proceed)
*mach/irqs.hremains for now, this still needs to be converted to sparse IRQs.
Quoted 6 lines
Some bits are a little ugly, but overall I think this a big improvement.
The contents are available for testing in
git://kernel.org:/pub/scm/linux/kernel/git/arnd/playground.gits3c-multiplatform
When sending v2, can you Cc:
Paweł Chmiel <[email protected]> Lihua Yao <[email protected]>
(or Lihua Yao <[email protected]> if outlook.com bounces) Sergio Prado <[email protected]> Sylwester Nawrocki <[email protected]>
These are folks which to my knowledge had working S3C and S5P boards so maybe they could provide testing.
Best regards,
Krzysztof
Quoted 7 lines · Krzysztof Kozlowski
Quoted 3 lines · Arnd Bergmann
The contents are available for testing in
git://kernel.org:/pub/scm/linux/kernel/git/arnd/playground.gits3c-multiplatformWhen sending v2, can you Cc:
Quoted 8 lines
Paweł Chmiel <[email protected]> Lihua Yao <[email protected]>
(or Lihua Yao <[email protected]> if outlook.com bounces) Sergio Prado <[email protected]> Sylwester Nawrocki <[email protected]>These are folks which to my knowledge had working S3C and S5P boards so maybe they could provide testing.
Ok, will do. I've uploaded the modified version based on your comments to the above URL for now.
I'll probably give it a little more time before resending, but they could already
start testing that version.
Thanks a lot for the review!
Arnd
Hi Arnd, Krzysztof,
Quoted 10 lines · Arnd Bergmann
Quoted 9 lines · Krzysztof Kozlowski
Quoted 3 lines · Arnd Bergmann
The contents are available for testing in
git://kernel.org:/pub/scm/linux/kernel/git/arnd/playground.gits3c-multiplatformWhen sending v2, can you Cc:
Paweł Chmiel <[email protected]> Lihua Yao <[email protected]>
(or Lihua Yao <[email protected]> if outlook.com bounces)
You could reach me by e-mail to Lihua Yao <[email protected]>.
Neither 163.com nor outlook.com e-mail server cooperates well with
vger.kernel.org mail list.
Quoted 11 lines
Quoted 5 lines
Sergio Prado <[email protected]>
Sylwester Nawrocki <[email protected]>These are folks which to my knowledge had working S3C and S5P boards so maybe they could provide testing.
Ok, will do. I've uploaded the modified version based on your comments to the above URL for now.
I'll probably give it a little more time before resending, but they could already
start testing that version.
Nice! Sadly I am on vocation and will test it until Nov 15.
Best Regards
Lihua
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel