aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-s3c2440/Kconfig20
-rw-r--r--arch/arm/mach-s3c2440/Makefile1
-rw-r--r--arch/arm/mach-s3c2440/include/mach/gta02.h (renamed from arch/arm/mach-s3c2442/include/mach/gta02.h)0
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c (renamed from arch/arm/mach-s3c2442/mach-gta02.c)0
-rw-r--r--arch/arm/mach-s3c2442/Kconfig22
-rw-r--r--arch/arm/mach-s3c2442/Makefile2
6 files changed, 19 insertions, 26 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 80879358eb2f..5486929dc3d0 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -21,8 +21,7 @@ config S3C2440_DMA
21 help 21 help
22 Support for S3C2440 specific DMA code5A 22 Support for S3C2440 specific DMA code5A
23 23
24 24menu "S3C2440 and S3C2442 Machines"
25menu "S3C2440 Machines"
26 25
27config MACH_ANUBIS 26config MACH_ANUBIS
28 bool "Simtec Electronics ANUBIS" 27 bool "Simtec Electronics ANUBIS"
@@ -37,6 +36,18 @@ config MACH_ANUBIS
37 Say Y here if you are using the Simtec Electronics ANUBIS 36 Say Y here if you are using the Simtec Electronics ANUBIS
38 development system 37 development system
39 38
39config MACH_NEO1973_GTA02
40 bool "Openmoko GTA02 / Freerunner phone"
41 select CPU_S3C2442
42 select MFD_PCF50633
43 select PCF50633_GPIO
44 select I2C
45 select POWER_SUPPLY
46 select MACH_NEO1973
47 select S3C2410_PWM
48 help
49 Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
50
40config MACH_OSIRIS 51config MACH_OSIRIS
41 bool "Simtec IM2440D20 (OSIRIS) module" 52 bool "Simtec IM2440D20 (OSIRIS) module"
42 select CPU_S3C2440 53 select CPU_S3C2440
@@ -99,6 +110,11 @@ config SMDK2440_CPU2440
99 select S3C2440_XTAL_16934400 110 select S3C2440_XTAL_16934400
100 select CPU_S3C2440 111 select CPU_S3C2440
101 112
113config SMDK2440_CPU2442
114 bool "SMDM2440 with S3C2442 CPU module"
115 depends on ARCH_S3C2440
116 select CPU_S3C2442
117
102config MACH_AT2440EVB 118config MACH_AT2440EVB
103 bool "Avantech AT2440EVB development board" 119 bool "Avantech AT2440EVB development board"
104 select CPU_S3C2440 120 select CPU_S3C2440
diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
index 5f3224531885..e51497ca12ea 100644
--- a/arch/arm/mach-s3c2440/Makefile
+++ b/arch/arm/mach-s3c2440/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
23obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o 23obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
24obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o 24obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
25obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o 25obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o
26obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
26 27
27# extra machine support 28# extra machine support
28 29
diff --git a/arch/arm/mach-s3c2442/include/mach/gta02.h b/arch/arm/mach-s3c2440/include/mach/gta02.h
index 953331d8d56a..953331d8d56a 100644
--- a/arch/arm/mach-s3c2442/include/mach/gta02.h
+++ b/arch/arm/mach-s3c2440/include/mach/gta02.h
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 45799c608d8f..45799c608d8f 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
index 8d3811852fc7..4832cd6ccfbc 100644
--- a/arch/arm/mach-s3c2442/Kconfig
+++ b/arch/arm/mach-s3c2442/Kconfig
@@ -13,25 +13,3 @@ config CPU_S3C2442
13 select CPU_LLSERIAL_S3C2440 13 select CPU_LLSERIAL_S3C2440
14 help 14 help
15 Support for S3C2442 Samsung Mobile CPU based systems. 15 Support for S3C2442 Samsung Mobile CPU based systems.
16
17
18menu "S3C2442 Machines"
19
20config SMDK2440_CPU2442
21 bool "SMDM2440 with S3C2442 CPU module"
22 depends on ARCH_S3C2440
23 select CPU_S3C2442
24
25config MACH_NEO1973_GTA02
26 bool "Openmoko GTA02 / Freerunner phone"
27 select CPU_S3C2442
28 select MFD_PCF50633
29 select PCF50633_GPIO
30 select I2C
31 select POWER_SUPPLY
32 select MACH_NEO1973
33 select S3C2410_PWM
34 help
35 Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
36
37endmenu
diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile
index 2a19113a5769..2a909c6c5798 100644
--- a/arch/arm/mach-s3c2442/Makefile
+++ b/arch/arm/mach-s3c2442/Makefile
@@ -12,7 +12,5 @@ obj- :=
12obj-$(CONFIG_CPU_S3C2442) += s3c2442.o 12obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
13obj-$(CONFIG_CPU_S3C2442) += clock.o 13obj-$(CONFIG_CPU_S3C2442) += clock.o
14 14
15obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
16
17# Machine support 15# Machine support
18 16