On Thu, Oct 10, 2019 at 11:07:04PM +0200, Arnd Bergmann wrote:
> 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@xxxxxxxx>
(...)
> 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.
> rename arch/arm/{mach-s3c64xx => mach-s3c}/backlight.h (100%)
The same.
> 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).
> rename arch/arm/{plat-samsung => mach-s3c}/cpu.c (100%)
> rename arch/arm/{mach-s3c24xx => mach-s3c}/cpufreq-utils.c (100%)
Suffix.
> rename arch/arm/{mach-s3c64xx => mach-s3c}/cpuidle.c (100%)
Suffix.
> rename arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h (100%)
> rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-audio.c (100%)
Suffix.
> rename arch/arm/{mach-s3c64xx => mach-s3c}/dev-backlight.c (100%)
Suffix.
> 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.
> 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.
> rename arch/arm/{mach-s3c24xx => mach-s3c}/include/mach/io.h (100%)
Suffix.
> 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%)
Suffix.
> 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%)
Suffix.
> 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%)
Suffix.
> rename arch/arm/{mach-s3c64xx => mach-s3c}/onenand-core.h (100%)
Suffix.
> 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%)
Suffix to all regs above.
> 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%)
Suffix to all setup above.
> 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.
> rename arch/arm/{mach-s3c64xx => mach-s3c}/setup-usb-phy.c (100%)
Suffix.
> 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.
> 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
