ARM: S5PV210: Remove support for board files
authorTomasz Figa <t.figa@samsung.com>
Wed, 2 Jul 2014 17:34:32 +0000 (19:34 +0200)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 18 Jul 2014 19:32:10 +0000 (04:32 +0900)
Since all in-tree boards have been moved to device tree, we can now drop
legacy code and make mach-s5pv210 DT-only. This patch does it.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
23 files changed:
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/common.c [deleted file]
arch/arm/mach-s5pv210/common.h
arch/arm/mach-s5pv210/dev-audio.c [deleted file]
arch/arm/mach-s5pv210/dma.c [deleted file]
arch/arm/mach-s5pv210/mach-aquila.c [deleted file]
arch/arm/mach-s5pv210/mach-goni.c [deleted file]
arch/arm/mach-s5pv210/mach-smdkc110.c [deleted file]
arch/arm/mach-s5pv210/mach-smdkv210.c [deleted file]
arch/arm/mach-s5pv210/mach-torbreck.c [deleted file]
arch/arm/mach-s5pv210/pm.c
arch/arm/mach-s5pv210/setup-fb-24bpp.c [deleted file]
arch/arm/mach-s5pv210/setup-fimc.c [deleted file]
arch/arm/mach-s5pv210/setup-i2c0.c
arch/arm/mach-s5pv210/setup-i2c1.c [deleted file]
arch/arm/mach-s5pv210/setup-i2c2.c [deleted file]
arch/arm/mach-s5pv210/setup-ide.c [deleted file]
arch/arm/mach-s5pv210/setup-keypad.c [deleted file]
arch/arm/mach-s5pv210/setup-sdhci-gpio.c [deleted file]
arch/arm/mach-s5pv210/setup-spi.c [deleted file]
arch/arm/mach-s5pv210/setup-usb-phy.c [deleted file]
arch/arm/plat-samsung/include/plat/cpu.h

index ed492cf10a16191b423bb3f182933228782e62ea..d6d0f9268935381fd308c9aaaaa955766e278276 100644 (file)
@@ -19,181 +19,8 @@ config CPU_S5PV210
        help
          Enable S5PV210 CPU support
 
-config S5PV210_SETUP_I2C1
-       bool
-       help
-         Common setup code for i2c bus 1.
-
-config S5PV210_SETUP_I2C2
-       bool
-       help
-         Common setup code for i2c bus 2.
-
-config S5PV210_SETUP_IDE
-       bool
-       help
-         Common setup code for S5PV210 IDE GPIO configurations
-
-config S5PV210_SETUP_FB_24BPP
-       bool
-       help
-          Common setup code for S5PV210 with an 24bpp RGB display helper.
-
-config S5PV210_SETUP_KEYPAD
-       bool
-       help
-         Common setup code for keypad.
-
-config S5PV210_SETUP_SDHCI
-        bool
-        select S5PV210_SETUP_SDHCI_GPIO
-        help
-          Internal helper functions for S5PV210 based SDHCI systems
-
-config S5PV210_SETUP_SDHCI_GPIO
-       bool
-       help
-         Common setup code for SDHCI gpio.
-
-config S5PV210_SETUP_FIMC
-       bool
-       help
-         Common setup code for the camera interfaces.
-
-config S5PV210_SETUP_SPI
-       bool
-       help
-         Common setup code for SPI GPIO configurations.
-
-config S5PV210_SETUP_USB_PHY
-       bool
-       help
-         Common setup code for USB PHY controller
-
-menu "S5PC110 Machines"
-
-config MACH_AQUILA
-       bool "Aquila"
-       select CPU_S5PV210
-       select S3C_DEV_FB
-       select S3C_DEV_HSMMC
-       select S3C_DEV_HSMMC1
-       select S3C_DEV_HSMMC2
-       select S5PV210_SETUP_FB_24BPP
-       select S5PV210_SETUP_SDHCI
-       select S5PV210_SETUP_USB_PHY
-       select S5P_DEV_FIMC0
-       select S5P_DEV_FIMC1
-       select S5P_DEV_FIMC2
-       select S5P_DEV_ONENAND
-       help
-         Machine support for the Samsung Aquila target based on S5PC110 SoC
-
-config MACH_GONI
-       bool "GONI"
-       select CPU_S5PV210
-       select S3C_DEV_FB
-       select S3C_DEV_HSMMC
-       select S3C_DEV_HSMMC1
-       select S3C_DEV_HSMMC2
-       select S3C_DEV_I2C1
-       select S3C_DEV_I2C2
-       select S3C_DEV_USB_HSOTG
-       select S5PV210_SETUP_FB_24BPP
-       select S5PV210_SETUP_FIMC
-       select S5PV210_SETUP_I2C1
-       select S5PV210_SETUP_I2C2
-       select S5PV210_SETUP_KEYPAD
-       select S5PV210_SETUP_SDHCI
-       select S5PV210_SETUP_USB_PHY
-       select S5P_DEV_FIMC0
-       select S5P_DEV_FIMC1
-       select S5P_DEV_FIMC2
-       select S5P_DEV_MFC
-       select S5P_DEV_ONENAND
-       select S5P_DEV_TV
-       select S5P_GPIO_INT
-       select SAMSUNG_DEV_KEYPAD
-       help
-         Machine support for Samsung GONI board
-         S5PC110(MCP) is one of package option of S5PV210
-
-config MACH_SMDKC110
-       bool "SMDKC110"
-       select CPU_S5PV210
-       select S3C_DEV_I2C1
-       select S3C_DEV_I2C2
-       select S3C_DEV_RTC
-       select S3C_DEV_WDT
-       select S5PV210_SETUP_I2C1
-       select S5PV210_SETUP_I2C2
-       select S5PV210_SETUP_IDE
-       select S5P_DEV_FIMC0
-       select S5P_DEV_FIMC1
-       select S5P_DEV_FIMC2
-       select S5P_DEV_MFC
-       select SAMSUNG_DEV_IDE
-       help
-         Machine support for Samsung SMDKC110
-         S5PC110(MCP) is one of package option of S5PV210
-
-endmenu
-
 menu "S5PV210 Machines"
 
-config MACH_SMDKV210
-       bool "SMDKV210"
-       select CPU_S5PV210
-       select S3C_DEV_FB
-       select S3C_DEV_HSMMC
-       select S3C_DEV_HSMMC1
-       select S3C_DEV_HSMMC2
-       select S3C_DEV_HSMMC3
-       select S3C_DEV_I2C1
-       select S3C_DEV_I2C2
-       select S3C_DEV_RTC
-       select S3C_DEV_USB_HSOTG
-       select S3C_DEV_WDT
-       select S5PV210_SETUP_FB_24BPP
-       select S5PV210_SETUP_I2C1
-       select S5PV210_SETUP_I2C2
-       select S5PV210_SETUP_IDE
-       select S5PV210_SETUP_KEYPAD
-       select S5PV210_SETUP_SDHCI
-       select S5PV210_SETUP_USB_PHY
-       select S5P_DEV_FIMC0
-       select S5P_DEV_FIMC1
-       select S5P_DEV_FIMC2
-       select S5P_DEV_JPEG
-       select S5P_DEV_MFC
-       select SAMSUNG_DEV_ADC
-       select SAMSUNG_DEV_BACKLIGHT
-       select SAMSUNG_DEV_IDE
-       select SAMSUNG_DEV_KEYPAD
-       select SAMSUNG_DEV_PWM
-       select SAMSUNG_DEV_TS
-       help
-         Machine support for Samsung SMDKV210
-
-config MACH_TORBRECK
-       bool "Torbreck"
-       select ARCH_SPARSEMEM_ENABLE
-       select CPU_S5PV210
-       select S3C_DEV_HSMMC
-       select S3C_DEV_HSMMC1
-       select S3C_DEV_HSMMC2
-       select S3C_DEV_HSMMC3
-       select S3C_DEV_I2C1
-       select S3C_DEV_I2C2
-       select S3C_DEV_RTC
-       select S3C_DEV_WDT
-       select S5PV210_SETUP_I2C1
-       select S5PV210_SETUP_I2C2
-       select S5PV210_SETUP_SDHCI
-       select SAMSUNG_DEV_IDE
-       help
-         Machine support for aESOP Torbreck
-
 config MACH_S5PV210_DT
        bool "Samsung S5PV210/S5PC110 machine using Device Tree"
        select CLKSRC_OF
index 8d87b10ea46180406649f6a5f8c9bd8df95d40dd..83993fc87d87f316f5cbfd62ceae8d7f1d17b32a 100644 (file)
@@ -12,30 +12,11 @@ obj-                                :=
 
 # Core
 
-obj-y                          += common.o
 obj-$(CONFIG_PM)               += pm.o
 
-obj-y                          += dma.o
-
 # machine support
 
-obj-$(CONFIG_MACH_AQUILA)      += mach-aquila.o
-obj-$(CONFIG_MACH_GONI)                += mach-goni.o
-obj-$(CONFIG_MACH_SMDKC110)    += mach-smdkc110.o
-obj-$(CONFIG_MACH_SMDKV210)    += mach-smdkv210.o
-obj-$(CONFIG_MACH_TORBRECK)    += mach-torbreck.o
 obj-$(CONFIG_MACH_S5PV210_DT)  += s5pv210.o
 # device support
 
-obj-y                          += dev-audio.o
-
 obj-y                                  += setup-i2c0.o
-obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)   += setup-fb-24bpp.o
-obj-$(CONFIG_S5PV210_SETUP_FIMC)       += setup-fimc.o
-obj-$(CONFIG_S5PV210_SETUP_I2C1)       += setup-i2c1.o
-obj-$(CONFIG_S5PV210_SETUP_I2C2)       += setup-i2c2.o
-obj-$(CONFIG_S5PV210_SETUP_IDE)                += setup-ide.o
-obj-$(CONFIG_S5PV210_SETUP_KEYPAD)     += setup-keypad.o
-obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
-obj-$(CONFIG_S5PV210_SETUP_SPI)                += setup-spi.o
-obj-$(CONFIG_S5PV210_SETUP_USB_PHY) += setup-usb-phy.o
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
deleted file mode 100644 (file)
index 30bd542..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Common Codes for S5PV210
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/clk.h>
-#include <linux/clk-provider.h>
-#include <linux/io.h>
-#include <linux/device.h>
-#include <clocksource/samsung_pwm.h>
-#include <linux/platform_device.h>
-#include <linux/sched.h>
-#include <linux/dma-mapping.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/of.h>
-
-#include <asm/proc-fns.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/cpu.h>
-
-#include <plat/devs.h>
-#include <plat/sdhci.h>
-#include <plat/adc-core.h>
-#include <plat/ata-core.h>
-#include <plat/fb-core.h>
-#include <plat/fimc-core.h>
-#include <plat/iic-core.h>
-#include <plat/keypad-core.h>
-#include <plat/pwm-core.h>
-#include <plat/tv-core.h>
-#include <plat/spi-core.h>
-
-#include "common.h"
-
-/* External clock frequency */
-static unsigned long xusbxti_f;
-
-static const char name_s5pv210[] = "S5PV210/S5PC110";
-
-static struct cpu_table cpu_ids[] __initdata = {
-       {
-               .idcode         = S5PV210_CPU_ID,
-               .idmask         = S5PV210_CPU_MASK,
-               .map_io         = s5pv210_map_io,
-               .init_clocks    = s5pv210_init_clocks,
-               .init_uarts     = s5pv210_init_uarts,
-               .init           = s5pv210_init,
-               .name           = name_s5pv210,
-       },
-};
-
-/* Initial IO mappings */
-
-static struct map_desc s5pv210_iodesc[] __initdata = {
-       {
-               .virtual        = (unsigned long)S5P_VA_CHIPID,
-               .pfn            = __phys_to_pfn(S5PV210_PA_CHIPID),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S3C_VA_SYS,
-               .pfn            = __phys_to_pfn(S5PV210_PA_SYSCON),
-               .length         = SZ_64K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S3C_VA_TIMER,
-               .pfn            = __phys_to_pfn(S5PV210_PA_TIMER),
-               .length         = SZ_16K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S3C_VA_WATCHDOG,
-               .pfn            = __phys_to_pfn(S5PV210_PA_WATCHDOG),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S5P_VA_SROMC,
-               .pfn            = __phys_to_pfn(S5PV210_PA_SROMC),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S5P_VA_SYSTIMER,
-               .pfn            = __phys_to_pfn(S5PV210_PA_SYSTIMER),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S5P_VA_GPIO,
-               .pfn            = __phys_to_pfn(S5PV210_PA_GPIO),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)VA_VIC0,
-               .pfn            = __phys_to_pfn(S5PV210_PA_VIC0),
-               .length         = SZ_16K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)VA_VIC1,
-               .pfn            = __phys_to_pfn(S5PV210_PA_VIC1),
-               .length         = SZ_16K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)VA_VIC2,
-               .pfn            = __phys_to_pfn(S5PV210_PA_VIC2),
-               .length         = SZ_16K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)VA_VIC3,
-               .pfn            = __phys_to_pfn(S5PV210_PA_VIC3),
-               .length         = SZ_16K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S3C_VA_UART,
-               .pfn            = __phys_to_pfn(S3C_PA_UART),
-               .length         = SZ_512K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S5P_VA_DMC0,
-               .pfn            = __phys_to_pfn(S5PV210_PA_DMC0),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S5P_VA_DMC1,
-               .pfn            = __phys_to_pfn(S5PV210_PA_DMC1),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }, {
-               .virtual        = (unsigned long)S3C_VA_USB_HSPHY,
-               .pfn            =__phys_to_pfn(S5PV210_PA_HSPHY),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE,
-       }
-};
-
-void s5pv210_restart(enum reboot_mode mode, const char *cmd)
-{
-       __raw_writel(0x1, S5P_SWRESET);
-}
-
-static struct samsung_pwm_variant s5pv210_pwm_variant = {
-       .bits           = 32,
-       .div_base       = 0,
-       .has_tint_cstat = true,
-       .tclk_mask      = (1 << 5),
-};
-
-void __init samsung_set_timer_source(unsigned int event, unsigned int source)
-{
-       s5pv210_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
-       s5pv210_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
-}
-
-void __init samsung_timer_init(void)
-{
-       unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
-               IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,
-               IRQ_TIMER3_VIC, IRQ_TIMER4_VIC,
-       };
-
-       samsung_pwm_clocksource_init(S3C_VA_TIMER,
-                                       timer_irqs, &s5pv210_pwm_variant);
-}
-
-/*
- * s5pv210_map_io
- *
- * register the standard cpu IO areas
- */
-
-void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
-{
-       /* initialize the io descriptors we need for initialization */
-       iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
-       if (mach_desc)
-               iotable_init(mach_desc, size);
-
-       /* detect cpu id and rev. */
-       s5p_init_cpu(S5P_VA_CHIPID);
-
-       s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
-
-       samsung_pwm_set_platdata(&s5pv210_pwm_variant);
-}
-
-void __init s5pv210_map_io(void)
-{
-       /* initialise device information early */
-       s5pv210_default_sdhci0();
-       s5pv210_default_sdhci1();
-       s5pv210_default_sdhci2();
-       s5pv210_default_sdhci3();
-
-       s3c_adc_setname("samsung-adc-v3");
-
-       s3c_cfcon_setname("s5pv210-pata");
-
-       s3c_fimc_setname(0, "s5pv210-fimc");
-       s3c_fimc_setname(1, "s5pv210-fimc");
-       s3c_fimc_setname(2, "s5pv210-fimc");
-
-       /* the i2c devices are directly compatible with s3c2440 */
-       s3c_i2c0_setname("s3c2440-i2c");
-       s3c_i2c1_setname("s3c2440-i2c");
-       s3c_i2c2_setname("s3c2440-i2c");
-
-       s3c_fb_setname("s5pv210-fb");
-
-       /* Use s5pv210-keypad instead of samsung-keypad */
-       samsung_keypad_setname("s5pv210-keypad");
-
-       /* setup TV devices */
-       s5p_hdmi_setname("s5pv210-hdmi");
-
-       s3c64xx_spi_setname("s5pv210-spi");
-}
-
-void __init s5pv210_init_clocks(int xtal)
-{
-       xusbxti_f = xtal;
-}
-
-void __init s5pv210_init_irq(void)
-{
-       u32 vic[4];     /* S5PV210 supports 4 VIC */
-
-       s5pv210_clk_init(0, xusbxti_f, S3C_VA_SYS);
-
-       /* All the VICs are fully populated. */
-       vic[0] = ~0;
-       vic[1] = ~0;
-       vic[2] = ~0;
-       vic[3] = ~0;
-
-       s5p_init_irq(vic, ARRAY_SIZE(vic));
-}
-
-struct bus_type s5pv210_subsys = {
-       .name           = "s5pv210-core",
-       .dev_name       = "s5pv210-core",
-};
-
-static struct device s5pv210_dev = {
-       .bus    = &s5pv210_subsys,
-};
-
-static int __init s5pv210_core_init(void)
-{
-       return subsys_system_register(&s5pv210_subsys, NULL);
-}
-core_initcall(s5pv210_core_init);
-
-int __init s5pv210_init(void)
-{
-       printk(KERN_INFO "S5PV210: Initializing architecture\n");
-       return device_register(&s5pv210_dev);
-}
-
-/* uart registration process */
-
-void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-       s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
-}
index 083ffe7b5079c4342cb1376dbb558d75dead3d19..0b694c798ad1b24de84c1df20196fbabb37cf75e 100644 (file)
 #ifndef __ARCH_ARM_MACH_S5PV210_COMMON_H
 #define __ARCH_ARM_MACH_S5PV210_COMMON_H
 
