diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-02 17:47:55 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2020-08-20 21:00:15 +0200 |
| commit | 71b9114d2c13a648fbe6523dd859e611c316ad90 (patch) | |
| tree | c380a723099f776736779319be913f8c0900989e | |
| parent | a3814e55b411e8cdb352637c65925f60b9ac15cc (diff) | |
ARM: s3c: move into a common directory
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 <arnd@arndb.de>
[krzk: Rebase, add s3c24xx and s3c64xx suffix to several files, add SPDX
headers to new files, remove plat-samsung from MAINTAINERS]
Co-developed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
https://lore.kernel.org/r/20200806182059.2431-39-krzk@kernel.org
| -rw-r--r-- | MAINTAINERS | 16 | ||||
| -rw-r--r-- | arch/arm/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/Makefile | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/Kconfig (renamed from arch/arm/plat-samsung/Kconfig) | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/Kconfig.s3c24xx (renamed from arch/arm/mach-s3c24xx/Kconfig) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/Kconfig.s3c64xx (renamed from arch/arm/mach-s3c64xx/Kconfig) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/Makefile (renamed from arch/arm/plat-samsung/Makefile) | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/Makefile.boot (renamed from arch/arm/mach-s3c24xx/Makefile.boot) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/Makefile.s3c24xx (renamed from arch/arm/mach-s3c24xx/Makefile) | 18 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/Makefile.s3c64xx (renamed from arch/arm/mach-s3c64xx/Makefile) | 32 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/adc.c (renamed from arch/arm/plat-samsung/adc.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/anubis.h (renamed from arch/arm/mach-s3c24xx/anubis.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/ata-core-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/ata-core.h) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/backlight-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/backlight.h) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/bast-ide.c (renamed from arch/arm/mach-s3c24xx/bast-ide.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/bast-irq.c (renamed from arch/arm/mach-s3c24xx/bast-irq.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/bast.h (renamed from arch/arm/mach-s3c24xx/bast.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/common-smdk-s3c24xx.c (renamed from arch/arm/mach-s3c24xx/common-smdk.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/common-smdk-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/common-smdk.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/cpu.c (renamed from arch/arm/plat-samsung/cpu.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c (renamed from arch/arm/mach-s3c24xx/cpufreq-utils.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/cpuidle-s3c64xx.c (renamed from arch/arm/mach-s3c64xx/cpuidle.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/crag6410.h (renamed from arch/arm/mach-s3c64xx/crag6410.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/dev-audio-s3c64xx.c (renamed from arch/arm/mach-s3c64xx/dev-audio.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/dev-backlight-s3c64xx.c (renamed from arch/arm/mach-s3c64xx/dev-backlight.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/dev-uart-s3c64xx.c (renamed from arch/arm/mach-s3c64xx/dev-uart.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/dev-uart.c (renamed from arch/arm/plat-samsung/dev-uart.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/devs.c (renamed from arch/arm/plat-samsung/devs.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/fb-core-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/fb-core.h) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/gpio-samsung.c (renamed from arch/arm/plat-samsung/gpio-samsung.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/gta02.h (renamed from arch/arm/mach-s3c24xx/gta02.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/h1940-bluetooth.c (renamed from arch/arm/mach-s3c24xx/h1940-bluetooth.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/h1940.h (renamed from arch/arm/mach-s3c24xx/h1940.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/dma-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/dma.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/dma-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/dma.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/dma.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/gpio-samsung-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/gpio-samsung.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/hardware-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/hardware.h) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/io-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/io.h) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/io.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/irqs-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/irqs.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/irqs-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/irqs.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/irqs.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/map-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/map-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/map.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/pm-core-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/pm-core.h) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/pm-core-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/pm-core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/pm-core.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-clock-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/regs-clock.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-clock-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/regs-clock.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-clock.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-gpio-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/regs-gpio.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-gpio-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/regs-gpio.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-gpio.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-irq-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/regs-irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-irq-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/include/mach/regs-irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-irq.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/regs-s3c2443-clock.h (renamed from arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/rtc-core-s3c24xx.h (renamed from arch/arm/mach-s3c24xx/include/mach/rtc-core.h) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/mach/s3c2412.h (renamed from arch/arm/mach-s3c24xx/include/mach/s3c2412.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/adc-core.h (renamed from arch/arm/plat-samsung/include/plat/adc-core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/cpu.h (renamed from arch/arm/plat-samsung/include/plat/cpu.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/devs.h (renamed from arch/arm/plat-samsung/include/plat/devs.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/fb.h (renamed from arch/arm/plat-samsung/include/plat/fb.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/gpio-cfg-helpers.h (renamed from arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/gpio-cfg.h (renamed from arch/arm/plat-samsung/include/plat/gpio-cfg.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/gpio-core.h (renamed from arch/arm/plat-samsung/include/plat/gpio-core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/iic-core.h (renamed from arch/arm/plat-samsung/include/plat/iic-core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/keypad.h (renamed from arch/arm/plat-samsung/include/plat/keypad.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/map-base.h (renamed from arch/arm/plat-samsung/include/plat/map-base.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/map-s3c.h (renamed from arch/arm/plat-samsung/include/plat/map-s3c.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/map-s5p.h (renamed from arch/arm/plat-samsung/include/plat/map-s5p.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/pm-common.h (renamed from arch/arm/plat-samsung/include/plat/pm-common.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/pm.h (renamed from arch/arm/plat-samsung/include/plat/pm.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/pwm-core.h (renamed from arch/arm/plat-samsung/include/plat/pwm-core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/regs-adc.h (renamed from arch/arm/plat-samsung/include/plat/regs-adc.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/regs-irqtype.h (renamed from arch/arm/plat-samsung/include/plat/regs-irqtype.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/sdhci.h (renamed from arch/arm/plat-samsung/include/plat/sdhci.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/usb-phy.h (renamed from arch/arm/plat-samsung/include/plat/usb-phy.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/include/plat/wakeup-mask.h (renamed from arch/arm/plat-samsung/include/plat/wakeup-mask.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/init.c (renamed from arch/arm/plat-samsung/init.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/iotiming-s3c2410.c (renamed from arch/arm/mach-s3c24xx/iotiming-s3c2410.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/iotiming-s3c2412.c (renamed from arch/arm/mach-s3c24xx/iotiming-s3c2412.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/irq-pm-s3c24xx.c (renamed from arch/arm/mach-s3c24xx/irq-pm.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/irq-pm-s3c64xx.c (renamed from arch/arm/mach-s3c64xx/irq-pm.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c (renamed from arch/arm/mach-s3c24xx/irq-s3c24xx-fiq-exports.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/irq-s3c24xx-fiq.S (renamed from arch/arm/mach-s3c24xx/irq-s3c24xx-fiq.S) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/irq-s3c24xx.c (renamed from arch/arm/mach-s3c24xx/irq-s3c24xx.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/irq-uart-s3c64xx.h (renamed from arch/arm/mach-s3c64xx/irq-uart.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-amlm5900.c (renamed from arch/arm/mach-s3c24xx/mach-amlm5900.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-anubis.c (renamed from arch/arm/mach-s3c24xx/mach-anubis.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-anw6410.c (renamed from arch/arm/mach-s3c64xx/mach-anw6410.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-at2440evb.c (renamed from arch/arm/mach-s3c24xx/mach-at2440evb.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-bast.c (renamed from arch/arm/mach-s3c24xx/mach-bast.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-crag6410-module.c (renamed from arch/arm/mach-s3c64xx/mach-crag6410-module.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-crag6410.c (renamed from arch/arm/mach-s3c64xx/mach-crag6410.c) | 8 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-gta02.c (renamed from arch/arm/mach-s3c24xx/mach-gta02.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-h1940.c (renamed from arch/arm/mach-s3c24xx/mach-h1940.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-hmt.c (renamed from arch/arm/mach-s3c64xx/mach-hmt.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-jive.c (renamed from arch/arm/mach-s3c24xx/mach-jive.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-mini2440.c (renamed from arch/arm/mach-s3c24xx/mach-mini2440.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-mini6410.c (renamed from arch/arm/mach-s3c64xx/mach-mini6410.c) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-n30.c (renamed from arch/arm/mach-s3c24xx/mach-n30.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-ncp.c (renamed from arch/arm/mach-s3c64xx/mach-ncp.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-nexcoder.c (renamed from arch/arm/mach-s3c24xx/mach-nexcoder.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-osiris-dvs.c (renamed from arch/arm/mach-s3c24xx/mach-osiris-dvs.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-osiris.c (renamed from arch/arm/mach-s3c24xx/mach-osiris.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-otom.c (renamed from arch/arm/mach-s3c24xx/mach-otom.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-qt2410.c (renamed from arch/arm/mach-s3c24xx/mach-qt2410.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-real6410.c (renamed from arch/arm/mach-s3c64xx/mach-real6410.c) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-rx1950.c (renamed from arch/arm/mach-s3c24xx/mach-rx1950.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-rx3715.c (renamed from arch/arm/mach-s3c24xx/mach-rx3715.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-s3c2416-dt.c (renamed from arch/arm/mach-s3c24xx/mach-s3c2416-dt.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-s3c64xx-dt.c (renamed from arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smartq.c (renamed from arch/arm/mach-s3c64xx/mach-smartq.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smartq.h (renamed from arch/arm/mach-s3c64xx/mach-smartq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smartq5.c (renamed from arch/arm/mach-s3c64xx/mach-smartq5.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smartq7.c (renamed from arch/arm/mach-s3c64xx/mach-smartq7.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smdk2410.c (renamed from arch/arm/mach-s3c24xx/mach-smdk2410.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smdk2413.c (renamed from arch/arm/mach-s3c24xx/mach-smdk2413.c) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smdk2416.c (renamed from arch/arm/mach-s3c24xx/mach-smdk2416.c) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/mach-smdk2440.c (renamed from arch/arm/mach-s3c24xx/mach-smdk2440.c) | 4 |