13 files changed, 926 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 69e9fbfea917..f5a59727949f 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -7,6 +7,7 @@
 config PLAT_S3C64XX
         bool
         depends on ARCH_S3C64XX
+        select SAMSUNG_WAKEMASK
         default y
         help
           Base platform code for any Samsung S3C64XX device
@@ -35,6 +36,11 @@ config S3C64XX_SETUP_SDHCI
           Internal configuration for default SDHCI setup for S3C6400 and
           S3C6410 SoCs.
 
+config S3C64XX_DEV_ONENAND1
+        bool
+        help
+          Compile in platform device definition for OneNAND1 controller
+
 # platform specific device setup
 
 config S3C64XX_SETUP_I2C0
@@ -90,8 +96,11 @@ config MACH_SMDK6410
         select S3C_DEV_HSMMC1
         select S3C_DEV_I2C1
         select S3C_DEV_FB
+        select SAMSUNG_DEV_TS
         select S3C_DEV_USB_HOST
         select S3C_DEV_USB_HSOTG
+        select S3C_DEV_WDT
+        select HAVE_S3C2410_WATCHDOG
         select S3C64XX_SETUP_SDHCI
         select S3C64XX_SETUP_I2C1
         select S3C64XX_SETUP_FB_24BPP
@@ -179,3 +188,34 @@ config MACH_HMT
         select HAVE_PWM
         help
           Machine support for the Airgoo HMT
+
+config MACH_SMARTQ
+        bool
+        select CPU_S3C6410
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
+        select S3C_DEV_FB
+        select S3C_DEV_HWMON
+        select S3C_DEV_RTC
+        select S3C_DEV_USB_HSOTG
+        select S3C_DEV_USB_HOST
+        select S3C64XX_SETUP_SDHCI
+        select S3C64XX_SETUP_FB_24BPP
+        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_TS
+        select HAVE_PWM
+        help
+            Shared machine support for SmartQ 5/7
+
+config MACH_SMARTQ5
+        bool "SmartQ 5"
+        select MACH_SMARTQ
+        help
+            Machine support for the SmartQ 5
+
+config MACH_SMARTQ7
+        bool "SmartQ 7"
+        select MACH_SMARTQ
+        help
+            Machine support for the SmartQ 7
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index a10f1fc6b023..9d1006938f5c 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -52,6 +52,9 @@ obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o
 obj-$(CONFIG_MACH_SMDK6410)     += mach-smdk6410.o
 obj-$(CONFIG_MACH_NCP)          += mach-ncp.o
 obj-$(CONFIG_MACH_HMT)          += mach-hmt.o
+obj-$(CONFIG_MACH_SMARTQ)       += mach-smartq.o
+obj-$(CONFIG_MACH_SMARTQ5)      += mach-smartq5.o
+obj-$(CONFIG_MACH_SMARTQ7)      += mach-smartq7.o
 
 # device support
 
@@ -59,3 +62,4 @@ obj-y				+= dev-uart.o
 obj-y                           += dev-audio.o
 obj-$(CONFIG_S3C64XX_DEV_SPI)   += dev-spi.o
 obj-$(CONFIG_S3C64XX_DEV_TS)    += dev-ts.o
+obj-$(CONFIG_S3C64XX_DEV_ONENAND1)      += dev-onenand1.o
diff --git a/arch/arm/mach-s3c64xx/dev-onenand1.c b/arch/arm/mach-s3c64xx/dev-onenand1.c
new file mode 100644
index 000000000000..92ffd5bac104
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/dev-onenand1.c
@@ -0,0 +1,55 @@
+/*
+ * linux/arch/arm/mach-s3c64xx/dev-onenand1.c
+ *
+ *  Copyright (c) 2008-2010 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * S3C64XX series device definition for OneNAND devices
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+
+#include <mach/irqs.h>
+#include <mach/map.h>
+
+static struct resource s3c64xx_onenand1_resources[] = {
+        [0] = {
+                .start  = S3C64XX_PA_ONENAND1,
+                .end    = S3C64XX_PA_ONENAND1 + 0x400 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = S3C64XX_PA_ONENAND1_BUF,
+                .end    = S3C64XX_PA_ONENAND1_BUF + S3C64XX_SZ_ONENAND1_BUF - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .start  = IRQ_ONENAND1,
+                .end    = IRQ_ONENAND1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+struct platform_device s3c64xx_device_onenand1 = {
+        .name           = "samsung-onenand",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(s3c64xx_onenand1_resources),
+        .resource       = s3c64xx_onenand1_resources,
+};
+
+void s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata)
+{
+        struct onenand_platform_data *pd;
+
+        pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL);
+        if (!pd)
+                printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+        s3c64xx_device_onenand1.dev.platform_data = pd;
+}
diff --git a/arch/arm/mach-s3c64xx/include/mach/irqs.h b/arch/arm/mach-s3c64xx/include/mach/irqs.h
index e9ab4ac0b9a8..8e2df26cf14a 100644
--- a/arch/arm/mach-s3c64xx/include/mach/irqs.h
+++ b/arch/arm/mach-s3c64xx/include/mach/irqs.h
@@ -212,5 +212,9 @@
 
 #define NR_IRQS (IRQ_BOARD_END + 1)
 
+/* Compatibility */
+
+#define IRQ_ONENAND     IRQ_ONENAND0
+
 #endif /* __ASM_MACH_S3C64XX_IRQS_H */
 
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h
index 9fdd50c8c767..e1eab3c94aea 100644
--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -52,6 +52,16 @@
 
 #define S3C64XX_PA_SROM         (0x70000000)
 
