Patched in Tegra support.

4 files changed, 107 insertions, 10 deletions

diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig
index 495f6928cba..c2cf4e56998 100644
--- a/arch/arm/mach-s3c2412/Kconfig
+++ b/arch/arm/mach-s3c2412/Kconfig
@@ -2,12 +2,98 @@
 #
 # Licensed under GPLv2
 
+config CPU_S3C2412
+        bool
+        depends on ARCH_S3C2410
+        select CPU_ARM926T
+        select CPU_LLSERIAL_S3C2440
+        select S3C2412_PM if PM
+        select S3C2412_DMA if S3C2410_DMA
+        select S3C2410_GPIO
+        help
+          Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
+
+config CPU_S3C2412_ONLY
+        bool
+        depends on ARCH_S3C2410 && !CPU_S3C2410 && \
+                   !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \
+                   !CPU_S3C2443 && CPU_S3C2412
+        default y if CPU_S3C2412
+
+config S3C2412_DMA
+        bool
+        depends on CPU_S3C2412
+        help
+          Internal config node for S3C2412 DMA support
+
+config S3C2412_PM
+        bool
+        select S3C2412_PM_SLEEP
+        help
+          Internal config node to apply S3C2412 power management
+
+config S3C2412_PM_SLEEP
+        bool
+        help
+          Internal config node to apply sleep for S3C2412 power management.
+          Can be selected by another SoCs with similar sleep procedure.
+
 # Note, the S3C2412 IOtiming support is in plat-s3c24xx
 
 config S3C2412_CPUFREQ
         bool
         depends on CPU_FREQ_S3C24XX && CPU_S3C2412
-        default y
         select S3C2412_IOTIMING
+        default y
         help
           CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
+
+menu "S3C2412 Machines"
+
+config MACH_JIVE
+        bool "Logitech Jive"
+        select CPU_S3C2412
+        select S3C_DEV_USB_HOST
+        select S3C_DEV_NAND
+        help
+          Say Y here if you are using the Logitech Jive.
+
+config MACH_JIVE_SHOW_BOOTLOADER
+        bool "Allow access to bootloader partitions in MTD (EXPERIMENTAL)"
+        depends on MACH_JIVE && EXPERIMENTAL
+
+config MACH_SMDK2413
+        bool "SMDK2413"
+        select CPU_S3C2412
+        select MACH_S3C2413
+        select MACH_SMDK
+        select S3C_DEV_USB_HOST
+        select S3C_DEV_NAND
+        help
+          Say Y here if you are using an SMDK2413
+
+config MACH_S3C2413
+        bool
+        help
+          Internal node for S3C2413 version of SMDK2413, so that
+          machine_is_s3c2413() will work when MACH_SMDK2413 is
+          selected
+
+config MACH_SMDK2412
+        bool "SMDK2412"
+        select MACH_SMDK2413
+        help
+          Say Y here if you are using an SMDK2412
+
+          Note, this shares support with SMDK2413, so will automatically
+          select MACH_SMDK2413.
+
+config MACH_VSTMS
+        bool "VMSTMS"
+        select CPU_S3C2412
+        select S3C_DEV_USB_HOST
+        select S3C_DEV_NAND
+        help
+          Say Y here if you are using an VSTMS board
+
+endmenu
diff --git a/arch/arm/mach-s3c2412/Makefile b/arch/arm/mach-s3c2412/Makefile
index 41a6c279fb2..6c48a91ea39 100644
--- a/arch/arm/mach-s3c2412/Makefile
+++ b/arch/arm/mach-s3c2412/Makefile
@@ -9,4 +9,17 @@ obj-m				:=
 obj-n                           :=
 obj-                            :=
 
+obj-$(CONFIG_CPU_S3C2412)       += s3c2412.o
+obj-$(CONFIG_CPU_S3C2412)       += irq.o
+obj-$(CONFIG_CPU_S3C2412)       += clock.o
+obj-$(CONFIG_CPU_S3C2412)       += gpio.o
+obj-$(CONFIG_S3C2412_DMA)       += dma.o
+obj-$(CONFIG_S3C2412_PM)        += pm.o
+obj-$(CONFIG_S3C2412_PM_SLEEP)  += sleep.o
 obj-$(CONFIG_S3C2412_CPUFREQ)   += cpu-freq.o
+
+# Machine support
+
+obj-$(CONFIG_MACH_JIVE)         += mach-jive.o
+obj-$(CONFIG_MACH_SMDK2413)     += mach-smdk2413.o
+obj-$(CONFIG_MACH_VSTMS)        += mach-vstms.o
diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c2412/cpu-freq.c
index 125be7d5fa6..eb3ea172133 100644
--- a/arch/arm/mach-s3c2412/cpu-freq.c
+++ b/arch/arm/mach-s3c2412/cpu-freq.c
@@ -16,7 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/cpufreq.h>
-#include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/err.h>
@@ -194,8 +194,7 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs),
 };
 
-static int s3c2412_cpufreq_add(struct device *dev,
-                               struct subsys_interface *sif)
+static int s3c2412_cpufreq_add(struct sys_device *sysdev)
 {
         unsigned long fclk_rate;
 
@@ -245,15 +244,14 @@ err_fclk:
         return -ENOENT;
 }
 
-static struct subsys_interface s3c2412_cpufreq_interface = {
-        .name           = "s3c2412_cpufreq",
-        .subsys         = &s3c2412_subsys,
-        .add_dev        = s3c2412_cpufreq_add,
+static struct sysdev_driver s3c2412_cpufreq_driver = {
+        .add            = s3c2412_cpufreq_add,
 };
 
 static int s3c2412_cpufreq_init(void)
 {
-        return subsys_interface_register(&s3c2412_cpufreq_interface);
+        return sysdev_driver_register(&s3c2412_sysclass,
+                                      &s3c2412_cpufreq_driver);
 }
 
 arch_initcall(s3c2412_cpufreq_init);
diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c
index 4526f6ba31a..3404a876b33 100644
--- a/arch/arm/mach-s3c2412/gpio.c
+++ b/arch/arm/mach-s3c2412/gpio.c
@@ -28,7 +28,7 @@
 
 int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state)
 {
-        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        struct s3c_gpio_chip *chip = s3c_gpiolib_getchip(pin);
         unsigned long offs = pin - chip->chip.base;
         unsigned long flags;
         unsigned long slpcon;