diff options
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 21 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/fiq_c_isr.c (renamed from arch/arm/mach-s3c2440/fiq_c_isr.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/fiq_c_isr.h (renamed from arch/arm/mach-s3c2440/fiq_c_isr.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c (renamed from arch/arm/mach-s3c2440/mach-gta02.c) | 0 |
7 files changed, 24 insertions, 10 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 9764b330274..a8163659645 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -23,14 +23,6 @@ config S3C2440_DMA help Support for S3C2440 specific DMA code5A -config S3C2440_C_FIQ - bool "FIQ ISR support in C" - depends on ARCH_S3C2410 - select FIQ - help - Support for S3C2440 FIQ support in C -- see - ./arch/arm/mach-s3c2440/fiq_c_isr.c - menu "S3C2440 Machines" config MACH_ANUBIS diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile index 964e50b7915..12c914b9d53 100644 --- a/arch/arm/mach-s3c2440/Makefile +++ b/arch/arm/mach-s3c2440/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_CPU_S3C2440) += s3c2440.o dsc.o obj-$(CONFIG_CPU_S3C2440) += irq.o obj-$(CONFIG_CPU_S3C2440) += clock.o obj-$(CONFIG_S3C2440_DMA) += dma.o -obj-$(CONFIG_S3C2440_C_FIQ) += fiq_c_isr.o # Machine support @@ -24,5 +23,4 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o obj-$(CONFIG_MACH_HXD8) += mach-hxd8.o -obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 6813758da5c..27453f02326 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig @@ -17,6 +17,15 @@ config CPU_S3C2442 help Support for S3C2442 Samsung Mobile CPU based systems. +config S3C2440_C_FIQ + bool "FIQ ISR support in C" + depends on ARCH_S3C2410 + select FIQ + help + Support for S3C2440 FIQ support in C -- see + ./arch/arm/mach-s3c2440/fiq_c_isr.c + + menu "S3C2442 Machines" @@ -25,6 +34,18 @@ config SMDK2440_CPU2442 depends on ARCH_S3C2440 select CPU_S3C2442 +config MACH_NEO1973_GTA02 + bool "FIC Neo1973 GSM Phone (GTA02 Hardware)" + select CPU_S3C2442 + select SENSORS_PCF50633 + select POWER_SUPPLY + select GTA02_HDQ + select MACH_NEO1973 + select S3C2410_PWM + select S3C2410_CLOCK + help + Say Y here if you are using the FIC Neo1973 GSM Phone + endmenu diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile index 2a909c6c579..f54b2499342 100644 --- a/arch/arm/mach-s3c2442/Makefile +++ b/arch/arm/mach-s3c2442/Makefile @@ -9,8 +9,11 @@ obj-m := obj-n := obj- := +obj-$(CONFIG_S3C2440_C_FIQ) += fiq_c_isr.o + obj-$(CONFIG_CPU_S3C2442) += s3c2442.o obj-$(CONFIG_CPU_S3C2442) += clock.o +obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o # Machine support diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2442/fiq_c_isr.c index 0decc35a317..0decc35a317 100644 --- a/arch/arm/mach-s3c2440/fiq_c_isr.c +++ b/arch/arm/mach-s3c2442/fiq_c_isr.c diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.h b/arch/arm/mach-s3c2442/fiq_c_isr.h index e92b103cdfb..e92b103cdfb 100644 --- a/arch/arm/mach-s3c2440/fiq_c_isr.h +++ b/arch/arm/mach-s3c2442/fiq_c_isr.h diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index c9c1a4dc86b..c9c1a4dc86b 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c |