Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git] / arch / arm / mach-pxa / em-x270.c
index f5ed803..920dfb8 100644 (file)
 
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/delay.h>
 
 #include <linux/dm9000.h>
 #include <linux/rtc-v3020.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 #include <linux/gpio.h>
+#include <linux/mfd/da903x.h>
+#include <linux/regulator/machine.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/tdo24m.h>
+#include <linux/power_supply.h>
+#include <linux/apm-emulation.h>
+
+#include <media/soc_camera.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/mfp-pxa27x.h>
-#include <mach/pxa-regs.h>
+#include <mach/pxa27x.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/audio.h>
 #include <mach/pxafb.h>
 #include <mach/ohci.h>
 #include <mach/mmc.h>
 #include <mach/pxa27x_keypad.h>
+#include <mach/i2c.h>
+#include <mach/camera.h>
+#include <mach/pxa2xx_spi.h>
 
 #include "generic.h"
+#include "devices.h"
 
-/* GPIO IRQ usage */
-#define GPIO41_ETHIRQ          (41)
+/* EM-X270 specific GPIOs */
 #define GPIO13_MMC_CD          (13)
+#define GPIO95_MMC_WP          (95)
+#define GPIO56_NAND_RB         (56)
+
+/* eXeda specific GPIOs */
+#define GPIO114_MMC_CD         (114)
+#define GPIO20_NAND_RB         (20)
+#define GPIO38_SD_PWEN         (38)
+
+/* common  GPIOs */
+#define GPIO11_NAND_CS         (11)
+#define GPIO93_CAM_RESET       (93)
+#define GPIO41_ETHIRQ          (41)
 #define EM_X270_ETHIRQ         IRQ_GPIO(GPIO41_ETHIRQ)
-#define EM_X270_MMC_CD         IRQ_GPIO(GPIO13_MMC_CD)
 
-/* NAND control GPIOs */
-#define GPIO11_NAND_CS (11)
-#define GPIO56_NAND_RB (56)
+static int mmc_cd;
+static int nand_rb;
+static int dm9000_flags;
 
