Ticket #32: gnufiish-x500.patch

arch/arm/mach-s3c2442/Kconfig

@@ -39 +39 @@
         help
            Say Y here if you are using the FIC Neo1973 GSM Phone
 
+config MACH_GLOFIISH_X500
+        bool "E-TEN glofiish X500"
+        select CPU_S3C2442
+        select MACH_GLOFIISHX500
+        select MACH_NEO1973
+        help
+           Say Y here if you are using the E-TEN glofiish M800/X800.
+
 
 endmenu
 

arch/arm/mach-s3c2442/Makefile

@@ -14 +14 @@
 obj-$(CONFIG_CPU_S3C2442)       += s3c2442.o
 obj-$(CONFIG_CPU_S3C2442)       += clock.o
 obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
+obj-${CONFIG_MACH_GLOFIISH_X500} += mach-glofiishx500.o
 
 # Machine support
 

(a) /dev/null vs. (b) b/arch/arm/mach-s3c2442/include/mach/glofiishx500.h

@@ +1 @@
+/*
+ * glofiishx500.h
+ *
+ *  Created on: Feb 22, 2010
+ *      Author: a.key@undef.tk
+ */
+
+#ifndef GLOFIISHX500_H_
+#define GLOFIISHX500_H_
+
+#define GLOFIISX500_GPIO_USB_PULLUP S3C2410_GPA21
+#define GLOFIISX500_GPIO_nSD_DETECT         S3C2410_GPG7
+
+#endif /* GLOFIISHX500_H_ */

(a) /dev/null vs. (b) b/arch/arm/mach-s3c2442/mach-glofiishx500.c

