| Message ID | 20200831154751.7551-1-krzk@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] ARM: mach: samsung: S3C cleanup for v5.10 | expand |
On Mon, Aug 31, 2020 at 05:47:51PM +0200, Krzysztof Kozlowski wrote: > Hi, > > I applied Arnd's series for Samsung S3C cleanup, plus multiple fixes from me > and other developers. This also pulls branch from Mark Brown. > > Best regards, > Krzysztof > > > The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5: > > Linux 5.9-rc1 (2020-08-16 13:04:57 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-s3c-5.10 > > for you to fetch changes up to a1342f6a9ff88ad88ff7a981c53ae0869c94d243: > > ARM: s3c: Avoid naming clash of S3C24xx and S3C64xx timer setup (2020-08-28 16:38:55 +0200) > > ---------------------------------------------------------------- > Samsung S3C24xx and S3C64xx machine code cleanup for v5.10 > > Big cleanup for the Samsung S3C24xx and S3C64xx platforms, although it > also touches files shared with S5Pv210 and Exynos. This is mostly Arnd > Bergmann work which Krzysztof Kozlowski took over, rebased and polished. > > The goal is to cleanup, merge and finally make the Samsung S3C24xx and > S3C64xx architectures multiplatform. The multiplatform did not happen > yet here - just cleaning up and merging into one arch/arm/mach-s3c > directory. However this is step forward for multiplatform or at least > to keep this code still maintainable. > > This pulls also branch with changes for Samsung SoC sound drivers from > broonie/sound because the cleanups there were part of this series and > all further patches depend on them. Hi Arnd and Olof, +Cc Ulf, This might conflict with Ulf Hansson's mmc tree around MMC_SDHCI_S3C. Possible resolution: -depends on PLAT_SAMSUNG || COMPILE_TEST +depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST Best regards, Krzysztof
Hi, I applied Arnd's series for Samsung S3C cleanup, plus multiple fixes from me and other developers. This also pulls branch from Mark Brown. Best regards, Krzysztof The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5: Linux 5.9-rc1 (2020-08-16 13:04:57 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-s3c-5.10 for you to fetch changes up to a1342f6a9ff88ad88ff7a981c53ae0869c94d243: ARM: s3c: Avoid naming clash of S3C24xx and S3C64xx timer setup (2020-08-28 16:38:55 +0200) ---------------------------------------------------------------- Samsung S3C24xx and S3C64xx machine code cleanup for v5.10 Big cleanup for the Samsung S3C24xx and S3C64xx platforms, although it also touches files shared with S5Pv210 and Exynos. This is mostly Arnd Bergmann work which Krzysztof Kozlowski took over, rebased and polished. The goal is to cleanup, merge and finally make the Samsung S3C24xx and S3C64xx architectures multiplatform. The multiplatform did not happen yet here - just cleaning up and merging into one arch/arm/mach-s3c directory. However this is step forward for multiplatform or at least to keep this code still maintainable. This pulls also branch with changes for Samsung SoC sound drivers from broonie/sound because the cleanups there were part of this series and all further patches depend on them. ---------------------------------------------------------------- Arnd Bergmann (37): ARM: s3c24xx: fix mmc gpio lookup tables ARM: s3c24xx: iotiming: make functions static ARM: s3c24xx: make S3C24XX_MISCCR access indirect ARM: s3c24xx: simplify mach/io.h usb: gadget: s3c: use platform resources usb: gadget: s3c-hsudc: remove platform header dependency ARM: samsung: don't build plat/pm-common for Exynos ARM: samsung: remove s3c_pm_debug_init() ARM: samsung: make pm-debug platform independent ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug ARM: exynos: use private samsung_cpu_id copy ARM: exynos: stop selecting PLAT_SAMSUNG ASoC: samsung: h1940: turn into platform driver ASoC: samsung: neo1973: turn into platform driver ASoC: samsung: rx1950: turn into platform driver ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS ARM: samsung: move pm check code to drivers/soc ARM: s5pv210: use private pm save/restore ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG ARM: s3c64xx: remove mach/hardware.h ARM: s3c24xx: move regs-spi.h into spi driver ARM: s3c24xx: move irqchip driver back into platform ARM: s3c: adc: move header to linux/soc/samsung ARM: s3c24xx: move spi fiq handler into platform ARM: s3c24xx: move iis pinctrl config into boards ARM: s3c24xx: move s3cmci pinctrl handling into board files ARM: s3c24xx: include mach/irqs.h where needed ARM: s3c24xx: spi: avoid hardcoding fiq number in driver ARM: s3c24xx: bast: avoid irq_desc array usage fbdev: s3c2410fb: remove mach header dependency cpufreq: s3c24xx: split out registers ARM: s3c: remove cpufreq header dependencies cpufreq: s3c2412: use global s3c2412_cpufreq_setrefresh cpufreq: s3c24xx: move low-level clk reg access into platform code ARM: s3c24xx: stop including mach/hardware.h from mach/io.h ARM: s3c: move into a common directory ARM: s3c: make headers local if possible Krzysztof Kozlowski (24): MAINTAINERS: drop Vincent Sanders from Simtec S3C boards MAINTAINERS: add more name matches for Samsung SoC entries ARM: s3c64xx: include header to fix -Wmissing-prototypes ARM: s3c24xx: demote kerneldoc comment ARM: samsung: fix language typo clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared header clk: samsung: s3c24xx: declare s3c24xx_common_clk_init() in shared header ARM: s3c: remove plat-samsung/.../samsung-time.h ARM: s3c24xx: include common.h header in s3c2443.c ARM: s3c24xx: sdhci: include plat/sdhci.h header ARM: s3c24xx: ts: include platform data header ARM: s3c24xx: ts: document function argument ARM: s3c: remove unneeded machine header includes mmc: s3cmci: remove unneeded machine header include ARM: samsung: fix kerneldoc of s3c_pm_do_restore_core() ARM: s3c24xx: drop s3c-camif setup platform code ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies ARM: s3c64xx: switch to generic watchdog driver reset ARM: s3c24xx: fix missing system reset ARM: s3c24xx: pass pointer to clk driver via platform data usb: gadget: s3c: remove unused 'udc' variable Merge tag 'samsung-platdrv-boards' of https://git.kernel.org/.../broonie/sound into next/soc-s3c-cleanup ARM: s3c: Cleanup from old plat-samsung include ARM: s3c: Avoid naming clash of S3C24xx and S3C64xx timer setup Qinglang Miao (1): ARM: s3c64xx: fix return value check in s3c_usb_otgphy_init() Stephen Kitt (1): ARM: s3c64xx: use simple i2c probe function MAINTAINERS | 24 +-- arch/arm/Kconfig | 8 +- arch/arm/Kconfig.debug | 18 +- arch/arm/Makefile | 7 +- arch/arm/mach-exynos/Kconfig | 1 - arch/arm/mach-exynos/Makefile | 4 - arch/arm/mach-exynos/common.h | 6 +- arch/arm/mach-exynos/exynos.c | 21 +- arch/arm/mach-exynos/include/mach/map.h | 18 -- arch/arm/mach-exynos/platsmp.c | 4 +- arch/arm/mach-exynos/pm.c | 8 +- arch/arm/{plat-samsung => mach-s3c}/Kconfig | 72 +------ .../Kconfig => mach-s3c/Kconfig.s3c24xx} | 13 -- .../Kconfig => mach-s3c/Kconfig.s3c64xx} | 5 +- arch/arm/{plat-samsung => mach-s3c}/Makefile | 16 +- arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot | 0 .../Makefile => mach-s3c/Makefile.s3c24xx} | 22 ++- .../Makefile => mach-s3c/Makefile.s3c64xx} | 36 ++-- .../include/plat => mach-s3c}/adc-core.h | 0 arch/arm/{plat-samsung => mach-s3c}/adc.c | 4 +- arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h | 0 .../ata-core.h => mach-s3c/ata-core-s3c64xx.h} | 6 +- .../backlight.h => mach-s3c/backlight-s3c64xx.h} | 6 +- arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c | 3 +- arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c | 8 +- arch/arm/{mach-s3c24xx => mach-s3c}/bast.h | 0 .../common-smdk-s3c24xx.c} | 13 +- .../common-smdk-s3c24xx.h} | 0 arch/arm/{plat-samsung => mach-s3c}/cpu.c | 21 +- .../{plat-samsung/include/plat => mach-s3c}/cpu.h | 12 -- .../cpufreq-utils-s3c24xx.c} | 40 +++- .../cpuidle.c => mach-s3c/cpuidle-s3c64xx.c} | 8 +- arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h | 2 +- .../dev-audio.c => mach-s3c/dev-audio-s3c64xx.c} | 9 +- .../dev-backlight-s3c64xx.c} | 6 +- .../dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} | 5 +- arch/arm/{plat-samsung => mach-s3c}/dev-uart.c | 2 +- arch/arm/{plat-samsung => mach-s3c}/devs.c | 57 ++++-- .../{plat-samsung/include/plat => mach-s3c}/devs.h | 0 .../include/mach/dma.h => mach-s3c/dma-s3c24xx.h} | 0 .../include/mach/dma.h => mach-s3c/dma-s3c64xx.h} | 0 arch/arm/mach-s3c/dma.h | 9 + .../fb-core.h => mach-s3c/fb-core-s3c24xx.h} | 6 +- .../{plat-samsung/include/plat => mach-s3c}/fb.h | 0 .../include/plat => mach-s3c}/gpio-cfg-helpers.h | 0 .../include/plat => mach-s3c}/gpio-cfg.h | 0 .../include/plat => mach-s3c}/gpio-core.h | 2 +- .../gpio-samsung-s3c24xx.h} | 2 + .../gpio-samsung-s3c64xx.h} | 0 arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c | 18 +- arch/arm/mach-s3c/gpio-samsung.h | 9 + arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h | 2 +- .../{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c | 7 +- arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h | 0 .../hardware.h => mach-s3c/hardware-s3c24xx.h} | 13 +- .../include/plat => mach-s3c}/iic-core.h | 0 arch/arm/mach-s3c/include/mach/io-s3c24xx.h | 50 +++++ arch/arm/mach-s3c/include/mach/io.h | 8 + .../include/mach/irqs-s3c24xx.h} | 0 .../include/mach/irqs-s3c64xx.h} | 0 arch/arm/mach-s3c/include/mach/irqs.h | 9 + .../plat => mach-s3c/include/mach}/map-base.h | 0 arch/arm/{plat-samsung => mach-s3c}/init.c | 4 +- .../{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c | 14 +- .../{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c | 6 +- .../irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} | 16 +- .../irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} | 8 +- arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c | 9 + .../arm/mach-s3c/irq-s3c24xx-fiq.S | 10 +- .../irqchip => arch/arm/mach-s3c}/irq-s3c24xx.c | 23 ++- .../irq-uart.h => mach-s3c/irq-uart-s3c64xx.h} | 0 .../include/plat => mach-s3c}/keypad.h | 0 .../arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c | 41 ++-- arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c | 17 +- arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c | 23 +-- .../{mach-s3c24xx => mach-s3c}/mach-at2440evb.c | 31 +-- arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c | 25 ++- .../mach-crag6410-module.c | 7 +- .../arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c | 37 ++-- arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c | 60 ++++-- arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c | 73 +++++-- arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c | 19 +- arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c | 30 +-- .../arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c | 45 +++-- .../arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c | 30 ++- arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c | 39 ++-- arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c | 17 +- .../arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c | 23 ++- .../{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c | 4 +- arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c | 27 ++- arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c | 19 +- arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c | 41 ++-- .../arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c | 26 ++- arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c | 60 ++++-- arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c | 29 +-- .../{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c | 8 +- .../{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c | 23 +-- arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c | 21 +- arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h | 0 arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c | 20 +- arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c | 20 +- .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c | 19 +- .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c | 30 +-- .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c | 28 ++- .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c | 30 +-- .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c | 19 +- .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c | 17 +- .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c | 35 ++-- .../{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c | 27 ++- arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c | 18 +- arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c | 23 +-- .../include/plat => mach-s3c}/map-s3c.h | 12 +- .../include/mach/map.h => mach-s3c/map-s3c24xx.h} | 6 +- .../include/mach/map.h => mach-s3c/map-s3c64xx.h} | 4 +- .../include/plat => mach-s3c}/map-s5p.h | 4 +- arch/arm/mach-s3c/map.h | 9 + .../nand-core.h => mach-s3c/nand-core-s3c24xx.h} | 6 +- .../onenand-core-s3c64xx.h} | 6 +- 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 | 6 +- arch/arm/{plat-samsung => mach-s3c}/platformdata.c | 4 +- arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c | 4 +- .../pll-s3c2440-12000000.c | 4 +- .../pll-s3c2440-16934400.c | 4 +- arch/arm/{plat-samsung => mach-s3c}/pm-common.c | 4 +- arch/arm/mach-s3c/pm-common.h | 40 ++++ .../mach/pm-core.h => mach-s3c/pm-core-s3c24xx.h} | 10 +- .../mach/pm-core.h => mach-s3c/pm-core-s3c64xx.h} | 50 +---- arch/arm/mach-s3c/pm-core.h | 9 + arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c | 6 +- arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S | 5 +- arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c | 11 +- arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c | 12 +- arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c | 6 +- .../{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} | 14 +- .../{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} | 74 +++++-- arch/arm/{plat-samsung => mach-s3c}/pm.c | 20 +- .../{plat-samsung/include/plat => mach-s3c}/pm.h | 2 +- .../include/plat => mach-s3c}/pwm-core.h | 0 .../include/plat => mach-s3c}/regs-adc.h | 0 .../regs-clock.h => mach-s3c/regs-clock-s3c24xx.h} | 2 + .../regs-clock.h => mach-s3c/regs-clock-s3c64xx.h} | 0 arch/arm/mach-s3c/regs-clock.h | 9 + .../regs-dsc.h => mach-s3c/regs-dsc-s3c24xx.h} | 6 +- .../regs-gpio-memport-s3c64xx.h} | 0 .../regs-gpio.h => mach-s3c/regs-gpio-s3c24xx.h} | 2 + .../regs-gpio.h => mach-s3c/regs-gpio-s3c64xx.h} | 0 arch/arm/mach-s3c/regs-gpio.h | 9 + .../regs-irq.h => mach-s3c/regs-irq-s3c24xx.h} | 2 + .../regs-irq.h => mach-s3c/regs-irq-s3c64xx.h} | 0 arch/arm/mach-s3c/regs-irq.h | 9 + .../include/plat => mach-s3c}/regs-irqtype.h | 0 .../regs-mem.h => mach-s3c/regs-mem-s3c24xx.h} | 2 + .../regs-modem.h => mach-s3c/regs-modem-s3c64xx.h} | 0 .../include/mach => mach-s3c}/regs-s3c2443-clock.h | 50 +++++ .../regs-srom.h => mach-s3c/regs-srom-s3c64xx.h} | 0 .../regs-sys.h => mach-s3c/regs-sys-s3c64xx.h} | 0 .../regs-syscon-power-s3c64xx.h} | 0 .../regs-usb-hsotg-phy-s3c64xx.h} | 0 .../rtc-core.h => mach-s3c/rtc-core-s3c24xx.h} | 6 +- arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c | 21 +- .../arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h | 0 arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c | 24 ++- .../include/mach => mach-s3c}/s3c2412.h | 2 + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c | 34 ++-- arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c | 17 +- arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c | 17 +- arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c | 28 +-- arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c | 20 +- .../{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} | 31 +-- .../{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} | 26 ++- arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c | 16 +- arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c | 21 +- .../{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} | 47 ++--- .../{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} | 17 +- .../include/plat => mach-s3c}/sdhci.h | 2 +- .../setup-fb-24bpp-s3c64xx.c} | 6 +- .../setup-i2c.c => mach-s3c/setup-i2c-s3c24xx.c} | 8 +- .../setup-i2c0.c => mach-s3c/setup-i2c0-s3c64xx.c} | 4 +- .../setup-i2c1.c => mach-s3c/setup-i2c1-s3c64xx.c} | 4 +- .../setup-ide.c => mach-s3c/setup-ide-s3c64xx.c} | 9 +- .../setup-keypad-s3c64xx.c} | 6 +- .../setup-sdhci-gpio-s3c24xx.c} | 7 +- .../setup-sdhci-gpio-s3c64xx.c} | 6 +- .../setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} | 6 +- .../setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} | 5 +- .../setup-ts.c => mach-s3c/setup-ts-s3c24xx.c} | 8 +- .../setup-usb-phy-s3c64xx.c} | 12 +- arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c | 11 +- arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c | 2 +- arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c | 10 +- arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c | 6 +- arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h | 0 .../arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S | 9 +- .../arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S | 5 +- .../sleep.S => mach-s3c/sleep-s3c24xx.S} | 7 +- .../sleep.S => mach-s3c/sleep-s3c64xx.S} | 4 +- .../spi-core.h => mach-s3c/spi-core-s3c24xx.h} | 6 +- .../include/plat => mach-s3c}/usb-phy.h | 0 arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h | 0 arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c | 4 +- .../include/plat => mach-s3c}/wakeup-mask.h | 0 arch/arm/mach-s3c24xx/include/mach/fb.h | 2 - arch/arm/mach-s3c24xx/include/mach/io.h | 212 --------------------- arch/arm/mach-s3c24xx/setup-camif.c | 67 ------- arch/arm/mach-s3c64xx/include/mach/hardware.h | 17 -- arch/arm/mach-s3c64xx/watchdog-reset.h | 16 -- arch/arm/mach-s5pv210/Kconfig | 2 +- arch/arm/mach-s5pv210/Makefile | 7 - arch/arm/mach-s5pv210/pm.c | 51 ++++- arch/arm/mach-s5pv210/regs-clock.h | 4 +- arch/arm/mach-s5pv210/s5pv210.c | 2 - arch/arm/plat-samsung/include/plat/samsung-time.h | 26 --- arch/arm/plat-samsung/watchdog-reset.c | 93 --------- arch/arm64/Kconfig.platforms | 1 - drivers/clk/samsung/clk-s3c2410-dclk.c | 15 +- drivers/clk/samsung/clk-s3c2410.c | 1 + drivers/clk/samsung/clk-s3c2412.c | 1 + drivers/clk/samsung/clk-s3c2443.c | 1 + drivers/clk/samsung/clk-s3c64xx.c | 1 + drivers/cpufreq/Kconfig.arm | 2 - drivers/cpufreq/s3c2410-cpufreq.c | 10 +- drivers/cpufreq/s3c2412-cpufreq.c | 44 ++--- drivers/cpufreq/s3c2440-cpufreq.c | 29 ++- drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 2 +- drivers/cpufreq/s3c24xx-cpufreq.c | 14 +- drivers/hwmon/s3c-hwmon.c | 2 +- drivers/input/touchscreen/s3c2410_ts.c | 37 +++- drivers/irqchip/Makefile | 1 - drivers/leds/leds-s3c24xx.c | 2 - drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/s3cmci.c | 72 ++----- drivers/power/supply/s3c_adc_battery.c | 2 +- drivers/pwm/Kconfig | 2 +- drivers/soc/samsung/Kconfig | 48 ++++- drivers/soc/samsung/Makefile | 3 + .../soc/samsung/s3c-pm-check.c | 2 +- .../soc/samsung/s3c-pm-debug.c | 26 +-- drivers/spi/Kconfig | 2 +- drivers/spi/Makefile | 1 - .../regs-spi.h => drivers/spi/spi-s3c24xx-regs.h | 9 +- drivers/spi/spi-s3c24xx.c | 28 +-- drivers/tty/serial/Kconfig | 2 +- drivers/usb/gadget/udc/s3c-hsudc.c | 55 +----- drivers/usb/gadget/udc/s3c2410_udc.c | 34 ++-- drivers/usb/gadget/udc/s3c2410_udc.h | 1 + .../usb/gadget/udc/s3c2410_udc_regs.h | 0 .../video/fbdev/s3c2410fb-regs-lcd.h | 28 +-- drivers/video/fbdev/s3c2410fb.c | 16 +- drivers/watchdog/Kconfig | 10 +- include/linux/clk/samsung.h | 56 ++++++ include/linux/platform_data/clk-s3c2410.h | 19 ++ .../linux/platform_data}/fb-s3c2410.h | 33 +++- include/linux/platform_data/mmc-s3cmci.h | 2 + include/linux/platform_data/s3c-hsudc.h | 2 + .../adc.h => include/linux/soc/samsung/s3c-adc.h | 6 +- .../linux/soc/samsung/s3c-cpu-freq.h | 4 + .../linux/soc/samsung/s3c-cpufreq-core.h | 14 +- .../linux/soc/samsung/s3c-pm.h | 69 +++---- .../linux/spi/s3c24xx-fiq.h | 10 + include/linux/spi/s3c24xx.h | 2 +- include/media/drv-intf/s3c_camif.h | 4 - sound/soc/samsung/Kconfig | 2 +- sound/soc/samsung/h1940_uda1380.c | 71 +++---- sound/soc/samsung/neo1973_wm8753.c | 85 +++------ sound/soc/samsung/rx1950_uda1380.c | 72 +++---- sound/soc/samsung/s3c-i2s-v2.c | 3 +- sound/soc/samsung/s3c-i2s-v2.h | 3 +- sound/soc/samsung/s3c2412-i2s.c | 9 +- sound/soc/samsung/s3c24xx-i2s.c | 7 - 271 files changed, 2013 insertions(+), 2133 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/map.h rename arch/arm/{plat-samsung => mach-s3c}/Kconfig (69%) rename arch/arm/{mach-s3c24xx/Kconfig => mach-s3c/Kconfig.s3c24xx} (97%) rename arch/arm/{mach-s3c64xx/Kconfig => mach-s3c/Kconfig.s3c64xx} (98%) rename arch/arm/{plat-samsung => mach-s3c}/Makefile (62%) rename arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot (100%) rename arch/arm/{mach-s3c24xx/Makefile => mach-s3c/Makefile.s3c24xx} (81%) rename arch/arm/{mach-s3c64xx/Makefile => mach-s3c/Makefile.s3c64xx} (56%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/adc-core.h (100%) rename arch/arm/{plat-samsung => mach-s3c}/adc.c (99%) rename arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h (100%) rename arch/arm/{mach-s3c64xx/ata-core.h => mach-s3c/ata-core-s3c64xx.h} (78%) rename arch/arm/{mach-s3c64xx/backlight.h => mach-s3c/backlight-s3c64xx.h} (78%) rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c (97%) rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c (95%) rename arch/arm/{mach-s3c24xx => mach-s3c}/bast.h (100%) rename arch/arm/{mach-s3c24xx/common-smdk.c => mach-s3c/common-smdk-s3c24xx.c} (96%) rename arch/arm/{mach-s3c24xx/common-smdk.h => mach-s3c/common-smdk-s3c24xx.h} (100%) rename arch/arm/{plat-samsung => mach-s3c}/cpu.c (62%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/cpu.h (89%) rename arch/arm/{mach-s3c24xx/cpufreq-utils.c => mach-s3c/cpufreq-utils-s3c24xx.c} (68%) rename arch/arm/{mach-s3c64xx/cpuidle.c => mach-s3c/cpuidle-s3c64xx.c} (92%) rename arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h (95%) rename arch/arm/{mach-s3c64xx/dev-audio.c => mach-s3c/dev-audio-s3c64xx.c} (97%) rename arch/arm/{mach-s3c64xx/dev-backlight.c => mach-s3c/dev-backlight-s3c64xx.c} (98%) rename arch/arm/{mach-s3c64xx/dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} (95%) rename arch/arm/{plat-samsung => mach-s3c}/dev-uart.c (97%) rename arch/arm/{plat-samsung => mach-s3c}/devs.c (96%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/devs.h (100%) rename arch/arm/{mach-s3c24xx/include/mach/dma.h => mach-s3c/dma-s3c24xx.h} (100%) rename arch/arm/{mach-s3c64xx/include/mach/dma.h => mach-s3c/dma-s3c64xx.h} (100%) create mode 100644 arch/arm/mach-s3c/dma.h rename arch/arm/{mach-s3c24xx/fb-core.h => mach-s3c/fb-core-s3c24xx.h} (78%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/fb.h (100%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg-helpers.h (100%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg.h (100%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-core.h (99%) rename arch/arm/{mach-s3c24xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c24xx.h} (99%) rename arch/arm/{mach-s3c64xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c64xx.h} (100%) rename arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c (99%) create mode 100644 arch/arm/mach-s3c/gpio-samsung.h rename arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h (94%) rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c (96%) rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h (100%) rename arch/arm/{mach-s3c24xx/include/mach/hardware.h => mach-s3c/hardware-s3c24xx.h} (54%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/iic-core.h (100%) create mode 100644 arch/arm/mach-s3c/include/mach/io-s3c24xx.h create mode 100644 arch/arm/mach-s3c/include/mach/io.h 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/{plat-samsung/include/plat => mach-s3c/include/mach}/map-base.h (100%) rename arch/arm/{plat-samsung => mach-s3c}/init.c (98%) rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c (97%) rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c (98%) rename arch/arm/{mach-s3c24xx/irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} (93%) rename arch/arm/{mach-s3c64xx/irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} (97%) create mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c rename drivers/spi/spi-s3c24xx-fiq.S => arch/arm/mach-s3c/irq-s3c24xx-fiq.S (94%) rename {drivers/irqchip => arch/arm/mach-s3c}/irq-s3c24xx.c (99%) rename arch/arm/{mach-s3c64xx/irq-uart.h => mach-s3c/irq-uart-s3c64xx.h} (100%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/keypad.h (100%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c (83%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c (97%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c (93%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-at2440evb.c (87%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c (97%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410-module.c (98%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c (97%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c (89%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c (92%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c (95%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c (97%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c (94%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c (95%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c (94%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c (87%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c (90%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c (98%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c (96%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c (88%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c (88%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c (95%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c (92%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c (89%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c (92%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c (70%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c (96%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h (100%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c (91%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c (92%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c (86%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c (86%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c (93%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c (87%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c (90%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c (87%) rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c (97%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c (81%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c (96%) rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c (88%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s3c.h (87%) rename arch/arm/{mach-s3c24xx/include/mach/map.h => mach-s3c/map-s3c24xx.h} (97%) rename arch/arm/{mach-s3c64xx/include/mach/map.h => mach-s3c/map-s3c64xx.h} (98%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s5p.h (85%) create mode 100644 arch/arm/mach-s3c/map.h rename arch/arm/{mach-s3c24xx/nand-core.h => mach-s3c/nand-core-s3c24xx.h} (77%) rename arch/arm/{mach-s3c64xx/onenand-core.h => mach-s3c/onenand-core-s3c64xx.h} (82%) 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 (98%) rename arch/arm/{plat-samsung => mach-s3c}/platformdata.c (96%) rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c (97%) rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-12000000.c (97%) rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-16934400.c (98%) rename arch/arm/{plat-samsung => mach-s3c}/pm-common.c (95%) create mode 100644 arch/arm/mach-s3c/pm-common.h rename arch/arm/{mach-s3c24xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c24xx.h} (94%) rename arch/arm/{mach-s3c64xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c64xx.h} (58%) create mode 100644 arch/arm/mach-s3c/pm-core.h rename arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c (99%) rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S (80%) rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c (96%) rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c (94%) rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c (95%) rename arch/arm/{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} (93%) rename arch/arm/{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} (81%) rename arch/arm/{plat-samsung => mach-s3c}/pm.c (94%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pm.h (98%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pwm-core.h (100%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-adc.h (100%) rename arch/arm/{mach-s3c24xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c24xx.h} (99%) rename arch/arm/{mach-s3c64xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c64xx.h} (100%) create mode 100644 arch/arm/mach-s3c/regs-clock.h rename arch/arm/{mach-s3c24xx/regs-dsc.h => mach-s3c/regs-dsc-s3c24xx.h} (77%) rename arch/arm/{mach-s3c64xx/regs-gpio-memport.h => mach-s3c/regs-gpio-memport-s3c64xx.h} (100%) rename arch/arm/{mach-s3c24xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c24xx.h} (99%) rename arch/arm/{mach-s3c64xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c64xx.h} (100%) create mode 100644 arch/arm/mach-s3c/regs-gpio.h rename arch/arm/{mach-s3c24xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c24xx.h} (98%) rename arch/arm/{mach-s3c64xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c64xx.h} (100%) create mode 100644 arch/arm/mach-s3c/regs-irq.h rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-irqtype.h (100%) rename arch/arm/{mach-s3c24xx/regs-mem.h => mach-s3c/regs-mem-s3c24xx.h} (98%) rename arch/arm/{mach-s3c64xx/regs-modem.h => mach-s3c/regs-modem-s3c64xx.h} (100%) rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/regs-s3c2443-clock.h (81%) rename arch/arm/{mach-s3c64xx/regs-srom.h => mach-s3c/regs-srom-s3c64xx.h} (100%) rename arch/arm/{mach-s3c64xx/regs-sys.h => mach-s3c/regs-sys-s3c64xx.h} (100%) rename arch/arm/{mach-s3c64xx/regs-syscon-power.h => mach-s3c/regs-syscon-power-s3c64xx.h} (100%) rename arch/arm/{mach-s3c64xx/regs-usb-hsotg-phy.h => mach-s3c/regs-usb-hsotg-phy-s3c64xx.h} (100%) rename arch/arm/{mach-s3c24xx/include/mach/rtc-core.h => mach-s3c/rtc-core-s3c24xx.h} (81%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c (90%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h (100%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c (93%) rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/s3c2412.h (96%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c (86%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c (85%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c (82%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c (86%) rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c (91%) rename arch/arm/{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} (97%) rename arch/arm/{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} (85%) rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c (88%) rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c (87%) rename arch/arm/{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} (92%) rename arch/arm/{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} (80%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/sdhci.h (99%) rename arch/arm/{mach-s3c64xx/setup-fb-24bpp.c => mach-s3c/setup-fb-24bpp-s3c64xx.c} (86%) rename arch/arm/{mach-s3c24xx/setup-i2c.c => mach-s3c/setup-i2c-s3c24xx.c} (79%) rename arch/arm/{mach-s3c64xx/setup-i2c0.c => mach-s3c/setup-i2c0-s3c64xx.c} (90%) rename arch/arm/{mach-s3c64xx/setup-i2c1.c => mach-s3c/setup-i2c1-s3c64xx.c} (90%) rename arch/arm/{mach-s3c64xx/setup-ide.c => mach-s3c/setup-ide-s3c64xx.c} (89%) rename arch/arm/{mach-s3c64xx/setup-keypad.c => mach-s3c/setup-keypad-s3c64xx.c} (86%) rename arch/arm/{mach-s3c24xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c24xx.c} (89%) rename arch/arm/{mach-s3c64xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c64xx.c} (95%) rename arch/arm/{mach-s3c24xx/setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} (85%) rename arch/arm/{mach-s3c64xx/setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} (83%) rename arch/arm/{mach-s3c24xx/setup-ts.c => mach-s3c/setup-ts-s3c24xx.c} (81%) rename arch/arm/{mach-s3c64xx/setup-usb-phy.c => mach-s3c/setup-usb-phy-s3c64xx.c} (92%) rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c (86%) rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c (98%) rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c (91%) rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c (96%) rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h (100%) rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S (90%) rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S (93%) rename arch/arm/{mach-s3c24xx/sleep.S => mach-s3c/sleep-s3c24xx.S} (92%) rename arch/arm/{mach-s3c64xx/sleep.S => mach-s3c/sleep-s3c64xx.S} (97%) rename arch/arm/{mach-s3c24xx/spi-core.h => mach-s3c/spi-core-s3c24xx.h} (81%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/usb-phy.h (100%) rename arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h (100%) rename arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c (94%) rename arch/arm/{plat-samsung/include/plat => mach-s3c}/wakeup-mask.h (100%) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h delete mode 100644 arch/arm/mach-s3c24xx/include/mach/io.h delete mode 100644 arch/arm/mach-s3c24xx/setup-camif.c delete mode 100644 arch/arm/mach-s3c64xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-s3c64xx/watchdog-reset.h delete mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h delete mode 100644 arch/arm/plat-samsung/watchdog-reset.c rename arch/arm/plat-samsung/pm-check.c => drivers/soc/samsung/s3c-pm-check.c (99%) rename arch/arm/plat-samsung/pm-debug.c => drivers/soc/samsung/s3c-pm-debug.c (78%) rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (89%) rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (100%) rename arch/arm/mach-s3c24xx/include/mach/regs-lcd.h => drivers/video/fbdev/s3c2410fb-regs-lcd.h (84%) create mode 100644 include/linux/clk/samsung.h create mode 100644 include/linux/platform_data/clk-s3c2410.h rename {arch/arm/plat-samsung/include/plat => include/linux/platform_data}/fb-s3c2410.h (57%) rename arch/arm/plat-samsung/include/plat/adc.h => include/linux/soc/samsung/s3c-adc.h (85%) rename arch/arm/plat-samsung/include/plat/cpu-freq.h => include/linux/soc/samsung/s3c-cpu-freq.h (97%) rename arch/arm/plat-samsung/include/plat/cpu-freq-core.h => include/linux/soc/samsung/s3c-cpufreq-core.h (95%) rename arch/arm/plat-samsung/include/plat/pm-common.h => include/linux/soc/samsung/s3c-pm.h (55%) rename drivers/spi/spi-s3c24xx-fiq.h => include/linux/spi/s3c24xx-fiq.h (66%)