+#define S3C64XX_PA_ONENAND0     (0x70100000)
+#define S3C64XX_PA_ONENAND0_BUF (0x20000000)
+#define S3C64XX_SZ_ONENAND0_BUF (SZ_64M)
+
+/* NAND and OneNAND1 controllers occupy the same register region
+   (depending on SoC POP version) */
+#define S3C64XX_PA_ONENAND1     (0x70200000)
+#define S3C64XX_PA_ONENAND1_BUF (0x28000000)
+#define S3C64XX_SZ_ONENAND1_BUF (SZ_64M)
+
 #define S3C64XX_PA_NAND         (0x70200000)
 #define S3C64XX_PA_FB           (0x77100000)
 #define S3C64XX_PA_USB_HSOTG    (0x7C000000)
@@ -99,11 +109,15 @@
 #define S3C_PA_IIC              S3C64XX_PA_IIC0
 #define S3C_PA_IIC1             S3C64XX_PA_IIC1
 #define S3C_PA_NAND             S3C64XX_PA_NAND
+#define S3C_PA_ONENAND          S3C64XX_PA_ONENAND0
+#define S3C_PA_ONENAND_BUF      S3C64XX_PA_ONENAND0_BUF
+#define S3C_SZ_ONENAND_BUF      S3C64XX_SZ_ONENAND0_BUF
 #define S3C_PA_FB               S3C64XX_PA_FB
 #define S3C_PA_USBHOST          S3C64XX_PA_USBHOST
 #define S3C_PA_USB_HSOTG        S3C64XX_PA_USB_HSOTG
 #define S3C_VA_USB_HSPHY        S3C64XX_VA_USB_HSPHY
 #define S3C_PA_RTC              S3C64XX_PA_RTC