-static unsigned long em_x270_pin_config[] = {
+static unsigned long common_pin_config[] = {
        /* AC'97 */
        GPIO28_AC97_BITCLK,
        GPIO29_AC97_SDATA_IN_0,
@@ -150,21 +173,32 @@ static unsigned long em_x270_pin_config[] = {
        GPIO18_RDY,
 
        /* GPIO */
-       GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,
+       GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,       /* sleep/resume button */
 
        /* power controls */
        GPIO20_GPIO     | MFP_LPM_DRIVE_LOW,    /* GPRS_PWEN */
+       GPIO93_GPIO     | MFP_LPM_DRIVE_LOW,    /* Camera reset */
        GPIO115_GPIO    | MFP_LPM_DRIVE_LOW,    /* WLAN_PWEN */
 
        /* NAND controls */
        GPIO11_GPIO     | MFP_LPM_DRIVE_HIGH,   /* NAND CE# */
-       GPIO56_GPIO,                            /* NAND Ready/Busy */
 
        /* interrupts */
-       GPIO13_GPIO,    /* MMC card detect */
        GPIO41_GPIO,    /* DM9000 interrupt */
 };
 
+static unsigned long em_x270_pin_config[] = {
+       GPIO13_GPIO,    /* MMC card detect */
+       GPIO56_GPIO,    /* NAND Ready/Busy */
+       GPIO95_GPIO,    /* MMC Write protect */
+};
+
+static unsigned long exeda_pin_config[] = {
+       GPIO20_GPIO,                            /* NAND Ready/Busy */
+       GPIO38_GPIO     | MFP_LPM_DRIVE_LOW,    /* SD slot power */
+       GPIO114_GPIO,                           /* MMC card detect */
+};
+
 #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
 static struct resource em_x270_dm9000_resource[] = {
        [0] = {
@@ -185,7 +219,7 @@ static struct resource em_x270_dm9000_resource[] = {
 };
 
 static struct dm9000_plat_data em_x270_dm9000_platdata = {
-       .flags          = DM9000_PLATF_32BITONLY,
+       .flags          = DM9000_PLATF_NO_EEPROM,
 };
 
 static struct platform_device em_x270_dm9000 = {
@@ -200,6 +234,7 @@ static struct platform_device em_x270_dm9000 = {
 
 static void __init em_x270_init_dm9000(void)
 {
+       em_x270_dm9000_platdata.flags |= dm9000_flags;
        platform_device_register(&em_x270_dm9000);
 }
 #else
@@ -289,7 +324,7 @@ static int em_x270_nand_device_ready(struct mtd_info *mtd)
 {
        dsb();
 
-       return gpio_get_value(GPIO56_NAND_RB);
+       return gpio_get_value(nand_rb);
 }
 
 static struct mtd_partition em_x270_partition_info[] = {
@@ -354,14 +389,14 @@ static void __init em_x270_init_nand(void)
 
        gpio_direction_output(GPIO11_NAND_CS, 1);
 
-       err = gpio_request(GPIO56_NAND_RB, "NAND R/B");
+       err = gpio_request(nand_rb, "NAND R/B");
        if (err) {
                pr_warning("EM-X270: failed to request NAND R/B gpio\n");
                gpio_free(GPIO11_NAND_CS);
                return;
        }
 
-       gpio_direction_input(GPIO56_NAND_RB);
+       gpio_direction_input(nand_rb);
 
        platform_device_register(&em_x270_nand);
 }
@@ -369,6 +404,61 @@ static void __init em_x270_init_nand(void)
 static inline void em_x270_init_nand(void) {}
 #endif
 
+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+static struct mtd_partition em_x270_nor_parts[] = {
+       {
+               .name =         "Bootloader",
+               .offset =       0x00000000,
+               .size =         0x00050000,
+               .mask_flags =   MTD_WRITEABLE  /* force read-only */
+       }, {
+               .name =         "Environment",
+               .offset =       0x00050000,
+               .size =         0x00010000,
+       }, {
+               .name =         "Reserved",
+               .offset =       0x00060000,
+               .size =         0x00050000,
+               .mask_flags =   MTD_WRITEABLE  /* force read-only */
+       }, {
+               .name =         "Splashscreen",
+               .offset =       0x000b0000,
+               .size =         0x00050000,
+       }
+};
+
+static struct physmap_flash_data em_x270_nor_data[] = {
+       [0] = {
+               .width = 2,
+               .parts = em_x270_nor_parts,
+               .nr_parts = ARRAY_SIZE(em_x270_nor_parts),
+       },
+};
+
+static struct resource em_x270_nor_flash_resource = {
+       .start  = PXA_CS0_PHYS,
+       .end    = PXA_CS0_PHYS + SZ_1M - 1,
+       .flags  = IORESOURCE_MEM,
+};
+
+static struct platform_device em_x270_physmap_flash = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .num_resources  = 1,
+       .resource       = &em_x270_nor_flash_resource,
+       .dev            = {
+               .platform_data  = &em_x270_nor_data,
+       },
+};
+
+static void __init em_x270_init_nor(void)
+{
+       platform_device_register(&em_x270_physmap_flash);
+}
+#else
+static inline void em_x270_init_nor(void) {}
+#endif
+
 /* PXA27x OHCI controller setup */
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 static int em_x270_ohci_init(struct device *dev)
@@ -395,40 +485,93 @@ static inline void em_x270_init_ohci(void) {}
 
 /* MCI controller setup */
 #if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)
+static struct regulator *em_x270_sdio_ldo;
+
 static int em_x270_mci_init(struct device *dev,
                            irq_handler_t em_x270_detect_int,
                            void *data)
 {
-       int err = request_irq(EM_X270_MMC_CD, em_x270_detect_int,
-                             IRQF_DISABLED | IRQF_TRIGGER_FALLING,
+       int err;
+
+       em_x270_sdio_ldo = regulator_get(dev, "vcc sdio");
+       if (IS_ERR(em_x270_sdio_ldo)) {
+               dev_err(dev, "can't request SDIO power supply: %ld\n",
+                       PTR_ERR(em_x270_sdio_ldo));
+               return PTR_ERR(em_x270_sdio_ldo);
+       }
+
+       err = request_irq(gpio_to_irq(mmc_cd), em_x270_detect_int,
+                             IRQF_DISABLED | IRQF_TRIGGER_RISING |
+                             IRQF_TRIGGER_FALLING,
                              "MMC card detect", data);
        if (err) {
-               printk(KERN_ERR "%s: can't request MMC card detect IRQ: %d\n",
-                      __func__, err);
-               return err;
+               dev_err(dev, "can't request MMC card detect IRQ: %d\n", err);
+               goto err_irq;
+       }
+
+       if (machine_is_em_x270()) {
+               err = gpio_request(GPIO95_MMC_WP, "MMC WP");
+               if (err) {
+                       dev_err(dev, "can't request MMC write protect: %d\n",
+                               err);
+                       goto err_gpio_wp;
+               }
+               gpio_direction_input(GPIO95_MMC_WP);
+       } else {
+               err = gpio_request(GPIO38_SD_PWEN, "sdio power");
+               if (err) {
+                       dev_err(dev, "can't request MMC power control : %d\n",
+                               err);
+                       goto err_gpio_wp;
+               }
+               gpio_direction_output(GPIO38_SD_PWEN, 1);
        }
 
        return 0;
+
+err_gpio_wp:
+       free_irq(gpio_to_irq(mmc_cd), data);
+err_irq:
+       regulator_put(em_x270_sdio_ldo);
+
+       return err;
 }
 
 static void em_x270_mci_setpower(struct device *dev, unsigned int vdd)
 {
-       /*
-          FIXME: current hardware implementation does not allow to
-          enable/disable MMC power. This will be fixed in next HW releases,
-          and we'll need to add implmentation here.
-       */
-       return;
+       struct pxamci_platform_data* p_d = dev->platform_data;
+
+       if ((1 << vdd) & p_d->ocr_mask) {
+               int vdd_uV = (2000 + (vdd - __ffs(MMC_VDD_20_21)) * 100) * 1000;
+
+               regulator_set_voltage(em_x270_sdio_ldo, vdd_uV, vdd_uV);
+               regulator_enable(em_x270_sdio_ldo);
+       } else {
+               regulator_disable(em_x270_sdio_ldo);
+       }
 }
 
 static void em_x270_mci_exit(struct device *dev, void *data)
 {
-       int irq = gpio_to_irq(GPIO13_MMC_CD);
-       free_irq(irq, data);
+       free_irq(gpio_to_irq(mmc_cd), data);
+       regulator_put(em_x270_sdio_ldo);
+
+       if (machine_is_em_x270())
+               gpio_free(GPIO95_MMC_WP);
+       else
+               gpio_free(GPIO38_SD_PWEN);
+}
+
+static int em_x270_mci_get_ro(struct device *dev)
+{
+       return gpio_get_value(GPIO95_MMC_WP);
 }
 
 static struct pxamci_platform_data em_x270_mci_platform_data = {
-       .ocr_mask       = MMC_VDD_28_29|MMC_VDD_29_30|MMC_VDD_30_31,
+       .ocr_mask       = MMC_VDD_20_21|MMC_VDD_21_22|MMC_VDD_22_23|
+                         MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27|
+                         MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
+                         MMC_VDD_30_31|MMC_VDD_31_32,
        .init           = em_x270_mci_init,
        .setpower       = em_x270_mci_setpower,
        .exit           = em_x270_mci_exit,
@@ -436,33 +579,53 @@ static struct pxamci_platform_data em_x270_mci_platform_data = {
 
 static void __init em_x270_init_mmc(void)
 {
+       if (machine_is_em_x270())
+               em_x270_mci_platform_data.get_ro = em_x270_mci_get_ro;
+
+       em_x270_mci_platform_data.detect_delay  = msecs_to_jiffies(250);
        pxa_set_mci_info(&em_x270_mci_platform_data);
 }
 #else
 static inline void em_x270_init_mmc(void) {}
 #endif
 
-/* LCD 480x640 */
+/* LCD */
 #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
-static struct pxafb_mode_info em_x270_lcd_mode = {
-       .pixclock       = 50000,
-       .bpp            = 16,
-       .xres           = 480,
-       .yres           = 640,
-       .hsync_len      = 8,
-       .vsync_len      = 2,
-       .left_margin    = 8,
-       .upper_margin   = 0,
-       .right_margin   = 24,
-       .lower_margin   = 4,
-       .cmap_greyscale = 0,
+static struct pxafb_mode_info em_x270_lcd_modes[] = {
+       [0] = {
+               .pixclock       = 38250,
+               .bpp            = 16,
+               .xres           = 480,
+               .yres           = 640,
+               .hsync_len      = 8,
+               .vsync_len      = 2,
+               .left_margin    = 8,
+               .upper_margin   = 2,
+               .right_margin   = 24,
+               .lower_margin   = 4,
+               .sync           = 0,
+       },
+       [1] = {
+               .pixclock       = 153800,
+               .bpp            = 16,
+               .xres           = 240,
+               .yres           = 320,
+               .hsync_len      = 8,
+               .vsync_len      = 2,
+               .left_margin    = 8,
+               .upper_margin   = 2,
+               .right_margin   = 88,
+               .lower_margin   = 2,
+               .sync           = 0,
+       },
 };
 
 static struct pxafb_mach_info em_x270_lcd = {
-       .modes          = &em_x270_lcd_mode,
-       .num_modes      = 1,
+       .modes          = em_x270_lcd_modes,
+       .num_modes      = 2,
        .lcd_conn       = LCD_COLOR_TFT_16BPP,
 };
+
 static void __init em_x270_init_lcd(void)
 {
        set_pxa_fb_info(&em_x270_lcd);
@@ -471,6 +634,40 @@ static void __init em_x270_init_lcd(void)
 static inline void em_x270_init_lcd(void) {}
 #endif
 
+#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)
+static struct pxa2xx_spi_master em_x270_spi_info = {
+       .num_chipselect = 1,
+};
+
+static struct pxa2xx_spi_chip em_x270_tdo24m_chip = {
+       .rx_threshold = 1,
+       .tx_threshold = 1,
+};
+
+static struct tdo24m_platform_data em_x270_tdo24m_pdata = {
+       .model = TDO35S,
+};
+
+static struct spi_board_info em_x270_spi_devices[] __initdata = {
+       {
+               .modalias = "tdo24m",
+               .max_speed_hz = 1000000,
+               .bus_num = 1,
+               .chip_select = 0,
+               .controller_data = &em_x270_tdo24m_chip,
+               .platform_data = &em_x270_tdo24m_pdata,
+       },
+};
+
+static void __init em_x270_init_spi(void)
+{
+       pxa2xx_set_spi_info(1, &em_x270_spi_info);
+       spi_register_board_info(ARRAY_AND_SIZE(em_x270_spi_devices));
+}
+#else
+static inline void em_x270_init_spi(void) {}
+#endif
+
 #if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE)
 static void __init em_x270_init_ac97(void)
 {
@@ -481,23 +678,76 @@ static inline void em_x270_init_ac97(void) {}
 #endif
 
 #if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)
-static unsigned int em_x270_matrix_keys[] = {
+static unsigned int em_x270_module_matrix_keys[] = {
        KEY(0, 0, KEY_A), KEY(1, 0, KEY_UP), KEY(2, 1, KEY_B),
        KEY(0, 2, KEY_LEFT), KEY(1, 1, KEY_ENTER), KEY(2, 0, KEY_RIGHT),
        KEY(0, 1, KEY_C), KEY(1, 2, KEY_DOWN), KEY(2, 2, KEY_D),
 };
 
-struct pxa27x_keypad_platform_data em_x270_keypad_info = {
+struct pxa27x_keypad_platform_data em_x270_module_keypad_info = {
        /* code map for the matrix keys */
        .matrix_key_rows        = 3,
        .matrix_key_cols        = 3,
-       .matrix_key_map         = em_x270_matrix_keys,
-       .matrix_key_map_size    = ARRAY_SIZE(em_x270_matrix_keys),
+       .matrix_key_map         = em_x270_module_matrix_keys,
+       .matrix_key_map_size    = ARRAY_SIZE(em_x270_module_matrix_keys),
+};
+
+static unsigned int em_x270_exeda_matrix_keys[] = {
+       KEY(0, 0, KEY_RIGHTSHIFT), KEY(0, 1, KEY_RIGHTCTRL),
+       KEY(0, 2, KEY_RIGHTALT), KEY(0, 3, KEY_SPACE),
+       KEY(0, 4, KEY_LEFTALT), KEY(0, 5, KEY_LEFTCTRL),
+       KEY(0, 6, KEY_ENTER), KEY(0, 7, KEY_SLASH),
+
+       KEY(1, 0, KEY_DOT), KEY(1, 1, KEY_M),
+       KEY(1, 2, KEY_N), KEY(1, 3, KEY_B),
+       KEY(1, 4, KEY_V), KEY(1, 5, KEY_C),
+       KEY(1, 6, KEY_X), KEY(1, 7, KEY_Z),
+
+       KEY(2, 0, KEY_LEFTSHIFT), KEY(2, 1, KEY_SEMICOLON),
+       KEY(2, 2, KEY_L), KEY(2, 3, KEY_K),
+       KEY(2, 4, KEY_J), KEY(2, 5, KEY_H),
+       KEY(2, 6, KEY_G), KEY(2, 7, KEY_F),
+
+       KEY(3, 0, KEY_D), KEY(3, 1, KEY_S),
+       KEY(3, 2, KEY_A), KEY(3, 3, KEY_TAB),
+       KEY(3, 4, KEY_BACKSPACE), KEY(3, 5, KEY_P),
+       KEY(3, 6, KEY_O), KEY(3, 7, KEY_I),
+
+       KEY(4, 0, KEY_U), KEY(4, 1, KEY_Y),
+       KEY(4, 2, KEY_T), KEY(4, 3, KEY_R),
+       KEY(4, 4, KEY_E), KEY(4, 5, KEY_W),
+       KEY(4, 6, KEY_Q), KEY(4, 7, KEY_MINUS),
+
+       KEY(5, 0, KEY_0), KEY(5, 1, KEY_9),
+       KEY(5, 2, KEY_8), KEY(5, 3, KEY_7),
+       KEY(5, 4, KEY_6), KEY(5, 5, KEY_5),
+       KEY(5, 6, KEY_4), KEY(5, 7, KEY_3),
+
+       KEY(6, 0, KEY_2), KEY(6, 1, KEY_1),
+       KEY(6, 2, KEY_ENTER), KEY(6, 3, KEY_END),
+       KEY(6, 4, KEY_DOWN), KEY(6, 5, KEY_UP),
+       KEY(6, 6, KEY_MENU), KEY(6, 7, KEY_F1),
+
+       KEY(7, 0, KEY_LEFT), KEY(7, 1, KEY_RIGHT),
+       KEY(7, 2, KEY_BACK), KEY(7, 3, KEY_HOME),
+       KEY(7, 4, 0), KEY(7, 5, 0),
+       KEY(7, 6, 0), KEY(7, 7, 0),
+};
+
+struct pxa27x_keypad_platform_data em_x270_exeda_keypad_info = {
+       /* code map for the matrix keys */
+       .matrix_key_rows        = 8,
+       .matrix_key_cols        = 8,
+       .matrix_key_map         = em_x270_exeda_matrix_keys,
+       .matrix_key_map_size    = ARRAY_SIZE(em_x270_exeda_matrix_keys),
 };
 
 static void __init em_x270_init_keypad(void)
 {
-       pxa_set_keypad_info(&em_x270_keypad_info);
+       if (machine_is_em_x270())
+               pxa_set_keypad_info(&em_x270_module_keypad_info);
+       else
+               pxa_set_keypad_info(&em_x270_exeda_keypad_info);
 }
 #else
 static inline void em_x270_init_keypad(void) {}
@@ -535,19 +785,264 @@ static void __init em_x270_init_gpio_keys(void)
 static inline void em_x270_init_gpio_keys(void) {}
 #endif
 
-static void __init em_x270_init(void)
+/* Quick Capture Interface and sensor setup */
+#if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)
+static struct regulator *em_x270_camera_ldo;
+
+static int em_x270_sensor_init(struct device *dev)
 {
+       int ret;
+
+       ret = gpio_request(GPIO93_CAM_RESET, "camera reset");
+       if (ret)
+               return ret;
+
+       gpio_direction_output(GPIO93_CAM_RESET, 0);
+
+       em_x270_camera_ldo = regulator_get(NULL, "vcc cam");
+       if (em_x270_camera_ldo == NULL) {
+               gpio_free(GPIO93_CAM_RESET);
+               return -ENODEV;
+       }
+
+       ret = regulator_enable(em_x270_camera_ldo);
+       if (ret) {
+               regulator_put(em_x270_camera_ldo);
+               gpio_free(GPIO93_CAM_RESET);
+               return ret;
+       }
+
+       gpio_set_value(GPIO93_CAM_RESET, 1);
+
+       return 0;
+}
+
+struct pxacamera_platform_data em_x270_camera_platform_data = {
+       .init   = em_x270_sensor_init,
+       .flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |
+               PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,
+       .mclk_10khz = 2600,
+};
+
+static int em_x270_sensor_power(struct device *dev, int on)
+{
+       int ret;
+       int is_on = regulator_is_enabled(em_x270_camera_ldo);
+
+       if (on == is_on)
+               return 0;
+
+       gpio_set_value(GPIO93_CAM_RESET, !on);
+
+       if (on)
+               ret = regulator_enable(em_x270_camera_ldo);
+       else
+               ret = regulator_disable(em_x270_camera_ldo);
+
+       if (ret)
+               return ret;
+
+       gpio_set_value(GPIO93_CAM_RESET, on);
+
+       return 0;
+}
+
+static struct soc_camera_link iclink = {
+       .bus_id = 0,
+       .power = em_x270_sensor_power,
+};
+
+static struct i2c_board_info em_x270_i2c_cam_info[] = {
+       {
+               I2C_BOARD_INFO("mt9m111", 0x48),
+               .platform_data = &iclink,
+       },
+};
+
+static struct i2c_pxa_platform_data em_x270_i2c_info = {
+       .fast_mode = 1,
+};
+
+static void  __init em_x270_init_camera(void)
+{
+       pxa_set_i2c_info(&em_x270_i2c_info);
+       i2c_register_board_info(0, ARRAY_AND_SIZE(em_x270_i2c_cam_info));
+       pxa_set_camera_info(&em_x270_camera_platform_data);
+}
+#else
+static inline void em_x270_init_camera(void) {}
+#endif
+
+/* DA9030 related initializations */
+#define REGULATOR_CONSUMER(_name, _dev, _supply)                              \
+       static struct regulator_consumer_supply _name##_consumers[] = { \
+               {                                                       \
+                       .dev = _dev,                                    \
+                       .supply = _supply,                              \
+               },                                                      \
+       }
+
+REGULATOR_CONSUMER(ldo3, NULL, "vcc gps");
+REGULATOR_CONSUMER(ldo5, NULL, "vcc cam");
+REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio");
+REGULATOR_CONSUMER(ldo12, NULL, "vcc usb");
+REGULATOR_CONSUMER(ldo19, NULL, "vcc gprs");
+
+#define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask)              \
+       static struct regulator_init_data _ldo##_data = {               \
+               .constraints = {                                        \
+                       .min_uV = _min_uV,                              \
+                       .max_uV = _max_uV,                              \
+                       .state_mem = {                                  \
+                               .enabled = 0,                           \
+                       },                                              \
+                       .valid_ops_mask = _ops_mask,                    \
+               },                                                      \
+               .num_consumer_supplies = ARRAY_SIZE(_ldo##_consumers),  \
+               .consumer_supplies = _ldo##_consumers,                  \
+       };
+
+REGULATOR_INIT(ldo3, 3200000, 3200000, REGULATOR_CHANGE_STATUS);
+REGULATOR_INIT(ldo5, 3000000, 3000000, REGULATOR_CHANGE_STATUS);
+REGULATOR_INIT(ldo10, 2000000, 3200000,
+              REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE);
+REGULATOR_INIT(ldo12, 3000000, 3000000, REGULATOR_CHANGE_STATUS);
+REGULATOR_INIT(ldo19, 3200000, 3200000, REGULATOR_CHANGE_STATUS);
+
+struct led_info em_x270_led_info = {
+       .name = "em-x270:orange",
+       .default_trigger = "battery-charging-or-full",
+};
+
+struct power_supply_info em_x270_psy_info = {
+       .name = "LP555597P6H-FPS",
+       .technology = POWER_SUPPLY_TECHNOLOGY_LIPO,
+       .voltage_max_design = 4200000,
+       .voltage_min_design = 3000000,
+       .use_for_apm = 1,
+};
+
+static void em_x270_battery_low(void)
+{
+       apm_queue_event(APM_LOW_BATTERY);
+}
+
+static void em_x270_battery_critical(void)
+{
+       apm_queue_event(APM_CRITICAL_SUSPEND);
+}
+
+struct da9030_battery_info em_x270_batterty_info = {
+       .battery_info = &em_x270_psy_info,
+
+       .charge_milliamp = 1000,
+       .charge_millivolt = 4200,
+
+       .vbat_low = 3600,
+       .vbat_crit = 3400,
+       .vbat_charge_start = 4100,
+       .vbat_charge_stop = 4200,
+       .vbat_charge_restart = 4000,
+
+       .vcharge_min = 3200,
+       .vcharge_max = 5500,
+
+       .tbat_low = 197,
+       .tbat_high = 78,
+       .tbat_restart = 100,
+
+       .batmon_interval = 0,
+
+       .battery_low = em_x270_battery_low,
+       .battery_critical = em_x270_battery_critical,
+};
+
+#define DA9030_SUBDEV(_name, _id, _pdata)      \
+       {                                       \
+               .name = "da903x-" #_name,       \
+               .id = DA9030_ID_##_id,          \
+               .platform_data = _pdata,        \
+       }
+
+#define DA9030_LDO(num)        DA9030_SUBDEV(regulator, LDO##num, &ldo##num##_data)
+
+struct da903x_subdev_info em_x270_da9030_subdevs[] = {
+       DA9030_LDO(3),
+       DA9030_LDO(5),
+       DA9030_LDO(10),
+       DA9030_LDO(12),
+       DA9030_LDO(19),
+
+       DA9030_SUBDEV(led, LED_PC, &em_x270_led_info),
+       DA9030_SUBDEV(backlight, WLED, &em_x270_led_info),
+       DA9030_SUBDEV(battery, BAT, &em_x270_batterty_info),
+};
+
+static struct da903x_platform_data em_x270_da9030_info = {
+       .num_subdevs = ARRAY_SIZE(em_x270_da9030_subdevs),
+       .subdevs = em_x270_da9030_subdevs,
+};
+
+static struct i2c_board_info em_x270_i2c_pmic_info = {
+       I2C_BOARD_INFO("da9030", 0x49),
+       .irq = IRQ_GPIO(0),
+       .platform_data = &em_x270_da9030_info,
+};
+
+static struct i2c_pxa_platform_data em_x270_pwr_i2c_info = {
+       .use_pio = 1,
+};
+
+static void __init em_x270_init_da9030(void)
+{
+       pxa27x_set_i2c_power_info(&em_x270_pwr_i2c_info);
+       i2c_register_board_info(1, &em_x270_i2c_pmic_info, 1);
+}
+
+static void __init em_x270_module_init(void)
+{
+       pr_info("%s\n", __func__);
        pxa2xx_mfp_config(ARRAY_AND_SIZE(em_x270_pin_config));
 
+       mmc_cd = GPIO13_MMC_CD;
+       nand_rb = GPIO56_NAND_RB;
+       dm9000_flags = DM9000_PLATF_32BITONLY;
+}
+
+static void __init em_x270_exeda_init(void)
+{
+       pr_info("%s\n", __func__);
+       pxa2xx_mfp_config(ARRAY_AND_SIZE(exeda_pin_config));
+
+       mmc_cd = GPIO114_MMC_CD;
+       nand_rb = GPIO20_NAND_RB;
+       dm9000_flags = DM9000_PLATF_16BITONLY;
+}
+
+static void __init em_x270_init(void)
+{
+       pxa2xx_mfp_config(ARRAY_AND_SIZE(common_pin_config));
+
+       if (machine_is_em_x270())
+               em_x270_module_init();
+       else if (machine_is_exeda())
+               em_x270_exeda_init();
+       else
+               panic("Unsupported machine: %d\n", machine_arch_type);
+
+       em_x270_init_da9030();
        em_x270_init_dm9000();
        em_x270_init_rtc();
        em_x270_init_nand();
+       em_x270_init_nor();
        em_x270_init_lcd();
        em_x270_init_mmc();
        em_x270_init_ohci();
        em_x270_init_keypad();
        em_x270_init_gpio_keys();
        em_x270_init_ac97();
+       em_x270_init_camera();
+       em_x270_init_spi();
 }
 
 MACHINE_START(EM_X270, "Compulab EM-X270")
@@ -559,3 +1054,13 @@ MACHINE_START(EM_X270, "Compulab EM-X270")
        .timer          = &pxa_timer,
        .init_machine   = em_x270_init,
 MACHINE_END
+
+MACHINE_START(EXEDA, "Compulab eXeda")
+       .boot_params    = 0xa0000100,
+       .phys_io        = 0x40000000,
+       .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+       .map_io         = pxa_map_io,
+       .init_irq       = pxa27x_init_irq,
+       .timer          = &pxa_timer,
+       .init_machine   = em_x270_init,
+MACHINE_END