54 files changed, 2506 insertions, 609 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index dee92182749b..38fbd0a0e402 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -115,6 +115,11 @@ config MACH_CM_X300
        select CPU_PXA310
        select HAVE_PWM
+config MACH_CAPC7117
+        bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM"
+        select CPU_PXA320
+        select PXA3xx
 config ARCH_GUMSTIX
        bool "Gumstix XScale 255 boards"
        select PXA25x
@@ -417,6 +422,24 @@ config MACH_TREO680
          Say Y here if you intend to run this kernel on Palm Treo 680
          smartphone.
+config MACH_RAUMFELD_RC
+        bool "Raumfeld Controller"
+        select PXA3xx
+        select CPU_PXA300
+        select HAVE_PWM
+config MACH_RAUMFELD_CONNECTOR
+        bool "Raumfeld Connector"
+        select PXA3xx
+        select CPU_PXA300
+        select PXA_SSP
+config MACH_RAUMFELD_SPEAKER
+        bool "Raumfeld Speaker"
+        select PXA3xx
+        select CPU_PXA300
+        select PXA_SSP
 config PXA_SHARPSL
        bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
        select SHARP_SCOOP
@@ -435,6 +458,7 @@ config SHARPSL_PM
 config CORGI_SSP_DEPRECATED
        bool
        select PXA_SSP
+        select PXA_SSP_LEGACY
        help
          This option will include corgi_ssp.c and corgi_lcd.c
          that corgi_ts.c and other legacy drivers (corgi_bl.c
@@ -446,6 +470,7 @@ config MACH_POODLE
        select PXA25x
        select SHARP_LOCOMO
        select PXA_SSP
+        select PXA_HAVE_BOARD_IRQS
 config MACH_CORGI
        bool "Enable Sharp SL-C700 (Corgi) Support"
@@ -492,6 +517,11 @@ config MACH_TOSA
        select PXA25x
        select PXA_HAVE_BOARD_IRQS
+config MACH_ICONTROL
+        bool "TMT iControl/SafeTCam based on the MXM-8x10 CoM"
+        select CPU_PXA320
+        select PXA3xx
 config ARCH_PXA_ESERIES
        bool "PXA based Toshiba e-series PDAs"
        select PXA25x
@@ -629,6 +659,11 @@ config PXA_SSP
        help
          Enable support for PXA2xx SSP ports
+config PXA_SSP_LEGACY
+        bool
+        help
+          Support of legacy SSP API
 config TOSA_BT
        tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
        depends on MACH_TOSA
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index f64afda7e6f6..86bc87b7f2dd 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_MACH_ARMCORE)	+= cm-x2xx-pci.o
 endif
 obj-$(CONFIG_MACH_EM_X270)      += em-x270.o
 obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o
+obj-$(CONFIG_MACH_CAPC7117)     += capc7117.o mxm8x10.o
 obj-$(CONFIG_ARCH_GUMSTIX)      += gumstix.o
 obj-$(CONFIG_GUMSTIX_AM200EPD)  += am200epd.o
 obj-$(CONFIG_GUMSTIX_AM300EPD)  += am300epd.o
@@ -82,6 +83,7 @@ obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o sharpsl_pm.o spitz_pm.o
 obj-$(CONFIG_CORGI_SSP_DEPRECATED)      += corgi_ssp.o corgi_lcd.o
 obj-$(CONFIG_MACH_POODLE)       += poodle.o
 obj-$(CONFIG_MACH_TOSA)         += tosa.o
+obj-$(CONFIG_MACH_ICONTROL)     += icontrol.o mxm8x10.o
 obj-$(CONFIG_ARCH_PXA_ESERIES)  += eseries.o
 obj-$(CONFIG_MACH_E330)         += e330.o
 obj-$(CONFIG_MACH_E350)         += e350.o
@@ -89,6 +91,9 @@ obj-$(CONFIG_MACH_E740)		+= e740.o
 obj-$(CONFIG_MACH_E750)         += e750.o
 obj-$(CONFIG_MACH_E400)         += e400.o
 obj-$(CONFIG_MACH_E800)         += e800.o
+obj-$(CONFIG_MACH_RAUMFELD_RC)          += raumfeld.o
+obj-$(CONFIG_MACH_RAUMFELD_CONNECTOR)   += raumfeld.o
+obj-$(CONFIG_MACH_RAUMFELD_SPEAKER)     += raumfeld.o
 # Support for blinky lights
 led-y := leds.o
diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c
index 4bd10a17332e..993d75e66390 100644
--- a/arch/arm/mach-pxa/am300epd.c
+++ b/arch/arm/mach-pxa/am300epd.c
@@ -288,7 +288,7 @@ int __init am300_init(void)
 }
 module_param(panel_type, uint, 0);
-MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97");
+MODULE_PARM_DESC(panel_type, "Select the panel type: 37, 6, 97");
 MODULE_DESCRIPTION("board driver for am300 epd kit");
 MODULE_AUTHOR("Jaya Kumar");
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index b8cd07ca9380..f3b5ace815e5 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -132,6 +132,14 @@ static void __init balloon3_init_irq(void)
                "enabled\n", __func__, BALLOON3_AUX_NIRQ);
 }
+static unsigned long balloon3_ac97_pin_config[] = {
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
+        GPIO113_AC97_nRESET,
+};
 static void balloon3_backlight_power(int on)
 {
        pr_debug("%s: power is %s\n", __func__, on ? "on" : "off");
@@ -140,26 +148,7 @@ static void balloon3_backlight_power(int on)
 static unsigned long balloon3_lcd_pin_config[] = {
        /* LCD - 16bpp Active TFT */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        GPIO99_GPIO,            /* Backlight */
 };
@@ -311,8 +300,10 @@ static void __init balloon3_init(void)
        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
-        if (balloon3_has(BALLOON3_FEATURE_AUDIO))
+        if (balloon3_has(BALLOON3_FEATURE_AUDIO)) {
+                pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_ac97_pin_config));
                pxa_set_ac97_info(NULL);
+        }
        if (balloon3_has(BALLOON3_FEATURE_TOPPOLY)) {
                pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_lcd_pin_config));
diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c
new file mode 100644
index 000000000000..aae544631a8b
--- /dev/null
+++ b/arch/arm/mach-pxa/capc7117.c
@@ -0,0 +1,158 @@
+/*
+ * linux/arch/arm/mach-pxa/capc7117.c
+ *
+ * Support for the Embedian CAPC-7117 Evaluation Kit
+ * based on the Embedian MXM-8x10 Computer on Module
+ *
+ * Copyright (C) 2009 Embedian Inc.
+ * Copyright (C) 2009 TMT Services & Supplies (Pty) Ltd.
+ *
+ * 2007-09-04: eric miao <eric.y.miao@gmail.com>
+ *             rewrite to align with latest kernel
+ *
+ * 2010-01-09: Edwin Peer <epeer@tmtservices.co.za>
+ *             Hennie van der Merwe <hvdmerwe@tmtservices.co.za>
+ *             rework for upstream merge
+ *
+ * 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/irq.h>
+#include <linux/platform_device.h>
+#include <linux/ata_platform.h>
+#include <linux/serial_8250.h>
+#include <linux/gpio.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/pxa320.h>
+#include <mach/mxm8x10.h>
+#include "generic.h"
+/* IDE (PATA) Support */
+static struct pata_platform_info pata_platform_data = {
+        .ioport_shift = 1
+};
+static struct resource capc7117_ide_resources[] = {
+        [0] = {
+               .start = 0x11000020,
+               .end = 0x1100003f,
+               .flags = IORESOURCE_MEM
+        },
+        [1] = {
+               .start = 0x1100001c,
+               .end = 0x1100001c,
+               .flags = IORESOURCE_MEM
+        },
+        [2] = {
+               .start = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO76)),
+               .end = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO76)),
+               .flags = IORESOURCE_IRQ | IRQF_TRIGGER_RISING
+        }
+};
+static struct platform_device capc7117_ide_device = {
+        .name = "pata_platform",
+        .num_resources = ARRAY_SIZE(capc7117_ide_resources),
+        .resource = capc7117_ide_resources,
+        .dev = {
+                .platform_data = &pata_platform_data,
+                .coherent_dma_mask = ~0         /* grumble */
+        }
+};
+static void __init capc7117_ide_init(void)
+{
+        platform_device_register(&capc7117_ide_device);
+}
+/* TI16C752 UART support */
+#define TI16C752_FLAGS          (UPF_BOOT_AUTOCONF | \
+                                        UPF_IOREMAP | \
+                                        UPF_BUGGY_UART | \
+                                        UPF_SKIP_TEST)
+#define TI16C752_UARTCLK        (22118400)
+static struct plat_serial8250_port ti16c752_platform_data[] = {
+        [0] = {
+               .mapbase = 0x14000000,
+               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO78)),
+               .irqflags = IRQF_TRIGGER_RISING,
+               .flags = TI16C752_FLAGS,
+               .iotype = UPIO_MEM,
+               .regshift = 1,
+               .uartclk = TI16C752_UARTCLK
+        },
+        [1] = {
+               .mapbase = 0x14000040,
+               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO79)),
+               .irqflags = IRQF_TRIGGER_RISING,
+               .flags = TI16C752_FLAGS,
+               .iotype = UPIO_MEM,
+               .regshift = 1,
+               .uartclk = TI16C752_UARTCLK
+        },
+        [2] = {
+               .mapbase = 0x14000080,
+               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO80)),
+               .irqflags = IRQF_TRIGGER_RISING,
+               .flags = TI16C752_FLAGS,
+               .iotype = UPIO_MEM,
+               .regshift = 1,
+               .uartclk = TI16C752_UARTCLK
+        },
+        [3] = {
+               .mapbase = 0x140000c0,
+               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO81)),
+               .irqflags = IRQF_TRIGGER_RISING,
+               .flags = TI16C752_FLAGS,
+               .iotype = UPIO_MEM,
+               .regshift = 1,
+               .uartclk = TI16C752_UARTCLK
+        },
+        [4] = {
+               /* end of array */
+        }
+};
+static struct platform_device ti16c752_device = {
+        .name = "serial8250",
+        .id = PLAT8250_DEV_PLATFORM,
+        .dev = {
+                .platform_data = ti16c752_platform_data
+        }
+};
+static void __init capc7117_uarts_init(void)
+{
+        platform_device_register(&ti16c752_device);
+}
+static void __init capc7117_init(void)
+{
+        /* Init CoM */
+        mxm_8x10_barebones_init();
+        /* Init evaluation board peripherals */
+        mxm_8x10_ac97_init();
+        mxm_8x10_usb_host_init();
+        mxm_8x10_mmc_init();
+        capc7117_uarts_init();
+        capc7117_ide_init();
+}
+MACHINE_START(CAPC7117,
+              "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM")
+        .phys_io = 0x40000000,
+        .boot_params = 0xa0000100,
+        .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io = pxa_map_io,
+        .init_irq = pxa3xx_init_irq,
+        .timer = &pxa_timer,
+        .init_machine = capc7117_init
+MACHINE_END
diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c
index 253fd76142d6..f1a7703d771b 100644
--- a/arch/arm/mach-pxa/cm-x255.c
+++ b/arch/arm/mach-pxa/cm-x255.c
@@ -50,26 +50,7 @@ static unsigned long cmx255_pin_config[] = {
        GPIO47_STUART_TXD,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* SSP1 */
        GPIO23_SSP1_SCLK,
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index eea78b6c2bc5..a9926bb75922 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -71,26 +71,7 @@ static unsigned long cmx270_pin_config[] = {
        GPIO111_MMC_DAT_3,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* I2C */
        GPIO117_I2C_SCL,
@@ -195,33 +176,57 @@ static struct resource cmx270_2700G_resource[] = {
        },
 };
-static unsigned long save_lcd_regs[10];
+static unsigned long cmx270_marathon_on[] = {
+        GPIO58_GPIO,
+        GPIO59_GPIO,
+        GPIO60_GPIO,
+        GPIO61_GPIO,
+        GPIO62_GPIO,
+        GPIO63_GPIO,
+        GPIO64_GPIO,
+        GPIO65_GPIO,
+        GPIO66_GPIO,
+        GPIO67_GPIO,
+        GPIO68_GPIO,
+        GPIO69_GPIO,
+        GPIO70_GPIO,
+        GPIO71_GPIO,
+        GPIO72_GPIO,
+        GPIO73_GPIO,
+        GPIO74_GPIO,
+        GPIO75_GPIO,
+        GPIO76_GPIO,
+        GPIO77_GPIO,
+};
+static unsigned long cmx270_marathon_off[] = {
+        GPIOxx_LCD_TFT_16BPP,
+};
 static int cmx270_marathon_probe(struct fb_info *fb)
 {
-        /* save PXA-270 pin settings before enabling 2700G */
+        int gpio, err;
-        save_lcd_regs[0] = GPDR1;
-        save_lcd_regs[1] = GPDR2;
+        for (gpio = 58; gpio <= 77; gpio++) {
-        save_lcd_regs[2] = GAFR1_U;
+                err = gpio_request(gpio, "LCD");
-        save_lcd_regs[3] = GAFR2_L;
+                if (err)
-        save_lcd_regs[4] = GAFR2_U;
+                        return err;
+                gpio_direction_input(gpio);
-        /* Disable PXA-270 on-chip controller driving pins */
+        }
-        GPDR1 &= ~(0xfc000000);
-        GPDR2 &= ~(0x00c03fff);
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(cmx270_marathon_on));
-        GAFR1_U &= ~(0xfff00000);
-        GAFR2_L &= ~(0x0fffffff);
-        GAFR2_U &= ~(0x0000f000);
        return 0;
 }
 static int cmx270_marathon_remove(struct fb_info *fb)
 {
-        GPDR1 =   save_lcd_regs[0];
+        int gpio;
-        GPDR2 =   save_lcd_regs[1];
-        GAFR1_U = save_lcd_regs[2];
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(cmx270_marathon_off));
-        GAFR2_L = save_lcd_regs[3];
-        GAFR2_U = save_lcd_regs[4];
+        for (gpio = 58; gpio <= 77; gpio++)
+                gpio_free(gpio);
        return 0;
 }
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c
index 7873fa3d8fa4..161fc2d61207 100644
--- a/arch/arm/mach-pxa/cm-x2xx-pci.c
+++ b/arch/arm/mach-pxa/cm-x2xx-pci.c
@@ -59,7 +59,7 @@ void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size,
 static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
        /* clear our parent irq */
-        GEDR(cmx2xx_it8152_irq_gpio) = GPIO_bit(cmx2xx_it8152_irq_gpio);
+        desc->chip->ack(irq);
        it8152_irq_demux(irq, desc);
 }
diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c
index a5ee70735e04..1d9bc118ee32 100644
--- a/arch/arm/mach-pxa/corgi_ssp.c
+++ b/arch/arm/mach-pxa/corgi_ssp.c
@@ -204,7 +204,7 @@ void __init corgi_ssp_set_machinfo(struct corgissp_machinfo *machinfo)
        ssp_machinfo = machinfo;
 }
