Skip to content

Commit

Permalink
ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kukjin Kim committed Mar 2, 2012
1 parent dd6f01b commit 84c028b
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 54 deletions.
1 change: 0 additions & 1 deletion arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,6 @@ if ARCH_S3C24XX
source "arch/arm/mach-s3c2412/Kconfig"
source "arch/arm/mach-s3c2416/Kconfig"
source "arch/arm/mach-s3c2440/Kconfig"
source "arch/arm/mach-s3c2443/Kconfig"
endif

if ARCH_S3C64XX
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2
machine-$(CONFIG_ARCH_PXA) := pxa
machine-$(CONFIG_ARCH_REALVIEW) := realview
machine-$(CONFIG_ARCH_RPC) := rpc
machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 s3c2443
machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440
machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx
machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0
machine-$(CONFIG_ARCH_S5PC100) := s5pc100
Expand Down
32 changes: 0 additions & 32 deletions arch/arm/mach-s3c2443/Kconfig

This file was deleted.

20 changes: 0 additions & 20 deletions arch/arm/mach-s3c2443/Makefile

This file was deleted.

29 changes: 29 additions & 0 deletions arch/arm/mach-s3c24xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ config CPU_S3C244X
def_bool y
depends on CPU_S3C2440 || CPU_S3C2442

config CPU_S3C2443
bool "SAMSUNG S3C2443"
depends on ARCH_S3C24XX
select CPU_ARM920T
select CPU_LLSERIAL_S3C2440
select SAMSUNG_CLKSRC
select S3C2443_CLOCK
select S3C2443_DMA if S3C24XX_DMA
help
Support for the S3C2443 SoC from the S3C24XX line

if CPU_S3C2410

config S3C2410_DMA
Expand Down Expand Up @@ -460,6 +471,24 @@ config SMDK2440_CPU2442

endif # CPU_S3C2440

if CPU_S3C2443

config S3C2443_DMA
bool
help
Internal config node for S3C2443 DMA support

comment "S3C2443 Boards"

config MACH_SMDK2443
bool "SMDK2443"
select MACH_SMDK
select S3C_DEV_HSMMC1
help
Say Y here if you are using an SMDK2443

endif # CPU_S3C2443

endmenu # SAMSUNG S3C24XX SoCs Support

endif # ARCH_S3C24XX
5 changes: 5 additions & 0 deletions arch/arm/mach-s3c24xx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o
obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o

obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o
obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o

#
# machine support
# following is ordered alphabetically by option text.
Expand Down Expand Up @@ -66,6 +69,8 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o

obj-$(CONFIG_MACH_SMDK2443) += mach-smdk2443.o

# common bits of machine support

obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 84c028b

Please sign in to comment.