ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 6 Feb 2012 00:38:19 +0000 (09:38 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 2 Mar 2012 22:47:38 +0000 (07:47 +0900)
This patch moves S3C2410 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.

And this patch is including following.
- re-ordered alphabetically by option text at Kconfig and Makefile
- removed unused option, MACH_N35
- fixed duplcated option name, S3C2410_DMA to S3C24XX_DMA which is
  in plat-s3c24xx/

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>
79 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-s3c2410/Kconfig
arch/arm/mach-s3c2410/Makefile
arch/arm/mach-s3c24xx/Kconfig [new file with mode: 0644]
arch/arm/mach-s3c24xx/Makefile [new file with mode: 0644]
arch/arm/mach-s3c24xx/Makefile.boot [moved from arch/arm/mach-s3c2410/Makefile.boot with 100% similarity]
arch/arm/mach-s3c24xx/bast-ide.c [moved from arch/arm/mach-s3c2410/bast-ide.c with 100% similarity]
arch/arm/mach-s3c24xx/bast-irq.c [moved from arch/arm/mach-s3c2410/bast-irq.c with 100% similarity]
arch/arm/mach-s3c24xx/common.h [moved from arch/arm/mach-s3c2410/common.h with 100% similarity]
arch/arm/mach-s3c24xx/dma-s3c2410.c [moved from arch/arm/mach-s3c2410/dma.c with 100% similarity]
arch/arm/mach-s3c24xx/h1940-bluetooth.c [moved from arch/arm/mach-s3c2410/h1940-bluetooth.c with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/anubis-cpld.h [moved from arch/arm/mach-s3c2410/include/mach/anubis-cpld.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/anubis-irq.h [moved from arch/arm/mach-s3c2410/include/mach/anubis-irq.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/anubis-map.h [moved from arch/arm/mach-s3c2410/include/mach/anubis-map.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/bast-cpld.h [moved from arch/arm/mach-s3c2410/include/mach/bast-cpld.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/bast-irq.h [moved from arch/arm/mach-s3c2410/include/mach/bast-irq.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/bast-map.h [moved from arch/arm/mach-s3c2410/include/mach/bast-map.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/bast-pmu.h [moved from arch/arm/mach-s3c2410/include/mach/bast-pmu.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/debug-macro.S [moved from arch/arm/mach-s3c2410/include/mach/debug-macro.S with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/dma.h [moved from arch/arm/mach-s3c2410/include/mach/dma.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/entry-macro.S [moved from arch/arm/mach-s3c2410/include/mach/entry-macro.S with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/fb.h [moved from arch/arm/mach-s3c2410/include/mach/fb.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/gpio-fns.h [moved from arch/arm/mach-s3c2410/include/mach/gpio-fns.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h [moved from arch/arm/mach-s3c2410/include/mach/gpio-nrs.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/gpio-track.h [moved from arch/arm/mach-s3c2410/include/mach/gpio-track.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/gpio.h [moved from arch/arm/mach-s3c2410/include/mach/gpio.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/h1940-latch.h [moved from arch/arm/mach-s3c2410/include/mach/h1940-latch.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/h1940.h [moved from arch/arm/mach-s3c2410/include/mach/h1940.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/hardware.h [moved from arch/arm/mach-s3c2410/include/mach/hardware.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/idle.h [moved from arch/arm/mach-s3c2410/include/mach/idle.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/io.h [moved from arch/arm/mach-s3c2410/include/mach/io.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/irqs.h [moved from arch/arm/mach-s3c2410/include/mach/irqs.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/leds-gpio.h [moved from arch/arm/mach-s3c2410/include/mach/leds-gpio.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/map.h [moved from arch/arm/mach-s3c2410/include/mach/map.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h [moved from arch/arm/mach-s3c2410/include/mach/osiris-cpld.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/osiris-map.h [moved from arch/arm/mach-s3c2410/include/mach/osiris-map.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/otom-map.h [moved from arch/arm/mach-s3c2410/include/mach/otom-map.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/pm-core.h [moved from arch/arm/mach-s3c2410/include/mach/pm-core.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-clock.h [moved from arch/arm/mach-s3c2410/include/mach/regs-clock.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-dsc.h [moved from arch/arm/mach-s3c2410/include/mach/regs-dsc.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h [moved from arch/arm/mach-s3c2410/include/mach/regs-gpio.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-gpioj.h [moved from arch/arm/mach-s3c2410/include/mach/regs-gpioj.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-irq.h [moved from arch/arm/mach-s3c2410/include/mach/regs-irq.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-lcd.h [moved from arch/arm/mach-s3c2410/include/mach/regs-lcd.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-mem.h [moved from arch/arm/mach-s3c2410/include/mach/regs-mem.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-power.h [moved from arch/arm/mach-s3c2410/include/mach/regs-power.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-s3c2412-mem.h [moved from arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h [moved from arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h [moved from arch/arm/mach-s3c2410/include/mach/regs-s3c2416-mem.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h [moved from arch/arm/mach-s3c2410/include/mach/regs-s3c2416.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h [moved from arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/regs-sdi.h [moved from arch/arm/mach-s3c2410/include/mach/regs-sdi.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/system.h [moved from arch/arm/mach-s3c2410/include/mach/system.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/tick.h [moved from arch/arm/mach-s3c2410/include/mach/tick.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/timex.h [moved from arch/arm/mach-s3c2410/include/mach/timex.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/uncompress.h [moved from arch/arm/mach-s3c2410/include/mach/uncompress.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/vr1000-cpld.h [moved from arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/vr1000-irq.h [moved from arch/arm/mach-s3c2410/include/mach/vr1000-irq.h with 100% similarity]
arch/arm/mach-s3c24xx/include/mach/vr1000-map.h [moved from arch/arm/mach-s3c2410/include/mach/vr1000-map.h with 100% similarity]
arch/arm/mach-s3c24xx/mach-amlm5900.c [moved from arch/arm/mach-s3c2410/mach-amlm5900.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-bast.c [moved from arch/arm/mach-s3c2410/mach-bast.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-h1940.c [moved from arch/arm/mach-s3c2410/mach-h1940.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-n30.c [moved from arch/arm/mach-s3c2410/mach-n30.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-otom.c [moved from arch/arm/mach-s3c2410/mach-otom.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-qt2410.c [moved from arch/arm/mach-s3c2410/mach-qt2410.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-smdk2410.c [moved from arch/arm/mach-s3c2410/mach-smdk2410.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-tct_hammer.c [moved from arch/arm/mach-s3c2410/mach-tct_hammer.c with 100% similarity]
arch/arm/mach-s3c24xx/mach-vr1000.c [moved from arch/arm/mach-s3c2410/mach-vr1000.c with 100% similarity]
arch/arm/mach-s3c24xx/nor-simtec.c [moved from arch/arm/mach-s3c2410/nor-simtec.c with 100% similarity]
arch/arm/mach-s3c24xx/nor-simtec.h [moved from arch/arm/mach-s3c2410/nor-simtec.h with 100% similarity]
arch/arm/mach-s3c24xx/pm-h1940.S [moved from arch/arm/mach-s3c2410/pm-h1940.S with 100% similarity]
arch/arm/mach-s3c24xx/pm-s3c2410.c [moved from arch/arm/mach-s3c2410/pm.c with 100% similarity]
arch/arm/mach-s3c24xx/s3c2410.c [moved from arch/arm/mach-s3c2410/s3c2410.c with 100% similarity]
arch/arm/mach-s3c24xx/sleep-s3c2410.S [moved from arch/arm/mach-s3c2410/sleep.S with 100% similarity]
arch/arm/mach-s3c24xx/usb-simtec.c [moved from arch/arm/mach-s3c2410/usb-simtec.c with 100% similarity]
arch/arm/mach-s3c24xx/usb-simtec.h [moved from arch/arm/mach-s3c2410/usb-simtec.h with 100% similarity]
arch/arm/plat-s3c24xx/Kconfig
arch/arm/plat-s3c24xx/Makefile

index 5f1a3ad..f8044e9 100644 (file)
@@ -1067,8 +1067,8 @@ source "arch/arm/plat-s5p/Kconfig"
 
 source "arch/arm/plat-spear/Kconfig"
 
+source "arch/arm/mach-s3c24xx/Kconfig"
 if ARCH_S3C24XX
-source "arch/arm/mach-s3c2410/Kconfig"
 source "arch/arm/mach-s3c2412/Kconfig"
 source "arch/arm/mach-s3c2416/Kconfig"
 source "arch/arm/mach-s3c2440/Kconfig"
index 624f764..59d9df4 100644 (file)
@@ -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)         := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443
+machine-$(CONFIG_ARCH_S3C24XX)         := s3c24xx s3c2412 s3c2416 s3c2440 s3c2443
 machine-$(CONFIG_ARCH_S3C64XX)         := s3c64xx
 machine-$(CONFIG_ARCH_S5P64X0)         := s5p64x0
 machine-$(CONFIG_ARCH_S5PC100)         := s5pc100
index ce62099..68d89cb 100644 (file)
@@ -2,42 +2,6 @@
 #
 # Licensed under GPLv2
 
-config CPU_S3C2410
-       bool
-       depends on ARCH_S3C24XX
-       select CPU_ARM920T
-       select S3C2410_CLOCK
-       select CPU_LLSERIAL_S3C2410
-       select S3C2410_PM if PM
-       select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
-       help
-         Support for S3C2410 and S3C2410A family from the S3C24XX line
-         of Samsung Mobile CPUs.
-
-config CPU_S3C2410_DMA
-       bool
-       depends on S3C2410_DMA && (CPU_S3C2410 || CPU_S3C2442)
-       default y if CPU_S3C2410 || CPU_S3C2442
-       help
-         DMA device selection for S3C2410 and compatible CPUs
-
-config S3C2410_PM
-       bool
-       help
-         Power Management code common to S3C2410 and better
-
-config SIMTEC_NOR
-       bool
-       help
-         Internal node to specify machine has simtec NOR mapping
-
-config MACH_BAST_IDE
-       bool
-       select HAVE_PATA_PLATFORM
-       help
-         Internal node for machines with an BAST style IDE
-         interface
-
 # cpu frequency scaling support
 
 config S3C2410_CPUFREQ
@@ -54,121 +18,3 @@ config S3C2410_PLLTABLE
        help
          Select the PLL table for the S3C2410
 
-menu "S3C2410 Machines"
-
-config ARCH_SMDK2410
-       bool "SMDK2410/A9M2410"
-       select CPU_S3C2410
-       select MACH_SMDK
-       help
-          Say Y here if you are using the SMDK2410 or the derived module A9M2410
-           <http://www.fsforth.de>
-
-config ARCH_H1940
-       bool "IPAQ H1940"
-       select CPU_S3C2410
-       select PM_H1940 if PM
-       select S3C_DEV_USB_HOST
-       select S3C_DEV_NAND
-       select S3C2410_SETUP_TS
-       help
-         Say Y here if you are using the HP IPAQ H1940
-
-config H1940BT
-        tristate "Control the state of H1940 bluetooth chip"
-        depends on ARCH_H1940
-        select RFKILL
-        help
-          This is a simple driver that is able to control
-          the state of built in bluetooth chip on h1940.
-
-config PM_H1940
-       bool
-       help
-         Internal node for H1940 and related PM
-
-config MACH_N30
-       bool "Acer N30 family"
-       select CPU_S3C2410
-       select MACH_N35
-       select S3C_DEV_USB_HOST
-       select S3C_DEV_NAND
-       help
-         Say Y here if you want suppt for the Acer N30, Acer N35,
-         Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
-
-config MACH_N35
-       bool
-       help
-         Internal node in order to enable support for Acer N35 if Acer N30 is
-         selected.
-
-config ARCH_BAST
-       bool "Simtec Electronics BAST (EB2410ITX)"
-       select CPU_S3C2410
-       select S3C2410_IOTIMING if S3C2410_CPUFREQ
-       select PM_SIMTEC if PM
-       select SIMTEC_NOR
-       select MACH_BAST_IDE
-       select S3C24XX_DCLK
-       select ISA
-       select S3C_DEV_HWMON
-       select S3C_DEV_USB_HOST
-       select S3C_DEV_NAND
-       help
-         Say Y here if you are using the Simtec Electronics EB2410ITX
-         development board (also known as BAST)
-
-config MACH_OTOM
-       bool "NexVision OTOM Board"
-       select CPU_S3C2410
-       select S3C_DEV_USB_HOST
-       select S3C_DEV_NAND
-       help
-         Say Y here if you are using the Nex Vision OTOM board
-
-config MACH_AML_M5900
-       bool "AML M5900 Series"
-       select CPU_S3C2410
-       select PM_SIMTEC if PM
-       select S3C_DEV_USB_HOST
-       help
-          Say Y here if you are using the American Microsystems M5900 Series
-           <http://www.amltd.com>
-
-config BAST_PC104_IRQ
-       bool "BAST PC104 IRQ support"
-       depends on ARCH_BAST
-       default y
-       help
-         Say Y here to enable the PC104 IRQ routing on the
-         Simtec BAST (EB2410ITX)
-
-config MACH_TCT_HAMMER
-       bool "TCT Hammer Board"
-       select CPU_S3C2410
-       select S3C_DEV_USB_HOST
-       help
-          Say Y here if you are using the TinCanTools Hammer Board
-           <http://www.tincantools.com>
-
-config MACH_VR1000
-       bool "Thorcom VR1000"
-       select PM_SIMTEC if PM
-       select S3C24XX_DCLK
-       select SIMTEC_NOR
-       select MACH_BAST_IDE
-       select CPU_S3C2410
-       select S3C_DEV_USB_HOST
-       help
-         Say Y here if you are using the Thorcom VR1000 board.
-
-config MACH_QT2410
-       bool "QT2410"
-       select CPU_S3C2410
-       select S3C_DEV_USB_HOST
-       select S3C_DEV_NAND
-       help
-          Say Y here if you are using the Armzone QT2410
-
-endmenu
index 782fd81..6b9a316 100644 (file)
@@ -9,32 +9,6 @@ obj-m                          :=
 obj-n                          :=
 obj-                           :=
 
-obj-$(CONFIG_CPU_S3C2410)      += s3c2410.o
-obj-$(CONFIG_CPU_S3C2410_DMA)  += dma.o
-obj-$(CONFIG_CPU_S3C2410_DMA)  += dma.o
-obj-$(CONFIG_S3C2410_PM)       += pm.o sleep.o
 obj-$(CONFIG_S3C2410_CPUFREQ)  += cpu-freq.o
 obj-$(CONFIG_S3C2410_PLLTABLE) += pll.o
 
-# Machine support
-
-obj-$(CONFIG_ARCH_SMDK2410)    += mach-smdk2410.o
-obj-$(CONFIG_ARCH_H1940)       += mach-h1940.o
-obj-$(CONFIG_H1940BT)          += h1940-bluetooth.o
-obj-$(CONFIG_PM_H1940)         += pm-h1940.o
-obj-$(CONFIG_MACH_N30)         += mach-n30.o
-obj-$(CONFIG_ARCH_BAST)                += mach-bast.o usb-simtec.o
-obj-$(CONFIG_MACH_OTOM)                += mach-otom.o
-obj-$(CONFIG_MACH_AML_M5900)   += mach-amlm5900.o
-obj-$(CONFIG_BAST_PC104_IRQ)   += bast-irq.o
-obj-$(CONFIG_MACH_TCT_HAMMER)  += mach-tct_hammer.o
-obj-$(CONFIG_MACH_VR1000)      += mach-vr1000.o usb-simtec.o
-obj-$(CONFIG_MACH_QT2410)      += mach-qt2410.o
-
-# Common bits of machine support
-
-obj-$(CONFIG_SIMTEC_NOR)       += nor-simtec.o
-
-# machine additions
-
-obj-$(CONFIG_MACH_BAST_IDE)    += bast-ide.o
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
new file mode 100644 (file)
index 0000000..7f916c8
--- /dev/null
@@ -0,0 +1,165 @@
+# arch/arm/mach-s3c24xx/Kconfig
+#
+# Copyright (c) 2012 Samsung Electronics Co., Ltd.
+#              http://www.samsung.com/
+#
+# Copyright 2007 Simtec Electronics
+#
+# Licensed under GPLv2
+
+if ARCH_S3C24XX
+
+menu "SAMSUNG S3C24XX SoCs Support"
+
+comment "S3C24XX SoCs"
+
+config CPU_S3C2410
+       bool "SAMSUNG S3C2410"
+       default y
+       select CPU_ARM920T
+       select S3C2410_CLOCK
+       select CPU_LLSERIAL_S3C2410
+       select S3C2410_PM if PM
+       select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
+       help
+         Support for S3C2410 and S3C2410A family from the S3C24XX line
+         of Samsung Mobile CPUs.
+
+if CPU_S3C2410
+
+config S3C2410_DMA
+       bool
+       depends on S3C2410_DMA && CPU_S3C2410
+       default y if CPU_S3C2410
+       help
+         DMA device selection for S3C2410 and compatible CPUs
+
+config S3C2410_PM
+       bool
+       help
+         Power Management code common to S3C2410 and better
+
+config SIMTEC_NOR
+       bool
+       help
+         Internal node to specify machine has simtec NOR mapping
+
+config MACH_BAST_IDE
+       bool
+       select HAVE_PATA_PLATFORM
+       help
+         Internal node for machines with an BAST style IDE
+         interface
+
+comment "S3C2410 Boards"
+
+#
+# The "S3C2410 Boards" list is ordered alphabetically by option text.
+# (without ARCH_ or MACH_)
+#
+
+config MACH_AML_M5900
+       bool "AML M5900 Series"
+       select PM_SIMTEC if PM
+       select S3C_DEV_USB_HOST
+       help
+         Say Y here if you are using the American Microsystems M5900 Series
+         <http://www.amltd.com>
+
+config ARCH_BAST
+       bool "Simtec Electronics BAST (EB2410ITX)"
+       select S3C2410_IOTIMING if S3C2410_CPUFREQ
+       select PM_SIMTEC if PM
+       select SIMTEC_NOR
+       select MACH_BAST_IDE
+       select S3C24XX_DCLK
+       select ISA
+       select S3C_DEV_HWMON
+       select S3C_DEV_USB_HOST
+       select S3C_DEV_NAND
+       help
+         Say Y here if you are using the Simtec Electronics EB2410ITX
+         development board (also known as BAST)
+
+config BAST_PC104_IRQ
+       bool "BAST PC104 IRQ support"
+       depends on ARCH_BAST
+       default y
+       help
+         Say Y here to enable the PC104 IRQ routing on the
+         Simtec BAST (EB2410ITX)
+
+config ARCH_H1940
+       bool "IPAQ H1940"
+       select PM_H1940 if PM
+       select S3C_DEV_USB_HOST
+       select S3C_DEV_NAND
+       select S3C2410_SETUP_TS
+       help
+         Say Y here if you are using the HP IPAQ H1940
+
+config H1940BT
+       tristate "Control the state of H1940 bluetooth chip"
+       depends on ARCH_H1940
+       select RFKILL
+       help
+         This is a simple driver that is able to control
+         the state of built in bluetooth chip on h1940.
+
+config PM_H1940
+       bool
+       help
+         Internal node for H1940 and related PM
+
+config MACH_N30
+       bool "Acer N30 family"
+       select MACH_N35
+       select S3C_DEV_USB_HOST
+       select S3C_DEV_NAND
+       help
+         Say Y here if you want suppt for the Acer N30, Acer N35,
+         Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
+
+config MACH_OTOM
+       bool "NexVision OTOM Board"
+       select S3C_DEV_USB_HOST
+       select S3C_DEV_NAND
+       help
+         Say Y here if you are using the Nex Vision OTOM board
+
+config MACH_QT2410
+       bool "QT2410"
+       select S3C_DEV_USB_HOST
+       select S3C_DEV_NAND
+       help
+         Say Y here if you are using the Armzone QT2410
+
+config ARCH_SMDK2410
+       bool "SMDK2410/A9M2410"
+       select MACH_SMDK
+       help
+         Say Y here if you are using the SMDK2410 or the derived module A9M2410
+         <http://www.fsforth.de>
+
+config MACH_TCT_HAMMER
+       bool "TCT Hammer Board"
+       select S3C_DEV_USB_HOST
+       help
+         Say Y here if you are using the TinCanTools Hammer Board
+         <http://www.tincantools.com>
+
+config MACH_VR1000
+       bool "Thorcom VR1000"
+       select PM_SIMTEC if PM
+       select S3C24XX_DCLK
+       select SIMTEC_NOR
+       select MACH_BAST_IDE
+       select S3C_DEV_USB_HOST
+       help
+         Say Y here if you are using the Thorcom VR1000 board.
+
+endif  # CPU_S3C2410
+
+endmenu        # SAMSUNG S3C24XX SoCs Support
+
+endif  # ARCH_S3C24XX
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile
new file mode 100644 (file)
index 0000000..b6afbf8
--- /dev/null
@@ -0,0 +1,45 @@
+# arch/arm/mach-s3c24xx/Makefile
+#
+# Copyright (c) 2012 Samsung Electronics Co., Ltd.
+#              http://www.samsung.com/
+#
+# Copyright 2007 Simtec Electronics
+#
+# Licensed under GPLv2
+
+obj-y                          :=
+obj-m                          :=
+obj-n                          :=
+obj-                           :=
+
+# core
+
+obj-$(CONFIG_CPU_S3C2410)      += s3c2410.o
+obj-$(CONFIG_S3C2410_DMA)      += dma-s3c2410.o
+obj-$(CONFIG_S3C2410_PM)       += pm-s3c2410.o sleep-s3c2410.o
+
+#
+# machine support
+# following is ordered alphabetically by option text.
+#
+
+obj-$(CONFIG_MACH_AML_M5900)           += mach-amlm5900.o
+obj-$(CONFIG_ARCH_BAST)                        += mach-bast.o usb-simtec.o
+obj-$(CONFIG_BAST_PC104_IRQ)           += bast-irq.o
+obj-$(CONFIG_ARCH_H1940)               += mach-h1940.o
+obj-$(CONFIG_H1940BT)                  += h1940-bluetooth.o
+obj-$(CONFIG_PM_H1940)                 += pm-h1940.o
+obj-$(CONFIG_MACH_N30)                 += mach-n30.o
+obj-$(CONFIG_MACH_OTOM)                        += mach-otom.o
+obj-$(CONFIG_MACH_QT2410)              += mach-qt2410.o
+obj-$(CONFIG_ARCH_SMDK2410)            += mach-smdk2410.o
+obj-$(CONFIG_MACH_TCT_HAMMER)          += mach-tct_hammer.o
+obj-$(CONFIG_MACH_VR1000)              += mach-vr1000.o usb-simtec.o
+
+# common bits of machine support
+
+obj-$(CONFIG_SIMTEC_NOR)               += nor-simtec.o
+
+# machine additions
+
+obj-$(CONFIG_MACH_BAST_IDE)            += bast-ide.o
index 5a67eda..0c183fd 100644 (file)
@@ -82,7 +82,7 @@ config PM_SIMTEC
          Common power management code for systems that are
          compatible with the Simtec style of power management
 
-config S3C2410_DMA
+config S3C24XX_DMA
        bool "S3C2410 DMA support"
        depends on ARCH_S3C24XX
        select S3C_DMA
index 32bd295..bce27ca 100644 (file)
@@ -29,7 +29,7 @@ obj-$(CONFIG_PM)              += irq-pm.o
 obj-$(CONFIG_PM)               += sleep.o
 obj-$(CONFIG_S3C2410_CLOCK)    += s3c2410-clock.o
 obj-$(CONFIG_S3C2443_CLOCK)    += s3c2443-clock.o
-obj-$(CONFIG_S3C2410_DMA)      += dma.o
+obj-$(CONFIG_S3C24XX_DMA)      += dma.o
 obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o
 obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o
 obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o