+#define S3C_PA_WDT              S3C64XX_PA_WATCHDOG
 
 #define SAMSUNG_PA_ADC          S3C64XX_PA_ADC
 
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c
new file mode 100644
index 000000000000..028d080dcd35
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@ -0,0 +1,363 @@
+/*
+ * linux/arch/arm/mach-s3c64xx/mach-smartq.c
+ *
+ * Copyright (C) 2010 Maurus Cuelenaere
+ *
+ * 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.
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/pwm_backlight.h>
+#include <linux/serial_core.h>
+#include <linux/usb/gpio_vbus.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/map.h>
+
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-modem.h>
+
+#include <plat/clock.h>
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/iic.h>
+#include <plat/gpio-cfg.h>
+#include <plat/hwmon.h>
+#include <plat/regs-serial.h>
+#include <plat/udc-hs.h>
+#include <plat/usb-control.h>
+#include <plat/sdhci.h>
+#include <plat/ts.h>
+
+#include <video/platform_lcd.h>
+
+#define UCON S3C2410_UCON_DEFAULT
+#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)
+#define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
+
+static struct s3c2410_uartcfg smartq_uartcfgs[] __initdata = {
+        [0] = {
+                .hwport      = 0,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [1] = {
+                .hwport      = 1,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [2] = {
+                .hwport      = 2,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+};
+
+static void smartq_usb_host_powercontrol(int port, int to)
+{
+        pr_debug("%s(%d, %d)\n", __func__, port, to);
+
+        if (port == 0) {
+                gpio_set_value(S3C64XX_GPL(0), to);
+                gpio_set_value(S3C64XX_GPL(1), to);
+        }
+}
+
+static irqreturn_t smartq_usb_host_ocirq(int irq, void *pw)
+{
+        struct s3c2410_hcd_info *info = pw;
+
+        if (gpio_get_value(S3C64XX_GPL(10)) == 0) {
+                pr_debug("%s: over-current irq (oc detected)\n", __func__);
+                s3c2410_usb_report_oc(info, 3);
+        } else {
+                pr_debug("%s: over-current irq (oc cleared)\n", __func__);
+                s3c2410_usb_report_oc(info, 0);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static void smartq_usb_host_enableoc(struct s3c2410_hcd_info *info, int on)
+{
+        int ret;
+
+        /* This isn't present on a SmartQ 5 board */
+        if (machine_is_smartq5())
+                return;
+
+        if (on) {
+                ret = request_irq(gpio_to_irq(S3C64XX_GPL(10)),
+                                  smartq_usb_host_ocirq, IRQF_DISABLED |
+                                  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                                  "USB host overcurrent", info);
+                if (ret != 0)
+                        pr_err("failed to request usb oc irq: %d\n", ret);
+        } else {
+                free_irq(gpio_to_irq(S3C64XX_GPL(10)), info);
+        }
+}
+
+static struct s3c2410_hcd_info smartq_usb_host_info = {
+        .port[0]        = {
+                .flags  = S3C_HCDFLG_USED
+        },
+        .port[1]        = {
+                .flags  = 0
+        },
+
+        .power_control  = smartq_usb_host_powercontrol,
+        .enable_oc      = smartq_usb_host_enableoc,
+};
+
+static struct gpio_vbus_mach_info smartq_usb_otg_vbus_pdata = {
+        .gpio_vbus              = S3C64XX_GPL(9),
+        .gpio_pullup            = -1,
+        .gpio_vbus_inverted     = true,
+};
+
+static struct platform_device smartq_usb_otg_vbus_dev = {
+        .name                   = "gpio-vbus",
+        .dev.platform_data      = &smartq_usb_otg_vbus_pdata,
+};
+
+static int __init smartq_bl_init(struct device *dev)
+{
+    s3c_gpio_cfgpin(S3C64XX_GPF(15), S3C_GPIO_SFN(2));
+
+    return 0;
+}
+
+static struct platform_pwm_backlight_data smartq_backlight_data = {
+        .pwm_id         = 1,
+        .max_brightness = 1000,
+        .dft_brightness = 600,
+        .pwm_period_ns  = 1000000000 / (1000 * 20),
+        .init           = smartq_bl_init,
+};
+
+static struct platform_device smartq_backlight_device = {
+        .name           = "pwm-backlight",
+        .dev            = {
+                .parent = &s3c_device_timer[1].dev,
+                .platform_data = &smartq_backlight_data,
+        },
+};
+
+static struct s3c2410_ts_mach_info smartq_touchscreen_pdata __initdata = {
+        .delay                  = 65535,
+        .presc                  = 99,
+        .oversampling_shift     = 4,
+};
+
+static struct s3c_sdhci_platdata smartq_internal_hsmmc_pdata = {
+        .max_width              = 4,
+        /*.broken_card_detection        = true,*/
+};
+
+static struct s3c_hwmon_pdata smartq_hwmon_pdata __initdata = {
+        /* Battery voltage (?-4.2V) */
+        .in[0] = &(struct s3c_hwmon_chcfg) {
+                .name           = "smartq:battery-voltage",
+                .mult           = 3300,
+                .div            = 2048,
+        },
+        /* Reference voltage (1.2V) */
+        .in[1] = &(struct s3c_hwmon_chcfg) {
+                .name           = "smartq:reference-voltage",
+                .mult           = 3300,
+                .div            = 4096,
+        },
+};
+
+static void smartq_lcd_power_set(struct plat_lcd_data *pd, unsigned int power)
+{
+        gpio_direction_output(S3C64XX_GPM(3), power);
+}
+
+static struct plat_lcd_data smartq_lcd_power_data = {
+        .set_power      = smartq_lcd_power_set,
+};
+
+static struct platform_device smartq_lcd_power_device = {
+        .name                   = "platform-lcd",
+        .dev.parent             = &s3c_device_fb.dev,
+        .dev.platform_data      = &smartq_lcd_power_data,
+};
+
+
+static struct platform_device *smartq_devices[] __initdata = {
+        &s3c_device_hsmmc1,     /* Init iNAND first, ... */
+        &s3c_device_hsmmc0,     /* ... then the external SD card */
+        &s3c_device_hsmmc2,
+        &s3c_device_adc,
+        &s3c_device_fb,
+        &s3c_device_hwmon,
+        &s3c_device_i2c0,
+        &s3c_device_ohci,
+        &s3c_device_rtc,
+        &s3c_device_timer[1],
+        &s3c_device_ts,
+        &s3c_device_usb_hsotg,
+        &smartq_backlight_device,
+        &smartq_lcd_power_device,
+        &smartq_usb_otg_vbus_dev,
+};
+
+static void __init smartq_lcd_mode_set(void)
+{
+        u32 tmp;
+
+        /* set the LCD type */
+        tmp = __raw_readl(S3C64XX_SPCON);
+        tmp &= ~S3C64XX_SPCON_LCD_SEL_MASK;
+        tmp |= S3C64XX_SPCON_LCD_SEL_RGB;
+        __raw_writel(tmp, S3C64XX_SPCON);
+
+        /* remove the LCD bypass */
+        tmp = __raw_readl(S3C64XX_MODEM_MIFPCON);
+        tmp &= ~MIFPCON_LCD_BYPASS;
+        __raw_writel(tmp, S3C64XX_MODEM_MIFPCON);
+}
+
+static void smartq_power_off(void)
+{
+        gpio_direction_output(S3C64XX_GPK(15), 1);
+}
+
+static int __init smartq_power_off_init(void)
+{
+        int ret;
+
+        ret = gpio_request(S3C64XX_GPK(15), "Power control");
+        if (ret < 0) {
+                pr_err("%s: failed to get GPK15\n", __func__);
+                return ret;
+        }
+
+        /* leave power on */
+        gpio_direction_output(S3C64XX_GPK(15), 0);
+
+
+        pm_power_off = smartq_power_off;
+
+        return ret;
+}
+
+static int __init smartq_usb_host_init(void)
+{
+        int ret;
+
+        ret = gpio_request(S3C64XX_GPL(0), "USB power control");
+        if (ret < 0) {
+                pr_err("%s: failed to get GPL0\n", __func__);
+                return ret;
+        }
+
+        ret = gpio_request(S3C64XX_GPL(1), "USB host power control");
+        if (ret < 0) {
+                pr_err("%s: failed to get GPL1\n", __func__);
+                goto err;
+        }
+
+        if (!machine_is_smartq5()) {
+                /* This isn't present on a SmartQ 5 board */
+                ret = gpio_request(S3C64XX_GPL(10), "USB host overcurrent");
+                if (ret < 0) {
+                        pr_err("%s: failed to get GPL10\n", __func__);
+                        goto err2;
+                }
+        }
+
+        /* turn power off */
+        gpio_direction_output(S3C64XX_GPL(0), 0);
+        gpio_direction_output(S3C64XX_GPL(1), 0);
+        if (!machine_is_smartq5())
+                gpio_direction_input(S3C64XX_GPL(10));
+
+        s3c_device_ohci.dev.platform_data = &smartq_usb_host_info;
+
+        return 0;
+
+err2:
+        gpio_free(S3C64XX_GPL(1));
+err:
+        gpio_free(S3C64XX_GPL(0));
+        return ret;
+}
+
+static int __init smartq_usb_otg_init(void)
+{
+        clk_xusbxti.rate = 12000000;
+
+        return 0;
+}
+
+static int __init smartq_wifi_init(void)
+{
+        int ret;
+
+        ret = gpio_request(S3C64XX_GPK(1), "wifi control");
+        if (ret < 0) {
+                pr_err("%s: failed to get GPK1\n", __func__);
+                return ret;
+        }
+
+        ret = gpio_request(S3C64XX_GPK(2), "wifi reset");
+        if (ret < 0) {
+                pr_err("%s: failed to get GPK2\n", __func__);
+                gpio_free(S3C64XX_GPK(1));
+                return ret;
+        }
+
+        /* turn power on */
+        gpio_direction_output(S3C64XX_GPK(1), 1);
+
+        /* reset device */
+        gpio_direction_output(S3C64XX_GPK(2), 0);
+        mdelay(100);
+        gpio_set_value(S3C64XX_GPK(2), 1);
+        gpio_direction_input(S3C64XX_GPK(2));
+
+        return 0;
+}
+
+static struct map_desc smartq_iodesc[] __initdata = {};
+void __init smartq_map_io(void)
+{
+        s3c64xx_init_io(smartq_iodesc, ARRAY_SIZE(smartq_iodesc));
+        s3c24xx_init_clocks(12000000);
+        s3c24xx_init_uarts(smartq_uartcfgs, ARRAY_SIZE(smartq_uartcfgs));
+
+        smartq_lcd_mode_set();
+}
+
+void __init smartq_machine_init(void)
+{
+        s3c_i2c0_set_platdata(NULL);
+        s3c_hwmon_set_platdata(&smartq_hwmon_pdata);
+        s3c_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata);
+        s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata);
+        s3c24xx_ts_set_platdata(&smartq_touchscreen_pdata);
+
+        WARN_ON(smartq_power_off_init());
+        WARN_ON(smartq_usb_host_init());
+        WARN_ON(smartq_usb_otg_init());
+        WARN_ON(smartq_wifi_init());
+
+        platform_add_devices(smartq_devices, ARRAY_SIZE(smartq_devices));
+}
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.h b/arch/arm/mach-s3c64xx/mach-smartq.h
new file mode 100644
index 000000000000..8e8b693db3af
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/mach-smartq.h
@@ -0,0 +1,20 @@
+/*
+ * linux/arch/arm/mach-s3c64xx/mach-smartq.h
+ *
+ * Copyright (C) 2010 Maurus Cuelenaere
+ *
+ * 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 __MACH_SMARTQ_H
+#define __MACH_SMARTQ_H __FILE__
+
+#include <linux/init.h>
+
+extern void __init smartq_map_io(void);
+extern void __init smartq_machine_init(void);
+
+#endif /* __MACH_SMARTQ_H */
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
new file mode 100644
index 000000000000..1d0326ead90f
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -0,0 +1,185 @@
+/*
+ * linux/arch/arm/mach-s3c64xx/mach-smartq5.c
+ *
+ * Copyright (C) 2010 Maurus Cuelenaere
+ *
+ * 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.
+ *
+ */
+
+#include <linux/fb.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/i2c-gpio.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/leds.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#include <mach/map.h>
+#include <mach/regs-fb.h>
+#include <mach/regs-gpio.h>
+#include <mach/s3c6410.h>
+
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/fb.h>
+#include <plat/gpio-cfg.h>
+
+#include "mach-smartq.h"
+
+static void __init smartq5_lcd_setup_gpio(void)
+{
+        gpio_request(S3C64XX_GPM(0), "LCD SCEN pin");
+        gpio_request(S3C64XX_GPM(1), "LCD SCL pin");
+        gpio_request(S3C64XX_GPM(2), "LCD SDA pin");
+        gpio_request(S3C64XX_GPM(3), "LCD power");
+
+        /* turn power off */
+        gpio_direction_output(S3C64XX_GPM(0), 1);
+        gpio_direction_input(S3C64XX_GPM(1));
+        gpio_direction_input(S3C64XX_GPM(2));
+        gpio_direction_output(S3C64XX_GPM(3), 0);
+}
+
+static struct i2c_gpio_platform_data smartq5_lcd_control = {
+        .sda_pin                = S3C64XX_GPM(2),
+        .scl_pin                = S3C64XX_GPM(1),
+};
+
+static struct platform_device smartq5_lcd_control_device = {
+        .name                   = "i2c-gpio",
+        .id                     = 1,
+        .dev.platform_data      = &smartq5_lcd_control,
+};
+
+static struct gpio_led smartq5_leds[] __initdata = {
+        {
+                .name                   = "smartq5:green",
+                .active_low             = 1,
+                .gpio                   = S3C64XX_GPN(8),
+        },
+        {
+                .name                   = "smartq5:red",
+                .active_low             = 1,
+                .gpio                   = S3C64XX_GPN(9),
+        },
+};
+
+static struct gpio_led_platform_data smartq5_led_data = {
+        .num_leds = ARRAY_SIZE(smartq5_leds),
+        .leds = smartq5_leds,
+};
+
+static struct platform_device smartq5_leds_device = {
+        .name                   = "leds-gpio",
+        .id                     = -1,
+        .dev.platform_data      = &smartq5_led_data,
+};
+
+/* Labels according to the SmartQ manual */
+static struct gpio_keys_button smartq5_buttons[] = {
+        {
+                .gpio                   = S3C64XX_GPL(14),
+                .code                   = KEY_POWER,
+                .desc                   = "Power",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(2),
+                .code                   = KEY_KPMINUS,
+                .desc                   = "Minus",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(12),
+                .code                   = KEY_KPPLUS,
+                .desc                   = "Plus",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(15),
+                .code                   = KEY_ENTER,
+                .desc                   = "Move",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+};
+
+static struct gpio_keys_platform_data smartq5_buttons_data  = {
+        .buttons        = smartq5_buttons,
+        .nbuttons       = ARRAY_SIZE(smartq5_buttons),
+};
+
+static struct platform_device smartq5_buttons_device  = {
+        .name           = "gpio-keys",
+        .id             = 0,
+        .num_resources  = 0,
+        .dev            = {
+                .platform_data  = &smartq5_buttons_data,
+        }
+};
+
+static struct s3c_fb_pd_win smartq5_fb_win0 = {
+        .win_mode       = {
+                .pixclock       = 1000000000000ULL /
+                                ((40+1+216+800)*(10+1+35+480)*80),
+                .left_margin    = 40,
+                .right_margin   = 216,
+                .upper_margin   = 10,
+                .lower_margin   = 35,
+                .hsync_len      = 1,
+                .vsync_len      = 1,
+                .xres           = 800,
+                .yres           = 480,
+        },
+        .max_bpp        = 32,
+        .default_bpp    = 16,
+};
+
+static struct s3c_fb_platdata smartq5_lcd_pdata __initdata = {
+        .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .win[0]         = &smartq5_fb_win0,
+        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
+                          VIDCON1_INV_VDEN,
+};
+
+static struct platform_device *smartq5_devices[] __initdata = {
+        &smartq5_leds_device,
+        &smartq5_buttons_device,
+        &smartq5_lcd_control_device,
+};
+
+static void __init smartq5_machine_init(void)
+{
+        s3c_fb_set_platdata(&smartq5_lcd_pdata);
+
+        smartq_machine_init();
+        smartq5_lcd_setup_gpio();
+
+        platform_add_devices(smartq5_devices, ARRAY_SIZE(smartq5_devices));
+}
+
+MACHINE_START(SMARTQ5, "SmartQ 5")
+        /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */
+        .phys_io        = S3C_PA_UART & 0xfff00000,
+        .io_pg_offst    = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C64XX_PA_SDRAM + 0x100,
+        .init_irq       = s3c6410_init_irq,
+        .map_io         = smartq_map_io,
+        .init_machine   = smartq5_machine_init,
+        .timer          = &s3c24xx_timer,
+MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
new file mode 100644
index 000000000000..e0bc78ecb156
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -0,0 +1,201 @@
+/*
+ * linux/arch/arm/mach-s3c64xx/mach-smartq7.c
+ *
+ * Copyright (C) 2010 Maurus Cuelenaere
+ *
+ * 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.
+ *
+ */
+
+#include <linux/fb.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/i2c-gpio.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/leds.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#include <mach/map.h>
+#include <mach/regs-fb.h>
+#include <mach/regs-gpio.h>
+#include <mach/s3c6410.h>
+
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/fb.h>
+#include <plat/gpio-cfg.h>
+
+#include "mach-smartq.h"
+
+static void __init smartq7_lcd_setup_gpio(void)
+{
+        gpio_request(S3C64XX_GPM(0), "LCD CSB pin");
+        gpio_request(S3C64XX_GPM(3), "LCD power");
+        gpio_request(S3C64XX_GPM(4), "LCD power status");
+
+        /* turn power off */
+        gpio_direction_output(S3C64XX_GPM(0), 1);
+        gpio_direction_output(S3C64XX_GPM(3), 0);
+        gpio_direction_input(S3C64XX_GPM(4));
+}
+
+static struct i2c_gpio_platform_data smartq7_lcd_control = {
+        .sda_pin                = S3C64XX_GPM(2),
+        .scl_pin                = S3C64XX_GPM(1),
+        .sda_is_open_drain      = 1,
+        .scl_is_open_drain      = 1,
+};
+
+static struct platform_device smartq7_lcd_control_device = {
+        .name                   = "i2c-gpio",
+        .id                     = 1,
+        .dev.platform_data      = &smartq7_lcd_control,
+};
+
+static struct gpio_led smartq7_leds[] __initdata = {
+        {
+                .name                   = "smartq7:red",
+                .active_low             = 1,
+                .gpio                   = S3C64XX_GPN(8),
+        },
+        {
+                .name                   = "smartq7:green",
+                .active_low             = 1,
+                .gpio                   = S3C64XX_GPN(9),
+        },
+};
+
+static struct gpio_led_platform_data smartq7_led_data = {
+        .num_leds = ARRAY_SIZE(smartq7_leds),
+        .leds = smartq7_leds,
+};
+
+static struct platform_device smartq7_leds_device = {
+        .name                   = "leds-gpio",
+        .id                     = -1,
+        .dev.platform_data      = &smartq7_led_data,
+};
+
+/* Labels according to the SmartQ manual */
+static struct gpio_keys_button smartq7_buttons[] = {
+        {
+                .gpio                   = S3C64XX_GPL(14),
+                .code                   = KEY_POWER,
+                .desc                   = "Power",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(2),
+                .code                   = KEY_FN,
+                .desc                   = "Function",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(3),
+                .code                   = KEY_KPMINUS,
+                .desc                   = "Minus",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(4),
+                .code                   = KEY_KPPLUS,
+                .desc                   = "Plus",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(12),
+                .code                   = KEY_ENTER,
+                .desc                   = "Enter",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+        {
+                .gpio                   = S3C64XX_GPN(15),
+                .code                   = KEY_ESC,
+                .desc                   = "Cancel",
+                .active_low             = 1,
+                .debounce_interval      = 5,
+                .type                   = EV_KEY,
+        },
+};
+
+static struct gpio_keys_platform_data smartq7_buttons_data  = {
+        .buttons        = smartq7_buttons,
+        .nbuttons       = ARRAY_SIZE(smartq7_buttons),
+};
+
+static struct platform_device smartq7_buttons_device  = {
+        .name           = "gpio-keys",
+        .id             = 0,
+        .num_resources  = 0,
+        .dev            = {
+                .platform_data  = &smartq7_buttons_data,
+        }
+};
+
+static struct s3c_fb_pd_win smartq7_fb_win0 = {
+        .win_mode       = {
+                .pixclock       = 1000000000000ULL /
+                                ((3+10+5+800)*(1+3+20+480)*80),
+                .left_margin    = 3,
+                .right_margin   = 5,
+                .upper_margin   = 1,
+                .lower_margin   = 20,
+                .hsync_len      = 10,
+                .vsync_len      = 3,
+                .xres           = 800,
+                .yres           = 480,
+        },
+        .max_bpp        = 32,
+        .default_bpp    = 16,
+};
+
+static struct s3c_fb_platdata smartq7_lcd_pdata __initdata = {
+        .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .win[0]         = &smartq7_fb_win0,
+        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
+                          VIDCON1_INV_VCLK,
+};
+
+static struct platform_device *smartq7_devices[] __initdata = {
+        &smartq7_leds_device,
+        &smartq7_buttons_device,
+        &smartq7_lcd_control_device,
+};
+
+static void __init smartq7_machine_init(void)
+{
+        s3c_fb_set_platdata(&smartq7_lcd_pdata);
+
+        smartq_machine_init();
+        smartq7_lcd_setup_gpio();
+
+        platform_add_devices(smartq7_devices, ARRAY_SIZE(smartq7_devices));
+}
+
+MACHINE_START(SMARTQ7, "SmartQ 7")
+        /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */
+        .phys_io        = S3C_PA_UART & 0xfff00000,
+        .io_pg_offst    = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C64XX_PA_SDRAM + 0x100,
+        .init_irq       = s3c6410_init_irq,
+        .map_io         = smartq_map_io,
+        .init_machine   = smartq7_machine_init,
+        .timer          = &s3c24xx_timer,
+MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 9d51455feb31..d9a03555f88b 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -64,6 +64,8 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/adc.h>
+#include <plat/ts.h>
 
 #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
@@ -262,6 +264,9 @@ static struct platform_device *smdk6410_devices[] __initdata = {
         &smdk6410_lcd_powerdev,
 
         &smdk6410_smsc911x,
+        &s3c_device_adc,
+        &s3c_device_ts,
+        &s3c_device_wdt,
 };
 
 #ifdef CONFIG_REGULATOR
@@ -596,6 +601,12 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
         { I2C_BOARD_INFO("24c128", 0x57), },    /* Samsung S524AD0XD1 */
 };
 
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+        .delay                  = 10000,
+        .presc                  = 49,
+        .oversampling_shift     = 2,
+};
+
 static void __init smdk6410_map_io(void)
 {
         u32 tmp;
@@ -625,6 +636,8 @@ static void __init smdk6410_machine_init(void)
         s3c_i2c1_set_platdata(NULL);
         s3c_fb_set_platdata(&smdk6410_lcd_pdata);
 
+        s3c24xx_ts_set_platdata(&s3c_ts_platform);
+
         /* configure nCS1 width to 16 bits */
 
         cs1 = __raw_readl(S3C64XX_SROM_BW) &
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index b8ac4597fad7..79412f735a8d 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -18,8 +18,11 @@
 #include <linux/io.h>
 
 #include <mach/map.h>
+#include <mach/irqs.h>
 
 #include <plat/pm.h>
+#include <plat/wakeup-mask.h>
+
 #include <mach/regs-sys.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-clock.h>
@@ -153,8 +156,25 @@ static void s3c64xx_cpu_suspend(void)
         panic("sleep resumed to originator?");
 }
 
