tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/

This patch moves S3C2443 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.

Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

Kukjin Kim 84c028b9 dd6f01b5

+35 -54
-1
arch/arm/Kconfig
··· 1072 1072 source "arch/arm/mach-s3c2412/Kconfig" 1073 1073 source "arch/arm/mach-s3c2416/Kconfig" 1074 1074 source "arch/arm/mach-s3c2440/Kconfig" 1075 - source "arch/arm/mach-s3c2443/Kconfig" 1076 1075 endif 1077 1076 1078 1077 if ARCH_S3C64XX
+1 -1
arch/arm/Makefile
··· 175 175 machine-$(CONFIG_ARCH_PXA) := pxa 176 176 machine-$(CONFIG_ARCH_REALVIEW) := realview 177 177 machine-$(CONFIG_ARCH_RPC) := rpc 178 - machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 s3c2443 178 + machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 179 179 machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx 180 180 machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 181 181 machine-$(CONFIG_ARCH_S5PC100) := s5pc100
-32
arch/arm/mach-s3c2443/Kconfig
··· 1 - # Copyright 2007 Simtec Electronics 2 - # 3 - # Licensed under GPLv2 4 - 5 - config CPU_S3C2443 6 - bool 7 - depends on ARCH_S3C24XX 8 - select CPU_ARM920T 9 - select S3C2443_DMA if S3C2410_DMA 10 - select CPU_LLSERIAL_S3C2440 11 - select SAMSUNG_CLKSRC 12 - select S3C2443_CLOCK 13 - help 14 - Support for the S3C2443 SoC from the S3C24XX line 15 - 16 - config S3C2443_DMA 17 - bool 18 - depends on CPU_S3C2443 19 - help 20 - Internal config node for S3C2443 DMA support 21 - 22 - menu "S3C2443 Machines" 23 - 24 - config MACH_SMDK2443 25 - bool "SMDK2443" 26 - select CPU_S3C2443 27 - select MACH_SMDK 28 - select S3C_DEV_HSMMC1 29 - help 30 - Say Y here if you are using an SMDK2443 31 - 32 - endmenu
-20
arch/arm/mach-s3c2443/Makefile
··· 1 - # arch/arm/mach-s3c2443/Makefile 2 - # 3 - # Copyright 2007 Simtec Electronics 4 - # 5 - # Licensed under GPLv2 6 - 7 - obj-y := 8 - obj-m := 9 - obj-n := 10 - obj- := 11 - 12 - obj-$(CONFIG_CPU_S3C2443) += s3c2443.o 13 - obj-$(CONFIG_CPU_S3C2443) += irq.o 14 - obj-$(CONFIG_CPU_S3C2443) += clock.o 15 - 16 - obj-$(CONFIG_S3C2443_DMA) += dma.o 17 - 18 - # Machine support 19 - 20 - obj-$(CONFIG_MACH_SMDK2443) += mach-smdk2443.o
arch/arm/mach-s3c2443/clock.c arch/arm/mach-s3c24xx/clock-s3c2443.c
arch/arm/mach-s3c2443/dma.c arch/arm/mach-s3c24xx/dma-s3c2443.c
arch/arm/mach-s3c2443/irq.c arch/arm/mach-s3c24xx/irq-s3c2443.c
arch/arm/mach-s3c2443/mach-smdk2443.c arch/arm/mach-s3c24xx/mach-smdk2443.c
arch/arm/mach-s3c2443/s3c2443.c arch/arm/mach-s3c24xx/s3c2443.c
+29
arch/arm/mach-s3c24xx/Kconfig
··· 70 70 def_bool y 71 71 depends on CPU_S3C2440 || CPU_S3C2442 72 72 73 + config CPU_S3C2443 74 + bool "SAMSUNG S3C2443" 75 + depends on ARCH_S3C24XX 76 + select CPU_ARM920T 77 + select CPU_LLSERIAL_S3C2440 78 + select SAMSUNG_CLKSRC 79 + select S3C2443_CLOCK 80 + select S3C2443_DMA if S3C24XX_DMA 81 + help 82 + Support for the S3C2443 SoC from the S3C24XX line 83 + 73 84 if CPU_S3C2410 74 85 75 86 config S3C2410_DMA ··· 470 459 bool "SMDM2440 with S3C2442 CPU module" 471 460 472 461 endif # CPU_S3C2440 462 + 463 + if CPU_S3C2443 464 + 465 + config S3C2443_DMA 466 + bool 467 + help 468 + Internal config node for S3C2443 DMA support 469 + 470 + comment "S3C2443 Boards" 471 + 472 + config MACH_SMDK2443 473 + bool "SMDK2443" 474 + select MACH_SMDK 475 + select S3C_DEV_HSMMC1 476 + help 477 + Say Y here if you are using an SMDK2443 478 + 479 + endif # CPU_S3C2443 473 480 474 481 endmenu # SAMSUNG S3C24XX SoCs Support 475 482
+5
arch/arm/mach-s3c24xx/Makefile
··· 31 31 obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o 32 32 obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o 33 33 34 + obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o 35 + obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o 36 + 34 37 # 35 38 # machine support 36 39 # following is ordered alphabetically by option text. ··· 68 65 69 66 obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o 70 67 obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o 68 + 69 + obj-$(CONFIG_MACH_SMDK2443) += mach-smdk2443.o 71 70 72 71 # common bits of machine support 73 72