@@ +1 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-glofiish.c
+ *
+ * S3C2440 Machine Support for the E-TEN glofiish X800/M800
+ *
+ * Copyright (C) 2008 by Harald Welte <laforge@gnumonks.org>
+ * All rights reserved.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/serial_core.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/mmc/host.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <mach/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+
+#include <mach/regs-irq.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-gpioj.h>
+#include <mach/leds-gpio.h>
+#include <mach/fb.h>
+#include <mach/mci.h>
+#include <mach/ts.h>
+#include <mach/spi.h>
+#include <mach/spi-gpio.h>
+
+#include <mach/glofiish.h>
+#include <mach/gta01.h>
+#include <mach/glofiishx500.h>
+
+#include <plat/regs-serial.h>
+#include <plat/regs-iic.h>
+#include <plat/nand.h>
+#include <plat/devs.h>
+#include <plat/cpu.h>
+#include <plat/pm.h>
+#include <plat/udc.h>
+#include <plat/iic.h>
+#include <plat/usb-control.h>
+#include <plat/glofiish-cpld.h>
+
+#include <linux/jbt6k74.h>
+
+#include <../drivers/input/touchscreen/ts_filter_chain.h>
+#ifdef CONFIG_TOUCHSCREEN_FILTER
+#include <../drivers/input/touchscreen/ts_filter_linear.h>
+#include <../drivers/input/touchscreen/ts_filter_mean.h>
+#include <../drivers/input/touchscreen/ts_filter_median.h>
+/*#include <../drivers/input/touchscreen/ts_filter_group.h>*/
+#endif
+
+
+/*
+ * this gets called every 1ms when we paniced.
+ */
+
+static long glofiishx500_panic_blink(long count)
+{
+        long delay = 0;
+        static long last_blink;
+//      static char led;
+
+        if (count - last_blink < 100) /* 200ms period, fast blink */
+                return 0;
+
+        /* FIXME */
+//#if 0
+//      led ^= 1;
+//      s3c2410_gpio_cfgpin(GTA02_GPIO_AUX_LED, S3C2410_GPIO_OUTPUT);
+//      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, led);
+//
+//      last_blink = count;
+//#endif
+        return delay;
+}
+
+//struct platform_device gta02_version_device = {
+//      .name           = "neo1973-version",
+//      .num_resources  = 0,
+//};
+//
+//struct platform_device gta02_resume_reason_device = {
+//      .name           = "neo1973-resume",
+//      .num_resources  = 0,
+//};
+//
+//struct platform_device gta02_memconfig_device = {
+//      .name           = "neo1973-memconfig",
+//      .num_resources  = 0,
+//};
+
+static struct map_desc glofiishx500_iodesc[] __initdata = {
+        {
+                .virtual        = 0xe0000000,
+                .pfn            = __phys_to_pfn(S3C2410_CS3+0x01000000),
+                .length         = SZ_1M,
+                .type           = MT_DEVICE
+        },
+};
+
+#define UCON S3C2410_UCON_DEFAULT
+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
+
+static struct s3c2410_uartcfg glofiishx500_uartcfgs[] = {
+        [0] = {
+                .hwport      = 0,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [1] = {
+                .hwport      = 1,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [2] = {
+                .hwport      = 2,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+
+};
+
+///* Configuration for 480x640 toppoly TD028TTEC1.
+// * Do not mark this as __initdata or it will break! */
+//static struct s3c2410fb_display glofiishx500_displays[] =  {
+//      {
+//              .type           = S3C2410_LCDCON1_TFT,
+//              .width          = 43,
+//              .height         = 58,
+//              .xres           = 480,
+//              .yres           = 640,
+//              .bpp            = 16,
+//
+//              .pixclock       = 40000,        /* HCLK/4 */
+//              .left_margin    = 2,
+//              .right_margin   = 2,
+//              .hsync_len      = 2,
+//              .upper_margin   = 2,
+//              .lower_margin   = 66,
+//              .vsync_len      = 2,
+//              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
+//                                S3C2410_LCDCON5_INVVCLK |
+//                                S3C2410_LCDCON5_INVVLINE |
+//                                S3C2410_LCDCON5_INVVFRAME |
+//                                S3C2410_LCDCON5_PWREN |
+//                                S3C2410_LCDCON5_HWSWP,
+//      },
+//      {
+//              .type           = S3C2410_LCDCON1_TFT,
+//              .width          = 43,
+//              .height         = 58,
+//              .xres           = 480,
+//              .yres           = 640,
+//              .bpp            = 32,
+//
+//              .pixclock       = 40000,        /* HCLK/4 */
+//              .left_margin    = 104,
+//              .right_margin   = 8,
+//              .hsync_len      = 8,
+//              .upper_margin   = 2,
+//              .lower_margin   = 16,
+//              .vsync_len      = 2,
+//              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
+//                                S3C2410_LCDCON5_INVVCLK |
+//                                S3C2410_LCDCON5_INVVLINE |
+//                                S3C2410_LCDCON5_INVVFRAME |
+//                                S3C2410_LCDCON5_PWREN |
+//                                S3C2410_LCDCON5_HWSWP,
+//      },
+//      {
+//              .type           = S3C2410_LCDCON1_TFT,
+//              .width          = 43,
+//              .height         = 58,
+//              .xres           = 240,
+//              .yres           = 320,
+//              .bpp            = 16,
+//
+//              .pixclock       = 40000,        /* HCLK/4 */
+//              .left_margin    = 104,
+//              .right_margin   = 8,
+//              .hsync_len      = 8,
+//              .upper_margin   = 2,
+//              .lower_margin   = 16,
+//              .vsync_len      = 2,
+//              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
+//                                S3C2410_LCDCON5_INVVCLK |
+//                                S3C2410_LCDCON5_INVVLINE |
+//                                S3C2410_LCDCON5_INVVFRAME |
+//                                S3C2410_LCDCON5_PWREN |
+//                                S3C2410_LCDCON5_HWSWP,
+//      },
+//};
+//
+//static struct s3c2410fb_mach_info glofiishx500_lcd_cfg __initdata = {
+//      .displays       = glofiishx500_displays,
+//      .num_displays   = ARRAY_SIZE(glofiishx500_displays),
+//      .default_display = 0,
+//
+//      .lpcsel         = ((0xCE6) & ~7) | 1<<4,
+//};
+
+/**
+ * Set lcd on or off, code from arch/arm/mach-s3c2410/mach-h1940.c
+ **/
+static struct s3c2410fb_display glofiishx500_displays[] = {
+    {
+        .lcdcon5=       S3C2410_LCDCON5_FRM565 | \
+                        S3C2410_LCDCON5_INVVLINE | \
+                        S3C2410_LCDCON5_HWSWP,
+
+        .type =         S3C2410_LCDCON1_TFT,
+        .width =        240,
+        .height =       320,
+        .pixclock =     260000,
+        .xres =         240,
+        .yres =         320,
+        .bpp =          16,
+        .left_margin =  20,
+        .right_margin = 8,
+        .hsync_len =    4,
+        .upper_margin = 8,
+        .lower_margin = 7,
+        .vsync_len =    1,
+    }
+};
+
+static struct s3c2410fb_mach_info glofiishx500_lcd_cfg __initdata = {
+        .displays       = glofiishx500_displays,
+        .num_displays   = ARRAY_SIZE(glofiishx500_displays),
+        .default_display = 0,
+
+        .lpcsel=        0x02,
+        .gpccon=        0xaa940659,
+        .gpccon_mask=   0xffffffff,
+        .gpcup=         0x0000ffff,
+        .gpcup_mask=    0xffffffff,
+        .gpdcon=        0xaa84aaa0,
+        .gpdcon_mask=   0xffffffff,
+        .gpdup=         0x0000faff,
+        .gpdup_mask=    0xffffffff,
+
+        // Magick numbers taken from rx1950 kernel patches
+        .lpcsel = 0x02,
+        .gpccon =  0xaa9506a9,
+        .gpccon_mask = 0xFFC003FC,
+        .gpcup = 0x0000ffff,
+        .gpcup_mask = 0xffffffff,
+        .gpdcon = 0xaa90aaa1,
+        .gpdcon_mask = 0xffc0fff0,
+        .gpdup = 0x0000fcfd,
+        .gpdup_mask = 0xffffffff
+
+};
+
+
+//static struct resource m800_sdio_resources[] = {
+//      [0] = {
+//              .flags  = IORESOURCE_IRQ,
+//              .start  = IRQ_SDI,
+//              .end    = IRQ_SDI,
+//      },
+//      [1] = {
+//              .flags = IORESOURCE_MEM,
+//              .start = S3C2410_PA_SDI,
+//              .end   = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
+//      },
+//      [2] = {
+//              .flags = IORESOURCE_DMA,
+//              .start = 0, /* Channel 0 for SDI */
+//              .end = 0,
+//      },
+//};
+
+static struct s3c2410_platform_i2c glofiishx500_i2c_pdata __initdata = {
+        .flags          = 0,
+        .slave_addr     = 0x48,
+        .bus_freq       = 100*1000,
+        .max_freq       = 100*1000,
+        .sda_delay      = S3C2410_IICLC_FILTER_ON,
+};
+
+//static struct i2c_board_info glofiishx500_i2c_devs[] __initdata = {
+//      {
+//              /* CPLD */
+//              I2C_BOARD_INFO("gf_cpld", 0x18),
+//              .irq = M800_IRQ_CPLD_KEY,
+//              .flags = I2C_M_IGNORE_NAK,
+//      },
+//      {
+//              /* FM Tuner */
+//              I2C_BOARD_INFO("si470x-i2c", 0x10),
+//              .irq = M800_IRQ_FMRADIO,
+//      },
+//      {
+//              /* Battery (unknown chip) */
+//              I2C_BOARD_INFO("gf_batt", 0x2f),
+//      },
+//#if 0
+//      {
+//              /* Front camera */
+//              I2C_BOARD_INFO("FIXME", 0x30),
+//      },
+//      {
+//              /* Back camera */
+//              I2C_BOARD_INFO("FIXME", 0x3c),
+//      },
+//#endif
+//      /* Don't put Audio Codec here, ASoC handles it */
+//};
+
+static struct s3c2410_nand_set glofiishx500_nand_sets[] = {
+        [0] = {
+                .name           = "glofiishx500-nand",
+                .nr_chips       = 1,
+                .flags          = S3C2410_NAND_BBT,
+        },
+};
+
+/* choose a set of timings derived from S3C@2442B MCP54
+ * data sheet (K5D2G13ACM-D075 MCP Memory)
+ */
+
+static struct s3c2410_platform_nand glofiishx500_nand_info = {
+        .tacls          = 0,
+        .twrph0         = 25,
+        .twrph1         = 15,
+        .nr_sets        = ARRAY_SIZE(glofiishx500_nand_sets),
+        .sets           = glofiishx500_nand_sets,
+        .software_ecc   = 1,
+};
+
+static struct s3c24xx_mci_pdata glofiishx500_mmc_cfg = {
+        .gpio_detect    = GLOFIISX500_GPIO_nSD_DETECT,
+        .set_power      = NULL,
+        .ocr_avail      = MMC_VDD_32_33,
+};
+
+static void glofiishx500_udc_command(enum s3c2410_udc_cmd_e cmd)
+{
+        printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
+
+        switch (cmd) {
+        case S3C2410_UDC_P_ENABLE:
+                s3c2410_gpio_setpin(GLOFIISX500_GPIO_USB_PULLUP, 1);
+                break;
+        case S3C2410_UDC_P_DISABLE:
+                s3c2410_gpio_setpin(GLOFIISX500_GPIO_USB_PULLUP, 0);
+                break;
+        case S3C2410_UDC_P_RESET:
+                /* FIXME! */
+                break;
+        default:
+                break;
+        }
+}
+
+/* get PMU to set USB current limit accordingly */
+
+static void glofiishx500_udc_vbus_draw(unsigned int ma)
+{
+        //pcf50633_notify_usb_current_limit_change(pcf50633_global, ma);
+}
+
+static struct s3c2410_udc_mach_info glofiishx500_udc_cfg = {
+        .vbus_draw      = glofiishx500_udc_vbus_draw,
+        .udc_command    = glofiishx500_udc_command,
+
+};
+
+/* touchscreen configuration */
+
+#ifdef CONFIG_TOUCHSCREEN_FILTER
+
+//#if 0
+//const static struct ts_filter_group_configuration glofiishx500_ts_group = {
+//      .length = 12,
+//      .close_enough = 10,
+//      .threshold = 6,         /* At least half of the points in a group. */
+//      .attempts = 10,
+//};
+//#endif
+
+const static struct ts_filter_median_configuration glofiishx500_ts_median = {
+        .extent = 20,
+        .decimation_below = 3,
+        .decimation_threshold = 8 * 3,
+        .decimation_above = 4,
+};
+
+const static struct ts_filter_mean_configuration glofiishx500_ts_mean = {
+        .length = 4,
+};
+
+const static struct ts_filter_linear_configuration glofiishx500_ts_linear = {
+        .constants = {1, 0, 0, 0, 1, 0, 1},     /* Don't modify coords. */
+        .coord0 = 0,
+        .coord1 = 1,
+};
+#endif
+
+const struct ts_filter_chain_configuration glofiishx500_filter_configuration[] =
+{
+#ifdef CONFIG_TOUCHSCREEN_FILTER
+/*      {&ts_filter_group_api,          &glofiishx500_ts_group.config}, */
+        {&ts_filter_median_api,         &glofiishx500_ts_median.config},
+        {&ts_filter_mean_api,           &glofiishx500_ts_mean.config},
+        {&ts_filter_linear_api,         &glofiishx500_ts_linear.config},
+#endif
+        {NULL, NULL},
+};
+
+const static struct s3c2410_ts_mach_info glofiishx500_ts_cfg = {
+        .delay = 10000,
+        //.presc = 0xff, /* slow as we can go */
+        /* next line from mach-h1940.c */
+        .presc = 49,
+        //.oversampling_shift = 2,
+        .filter_config = glofiishx500_filter_configuration,
+};
+
+
+/* SPI: LCM control interface attached to Glamo3362 */
+
+static void glofiishx500_jbt6k74_reset(int devidx, int level)
+{
+        //glamo_lcm_reset(level);
+        printk(KERN_DEBUG "glofiishx500_jbt6k74_reset\n");
+}
+
+/* finally bring up deferred backlight resume now LCM is resumed itself */
+
+static void glofiishx500_jbt6k74_resuming(int devidx)
+{
+        //pcf50633_backlight_resume(pcf50633_global);
+        //gta01bl_deferred_resume();
+}
+
+const struct jbt6k74_platform_data jbt6k74_pdata = {
+        .reset          = glofiishx500_jbt6k74_reset,
+        .resuming       = glofiishx500_jbt6k74_resuming,
+};
+
+static struct spi_board_info glofiishx500_spi_board_info[] = {
+        {
+                .modalias       = "jbt6k74",
+                /* platform_data */
+                .platform_data  = &jbt6k74_pdata,
+                /* controller_data */
+                /* irq */
+                .max_speed_hz   = 10 * 1000 * 1000,
+                .bus_num        = 2,
+                /* chip_select */
+        },
+};
+
+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int csidx, int cs)
+{
+        /* GPD0 is a pure guess.  */
+        switch (cs) {
+        case BITBANG_CS_ACTIVE:
+                s3c2410_gpio_setpin(S3C2410_GPD0, 0);
+                break;
+        case BITBANG_CS_INACTIVE:
+                s3c2410_gpio_setpin(S3C2410_GPD0, 1);
+                break;
+        }
+}
+
+static struct s3c2410_spigpio_info spi_gpio_cfg = {
+        /* GPD8..10 is next to the LCM signals, and configured to SPI
+         * function mode, so we guess it's them! */
+        .pin_clk        = S3C2410_GPD10,
+        .pin_mosi       = S3C2410_GPD9,
+        .pin_miso       = S3C2410_GPD8,
+/*      .board_size     = ARRAY_SIZE(glofiish_spi_board_info),
+        .board_info     = glofiish_spi_board_info, */
+        .chip_select    = &spi_gpio_cs,
+        .num_chipselect = 2,   /*** Should be 1 or 2 for gta01? ***/
+};
+
+static struct resource s3c_spi_lcm_resource[] = {
+        [0] = {
+                .start = S3C2410_GPG3,
+                .end   = S3C2410_GPG3,
+        },
+        [1] = {
+                .start = S3C2410_GPG5,
+                .end   = S3C2410_GPG5,
+        },
+        [2] = {
+                .start = S3C2410_GPG6,
+                .end   = S3C2410_GPG6,
+        },
+        [3] = {
+                .start = S3C2410_GPG7,
+                .end   = S3C2410_GPG7,
+        },
+};
+
+struct platform_device s3c_device_spi_lcm = {
+        .name             = "spi_s3c24xx_gpio",
+        .id               = 1,
+        .num_resources    = ARRAY_SIZE(s3c_spi_lcm_resource),
+        .resource         = s3c_spi_lcm_resource,
+        .dev = {
+                .platform_data = &spi_gpio_cfg,
+        },
+};
+
+//static struct gta01bl_machinfo backlight_machinfo = {
+//      .default_intensity      = 1,
+//      .max_intensity          = 1,
+//      .limit_mask             = 1,
+//      .defer_resume_backlight = 1,
+//};
+//
+//static struct resource gta01_bl_resources[] = {
+//      [0] = {
+//              .start  = M800_GPIO_BACKLIGHT,
+//              .end    = M800_GPIO_BACKLIGHT,
+//      },
+//};
+//
+//struct platform_device gta01_bl_dev = {
+//      .name           = "gta01-bl",
+//      .num_resources  = ARRAY_SIZE(gta01_bl_resources),
+//      .resource       = gta01_bl_resources,
+//      .dev            = {
+//              .platform_data = &backlight_machinfo,
+//      },
+//};
+
+
+//#if 0 /* currently this is not used and we use gpio spi */
+//static struct glamo_spi_info glamo_spi_cfg = {
+//      .board_size     = ARRAY_SIZE(gta02_spi_board_info),
+//      .board_info     = gta02_spi_board_info,
+//};
+//#endif /* 0 */
+//
+///* LED for the keyboard backlight */
+//static struct s3c24xx_led_platdata m800_kbd_led_pdata = {
+//      .name           = "kbd_backlight",
+//      .gpio           = M800_GPIO_KBDLIGHT,
+//      .def_trigger    = "kbd-backlight",
+//};
+//
+//static struct platform_device m800_kbd_led = {
+//      .name           = "s3c24xx_led",
+//      .id             = 0,
+//      .dev            = {
+//              .platform_data  = &m800_kbd_led_pdata,
+//      },
+//};
+//
+///* LED for the keyboard Fn LED */
+//static struct s3c24xx_led_platdata m800_kbd_fn_led_pdata = {
+//      .name           = "kbd_fn",
+//      .gpio           = M800_GPIO_LED_KBD_Fn,
+//      .def_trigger    = "kbd-fn",
+//};
+//
+//static struct platform_device m800_kbd_fn_led = {
+//      .name           = "s3c24xx_led",
+//      .id             = 1,
+//      .dev            = {
+//              .platform_data  = &m800_kbd_fn_led_pdata,
+//      },
+//};
+//
+///* LED for the keyboard Caps LED */
+//static struct s3c24xx_led_platdata m800_kbd_caps_led_pdata = {
+//      .name           = "kbd_caps",
+//      .gpio           = M800_GPIO_LED_KBD_Caps,
+//      .def_trigger    = "kbd-caps",
+//};
+//
+//static struct platform_device m800_kbd_caps_led = {
+//      .name           = "s3c24xx_led",
+//      .id             = 2,
+//      .dev            = {
+//              .platform_data  = &m800_kbd_caps_led_pdata,
+//      },
+//};
+
+/* USB */
+static struct s3c2410_hcd_info glofiishx500_usb_info = {
+        .port[0]        = {
+                .flags  = S3C_HCDFLG_USED,
+        },
+        .port[1]        = {
+                .flags  = 0,
+        },
+};
+
+//static struct resource m800_button_resources[] = {
+//      [0] = {
+//              .start = M800_GPIO_nKEY_POWER,
+//              .end   = M800_GPIO_nKEY_POWER,
+//      },
+//      [1] = {
+//              .start = M800_GPIO_nKEY_CAMERA,
+//              .end   = M800_GPIO_nKEY_CAMERA,
+//      },
+//      [2] = {
+//              .start = M800_GPIO_nKEY_RECORD,
+//              .end   = M800_GPIO_nKEY_RECORD,
+//      },
+//      [3] = {
+//              .start = M800_GPIO_SLIDE,
+//              .end   = M800_GPIO_SLIDE,
+//      },
+//      [4] = {
+//              .start = M800_GPIO_nKEY_RESET,
+//              .end   = M800_GPIO_nKEY_RESET,
+//      },
+//      [5] = {
+//              .start = M800_GPIO_HEADJACK,
+//              .end   = M800_GPIO_HEADJACK,
+//      },
+//};
+//
+//static struct platform_device m800_button_dev = {
+//      .name           = "m800-button",
+//      .num_resources  = ARRAY_SIZE(m800_button_resources),
+//      .resource       = m800_button_resources,
+//};
+//
+//static struct platform_device m800_pm_bt_dev = {
+//      .name           = "neo1973-pm-bt",
+//};
+//
+//static struct platform_device m800_pm_gps_dev = {
+//      .name           = "neo1973-pm-gps",
+//};
+//
+//static struct platform_device m800_pm_fm_dev = {
+//    .name       = "glofiish-pm-fm",
+//};
+//
+//static struct platform_device m800_pm_modem_dev = {
+//    .name       = "glofiish-pm-modem",
+//};
+//
+//static struct resource m800_modem_resources[] = {
+//      [0] = {
+//              .flags  = IORESOURCE_IRQ,
+//              .start  = M800_IRQ_GSM,
+//              .end    = M800_IRQ_GSM,
+//      },
+//      [1] = {
+//              .flags  = IORESOURCE_IRQ,
+//              .start  = IRQ_SPI1,
+//              .end    = IRQ_SPI1,
+//      },
+//      [2] = {
+//              .flags  = IORESOURCE_MEM,
+//              .start  = S3C2410_PA_SPI + 0x20,
+//              .end    = S3C2410_PA_SPI + 0x34,
+//      },
+//};
+//
+//static struct platform_device m800_modem_dev = {
+//      .name           = "gfish-modem",
+//      .num_resources  = ARRAY_SIZE(m800_modem_resources),
+//      .resource       = m800_modem_resources,
+//};
+//
+//static const struct gf_cpld_led_cfg m800_led_cfg[] = {
+//      {
+//              .reg_offset = 0x10,
+//              .bit_offset = 0,
+//              .name = "glofiish:red:right",
+//      }, {
+//              .reg_offset = 0x10,
+//              .bit_offset = 1,
+//              .name = "glofiish:green:right",
+//      }, {
+//              .reg_offset = 0x10,
+//              .bit_offset = 2,
+//              .name = "glofiish:blue:left",
+//      }, {
+//              .reg_offset = 0x10,
+//              .bit_offset = 3,
+//              .name = "glofiish:orange:left",
+//      }, {
+//              .reg_offset = 0x14,
+//              .bit_offset = 0,
+//              .name = "glofiish:white:left",
+//      }, {
+//              .reg_offset = 0x14,
+//              .bit_offset = 2,
+//              .name = "glofiish::vibrator",
+//      }, {
+//              .reg_offset = 0x16,
+//              .bit_offset = 2,
+//              .name = "glofiish:white:light",
+//      }, {
+//              .reg_offset = 0x16,
+//              .bit_offset = 3,
+//              .name = "glofiish:white:flash",
+//      },
+//};
+//
+//static struct gf_cpld_pdata m800_cpld_pdata = {
+//      .led_num = ARRAY_SIZE(m800_led_cfg),
+//      .led_cfgs = m800_led_cfg,
+//};
+//
+//static struct resource m800_cpld_resources[] = {
+//      [0] = {
+//              .start  = S3C2410_CS1,
+//              .end    = S3C2410_CS1 + 0x1000000 - 1,
+//              .flags  = IORESOURCE_MEM,
+//      },
+//      [1] = {
+//              .start  = M800_IRQ_CPLD_KEY,
+//              .end    = M800_IRQ_CPLD_KEY,
+//              .flags  = IORESOURCE_IRQ,
+//      },
+//      [2] = {
+//              .start  = M800_GPIO_KBD_SCAN_EN,
+//              .end    = M800_GPIO_KBD_SCAN_EN,
+//              .name   = "kbd_scan_en",
+//      },
+//};
+//
+//static struct platform_device m800_cpld_dev = {
+//      .name           = "gfish-cpld",
+//      .num_resources  = ARRAY_SIZE(m800_cpld_resources),
+//      .resource       = m800_cpld_resources,
+//      .dev            = {
+//              .platform_data  = &m800_cpld_pdata,
+//      },
+//};
+
+static void __init glofiishx500_map_io(void)
+{
+        s3c24xx_init_io(glofiishx500_iodesc, ARRAY_SIZE(glofiishx500_iodesc));
+        s3c24xx_init_clocks(16934400);
+        s3c24xx_init_uarts(glofiishx500_uartcfgs, ARRAY_SIZE(glofiishx500_uartcfgs));
+}
+
+/*
+ * hardware_ecc=1|0
+ */
+static char hardware_ecc_str[4] __initdata = "";
+
+static int __init hardware_ecc_setup(char *str)
+{
+        if (str)
+                strlcpy(hardware_ecc_str, str, sizeof(hardware_ecc_str));
+        return 1;
+}
+
+static struct platform_device *glofiishx500_devices[] __initdata = {
+        &s3c_device_usb,
+        &s3c_device_lcd,
+        &s3c_device_wdt,
+        &s3c_device_i2c0,
+        &s3c_device_iis,
+        &s3c_device_sdi,
+        &s3c_device_usbgadget,
+//      &s3c_device_nand,
+        &s3c_device_ts,
+//      &m800_kbd_led,
+//      &m800_kbd_fn_led,
+//      &m800_kbd_caps_led,
+};
+
+__setup("hardware_ecc=", hardware_ecc_setup);
+
+static void __init glofiishx500_machine_init(void)
+{
+        //int rc;
+
+        /* set the panic callback to make AUX blink fast */
+        panic_blink = glofiishx500_panic_blink;
+
+        /* do not force soft ecc if we are asked to use hardware_ecc */
+        if (hardware_ecc_str[0] == '1')
+                glofiishx500_nand_info.software_ecc = 0;
+
+        s3c_device_usb.dev.platform_data = &glofiishx500_usb_info;
+        s3c_device_nand.dev.platform_data = &glofiishx500_nand_info;
+        s3c_device_sdi.dev.platform_data = &glofiishx500_mmc_cfg;
+
+        s3c24xx_fb_set_platdata(&glofiishx500_lcd_cfg);
+        s3c24xx_udc_set_platdata(&glofiishx500_udc_cfg);
+        set_s3c2410ts_info(&glofiishx500_ts_cfg);
+
+        /*
+        platform_device_register(&gta01_bl_dev);
+        platform_device_register(&m800_pm_bt_dev);
+        platform_device_register(&m800_pm_gps_dev);
+        platform_device_register(&m800_pm_fm_dev);
+        platform_device_register(&m800_pm_modem_dev);
+        platform_device_register(&m800_modem_dev);
+        platform_device_register(&m800_cpld_dev);
+        platform_device_register(&m800_button_dev);
+        */
+        platform_device_register(&s3c_device_spi_lcm);
+
+        s3c_i2c0_set_platdata(&glofiishx500_i2c_pdata);
+        //i2c_register_board_info(0, glofiishx500_i2c_devs,
+        //                      ARRAY_SIZE(glofiishx500_i2c_devs));
+        spi_register_board_info(glofiishx500_spi_board_info,
+                    ARRAY_SIZE(glofiishx500_spi_board_info));
+
+        platform_add_devices(glofiishx500_devices, ARRAY_SIZE(glofiishx500_devices));
+
+        s3c_pm_init();
+
+        printk(KERN_INFO "Glofiish X500 machine initialized\n");
+}
+
+MACHINE_START(X500, "Glofiish X500")
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = glofiishx500_map_io,
+        .init_irq       = s3c24xx_init_irq,
+        .init_machine   = glofiishx500_machine_init,
+        .timer          = &s3c24xx_timer,
+MACHINE_END

arch/arm/plat-s3c24xx/neo1973_pm_bt.c

@@ -31 +31 @@
 #include <linux/mfd/pcf50633/gpio.h>
 
 /* For Glofiish M800 */
-#ifdef CONFIG_MACH_M800
+//#ifdef CONFIG_MACH_M800
 #include <mach/glofiish.h>
-#endif
+//#endif
 
 #include <linux/regulator/consumer.h>
 

arch/arm/plat-s3c24xx/neo1973_pm_gps.c

@@ -53 +53 @@
         GTA01_GPS_NUM_REG
 };
 
-#ifdef CONFIG_MACH_M800
+//#ifdef CONFIG_MACH_M800
 #include <mach/regs-gpioj.h>
 #include <mach/glofiish.h>
-#endif
+//#endif
 
 struct neo1973_pm_gps_data {
 #ifdef CONFIG_PM