+/* mapping of interrupts to parts of the wakeup mask */
+static struct samsung_wakeup_mask wake_irqs[] = {
+        { .irq = IRQ_RTC_ALARM, .bit = S3C64XX_PWRCFG_RTC_ALARM_DISABLE, },
+        { .irq = IRQ_RTC_TIC,   .bit = S3C64XX_PWRCFG_RTC_TICK_DISABLE, },
+        { .irq = IRQ_PENDN,     .bit = S3C64XX_PWRCFG_TS_DISABLE, },
+        { .irq = IRQ_HSMMC0,    .bit = S3C64XX_PWRCFG_MMC0_DISABLE, },
+        { .irq = IRQ_HSMMC1,    .bit = S3C64XX_PWRCFG_MMC1_DISABLE, },
+        { .irq = IRQ_HSMMC2,    .bit = S3C64XX_PWRCFG_MMC2_DISABLE, },
+        { .irq = NO_WAKEUP_IRQ, .bit = S3C64XX_PWRCFG_BATF_DISABLE},
+        { .irq = NO_WAKEUP_IRQ, .bit = S3C64XX_PWRCFG_MSM_DISABLE },
+        { .irq = NO_WAKEUP_IRQ, .bit = S3C64XX_PWRCFG_HSI_DISABLE },
+        { .irq = NO_WAKEUP_IRQ, .bit = S3C64XX_PWRCFG_MSM_DISABLE },
+};
+
 static void s3c64xx_pm_prepare(void)
 {
+        samsung_sync_wakemask(S3C64XX_PWR_CFG,
+                              wake_irqs, ARRAY_SIZE(wake_irqs));
+
         /* store address of resume. */
         __raw_writel(virt_to_phys(s3c_cpu_resume), S3C64XX_INFORM0);
 
diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
index 707e34e3afd1..5e93fe3f3f40 100644
--- a/arch/arm/mach-s3c64xx/s3c6400.c
+++ b/arch/arm/mach-s3c64xx/s3c6400.c
@@ -37,6 +37,7 @@
 #include <plat/clock.h>
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
+#include <plat/onenand-core.h>
 #include <mach/s3c6400.h>
 
 void __init s3c6400_map_io(void)
@@ -51,6 +52,9 @@ void __init s3c6400_map_io(void)
         s3c_i2c0_setname("s3c2440-i2c");
 
         s3c_device_nand.name = "s3c6400-nand";
+
+        s3c_onenand_setname("s3c6400-onenand");
+        s3c64xx_onenand1_setname("s3c6400-onenand");
 }
 
 void __init s3c6400_init_clocks(int xtal)
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
index 3ab695c691ee..014401c39f36 100644
--- a/arch/arm/mach-s3c64xx/s3c6410.c
+++ b/arch/arm/mach-s3c64xx/s3c6410.c
@@ -39,6 +39,7 @@
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
 #include <plat/adc.h>
+#include <plat/onenand-core.h>
 #include <mach/s3c6400.h>
 #include <mach/s3c6410.h>
 
@@ -55,6 +56,8 @@ void __init s3c6410_map_io(void)
 
         s3c_device_adc.name     = "s3c64xx-adc";
         s3c_device_nand.name = "s3c6400-nand";
+        s3c_onenand_setname("s3c6410-onenand");
+        s3c64xx_onenand1_setname("s3c6410-onenand");
 }
 
 void __init s3c6410_init_clocks(int xtal)