-static int __init corgi_ssp_probe(struct platform_device *dev)
+static int __devinit corgi_ssp_probe(struct platform_device *dev)
 {
        int ret;
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c
index 94b23a9e3877..d578021d1a10 100644
--- a/arch/arm/mach-pxa/e740.c
+++ b/arch/arm/mach-pxa/e740.c
@@ -134,6 +134,12 @@ static unsigned long e740_pin_config[] __initdata = {
        /* IrDA */
        GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        /* Audio power control */
        GPIO16_GPIO,  /* AC97 codec AVDD2 supply (analogue power) */
        GPIO40_GPIO,  /* Mic amp power */
diff --git a/arch/arm/mach-pxa/e750.c b/arch/arm/mach-pxa/e750.c
index 5eccbce73a33..af83caa52dd4 100644
--- a/arch/arm/mach-pxa/e750.c
+++ b/arch/arm/mach-pxa/e750.c
@@ -132,6 +132,12 @@ static unsigned long e750_pin_config[] __initdata = {
        /* IrDA */
        GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        /* Audio power control */
        GPIO4_GPIO,  /* Headphone amp power */
        GPIO7_GPIO,  /* Speaker amp power */
diff --git a/arch/arm/mach-pxa/e800.c b/arch/arm/mach-pxa/e800.c
index aad129bed199..8ea97bf53fe1 100644
--- a/arch/arm/mach-pxa/e800.c
+++ b/arch/arm/mach-pxa/e800.c
@@ -35,6 +35,14 @@
 /* ------------------------ e800 LCD definitions ------------------------- */
+static unsigned long e800_pin_config[] __initdata = {
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
+};
 static struct w100_gen_regs e800_lcd_regs = {
        .lcd_format =            0x00008003,
        .lcdd_cntl1 =            0x02a00000,
@@ -195,6 +203,7 @@ static struct platform_device *devices[] __initdata = {
 static void __init e800_init(void)
 {
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(e800_pin_config));
        pxa_set_ffuart_info(NULL);
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index c8a01bc85fde..aab04f33e49b 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -109,26 +109,7 @@ static unsigned long common_pin_config[] = {
        GPIO111_MMC_DAT_3,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* QCI */
        GPIO84_CIF_FV,
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
new file mode 100644
index 000000000000..771137fc1a82
--- /dev/null
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -0,0 +1,202 @@
+/*
+ * linux/arch/arm/mach-pxa/icontrol.c
+ *
+ * Support for the iControl and SafeTcam platforms from TMT Services
+ * using the Embedian MXM-8x10 Computer on Module
+ *
+ * Copyright (C) 2009 TMT Services & Supplies (Pty) Ltd.
+ *
+ * 2010-01-21 Hennie van der Merve <hvdmerwe@tmtservies.co.za>
+ *
+ * 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/irq.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/pxa320.h>
+#include <mach/mxm8x10.h>
+#include <linux/spi/spi.h>
+#include <mach/pxa2xx_spi.h>
+#include <linux/can/platform/mcp251x.h>
+#include "generic.h"
+#define ICONTROL_MCP251x_nCS1   (15)
+#define ICONTROL_MCP251x_nCS2   (16)
+#define ICONTROL_MCP251x_nCS3   (17)
+#define ICONTROL_MCP251x_nCS4   (24)
+#define ICONTROL_MCP251x_nIRQ1  (74)
+#define ICONTROL_MCP251x_nIRQ2  (75)
+#define ICONTROL_MCP251x_nIRQ3  (76)
+#define ICONTROL_MCP251x_nIRQ4  (77)
+static struct pxa2xx_spi_chip mcp251x_chip_info1 = {
+        .tx_threshold   = 8,
+        .rx_threshold   = 128,
+        .dma_burst_size = 8,
+        .timeout        = 235,
+        .gpio_cs        = ICONTROL_MCP251x_nCS1
+};
+static struct pxa2xx_spi_chip mcp251x_chip_info2 = {
+        .tx_threshold   = 8,
+        .rx_threshold   = 128,
+        .dma_burst_size = 8,
+        .timeout        = 235,
+        .gpio_cs        = ICONTROL_MCP251x_nCS2
+};
+static struct pxa2xx_spi_chip mcp251x_chip_info3 = {
+        .tx_threshold   = 8,
+        .rx_threshold   = 128,
+        .dma_burst_size = 8,
+        .timeout        = 235,
+        .gpio_cs        = ICONTROL_MCP251x_nCS3
+};
+static struct pxa2xx_spi_chip mcp251x_chip_info4 = {
+        .tx_threshold   = 8,
+        .rx_threshold   = 128,
+        .dma_burst_size = 8,
+        .timeout        = 235,
+        .gpio_cs        = ICONTROL_MCP251x_nCS4
+};
+static struct mcp251x_platform_data mcp251x_info = {
+        .oscillator_frequency = 16E6,
+        .model                = CAN_MCP251X_MCP2515,
+        .board_specific_setup = NULL,
+        .power_enable         = NULL,
+        .transceiver_enable   = NULL
+};
+static struct spi_board_info mcp251x_board_info[] = {
+        {
+                .modalias        = "mcp251x",
+                .max_speed_hz    = 6500000,
+                .bus_num         = 3,
+                .chip_select     = 0,
+                .platform_data   = &mcp251x_info,
+                .controller_data = &mcp251x_chip_info1,
+                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ1)
+        },
+        {
+                .modalias        = "mcp251x",
+                .max_speed_hz    = 6500000,
+                .bus_num         = 3,
+                .chip_select     = 1,
+                .platform_data   = &mcp251x_info,
+                .controller_data = &mcp251x_chip_info2,
+                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ2)
+        },
+        {
+                .modalias        = "mcp251x",
+                .max_speed_hz    = 6500000,
+                .bus_num         = 4,
+                .chip_select     = 0,
+                .platform_data   = &mcp251x_info,
+                .controller_data = &mcp251x_chip_info3,
+                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ3)
+        },
+        {
+                .modalias        = "mcp251x",
+                .max_speed_hz    = 6500000,
+                .bus_num         = 4,
+                .chip_select     = 1,
+                .platform_data   = &mcp251x_info,
+                .controller_data = &mcp251x_chip_info4,
+                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ4)
+        }
+};
+static struct pxa2xx_spi_master pxa_ssp3_spi_master_info = {
+        .clock_enable   = CKEN_SSP3,
+        .num_chipselect = 2,
+        .enable_dma     = 1
+};
+static struct pxa2xx_spi_master pxa_ssp4_spi_master_info = {
+        .clock_enable   = CKEN_SSP4,
+        .num_chipselect = 2,
+        .enable_dma     = 1
+};
+struct platform_device pxa_spi_ssp3 = {
+        .name          = "pxa2xx-spi",
+        .id            = 3,
+        .dev           = {
+                .platform_data = &pxa_ssp3_spi_master_info,
+        }
+};
+struct platform_device pxa_spi_ssp4 = {
+        .name          = "pxa2xx-spi",
+        .id            = 4,
+        .dev           = {
+                .platform_data = &pxa_ssp4_spi_master_info,
+        }
+};
+static struct platform_device *icontrol_spi_devices[] __initdata = {
+        &pxa_spi_ssp3,
+        &pxa_spi_ssp4,
+};
+static mfp_cfg_t mfp_can_cfg[] __initdata = {
+        /* CAN CS lines */
+        GPIO15_GPIO,
+        GPIO16_GPIO,
+        GPIO17_GPIO,
+        GPIO24_GPIO,
+        /* SPI (SSP3) lines */
+        GPIO89_SSP3_SCLK,
+        GPIO91_SSP3_TXD,
+        GPIO92_SSP3_RXD,
+        /* SPI (SSP4) lines */
+        GPIO93_SSP4_SCLK,
+        GPIO95_SSP4_TXD,
+        GPIO96_SSP4_RXD,
+        /* CAN nIRQ lines */
+        GPIO74_GPIO | MFP_LPM_EDGE_RISE,
+        GPIO75_GPIO | MFP_LPM_EDGE_RISE,
+        GPIO76_GPIO | MFP_LPM_EDGE_RISE,
+        GPIO77_GPIO | MFP_LPM_EDGE_RISE
+};
+static void __init icontrol_can_init(void)
+{
+        pxa3xx_mfp_config(ARRAY_AND_SIZE(mfp_can_cfg));
+        platform_add_devices(ARRAY_AND_SIZE(icontrol_spi_devices));
+        spi_register_board_info(ARRAY_AND_SIZE(mcp251x_board_info));
+}
+static void __init icontrol_init(void)
+{
+        mxm_8x10_barebones_init();
+        mxm_8x10_usb_host_init();
+        mxm_8x10_mmc_init();
+        icontrol_can_init();
+}
+MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
+        .phys_io        = 0x40000000,
+        .boot_params    = 0xa0000100,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa3xx_init_irq,
+        .timer          = &pxa_timer,
+        .init_machine   = icontrol_init
+MACHINE_END
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index 5c9e11d74f49..bc78c4dc0c66 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -47,25 +47,7 @@
 static unsigned long idp_pin_config[] __initdata = {
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_DSTN_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
        /* BTUART */
        GPIO42_BTUART_RXD,
diff --git a/arch/arm/mach-pxa/imote2.c b/arch/arm/mach-pxa/imote2.c
index 5b0862df61ab..b2f878bd460b 100644
--- a/arch/arm/mach-pxa/imote2.c
+++ b/arch/arm/mach-pxa/imote2.c
@@ -64,7 +64,6 @@ static unsigned long imote2_pin_config[] __initdata = {
        GPIO116_GPIO,                   /* CC_CCA */
        GPIO0_GPIO,                     /* CC_FIFOP */
        GPIO16_GPIO,                    /* CCSFD */
-        GPIO39_GPIO,                    /* CSn */
        GPIO115_GPIO,                   /* Power enable */
        /* I2C */
@@ -72,7 +71,7 @@ static unsigned long imote2_pin_config[] __initdata = {
        GPIO118_I2C_SDA,
        /* SSP 3 - 802.15.4 radio */
-        GPIO39_GPIO,                    /* Chip Select */
+        GPIO39_GPIO,                    /* Chip Select */
        GPIO34_SSP3_SCLK,
        GPIO35_SSP3_TXD,
        GPIO41_SSP3_RXD,
diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h
index bfec09b1814b..1a741065045f 100644
--- a/arch/arm/mach-pxa/include/mach/balloon3.h
+++ b/arch/arm/mach-pxa/include/mach/balloon3.h
@@ -129,6 +129,16 @@ enum balloon3_features {
 #define CPLD_AROUTING_LOONR2INT_BIT    6
 #define CPLD_AROUTING_LOONR2EXT_BIT    7
+/* Balloon3 Interrupts */
+#define BALLOON3_IRQ(x)         (IRQ_BOARD_START + (x))
+#define BALLOON3_BP_CF_NRDY_IRQ BALLOON3_IRQ(0)
+#define BALLOON3_BP_NSTSCHG_IRQ BALLOON3_IRQ(1)
+#define BALLOON3_AUX_NIRQ       IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ)
+#define BALLOON3_CODEC_IRQ      IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)
+#define BALLOON3_S0_CD_IRQ      IRQ_GPIO(BALLOON3_GPIO_S0_CD)
 extern int balloon3_has(enum balloon3_features feature);
 #endif
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
index e741bf1bfb2d..7515757d6911 100644
--- a/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -314,7 +314,6 @@ extern unsigned long get_clock_tick_rate(void);
 #define PCIBIOS_MIN_IO          0
 #define PCIBIOS_MIN_MEM         0
 #define pcibios_assign_all_busses()     1
-#define HAVE_ARCH_PCI_SET_DMA_MASK      1
 #endif
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 3677a9af9c87..ffc8314520f2 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -135,82 +135,6 @@
 #define IRQ_BOARD_END           (IRQ_BOARD_START + 16)
 #endif
-#define IRQ_SA1111_START        (IRQ_BOARD_END)
-#define IRQ_GPAIN0              (IRQ_BOARD_END + 0)
-#define IRQ_GPAIN1              (IRQ_BOARD_END + 1)
-#define IRQ_GPAIN2              (IRQ_BOARD_END + 2)
-#define IRQ_GPAIN3              (IRQ_BOARD_END + 3)
-#define IRQ_GPBIN0              (IRQ_BOARD_END + 4)
-#define IRQ_GPBIN1              (IRQ_BOARD_END + 5)
-#define IRQ_GPBIN2              (IRQ_BOARD_END + 6)
-#define IRQ_GPBIN3              (IRQ_BOARD_END + 7)
-#define IRQ_GPBIN4              (IRQ_BOARD_END + 8)
-#define IRQ_GPBIN5              (IRQ_BOARD_END + 9)
-#define IRQ_GPCIN0              (IRQ_BOARD_END + 10)
-#define IRQ_GPCIN1              (IRQ_BOARD_END + 11)
-#define IRQ_GPCIN2              (IRQ_BOARD_END + 12)
-#define IRQ_GPCIN3              (IRQ_BOARD_END + 13)
-#define IRQ_GPCIN4              (IRQ_BOARD_END + 14)
-#define IRQ_GPCIN5              (IRQ_BOARD_END + 15)
-#define IRQ_GPCIN6              (IRQ_BOARD_END + 16)
-#define IRQ_GPCIN7              (IRQ_BOARD_END + 17)
-#define IRQ_MSTXINT             (IRQ_BOARD_END + 18)
-#define IRQ_MSRXINT             (IRQ_BOARD_END + 19)
-#define IRQ_MSSTOPERRINT        (IRQ_BOARD_END + 20)
-#define IRQ_TPTXINT             (IRQ_BOARD_END + 21)
-#define IRQ_TPRXINT             (IRQ_BOARD_END + 22)
-#define IRQ_TPSTOPERRINT        (IRQ_BOARD_END + 23)
-#define SSPXMTINT               (IRQ_BOARD_END + 24)
-#define SSPRCVINT               (IRQ_BOARD_END + 25)
-#define SSPROR                  (IRQ_BOARD_END + 26)
-#define AUDXMTDMADONEA          (IRQ_BOARD_END + 32)
-#define AUDRCVDMADONEA          (IRQ_BOARD_END + 33)
-#define AUDXMTDMADONEB          (IRQ_BOARD_END + 34)
-#define AUDRCVDMADONEB          (IRQ_BOARD_END + 35)
-#define AUDTFSR                 (IRQ_BOARD_END + 36)
-#define AUDRFSR                 (IRQ_BOARD_END + 37)
-#define AUDTUR                  (IRQ_BOARD_END + 38)
-#define AUDROR                  (IRQ_BOARD_END + 39)
-#define AUDDTS                  (IRQ_BOARD_END + 40)
-#define AUDRDD                  (IRQ_BOARD_END + 41)
-#define AUDSTO                  (IRQ_BOARD_END + 42)
-#define IRQ_USBPWR              (IRQ_BOARD_END + 43)
-#define IRQ_HCIM                (IRQ_BOARD_END + 44)
-#define IRQ_HCIBUFFACC          (IRQ_BOARD_END + 45)
-#define IRQ_HCIRMTWKP           (IRQ_BOARD_END + 46)
-#define IRQ_NHCIMFCIR           (IRQ_BOARD_END + 47)
-#define IRQ_USB_PORT_RESUME     (IRQ_BOARD_END + 48)
-#define IRQ_S0_READY_NINT       (IRQ_BOARD_END + 49)
-#define IRQ_S1_READY_NINT       (IRQ_BOARD_END + 50)
-#define IRQ_S0_CD_VALID         (IRQ_BOARD_END + 51)
-#define IRQ_S1_CD_VALID         (IRQ_BOARD_END + 52)
-#define IRQ_S0_BVD1_STSCHG      (IRQ_BOARD_END + 53)
-#define IRQ_S1_BVD1_STSCHG      (IRQ_BOARD_END + 54)
-#define IRQ_LOCOMO_START        (IRQ_BOARD_END)
-#define IRQ_LOCOMO_KEY          (IRQ_BOARD_END + 0)
-#define IRQ_LOCOMO_GPIO0        (IRQ_BOARD_END + 1)
-#define IRQ_LOCOMO_GPIO1        (IRQ_BOARD_END + 2)
-#define IRQ_LOCOMO_GPIO2        (IRQ_BOARD_END + 3)
-#define IRQ_LOCOMO_GPIO3        (IRQ_BOARD_END + 4)
-#define IRQ_LOCOMO_GPIO4        (IRQ_BOARD_END + 5)
-#define IRQ_LOCOMO_GPIO5        (IRQ_BOARD_END + 6)
-#define IRQ_LOCOMO_GPIO6        (IRQ_BOARD_END + 7)
-#define IRQ_LOCOMO_GPIO7        (IRQ_BOARD_END + 8)
-#define IRQ_LOCOMO_GPIO8        (IRQ_BOARD_END + 9)
-#define IRQ_LOCOMO_GPIO9        (IRQ_BOARD_END + 10)
-#define IRQ_LOCOMO_GPIO10       (IRQ_BOARD_END + 11)
-#define IRQ_LOCOMO_GPIO11       (IRQ_BOARD_END + 12)
-#define IRQ_LOCOMO_GPIO12       (IRQ_BOARD_END + 13)
-#define IRQ_LOCOMO_GPIO13       (IRQ_BOARD_END + 14)
-#define IRQ_LOCOMO_GPIO14       (IRQ_BOARD_END + 15)
-#define IRQ_LOCOMO_GPIO15       (IRQ_BOARD_END + 16)
-#define IRQ_LOCOMO_LT           (IRQ_BOARD_END + 17)
-#define IRQ_LOCOMO_SPI_RFR      (IRQ_BOARD_END + 18)
-#define IRQ_LOCOMO_SPI_RFW      (IRQ_BOARD_END + 19)
-#define IRQ_LOCOMO_SPI_OVRN     (IRQ_BOARD_END + 20)
-#define IRQ_LOCOMO_SPI_TEND     (IRQ_BOARD_END + 21)
 /*
 * Figure out the MAX IRQ number.
 *
@@ -219,89 +143,16 @@
 * Otherwise, we have the standard IRQs only.
 */
 #ifdef CONFIG_SA1111
-#define NR_IRQS                 (IRQ_S1_BVD1_STSCHG + 1)
+#define NR_IRQS                 (IRQ_BOARD_END + 55)
-#elif defined(CONFIG_SHARP_LOCOMO)
-#define NR_IRQS                 (IRQ_LOCOMO_SPI_TEND + 1)
 #elif defined(CONFIG_PXA_HAVE_BOARD_IRQS)
 #define NR_IRQS                 (IRQ_BOARD_END)
 #else
 #define NR_IRQS                 (IRQ_BOARD_START)
 #endif
-/*
- * Board specific IRQs.  Define them here.
- * Do not surround them with ifdefs.
- */
-#define LUBBOCK_IRQ(x)          (IRQ_BOARD_START + (x))
-#define LUBBOCK_SD_IRQ          LUBBOCK_IRQ(0)
-#define LUBBOCK_SA1111_IRQ      LUBBOCK_IRQ(1)
-#define LUBBOCK_USB_IRQ         LUBBOCK_IRQ(2)  /* usb connect */
-#define LUBBOCK_ETH_IRQ         LUBBOCK_IRQ(3)
-#define LUBBOCK_UCB1400_IRQ     LUBBOCK_IRQ(4)
-#define LUBBOCK_BB_IRQ          LUBBOCK_IRQ(5)
-#define LUBBOCK_USB_DISC_IRQ    LUBBOCK_IRQ(6)  /* usb disconnect */
-#define LUBBOCK_LAST_IRQ        LUBBOCK_IRQ(6)
-#define LPD270_IRQ(x)           (IRQ_BOARD_START + (x))
-#define LPD270_USBC_IRQ         LPD270_IRQ(2)
-#define LPD270_ETHERNET_IRQ     LPD270_IRQ(3)
-#define LPD270_AC97_IRQ         LPD270_IRQ(4)
-#define MAINSTONE_IRQ(x)        (IRQ_BOARD_START + (x))
-#define MAINSTONE_MMC_IRQ       MAINSTONE_IRQ(0)
-#define MAINSTONE_USIM_IRQ      MAINSTONE_IRQ(1)
-#define MAINSTONE_USBC_IRQ      MAINSTONE_IRQ(2)
-#define MAINSTONE_ETHERNET_IRQ  MAINSTONE_IRQ(3)
-#define MAINSTONE_AC97_IRQ      MAINSTONE_IRQ(4)
-#define MAINSTONE_PEN_IRQ       MAINSTONE_IRQ(5)
-#define MAINSTONE_MSINS_IRQ     MAINSTONE_IRQ(6)
-#define MAINSTONE_EXBRD_IRQ     MAINSTONE_IRQ(7)
-#define MAINSTONE_S0_CD_IRQ     MAINSTONE_IRQ(9)
-#define MAINSTONE_S0_STSCHG_IRQ MAINSTONE_IRQ(10)
-#define MAINSTONE_S0_IRQ        MAINSTONE_IRQ(11)
-#define MAINSTONE_S1_CD_IRQ     MAINSTONE_IRQ(13)
-#define MAINSTONE_S1_STSCHG_IRQ MAINSTONE_IRQ(14)
-#define MAINSTONE_S1_IRQ        MAINSTONE_IRQ(15)
-/* Balloon3 Interrupts */
-#define BALLOON3_IRQ(x)         (IRQ_BOARD_START + (x))
-#define BALLOON3_BP_CF_NRDY_IRQ BALLOON3_IRQ(0)
-#define BALLOON3_BP_NSTSCHG_IRQ BALLOON3_IRQ(1)
-#define BALLOON3_AUX_NIRQ       IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ)
-#define BALLOON3_CODEC_IRQ      IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)
-#define BALLOON3_S0_CD_IRQ      IRQ_GPIO(BALLOON3_GPIO_S0_CD)
-/* LoCoMo Interrupts (CONFIG_SHARP_LOCOMO) */
-#define IRQ_LOCOMO_KEY_BASE     (IRQ_BOARD_START + 0)
-#define IRQ_LOCOMO_GPIO_BASE    (IRQ_BOARD_START + 1)
-#define IRQ_LOCOMO_LT_BASE      (IRQ_BOARD_START + 2)
-#define IRQ_LOCOMO_SPI_BASE     (IRQ_BOARD_START + 3)
-/* phyCORE-PXA270 (PCM027) Interrupts */
-#define PCM027_IRQ(x)          (IRQ_BOARD_START + (x))
-#define PCM027_BTDET_IRQ       PCM027_IRQ(0)
-#define PCM027_FF_RI_IRQ       PCM027_IRQ(1)
-#define PCM027_MMCDET_IRQ      PCM027_IRQ(2)
-#define PCM027_PM_5V_IRQ       PCM027_IRQ(3)
-/* ITE8152 irqs */
 /* add IT8152 IRQs beyond BOARD_END */
 #ifdef CONFIG_PCI_HOST_ITE8152
-#define IT8152_IRQ(x)   (IRQ_BOARD_END + (x))
+#define IT8152_LAST_IRQ         (IRQ_BOARD_END + 40)
-/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */
-#define IT8152_LD_IRQ_COUNT     9
-#define IT8152_LP_IRQ_COUNT     16
-#define IT8152_PD_IRQ_COUNT     15
-/* Priorities: */
-#define IT8152_PD_IRQ(i)        IT8152_IRQ(i)
-#define IT8152_LP_IRQ(i)        (IT8152_IRQ(i) + IT8152_PD_IRQ_COUNT)
-#define IT8152_LD_IRQ(i)        (IT8152_IRQ(i) + IT8152_PD_IRQ_COUNT + IT8152_LP_IRQ_COUNT)
-#define IT8152_LAST_IRQ         IT8152_LD_IRQ(IT8152_LD_IRQ_COUNT - 1)
 #if NR_IRQS < (IT8152_LAST_IRQ+1)
 #undef NR_IRQS
diff --git a/arch/arm/mach-pxa/include/mach/lpd270.h b/arch/arm/mach-pxa/include/mach/lpd270.h
index f89fb715266b..0e6440c81683 100644
--- a/arch/arm/mach-pxa/include/mach/lpd270.h
+++ b/arch/arm/mach-pxa/include/mach/lpd270.h
@@ -34,5 +34,9 @@
 #define LPD270_INT_ETHERNET     (1 << 3)  /* Ethernet controller IRQ */
 #define LPD270_INT_USBC         (1 << 2)  /* USB client cable detection IRQ */
+#define LPD270_IRQ(x)           (IRQ_BOARD_START + (x))
+#define LPD270_USBC_IRQ         LPD270_IRQ(2)
+#define LPD270_ETHERNET_IRQ     LPD270_IRQ(3)
+#define LPD270_AC97_IRQ         LPD270_IRQ(4)
 #endif
diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h
index 751b74811d0f..a0d4247f08fc 100644
--- a/arch/arm/mach-pxa/include/mach/lubbock.h
+++ b/arch/arm/mach-pxa/include/mach/lubbock.h
@@ -34,6 +34,17 @@
 #define LUB_IRQ_SET_CLR         __LUB_REG(LUBBOCK_FPGA_PHYS + 0x0d0)
 #define LUB_GP                  __LUB_REG(LUBBOCK_FPGA_PHYS + 0x100)
+/* Board specific IRQs */
+#define LUBBOCK_IRQ(x)          (IRQ_BOARD_START + (x))
+#define LUBBOCK_SD_IRQ          LUBBOCK_IRQ(0)
+#define LUBBOCK_SA1111_IRQ      LUBBOCK_IRQ(1)
+#define LUBBOCK_USB_IRQ         LUBBOCK_IRQ(2)  /* usb connect */
+#define LUBBOCK_ETH_IRQ         LUBBOCK_IRQ(3)
+#define LUBBOCK_UCB1400_IRQ     LUBBOCK_IRQ(4)
+#define LUBBOCK_BB_IRQ          LUBBOCK_IRQ(5)
+#define LUBBOCK_USB_DISC_IRQ    LUBBOCK_IRQ(6)  /* usb disconnect */
+#define LUBBOCK_LAST_IRQ        LUBBOCK_IRQ(6)
 #ifndef __ASSEMBLY__
 extern void lubbock_set_misc_wr(unsigned int mask, unsigned int set);
 #endif
diff --git a/arch/arm/mach-pxa/include/mach/mainstone.h b/arch/arm/mach-pxa/include/mach/mainstone.h
index 3461c4302ff4..86e623abd64d 100644
--- a/arch/arm/mach-pxa/include/mach/mainstone.h
+++ b/arch/arm/mach-pxa/include/mach/mainstone.h
@@ -117,4 +117,21 @@
 #define MST_PCMCIA_PWR_VCC_33   0x8        /* voltage VCC = 3.3V */
 #define MST_PCMCIA_PWR_VCC_50   0x4        /* voltage VCC = 5.0V */
+/* board specific IRQs */
+#define MAINSTONE_IRQ(x)        (IRQ_BOARD_START + (x))
+#define MAINSTONE_MMC_IRQ       MAINSTONE_IRQ(0)
+#define MAINSTONE_USIM_IRQ      MAINSTONE_IRQ(1)
+#define MAINSTONE_USBC_IRQ      MAINSTONE_IRQ(2)
+#define MAINSTONE_ETHERNET_IRQ  MAINSTONE_IRQ(3)
+#define MAINSTONE_AC97_IRQ      MAINSTONE_IRQ(4)
+#define MAINSTONE_PEN_IRQ       MAINSTONE_IRQ(5)
+#define MAINSTONE_MSINS_IRQ     MAINSTONE_IRQ(6)
+#define MAINSTONE_EXBRD_IRQ     MAINSTONE_IRQ(7)
+#define MAINSTONE_S0_CD_IRQ     MAINSTONE_IRQ(9)
+#define MAINSTONE_S0_STSCHG_IRQ MAINSTONE_IRQ(10)
+#define MAINSTONE_S0_IRQ        MAINSTONE_IRQ(11)
+#define MAINSTONE_S1_CD_IRQ     MAINSTONE_IRQ(13)
+#define MAINSTONE_S1_STSCHG_IRQ MAINSTONE_IRQ(14)
+#define MAINSTONE_S1_IRQ        MAINSTONE_IRQ(15)
 #endif
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
index 9c787855cf24..cafadc33dfd8 100644
--- a/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
@@ -190,4 +190,36 @@
 #define GPIO89_AC97_nRESET      MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)
 #endif  /* CONFIG_CPU_PXA26x */
+/* commonly used pin configurations */
+#define GPIOxx_LCD_16BPP        \
+        GPIO58_LCD_LDD_0,       \
+        GPIO59_LCD_LDD_1,       \
+        GPIO60_LCD_LDD_2,       \
+        GPIO61_LCD_LDD_3,       \
+        GPIO62_LCD_LDD_4,       \
+        GPIO63_LCD_LDD_5,       \
+        GPIO64_LCD_LDD_6,       \
+        GPIO65_LCD_LDD_7,       \
+        GPIO66_LCD_LDD_8,       \
+        GPIO67_LCD_LDD_9,       \
+        GPIO68_LCD_LDD_10,      \
+        GPIO69_LCD_LDD_11,      \
+        GPIO70_LCD_LDD_12,      \
+        GPIO71_LCD_LDD_13,      \
+        GPIO72_LCD_LDD_14,      \
+        GPIO73_LCD_LDD_15
+#define GPIOxx_LCD_DSTN_16BPP   \
+        GPIOxx_LCD_16BPP,       \
+        GPIO74_LCD_FCLK,        \
+        GPIO75_LCD_LCLK,        \
+        GPIO76_LCD_PCLK
+#define GPIOxx_LCD_TFT_16BPP    \
+        GPIOxx_LCD_16BPP,       \
+        GPIO74_LCD_FCLK,        \
+        GPIO75_LCD_LCLK,        \
+        GPIO76_LCD_PCLK,        \
+        GPIO77_LCD_BIAS
 #endif /* __ASM_ARCH_MFP_PXA25X_H */
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
index 6543c05f47ed..ec0f0b0b6744 100644
--- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
@@ -434,5 +434,32 @@
 #define GPIO112_nMSINS          MFP_CFG_IN(GPIO112, AF2)
 #define GPIO32_MSSCLK           MFP_CFG_OUT(GPIO32, AF1, DRIVE_LOW)
+/* commonly used pin configurations */
+#define GPIOxx_LCD_16BPP        \
+        GPIO58_LCD_LDD_0,       \
+        GPIO59_LCD_LDD_1,       \
+        GPIO60_LCD_LDD_2,       \
+        GPIO61_LCD_LDD_3,       \
+        GPIO62_LCD_LDD_4,       \
+        GPIO63_LCD_LDD_5,       \
+        GPIO64_LCD_LDD_6,       \
+        GPIO65_LCD_LDD_7,       \
+        GPIO66_LCD_LDD_8,       \
+        GPIO67_LCD_LDD_9,       \
+        GPIO68_LCD_LDD_10,      \
+        GPIO69_LCD_LDD_11,      \
+        GPIO70_LCD_LDD_12,      \
+        GPIO71_LCD_LDD_13,      \
+        GPIO72_LCD_LDD_14,      \
+        GPIO73_LCD_LDD_15
+#define GPIOxx_LCD_TFT_16BPP    \
+        GPIOxx_LCD_16BPP,       \
+        GPIO74_LCD_FCLK,        \
+        GPIO75_LCD_LCLK,        \
+        GPIO76_LCD_PCLK,        \
+        GPIO77_LCD_BIAS
 extern int keypad_set_wake(unsigned int on);
 #endif /* __ASM_ARCH_MFP_PXA27X_H */
diff --git a/arch/arm/mach-pxa/include/mach/mxm8x10.h b/arch/arm/mach-pxa/include/mach/mxm8x10.h
new file mode 100644
index 000000000000..ffa15665a418
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/mxm8x10.h
@@ -0,0 +1,21 @@
+#ifndef __MACH_MXM_8X10_H
+#define __MACH_MXM_8X10_H
+#define MXM_8X10_ETH_PHYS       0x13000000
+#if defined(CONFIG_MMC)
+#define MXM_8X10_SD_nCD (72)
+#define MXM_8X10_SD_WP (84)
+extern void mxm_8x10_mmc_init(void);
+#else
+static inline void mxm_8x10_mmc_init(void) {}
+#endif
+extern void mxm_8x10_usb_host_init(void);
+extern void mxm_8x10_ac97_init(void);
+extern void mxm_8x10_barebones_init(void);
+#endif /* __MACH_MXM_8X10_H */
diff --git a/arch/arm/mach-pxa/include/mach/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h
index 4dcd2e8baa61..04083263167e 100644
--- a/arch/arm/mach-pxa/include/mach/pcm027.h
+++ b/arch/arm/mach-pxa/include/mach/pcm027.h
@@ -23,6 +23,13 @@
 * Definitions of CPU card resources only
 */
+/* phyCORE-PXA270 (PCM027) Interrupts */
+#define PCM027_IRQ(x)          (IRQ_BOARD_START + (x))
+#define PCM027_BTDET_IRQ       PCM027_IRQ(0)
+#define PCM027_FF_RI_IRQ       PCM027_IRQ(1)
+#define PCM027_MMCDET_IRQ      PCM027_IRQ(2)
+#define PCM027_PM_5V_IRQ       PCM027_IRQ(3)
 /* I2C RTC */
 #define PCM027_RTC_IRQ_GPIO     0
 #define PCM027_RTC_IRQ          IRQ_GPIO(PCM027_RTC_IRQ_GPIO)
diff --git a/arch/arm/mach-pxa/include/mach/ssp.h b/arch/arm/mach-pxa/include/mach/ssp.h
index cb5cb766f0f1..be1be5b6db51 100644
--- a/arch/arm/mach-pxa/include/mach/ssp.h
+++ b/arch/arm/mach-pxa/include/mach/ssp.h
@@ -46,6 +46,7 @@ struct ssp_device {
        int             drcmr_tx;
 };
+#ifdef CONFIG_PXA_SSP_LEGACY
 /*
 * SSP initialisation flags
 */
@@ -78,6 +79,7 @@ void ssp_restore_state(struct ssp_dev *dev, struct ssp_state *ssp);
 int ssp_init(struct ssp_dev *dev, u32 port, u32 init_flags);
 int ssp_config(struct ssp_dev *dev, u32 mode, u32 flags, u32 psp_flags, u32 speed);
 void ssp_exit(struct ssp_dev *dev);
+#endif /* CONFIG_PXA_SSP_LEGACY */
 /**
 * ssp_write_reg - Write to a SSP register
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h
index 237734b5b1be..5ef91d9d17e4 100644
--- a/arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -10,20 +10,41 @@
 */
 #include <linux/serial_reg.h>
-#include <mach/regs-uart.h>
 #include <asm/mach-types.h>
-#define __REG(x)       ((volatile unsigned long *)x)
+#define FFUART_BASE     (0x40100000)
+#define BTUART_BASE     (0x40200000)
+#define STUART_BASE     (0x40700000)
-static volatile unsigned long *UART = FFUART;
+static unsigned long uart_base = FFUART_BASE;
+static unsigned int uart_shift = 2;
+static unsigned int uart_is_pxa = 1;
+static inline unsigned char uart_read(int offset)
+{
+        return *(volatile unsigned char *)(uart_base + (offset << uart_shift));
+}
+static inline void uart_write(unsigned char val, int offset)
+{
+        *(volatile unsigned char *)(uart_base + (offset << uart_shift)) = val;
+}
+static inline int uart_is_enabled(void)
+{
+        /* assume enabled by default for non-PXA uarts */
+        return uart_is_pxa ? uart_read(UART_IER) & UART_IER_UUE : 1;
+}
 static inline void putc(char c)
 {
-        if (!(UART[UART_IER] & IER_UUE))
+        if (!uart_is_enabled())
                return;
-        while (!(UART[UART_LSR] & LSR_TDRQ))
+        while (!(uart_read(UART_LSR) & UART_LSR_THRE))
                barrier();
-        UART[UART_TX] = c;
+        uart_write(c, UART_TX);
 }
 /*
@@ -38,7 +59,13 @@ static inline void arch_decomp_setup(void)
        if (machine_is_littleton() || machine_is_intelmote2()
            || machine_is_csb726() || machine_is_stargate2()
            || machine_is_cm_x300() || machine_is_balloon3())
-                UART = STUART;
+                uart_base = STUART_BASE;
+        if (machine_is_arcom_zeus()) {
+                uart_base = 0x10000000; /* nCS4 */
+                uart_shift = 1;
+                uart_is_pxa = 0;
+        }
 }
 /*
diff --git a/arch/arm/mach-pxa/include/mach/zeus.h b/arch/arm/mach-pxa/include/mach/zeus.h
index c387046d2f28..6e119976003e 100644
--- a/arch/arm/mach-pxa/include/mach/zeus.h
+++ b/arch/arm/mach-pxa/include/mach/zeus.h
@@ -58,6 +58,8 @@
 #define ZEUS_EXT1_GPIO(x)       (ZEUS_EXT1_GPIO_BASE + (x))
 #define ZEUS_USER_GPIO(x)       (ZEUS_USER_GPIO_BASE + (x))
+#define ZEUS_CAN_SHDN_GPIO      ZEUS_EXT1_GPIO(2)
 /*
 * CPLD registers:
 * Only 4 registers, but spreaded over a 32MB address space.
@@ -68,7 +70,6 @@
 #define ZEUS_CPLD_VERSION       (ZEUS_CPLD + 0x0000)
 #define ZEUS_CPLD_ISA_IRQ       (ZEUS_CPLD + 0x1000)
 #define ZEUS_CPLD_CONTROL       (ZEUS_CPLD + 0x2000)
-#define ZEUS_CPLD_EXTWDOG       (ZEUS_CPLD + 0x3000)
 /* CPLD register bits */
 #define ZEUS_CPLD_CONTROL_CF_RST        0x01
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index 1373c22dbb83..d279507fc748 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -83,6 +83,10 @@ static unsigned long lpd270_pin_config[] __initdata = {
        GPIO89_USBH1_PEN,
        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        GPIO45_AC97_SYSCLK,
        GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,
@@ -121,7 +125,7 @@ static void lpd270_irq_handler(unsigned int irq, struct irq_desc *desc)
        pending = __raw_readw(LPD270_INT_STATUS) & lpd270_irq_enabled;
        do {
-                GEDR(0) = GPIO_bit(0);  /* clear useless edge notification */
+                desc->chip->ack(irq);   /* clear useless edge notification */
                if (likely(pending)) {
                        irq = LPD270_IRQ(0) + __ffs(pending);
                        generic_handle_irq(irq);
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 98ee7e590299..63d65a2a0387 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -66,26 +66,14 @@ static unsigned long lubbock_pin_config[] __initdata = {
        GPIO25_SSP1_TXD,
        GPIO26_SSP1_RXD,
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        /* LCD - 16bpp DSTN */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_DSTN_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
        /* BTUART */
        GPIO42_BTUART_RXD,
@@ -158,7 +146,7 @@ static void lubbock_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
        unsigned long pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled;
        do {
-                GEDR(0) = GPIO_bit(0);  /* clear our parent irq */
+                desc->chip->ack(irq);   /* clear our parent irq */
                if (likely(pending)) {
                        irq = LUBBOCK_IRQ(0) + __ffs(pending);
                        generic_handle_irq(irq);
@@ -240,11 +228,18 @@ static struct resource sa1111_resources[] = {
        },
 };
+static struct sa1111_platform_data sa1111_info = {
+        .irq_base       = IRQ_BOARD_END,
+};
 static struct platform_device sa1111_device = {
        .name           = "sa1111",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(sa1111_resources),
        .resource       = sa1111_resources,
+        .dev            = {
+                .platform_data  = &sa1111_info,
+        },
 };
 /* ADS7846 is connected through SSP ... and if your board has J5 populated,
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 189f330719a2..e81dd0c8e40d 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -88,26 +88,7 @@ static unsigned long magician_pin_config[] __initdata = {
        GPIO112_MMC_CMD,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* QCI */
        GPIO12_CIF_DD_7,
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 851ee0fc32e2..5543c64da9ef 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -60,26 +60,7 @@ static unsigned long mainstone_pin_config[] = {
        GPIO15_nCS_1,
        /* LCD - 16bpp Active TFT */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        GPIO16_PWM0_OUT,        /* Backlight */
        /* MMC */
@@ -107,6 +88,10 @@ static unsigned long mainstone_pin_config[] = {
        GPIO57_nIOIS16,
        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        GPIO45_AC97_SYSCLK,
        /* Keypad */
@@ -162,7 +147,7 @@ static void mainstone_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
        unsigned long pending = MST_INTSETCLR & mainstone_irq_enabled;
        do {
-                GEDR(0) = GPIO_bit(0);  /* clear useless edge notification */
+                desc->chip->ack(irq);   /* clear useless edge notification */
                if (likely(pending)) {
                        irq = MAINSTONE_IRQ(0) + __ffs(pending);
                        generic_handle_irq(irq);
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 2466a44d8fda..843fcca76e26 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -86,25 +86,7 @@ static unsigned long mioa701_pin_config[] = {
        MIO_CFG_OUT(GPIO22_USB_ENABLE, AF0, DRIVE_LOW),
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
        /* QCI */
        GPIO12_CIF_DD_7,
@@ -155,6 +137,10 @@ static unsigned long mioa701_pin_config[] = {
        GPIO41_FFUART_RTS,
        /* Sound */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        GPIO89_AC97_SYSCLK,
        MIO_CFG_IN(GPIO12_HPJACK_INSERT, AF0),
diff --git a/arch/arm/mach-pxa/mxm8x10.c b/arch/arm/mach-pxa/mxm8x10.c
new file mode 100644
index 000000000000..8c9c6f0d56bb
--- /dev/null
+++ b/arch/arm/mach-pxa/mxm8x10.c
@@ -0,0 +1,474 @@
+/*
+ * linux/arch/arm/mach-pxa/mxm8x10.c
+ *
+ * Support for the Embedian MXM-8x10 Computer on Module
+ *
+ * Copyright (C) 2006 Marvell International Ltd.
+ * Copyright (C) 2009 Embedian Inc.
+ * Copyright (C) 2009 TMT Services & Supplies (Pty) Ltd.
+ *
+ * 2007-09-04: eric miao <eric.y.miao@gmail.com>
+ *             rewrite to align with latest kernel
+ *
+ * 2010-01-09: Edwin Peer <epeer@tmtservices.co.za>
+ *             Hennie van der Merwe <hvdmerwe@tmtservices.co.za>
+ *             rework for upstream merge
+ *
+ * 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/serial_8250.h>
+#include <linux/dm9000.h>
+#include <linux/gpio.h>
+#include <plat/i2c.h>
+#include <plat/pxa3xx_nand.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
+#include <mach/ohci.h>
+#include <mach/pxa320.h>
+#include <mach/mxm8x10.h>
+#include "devices.h"
+#include "generic.h"
+/* GPIO pin definition
+External device stuff   - Leave unconfigured for now...
+---------------------
+GPIO0   -   DREQ    (External DMA Request)
+GPIO3   -   nGCS2   (External Chip Select) Where is nGCS0; nGCS1; nGCS4; nGCS5 ?
+GPIO4   -   nGCS3
+GPIO15  -   EXT_GPIO1
+GPIO16  -   EXT_GPIO2
+GPIO17  -   EXT_GPIO3
+GPIO24  -   EXT_GPIO4
+GPIO25  -   EXT_GPIO5
+GPIO26  -   EXT_GPIO6
+GPIO27  -   EXT_GPIO7
+GPIO28  -   EXT_GPIO8
+GPIO29  -   EXT_GPIO9
+GPIO30  -   EXT_GPIO10
+GPIO31  -   EXT_GPIO11
+GPIO57  -   EXT_GPIO12
+GPIO74  -   EXT_IRQ1
+GPIO75  -   EXT_IRQ2
+GPIO76  -   EXT_IRQ3
+GPIO77  -   EXT_IRQ4
+GPIO78  -   EXT_IRQ5
+GPIO79  -   EXT_IRQ6
+GPIO80  -   EXT_IRQ7
+GPIO81  -   EXT_IRQ8
+GPIO87  -   VCCIO_PWREN (External Device PWREN)
+Dallas 1-Wire   - Leave unconfigured for now...
+-------------
+GPIO0_2 -   DS - 1Wire
+Ethernet
+--------
+GPIO1   -   DM9000 PWR
+GPIO9   -   DM9K_nIRQ
+GPIO36  -   DM9K_RESET
+Keypad  - Leave unconfigured by for now...
+------
+GPIO1_2 -   KP_DKIN0
+GPIO5_2 -   KP_MKOUT7
+GPIO82  -   KP_DKIN1
+GPIO85  -   KP_DKIN2
+GPIO86  -   KP_DKIN3
+GPIO113 -   KP_MKIN0
+GPIO114 -   KP_MKIN1
+GPIO115 -   KP_MKIN2
+GPIO116 -   KP_MKIN3
+GPIO117 -   KP_MKIN4
+GPIO118 -   KP_MKIN5
+GPIO119 -   KP_MKIN6
+GPIO120 -   KP_MKIN7
+GPIO121 -   KP_MKOUT0
+GPIO122 -   KP_MKOUT1
+GPIO122 -   KP_MKOUT2
+GPIO123 -   KP_MKOUT3
+GPIO124 -   KP_MKOUT4
+GPIO125 -   KP_MKOUT5
+GPIO127 -   KP_MKOUT6
+Data Bus    - Leave unconfigured for now...
+--------
+GPIO2   -   nWait (Data Bus)
+USB Device
+----------
+GPIO4_2 -   USBD_PULLUP
+GPIO10  -   UTM_CLK (USB Device UTM Clk)
+GPIO49  -   USB 2.0 Device UTM_DATA0
+GPIO50  -   USB 2.0 Device UTM_DATA1
+GPIO51  -   USB 2.0 Device UTM_DATA2
+GPIO52  -   USB 2.0 Device UTM_DATA3
+GPIO53  -   USB 2.0 Device UTM_DATA4
+GPIO54  -   USB 2.0 Device UTM_DATA5
+GPIO55  -   USB 2.0 Device UTM_DATA6
+GPIO56  -   USB 2.0 Device UTM_DATA7
+GPIO58  -   UTM_RXVALID (USB 2.0 Device)
+GPIO59  -   UTM_RXACTIVE (USB 2.0 Device)
+GPIO60  -   UTM_RXERROR
+GPIO61  -   UTM_OPMODE0
+GPIO62  -   UTM_OPMODE1
+GPIO71  -   USBD_INT    (USB Device?)
+GPIO73  -   UTM_TXREADY (USB 2.0 Device)
+GPIO83  -   UTM_TXVALID (USB 2.0 Device)
+GPIO98  -   UTM_RESET   (USB 2.0 device)
+GPIO99  -   UTM_XCVR_SELECT
+GPIO100 -   UTM_TERM_SELECT
+GPIO101 -   UTM_SUSPENDM_X
+GPIO102 -   UTM_LINESTATE0
+GPIO103 -   UTM_LINESTATE1
+Card-Bus Interface  - Leave unconfigured for now...
+------------------
+GPIO5   -   nPIOR (I/O space output enable)
+GPIO6   -   nPIOW (I/O space write enable)
+GPIO7   -   nIOS16 (Input from I/O space telling size of data bus)
+GPIO8   -   nPWAIT (Input for inserting wait states)
+LCD
+---
+GPIO6_2     -   LDD0
+GPIO7_2     -   LDD1
+GPIO8_2     -   LDD2
+GPIO9_2     -   LDD3
+GPIO11_2    -   LDD5
+GPIO12_2    -   LDD6
+GPIO13_2    -   LDD7
+GPIO14_2    -   VSYNC
+GPIO15_2    -   HSYNC
+GPIO16_2    -   VCLK
+GPIO17_2    -   HCLK
+GPIO18_2    -   VDEN
+GPIO63      -   LDD8    (CPU LCD)
+GPIO64      -   LDD9    (CPU LCD)
+GPIO65      -   LDD10   (CPU LCD)
+GPIO66      -   LDD11   (CPU LCD)
+GPIO67      -   LDD12   (CPU LCD)
+GPIO68      -   LDD13   (CPU LCD)
+GPIO69      -   LDD14   (CPU LCD)
+GPIO70      -   LDD15   (CPU LCD)
+GPIO88      -   VCCLCD_PWREN (LCD Panel PWREN)
+GPIO97      -   BACKLIGHT_EN
+GPIO104     -   LCD_PWREN
+PWM   - Leave unconfigured for now...
+---
+GPIO11  -   PWM0
+GPIO12  -   PWM1
+GPIO13  -   PWM2
+GPIO14  -   PWM3
+SD-CARD
+-------
+GPIO18  -   SDDATA0
+GPIO19  -   SDDATA1
+GPIO20  -   SDDATA2
+GPIO21  -   SDDATA3
+GPIO22  -   SDCLK
+GPIO23  -   SDCMD
+GPIO72  -   SD_WP
+GPIO84  -   SD_nIRQ_CD  (SD-Card)
+I2C
+---
+GPIO32  -   I2CSCL
+GPIO33  -   I2CSDA
+AC97
+----
+GPIO35  -   AC97_SDATA_IN
+GPIO37  -   AC97_SDATA_OUT
+GPIO38  -   AC97_SYNC
+GPIO39  -   AC97_BITCLK
+GPIO40  -   AC97_nRESET
+UART1
+-----
+GPIO41  -   UART_RXD1
+GPIO42  -   UART_TXD1
+GPIO43  -   UART_CTS1
+GPIO44  -   UART_DCD1
+GPIO45  -   UART_DSR1
+GPIO46  -   UART_nRI1
+GPIO47  -   UART_DTR1
+GPIO48  -   UART_RTS1
+UART2
+-----
+GPIO109 -   RTS2
+GPIO110 -   RXD2
+GPIO111 -   TXD2
+GPIO112 -   nCTS2
+UART3
+-----
+GPIO105 -   nCTS3
+GPIO106 -   nRTS3
+GPIO107 -   TXD3
+GPIO108 -   RXD3
+SSP3    - Leave unconfigured for now...
+----
+GPIO89  -   SSP3_CLK
+GPIO90  -   SSP3_SFRM
+GPIO91  -   SSP3_TXD
+GPIO92  -   SSP3_RXD
+SSP4
+GPIO93  -   SSP4_CLK
+GPIO94  -   SSP4_SFRM
+GPIO95  -   SSP4_TXD
+GPIO96  -   SSP4_RXD
+*/
+static mfp_cfg_t mfp_cfg[] __initdata = {
+        /* USB */
+        GPIO10_UTM_CLK,
+        GPIO49_U2D_PHYDATA_0,
+        GPIO50_U2D_PHYDATA_1,
+        GPIO51_U2D_PHYDATA_2,
+        GPIO52_U2D_PHYDATA_3,
+        GPIO53_U2D_PHYDATA_4,
+        GPIO54_U2D_PHYDATA_5,
+        GPIO55_U2D_PHYDATA_6,
+        GPIO56_U2D_PHYDATA_7,
+        GPIO58_UTM_RXVALID,
+        GPIO59_UTM_RXACTIVE,
+        GPIO60_U2D_RXERROR,
+        GPIO61_U2D_OPMODE0,
+        GPIO62_U2D_OPMODE1,
+        GPIO71_GPIO, /* USBD_INT */
+        GPIO73_UTM_TXREADY,
+        GPIO83_U2D_TXVALID,
+        GPIO98_U2D_RESET,
+        GPIO99_U2D_XCVR_SEL,
+        GPIO100_U2D_TERM_SEL,
+        GPIO101_U2D_SUSPEND,
+        GPIO102_UTM_LINESTATE_0,
+        GPIO103_UTM_LINESTATE_1,
+        GPIO4_2_GPIO | MFP_PULL_HIGH, /* UTM_PULLUP */
+        /* DM9000 */
+        GPIO1_GPIO,
+        GPIO9_GPIO,
+        GPIO36_GPIO,
+        /* AC97 */
+        GPIO35_AC97_SDATA_IN_0,
+        GPIO37_AC97_SDATA_OUT,
+        GPIO38_AC97_SYNC,
+        GPIO39_AC97_BITCLK,
+        GPIO40_AC97_nACRESET,
+        /* UARTS */
+        GPIO41_UART1_RXD,
+        GPIO42_UART1_TXD,
+        GPIO43_UART1_CTS,
+        GPIO44_UART1_DCD,
+        GPIO45_UART1_DSR,
+        GPIO46_UART1_RI,
+        GPIO47_UART1_DTR,
+        GPIO48_UART1_RTS,
+        GPIO109_UART2_RTS,
+        GPIO110_UART2_RXD,
+        GPIO111_UART2_TXD,
+        GPIO112_UART2_CTS,
+        GPIO105_UART3_CTS,
+        GPIO106_UART3_RTS,
+        GPIO107_UART3_TXD,
+        GPIO108_UART3_RXD,
+        GPIO78_GPIO,
+        GPIO79_GPIO,
+        GPIO80_GPIO,
+        GPIO81_GPIO,
+        /* I2C */
+        GPIO32_I2C_SCL,
+        GPIO33_I2C_SDA,
+        /* MMC */
+        GPIO18_MMC1_DAT0,
+        GPIO19_MMC1_DAT1,
+        GPIO20_MMC1_DAT2,
+        GPIO21_MMC1_DAT3,
+        GPIO22_MMC1_CLK,
+        GPIO23_MMC1_CMD,
+        GPIO72_GPIO | MFP_PULL_HIGH, /* Card Detect */
+        GPIO84_GPIO | MFP_PULL_LOW, /* Write Protect */
+        /* IRQ */
+        GPIO74_GPIO | MFP_LPM_EDGE_RISE, /* EXT_IRQ1 */
+        GPIO75_GPIO | MFP_LPM_EDGE_RISE, /* EXT_IRQ2 */
+        GPIO76_GPIO | MFP_LPM_EDGE_RISE, /* EXT_IRQ3 */
+        GPIO77_GPIO | MFP_LPM_EDGE_RISE, /* EXT_IRQ4 */
+        GPIO78_GPIO | MFP_LPM_EDGE_RISE, /* EXT_IRQ5 */
+        GPIO79_GPIO | MFP_LPM_EDGE_RISE, /* EXT_IRQ6 */
+        GPIO80_GPIO | MFP_LPM_EDGE_RISE, /* EXT_IRQ7 */
+        GPIO81_GPIO | MFP_LPM_EDGE_RISE  /* EXT_IRQ8 */
+};
+/* MMC/MCI Support */
+#if defined(CONFIG_MMC)
+static struct pxamci_platform_data mxm_8x10_mci_platform_data = {
+        .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .detect_delay = 1,
+        .gpio_card_detect = MXM_8X10_SD_nCD,
+        .gpio_card_ro = MXM_8X10_SD_WP,
+        .gpio_power = -1
+};
+void __init mxm_8x10_mmc_init(void)
+{
+        pxa_set_mci_info(&mxm_8x10_mci_platform_data);
+}
+#endif
+/* USB Open Host Controler Interface */
+static struct pxaohci_platform_data mxm_8x10_ohci_platform_data = {
+        .port_mode = PMM_NPS_MODE,
+        .flags = ENABLE_PORT_ALL
+};
+void __init mxm_8x10_usb_host_init(void)
+{
+        pxa_set_ohci_info(&mxm_8x10_ohci_platform_data);
+}
+/* AC97 Sound Support */
+static struct platform_device mxm_8x10_ac97_device = {
+        .name = "pxa2xx-ac97"
+};
+void __init mxm_8x10_ac97_init(void)
+{
+        platform_device_register(&mxm_8x10_ac97_device);
+}
+/* NAND flash Support */
+#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE)
+#define NAND_BLOCK_SIZE SZ_128K
+#define NB(x)           (NAND_BLOCK_SIZE * (x))
+static struct mtd_partition mxm_8x10_nand_partitions[] = {
+        [0] = {
+               .name = "boot",
+               .size = NB(0x002),
+               .offset = NB(0x000),
+               .mask_flags = MTD_WRITEABLE
+        },
+        [1] = {
+               .name = "kernel",
+               .size = NB(0x010),
+               .offset = NB(0x002),
+               .mask_flags = MTD_WRITEABLE
+        },
+        [2] = {
+               .name = "root",
+               .size = NB(0x36c),
+               .offset = NB(0x012)
+        },
+        [3] = {
+               .name = "bbt",
+               .size = NB(0x082),
+               .offset = NB(0x37e),
+               .mask_flags = MTD_WRITEABLE
+        }
+};
+static struct pxa3xx_nand_platform_data mxm_8x10_nand_info = {
+        .enable_arbiter = 1,
+        .keep_config = 1,
+        .parts = mxm_8x10_nand_partitions,
+        .nr_parts = ARRAY_SIZE(mxm_8x10_nand_partitions)
+};
+static void __init mxm_8x10_nand_init(void)
+{
+        pxa3xx_set_nand_info(&mxm_8x10_nand_info);
+}
+#else
+static inline void mxm_8x10_nand_init(void) {}
+#endif /* CONFIG_MTD_NAND_PXA3xx || CONFIG_MTD_NAND_PXA3xx_MODULE */
+/* Ethernet support: Davicom DM9000 */
+static struct resource dm9k_resources[] = {
+        [0] = {
+               .start = MXM_8X10_ETH_PHYS + 0x300,
+               .end = MXM_8X10_ETH_PHYS + 0x300,
+               .flags = IORESOURCE_MEM
+        },
+        [1] = {
+               .start = MXM_8X10_ETH_PHYS + 0x308,
+               .end = MXM_8X10_ETH_PHYS + 0x308,
+               .flags = IORESOURCE_MEM
+        },
+        [2] = {
+               .start = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO9)),
+               .end = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO9)),
+               .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE
+        }
+};
+static struct dm9000_plat_data dm9k_plat_data = {
+        .flags = DM9000_PLATF_16BITONLY
+};
+static struct platform_device dm9k_device = {
+        .name = "dm9000",
+        .id = 0,
+        .num_resources = ARRAY_SIZE(dm9k_resources),
+        .resource = dm9k_resources,
+        .dev = {
+                .platform_data = &dm9k_plat_data
+        }
+};
+static void __init mxm_8x10_ethernet_init(void)
+{
+        platform_device_register(&dm9k_device);
+}
+/* PXA UARTs */
+static void __init mxm_8x10_uarts_init(void)
+{
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+}
+/* I2C and Real Time Clock */
+static struct i2c_board_info __initdata mxm_8x10_i2c_devices[] = {
+        {
+                I2C_BOARD_INFO("ds1337", 0x68)
+        }
+};
+static void __init mxm_8x10_i2c_init(void)
+{
+        i2c_register_board_info(0, mxm_8x10_i2c_devices,
+                                ARRAY_SIZE(mxm_8x10_i2c_devices));
+        pxa_set_i2c_info(NULL);
+}
+void __init mxm_8x10_barebones_init(void)
+{
+        pxa3xx_mfp_config(ARRAY_AND_SIZE(mfp_cfg));
+        mxm_8x10_uarts_init();
+        mxm_8x10_nand_init();
+        mxm_8x10_i2c_init();
+        mxm_8x10_ethernet_init();
+}
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
index e100af78b166..f70c75b38769 100644
--- a/arch/arm/mach-pxa/palmld.c
+++ b/arch/arm/mach-pxa/palmld.c
@@ -83,26 +83,7 @@ static unsigned long palmld_pin_config[] __initdata = {
        GPIO105_KP_MKOUT_2,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* PWM */
        GPIO16_PWM0_OUT,
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index 8fe3ec27568f..d902a813aae3 100644
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -87,26 +87,7 @@ static unsigned long palmt5_pin_config[] __initdata = {
        GPIO105_KP_MKOUT_2,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* PWM */
        GPIO16_PWM0_OUT,
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c
index b992f07ece21..717d7a638675 100644
--- a/arch/arm/mach-pxa/palmtc.c
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -84,26 +84,7 @@ static unsigned long palmtc_pin_config[] __initdata = {
        GPIO36_GPIO,    /* pullup */
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* MATRIX KEYPAD */
        GPIO0_GPIO | WAKEUP_ON_EDGE_BOTH,       /* in 0 */
diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c
index dc728d6ab94e..3d284ff1a64e 100644
--- a/arch/arm/mach-pxa/palmte2.c
+++ b/arch/arm/mach-pxa/palmte2.c
@@ -73,26 +73,7 @@ static unsigned long palmte2_pin_config[] __initdata = {
        GPIO47_FICP_TXD,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* GPIO KEYS */
        GPIO5_GPIO,     /* notes */
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index b433bb496711..d8b4469607a1 100644
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -99,25 +99,7 @@ static unsigned long treo_pin_config[] __initdata = {
        GPIO93_KP_DKIN_0 | WAKEUP_ON_LEVEL_HIGH,        /* Hotsync button */
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
        /* Quick Capture Interface */
        GPIO84_CIF_FV,
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index b37a025c0b7b..007b58c11f8d 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -110,26 +110,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
        GPIO105_KP_MKOUT_2,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* FFUART */
        GPIO34_FFUART_RXD,
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c
index 1c5d68a94511..3a7925ca3944 100644
--- a/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@ -95,26 +95,8 @@ static unsigned long palmz72_pin_config[] __initdata = {
        GPIO105_KP_MKOUT_2,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        GPIO20_GPIO,    /* bl power */
        GPIO21_GPIO,    /* LCD border switch */
        GPIO22_GPIO,    /* LCD border color */
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index d5255ae74fe3..9d0ecea1760c 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -58,6 +58,12 @@ static unsigned long pcm990_pin_config[] __initdata = {
        /* I2C */
        GPIO117_I2C_SCL,
        GPIO118_I2C_SDA,
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
 };
 /*
@@ -259,8 +265,7 @@ static void pcm990_irq_handler(unsigned int irq, struct irq_desc *desc)
        unsigned long pending = (~PCM990_INTSETCLR) & pcm990_irq_enabled;
        do {
-                GEDR(PCM990_CTRL_INT_IRQ_GPIO) =
+                desc->chip->ack(irq);   /* clear our parent IRQ */
-                                        GPIO_bit(PCM990_CTRL_INT_IRQ_GPIO);
                if (likely(pending)) {
                        irq = PCM027_IRQ(0) + __ffs(pending);
                        generic_handle_irq(irq);
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index c2b938a4d5c9..d58a52415d75 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -91,26 +91,7 @@ static unsigned long poodle_pin_config[] __initdata = {
        GPIO35_FFUART_CTS,
        /* LCD */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* PC Card */
        GPIO48_nPOE,
@@ -193,11 +174,18 @@ static struct resource locomo_resources[] = {
        },
 };
+static struct locomo_platform_data locomo_info = {
+        .irq_base       = IRQ_BOARD_START,
+};
 struct platform_device poodle_locomo_device = {
        .name           = "locomo",
        .id             = 0,
        .num_resources  = ARRAY_SIZE(locomo_resources),
        .resource       = locomo_resources,
+        .dev            = {
+                .platform_data  = &locomo_info,
+        },
 };
 EXPORT_SYMBOL(poodle_locomo_device);
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index d783123e2d48..0af36177ff08 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -40,6 +40,25 @@ void pxa27x_clear_otgph(void)
 }
 EXPORT_SYMBOL(pxa27x_clear_otgph);
+static unsigned long ac97_reset_config[] = {
+        GPIO95_AC97_nRESET,
+        GPIO95_GPIO,
+        GPIO113_AC97_nRESET,
+        GPIO113_GPIO,
+};
+void pxa27x_assert_ac97reset(int reset_gpio, int on)
+{
+        if (reset_gpio == 113)
+                pxa2xx_mfp_config(on ? &ac97_reset_config[0] :
+                                       &ac97_reset_config[1], 1);
+        if (reset_gpio == 95)
+                pxa2xx_mfp_config(on ? &ac97_reset_config[2] :
+                                       &ac97_reset_config[3], 1);
+}
+EXPORT_SYMBOL_GPL(pxa27x_assert_ac97reset);
 /* Crystal clock: 13MHz */
 #define BASE_CLK        13000000
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
new file mode 100644
index 000000000000..3184bdc14526
--- /dev/null
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -0,0 +1,1108 @@
+/*
+ * arch/arm/mach-pxa/raumfeld.c
+ *
+ * Support for the following Raumfeld devices:
+ *
+ *      * Controller
+ *      * Connector
+ *      * Speaker S/M
+ *
+ * See http://www.raumfeld.com for details.
+ *
+ * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ *
+ * 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/init.h>
+#include <linux/kernel.h>
+#include <linux/sysdev.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/smsc911x.h>
+#include <linux/input.h>
+#include <linux/rotary_encoder.h>
+#include <linux/gpio_keys.h>
+#include <linux/input/eeti_ts.h>
+#include <linux/leds.h>
+#include <linux/w1-gpio.h>
+#include <linux/sched.h>
+#include <linux/pwm_backlight.h>
+#include <linux/i2c.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
+#include <linux/lis3lv02d.h>
+#include <linux/pda_power.h>
+#include <linux/power_supply.h>
+#include <linux/pda_power.h>
+#include <linux/power_supply.h>
+#include <linux/regulator/max8660.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/consumer.h>
+#include <linux/delay.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/hardware.h>
+#include <mach/pxa3xx-regs.h>
+#include <mach/mfp-pxa3xx.h>
+#include <mach/mfp-pxa300.h>
+#include <mach/ohci.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
+#include <plat/i2c.h>
+#include <plat/pxa3xx_nand.h>
+#include "generic.h"
+#include "devices.h"
+#include "clock.h"
+/* common GPIO  definitions */
+/* inputs */
+#define GPIO_ON_OFF             (14)
+#define GPIO_VOLENC_A           (19)
+#define GPIO_VOLENC_B           (20)
+#define GPIO_CHARGE_DONE        (23)
+#define GPIO_CHARGE_IND         (27)
+#define GPIO_TOUCH_IRQ          (32)
+#define GPIO_ETH_IRQ            (40)
+#define GPIO_SPI_MISO           (98)
+#define GPIO_ACCEL_IRQ          (104)
+#define GPIO_RESCUE_BOOT        (115)
+#define GPIO_DOCK_DETECT        (116)
+#define GPIO_KEY1               (117)
+#define GPIO_KEY2               (118)
+#define GPIO_KEY3               (119)
+#define GPIO_CHARGE_USB_OK      (112)
+#define GPIO_CHARGE_DC_OK       (101)
+#define GPIO_CHARGE_USB_SUSP    (102)
+/* outputs */
+#define GPIO_SHUTDOWN_SUPPLY    (16)
+#define GPIO_SHUTDOWN_BATT      (18)
+#define GPIO_CHRG_PEN2          (31)
+#define GPIO_TFT_VA_EN          (33)
+#define GPIO_SPDIF_CS           (34)
+#define GPIO_LED2               (35)
+#define GPIO_LED1               (36)
+#define GPIO_SPDIF_RESET        (38)
+#define GPIO_SPI_CLK            (95)
+#define GPIO_MCLK_DAC_CS        (96)
+#define GPIO_SPI_MOSI           (97)
+#define GPIO_W1_PULLUP_ENABLE   (105)
+#define GPIO_DISPLAY_ENABLE     (106)
+#define GPIO_MCLK_RESET         (111)
+#define GPIO_W2W_RESET          (113)
+#define GPIO_W2W_PDN            (114)
+#define GPIO_CODEC_RESET        (120)
+#define GPIO_AUDIO_VA_ENABLE    (124)
+#define GPIO_ACCEL_CS           (125)
+#define GPIO_ONE_WIRE           (126)
+/*
+ * GPIO configurations
+ */
+static mfp_cfg_t raumfeld_controller_pin_config[] __initdata = {
+        /* UART1 */
+        GPIO77_UART1_RXD,
+        GPIO78_UART1_TXD,
+        GPIO79_UART1_CTS,
+        GPIO81_UART1_DSR,
+        GPIO83_UART1_DTR,
+        GPIO84_UART1_RTS,
+        /* UART3 */
+        GPIO110_UART3_RXD,
+        /* USB Host */
+        GPIO0_2_USBH_PEN,
+        GPIO1_2_USBH_PWR,
+        /* I2C */
+        GPIO21_I2C_SCL | MFP_LPM_FLOAT | MFP_PULL_FLOAT,
+        GPIO22_I2C_SDA | MFP_LPM_FLOAT | MFP_PULL_FLOAT,
+        /* SPI */
+        GPIO34_GPIO,    /* SPDIF_CS */
+        GPIO96_GPIO,    /* MCLK_CS */
+        GPIO125_GPIO,   /* ACCEL_CS */
+        /* MMC */
+        GPIO3_MMC1_DAT0,
+        GPIO4_MMC1_DAT1,
+        GPIO5_MMC1_DAT2,
+        GPIO6_MMC1_DAT3,
+        GPIO7_MMC1_CLK,
+        GPIO8_MMC1_CMD,
+        /* One-wire */
+        GPIO126_GPIO | MFP_LPM_FLOAT,
+        GPIO105_GPIO | MFP_PULL_LOW | MFP_LPM_PULL_LOW,
+        /* CHRG_USB_OK */
+        GPIO101_GPIO | MFP_PULL_HIGH,
+        /* CHRG_USB_OK */
+        GPIO112_GPIO | MFP_PULL_HIGH,
+        /* CHRG_USB_SUSP */
+        GPIO102_GPIO,
+        /* DISPLAY_ENABLE */
+        GPIO106_GPIO,
+        /* DOCK_DETECT */
+        GPIO116_GPIO | MFP_LPM_FLOAT | MFP_PULL_FLOAT,
+        /* LCD */
+        GPIO54_LCD_LDD_0,
+        GPIO55_LCD_LDD_1,
+        GPIO56_LCD_LDD_2,
+        GPIO57_LCD_LDD_3,
+        GPIO58_LCD_LDD_4,
+        GPIO59_LCD_LDD_5,
+        GPIO60_LCD_LDD_6,
+        GPIO61_LCD_LDD_7,
+        GPIO62_LCD_LDD_8,
+        GPIO63_LCD_LDD_9,
+        GPIO64_LCD_LDD_10,
+        GPIO65_LCD_LDD_11,
+        GPIO66_LCD_LDD_12,
+        GPIO67_LCD_LDD_13,
+        GPIO68_LCD_LDD_14,
+        GPIO69_LCD_LDD_15,
+        GPIO70_LCD_LDD_16,
+        GPIO71_LCD_LDD_17,
+        GPIO72_LCD_FCLK,
+        GPIO73_LCD_LCLK,
+        GPIO74_LCD_PCLK,
+        GPIO75_LCD_BIAS,
+};
+static mfp_cfg_t raumfeld_connector_pin_config[] __initdata = {
+        /* UART1 */
+        GPIO77_UART1_RXD,
+        GPIO78_UART1_TXD,
+        GPIO79_UART1_CTS,
+        GPIO81_UART1_DSR,
+        GPIO83_UART1_DTR,
+        GPIO84_UART1_RTS,
+        /* UART3 */
+        GPIO110_UART3_RXD,
+        /* USB Host */
+        GPIO0_2_USBH_PEN,
+        GPIO1_2_USBH_PWR,
+        /* I2C */
+        GPIO21_I2C_SCL | MFP_LPM_FLOAT | MFP_PULL_FLOAT,
+        GPIO22_I2C_SDA | MFP_LPM_FLOAT | MFP_PULL_FLOAT,
+        /* SPI */
+        GPIO34_GPIO,    /* SPDIF_CS */
+        GPIO96_GPIO,    /* MCLK_CS */
+        GPIO125_GPIO,   /* ACCEL_CS */
+        /* MMC */
+        GPIO3_MMC1_DAT0,
+        GPIO4_MMC1_DAT1,
+        GPIO5_MMC1_DAT2,
+        GPIO6_MMC1_DAT3,
+        GPIO7_MMC1_CLK,
+        GPIO8_MMC1_CMD,
+        /* Ethernet */
+        GPIO1_nCS2,                     /* CS */
+        GPIO40_GPIO | MFP_PULL_HIGH,    /* IRQ */
+        /* SSP for I2S */
+        GPIO85_SSP1_SCLK,
+        GPIO89_SSP1_EXTCLK,
+        GPIO86_SSP1_FRM,
+        GPIO87_SSP1_TXD,
+        GPIO88_SSP1_RXD,
+        GPIO90_SSP1_SYSCLK,
+        /* SSP2 for S/PDIF */
+        GPIO25_SSP2_SCLK,
+        GPIO26_SSP2_FRM,
+        GPIO27_SSP2_TXD,
+        GPIO29_SSP2_EXTCLK,
+        /* LEDs */
+        GPIO35_GPIO | MFP_LPM_PULL_LOW,
+        GPIO36_GPIO | MFP_LPM_DRIVE_HIGH,
+};
+static mfp_cfg_t raumfeld_speaker_pin_config[] __initdata = {
+        /* UART1 */
+        GPIO77_UART1_RXD,
+        GPIO78_UART1_TXD,
+        GPIO79_UART1_CTS,
+        GPIO81_UART1_DSR,
+        GPIO83_UART1_DTR,
+        GPIO84_UART1_RTS,
+        /* UART3 */
+        GPIO110_UART3_RXD,
+        /* USB Host */
+        GPIO0_2_USBH_PEN,
+        GPIO1_2_USBH_PWR,
+        /* I2C */
+        GPIO21_I2C_SCL | MFP_LPM_FLOAT | MFP_PULL_FLOAT,
+        GPIO22_I2C_SDA | MFP_LPM_FLOAT | MFP_PULL_FLOAT,
+        /* SPI */
+        GPIO34_GPIO,    /* SPDIF_CS */
+        GPIO96_GPIO,    /* MCLK_CS */
+        GPIO125_GPIO,   /* ACCEL_CS */
+        /* MMC */
+        GPIO3_MMC1_DAT0,
+        GPIO4_MMC1_DAT1,
+        GPIO5_MMC1_DAT2,
+        GPIO6_MMC1_DAT3,
+        GPIO7_MMC1_CLK,
+        GPIO8_MMC1_CMD,
+        /* Ethernet */
+        GPIO1_nCS2,                     /* CS */
+        GPIO40_GPIO | MFP_PULL_HIGH,    /* IRQ */
+        /* SSP for I2S */
+        GPIO85_SSP1_SCLK,
+        GPIO89_SSP1_EXTCLK,
+        GPIO86_SSP1_FRM,
+        GPIO87_SSP1_TXD,
+        GPIO88_SSP1_RXD,
+        GPIO90_SSP1_SYSCLK,
+        /* LEDs */
+        GPIO35_GPIO | MFP_LPM_PULL_LOW,
+        GPIO36_GPIO | MFP_LPM_DRIVE_HIGH,
+};
+/*
+ * SMSC LAN9220 Ethernet
+ */
+static struct resource smc91x_resources[] = {
+        {
+                .start  = PXA3xx_CS2_PHYS,
+                .end    = PXA3xx_CS2_PHYS + 0xfffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = gpio_to_irq(GPIO_ETH_IRQ),
+                .end    = gpio_to_irq(GPIO_ETH_IRQ),
+                .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,
+        }
+};
+static struct smsc911x_platform_config raumfeld_smsc911x_config = {
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
+};
+static struct platform_device smc91x_device = {
+        .name           = "smsc911x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc91x_resources),
+        .resource       = smc91x_resources,
+        .dev            = {
+                .platform_data = &raumfeld_smsc911x_config,
+        }
+};
+/**
+ * NAND
+ */
+static struct mtd_partition raumfeld_nand_partitions[] = {
+        {
+                .name           = "Bootloader",
+                .offset         = 0,
+                .size           = 0xa0000,
+                .mask_flags     = MTD_WRITEABLE, /* force read-only */
+        },
+        {
+                .name           = "BootloaderEnvironment",
+                .offset         = 0xa0000,
+                .size           = 0x20000,
+        },
+        {
+                .name           = "BootloaderSplashScreen",
+                .offset         = 0xc0000,
+                .size           = 0x60000,
+        },
+        {
+                .name           = "UBI",
+                .offset         = 0x120000,
+                .size           = MTDPART_SIZ_FULL,
+        },
+};
+static struct pxa3xx_nand_platform_data raumfeld_nand_info = {
+        .enable_arbiter = 1,
+        .keep_config    = 1,
+        .parts          = raumfeld_nand_partitions,
+        .nr_parts       = ARRAY_SIZE(raumfeld_nand_partitions),
+};
+/**
+ * USB (OHCI) support
+ */
+static struct pxaohci_platform_data raumfeld_ohci_info = {
+        .port_mode      = PMM_GLOBAL_MODE,
+        .flags          = ENABLE_PORT1,
+};
+/**
+ * Rotary encoder input device
+ */
+static struct rotary_encoder_platform_data raumfeld_rotary_encoder_info = {
+        .steps          = 24,
+        .axis           = REL_X,
+        .relative_axis  = 1,
+        .gpio_a         = GPIO_VOLENC_A,
+        .gpio_b         = GPIO_VOLENC_B,
+        .inverted_a     = 1,
+        .inverted_b     = 0,
+};
+static struct platform_device rotary_encoder_device = {
+        .name           = "rotary-encoder",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &raumfeld_rotary_encoder_info,
+        }
+};
+/**
+ * GPIO buttons
+ */
+static struct gpio_keys_button gpio_keys_button[] = {
+        {
+                .code                   = KEY_F1,
+                .type                   = EV_KEY,
+                .gpio                   = GPIO_KEY1,
+                .active_low             = 1,
+                .wakeup                 = 0,
+                .debounce_interval      = 5, /* ms */
+                .desc                   = "Button 1",
+        },
+        {
+                .code                   = KEY_F2,
+                .type                   = EV_KEY,
+                .gpio                   = GPIO_KEY2,
+                .active_low             = 1,
+                .wakeup                 = 0,
+                .debounce_interval      = 5, /* ms */
+                .desc                   = "Button 2",
+        },
+        {
+                .code                   = KEY_F3,
+                .type                   = EV_KEY,
+                .gpio                   = GPIO_KEY3,
+                .active_low             = 1,
+                .wakeup                 = 0,
+                .debounce_interval      = 5, /* ms */
+                .desc                   = "Button 3",
+        },
+        {
+                .code                   = KEY_F4,
+                .type                   = EV_KEY,
+                .gpio                   = GPIO_RESCUE_BOOT,
+                .active_low             = 0,
+                .wakeup                 = 0,
+                .debounce_interval      = 5, /* ms */
+                .desc                   = "rescue boot button",
+        },
+        {
+                .code                   = KEY_F5,
+                .type                   = EV_KEY,
+                .gpio                   = GPIO_DOCK_DETECT,
+                .active_low             = 1,
+                .wakeup                 = 0,
+                .debounce_interval      = 5, /* ms */
+                .desc                   = "dock detect",
+        },
+        {
+                .code                   = KEY_F6,
+                .type                   = EV_KEY,
+                .gpio                   = GPIO_ON_OFF,
+                .active_low             = 0,
+                .wakeup                 = 0,
+                .debounce_interval      = 5, /* ms */
+                .desc                   = "on/off button",
+        },
+};
+static struct gpio_keys_platform_data gpio_keys_platform_data = {
+        .buttons        = gpio_keys_button,
+        .nbuttons       = ARRAY_SIZE(gpio_keys_button),
+        .rep            = 0,
+};
+static struct platform_device raumfeld_gpio_keys_device = {
+        .name   = "gpio-keys",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &gpio_keys_platform_data,
+        }
+};
+/**
+ * GPIO LEDs
+ */
+static struct gpio_led raumfeld_leds[] = {
+        {
+                .name           = "raumfeld:1",
+                .gpio           = GPIO_LED1,
+                .active_low     = 1,
+                .default_state  = LEDS_GPIO_DEFSTATE_ON,
+        },
+        {
+                .name           = "raumfeld:2",
+                .gpio           = GPIO_LED2,
+                .active_low     = 0,
+                .default_state  = LEDS_GPIO_DEFSTATE_OFF,
+        }
+};
+static struct gpio_led_platform_data raumfeld_led_platform_data = {
+        .leds           = raumfeld_leds,
+        .num_leds       = ARRAY_SIZE(raumfeld_leds),
+};
+static struct platform_device raumfeld_led_device = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &raumfeld_led_platform_data,
+        },
+};
+/**
+ * One-wire (W1 bus) support
+ */
+static void w1_enable_external_pullup(int enable)
+{
+        gpio_set_value(GPIO_W1_PULLUP_ENABLE, enable);
+        msleep(100);
+}
+static struct w1_gpio_platform_data w1_gpio_platform_data = {
+        .pin                    = GPIO_ONE_WIRE,
+        .is_open_drain          = 0,
+        .enable_external_pullup = w1_enable_external_pullup,
+};
+struct platform_device raumfeld_w1_gpio_device = {
+        .name   = "w1-gpio",
+        .dev    = {
+                .platform_data = &w1_gpio_platform_data
+        }
+};
+static void __init raumfeld_w1_init(void)
+{
+        int ret = gpio_request(GPIO_W1_PULLUP_ENABLE,
+                                "W1 external pullup enable");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_W1_PULLUP_ENABLE\n");
+        else
+                gpio_direction_output(GPIO_W1_PULLUP_ENABLE, 0);
+        platform_device_register(&raumfeld_w1_gpio_device);
+}
+/**
+ * Framebuffer device
+ */
+/* PWM controlled backlight */
+static struct platform_pwm_backlight_data raumfeld_pwm_backlight_data = {
+        .pwm_id         = 0,
+        .max_brightness = 100,
+        .dft_brightness = 100,
+        /* 10000 ns = 10 ms ^= 100 kHz */
+        .pwm_period_ns  = 10000,
+};
+static struct platform_device raumfeld_pwm_backlight_device = {
+        .name   = "pwm-backlight",
+        .dev    = {
+                .parent         = &pxa27x_device_pwm0.dev,
+                .platform_data  = &raumfeld_pwm_backlight_data,
+        }
+};
+/* LT3593 controlled backlight */
+static struct gpio_led raumfeld_lt3593_led = {
+        .name           = "backlight",
+        .gpio           = mfp_to_gpio(MFP_PIN_GPIO17),
+        .default_state  = LEDS_GPIO_DEFSTATE_ON,
+};
+static struct gpio_led_platform_data raumfeld_lt3593_platform_data = {
+        .leds           = &raumfeld_lt3593_led,
+        .num_leds       = 1,
+};
+static struct platform_device raumfeld_lt3593_device = {
+        .name   = "leds-lt3593",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &raumfeld_lt3593_platform_data,
+        },
+};
+static struct pxafb_mode_info sharp_lq043t3dx02_mode = {
+        .pixclock       = 111000,
+        .xres           = 480,
+        .yres           = 272,
+        .bpp            = 16,
+        .hsync_len      = 4,
+        .left_margin    = 2,
+        .right_margin   = 1,
+        .vsync_len      = 1,
+        .upper_margin   = 3,
+        .lower_margin   = 1,
+        .sync           = 0,
+};
+static struct pxafb_mach_info raumfeld_sharp_lcd_info = {
+        .modes          = &sharp_lq043t3dx02_mode,
+        .num_modes      = 1,
+        .video_mem_size = 0x400000,
+        .lcd_conn       = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
+};
+static void __init raumfeld_lcd_init(void)
+{
+        int ret;
+        set_pxa_fb_info(&raumfeld_sharp_lcd_info);
+        /* Earlier devices had the backlight regulator controlled
+         * via PWM, later versions use another controller for that */
+        if ((system_rev & 0xff) < 2) {
+                mfp_cfg_t raumfeld_pwm_pin_config = GPIO17_PWM0_OUT;
+                pxa3xx_mfp_config(&raumfeld_pwm_pin_config, 1);
+                platform_device_register(&raumfeld_pwm_backlight_device);
+        } else
+                platform_device_register(&raumfeld_lt3593_device);
+        ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_TFT_VA_EN\n");
+        else
+                gpio_direction_output(GPIO_TFT_VA_EN, 1);
+        ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_DISPLAY_ENABLE\n");
+        else
+                gpio_direction_output(GPIO_DISPLAY_ENABLE, 1);
+}
+/**
+ * SPI devices
+ */
+struct spi_gpio_platform_data raumfeld_spi_platform_data = {
+        .sck            = GPIO_SPI_CLK,
+        .mosi           = GPIO_SPI_MOSI,
+        .miso           = GPIO_SPI_MISO,
+        .num_chipselect = 3,
+};
+static struct platform_device raumfeld_spi_device = {
+        .name   = "spi_gpio",
+        .id     = 0,
+        .dev    = {
+                .platform_data  = &raumfeld_spi_platform_data,
+        }
+};
+static struct lis3lv02d_platform_data lis3_pdata = {
+        .click_flags    = LIS3_CLICK_SINGLE_X |
+                          LIS3_CLICK_SINGLE_Y |
+                          LIS3_CLICK_SINGLE_Z,
+        .irq_cfg        = LIS3_IRQ1_CLICK | LIS3_IRQ2_CLICK,
+        .wakeup_flags   = LIS3_WAKEUP_X_LO | LIS3_WAKEUP_X_HI |
+                          LIS3_WAKEUP_Y_LO | LIS3_WAKEUP_Y_HI |
+                          LIS3_WAKEUP_Z_LO | LIS3_WAKEUP_Z_HI,
+        .wakeup_thresh  = 10,
+        .click_thresh_x = 10,
+        .click_thresh_y = 10,
+        .click_thresh_z = 10,
+};
+#define SPI_AK4104      \
+{                       \
+        .modalias       = "ak4104",     \
+        .max_speed_hz   = 10000,        \
+        .bus_num        = 0,            \
+        .chip_select    = 0,            \
+        .controller_data = (void *) GPIO_SPDIF_CS,      \
+}
+#define SPI_LIS3        \
+{                       \
+        .modalias       = "lis3lv02d_spi",      \
+        .max_speed_hz   = 1000000,              \
+        .bus_num        = 0,                    \
+        .chip_select    = 1,                    \
+        .controller_data = (void *) GPIO_ACCEL_CS,      \
+        .platform_data  = &lis3_pdata,          \
+        .irq            = gpio_to_irq(GPIO_ACCEL_IRQ),  \
+}
+#define SPI_DAC7512     \
+{       \
+        .modalias       = "dac7512",            \
+        .max_speed_hz   = 1000000,              \
+        .bus_num        = 0,                    \
+        .chip_select    = 2,                    \
+        .controller_data = (void *) GPIO_MCLK_DAC_CS,   \
+}
+static struct spi_board_info connector_spi_devices[] __initdata = {
+        SPI_AK4104,
+        SPI_DAC7512,
+};
+static struct spi_board_info speaker_spi_devices[] __initdata = {
+        SPI_DAC7512,
+};
+static struct spi_board_info controller_spi_devices[] __initdata = {
+        SPI_LIS3,
+};
+/**
+ * MMC for Marvell Libertas 8688 via SDIO
+ */
+static int raumfeld_mci_init(struct device *dev, irq_handler_t isr, void *data)
+{
+        gpio_set_value(GPIO_W2W_RESET, 1);
+        gpio_set_value(GPIO_W2W_PDN, 1);
+        return 0;
+}
+static void raumfeld_mci_exit(struct device *dev, void *data)
+{
+        gpio_set_value(GPIO_W2W_RESET, 0);
+        gpio_set_value(GPIO_W2W_PDN, 0);
+}
+static struct pxamci_platform_data raumfeld_mci_platform_data = {
+        .init                   = raumfeld_mci_init,
+        .exit                   = raumfeld_mci_exit,
+        .detect_delay           = 20,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
+};
+/*
+ * External power / charge logic
+ */
+static int power_supply_init(struct device *dev)
+{
+        return 0;
+}
+static void power_supply_exit(struct device *dev)
+{
+}
+static int raumfeld_is_ac_online(void)
+{
+        return !gpio_get_value(GPIO_CHARGE_DC_OK);
+}
+static int raumfeld_is_usb_online(void)
+{
+        return 0;
+}
+static char *raumfeld_power_supplicants[] = { "ds2760-battery.0" };
+static struct pda_power_pdata power_supply_info = {
+        .init                   = power_supply_init,
+        .is_ac_online           = raumfeld_is_ac_online,
+        .is_usb_online          = raumfeld_is_usb_online,
+        .exit                   = power_supply_exit,
+        .supplied_to            = raumfeld_power_supplicants,
+        .num_supplicants        = ARRAY_SIZE(raumfeld_power_supplicants)
+};
+static struct resource power_supply_resources[] = {
+        {
+                .name  = "ac",
+                .flags = IORESOURCE_IRQ |
+                         IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE,
+                .start = GPIO_CHARGE_DC_OK,
+                .end   = GPIO_CHARGE_DC_OK,
+        },
+};
+static irqreturn_t charge_done_irq(int irq, void *dev_id)
+{
+        struct power_supply *psy;
+        psy = power_supply_get_by_name("ds2760-battery.0");
+        if (psy)
+                power_supply_set_battery_charged(psy);
+        return IRQ_HANDLED;
+}
+static struct platform_device raumfeld_power_supply = {
+        .name = "pda-power",
+        .id   = -1,
+        .dev  = {
+                .platform_data = &power_supply_info,
+        },
+        .resource      = power_supply_resources,
+        .num_resources = ARRAY_SIZE(power_supply_resources),
+};
+static void __init raumfeld_power_init(void)
+{
+        int ret;
+        /* Set PEN2 high to enable maximum charge current */
+        ret = gpio_request(GPIO_CHRG_PEN2, "CHRG_PEN2");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_CHRG_PEN2\n");
+        else
+                gpio_direction_output(GPIO_CHRG_PEN2, 1);
+        ret = gpio_request(GPIO_CHARGE_DC_OK, "CABLE_DC_OK");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_CHARGE_DC_OK\n");
+        ret = gpio_request(GPIO_CHARGE_USB_SUSP, "CHARGE_USB_SUSP");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_CHARGE_USB_SUSP\n");
+        else
+                gpio_direction_output(GPIO_CHARGE_USB_SUSP, 0);
+        power_supply_resources[0].start = gpio_to_irq(GPIO_CHARGE_DC_OK);
+        power_supply_resources[0].end = gpio_to_irq(GPIO_CHARGE_DC_OK);
+        ret = request_irq(gpio_to_irq(GPIO_CHARGE_DONE),
+                        &charge_done_irq, IORESOURCE_IRQ_LOWEDGE,
+                        "charge_done", NULL);
+        if (ret < 0)
+                printk(KERN_ERR "%s: unable to register irq %d\n", __func__,
+                        GPIO_CHARGE_DONE);
+        else
+                platform_device_register(&raumfeld_power_supply);
+}
+/* Fixed regulator for AUDIO_VA, 0-0048 maps to the cs4270 codec device */
+static struct regulator_consumer_supply audio_va_consumer_supply =
+        REGULATOR_SUPPLY("va", "0-0048");
+struct regulator_init_data audio_va_initdata = {
+        .consumer_supplies = &audio_va_consumer_supply,
+        .num_consumer_supplies = 1,
+        .constraints = {
+                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+        },
+};
+static struct fixed_voltage_config audio_va_config = {
+        .supply_name            = "audio_va",
+        .microvolts             = 5000000,
+        .gpio                   = GPIO_AUDIO_VA_ENABLE,
+        .enable_high            = 1,
+        .enabled_at_boot        = 0,
+        .init_data              = &audio_va_initdata,
+};
+static struct platform_device audio_va_device = {
+        .name   = "reg-fixed-voltage",
+        .id     = 0,
+        .dev    = {
+                .platform_data = &audio_va_config,
+        },
+};
+/* Dummy supplies for Codec's VD/VLC */
+static struct regulator_consumer_supply audio_dummy_supplies[] = {
+        REGULATOR_SUPPLY("vd", "0-0048"),
+        REGULATOR_SUPPLY("vlc", "0-0048"),
+};
+struct regulator_init_data audio_dummy_initdata = {
+        .consumer_supplies = audio_dummy_supplies,
+        .num_consumer_supplies = ARRAY_SIZE(audio_dummy_supplies),
+        .constraints = {
+                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+        },
+};
+static struct fixed_voltage_config audio_dummy_config = {
+        .supply_name            = "audio_vd",
+        .microvolts             = 3300000,
+        .gpio                   = -1,
+        .init_data              = &audio_dummy_initdata,
+};
+static struct platform_device audio_supply_dummy_device = {
+        .name   = "reg-fixed-voltage",
+        .id     = 1,
+        .dev    = {
+                .platform_data = &audio_dummy_config,
+        },
+};
+static struct platform_device *audio_regulator_devices[] = {
+        &audio_va_device,
+        &audio_supply_dummy_device,
+};
+/**
+ * Regulator support via MAX8660
+ */
+static struct regulator_consumer_supply vcc_mmc_supply =
+        REGULATOR_SUPPLY("vmmc", "pxa2xx-mci.0");
+static struct regulator_init_data vcc_mmc_init_data = {
+        .constraints = {
+                .min_uV                 = 3300000,
+                .max_uV                 = 3300000,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL,
+                .valid_ops_mask         = REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_MODE,
+        },
+        .consumer_supplies = &vcc_mmc_supply,
+        .num_consumer_supplies = 1,
+};
+struct max8660_subdev_data max8660_v6_subdev_data = {
+        .id             = MAX8660_V6,
+        .name           = "vmmc",
+        .platform_data  = &vcc_mmc_init_data,
+};
+static struct max8660_platform_data max8660_pdata = {
+        .subdevs = &max8660_v6_subdev_data,
+        .num_subdevs = 1,
+};
+/**
+ * I2C devices
+ */
+static struct i2c_board_info raumfeld_pwri2c_board_info = {
+        .type           = "max8660",
+        .addr           = 0x34,
+        .platform_data  = &max8660_pdata,
+};
+static struct i2c_board_info raumfeld_connector_i2c_board_info __initdata = {
+        .type   = "cs4270",
+        .addr   = 0x48,
+};
+static struct eeti_ts_platform_data eeti_ts_pdata = {
+        .irq_active_high = 1,
+};
+static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = {
+        .type   = "eeti_ts",
+        .addr   = 0x0a,
+        .irq    = gpio_to_irq(GPIO_TOUCH_IRQ),
+        .platform_data = &eeti_ts_pdata,
+};
+static struct platform_device *raumfeld_common_devices[] = {
+        &raumfeld_gpio_keys_device,
+        &raumfeld_led_device,
+        &raumfeld_spi_device,
+};
+static void __init raumfeld_audio_init(void)
+{
+        int ret;
+        ret = gpio_request(GPIO_CODEC_RESET, "cs4270 reset");
+        if (ret < 0)
+                pr_warning("unable to request GPIO_CODEC_RESET\n");
+        else
+                gpio_direction_output(GPIO_CODEC_RESET, 1);
+        ret = gpio_request(GPIO_SPDIF_RESET, "ak4104 s/pdif reset");
+        if (ret < 0)
+                pr_warning("unable to request GPIO_SPDIF_RESET\n");
+        else
+                gpio_direction_output(GPIO_SPDIF_RESET, 1);
+        ret = gpio_request(GPIO_MCLK_RESET, "MCLK reset");
+        if (ret < 0)
+                pr_warning("unable to request GPIO_MCLK_RESET\n");
+        else
+                gpio_direction_output(GPIO_MCLK_RESET, 1);
+        platform_add_devices(ARRAY_AND_SIZE(audio_regulator_devices));
+}
+static void __init raumfeld_common_init(void)
+{
+        int ret;
+        /* The on/off button polarity has changed after revision 1 */
+        if ((system_rev & 0xff) > 1) {
+                int i;
+                for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
+                        if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
+                                gpio_keys_button[i].active_low = 1;
+        }
+        enable_irq_wake(IRQ_WAKEUP0);
+        pxa3xx_set_nand_info(&raumfeld_nand_info);
+        pxa3xx_set_i2c_power_info(NULL);
+        pxa_set_ohci_info(&raumfeld_ohci_info);
+        pxa_set_mci_info(&raumfeld_mci_platform_data);
+        pxa_set_i2c_info(NULL);
+        pxa_set_ffuart_info(NULL);
+        ret = gpio_request(GPIO_W2W_RESET, "Wi2Wi reset");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_W2W_RESET\n");
+        else
+                gpio_direction_output(GPIO_W2W_RESET, 0);
+        ret = gpio_request(GPIO_W2W_PDN, "Wi2Wi powerup");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_W2W_PDN\n");
+        else
+                gpio_direction_output(GPIO_W2W_PDN, 0);
+        /* this can be used to switch off the device */
+        ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
+                                "supply shutdown");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
+        else
+                gpio_direction_output(GPIO_SHUTDOWN_SUPPLY, 0);
+        platform_add_devices(ARRAY_AND_SIZE(raumfeld_common_devices));
+        i2c_register_board_info(1, &raumfeld_pwri2c_board_info, 1);
+}
+static void __init raumfeld_controller_init(void)
+{
+        int ret;
+        pxa3xx_mfp_config(ARRAY_AND_SIZE(raumfeld_controller_pin_config));
+        platform_device_register(&rotary_encoder_device);
+        spi_register_board_info(ARRAY_AND_SIZE(controller_spi_devices));
+        i2c_register_board_info(0, &raumfeld_controller_i2c_board_info, 1);
+        ret = gpio_request(GPIO_SHUTDOWN_BATT, "battery shutdown");
+        if (ret < 0)
+                pr_warning("Unable to request GPIO_SHUTDOWN_BATT\n");
+        else
+                gpio_direction_output(GPIO_SHUTDOWN_BATT, 0);
+        raumfeld_common_init();
+        raumfeld_power_init();
+        raumfeld_lcd_init();
+        raumfeld_w1_init();
+}
+static void __init raumfeld_connector_init(void)
+{
+        pxa3xx_mfp_config(ARRAY_AND_SIZE(raumfeld_connector_pin_config));
+        spi_register_board_info(ARRAY_AND_SIZE(connector_spi_devices));
+        i2c_register_board_info(0, &raumfeld_connector_i2c_board_info, 1);
+        platform_device_register(&smc91x_device);
+        raumfeld_audio_init();
+        raumfeld_common_init();
+}
+static void __init raumfeld_speaker_init(void)
+{
+        pxa3xx_mfp_config(ARRAY_AND_SIZE(raumfeld_speaker_pin_config));
+        spi_register_board_info(ARRAY_AND_SIZE(speaker_spi_devices));
+        i2c_register_board_info(0, &raumfeld_connector_i2c_board_info, 1);
+        platform_device_register(&smc91x_device);
+        platform_device_register(&rotary_encoder_device);
+        raumfeld_audio_init();
+        raumfeld_common_init();
+}
+/* physical memory regions */
+#define RAUMFELD_SDRAM_BASE     0xa0000000      /* SDRAM region */
+#ifdef CONFIG_MACH_RAUMFELD_RC
+MACHINE_START(RAUMFELD_RC, "Raumfeld Controller")
+        .phys_io        = 0x40000000,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .boot_params    = RAUMFELD_SDRAM_BASE + 0x100,
+        .init_machine   = raumfeld_controller_init,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa3xx_init_irq,
+        .timer          = &pxa_timer,
+MACHINE_END
+#endif
+#ifdef CONFIG_MACH_RAUMFELD_CONNECTOR
+MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector")
+        .phys_io        = 0x40000000,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .boot_params    = RAUMFELD_SDRAM_BASE + 0x100,
+        .init_machine   = raumfeld_connector_init,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa3xx_init_irq,
+        .timer          = &pxa_timer,
+MACHINE_END
+#endif
+#ifdef CONFIG_MACH_RAUMFELD_SPEAKER
+MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker")
+        .phys_io        = 0x40000000,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .boot_params    = RAUMFELD_SDRAM_BASE + 0x100,
+        .init_machine   = raumfeld_speaker_init,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa3xx_init_irq,
+        .timer          = &pxa_timer,
+MACHINE_END
+#endif
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 67229a1ef55c..463d874bb867 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -900,7 +900,7 @@ static struct platform_suspend_ops sharpsl_pm_ops = {
 };
 #endif
-static int __init sharpsl_pm_probe(struct platform_device *pdev)
+static int __devinit sharpsl_pm_probe(struct platform_device *pdev)
 {
        int ret;
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 28352c0b8c34..19b5109d9808 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -56,25 +56,7 @@ static unsigned long spitz_pin_config[] __initdata = {
        GPIO80_nCS_4,   /* SCOOP #1 */
        /* LCD - 16bpp Active TFT */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
        /* PC Card */
        GPIO48_nPOE,
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c
index 9ebe658590fa..a81d6dbf662d 100644
--- a/arch/arm/mach-pxa/ssp.c
+++ b/arch/arm/mach-pxa/ssp.c
@@ -35,6 +35,8 @@
 #include <mach/ssp.h>
 #include <mach/regs-ssp.h>
+#ifdef CONFIG_PXA_SSP_LEGACY
 #define TIMEOUT 100000
 static irqreturn_t ssp_interrupt(int irq, void *dev_id)
@@ -303,6 +305,7 @@ void ssp_exit(struct ssp_dev *dev)
        clk_disable(ssp->clk);
        ssp_free(ssp);
 }
+#endif /* CONFIG_PXA_SSP_LEGACY */
 static DEFINE_MUTEX(ssp_lock);
 static LIST_HEAD(ssp_list);
@@ -488,6 +491,7 @@ static void __exit pxa_ssp_exit(void)
 arch_initcall(pxa_ssp_init);
 module_exit(pxa_ssp_exit);
+#ifdef CONFIG_PXA_SSP_LEGACY
 EXPORT_SYMBOL(ssp_write_word);
 EXPORT_SYMBOL(ssp_read_word);
 EXPORT_SYMBOL(ssp_flush);
@@ -498,6 +502,7 @@ EXPORT_SYMBOL(ssp_restore_state);
 EXPORT_SYMBOL(ssp_init);
 EXPORT_SYMBOL(ssp_exit);
 EXPORT_SYMBOL(ssp_config);
+#endif
 MODULE_DESCRIPTION("PXA SSP driver");
 MODULE_AUTHOR("Liam Girdwood");
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 750c448db672..293e40aeaf29 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -76,14 +76,12 @@ pxa_ost0_interrupt(int irq, void *dev_id)
 static int
 pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev)
 {
-        unsigned long flags, next, oscr;
+        unsigned long next, oscr;
-        raw_local_irq_save(flags);
        OIER |= OIER_E0;
        next = OSCR + delta;
        OSMR0 = next;
        oscr = OSCR;
-        raw_local_irq_restore(flags);
        return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;
 }
@@ -91,23 +89,17 @@ pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev)
 static void
 pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev)
 {
-        unsigned long irqflags;
        switch (mode) {
        case CLOCK_EVT_MODE_ONESHOT:
-                raw_local_irq_save(irqflags);
                OIER &= ~OIER_E0;
                OSSR = OSSR_M0;
-                raw_local_irq_restore(irqflags);
                break;
        case CLOCK_EVT_MODE_UNUSED:
        case CLOCK_EVT_MODE_SHUTDOWN:
                /* initializing, released, or preparing for suspend */
-                raw_local_irq_save(irqflags);
                OIER &= ~OIER_E0;
                OSSR = OSSR_M0;
-                raw_local_irq_restore(irqflags);
                break;
        case CLOCK_EVT_MODE_RESUME:
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index c854c168a451..ad552791c4ce 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -32,6 +32,7 @@
 #include <linux/gpio.h>
 #include <linux/pda_power.h>
 #include <linux/spi/spi.h>
+#include <linux/input/matrix_keypad.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -131,24 +132,24 @@ static unsigned long tosa_pin_config[] = {
        GPIO45_BTUART_RTS,
        /* Keybd */
-        GPIO58_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO58_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 0 */
-        GPIO59_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO59_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 1 */
-        GPIO60_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO60_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 2 */
-        GPIO61_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO61_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 3 */
-        GPIO62_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO62_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 4 */
-        GPIO63_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO63_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 5 */
-        GPIO64_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO64_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 6 */
-        GPIO65_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO65_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 7 */
-        GPIO66_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO66_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 8 */
-        GPIO67_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO67_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 9 */
-        GPIO68_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO68_GPIO | MFP_LPM_DRIVE_LOW,        /* Column 10 */
-        GPIO69_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO69_GPIO | MFP_LPM_DRIVE_LOW,        /* Row 0 */
-        GPIO70_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO70_GPIO | MFP_LPM_DRIVE_LOW,        /* Row 1 */
-        GPIO71_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO71_GPIO | MFP_LPM_DRIVE_LOW,        /* Row 2 */
-        GPIO72_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO72_GPIO | MFP_LPM_DRIVE_LOW,        /* Row 3 */
-        GPIO73_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO73_GPIO | MFP_LPM_DRIVE_LOW,        /* Row 4 */
-        GPIO74_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO74_GPIO | MFP_LPM_DRIVE_LOW,        /* Row 5 */
-        GPIO75_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO75_GPIO | MFP_LPM_DRIVE_LOW,        /* Row 6 */
        /* SPI */
        GPIO81_SSP2_CLK_OUT,
@@ -411,9 +412,87 @@ static struct platform_device tosa_power_device = {
 /*
 * Tosa Keyboard
 */
+static const uint32_t tosakbd_keymap[] = {
+        KEY(0, 2, KEY_W),
+        KEY(0, 6, KEY_K),
+        KEY(0, 7, KEY_BACKSPACE),
+        KEY(0, 8, KEY_P),
+        KEY(1, 1, KEY_Q),
+        KEY(1, 2, KEY_E),
+        KEY(1, 3, KEY_T),
+        KEY(1, 4, KEY_Y),
+        KEY(1, 6, KEY_O),
+        KEY(1, 7, KEY_I),
+        KEY(1, 8, KEY_COMMA),
+        KEY(2, 1, KEY_A),
+        KEY(2, 2, KEY_D),
+        KEY(2, 3, KEY_G),
+        KEY(2, 4, KEY_U),
+        KEY(2, 6, KEY_L),
+        KEY(2, 7, KEY_ENTER),
+        KEY(2, 8, KEY_DOT),
+        KEY(3, 1, KEY_Z),
+        KEY(3, 2, KEY_C),
+        KEY(3, 3, KEY_V),
+        KEY(3, 4, KEY_J),
+        KEY(3, 5, TOSA_KEY_ADDRESSBOOK),
+        KEY(3, 6, TOSA_KEY_CANCEL),
+        KEY(3, 7, TOSA_KEY_CENTER),
+        KEY(3, 8, TOSA_KEY_OK),
+        KEY(3, 9, KEY_LEFTSHIFT),
+        KEY(4, 1, KEY_S),
+        KEY(4, 2, KEY_R),
+        KEY(4, 3, KEY_B),
+        KEY(4, 4, KEY_N),
+        KEY(4, 5, TOSA_KEY_CALENDAR),
+        KEY(4, 6, TOSA_KEY_HOMEPAGE),
+        KEY(4, 7, KEY_LEFTCTRL),
+        KEY(4, 8, TOSA_KEY_LIGHT),
+        KEY(4, 10, KEY_RIGHTSHIFT),
+        KEY(5, 1, KEY_TAB),
+        KEY(5, 2, KEY_SLASH),
+        KEY(5, 3, KEY_H),
+        KEY(5, 4, KEY_M),
+        KEY(5, 5, TOSA_KEY_MENU),
+        KEY(5, 7, KEY_UP),
+        KEY(5, 11, TOSA_KEY_FN),
+        KEY(6, 1, KEY_X),
+        KEY(6, 2, KEY_F),
+        KEY(6, 3, KEY_SPACE),
+        KEY(6, 4, KEY_APOSTROPHE),
+        KEY(6, 5, TOSA_KEY_MAIL),
+        KEY(6, 6, KEY_LEFT),
+        KEY(6, 7, KEY_DOWN),
+        KEY(6, 8, KEY_RIGHT),
+};
+static struct matrix_keymap_data tosakbd_keymap_data = {
+        .keymap         = tosakbd_keymap,
+        .keymap_size    = ARRAY_SIZE(tosakbd_keymap),
+};
+static const int tosakbd_col_gpios[] =
+                        { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68 };
+static const int tosakbd_row_gpios[] =
+                        { 69, 70, 71, 72, 73, 74, 75 };
+static struct matrix_keypad_platform_data tosakbd_pdata = {
+        .keymap_data            = &tosakbd_keymap_data,
+        .row_gpios              = tosakbd_row_gpios,
+        .col_gpios              = tosakbd_col_gpios,
+        .num_row_gpios          = ARRAY_SIZE(tosakbd_row_gpios),
+        .num_col_gpios          = ARRAY_SIZE(tosakbd_col_gpios),
+        .col_scan_delay_us      = 10,
+        .debounce_ms            = 10,
+        .wakeup                 = 1,
+};
 static struct platform_device tosakbd_device = {
-        .name           = "tosa-keyboard",
+        .name           = "matrix-keypad",
        .id             = -1,
+        .dev            = {
+                .platform_data = &tosakbd_pdata,
+        },
 };
 static struct gpio_keys_button tosa_gpio_keys[] = {
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 0aa858ebc573..797f2544d0ce 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -72,27 +72,14 @@ static unsigned long trizeps4_pin_config[] __initdata = {
        GPIO79_nCS_3,           /* Logic CS */
        GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,       /* Logic irq */
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        /* LCD - 16bpp Active TFT */
-        GPIO58_LCD_LDD_0,
+        GPIOxx_LCD_TFT_16BPP,
-        GPIO59_LCD_LDD_1,
-        GPIO60_LCD_LDD_2,
-        GPIO61_LCD_LDD_3,
-        GPIO62_LCD_LDD_4,
-        GPIO63_LCD_LDD_5,
-        GPIO64_LCD_LDD_6,
-        GPIO65_LCD_LDD_7,
-        GPIO66_LCD_LDD_8,
-        GPIO67_LCD_LDD_9,
-        GPIO68_LCD_LDD_10,
-        GPIO69_LCD_LDD_11,
-        GPIO70_LCD_LDD_12,
-        GPIO71_LCD_LDD_13,
-        GPIO72_LCD_LDD_14,
-        GPIO73_LCD_LDD_15,
-        GPIO74_LCD_FCLK,
-        GPIO75_LCD_LCLK,
-        GPIO76_LCD_PCLK,
-        GPIO77_LCD_BIAS,
        /* UART */
        GPIO9_FFUART_CTS,
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 89f258c9e126..1dd13346f977 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -281,7 +281,7 @@ static void viper_irq_handler(unsigned int irq, struct irq_desc *desc)
        do {
                /* we're in a chained irq handler,
                 * so ack the interrupt by hand */
-                GEDR(VIPER_CPLD_GPIO) = GPIO_bit(VIPER_CPLD_GPIO);
+                desc->chip->ack(irq);
                if (likely(pending)) {
                        irq = viper_bit_to_irq(__ffs(pending));
@@ -711,6 +711,12 @@ static mfp_cfg_t viper_pin_config[] __initdata = {
        GPIO80_nCS_4,
        GPIO33_nCS_5,
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        /* FP Backlight */
        GPIO9_GPIO,                             /* VIPER_BCKLIGHT_EN_GPIO */
        GPIO10_GPIO,                            /* VIPER_LCD_EN_GPIO */
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 75f2a37f945d..39896d883584 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -26,6 +26,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c/pca953x.h>
 #include <linux/apm-emulation.h>
+#include <linux/can/platform/mcp251x.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -387,11 +388,47 @@ static struct pxa2xx_spi_master pxa2xx_spi_ssp3_master_info = {
        .enable_dma     = 1,
 };
-static struct platform_device pxa2xx_spi_ssp3_device = {
+/* CAN bus on SPI */
-        .name = "pxa2xx-spi",
+static int zeus_mcp2515_setup(struct spi_device *sdev)
-        .id = 3,
+{
-        .dev = {
+        int err;
-                .platform_data = &pxa2xx_spi_ssp3_master_info,
+        err = gpio_request(ZEUS_CAN_SHDN_GPIO, "CAN shutdown");
+        if (err)
+                return err;
+        err = gpio_direction_output(ZEUS_CAN_SHDN_GPIO, 1);
+        if (err) {
+                gpio_free(ZEUS_CAN_SHDN_GPIO);
+                return err;
+        }
+        return 0;
+}
+static int zeus_mcp2515_transceiver_enable(int enable)
+{
+        gpio_set_value(ZEUS_CAN_SHDN_GPIO, !enable);
+        return 0;
+}
+static struct mcp251x_platform_data zeus_mcp2515_pdata = {
+        .oscillator_frequency   = 16*1000*1000,
+        .model                  = CAN_MCP251X_MCP2515,
+        .board_specific_setup   = zeus_mcp2515_setup,
+        .transceiver_enable     = zeus_mcp2515_transceiver_enable,
+        .power_enable           = zeus_mcp2515_transceiver_enable,
+};
+static struct spi_board_info zeus_spi_board_info[] = {
+        [0] = {
+                .modalias       = "mcp251x",
+                .platform_data  = &zeus_mcp2515_pdata,
+                .irq            = gpio_to_irq(ZEUS_CAN_GPIO),
+                .max_speed_hz   = 1*1000*1000,
+                .bus_num        = 3,
+                .mode           = SPI_MODE_0,
+                .chip_select    = 0,
        },
 };
@@ -457,15 +494,28 @@ static struct platform_device zeus_pcmcia_device = {
        },
 };
+static struct resource zeus_max6369_resource = {
+        .start          = ZEUS_CPLD_EXTWDOG_PHYS,
+        .end            = ZEUS_CPLD_EXTWDOG_PHYS,
+        .flags          = IORESOURCE_MEM,
+};
+struct platform_device zeus_max6369_device = {
+        .name           = "max6369_wdt",
+        .id             = -1,
+        .resource       = &zeus_max6369_resource,
+        .num_resources  = 1,
+};
 static struct platform_device *zeus_devices[] __initdata = {
        &zeus_serial_device,
        &zeus_mtd_devices[0],
        &zeus_dm9k0_device,
        &zeus_dm9k1_device,
        &zeus_sram_device,
-        &pxa2xx_spi_ssp3_device,
        &zeus_leds_device,
        &zeus_pcmcia_device,
+        &zeus_max6369_device,
 };
 /* AC'97 */
@@ -509,7 +559,9 @@ static void zeus_ohci_exit(struct device *dev)
 static struct pxaohci_platform_data zeus_ohci_platform_data = {
        .port_mode      = PMM_NPS_MODE,
-        .flags          = ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,
+        /* Clear Power Control Polarity Low and set Power Sense
+         * Polarity Low. Supply power to USB ports. */
+        .flags          = ENABLE_PORT_ALL | POWER_SENSE_LOW,
        .init           = zeus_ohci_init,
        .exit           = zeus_ohci_exit,
 };
@@ -621,11 +673,15 @@ static struct pxa2xx_udc_mach_info zeus_udc_info = {
        .udc_command = zeus_udc_command,
 };
+#ifdef CONFIG_PM
 static void zeus_power_off(void)
 {
        local_irq_disable();
        pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP);
 }
+#else
+#define zeus_power_off   NULL
+#endif
 #ifdef CONFIG_APM_EMULATION
 static void zeus_get_power_status(struct apm_power_info *info)
@@ -706,6 +762,12 @@ static struct i2c_board_info __initdata zeus_i2c_devices[] = {
 };
 static mfp_cfg_t zeus_pin_config[] __initdata = {
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
        GPIO15_nCS_1,
        GPIO78_nCS_2,
        GPIO80_nCS_4,
@@ -731,6 +793,11 @@ static mfp_cfg_t zeus_pin_config[] __initdata = {
        GPIO104_CIF_DD_2,
        GPIO105_CIF_DD_1,
+        GPIO81_SSP3_TXD,
+        GPIO82_SSP3_RXD,
+        GPIO83_SSP3_SFRM,
+        GPIO84_SSP3_SCLK,
        GPIO48_nPOE,
        GPIO49_nPWE,
        GPIO50_nPIOR,
@@ -785,6 +852,8 @@ static void __init zeus_init(void)
        pxa_set_ac97_info(&zeus_ac97_info);
        pxa_set_i2c_info(NULL);
        i2c_register_board_info(0, ARRAY_AND_SIZE(zeus_i2c_devices));
+        pxa2xx_set_spi_info(3, &pxa2xx_spi_ssp3_master_info);
+        spi_register_board_info(zeus_spi_board_info, ARRAY_SIZE(zeus_spi_board_info));
 }
 static struct map_desc zeus_io_desc[] __initdata = {
@@ -807,12 +876,6 @@ static struct map_desc zeus_io_desc[] __initdata = {
                .type    = MT_DEVICE,
        },
        {
-                .virtual = ZEUS_CPLD_EXTWDOG,
-                .pfn     = __phys_to_pfn(ZEUS_CPLD_EXTWDOG_PHYS),
-                .length  = 0x1000,
-                .type    = MT_DEVICE,
-        },
-        {
                .virtual = ZEUS_PC104IO,
                .pfn     = __phys_to_pfn(ZEUS_PC104IO_PHYS),
                .length  = 0x00800000,
@@ -837,7 +900,7 @@ static void __init zeus_map_io(void)
        PCFR = PCFR_OPDE | PCFR_DC_EN | PCFR_FS | PCFR_FP;
 }
-MACHINE_START(ARCOM_ZEUS, "Arcom ZEUS")
+MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS")
        /* Maintainer: Marc Zyngier <maz@misterjones.org> */
        .phys_io        = 0x40000000,
        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc),