12 files changed, 536 insertions, 3 deletions

diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h
index 3b52b86498a6..e0349af8a483 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -15,4 +15,10 @@
 #define gpio_set_value  __gpio_set_value
 #define gpio_cansleep   __gpio_cansleep
 
+/* some boards require extra gpio capacity to support external
+ * devices that need GPIO.
+ */
+
+#define ARCH_NR_GPIOS   (256 + CONFIG_S3C24XX_GPIO_EXTRA)
+
 #include <asm-generic/gpio.h>
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c
index 25ff1ec9f8ad..5e758cf8bf82 100644
--- a/arch/arm/mach-s3c2412/mach-jive.c
+++ b/arch/arm/mach-s3c2412/mach-jive.c
@@ -398,11 +398,12 @@ static struct s3c2410_spigpio_info jive_lcd_spi = {
         .bus_num        = 1,
         .pin_clk        = S3C2410_GPG8,
         .pin_mosi       = S3C2410_GPB8,
+        .num_chipselect = 1,
         .chip_select    = jive_lcd_spi_chipselect,
 };
 
 static struct platform_device jive_device_lcdspi = {
-        .name           = "s3c24xx-spi-gpio",
+        .name           = "spi_s3c24xx_gpio",
         .id             = 1,
         .num_resources  = 0,
         .dev.platform_data = &jive_lcd_spi,
@@ -419,11 +420,12 @@ static struct s3c2410_spigpio_info jive_wm8750_spi = {
         .bus_num        = 2,
         .pin_clk        = S3C2410_GPB4,
         .pin_mosi       = S3C2410_GPB9,
+        .num_chipselect = 1,
         .chip_select    = jive_wm8750_chipselect,
 };
 
 static struct platform_device jive_device_wm8750 = {
-        .name           = "s3c24xx-spi-gpio",
+        .name           = "spi_s3c24xx_gpio",
         .id             = 2,
         .num_resources  = 0,
         .dev.platform_data = &jive_wm8750_spi,
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 57b9c57ff2b4..cde5ae9a4340 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -32,6 +32,7 @@ config MACH_ANUBIS
         select S3C24XX_DCLK
         select PM_SIMTEC if PM
         select HAVE_PATA_PLATFORM
+        select S3C24XX_GPIO_EXTRA64
         help
           Say Y here if you are using the Simtec Electronics ANUBIS
           development system
@@ -41,6 +42,7 @@ config MACH_OSIRIS
         select CPU_S3C2440
         select S3C24XX_DCLK
         select PM_SIMTEC if PM
+        select S3C24XX_GPIO_EXTRA128
         help
           Say Y here if you are using the Simtec IM2440D20 module, also
           known as the Osiris.
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index 334379bdfc6e..f151f8939929 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -366,6 +366,8 @@ static struct sm501_initdata anubis_sm501_initdata = {
                 .mask   = 0,
         },
 
+        .devices        = SM501_USE_GPIO,
+
         /* set the SDRAM and bus clocks */
         .mclk           = 72 * MHZ,
         .m1xclk         = 144 * MHZ,
@@ -373,10 +375,12 @@ static struct sm501_initdata anubis_sm501_initdata = {
 
 static struct sm501_platdata_gpio_i2c anubis_sm501_gpio_i2c[] = {
         [0] = {
+                .bus_num        = 1,
                 .pin_scl        = 44,
                 .pin_sda        = 45,
         },
         [1] = {
+                .bus_num        = 2,
                 .pin_scl        = 40,
                 .pin_sda        = 41,
         },
@@ -384,6 +388,7 @@ static struct sm501_platdata_gpio_i2c anubis_sm501_gpio_i2c[] = {
 
 static struct sm501_platdata anubis_sm501_platdata = {
         .init           = &anubis_sm501_initdata,
+        .gpio_base      = -1,
         .gpio_i2c       = anubis_sm501_gpio_i2c,
         .gpio_i2c_nr    = ARRAY_SIZE(anubis_sm501_gpio_i2c),
 };
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c
index 07b42a0207d1..4539b1d95877 100644
--- a/arch/arm/mach-s3c2440/mach-at2440evb.c
+++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -28,6 +28,7 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
+#include <mach/fb.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
@@ -45,6 +46,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <asm/plat-s3c24xx/mci.h>
 
 static struct map_desc at2440evb_iodesc[] __initdata = {
         /* Nothing here */
@@ -162,6 +164,43 @@ static struct platform_device at2440evb_device_eth = {
         },
 };
 
+static struct s3c24xx_mci_pdata at2440evb_mci_pdata = {
+        .gpio_detect    = S3C2410_GPG10,
+};
+
+/* 7" LCD panel */
+
+static struct s3c2410fb_display at2440evb_lcd_cfg __initdata = {
+
+        .lcdcon5        = S3C2410_LCDCON5_FRM565 |
+                          S3C2410_LCDCON5_INVVLINE |
+                          S3C2410_LCDCON5_INVVFRAME |
+                          S3C2410_LCDCON5_PWREN |
+                          S3C2410_LCDCON5_HWSWP,
+
+        .type           = S3C2410_LCDCON1_TFT,
+
+        .width          = 800,
+        .height         = 480,
+
+        .pixclock       = 33333, /* HCLK 60 MHz, divisor 2 */
+        .xres           = 800,
+        .yres           = 480,
+        .bpp            = 16,
+        .left_margin    = 88,
+        .right_margin   = 40,
+        .hsync_len      = 128,
+        .upper_margin   = 32,
+        .lower_margin   = 11,
+        .vsync_len      = 2,
+};
+
+static struct s3c2410fb_mach_info at2440evb_fb_info __initdata = {
+        .displays       = &at2440evb_lcd_cfg,
+        .num_displays   = 1,
+        .default_display = 0,
+};
+
 static struct platform_device *at2440evb_devices[] __initdata = {
         &s3c_device_usb,
         &s3c_device_wdt,
@@ -169,12 +208,16 @@ static struct platform_device *at2440evb_devices[] __initdata = {
         &s3c_device_i2c,
         &s3c_device_rtc,
         &s3c_device_nand,
+        &s3c_device_sdi,
+        &s3c_device_lcd,
         &at2440evb_device_eth,
 };
 
 static void __init at2440evb_map_io(void)
 {
         s3c_device_nand.dev.platform_data = &at2440evb_nand_info;
+        s3c_device_sdi.name = "s3c2440-sdi";
+        s3c_device_sdi.dev.platform_data = &at2440evb_mci_pdata;
 
         s3c24xx_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc));
         s3c24xx_init_clocks(16934400);
@@ -183,6 +226,7 @@ static void __init at2440evb_map_io(void)
 
 static void __init at2440evb_init(void)
 {
+        s3c24xx_fb_set_platdata(&at2440evb_fb_info);
         platform_add_devices(at2440evb_devices, ARRAY_SIZE(at2440evb_devices));
 }
 
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
index 6fa261a3d405..adb9060ec910 100644
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -57,6 +57,14 @@ config S3C_BOOT_ERROR_RESET
           Say y here to use the watchdog to reset the system if the
           kernel decompressor detects an error during decompression.
 
+config S3C_BOOT_UART_FORCE_FIFO
+       bool "Force UART FIFO on during boot process"
+       depends on PLAT_S3C
+       default y
+       help
+         Say Y here to force the UART FIFOs on during the kernel
+         uncompressor
+
 comment "Power management"
 
 config S3C2410_PM_DEBUG
diff --git a/arch/arm/plat-s3c/include/plat/adc.h b/arch/arm/plat-s3c/include/plat/adc.h
new file mode 100644
index 000000000000..43df2a404b0b
--- /dev/null
+++ b/arch/arm/plat-s3c/include/plat/adc.h
@@ -0,0 +1,29 @@
+/* arch/arm/plat-s3c/include/plat/adc.h
+ *
+ * Copyright (c) 2008 Simtec Electronics
+ *      http://armlinux.simnte.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C24XX ADC driver information
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_PLAT_ADC_H
+#define __ASM_PLAT_ADC_H __FILE__
+
+struct s3c_adc_client;
+
+extern int s3c_adc_start(struct s3c_adc_client *client,
+                         unsigned int channel, unsigned int nr_samples);
+
+extern struct s3c_adc_client *s3c_adc_register(struct platform_device *pdev,
+                                               void (*select)(unsigned selected),
+                                               void (*conv)(unsigned d0, unsigned d1),
+                                               unsigned int is_ts);
+
+extern void s3c_adc_release(struct s3c_adc_client *client);
+
+#endif /* __ASM_PLAT_ADC_H */
diff --git a/arch/arm/plat-s3c/include/plat/uncompress.h b/arch/arm/plat-s3c/include/plat/uncompress.h
index eeef32c4312d..6061de87f225 100644
--- a/arch/arm/plat-s3c/include/plat/uncompress.h
+++ b/arch/arm/plat-s3c/include/plat/uncompress.h
@@ -139,6 +139,28 @@ static void arch_decomp_error(const char *x)
 
 static void error(char *err);
 
+#ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO
+static inline void arch_enable_uart_fifo(void)
+{
+        u32 fifocon = uart_rd(S3C2410_UFCON);
+
+        if (!(fifocon & S3C2410_UFCON_FIFOMODE)) {
+                fifocon |= S3C2410_UFCON_RESETBOTH;
+                uart_wr(S3C2410_UFCON, fifocon);
+
+                /* wait for fifo reset to complete */
+                while (1) {
+                        fifocon = uart_rd(S3C2410_UFCON);
+                        if (!(fifocon & S3C2410_UFCON_RESETBOTH))
+                                break;
+                }
+        }
+}
+#else
+#define arch_enable_uart_fifo() do { } while(0)
+#endif
+
+
 static void
 arch_decomp_setup(void)
 {
@@ -149,6 +171,12 @@ arch_decomp_setup(void)
 
         arch_detect_cpu();
         arch_decomp_wdog_start();
+
+        /* Enable the UART FIFOs if they where not enabled and our
+         * configuration says we should turn them on.
+         */
+
+        arch_enable_uart_fifo();
 }
 
 
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index f0d54fdf88d4..2c8a2f5d75ff 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -41,6 +41,27 @@ config S3C24XX_PWM
           Support for exporting the PWM timer blocks via the pwm device
           system.
 
+
+# gpio configurations
+
+config S3C24XX_GPIO_EXTRA
+        int
+        default 128 if S3C24XX_GPIO_EXTRA128
+        default 64 if S3C24XX_GPIO_EXTRA64
+        default 0
+
+config S3C24XX_GPIO_EXTRA64
+        bool
+        help
+          Add an extra 64 gpio numbers to the available GPIO pool. This is
+          available for boards that need extra gpios for external devices.
+
+config S3C24XX_GPIO_EXTRA128
+        bool
+        help
+          Add an extra 128 gpio numbers to the available GPIO pool. This is
+          available for boards that need extra gpios for external devices.
+
 config PM_SIMTEC
         bool
         help
@@ -62,6 +83,13 @@ config S3C2410_DMA_DEBUG
           Enable debugging output for the DMA code. This option sends info
           to the kernel log, at priority KERN_DEBUG.
 
+config S3C24XX_ADC
+        bool "ADC common driver support"
+        help
+          Core support for the ADC block found in the S3C24XX SoC systems
+          for drivers such as the touchscreen and hwmon to use to share
+          this resource.
+
 # SPI default pin configuration code
 
 config S3C24XX_SPI_BUS0_GPE11_GPE12_GPE13
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
index 2a65ba7eb34d..a8cfdefc29e9 100644
--- a/arch/arm/plat-s3c24xx/Makefile
+++ b/arch/arm/plat-s3c24xx/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_PM)		+= sleep.o
 obj-$(CONFIG_HAVE_PWM)          += pwm.o
 obj-$(CONFIG_S3C2410_CLOCK)     += s3c2410-clock.o
 obj-$(CONFIG_S3C2410_DMA)       += dma.o
+obj-$(CONFIG_S3C24XX_ADC)       += adc.o
 
 # SPI gpio central GPIO functions
 
diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c
new file mode 100644
index 000000000000..9a5c767e0a42
--- /dev/null
+++ b/arch/arm/plat-s3c24xx/adc.c
@@ -0,0 +1,372 @@
+/* arch/arm/plat-s3c24xx/adc.c
+ *
+ * Copyright (c) 2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org>
+ *
+ * S3C24XX ADC device core
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+*/
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+
+#include <plat/regs-adc.h>
+#include <plat/adc.h>
+
+/* This driver is designed to control the usage of the ADC block between
+ * the touchscreen and any other drivers that may need to use it, such as
+ * the hwmon driver.
+ *
+ * Priority will be given to the touchscreen driver, but as this itself is
+ * rate limited it should not starve other requests which are processed in
+ * order that they are received.
+ *
+ * Each user registers to get a client block which uniquely identifies it
+ * and stores information such as the necessary functions to callback when
+ * action is required.
+ */
+
+struct s3c_adc_client {
+        struct platform_device  *pdev;
+        struct list_head         pend;
+
+        unsigned int             nr_samples;
+        unsigned char            is_ts;
+        unsigned char            channel;
+
+        void    (*select_cb)(unsigned selected);
+        void    (*convert_cb)(unsigned val1, unsigned val2);
+};
+
+struct adc_device {
+        struct platform_device  *pdev;
+        struct platform_device  *owner;
+        struct clk              *clk;
+        struct s3c_adc_client   *cur;
+        struct s3c_adc_client   *ts_pend;
+        void __iomem            *regs;
+
+        unsigned int             prescale;
+
+        int                      irq;
+};
+
+static struct adc_device *adc_dev;
+
+static LIST_HEAD(adc_pending);
+
+#define adc_dbg(_adc, msg...) dev_dbg(&(_adc)->pdev->dev, msg)
+
+static inline void s3c_adc_convert(struct adc_device *adc)
+{
+        unsigned con = readl(adc->regs + S3C2410_ADCCON);
+
+        con |= S3C2410_ADCCON_ENABLE_START;
+        writel(con, adc->regs + S3C2410_ADCCON);
+}
+
+static inline void s3c_adc_select(struct adc_device *adc,
+                                  struct s3c_adc_client *client)
+{
+        unsigned con = readl(adc->regs + S3C2410_ADCCON);
+
+        client->select_cb(1);
+
+        con &= ~S3C2410_ADCCON_MUXMASK;
+        con &= ~S3C2410_ADCCON_STDBM;
+        con &= ~S3C2410_ADCCON_STARTMASK;
+
+        if (!client->is_ts)
+                con |= S3C2410_ADCCON_SELMUX(client->channel);
+
+        writel(con, adc->regs + S3C2410_ADCCON);
+}
+
+static void s3c_adc_dbgshow(struct adc_device *adc)
+{
+        adc_dbg(adc, "CON=%08x, TSC=%08x, DLY=%08x\n",
+                readl(adc->regs + S3C2410_ADCCON),
+                readl(adc->regs + S3C2410_ADCTSC),
+                readl(adc->regs + S3C2410_ADCDLY));
+}
+
+void s3c_adc_try(struct adc_device *adc)
+{
+        struct s3c_adc_client *next = adc->ts_pend;
+
+        if (!next && !list_empty(&adc_pending)) {
+                next = list_first_entry(&adc_pending,
+                                        struct s3c_adc_client, pend);
+                list_del(&next->pend);
+        } else
+                adc->ts_pend = NULL;
+
+        if (next) {
+                adc_dbg(adc, "new client is %p\n", next);
+                adc->cur = next;
+                s3c_adc_select(adc, next);
+                s3c_adc_convert(adc);
+                s3c_adc_dbgshow(adc);
+        }
+}
+
+int s3c_adc_start(struct s3c_adc_client *client,
+                  unsigned int channel, unsigned int nr_samples)
+{
+        struct adc_device *adc = adc_dev;
+        unsigned long flags;
+
+        if (!adc) {
+                printk(KERN_ERR "%s: failed to find adc\n", __func__);
+                return -EINVAL;
+        }
+
+        if (client->is_ts && adc->ts_pend)
+                return -EAGAIN;
+
+        local_irq_save(flags);
+
+        client->channel = channel;
+        client->nr_samples = nr_samples;
+
+        if (client->is_ts)
+                adc->ts_pend = client;
+        else
+                list_add_tail(&client->pend, &adc_pending);
+
+        if (!adc->cur)
+                s3c_adc_try(adc);
+        local_irq_restore(flags);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(s3c_adc_start);
+
+static void s3c_adc_default_select(unsigned select)
+{
+}
+
+struct s3c_adc_client *s3c_adc_register(struct platform_device *pdev,
+                                        void (*select)(unsigned int selected),
+                                        void (*conv)(unsigned d0, unsigned d1),
+                                        unsigned int is_ts)
+{
+        struct s3c_adc_client *client;
+
+        WARN_ON(!pdev);
+        WARN_ON(!conv);
+
+        if (!select)
+                select = s3c_adc_default_select;
+
+        if (!conv || !pdev)
+                return ERR_PTR(-EINVAL);
+
+        client = kzalloc(sizeof(struct s3c_adc_client), GFP_KERNEL);
+        if (!client) {
+                dev_err(&pdev->dev, "no memory for adc client\n");
+                return ERR_PTR(-ENOMEM);
+        }
+
+        client->pdev = pdev;
+        client->is_ts = is_ts;
+        client->select_cb = select;
+        client->convert_cb = conv;
+
+        return client;
+}
+EXPORT_SYMBOL_GPL(s3c_adc_register);
+
+void s3c_adc_release(struct s3c_adc_client *client)
+{
+        /* We should really check that nothing is in progress. */
+        kfree(client);
+}
+EXPORT_SYMBOL_GPL(s3c_adc_release);
+
+static irqreturn_t s3c_adc_irq(int irq, void *pw)
+{
+        struct adc_device *adc = pw;
+        struct s3c_adc_client *client = adc->cur;
+        unsigned long flags;
+        unsigned data0, data1;
+
+        if (!client) {
+                dev_warn(&adc->pdev->dev, "%s: no adc pending\n", __func__);
+                return IRQ_HANDLED;
+        }
+
+        data0 = readl(adc->regs + S3C2410_ADCDAT0);
+        data1 = readl(adc->regs + S3C2410_ADCDAT1);
+        adc_dbg(adc, "read %d: 0x%04x, 0x%04x\n", client->nr_samples, data0, data1);
+
+        (client->convert_cb)(data0 & 0x3ff, data1 & 0x3ff);
+
+        if (--client->nr_samples > 0) {
+                /* fire another conversion for this */
+
+                client->select_cb(1);
+                s3c_adc_convert(adc);
+        } else {
+                local_irq_save(flags);
+                (client->select_cb)(0);
+                adc->cur = NULL;
+
+                s3c_adc_try(adc);
+                local_irq_restore(flags);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int s3c_adc_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct adc_device *adc;
+        struct resource *regs;
+        int ret;
+
+        adc = kzalloc(sizeof(struct adc_device), GFP_KERNEL);
+        if (adc == NULL) {
+                dev_err(dev, "failed to allocate adc_device\n");
+                return -ENOMEM;
+        }
+
+        adc->pdev = pdev;
+        adc->prescale = S3C2410_ADCCON_PRSCVL(49);
+
+        adc->irq = platform_get_irq(pdev, 1);
+        if (adc->irq <= 0) {
+                dev_err(dev, "failed to get adc irq\n");
+                ret = -ENOENT;
+                goto err_alloc;
+        }
+
+        ret = request_irq(adc->irq, s3c_adc_irq, 0, dev_name(dev), adc);
+        if (ret < 0) {
+                dev_err(dev, "failed to attach adc irq\n");
+                goto err_alloc;
+        }
+
+        adc->clk = clk_get(dev, "adc");
+        if (IS_ERR(adc->clk)) {
+                dev_err(dev, "failed to get adc clock\n");
+                ret = PTR_ERR(adc->clk);
+                goto err_irq;
+        }
+
+        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!regs) {
+                dev_err(dev, "failed to find registers\n");
+                ret = -ENXIO;
+                goto err_clk;
+        }
+
+        adc->regs = ioremap(regs->start, resource_size(regs));
+        if (!adc->regs) {
+                dev_err(dev, "failed to map registers\n");
+                ret = -ENXIO;
+                goto err_clk;
+        }
+
+        clk_enable(adc->clk);
+
+        writel(adc->prescale | S3C2410_ADCCON_PRSCEN,
+               adc->regs + S3C2410_ADCCON);
+
+        dev_info(dev, "attached adc driver\n");
+
+        platform_set_drvdata(pdev, adc);
+        adc_dev = adc;
+
+        return 0;
+
+ err_clk:
+        clk_put(adc->clk);
+
+ err_irq:
+        free_irq(adc->irq, adc);
+
+ err_alloc:
+        kfree(adc);
+        return ret;
+}
+
+static int s3c_adc_remove(struct platform_device *pdev)
+{
+        struct adc_device *adc = platform_get_drvdata(pdev);
+
+        iounmap(adc->regs);
+        free_irq(adc->irq, adc);
+        clk_disable(adc->clk);
+        clk_put(adc->clk);
+        kfree(adc);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct adc_device *adc = platform_get_drvdata(pdev);
+        u32 con;
+
+        con = readl(adc->regs + S3C2410_ADCCON);
+        con |= S3C2410_ADCCON_STDBM;
+        writel(con, adc->regs + S3C2410_ADCCON);
+
+        clk_disable(adc->clk);
+
+        return 0;
+}
+
+static int s3c_adc_resume(struct platform_device *pdev)
+{
+        struct adc_device *adc = platform_get_drvdata(pdev);
+
+        clk_enable(adc->clk);
+
+        writel(adc->prescale | S3C2410_ADCCON_PRSCEN,
+               adc->regs + S3C2410_ADCCON);
+
+        return 0;
+}
+
+#else
+#define s3c_adc_suspend NULL
+#define s3c_adc_resume NULL
+#endif
+
+static struct platform_driver s3c_adc_driver = {
+        .driver         = {
+                .name   = "s3c24xx-adc",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = s3c_adc_probe,
+        .remove         = __devexit_p(s3c_adc_remove),
+        .suspend        = s3c_adc_suspend,
+        .resume         = s3c_adc_resume,
+};
+
+static int __init adc_init(void)
+{
+        int ret;
+
+        ret = platform_driver_register(&s3c_adc_driver);
+        if (ret)
+                printk(KERN_ERR "%s: failed to add adc driver\n", __func__);
+
+        return ret;
+}
+
+arch_initcall(adc_init);
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index ea445850ff47..9826efb91e48 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -372,12 +372,20 @@ static struct resource s3c_adc_resource[] = {
 };
 
 struct platform_device s3c_device_adc = {
-        .name             = "s3c2410-adc",
+        .name             = "s3c24xx-adc",
         .id               = -1,
         .num_resources    = ARRAY_SIZE(s3c_adc_resource),
         .resource         = s3c_adc_resource,
 };
 
+/* HWMON */
+
+struct platform_device s3c_device_hwmon = {
+        .name           = "s3c24xx-hwmon",
+        .id             = -1,
+        .dev.parent     = &s3c_device_adc.dev,
+};
+
 /* SDI */
 
 static struct resource s3c_sdi_resource[] = {