Patched in Tegra support.

4 files changed, 208 insertions, 28 deletions

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 68d89cb96af..7245a55795d 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -2,6 +2,49 @@
 #
 # Licensed under GPLv2
 
+config CPU_S3C2410
+        bool
+        depends on ARCH_S3C2410
+        select CPU_ARM920T
+        select S3C_GPIO_PULL_UP
+        select S3C2410_CLOCK
+        select S3C2410_GPIO
+        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 S3C2410_GPIO
+        bool
+        help
+          GPIO code for S3C2410 and similar processors
+
+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
@@ -18,3 +61,121 @@ 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
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 6b9a316e004..81695353d8f 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -9,6 +9,33 @@ 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_GPIO)      += gpio.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-s3c2410/cpu-freq.c b/arch/arm/mach-s3c2410/cpu-freq.c
index 5404535da1a..75189df995a 100644
--- a/arch/arm/mach-s3c2410/cpu-freq.c
+++ b/arch/arm/mach-s3c2410/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/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
@@ -115,27 +115,24 @@ static struct s3c_cpufreq_info s3c2410_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
 };
 
-static int s3c2410_cpufreq_add(struct device *dev,
-                               struct subsys_interface *sif)
+static int s3c2410_cpufreq_add(struct sys_device *sysdev)
 {
         return s3c_cpufreq_register(&s3c2410_cpufreq_info);
 }
 
-static struct subsys_interface s3c2410_cpufreq_interface = {
-        .name           = "s3c2410_cpufreq",
-        .subsys         = &s3c2410_subsys,
-        .add_dev        = s3c2410_cpufreq_add,
+static struct sysdev_driver s3c2410_cpufreq_driver = {
+        .add            = s3c2410_cpufreq_add,
 };
 
 static int __init s3c2410_cpufreq_init(void)
 {
-        return subsys_interface_register(&s3c2410_cpufreq_interface);
+        return sysdev_driver_register(&s3c2410_sysclass,
+                                      &s3c2410_cpufreq_driver);
 }
 
 arch_initcall(s3c2410_cpufreq_init);
 
-static int s3c2410a_cpufreq_add(struct device *dev,
-                                struct subsys_interface *sif)
+static int s3c2410a_cpufreq_add(struct sys_device *sysdev)
 {
         /* alter the maximum freq settings for S3C2410A. If a board knows
          * it only has a maximum of 200, then it should register its own
@@ -146,18 +143,17 @@ static int s3c2410a_cpufreq_add(struct device *dev,
         s3c2410_cpufreq_info.max.pclk =  66500000;
         s3c2410_cpufreq_info.name = "s3c2410a";
 
-        return s3c2410_cpufreq_add(dev, sif);
+        return s3c2410_cpufreq_add(sysdev);
 }
 
-static struct subsys_interface s3c2410a_cpufreq_interface = {
-        .name           = "s3c2410a_cpufreq",
-        .subsys         = &s3c2410a_subsys,
-        .add_dev        = s3c2410a_cpufreq_add,
+static struct sysdev_driver s3c2410a_cpufreq_driver = {
+        .add            = s3c2410a_cpufreq_add,
 };
 
 static int __init s3c2410a_cpufreq_init(void)
 {
-        return subsys_interface_register(&s3c2410a_cpufreq_interface);
+        return sysdev_driver_register(&s3c2410a_sysclass,
+                                      &s3c2410a_cpufreq_driver);
 }
 
 arch_initcall(s3c2410a_cpufreq_init);
diff --git a/arch/arm/mach-s3c2410/pll.c b/arch/arm/mach-s3c2410/pll.c
index e0b3b347da8..8338865e11c 100644
--- a/arch/arm/mach-s3c2410/pll.c
+++ b/arch/arm/mach-s3c2410/pll.c
@@ -25,7 +25,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/list.h>
 #include <linux/clk.h>
 #include <linux/err.h>
@@ -66,34 +66,30 @@ static struct cpufreq_frequency_table pll_vals_12MHz[] = {
     { .frequency = 270000000, .index = PLLVAL(127, 1, 1),  },
 };
 
-static int s3c2410_plls_add(struct device *dev, struct subsys_interface *sif)
+static int s3c2410_plls_add(struct sys_device *dev)
 {
         return s3c_plltab_register(pll_vals_12MHz, ARRAY_SIZE(pll_vals_12MHz));
 }
 
-static struct subsys_interface s3c2410_plls_interface = {
-        .name           = "s3c2410_plls",
-        .subsys         = &s3c2410_subsys,
-        .add_dev        = s3c2410_plls_add,
+static struct sysdev_driver s3c2410_plls_drv = {
+        .add    = s3c2410_plls_add,
 };
 
 static int __init s3c2410_pll_init(void)
 {
-        return subsys_interface_register(&s3c2410_plls_interface);
+        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_plls_drv);
 
 }
 
 arch_initcall(s3c2410_pll_init);
 
-static struct subsys_interface s3c2410a_plls_interface = {
-        .name           = "s3c2410a_plls",
-        .subsys         = &s3c2410a_subsys,
-        .add_dev        = s3c2410_plls_add,
+static struct sysdev_driver s3c2410a_plls_drv = {
+        .add    = s3c2410_plls_add,
 };
 
 static int __init s3c2410a_pll_init(void)
 {
-        return subsys_interface_register(&s3c2410a_plls_interface);
+        return sysdev_driver_register(&s3c2410a_sysclass, &s3c2410a_plls_drv);
 }
 
 arch_initcall(s3c2410a_pll_init);