-#include <linux/reboot.h>
-
-void s5pv210_clk_init(unsigned long xxti_f, unsigned long xusbxti_f,
-                     void __iomem *reg_base);
-
-void s5pv210_init_io(struct map_desc *mach_desc, int size);
-void s5pv210_init_irq(void);
-
-void s5pv210_register_clocks(void);
-void s5pv210_setup_clocks(void);
-
-void s5pv210_restart(enum reboot_mode mode, const char *cmd);
-
-extern  int s5pv210_init(void);
-extern void s5pv210_map_io(void);
-extern void s5pv210_init_clocks(int xtal);
-extern void s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no);
 
 #endif /* __ARCH_ARM_MACH_S5PV210_COMMON_H */
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
deleted file mode 100644 (file)
index 2d67361..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/dev-audio.c
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- *     Jaswinder Singh <jassi.brar@samsung.com>
- *
- * 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/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <plat/gpio-cfg.h>
-#include <linux/platform_data/asoc-s3c.h>
-
-#include <mach/map.h>
-#include <mach/dma.h>
-#include <mach/irqs.h>
-
-#define S5PV210_AUDSS_INT_MEM  (0xC0000000)
-
-static int s5pv210_cfg_i2s(struct platform_device *pdev)
-{
-       /* configure GPIO for i2s port */
-       switch (pdev->id) {
-       case 0:
-               s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
-               break;
-       case 1:
-               s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(2));
-               break;
-       case 2:
-               s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(4));
-               break;
-       default:
-               printk(KERN_ERR "Invalid Device %d\n", pdev->id);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static struct s3c_audio_pdata i2sv5_pdata = {
-       .cfg_gpio = s5pv210_cfg_i2s,
-       .type = {
-               .i2s = {
-                       .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
-                                        | QUIRK_NEED_RSTCLR,
-                       .idma_addr = S5PV210_AUDSS_INT_MEM,
-               },
-       },
-};
-
-static struct resource s5pv210_iis0_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_IIS0, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_I2S0_TX),
-       [2] = DEFINE_RES_DMA(DMACH_I2S0_RX),
-       [3] = DEFINE_RES_DMA(DMACH_I2S0S_TX),
-};
-
-struct platform_device s5pv210_device_iis0 = {
-       .name = "samsung-i2s",
-       .id = 0,
-       .num_resources    = ARRAY_SIZE(s5pv210_iis0_resource),
-       .resource         = s5pv210_iis0_resource,
-       .dev = {
-               .platform_data = &i2sv5_pdata,
-       },
-};
-
-static struct s3c_audio_pdata i2sv3_pdata = {
-       .cfg_gpio = s5pv210_cfg_i2s,
-};
-
-static struct resource s5pv210_iis1_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_IIS1, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_I2S1_TX),
-       [2] = DEFINE_RES_DMA(DMACH_I2S1_RX),
-};
-
-struct platform_device s5pv210_device_iis1 = {
-       .name             = "samsung-i2s",
-       .id               = 1,
-       .num_resources    = ARRAY_SIZE(s5pv210_iis1_resource),
-       .resource         = s5pv210_iis1_resource,
-       .dev = {
-               .platform_data = &i2sv3_pdata,
-       },
-};
-
-static struct resource s5pv210_iis2_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_IIS2, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_I2S2_TX),
-       [2] = DEFINE_RES_DMA(DMACH_I2S2_RX),
-};
-
-struct platform_device s5pv210_device_iis2 = {
-       .name             = "samsung-i2s",
-       .id               = 2,
-       .num_resources    = ARRAY_SIZE(s5pv210_iis2_resource),
-       .resource         = s5pv210_iis2_resource,
-       .dev = {
-               .platform_data = &i2sv3_pdata,
-       },
-};
-
-/* PCM Controller platform_devices */
-
-static int s5pv210_pcm_cfg_gpio(struct platform_device *pdev)
-{
-       switch (pdev->id) {
-       case 0:
-               s3c_gpio_cfgpin_range(S5PV210_GPI(0), 5, S3C_GPIO_SFN(3));
-               break;
-       case 1:
-               s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(3));
-               break;
-       case 2:
-               s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(2));
-               break;
-       default:
-               printk(KERN_DEBUG "Invalid PCM Controller number!");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static struct s3c_audio_pdata s3c_pcm_pdata = {
-       .cfg_gpio = s5pv210_pcm_cfg_gpio,
-};
-
-static struct resource s5pv210_pcm0_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_PCM0, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_PCM0_TX),
-       [2] = DEFINE_RES_DMA(DMACH_PCM0_RX),
-};
-
-struct platform_device s5pv210_device_pcm0 = {
-       .name             = "samsung-pcm",
-       .id               = 0,
-       .num_resources    = ARRAY_SIZE(s5pv210_pcm0_resource),
-       .resource         = s5pv210_pcm0_resource,
-       .dev = {
-               .platform_data = &s3c_pcm_pdata,
-       },
-};
-
-static struct resource s5pv210_pcm1_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_PCM1, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_PCM1_TX),
-       [2] = DEFINE_RES_DMA(DMACH_PCM1_RX),
-};
-
-struct platform_device s5pv210_device_pcm1 = {
-       .name             = "samsung-pcm",
-       .id               = 1,
-       .num_resources    = ARRAY_SIZE(s5pv210_pcm1_resource),
-       .resource         = s5pv210_pcm1_resource,
-       .dev = {
-               .platform_data = &s3c_pcm_pdata,
-       },
-};
-
-static struct resource s5pv210_pcm2_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_PCM2, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_PCM2_TX),
-       [2] = DEFINE_RES_DMA(DMACH_PCM2_RX),
-};
-
-struct platform_device s5pv210_device_pcm2 = {
-       .name             = "samsung-pcm",
-       .id               = 2,
-       .num_resources    = ARRAY_SIZE(s5pv210_pcm2_resource),
-       .resource         = s5pv210_pcm2_resource,
-       .dev = {
-               .platform_data = &s3c_pcm_pdata,
-       },
-};
-
-/* AC97 Controller platform devices */
-
-static int s5pv210_ac97_cfg_gpio(struct platform_device *pdev)
-{
-       return s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(4));
-}
-
-static struct resource s5pv210_ac97_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_AC97, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_AC97_PCMOUT),
-       [2] = DEFINE_RES_DMA(DMACH_AC97_PCMIN),
-       [3] = DEFINE_RES_DMA(DMACH_AC97_MICIN),
-       [4] = DEFINE_RES_IRQ(IRQ_AC97),
-};
-
-static struct s3c_audio_pdata s3c_ac97_pdata = {
-       .cfg_gpio = s5pv210_ac97_cfg_gpio,
-};
-
-static u64 s5pv210_ac97_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pv210_device_ac97 = {
-       .name             = "samsung-ac97",
-       .id               = -1,
-       .num_resources    = ARRAY_SIZE(s5pv210_ac97_resource),
-       .resource         = s5pv210_ac97_resource,
-       .dev = {
-               .platform_data = &s3c_ac97_pdata,
-               .dma_mask = &s5pv210_ac97_dmamask,
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-       },
-};
-
-/* S/PDIF Controller platform_device */
-
-static int s5pv210_spdif_cfg_gpio(struct platform_device *pdev)
-{
-       s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 2, S3C_GPIO_SFN(3));
-
-       return 0;
-}
-
-static struct resource s5pv210_spdif_resource[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_SPDIF, SZ_256),
-       [1] = DEFINE_RES_DMA(DMACH_SPDIF),
-};
-
-static struct s3c_audio_pdata samsung_spdif_pdata = {
-       .cfg_gpio = s5pv210_spdif_cfg_gpio,
-};
-
-static u64 s5pv210_spdif_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pv210_device_spdif = {
-       .name           = "samsung-spdif",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(s5pv210_spdif_resource),
-       .resource       = s5pv210_spdif_resource,
-       .dev = {
-               .platform_data = &samsung_spdif_pdata,
-               .dma_mask = &s5pv210_spdif_dmamask,
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-       },
-};
diff --git a/arch/arm/mach-s5pv210/dma.c b/arch/arm/mach-s5pv210/dma.c
deleted file mode 100644 (file)
index b8337e2..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/dma.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *     Jaswinder Singh <jassi.brar@samsung.com>
- *
- * 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, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/pl330.h>
-
-#include <asm/irq.h>
-#include <plat/devs.h>
-#include <plat/irqs.h>
-
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <mach/dma.h>
-
-static u8 pdma0_peri[] = {
-       DMACH_UART0_RX,
-       DMACH_UART0_TX,
-       DMACH_UART1_RX,
-       DMACH_UART1_TX,
-       DMACH_UART2_RX,
-       DMACH_UART2_TX,
-       DMACH_UART3_RX,
-       DMACH_UART3_TX,
-       DMACH_MAX,
-       DMACH_I2S0_RX,
-       DMACH_I2S0_TX,
-       DMACH_I2S0S_TX,
-       DMACH_I2S1_RX,
-       DMACH_I2S1_TX,
-       DMACH_MAX,
-       DMACH_MAX,
-       DMACH_SPI0_RX,
-       DMACH_SPI0_TX,
-       DMACH_SPI1_RX,
-       DMACH_SPI1_TX,
-       DMACH_MAX,
-       DMACH_MAX,
-       DMACH_AC97_MICIN,
-       DMACH_AC97_PCMIN,
-       DMACH_AC97_PCMOUT,
-       DMACH_MAX,
-       DMACH_PWM,
-       DMACH_SPDIF,
-};
-
-static struct dma_pl330_platdata s5pv210_pdma0_pdata = {
-       .nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-       .peri_id = pdma0_peri,
-};
-
-static AMBA_AHB_DEVICE(s5pv210_pdma0, "dma-pl330.0", 0x00041330,
-       S5PV210_PA_PDMA0, {IRQ_PDMA0}, &s5pv210_pdma0_pdata);
-
-static u8 pdma1_peri[] = {
-       DMACH_UART0_RX,
-       DMACH_UART0_TX,
-       DMACH_UART1_RX,
-       DMACH_UART1_TX,
-       DMACH_UART2_RX,
-       DMACH_UART2_TX,
-       DMACH_UART3_RX,
-       DMACH_UART3_TX,
-       DMACH_MAX,
-       DMACH_I2S0_RX,
-       DMACH_I2S0_TX,
-       DMACH_I2S0S_TX,
-       DMACH_I2S1_RX,
-       DMACH_I2S1_TX,
-       DMACH_I2S2_RX,
-       DMACH_I2S2_TX,
-       DMACH_SPI0_RX,
-       DMACH_SPI0_TX,
-       DMACH_SPI1_RX,
-       DMACH_SPI1_TX,
-       DMACH_MAX,
-       DMACH_MAX,
-       DMACH_PCM0_RX,
-       DMACH_PCM0_TX,
-       DMACH_PCM1_RX,
-       DMACH_PCM1_TX,
-       DMACH_MSM_REQ0,
-       DMACH_MSM_REQ1,
-       DMACH_MSM_REQ2,
-       DMACH_MSM_REQ3,
-       DMACH_PCM2_RX,
-       DMACH_PCM2_TX,
-};
-
-static struct dma_pl330_platdata s5pv210_pdma1_pdata = {
-       .nr_valid_peri = ARRAY_SIZE(pdma1_peri),
-       .peri_id = pdma1_peri,
-};
-
-static AMBA_AHB_DEVICE(s5pv210_pdma1, "dma-pl330.1", 0x00041330,
-       S5PV210_PA_PDMA1, {IRQ_PDMA1}, &s5pv210_pdma1_pdata);
-
-static int __init s5pv210_dma_init(void)
-{
-       dma_cap_set(DMA_SLAVE, s5pv210_pdma0_pdata.cap_mask);
-       dma_cap_set(DMA_CYCLIC, s5pv210_pdma0_pdata.cap_mask);
-       amba_device_register(&s5pv210_pdma0_device, &iomem_resource);
-
-       dma_cap_set(DMA_SLAVE, s5pv210_pdma1_pdata.cap_mask);
-       dma_cap_set(DMA_CYCLIC, s5pv210_pdma1_pdata.cap_mask);
-       amba_device_register(&s5pv210_pdma1_device, &iomem_resource);
-
-       return 0;
-}
-arch_initcall(s5pv210_dma_init);
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
deleted file mode 100644 (file)
index cc37eda..0000000
+++ /dev/null
@@ -1,687 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-aquila.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * 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/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/fb.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/mfd/max8998.h>
-#include <linux/mfd/wm8994/pdata.h>
-#include <linux/regulator/fixed.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/gpio.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <video/samsung_fimd.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/fb.h>
-#include <plat/fimc-core.h>
-#include <plat/sdhci.h>
-#include <plat/samsung-time.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define AQUILA_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |        \
-                                S3C2410_UCON_RXILEVEL |        \
-                                S3C2410_UCON_TXIRQMODE |       \
-                                S3C2410_UCON_RXIRQMODE |       \
-                                S3C2410_UCON_RXFIFO_TOI |      \
-                                S3C2443_UCON_RXERR_IRQEN)
-
-#define AQUILA_ULCON_DEFAULT   S3C2410_LCON_CS8
-
-#define AQUILA_UFCON_DEFAULT   S3C2410_UFCON_FIFOMODE
-
-static struct s3c2410_uartcfg aquila_uartcfgs[] __initdata = {
-       [0] = {
-               .hwport         = 0,
-               .flags          = 0,
-               .ucon           = AQUILA_UCON_DEFAULT,
-               .ulcon          = AQUILA_ULCON_DEFAULT,
-               /*
-                * Actually UART0 can support 256 bytes fifo, but aquila board
-                * supports 128 bytes fifo because of initial chip bug
-                */
-               .ufcon          = AQUILA_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG128 | S5PV210_UFCON_RXTRIG128,
-       },
-       [1] = {
-               .hwport         = 1,
-               .flags          = 0,
-               .ucon           = AQUILA_UCON_DEFAULT,
-               .ulcon          = AQUILA_ULCON_DEFAULT,
-               .ufcon          = AQUILA_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG64 | S5PV210_UFCON_RXTRIG64,
-       },
-       [2] = {
-               .hwport         = 2,
-               .flags          = 0,
-               .ucon           = AQUILA_UCON_DEFAULT,
-               .ulcon          = AQUILA_ULCON_DEFAULT,
-               .ufcon          = AQUILA_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-       },
-       [3] = {
-               .hwport         = 3,
-               .flags          = 0,
-               .ucon           = AQUILA_UCON_DEFAULT,
-               .ulcon          = AQUILA_ULCON_DEFAULT,
-               .ufcon          = AQUILA_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-       },
-};
-
-/* Frame Buffer */
-static struct s3c_fb_pd_win aquila_fb_win0 = {
-       .max_bpp = 32,
-       .default_bpp = 16,
-       .xres = 480,
-       .yres = 800,
-};
-
-static struct s3c_fb_pd_win aquila_fb_win1 = {
-       .max_bpp = 32,
-       .default_bpp = 16,
-       .xres = 480,
-       .yres = 800,
-};
-
-static struct fb_videomode aquila_lcd_timing = {
-       .left_margin = 16,
-       .right_margin = 16,
-       .upper_margin = 3,
-       .lower_margin = 28,
-       .hsync_len = 2,
-       .vsync_len = 2,
-       .xres = 480,
-       .yres = 800,
-};
-
-static struct s3c_fb_platdata aquila_lcd_pdata __initdata = {
-       .win[0]         = &aquila_fb_win0,
-       .win[1]         = &aquila_fb_win1,
-       .vtiming        = &aquila_lcd_timing,
-       .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-       .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
-                         VIDCON1_INV_VCLK | VIDCON1_INV_VDEN,
-       .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,
-};
-
-/* MAX8998 regulators */
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-
-static struct regulator_init_data aquila_ldo2_data = {
-       .constraints    = {
-               .name           = "VALIVE_1.1V",
-               .min_uV         = 1100000,
-               .max_uV         = 1100000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-               .state_mem      = {
-                       .enabled = 1,
-               },
-       },
-};
-
-static struct regulator_init_data aquila_ldo3_data = {
-       .constraints    = {
-               .name           = "VUSB+MIPI_1.1V",
-               .min_uV         = 1100000,
-               .max_uV         = 1100000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo4_data = {
-       .constraints    = {
-               .name           = "VDAC_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo5_data = {
-       .constraints    = {
-               .name           = "VTF_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo6_data = {
-       .constraints    = {
-               .name           = "VCC_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo7_data = {
-       .constraints    = {
-               .name           = "VCC_3.0V",
-               .min_uV         = 3000000,
-               .max_uV         = 3000000,
-               .apply_uV       = 1,
-               .boot_on        = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo8_data = {
-       .constraints    = {
-               .name           = "VUSB+VADC_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo9_data = {
-       .constraints    = {
-               .name           = "VCC+VCAM_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo10_data = {
-       .constraints    = {
-               .name           = "VPLL_1.1V",
-               .min_uV         = 1100000,
-               .max_uV         = 1100000,
-               .apply_uV       = 1,
-               .boot_on        = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo11_data = {
-       .constraints    = {
-               .name           = "CAM_IO_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo12_data = {
-       .constraints    = {
-               .name           = "CAM_ISP_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo13_data = {
-       .constraints    = {
-               .name           = "CAM_A_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo14_data = {
-       .constraints    = {
-               .name           = "CAM_CIF_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo15_data = {
-       .constraints    = {
-               .name           = "CAM_AF_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo16_data = {
-       .constraints    = {
-               .name           = "VMIPI_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data aquila_ldo17_data = {
-       .constraints    = {
-               .name           = "CAM_8M_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-/* BUCK */
-static struct regulator_consumer_supply buck1_consumer =
-       REGULATOR_SUPPLY("vddarm", NULL);
-
-static struct regulator_consumer_supply buck2_consumer =
-       REGULATOR_SUPPLY("vddint", NULL);
-
-static struct regulator_init_data aquila_buck1_data = {
-       .constraints    = {
-               .name           = "VARM_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                 REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &buck1_consumer,
-};
-
-static struct regulator_init_data aquila_buck2_data = {
-       .constraints    = {
-               .name           = "VINT_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                 REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &buck2_consumer,
-};
-
-static struct regulator_init_data aquila_buck3_data = {
-       .constraints    = {
-               .name           = "VCC_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-               .state_mem      = {
-                       .enabled = 1,
-               },
-       },
-};
-
-static struct regulator_init_data aquila_buck4_data = {
-       .constraints    = {
-               .name           = "CAM_CORE_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct max8998_regulator_data aquila_regulators[] = {
-       { MAX8998_LDO2,  &aquila_ldo2_data },
-       { MAX8998_LDO3,  &aquila_ldo3_data },
-       { MAX8998_LDO4,  &aquila_ldo4_data },
-       { MAX8998_LDO5,  &aquila_ldo5_data },
-       { MAX8998_LDO6,  &aquila_ldo6_data },
-       { MAX8998_LDO7,  &aquila_ldo7_data },
-       { MAX8998_LDO8,  &aquila_ldo8_data },
-       { MAX8998_LDO9,  &aquila_ldo9_data },
-       { MAX8998_LDO10, &aquila_ldo10_data },
-       { MAX8998_LDO11, &aquila_ldo11_data },
-       { MAX8998_LDO12, &aquila_ldo12_data },
-       { MAX8998_LDO13, &aquila_ldo13_data },
-       { MAX8998_LDO14, &aquila_ldo14_data },
-       { MAX8998_LDO15, &aquila_ldo15_data },
-       { MAX8998_LDO16, &aquila_ldo16_data },
-       { MAX8998_LDO17, &aquila_ldo17_data },
-       { MAX8998_BUCK1, &aquila_buck1_data },
-       { MAX8998_BUCK2, &aquila_buck2_data },
-       { MAX8998_BUCK3, &aquila_buck3_data },
-       { MAX8998_BUCK4, &aquila_buck4_data },
-};
-
-static struct max8998_platform_data aquila_max8998_pdata = {
-       .num_regulators = ARRAY_SIZE(aquila_regulators),
-       .regulators     = aquila_regulators,
-       .buck1_set1     = S5PV210_GPH0(3),
-       .buck1_set2     = S5PV210_GPH0(4),
-       .buck2_set3     = S5PV210_GPH0(5),
-       .buck1_voltage  = { 1200000, 1200000, 1200000, 1200000 },
-       .buck2_voltage  = { 1200000, 1200000 },
-};
-#endif
-
-static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
-       REGULATOR_SUPPLY("DBVDD", "5-001a"),
-       REGULATOR_SUPPLY("AVDD2", "5-001a"),
-       REGULATOR_SUPPLY("CPVDD", "5-001a"),
-};
-
-static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
-       REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
-       REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
-};
-
-static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
-       .constraints = {
-               .always_on = 1,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage0_supplies),
-       .consumer_supplies      = wm8994_fixed_voltage0_supplies,
-};
-
-static struct regulator_init_data wm8994_fixed_voltage1_init_data = {
-       .constraints = {
-               .always_on = 1,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage1_supplies),
-       .consumer_supplies      = wm8994_fixed_voltage1_supplies,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage0_config = {
-       .supply_name    = "VCC_1.8V_PDA",
-       .microvolts     = 1800000,
-       .gpio           = -EINVAL,
-       .init_data      = &wm8994_fixed_voltage0_init_data,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage1_config = {
-       .supply_name    = "V_BAT",
-       .microvolts     = 3700000,
-       .gpio           = -EINVAL,
-       .init_data      = &wm8994_fixed_voltage1_init_data,
-};
-
-static struct platform_device wm8994_fixed_voltage0 = {
-       .name           = "reg-fixed-voltage",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &wm8994_fixed_voltage0_config,
-       },
-};
-
-static struct platform_device wm8994_fixed_voltage1 = {
-       .name           = "reg-fixed-voltage",
-       .id             = 1,
-       .dev            = {
-               .platform_data  = &wm8994_fixed_voltage1_config,
-       },
-};
-
-static struct regulator_consumer_supply wm8994_avdd1_supply =
-       REGULATOR_SUPPLY("AVDD1", "5-001a");
-
-static struct regulator_consumer_supply wm8994_dcvdd_supply =
-       REGULATOR_SUPPLY("DCVDD", "5-001a");
-
-static struct regulator_init_data wm8994_ldo1_data = {
-       .constraints    = {
-               .name           = "AVDD1_3.0V",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &wm8994_avdd1_supply,
-};
-
-static struct regulator_init_data wm8994_ldo2_data = {
-       .constraints    = {
-               .name           = "DCVDD_1.0V",
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &wm8994_dcvdd_supply,
-};
-
-static struct wm8994_pdata wm8994_platform_data = {
-       /* configure gpio1 function: 0x0001(Logic level input/output) */
-       .gpio_defaults[0] = 0x0001,
-       /* configure gpio3/4/5/7 function for AIF2 voice */
-       .gpio_defaults[2] = 0x8100,
-       .gpio_defaults[3] = 0x8100,
-       .gpio_defaults[4] = 0x8100,
-       .gpio_defaults[6] = 0x0100,
-       /* configure gpio8/9/10/11 function for AIF3 BT */
-       .gpio_defaults[7] = 0x8100,
-       .gpio_defaults[8] = 0x0100,
-       .gpio_defaults[9] = 0x0100,
-       .gpio_defaults[10] = 0x0100,
-       .ldo[0] = { S5PV210_MP03(6), &wm8994_ldo1_data },       /* XM0FRNB_2 */
-       .ldo[1] = { 0, &wm8994_ldo2_data },
-};
-
-/* GPIO I2C PMIC */
-#define AP_I2C_GPIO_PMIC_BUS_4 4
-static struct i2c_gpio_platform_data aquila_i2c_gpio_pmic_data = {
-       .sda_pin        = S5PV210_GPJ4(0),      /* XMSMCSN */
-       .scl_pin        = S5PV210_GPJ4(3),      /* XMSMIRQN */
-};
-
-static struct platform_device aquila_i2c_gpio_pmic = {
-       .name           = "i2c-gpio",
-       .id             = AP_I2C_GPIO_PMIC_BUS_4,
-       .dev            = {
-               .platform_data = &aquila_i2c_gpio_pmic_data,
-       },
-};
-
-static struct i2c_board_info i2c_gpio_pmic_devs[] __initdata = {
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-       {
-               /* 0xCC when SRAD = 0 */
-               I2C_BOARD_INFO("max8998", 0xCC >> 1),
-               .platform_data = &aquila_max8998_pdata,
-       },
-#endif
-};
-
-/* GPIO I2C AP 1.8V */
-#define AP_I2C_GPIO_BUS_5      5
-static struct i2c_gpio_platform_data aquila_i2c_gpio5_data = {
-       .sda_pin        = S5PV210_MP05(3),      /* XM0ADDR_11 */
-       .scl_pin        = S5PV210_MP05(2),      /* XM0ADDR_10 */
-};
-
-static struct platform_device aquila_i2c_gpio5 = {
-       .name           = "i2c-gpio",
-       .id             = AP_I2C_GPIO_BUS_5,
-       .dev            = {
-               .platform_data  = &aquila_i2c_gpio5_data,
-       },
-};
-
-static struct i2c_board_info i2c_gpio5_devs[] __initdata = {
-       {
-               /* CS/ADDR = low 0x34 (FYI: high = 0x36) */
-               I2C_BOARD_INFO("wm8994", 0x1a),
-               .platform_data  = &wm8994_platform_data,
-       },
-};
-
-/* PMIC Power button */
-static struct gpio_keys_button aquila_gpio_keys_table[] = {
-       {
-               .code           = KEY_POWER,
-               .gpio           = S5PV210_GPH2(6),
-               .desc           = "gpio-keys: KEY_POWER",
-               .type           = EV_KEY,
-               .active_low     = 1,
-               .wakeup         = 1,
-               .debounce_interval = 1,
-       },
-};
-
-static struct gpio_keys_platform_data aquila_gpio_keys_data = {
-       .buttons        = aquila_gpio_keys_table,
-       .nbuttons       = ARRAY_SIZE(aquila_gpio_keys_table),
-};
-
-static struct platform_device aquila_device_gpiokeys = {
-       .name = "gpio-keys",
-       .dev = {
-               .platform_data = &aquila_gpio_keys_data,
-       },
-};
-
-static void __init aquila_pmic_init(void)
-{
-       /* AP_PMIC_IRQ: EINT7 */
-       s3c_gpio_cfgpin(S5PV210_GPH0(7), S3C_GPIO_SFN(0xf));
-       s3c_gpio_setpull(S5PV210_GPH0(7), S3C_GPIO_PULL_UP);
-
-       /* nPower: EINT22 */
-       s3c_gpio_cfgpin(S5PV210_GPH2(6), S3C_GPIO_SFN(0xf));
-       s3c_gpio_setpull(S5PV210_GPH2(6), S3C_GPIO_PULL_UP);
-}
-
-/* MoviNAND */
-static struct s3c_sdhci_platdata aquila_hsmmc0_data __initdata = {
-       .max_width              = 4,
-       .cd_type                = S3C_SDHCI_CD_PERMANENT,
-};
-
-/* Wireless LAN */
-static struct s3c_sdhci_platdata aquila_hsmmc1_data __initdata = {
-       .max_width              = 4,
-       .cd_type                = S3C_SDHCI_CD_EXTERNAL,
-       /* ext_cd_{init,cleanup} callbacks will be added later */
-};
-
-/* External Flash */
-#define AQUILA_EXT_FLASH_EN    S5PV210_MP05(4)
-#define AQUILA_EXT_FLASH_CD    S5PV210_GPH3(4)
-static struct s3c_sdhci_platdata aquila_hsmmc2_data __initdata = {
-       .max_width              = 4,
-       .cd_type                = S3C_SDHCI_CD_GPIO,
-       .ext_cd_gpio            = AQUILA_EXT_FLASH_CD,
-       .ext_cd_gpio_invert     = 1,
-};
-
-static void aquila_setup_sdhci(void)
-{
-       gpio_request_one(AQUILA_EXT_FLASH_EN, GPIOF_OUT_INIT_HIGH, "FLASH_EN");
-
-       s3c_sdhci0_set_platdata(&aquila_hsmmc0_data);
-       s3c_sdhci1_set_platdata(&aquila_hsmmc1_data);
-       s3c_sdhci2_set_platdata(&aquila_hsmmc2_data);
-};
-
-/* Audio device */
-static struct platform_device aquila_device_audio = {
-       .name = "smdk-audio",
-       .id = -1,
-};
-
-static struct platform_device *aquila_devices[] __initdata = {
-       &aquila_i2c_gpio_pmic,
-       &aquila_i2c_gpio5,
-       &aquila_device_gpiokeys,
-       &aquila_device_audio,
-       &s3c_device_fb,
-       &s5p_device_onenand,
-       &s3c_device_hsmmc0,
-       &s3c_device_hsmmc1,
-       &s3c_device_hsmmc2,
-       &s5p_device_fimc0,
-       &s5p_device_fimc1,
-       &s5p_device_fimc2,
-       &s5p_device_fimc_md,
-       &s5pv210_device_iis0,
-       &wm8994_fixed_voltage0,
-       &wm8994_fixed_voltage1,
-};
-
-static void __init aquila_sound_init(void)
-{
-       unsigned int gpio;
-
-       /* CODEC_XTAL_EN
-        *
-        * The Aquila board have a oscillator which provide main clock
-        * to WM8994 codec. The oscillator provide 24MHz clock to WM8994
-        * clock. Set gpio setting of "CODEC_XTAL_EN" to enable a oscillator.
-        * */
-       gpio = S5PV210_GPH3(2);         /* XEINT_26 */
-       gpio_request(gpio, "CODEC_XTAL_EN");
-       s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT);
-       s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
-
-       /* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
-        * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS)
-        * because it needs 24MHz clock to operate WM8994 codec.
-        */
-       __raw_writel(__raw_readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
-}
-
-static void __init aquila_map_io(void)
-{
-       s5pv210_init_io(NULL, 0);
-       s3c24xx_init_clocks(24000000);
-       s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs));
-       samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init aquila_machine_init(void)
-{
-       /* PMIC */
-       aquila_pmic_init();
-       i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs,
-                       ARRAY_SIZE(i2c_gpio_pmic_devs));
-       /* SDHCI */
-       aquila_setup_sdhci();
-
-       s3c_fimc_setname(0, "s5p-fimc");
-       s3c_fimc_setname(1, "s5p-fimc");
-       s3c_fimc_setname(2, "s5p-fimc");
-
-       /* SOUND */
-       aquila_sound_init();
-       i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
-                       ARRAY_SIZE(i2c_gpio5_devs));
-
-       /* FB */
-       s3c_fb_set_platdata(&aquila_lcd_pdata);
-
-       platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices));
-}
-
-MACHINE_START(AQUILA, "Aquila")
-       /* Maintainers:
-          Marek Szyprowski <m.szyprowski@samsung.com>
-          Kyungmin Park <kyungmin.park@samsung.com> */
-       .atag_offset    = 0x100,
-       .init_irq       = s5pv210_init_irq,
-       .map_io         = aquila_map_io,
-       .init_machine   = aquila_machine_init,
-       .init_time      = samsung_timer_init,
-       .restart        = s5pv210_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
deleted file mode 100644 (file)
index 315926f..0000000
+++ /dev/null
@@ -1,915 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-goni.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * 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/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/fb.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/i2c/atmel_mxt_ts.h>
-#include <linux/mfd/max8998.h>
-#include <linux/mfd/wm8994/pdata.h>
-#include <linux/regulator/fixed.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_gpio.h>
-#include <linux/lcd.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/gpio.h>
-#include <linux/mmc/host.h>
-#include <linux/interrupt.h>
-#include <linux/platform_data/s3c-hsotg.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <video/samsung_fimd.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/fb.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/keypad.h>
-#include <plat/sdhci.h>
-#include <plat/samsung-time.h>
-#include <plat/mfc.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define GONI_UCON_DEFAULT      (S3C2410_UCON_TXILEVEL |        \
-                                S3C2410_UCON_RXILEVEL |        \
-                                S3C2410_UCON_TXIRQMODE |       \
-                                S3C2410_UCON_RXIRQMODE |       \
-                                S3C2410_UCON_RXFIFO_TOI |      \
-                                S3C2443_UCON_RXERR_IRQEN)
-
-#define GONI_ULCON_DEFAULT     S3C2410_LCON_CS8
-
-#define GONI_UFCON_DEFAULT     S3C2410_UFCON_FIFOMODE
-
-static struct s3c2410_uartcfg goni_uartcfgs[] __initdata = {
-       [0] = {
-               .hwport         = 0,
-               .flags          = 0,
-               .ucon           = GONI_UCON_DEFAULT,
-               .ulcon          = GONI_ULCON_DEFAULT,
-               .ufcon          = GONI_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG256 | S5PV210_UFCON_RXTRIG256,
-       },
-       [1] = {
-               .hwport         = 1,
-               .flags          = 0,
-               .ucon           = GONI_UCON_DEFAULT,
-               .ulcon          = GONI_ULCON_DEFAULT,
-               .ufcon          = GONI_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG64 | S5PV210_UFCON_RXTRIG64,
-       },
-       [2] = {
-               .hwport         = 2,
-               .flags          = 0,
-               .ucon           = GONI_UCON_DEFAULT,
-               .ulcon          = GONI_ULCON_DEFAULT,
-               .ufcon          = GONI_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-       },
-       [3] = {
-               .hwport         = 3,
-               .flags          = 0,
-               .ucon           = GONI_UCON_DEFAULT,
-               .ulcon          = GONI_ULCON_DEFAULT,
-               .ufcon          = GONI_UFCON_DEFAULT |
-                       S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-       },
-};
-
-/* Frame Buffer */
-static struct s3c_fb_pd_win goni_fb_win0 = {
-       .max_bpp        = 32,
-       .default_bpp    = 16,
-       .xres           = 480,
-       .yres           = 800,
-       .virtual_x      = 480,
-       .virtual_y      = 2 * 800,
-};
-
-static struct fb_videomode goni_lcd_timing = {
-       .left_margin    = 16,
-       .right_margin   = 16,
-       .upper_margin   = 2,
-       .lower_margin   = 28,
-       .hsync_len      = 2,
-       .vsync_len      = 1,
-       .xres           = 480,
-       .yres           = 800,
-       .refresh        = 55,
-};
-
-static struct s3c_fb_platdata goni_lcd_pdata __initdata = {
-       .win[0]         = &goni_fb_win0,
-       .vtiming        = &goni_lcd_timing,
-       .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB |
-                         VIDCON0_CLKSEL_LCD,
-       .vidcon1        = VIDCON1_INV_VCLK | VIDCON1_INV_VDEN
-                         | VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
-       .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,
-};
-
-static int lcd_power_on(struct lcd_device *ld, int enable)
-{
-       return 1;
-}
-
-static int reset_lcd(struct lcd_device *ld)
-{
-       static unsigned int first = 1;
-       int reset_gpio = -1;
-
-       reset_gpio = S5PV210_MP05(5);
-
-       if (first) {
-               gpio_request(reset_gpio, "MLCD_RST");
-               first = 0;
-       }
-
-       gpio_direction_output(reset_gpio, 1);
-       return 1;
-}
-
-static struct lcd_platform_data goni_lcd_platform_data = {
-       .reset                  = reset_lcd,
-       .power_on               = lcd_power_on,
-       .lcd_enabled            = 0,
-       .reset_delay            = 120,  /* 120ms */
-       .power_on_delay         = 25,   /* 25ms */
-       .power_off_delay        = 200,  /* 200ms */
-};
-
-#define LCD_BUS_NUM    3
-static struct spi_board_info spi_board_info[] __initdata = {
-       {
-               .modalias       = "s6e63m0",
-               .platform_data  = &goni_lcd_platform_data,
-               .max_speed_hz   = 1200000,
-               .bus_num        = LCD_BUS_NUM,
-               .chip_select    = 0,
-               .mode           = SPI_MODE_3,
-               .controller_data = (void *)S5PV210_MP01(1), /* DISPLAY_CS */
-       },
-};
-
-static struct spi_gpio_platform_data lcd_spi_gpio_data = {
-       .sck    = S5PV210_MP04(1), /* DISPLAY_CLK */
-       .mosi   = S5PV210_MP04(3), /* DISPLAY_SI */
-       .miso   = SPI_GPIO_NO_MISO,
-       .num_chipselect = 1,
-};
-
-static struct platform_device goni_spi_gpio = {
-       .name   = "spi_gpio",
-       .id     = LCD_BUS_NUM,
-       .dev    = {
-               .parent         = &s3c_device_fb.dev,
-               .platform_data  = &lcd_spi_gpio_data,
-       },
-};
-
-/* KEYPAD */
-static uint32_t keymap[] __initdata = {
-       /* KEY(row, col, keycode) */
-       KEY(0, 1, KEY_MENU),            /* Send */
-       KEY(0, 2, KEY_BACK),            /* End */
-       KEY(1, 1, KEY_CONFIG),          /* Half shot */
-       KEY(1, 2, KEY_VOLUMEUP),
-       KEY(2, 1, KEY_CAMERA),          /* Full shot */
-       KEY(2, 2, KEY_VOLUMEDOWN),
-};
-
-static struct matrix_keymap_data keymap_data __initdata = {
-       .keymap         = keymap,
-       .keymap_size    = ARRAY_SIZE(keymap),
-};
-
-static struct samsung_keypad_platdata keypad_data __initdata = {
-       .keymap_data    = &keymap_data,
-       .rows           = 3,
-       .cols           = 3,
-};
-
-/* Radio */
-static struct i2c_board_info i2c1_devs[] __initdata = {
-       {
-               I2C_BOARD_INFO("si470x", 0x10),
-       },
-};
-
-static void __init goni_radio_init(void)
-{
-       int gpio;
-
-       gpio = S5PV210_GPJ2(4);                 /* XMSMDATA_4 */
-       gpio_request(gpio, "FM_INT");
-       s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf));
-       i2c1_devs[0].irq = gpio_to_irq(gpio);
-
-       gpio = S5PV210_GPJ2(5);                 /* XMSMDATA_5 */
-       gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "FM_RST");
-}
-
-/* TSP */
-static struct mxt_platform_data qt602240_platform_data = {
-       .irqflags       = IRQF_TRIGGER_FALLING,
-};
-
-static struct s3c2410_platform_i2c i2c2_data __initdata = {
-       .flags          = 0,
-       .bus_num        = 2,
-       .slave_addr     = 0x10,
-       .frequency      = 400 * 1000,
-       .sda_delay      = 100,
-};
-
-static struct i2c_board_info i2c2_devs[] __initdata = {
-       {
-               I2C_BOARD_INFO("qt602240_ts", 0x4a),
-               .platform_data = &qt602240_platform_data,
-       },
-};
-
-static void __init goni_tsp_init(void)
-{
-       int gpio;
-
-       gpio = S5PV210_GPJ1(3);         /* XMSMADDR_11 */
-       gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");
-       gpio_export(gpio, 0);
-
-       gpio = S5PV210_GPJ0(5);         /* XMSMADDR_5 */
-       gpio_request(gpio, "TSP_INT");
-
-       s5p_register_gpio_interrupt(gpio);
-       s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf));
-       s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP);
-       i2c2_devs[0].irq = gpio_to_irq(gpio);
-}
-
-/* USB OTG */
-static struct s3c_hsotg_plat goni_hsotg_pdata;
-
-/* MAX8998 regulators */
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-
-static struct regulator_consumer_supply goni_ldo3_consumers[] = {
-       REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
-};
-
-static struct regulator_consumer_supply goni_ldo5_consumers[] = {
-       REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),
-};
-
-static struct regulator_consumer_supply goni_ldo8_consumers[] = {
-       REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"),
-       REGULATOR_SUPPLY("vdd33a_dac", "s5p-sdo"),
-};
-
-static struct regulator_consumer_supply goni_ldo11_consumers[] = {
-       REGULATOR_SUPPLY("vddio", "0-0030"), /* "CAM_IO_2.8V" */
-};
-
-static struct regulator_consumer_supply goni_ldo13_consumers[] = {
-       REGULATOR_SUPPLY("vdda", "0-0030"), /* "CAM_A_2.8V" */
-};
-
-static struct regulator_consumer_supply goni_ldo14_consumers[] = {
-       REGULATOR_SUPPLY("vdd_core", "0-0030"), /* "CAM_CIF_1.8V" */
-};
-
-static struct regulator_init_data goni_ldo2_data = {
-       .constraints    = {
-               .name           = "VALIVE_1.1V",
-               .min_uV         = 1100000,
-               .max_uV         = 1100000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-               .state_mem      = {
-                       .enabled = 1,
-               },
-       },
-};
-
-static struct regulator_init_data goni_ldo3_data = {
-       .constraints    = {
-               .name           = "VUSB+MIPI_1.1V",
-               .min_uV         = 1100000,
-               .max_uV         = 1100000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies = ARRAY_SIZE(goni_ldo3_consumers),
-       .consumer_supplies = goni_ldo3_consumers,
-};
-
-static struct regulator_init_data goni_ldo4_data = {
-       .constraints    = {
-               .name           = "VDAC_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo5_data = {
-       .constraints    = {
-               .name           = "VTF_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies = ARRAY_SIZE(goni_ldo5_consumers),
-       .consumer_supplies = goni_ldo5_consumers,
-};
-
-static struct regulator_init_data goni_ldo6_data = {
-       .constraints    = {
-               .name           = "VCC_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo7_data = {
-       .constraints    = {
-               .name           = "VLCD_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo8_data = {
-       .constraints    = {
-               .name           = "VUSB+VADC_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies = ARRAY_SIZE(goni_ldo8_consumers),
-       .consumer_supplies = goni_ldo8_consumers,
-};
-
-static struct regulator_init_data goni_ldo9_data = {
-       .constraints    = {
-               .name           = "VCC+VCAM_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo10_data = {
-       .constraints    = {
-               .name           = "VPLL_1.1V",
-               .min_uV         = 1100000,
-               .max_uV         = 1100000,
-               .apply_uV       = 1,
-               .boot_on        = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo11_data = {
-       .constraints    = {
-               .name           = "CAM_IO_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(goni_ldo11_consumers),
-       .consumer_supplies      = goni_ldo11_consumers,
-};
-
-static struct regulator_init_data goni_ldo12_data = {
-       .constraints    = {
-               .name           = "CAM_ISP_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo13_data = {
-       .constraints    = {
-               .name           = "CAM_A_2.8V",
-               .min_uV         = 2800000,
-               .max_uV         = 2800000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(goni_ldo13_consumers),
-       .consumer_supplies      = goni_ldo13_consumers,
-};
-
-static struct regulator_init_data goni_ldo14_data = {
-       .constraints    = {
-               .name           = "CAM_CIF_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(goni_ldo14_consumers),
-       .consumer_supplies      = goni_ldo14_consumers,
-};
-
-static struct regulator_init_data goni_ldo15_data = {
-       .constraints    = {
-               .name           = "CAM_AF_3.3V",
-               .min_uV         = 3300000,
-               .max_uV         = 3300000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo16_data = {
-       .constraints    = {
-               .name           = "VMIPI_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-       },
-};
-
-static struct regulator_init_data goni_ldo17_data = {
-       .constraints    = {
-               .name           = "VCC_3.0V_LCD",
-               .min_uV         = 3000000,
-               .max_uV         = 3000000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-/* BUCK */
-static struct regulator_consumer_supply buck1_consumer =
-       REGULATOR_SUPPLY("vddarm", NULL);
-
-static struct regulator_consumer_supply buck2_consumer =
-       REGULATOR_SUPPLY("vddint", NULL);
-
-static struct regulator_consumer_supply buck3_consumer =
-       REGULATOR_SUPPLY("vdet", "s5p-sdo");
-
-
-static struct regulator_init_data goni_buck1_data = {
-       .constraints    = {
-               .name           = "VARM_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                 REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &buck1_consumer,
-};
-
-static struct regulator_init_data goni_buck2_data = {
-       .constraints    = {
-               .name           = "VINT_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                 REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &buck2_consumer,
-};
-
-static struct regulator_init_data goni_buck3_data = {
-       .constraints    = {
-               .name           = "VCC_1.8V",
-               .min_uV         = 1800000,
-               .max_uV         = 1800000,
-               .apply_uV       = 1,
-               .state_mem      = {
-                       .enabled = 1,
-               },
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &buck3_consumer,
-};
-
-static struct regulator_init_data goni_buck4_data = {
-       .constraints    = {
-               .name           = "CAM_CORE_1.2V",
-               .min_uV         = 1200000,
-               .max_uV         = 1200000,
-               .apply_uV       = 1,
-               .always_on      = 1,
-       },
-};
-
-static struct max8998_regulator_data goni_regulators[] = {
-       { MAX8998_LDO2,  &goni_ldo2_data },
-       { MAX8998_LDO3,  &goni_ldo3_data },
-       { MAX8998_LDO4,  &goni_ldo4_data },
-       { MAX8998_LDO5,  &goni_ldo5_data },
-       { MAX8998_LDO6,  &goni_ldo6_data },
-       { MAX8998_LDO7,  &goni_ldo7_data },
-       { MAX8998_LDO8,  &goni_ldo8_data },
-       { MAX8998_LDO9,  &goni_ldo9_data },
-       { MAX8998_LDO10, &goni_ldo10_data },
-       { MAX8998_LDO11, &goni_ldo11_data },
-       { MAX8998_LDO12, &goni_ldo12_data },
-       { MAX8998_LDO13, &goni_ldo13_data },
-       { MAX8998_LDO14, &goni_ldo14_data },
-       { MAX8998_LDO15, &goni_ldo15_data },
-       { MAX8998_LDO16, &goni_ldo16_data },
-       { MAX8998_LDO17, &goni_ldo17_data },
-       { MAX8998_BUCK1, &goni_buck1_data },
-       { MAX8998_BUCK2, &goni_buck2_data },
-       { MAX8998_BUCK3, &goni_buck3_data },
-       { MAX8998_BUCK4, &goni_buck4_data },
-};
-
-static struct max8998_platform_data goni_max8998_pdata = {
-       .num_regulators = ARRAY_SIZE(goni_regulators),
-       .regulators     = goni_regulators,
-       .buck1_set1     = S5PV210_GPH0(3),
-       .buck1_set2     = S5PV210_GPH0(4),
-       .buck2_set3     = S5PV210_GPH0(5),
-       .buck1_voltage  = { 1200000, 1200000, 1200000, 1200000 },
-       .buck2_voltage  = { 1200000, 1200000 },
-};
-#endif
-
-static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
-       REGULATOR_SUPPLY("DBVDD", "5-001a"),
-       REGULATOR_SUPPLY("AVDD2", "5-001a"),
-       REGULATOR_SUPPLY("CPVDD", "5-001a"),
-};
-
-static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
-       REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
-       REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
-};
-
-static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
-       .constraints = {
-               .always_on = 1,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage0_supplies),
-       .consumer_supplies      = wm8994_fixed_voltage0_supplies,
-};
-
-static struct regulator_init_data wm8994_fixed_voltage1_init_data = {
-       .constraints = {
-               .always_on = 1,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage1_supplies),
-       .consumer_supplies      = wm8994_fixed_voltage1_supplies,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage0_config = {
-       .supply_name    = "VCC_1.8V_PDA",
-       .microvolts     = 1800000,
-       .gpio           = -EINVAL,
-       .init_data      = &wm8994_fixed_voltage0_init_data,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage1_config = {
-       .supply_name    = "V_BAT",
-       .microvolts     = 3700000,
-       .gpio           = -EINVAL,
-       .init_data      = &wm8994_fixed_voltage1_init_data,
-};
-
-static struct platform_device wm8994_fixed_voltage0 = {
-       .name           = "reg-fixed-voltage",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &wm8994_fixed_voltage0_config,
-       },
-};
-
-static struct platform_device wm8994_fixed_voltage1 = {
-       .name           = "reg-fixed-voltage",
-       .id             = 1,
-       .dev            = {
-               .platform_data  = &wm8994_fixed_voltage1_config,
-       },
-};
-
-static struct regulator_consumer_supply wm8994_avdd1_supply =
-       REGULATOR_SUPPLY("AVDD1", "5-001a");
-
-static struct regulator_consumer_supply wm8994_dcvdd_supply =
-       REGULATOR_SUPPLY("DCVDD", "5-001a");
-
-static struct regulator_init_data wm8994_ldo1_data = {
-       .constraints    = {
-               .name           = "AVDD1_3.0V",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &wm8994_avdd1_supply,
-};
-
-static struct regulator_init_data wm8994_ldo2_data = {
-       .constraints    = {
-               .name           = "DCVDD_1.0V",
-       },
-       .num_consumer_supplies  = 1,
-       .consumer_supplies      = &wm8994_dcvdd_supply,
-};
-
-static struct wm8994_pdata wm8994_platform_data = {
-       /* configure gpio1 function: 0x0001(Logic level input/output) */
-       .gpio_defaults[0] = 0x0001,
-       /* configure gpio3/4/5/7 function for AIF2 voice */
-       .gpio_defaults[2] = 0x8100,
-       .gpio_defaults[3] = 0x8100,
-       .gpio_defaults[4] = 0x8100,
-       .gpio_defaults[6] = 0x0100,
-       /* configure gpio8/9/10/11 function for AIF3 BT */
-       .gpio_defaults[7] = 0x8100,
-       .gpio_defaults[8] = 0x0100,
-       .gpio_defaults[9] = 0x0100,
-       .gpio_defaults[10] = 0x0100,
-       .ldo[0] = { S5PV210_MP03(6), &wm8994_ldo1_data },       /* XM0FRNB_2 */
-       .ldo[1] = { 0, &wm8994_ldo2_data },
-};
-
-/* GPIO I2C PMIC */
-#define AP_I2C_GPIO_PMIC_BUS_4 4
-static struct i2c_gpio_platform_data goni_i2c_gpio_pmic_data = {
-       .sda_pin        = S5PV210_GPJ4(0),      /* XMSMCSN */
-       .scl_pin        = S5PV210_GPJ4(3),      /* XMSMIRQN */
-};
-
-static struct platform_device goni_i2c_gpio_pmic = {
-       .name           = "i2c-gpio",
-       .id             = AP_I2C_GPIO_PMIC_BUS_4,
-       .dev            = {
-               .platform_data  = &goni_i2c_gpio_pmic_data,
-       },
-};
-
-static struct i2c_board_info i2c_gpio_pmic_devs[] __initdata = {
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-       {
-               /* 0xCC when SRAD = 0 */
-               I2C_BOARD_INFO("max8998", 0xCC >> 1),
-               .platform_data = &goni_max8998_pdata,
-       },
-#endif
-};
-
-/* GPIO I2C AP 1.8V */
-#define AP_I2C_GPIO_BUS_5      5
-static struct i2c_gpio_platform_data goni_i2c_gpio5_data = {
-       .sda_pin        = S5PV210_MP05(3),      /* XM0ADDR_11 */
-       .scl_pin        = S5PV210_MP05(2),      /* XM0ADDR_10 */
-};
-
-static struct platform_device goni_i2c_gpio5 = {
-       .name           = "i2c-gpio",
-       .id             = AP_I2C_GPIO_BUS_5,
-       .dev            = {
-               .platform_data  = &goni_i2c_gpio5_data,
-       },
-};
-
-static struct i2c_board_info i2c_gpio5_devs[] __initdata = {
-       {
-               /* CS/ADDR = low 0x34 (FYI: high = 0x36) */
-               I2C_BOARD_INFO("wm8994", 0x1a),
-               .platform_data  = &wm8994_platform_data,
-       },
-};
-
-/* PMIC Power button */
-static struct gpio_keys_button goni_gpio_keys_table[] = {
-       {
-               .code           = KEY_POWER,
-               .gpio           = S5PV210_GPH2(6),
-               .desc           = "gpio-keys: KEY_POWER",
-               .type           = EV_KEY,
-               .active_low     = 1,
-               .wakeup         = 1,
-               .debounce_interval = 1,
-       },
-};
-
-static struct gpio_keys_platform_data goni_gpio_keys_data = {
-       .buttons        = goni_gpio_keys_table,
-       .nbuttons       = ARRAY_SIZE(goni_gpio_keys_table),
-};
-
-static struct platform_device goni_device_gpiokeys = {
-       .name = "gpio-keys",
-       .dev = {
-               .platform_data = &goni_gpio_keys_data,
-       },
-};
-
-static void __init goni_pmic_init(void)
-{
-       /* AP_PMIC_IRQ: EINT7 */
-       s3c_gpio_cfgpin(S5PV210_GPH0(7), S3C_GPIO_SFN(0xf));
-       s3c_gpio_setpull(S5PV210_GPH0(7), S3C_GPIO_PULL_UP);
-
-       /* nPower: EINT22 */
-       s3c_gpio_cfgpin(S5PV210_GPH2(6), S3C_GPIO_SFN(0xf));
-       s3c_gpio_setpull(S5PV210_GPH2(6), S3C_GPIO_PULL_UP);
-}
-
-/* MoviNAND */
-static struct s3c_sdhci_platdata goni_hsmmc0_data __initdata = {
-       .max_width              = 4,
-       .cd_type                = S3C_SDHCI_CD_PERMANENT,
-};
-
-/* Wireless LAN */
-static struct s3c_sdhci_platdata goni_hsmmc1_data __initdata = {
-       .max_width              = 4,
-       .cd_type                = S3C_SDHCI_CD_EXTERNAL,
-       /* ext_cd_{init,cleanup} callbacks will be added later */
-};
-
-/* External Flash */
-#define GONI_EXT_FLASH_EN      S5PV210_MP05(4)
-#define GONI_EXT_FLASH_CD      S5PV210_GPH3(4)
-static struct s3c_sdhci_platdata goni_hsmmc2_data __initdata = {
-       .max_width              = 4,
-       .cd_type                = S3C_SDHCI_CD_GPIO,
-       .ext_cd_gpio            = GONI_EXT_FLASH_CD,
-       .ext_cd_gpio_invert     = 1,
-};
-
-static struct regulator_consumer_supply mmc2_supplies[] = {
-       REGULATOR_SUPPLY("vmmc", "s3c-sdhci.2"),
-};
-
-static struct regulator_init_data mmc2_fixed_voltage_init_data = {
-       .constraints            = {
-               .name           = "V_TF_2.8V",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .num_consumer_supplies  = ARRAY_SIZE(mmc2_supplies),
-       .consumer_supplies      = mmc2_supplies,
-};
-
-static struct fixed_voltage_config mmc2_fixed_voltage_config = {
-       .supply_name            = "EXT_FLASH_EN",
-       .microvolts             = 2800000,
-       .gpio                   = GONI_EXT_FLASH_EN,
-       .enable_high            = true,
-       .init_data              = &mmc2_fixed_voltage_init_data,
-};
-
-static struct platform_device mmc2_fixed_voltage = {
-       .name           = "reg-fixed-voltage",
-       .id             = 2,
-       .dev            = {
-               .platform_data  = &mmc2_fixed_voltage_config,
-       },
-};
-
-static void goni_setup_sdhci(void)
-{
-       s3c_sdhci0_set_platdata(&goni_hsmmc0_data);
-       s3c_sdhci1_set_platdata(&goni_hsmmc1_data);
-       s3c_sdhci2_set_platdata(&goni_hsmmc2_data);
-};
-
-/* Audio device */
-static struct platform_device goni_device_audio = {
-       .name = "smdk-audio",
-       .id = -1,
-};
-
-static struct platform_device *goni_devices[] __initdata = {
-       &s3c_device_fb,
-       &s5p_device_onenand,
-       &goni_spi_gpio,
-       &goni_i2c_gpio_pmic,
-       &goni_i2c_gpio5,
-       &goni_device_audio,
-       &mmc2_fixed_voltage,
-       &goni_device_gpiokeys,
-       &s5p_device_mfc,
-       &s5p_device_mfc_l,
-       &s5p_device_mfc_r,
-       &s5p_device_mixer,
-       &s5p_device_sdo,
-       &s3c_device_i2c0,
-       &s3c_device_hsmmc0,
-       &s3c_device_hsmmc1,
-       &s3c_device_hsmmc2,
-       &s5pv210_device_iis0,
-       &s3c_device_usb_hsotg,
-       &samsung_device_keypad,
-       &s3c_device_i2c1,
-       &s3c_device_i2c2,
-       &wm8994_fixed_voltage0,
-       &wm8994_fixed_voltage1,
-};
-
-static void __init goni_sound_init(void)
-{
-       /* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
-        * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS)
-        * because it needs 24MHz clock to operate WM8994 codec.
-        */
-       __raw_writel(__raw_readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
-}
-
-static void __init goni_map_io(void)
-{
-       s5pv210_init_io(NULL, 0);
-       s3c24xx_init_clocks(24000000);
-       s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));
-       samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init goni_reserve(void)
-{
-       s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
-}
-
-static void __init goni_machine_init(void)
-{
-       /* Radio: call before I2C 1 registeration */
-       goni_radio_init();
-
-       /* I2C0 */
-       s3c_i2c0_set_platdata(NULL);
-
-       /* I2C1 */
-       s3c_i2c1_set_platdata(NULL);
-       i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
-
-       /* TSP: call before I2C 2 registeration */
-       goni_tsp_init();
-
-       /* I2C2 */
-       s3c_i2c2_set_platdata(&i2c2_data);
-       i2c_register_board_info(2, i2c2_devs, ARRAY_SIZE(i2c2_devs));
-
-       /* PMIC */
-       goni_pmic_init();
-       i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs,
-                       ARRAY_SIZE(i2c_gpio_pmic_devs));
-       /* SDHCI */
-       goni_setup_sdhci();
-
-       /* SOUND */
-       goni_sound_init();
-       i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
-                       ARRAY_SIZE(i2c_gpio5_devs));
-
-       /* FB */
-       s3c_fb_set_platdata(&goni_lcd_pdata);
-
-       s3c_hsotg_set_platdata(&goni_hsotg_pdata);
-
-       /* SPI */
-       spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
-
-       /* KEYPAD */
-       samsung_keypad_set_platdata(&keypad_data);
-
-       platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices));
-}
-
-MACHINE_START(GONI, "GONI")
-       /* Maintainers: Kyungmin Park <kyungmin.park@samsung.com> */
-       .atag_offset    = 0x100,
-       .init_irq       = s5pv210_init_irq,
-       .map_io         = goni_map_io,
-       .init_machine   = goni_machine_init,
-       .init_time      = samsung_timer_init,
-       .reserve        = &goni_reserve,
-       .restart        = s5pv210_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
deleted file mode 100644 (file)
index 448e1d2..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-smdkc110.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * 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/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/i2c.h>
-#include <linux/device.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <linux/platform_data/ata-samsung_cf.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/pm.h>
-#include <plat/samsung-time.h>
-#include <plat/mfc.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define SMDKC110_UCON_DEFAULT  (S3C2410_UCON_TXILEVEL |        \
-                                S3C2410_UCON_RXILEVEL |        \
-                                S3C2410_UCON_TXIRQMODE |       \
-                                S3C2410_UCON_RXIRQMODE |       \
-                                S3C2410_UCON_RXFIFO_TOI |      \
-                                S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDKC110_ULCON_DEFAULT S3C2410_LCON_CS8
-
-#define SMDKC110_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE |       \
-                                S5PV210_UFCON_TXTRIG4 |        \
-                                S5PV210_UFCON_RXTRIG4)
-
-static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
-       [0] = {
-               .hwport         = 0,
-               .flags          = 0,
-               .ucon           = SMDKC110_UCON_DEFAULT,
-               .ulcon          = SMDKC110_ULCON_DEFAULT,
-               .ufcon          = SMDKC110_UFCON_DEFAULT,
-       },
-       [1] = {
-               .hwport         = 1,
-               .flags          = 0,
-               .ucon           = SMDKC110_UCON_DEFAULT,
-               .ulcon          = SMDKC110_ULCON_DEFAULT,
-               .ufcon          = SMDKC110_UFCON_DEFAULT,
-       },
-       [2] = {
-               .hwport         = 2,
-               .flags          = 0,
-               .ucon           = SMDKC110_UCON_DEFAULT,
-               .ulcon          = SMDKC110_ULCON_DEFAULT,
-               .ufcon          = SMDKC110_UFCON_DEFAULT,
-       },
-       [3] = {
-               .hwport         = 3,
-               .flags          = 0,
-               .ucon           = SMDKC110_UCON_DEFAULT,
-               .ulcon          = SMDKC110_ULCON_DEFAULT,
-               .ufcon          = SMDKC110_UFCON_DEFAULT,
-       },
-};
-
-static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = {
-       .setup_gpio     = s5pv210_ide_setup_gpio,
-};
-
-static struct platform_device *smdkc110_devices[] __initdata = {
-       &s5pv210_device_iis0,
-       &s5pv210_device_ac97,
-       &s5pv210_device_spdif,
-       &s3c_device_cfcon,
-       &s3c_device_i2c0,
-       &s3c_device_i2c1,
-       &s3c_device_i2c2,
-       &s3c_device_rtc,
-       &s3c_device_wdt,
-       &s5p_device_fimc0,
-       &s5p_device_fimc1,
-       &s5p_device_fimc2,
-       &s5p_device_fimc_md,
-       &s5p_device_mfc,
-       &s5p_device_mfc_l,
-       &s5p_device_mfc_r,
-};
-
-static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
-       { I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung S524AD0XD1 */
-       { I2C_BOARD_INFO("wm8580", 0x1b), },
-};
-
-static struct i2c_board_info smdkc110_i2c_devs1[] __initdata = {
-       /* To Be Updated */
-};
-
-static struct i2c_board_info smdkc110_i2c_devs2[] __initdata = {
-       /* To Be Updated */
-};
-
-static void __init smdkc110_map_io(void)
-{
-       s5pv210_init_io(NULL, 0);
-       s3c24xx_init_clocks(24000000);
-       s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));
-       samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init smdkc110_reserve(void)
-{
-       s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
-}
-
-static void __init smdkc110_machine_init(void)
-{
-       s3c_pm_init();
-
-       s3c_i2c0_set_platdata(NULL);
-       s3c_i2c1_set_platdata(NULL);
-       s3c_i2c2_set_platdata(NULL);
-       i2c_register_board_info(0, smdkc110_i2c_devs0,
-                       ARRAY_SIZE(smdkc110_i2c_devs0));
-       i2c_register_board_info(1, smdkc110_i2c_devs1,
-                       ARRAY_SIZE(smdkc110_i2c_devs1));
-       i2c_register_board_info(2, smdkc110_i2c_devs2,
-                       ARRAY_SIZE(smdkc110_i2c_devs2));
-
-       s3c_ide_set_platdata(&smdkc110_ide_pdata);
-
-       platform_add_devices(smdkc110_devices, ARRAY_SIZE(smdkc110_devices));
-}
-
-MACHINE_START(SMDKC110, "SMDKC110")
-       /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-       .atag_offset    = 0x100,
-       .init_irq       = s5pv210_init_irq,
-       .map_io         = smdkc110_map_io,
-       .init_machine   = smdkc110_machine_init,
-       .init_time      = samsung_timer_init,
-       .restart        = s5pv210_restart,
-       .reserve        = &smdkc110_reserve,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
deleted file mode 100644 (file)
index 6816ccd..0000000
+++ /dev/null
@@ -1,336 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-smdkv210.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * 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/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/device.h>
-#include <linux/dm9000.h>
-#include <linux/fb.h>
-#include <linux/gpio.h>
-#include <linux/delay.h>
-#include <linux/pwm_backlight.h>
-#include <linux/platform_data/s3c-hsotg.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <video/platform_lcd.h>
-#include <video/samsung_fimd.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/regs-srom.h>
-#include <plat/gpio-cfg.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/adc.h>
-#include <linux/platform_data/touchscreen-s3c2410.h>
-#include <linux/platform_data/ata-samsung_cf.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/keypad.h>
-#include <plat/pm.h>
-#include <plat/fb.h>
-#include <plat/samsung-time.h>
-#include <plat/backlight.h>
-#include <plat/mfc.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define SMDKV210_UCON_DEFAULT  (S3C2410_UCON_TXILEVEL |        \
-                                S3C2410_UCON_RXILEVEL |        \
-                                S3C2410_UCON_TXIRQMODE |       \
-                                S3C2410_UCON_RXIRQMODE |       \
-                                S3C2410_UCON_RXFIFO_TOI |      \
-                                S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDKV210_ULCON_DEFAULT S3C2410_LCON_CS8
-
-#define SMDKV210_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE |       \
-                                S5PV210_UFCON_TXTRIG4 |        \
-                                S5PV210_UFCON_RXTRIG4)
-
-static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
-       [0] = {
-               .hwport         = 0,
-               .flags          = 0,
-               .ucon           = SMDKV210_UCON_DEFAULT,
-               .ulcon          = SMDKV210_ULCON_DEFAULT,
-               .ufcon          = SMDKV210_UFCON_DEFAULT,
-       },
-       [1] = {
-               .hwport         = 1,
-               .flags          = 0,
-               .ucon           = SMDKV210_UCON_DEFAULT,
-               .ulcon          = SMDKV210_ULCON_DEFAULT,
-               .ufcon          = SMDKV210_UFCON_DEFAULT,
-       },
-       [2] = {
-               .hwport         = 2,
-               .flags          = 0,
-               .ucon           = SMDKV210_UCON_DEFAULT,
-               .ulcon          = SMDKV210_ULCON_DEFAULT,
-               .ufcon          = SMDKV210_UFCON_DEFAULT,
-       },
-       [3] = {
-               .hwport         = 3,
-               .flags          = 0,
-               .ucon           = SMDKV210_UCON_DEFAULT,
-               .ulcon          = SMDKV210_ULCON_DEFAULT,
-               .ufcon          = SMDKV210_UFCON_DEFAULT,
-       },
-};
-
-static struct s3c_ide_platdata smdkv210_ide_pdata __initdata = {
-       .setup_gpio     = s5pv210_ide_setup_gpio,
-};
-
-static uint32_t smdkv210_keymap[] __initdata = {
-       /* KEY(row, col, keycode) */
-       KEY(0, 3, KEY_1), KEY(0, 4, KEY_2), KEY(0, 5, KEY_3),
-       KEY(0, 6, KEY_4), KEY(0, 7, KEY_5),
-       KEY(1, 3, KEY_A), KEY(1, 4, KEY_B), KEY(1, 5, KEY_C),
-       KEY(1, 6, KEY_D), KEY(1, 7, KEY_E)
-};
-
-static struct matrix_keymap_data smdkv210_keymap_data __initdata = {
-       .keymap         = smdkv210_keymap,
-       .keymap_size    = ARRAY_SIZE(smdkv210_keymap),
-};
-
-static struct samsung_keypad_platdata smdkv210_keypad_data __initdata = {
-       .keymap_data    = &smdkv210_keymap_data,
-       .rows           = 8,
-       .cols           = 8,
-};
-
-static struct resource smdkv210_dm9000_resources[] = {
-       [0] = DEFINE_RES_MEM(S5PV210_PA_SROM_BANK5, 1),
-       [1] = DEFINE_RES_MEM(S5PV210_PA_SROM_BANK5 + 2, 1),
-       [2] = DEFINE_RES_NAMED(IRQ_EINT(9), 1, NULL, IORESOURCE_IRQ \
-                               | IORESOURCE_IRQ_HIGHLEVEL),
-};
-
-static struct dm9000_plat_data smdkv210_dm9000_platdata = {
-       .flags          = DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM,
-       .dev_addr       = { 0x00, 0x09, 0xc0, 0xff, 0xec, 0x48 },
-};
-
-static struct platform_device smdkv210_dm9000 = {
-       .name           = "dm9000",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(smdkv210_dm9000_resources),
-       .resource       = smdkv210_dm9000_resources,
-       .dev            = {
-               .platform_data  = &smdkv210_dm9000_platdata,
-       },
-};
-
-static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,
-                                       unsigned int power)
-{
-       if (power) {
-#if !defined(CONFIG_BACKLIGHT_PWM)
-               gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_HIGH, "GPD0");
-               gpio_free(S5PV210_GPD0(3));
-#endif
-
-               /* fire nRESET on power up */
-               gpio_request_one(S5PV210_GPH0(6), GPIOF_OUT_INIT_HIGH, "GPH0");
-
-               gpio_set_value(S5PV210_GPH0(6), 0);
-               mdelay(10);
-
-               gpio_set_value(S5PV210_GPH0(6), 1);
-               mdelay(10);
-
-               gpio_free(S5PV210_GPH0(6));
-       } else {
-#if !defined(CONFIG_BACKLIGHT_PWM)
-               gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_LOW, "GPD0");
-               gpio_free(S5PV210_GPD0(3));
-#endif
-       }
-}
-
-static struct plat_lcd_data smdkv210_lcd_lte480wv_data = {
-       .set_power      = smdkv210_lte480wv_set_power,
-};
-
-static struct platform_device smdkv210_lcd_lte480wv = {
-       .name                   = "platform-lcd",
-       .dev.parent             = &s3c_device_fb.dev,
-       .dev.platform_data      = &smdkv210_lcd_lte480wv_data,
-};
-
-static struct s3c_fb_pd_win smdkv210_fb_win0 = {
-       .max_bpp        = 32,
-       .default_bpp    = 24,
-       .xres           = 800,
-       .yres           = 480,
-};
-
-static struct fb_videomode smdkv210_lcd_timing = {
-       .left_margin    = 13,
-       .right_margin   = 8,
-       .upper_margin   = 7,
-       .lower_margin   = 5,
-       .hsync_len      = 3,
-       .vsync_len      = 1,
-       .xres           = 800,
-       .yres           = 480,
-};
-
-static struct s3c_fb_platdata smdkv210_lcd0_pdata __initdata = {
-       .win[0]         = &smdkv210_fb_win0,
-       .vtiming        = &smdkv210_lcd_timing,
-       .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-       .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
-       .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,
-};
-
-/* USB OTG */
-static struct s3c_hsotg_plat smdkv210_hsotg_pdata;
-
-static struct platform_device *smdkv210_devices[] __initdata = {
-       &s3c_device_adc,
-       &s3c_device_cfcon,
-       &s3c_device_fb,
-       &s3c_device_hsmmc0,
-       &s3c_device_hsmmc1,
-       &s3c_device_hsmmc2,
-       &s3c_device_hsmmc3,
-       &s3c_device_i2c0,
-       &s3c_device_i2c1,
-       &s3c_device_i2c2,
-       &samsung_device_pwm,
-       &s3c_device_rtc,
-       &s3c_device_ts,
-       &s3c_device_usb_hsotg,
-       &s3c_device_wdt,
-       &s5p_device_fimc0,
-       &s5p_device_fimc1,
-       &s5p_device_fimc2,
-       &s5p_device_fimc_md,
-       &s5p_device_jpeg,
-       &s5p_device_mfc,
-       &s5p_device_mfc_l,
-       &s5p_device_mfc_r,
-       &s5pv210_device_ac97,
-       &s5pv210_device_iis0,
-       &s5pv210_device_spdif,
-       &samsung_asoc_idma,
-       &samsung_device_keypad,
-       &smdkv210_dm9000,
-       &smdkv210_lcd_lte480wv,
-};
-
-static void __init smdkv210_dm9000_init(void)
-{
-       unsigned int tmp;
-
-       gpio_request(S5PV210_MP01(5), "nCS5");
-       s3c_gpio_cfgpin(S5PV210_MP01(5), S3C_GPIO_SFN(2));
-       gpio_free(S5PV210_MP01(5));
-
-       tmp = (5 << S5P_SROM_BCX__TACC__SHIFT);
-       __raw_writel(tmp, S5P_SROM_BC5);
-
-       tmp = __raw_readl(S5P_SROM_BW);
-       tmp &= (S5P_SROM_BW__CS_MASK << S5P_SROM_BW__NCS5__SHIFT);
-       tmp |= (1 << S5P_SROM_BW__NCS5__SHIFT);
-       __raw_writel(tmp, S5P_SROM_BW);
-}
-
-static struct i2c_board_info smdkv210_i2c_devs0[] __initdata = {
-       { I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung S524AD0XD1 */
-       { I2C_BOARD_INFO("wm8580", 0x1b), },
-};
-
-static struct i2c_board_info smdkv210_i2c_devs1[] __initdata = {
-       /* To Be Updated */
-};
-
-static struct i2c_board_info smdkv210_i2c_devs2[] __initdata = {
-       /* To Be Updated */
-};
-
-/* LCD Backlight data */
-static struct samsung_bl_gpio_info smdkv210_bl_gpio_info = {
-       .no = S5PV210_GPD0(3),
-       .func = S3C_GPIO_SFN(2),
-};
-
-static struct platform_pwm_backlight_data smdkv210_bl_data = {
-       .pwm_id = 3,
-       .pwm_period_ns = 1000,
-       .enable_gpio = -1,
-};
-
-static void __init smdkv210_map_io(void)
-{
-       s5pv210_init_io(NULL, 0);
-       s3c24xx_init_clocks(24000000);
-       s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));
-       samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4);
-}
-
-static void __init smdkv210_reserve(void)
-{
-       s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
-}
-
-static void __init smdkv210_machine_init(void)
-{
-       s3c_pm_init();
-
-       smdkv210_dm9000_init();
-
-       samsung_keypad_set_platdata(&smdkv210_keypad_data);
-       s3c24xx_ts_set_platdata(NULL);
-
-       s3c_i2c0_set_platdata(NULL);
-       s3c_i2c1_set_platdata(NULL);
-       s3c_i2c2_set_platdata(NULL);
-       i2c_register_board_info(0, smdkv210_i2c_devs0,
-                       ARRAY_SIZE(smdkv210_i2c_devs0));
-       i2c_register_board_info(1, smdkv210_i2c_devs1,
-                       ARRAY_SIZE(smdkv210_i2c_devs1));
-       i2c_register_board_info(2, smdkv210_i2c_devs2,
-                       ARRAY_SIZE(smdkv210_i2c_devs2));
-
-       s3c_ide_set_platdata(&smdkv210_ide_pdata);
-
-       s3c_fb_set_platdata(&smdkv210_lcd0_pdata);
-
-       s3c_hsotg_set_platdata(&smdkv210_hsotg_pdata);
-
-       platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices));
-
-       samsung_bl_set(&smdkv210_bl_gpio_info, &smdkv210_bl_data);
-}
-
-MACHINE_START(SMDKV210, "SMDKV210")
-       /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-       .atag_offset    = 0x100,
-       .init_irq       = s5pv210_init_irq,
-       .map_io         = smdkv210_map_io,
-       .init_machine   = smdkv210_machine_init,
-       .init_time      = samsung_timer_init,
-       .restart        = s5pv210_restart,
-       .reserve        = &smdkv210_reserve,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c
deleted file mode 100644 (file)
index 1578055..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-torbreck.c
- *
- * Copyright (c) 2010 aESOP Community
- *             http://www.aesop.or.kr/
- *
- * 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/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/samsung-time.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define TORBRECK_UCON_DEFAULT  (S3C2410_UCON_TXILEVEL |        \
-                                S3C2410_UCON_RXILEVEL |        \
-                                S3C2410_UCON_TXIRQMODE |       \
-                                S3C2410_UCON_RXIRQMODE |       \
-                                S3C2410_UCON_RXFIFO_TOI |      \
-                                S3C2443_UCON_RXERR_IRQEN)
-
-#define TORBRECK_ULCON_DEFAULT S3C2410_LCON_CS8
-
-#define TORBRECK_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE |       \
-                                S5PV210_UFCON_TXTRIG4 |        \
-                                S5PV210_UFCON_RXTRIG4)
-
-static struct s3c2410_uartcfg torbreck_uartcfgs[] __initdata = {
-       [0] = {
-               .hwport         = 0,
-               .flags          = 0,
-               .ucon           = TORBRECK_UCON_DEFAULT,
-               .ulcon          = TORBRECK_ULCON_DEFAULT,
-               .ufcon          = TORBRECK_UFCON_DEFAULT,
-       },
-       [1] = {
-               .hwport         = 1,
-               .flags          = 0,
-               .ucon           = TORBRECK_UCON_DEFAULT,
-               .ulcon          = TORBRECK_ULCON_DEFAULT,
-               .ufcon          = TORBRECK_UFCON_DEFAULT,
-       },
-       [2] = {
-               .hwport         = 2,
-               .flags          = 0,
-               .ucon           = TORBRECK_UCON_DEFAULT,
-               .ulcon          = TORBRECK_ULCON_DEFAULT,
-               .ufcon          = TORBRECK_UFCON_DEFAULT,
-       },
-       [3] = {
-               .hwport         = 3,
-               .flags          = 0,
-               .ucon           = TORBRECK_UCON_DEFAULT,
-               .ulcon          = TORBRECK_ULCON_DEFAULT,
-               .ufcon          = TORBRECK_UFCON_DEFAULT,
-       },
-};
-
-static struct platform_device *torbreck_devices[] __initdata = {
-       &s5pv210_device_iis0,
-       &s3c_device_cfcon,
-       &s3c_device_hsmmc0,
-       &s3c_device_hsmmc1,
-       &s3c_device_hsmmc2,
-       &s3c_device_hsmmc3,
-       &s3c_device_i2c0,
-       &s3c_device_i2c1,
-       &s3c_device_i2c2,
-       &s3c_device_rtc,
-       &s3c_device_wdt,
-};
-
-static struct i2c_board_info torbreck_i2c_devs0[] __initdata = {
-       /* To Be Updated */
-};
-
-static struct i2c_board_info torbreck_i2c_devs1[] __initdata = {
-       /* To Be Updated */
-};
-
-static struct i2c_board_info torbreck_i2c_devs2[] __initdata = {
-       /* To Be Updated */
-};
-
-static void __init torbreck_map_io(void)
-{
-       s5pv210_init_io(NULL, 0);
-       s3c24xx_init_clocks(24000000);
-       s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs));
-       samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init torbreck_machine_init(void)
-{
-       s3c_i2c0_set_platdata(NULL);
-       s3c_i2c1_set_platdata(NULL);
-       s3c_i2c2_set_platdata(NULL);
-       i2c_register_board_info(0, torbreck_i2c_devs0,
-                       ARRAY_SIZE(torbreck_i2c_devs0));
-       i2c_register_board_info(1, torbreck_i2c_devs1,
-                       ARRAY_SIZE(torbreck_i2c_devs1));
-       i2c_register_board_info(2, torbreck_i2c_devs2,
-                       ARRAY_SIZE(torbreck_i2c_devs2));
-
-       platform_add_devices(torbreck_devices, ARRAY_SIZE(torbreck_devices));
-}
-
-MACHINE_START(TORBRECK, "TORBRECK")
-       /* Maintainer: Hyunchul Ko <ghcstop@gmail.com> */
-       .atag_offset    = 0x100,
-       .init_irq       = s5pv210_init_irq,
-       .map_io         = torbreck_map_io,
-       .init_machine   = torbreck_machine_init,
-       .init_time      = samsung_timer_init,
-       .restart        = s5pv210_restart,
-MACHINE_END
index dd5bfec16b4f5c715e9a02bb9b14560596f224c2..00d1523284dac3e52d232a6e2a3e6e69d541e004 100644 (file)
@@ -75,26 +75,6 @@ static void s5pv210_pm_prepare(void)
        s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
 }
 
-static int s5pv210_pm_add(struct device *dev, struct subsys_interface *sif)
-{
-       pm_cpu_prep = s5pv210_pm_prepare;
-       pm_cpu_sleep = s5pv210_cpu_suspend;
-
-       return 0;
-}
-
-static struct subsys_interface s5pv210_pm_interface = {
-       .name           = "s5pv210_pm",
-       .subsys         = &s5pv210_subsys,
-       .add_dev        = s5pv210_pm_add,
-};
-
-static __init int s5pv210_pm_drvinit(void)
-{
-       return subsys_interface_register(&s5pv210_pm_interface);
-}
-arch_initcall(s5pv210_pm_drvinit);
-
 static void s5pv210_pm_resume(void)
 {
        u32 tmp;
@@ -114,6 +94,10 @@ static struct syscore_ops s5pv210_pm_syscore_ops = {
 static __init int s5pv210_pm_syscore_init(void)
 {
        register_syscore_ops(&s5pv210_pm_syscore_ops);
+
+       pm_cpu_prep = s5pv210_pm_prepare;
+       pm_cpu_sleep = s5pv210_cpu_suspend;
+
        return 0;
 }
 arch_initcall(s5pv210_pm_syscore_init);
diff --git a/arch/arm/mach-s5pv210/setup-fb-24bpp.c b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
deleted file mode 100644 (file)
index 55103c8..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/* linux/arch/arm/plat-s5pv210/setup-fb-24bpp.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * Base s5pv210 setup information for 24bpp LCD framebuffer
- *
- * 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/types.h>
-#include <linux/fb.h>
-#include <linux/gpio.h>
-
-#include <mach/map.h>
-#include <plat/fb.h>
-#include <mach/regs-clock.h>
-#include <plat/gpio-cfg.h>
-
-static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
-{
-       s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2));
-
-       for (; nr > 0; nr--, base++)
-               s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
-}
-
-
-void s5pv210_fb_gpio_setup_24bpp(void)
-{
-       s5pv210_fb_cfg_gpios(S5PV210_GPF0(0), 8);
-       s5pv210_fb_cfg_gpios(S5PV210_GPF1(0), 8);
-       s5pv210_fb_cfg_gpios(S5PV210_GPF2(0), 8);
-       s5pv210_fb_cfg_gpios(S5PV210_GPF3(0), 4);
-
-       /* Set DISPLAY_CONTROL register for Display path selection.
-        *
-        * ouput   |   RGB   |   I80   |   ITU
-        * -----------------------------------
-        *  00     |   MIE   |  FIMD   |  FIMD
-        *  01     | MDNIE   | MDNIE   |  FIMD
-        *  10     |  FIMD   |  FIMD   |  FIMD
-        *  11     |  FIMD   |  FIMD   |  FIMD
-        */
-       writel(0x2, S5P_MDNIE_SEL);
-}
diff --git a/arch/arm/mach-s5pv210/setup-fimc.c b/arch/arm/mach-s5pv210/setup-fimc.c
deleted file mode 100644 (file)
index 54cc5b1..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co., Ltd.
- *
- * S5PV210 camera interface GPIO configuration.
- *
- * 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/gpio.h>
-#include <plat/gpio-cfg.h>
-#include <plat/camport.h>
-
-int s5pv210_fimc_setup_gpio(enum s5p_camport_id id)
-{
-       u32 gpio8, gpio5;
-       int ret;
-
-       switch (id) {
-       case S5P_CAMPORT_A:
-               gpio8 = S5PV210_GPE0(0);
-               gpio5 = S5PV210_GPE1(0);
-               break;
-
-       case S5P_CAMPORT_B:
-               gpio8 = S5PV210_GPJ0(0);
-               gpio5 = S5PV210_GPJ1(0);
-               break;
-
-       default:
-               WARN(1, "Wrong camport id: %d\n", id);
-               return -EINVAL;
-       }
-
-       ret = s3c_gpio_cfgall_range(gpio8, 8, S3C_GPIO_SFN(2),
-                                   S3C_GPIO_PULL_UP);
-       if (ret)
-               return ret;
-
-       return s3c_gpio_cfgall_range(gpio5, 5, S3C_GPIO_SFN(2),
-                                    S3C_GPIO_PULL_UP);
-}
index 4a15849766c0e0d2d5458634690d5e6e178652a2..3658416134ec020751b0ca9800880f0943ef95c2 100644 (file)
@@ -23,6 +23,8 @@ struct platform_device; /* don't need the contents */
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
 {
-       s3c_gpio_cfgall_range(S5PV210_GPD1(0), 2,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+       /*
+        * FIXME: Used only by legacy code that is not used anymore,
+        * but still compiled in, until all dependencies are removed.
+        */
 }
diff --git a/arch/arm/mach-s5pv210/setup-i2c1.c b/arch/arm/mach-s5pv210/setup-i2c1.c
deleted file mode 100644 (file)
index 4777f6b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-i2c1.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * I2C1 GPIO configuration.
- *
- * Based on plat-s3c64xx/setup-i2c1.c
- *
- * 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/types.h>
-#include <linux/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
-
-void s3c_i2c1_cfg_gpio(struct platform_device *dev)
-{
-       s3c_gpio_cfgall_range(S5PV210_GPD1(2), 2,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pv210/setup-i2c2.c b/arch/arm/mach-s5pv210/setup-i2c2.c
deleted file mode 100644 (file)
index bbce6c7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-i2c2.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * I2C2 GPIO configuration.
- *
- * Based on plat-s3c64xx/setup-i2c0.c
- *
- * 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/types.h>
-#include <linux/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
-
-void s3c_i2c2_cfg_gpio(struct platform_device *dev)
-{
-       s3c_gpio_cfgall_range(S5PV210_GPD1(4), 2,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pv210/setup-ide.c b/arch/arm/mach-s5pv210/setup-ide.c
deleted file mode 100644 (file)
index ea123d5..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-ide.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * S5PV210 setup information for IDE
- *
- * 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/gpio.h>
-
-#include <plat/gpio-cfg.h>
-
-static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
-{
-       s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
-
-       for (; nr > 0; nr--, base++)
-               s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
-}
-
-void s5pv210_ide_setup_gpio(void)
-{
-       /* CF_Add[0 - 2], CF_IORDY, CF_INTRQ, CF_DMARQ, CF_DMARST, CF_DMACK */
-       s5pv210_ide_cfg_gpios(S5PV210_GPJ0(0), 8);
-
-       /* CF_Data[0 - 7] */
-       s5pv210_ide_cfg_gpios(S5PV210_GPJ2(0), 8);
-
-       /* CF_Data[8 - 15] */
-       s5pv210_ide_cfg_gpios(S5PV210_GPJ3(0), 8);
-
-       /* CF_CS0, CF_CS1, CF_IORD, CF_IOWR */
-       s5pv210_ide_cfg_gpios(S5PV210_GPJ4(0), 4);
-}
diff --git a/arch/arm/mach-s5pv210/setup-keypad.c b/arch/arm/mach-s5pv210/setup-keypad.c
deleted file mode 100644 (file)
index c56420a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * linux/arch/arm/mach-s5pv210/setup-keypad.c
- *
- * Copyright (C) 2010 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- *  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, or (at your
- *  option) any later version.
- *
- */
-
-#include <linux/gpio.h>
-#include <plat/gpio-cfg.h>
-
-void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
-{
-       /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPH3(0), rows, S3C_GPIO_SFN(3));
-
-       /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPH2(0), cols, S3C_GPIO_SFN(3));
-}
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
deleted file mode 100644 (file)
index 0512ada..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/* linux/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * S5PV210 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/card.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/sdhci.h>
-
-void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
-{
-       struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-       /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
-
-       switch (width) {
-       case 8:
-               /* GPG1[3:6] special-function 3 */
-               s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
-       case 4:
-               /* GPG0[3:6] special-function 2 */
-               s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
-       default:
-               break;
-       }
-
-       if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-               s3c_gpio_setpull(S5PV210_GPG0(2), S3C_GPIO_PULL_UP);
-               s3c_gpio_cfgpin(S5PV210_GPG0(2), S3C_GPIO_SFN(2));
-       }
-}
-
-void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
-{
-       struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-       /* Set all the necessary GPG1[0:1] pins to special-function 2 */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
-
-       /* Data pin GPG1[3:6] to special-function 2 */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
-
-       if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-               s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
-               s3c_gpio_cfgpin(S5PV210_GPG1(2), S3C_GPIO_SFN(2));
-       }
-}
-
-void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
-{
-       struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-       /* Set all the necessary GPG2[0:1] pins to special-function 2 */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
-
-       switch (width) {
-       case 8:
-               /* Data pin GPG3[3:6] to special-function 3 */
-               s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
-       case 4:
-               /* Data pin GPG2[3:6] to special-function 2 */
-               s3c_gpio_cfgrange_nopull(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
-       default:
-               break;
-       }
-
-       if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-               s3c_gpio_setpull(S5PV210_GPG2(2), S3C_GPIO_PULL_UP);
-               s3c_gpio_cfgpin(S5PV210_GPG2(2), S3C_GPIO_SFN(2));
-       }
-}
-
-void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
-{
-       struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-       /* Set all the necessary GPG3[0:1] pins to special-function 2 */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
-
-       /* Data pin GPG3[3:6] to special-function 2 */
-       s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
-
-       if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-               s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
-               s3c_gpio_cfgpin(S5PV210_GPG3(2), S3C_GPIO_SFN(2));
-       }
-}
diff --git a/arch/arm/mach-s5pv210/setup-spi.c b/arch/arm/mach-s5pv210/setup-spi.c
deleted file mode 100644 (file)
index 81aecc1..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-spi.c
- *
- * Copyright (C) 2011 Samsung Electronics Ltd.
- *             http://www.samsung.com/
- *
- * 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/gpio.h>
-#include <plat/gpio-cfg.h>
-
-#ifdef CONFIG_S3C64XX_DEV_SPI0
-int s3c64xx_spi0_cfg_gpio(void)
-{
-       s3c_gpio_cfgpin(S5PV210_GPB(0), S3C_GPIO_SFN(2));
-       s3c_gpio_setpull(S5PV210_GPB(0), S3C_GPIO_PULL_UP);
-       s3c_gpio_cfgall_range(S5PV210_GPB(2), 2,
-                               S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_S3C64XX_DEV_SPI1
-int s3c64xx_spi1_cfg_gpio(void)
-{
-       s3c_gpio_cfgpin(S5PV210_GPB(4), S3C_GPIO_SFN(2));
-       s3c_gpio_setpull(S5PV210_GPB(4), S3C_GPIO_PULL_UP);
-       s3c_gpio_cfgall_range(S5PV210_GPB(6), 2,
-                               S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-       return 0;
-}
-#endif
diff --git a/arch/arm/mach-s5pv210/setup-usb-phy.c b/arch/arm/mach-s5pv210/setup-usb-phy.c
deleted file mode 100644 (file)
index b2ee533..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * 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 Foundationr
- */
-
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-
-#include <mach/map.h>
-
-#include <plat/cpu.h>
-#include <plat/regs-usb-hsotg-phy.h>
-#include <plat/usb-phy.h>
-
-#define S5PV210_USB_PHY_CON    (S3C_VA_SYS + 0xE80C)
-#define S5PV210_USB_PHY0_EN    (1 << 0)
-#define S5PV210_USB_PHY1_EN    (1 << 1)
-
-static int s5pv210_usb_otgphy_init(struct platform_device *pdev)
-{
-       struct clk *xusbxti;
-       u32 phyclk;
-
-       writel(readl(S5PV210_USB_PHY_CON) | S5PV210_USB_PHY0_EN,
-                       S5PV210_USB_PHY_CON);
-
-       /* set clock frequency for PLL */
-       phyclk = readl(S3C_PHYCLK) & ~S3C_PHYCLK_CLKSEL_MASK;
-
-       xusbxti = clk_get(&pdev->dev, "xusbxti");
-       if (xusbxti && !IS_ERR(xusbxti)) {
-               switch (clk_get_rate(xusbxti)) {
-               case 12 * MHZ:
-                       phyclk |= S3C_PHYCLK_CLKSEL_12M;
-                       break;
-               case 24 * MHZ:
-                       phyclk |= S3C_PHYCLK_CLKSEL_24M;
-                       break;
-               default:
-               case 48 * MHZ:
-                       /* default reference clock */
-                       break;
-               }
-               clk_put(xusbxti);
-       }
-
-       /* TODO: select external clock/oscillator */
-       writel(phyclk | S3C_PHYCLK_CLK_FORCE, S3C_PHYCLK);
-
-       /* set to normal OTG PHY */
-       writel((readl(S3C_PHYPWR) & ~S3C_PHYPWR_NORMAL_MASK), S3C_PHYPWR);
-       mdelay(1);
-
-       /* reset OTG PHY and Link */
-       writel(S3C_RSTCON_PHY | S3C_RSTCON_HCLK | S3C_RSTCON_PHYCLK,
-                       S3C_RSTCON);
-       udelay(20);     /* at-least 10uS */
-       writel(0, S3C_RSTCON);
-
-       return 0;
-}
-
-static int s5pv210_usb_otgphy_exit(struct platform_device *pdev)
-{
-       writel((readl(S3C_PHYPWR) | S3C_PHYPWR_ANALOG_POWERDOWN |
-                               S3C_PHYPWR_OTG_DISABLE), S3C_PHYPWR);
-
-       writel(readl(S5PV210_USB_PHY_CON) & ~S5PV210_USB_PHY0_EN,
-                       S5PV210_USB_PHY_CON);
-
-       return 0;
-}
-
-int s5p_usb_phy_init(struct platform_device *pdev, int type)
-{
-       if (type == USB_PHY_TYPE_DEVICE)
-               return s5pv210_usb_otgphy_init(pdev);
-
-       return -EINVAL;
-}
-
-int s5p_usb_phy_exit(struct platform_device *pdev, int type)
-{
-       if (type == USB_PHY_TYPE_DEVICE)
-               return s5pv210_usb_otgphy_exit(pdev);
-
-       return -EINVAL;
-}
index d1d4659025bbebf8da3141e12fb66e753d7bdedc..995e56eadc0f6bb45fe3f443b2ef75c5ab456010 100644 (file)
@@ -149,7 +149,6 @@ extern struct bus_type s3c2440_subsys;
 extern struct bus_type s3c2442_subsys;
 extern struct bus_type s3c2443_subsys;
 extern struct bus_type s3c6410_subsys;
-extern struct bus_type s5pv210_subsys;
 
 extern void (*s5pc1xx_idle)(void);