15 files changed, 104 insertions, 146 deletions

diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index c35456f02acb..56e8cebeb7d5 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -732,9 +732,7 @@ static inline void balloon3_nand_init(void) {}
 #if defined(CONFIG_REGULATOR_MAX1586) || \
     defined(CONFIG_REGULATOR_MAX1586_MODULE)
 static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {
-        {
-                .supply = "vcc_core",
-        }
+        REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data balloon3_max1587a_v3_info = {
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 313274016277..3e4e9fe2d462 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -713,9 +713,7 @@ struct da9030_battery_info cm_x300_battery_info = {
 };
 
 static struct regulator_consumer_supply buck2_consumers[] = {
-        {
-                .supply = "vcc_core",
-        },
+        REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data buck2_data = {
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 16ec557b8e43..a3a4a38d4972 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -1085,10 +1085,7 @@ static void __init em_x270_userspace_consumers_init(void)
 /* DA9030 related initializations */
 #define REGULATOR_CONSUMER(_name, _dev_name, _supply)                   \
         static struct regulator_consumer_supply _name##_consumers[] = { \
-                {                                                       \
-                        .dev_name = _dev_name,                          \
-                        .supply = _supply,                              \
-                },                                                      \
+                REGULATOR_SUPPLY(_supply, _dev_name),                   \
         }
 
 REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index b83b95a29503..d09da6a746b8 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -22,6 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
+#include <linux/input/navpoint.h>
 #include <linux/lcd.h>
 #include <linux/mfd/htc-egpio.h>
 #include <linux/mfd/asic3.h>
@@ -102,6 +103,10 @@ static unsigned long hx4700_pin_config[] __initdata = {
         GPIO44_BTUART_CTS,
         GPIO45_BTUART_RTS_LPM_LOW,
 
+        /* STUART (IRDA) */
+        GPIO46_STUART_RXD,
+        GPIO47_STUART_TXD,
+
         /* PWM 1 (Backlight) */
         GPIO17_PWM1_OUT,
 
@@ -113,7 +118,7 @@ static unsigned long hx4700_pin_config[] __initdata = {
         GPIO113_I2S_SYSCLK,
 
         /* SSP 1 (NavPoint) */
-        GPIO23_SSP1_SCLK,
+        GPIO23_SSP1_SCLK_IN,
         GPIO24_SSP1_SFRM,
         GPIO25_SSP1_TXD,
         GPIO26_SSP1_RXD,
@@ -125,10 +130,13 @@ static unsigned long hx4700_pin_config[] __initdata = {
         GPIO88_GPIO,
 
         /* HX4700 specific input GPIOs */
-        GPIO12_GPIO,    /* ASIC3_IRQ */
+        GPIO12_GPIO | WAKEUP_ON_EDGE_RISE,      /* ASIC3_IRQ */
         GPIO13_GPIO,    /* W3220_IRQ */
         GPIO14_GPIO,    /* nWLAN_IRQ */
 
+        /* HX4700 specific output GPIOs */
+        GPIO102_GPIO | MFP_LPM_DRIVE_LOW,       /* SYNAPTICS_POWER_ON */
+
         GPIO10_GPIO,    /* GSM_IRQ */
         GPIO13_GPIO,    /* CPLD_IRQ */
         GPIO107_GPIO,   /* DS1WM_IRQ */
@@ -183,6 +191,23 @@ static struct platform_device gpio_keys = {
 };
 
 /*
+ * Synaptics NavPoint connected to SSP1
+ */
+
+static struct navpoint_platform_data navpoint_platform_data = {
+        .port   = 1,
+        .gpio   = GPIO102_HX4700_SYNAPTICS_POWER_ON,
+};
+
+static struct platform_device navpoint = {
+        .name   = "navpoint",
+        .id     = -1,
+        .dev = {
+                .platform_data = &navpoint_platform_data,
+        },
+};
+
+/*
  * ASIC3
  */
 
@@ -227,7 +252,6 @@ static u16 asic3_gpio_config[] = {
         ASIC3_GPIOC0_LED0,              /* red */
         ASIC3_GPIOC1_LED1,              /* green */
         ASIC3_GPIOC2_LED2,              /* blue */
-        ASIC3_GPIOC4_CF_nCD,
         ASIC3_GPIOC5_nCIOW,
         ASIC3_GPIOC6_nCIOR,
         ASIC3_GPIOC7_nPCE_1,
@@ -241,6 +265,7 @@ static u16 asic3_gpio_config[] = {
         ASIC3_GPIOC15_nPIOR,
 
         /* GPIOD: input GPIOs, CF */
+        ASIC3_GPIOD4_CF_nCD,
         ASIC3_GPIOD11_nCIOIS16,
         ASIC3_GPIOD12_nCWAIT,
         ASIC3_GPIOD15_nPIOW,
@@ -291,6 +316,7 @@ static struct asic3_platform_data asic3_platform_data = {
         .gpio_config_num = ARRAY_SIZE(asic3_gpio_config),
         .irq_base        = IRQ_BOARD_START,
         .gpio_base       = HX4700_ASIC3_GPIO_BASE,
+        .clock_rate      = 4000000,
         .leds            = asic3_leds,
 };
 
@@ -680,12 +706,8 @@ static struct platform_device power_supply = {
  */
 
 static struct regulator_consumer_supply bq24022_consumers[] = {
-        {
-                .supply = "vbus_draw",
-        },
-        {
-                .supply = "ac_draw",
-        },
+        REGULATOR_SUPPLY("vbus_draw", NULL),
+        REGULATOR_SUPPLY("ac_draw", NULL),
 };
 
 static struct regulator_init_data bq24022_init_data = {
@@ -764,9 +786,8 @@ static struct platform_device strataflash = {
  * Maxim MAX1587A on PI2C
  */
 
-static struct regulator_consumer_supply max1587a_consumer = {
-        .supply = "vcc_core",
-};
+static struct regulator_consumer_supply max1587a_consumer =
+        REGULATOR_SUPPLY("vcc_core", NULL);
 
 static struct regulator_init_data max1587a_v3_info = {
         .constraints = {
@@ -828,6 +849,7 @@ static struct platform_device audio = {
 static struct platform_device *devices[] __initdata = {
         &asic3,
         &gpio_keys,
+        &navpoint,
         &backlight,
         &w3220,
         &hx4700_lcd,
@@ -859,6 +881,7 @@ static void __init hx4700_init(void)
         int ret;
 
         pxa2xx_mfp_config(ARRAY_AND_SIZE(hx4700_pin_config));
+        gpio_set_wake(GPIO12_HX4700_ASIC3_IRQ, 1);
         ret = gpio_request_array(ARRAY_AND_SIZE(global_gpios));
         if (ret)
                 pr_err ("hx4700: Failed to request GPIOs.\n");
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
index a65867209aa0..a611ad3153c7 100644
--- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
@@ -208,6 +208,7 @@
 #define GPIO113_I2S_SYSCLK      MFP_CFG_OUT(GPIO113, AF1, DRIVE_LOW)
 
 /* SSP 1 */
+#define GPIO23_SSP1_SCLK_IN     MFP_CFG_IN(GPIO23, AF2)
 #define GPIO23_SSP1_SCLK        MFP_CFG_OUT(GPIO23, AF2, DRIVE_LOW)
 #define GPIO29_SSP1_SCLK        MFP_CFG_IN(GPIO29, AF3)
 #define GPIO27_SSP1_SYSCLK      MFP_CFG_OUT(GPIO27, AF1, DRIVE_LOW)
diff --git a/arch/arm/mach-pxa/include/mach/mioa701.h b/arch/arm/mach-pxa/include/mach/mioa701.h
index 02868447b0b1..e57f5c724e8a 100644
--- a/arch/arm/mach-pxa/include/mach/mioa701.h
+++ b/arch/arm/mach-pxa/include/mach/mioa701.h
@@ -61,6 +61,9 @@
 #define GPIO93_KEY_VOLUME_UP                    93
 #define GPIO94_KEY_VOLUME_DOWN                  94
 
+/* Camera */
+#define GPIO56_MT9M111_nOE                      56
+
 extern struct input_dev *mioa701_evdev;
 extern void mioa701_gpio_lpm_set(unsigned long mfp_pin);
 
diff --git a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
index d72791695b26..0260aaa2fc17 100644
--- a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
+++ b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
@@ -31,7 +31,6 @@
 #define PCM990_CTRL_INT_IRQ             PXA_GPIO_TO_IRQ(PCM990_CTRL_INT_IRQ_GPIO)
 #define PCM990_CTRL_INT_IRQ_EDGE        IRQ_TYPE_EDGE_RISING
 #define PCM990_CTRL_PHYS                PXA_CS1_PHYS    /* 16-Bit */
-#define PCM990_CTRL_BASE                0xea000000
 #define PCM990_CTRL_SIZE                (1*1024*1024)
 
 #define PCM990_CTRL_PWR_IRQ_GPIO        14
@@ -69,13 +68,13 @@
 #define PCM990_CTRL_MMC2DE      0x0004  /* R MMC2 Card detect */
 #define PCM990_CTRL_MMC2WP      0x0008  /* R MMC2 Card write protect */
 
-#define PCM990_CTRL_REG6        0x000C  /* Interrupt Clear REGISTER */
+#define PCM990_CTRL_INTSETCLR   0x000C  /* Interrupt Clear REGISTER */
 #define PCM990_CTRL_INTC0       0x0001  /* Clear Reg BT Detect */
 #define PCM990_CTRL_INTC1       0x0002  /* Clear Reg FR RI */
 #define PCM990_CTRL_INTC2       0x0004  /* Clear Reg MMC1 Detect */
 #define PCM990_CTRL_INTC3       0x0008  /* Clear Reg PM_5V off */
 
-#define PCM990_CTRL_REG7        0x000E  /* Interrupt Enable REGISTER */
+#define PCM990_CTRL_INTMSKENA   0x000E  /* Interrupt Enable REGISTER */
 #define PCM990_CTRL_ENAINT0     0x0001  /* Enable Int BT Detect */
 #define PCM990_CTRL_ENAINT1     0x0002  /* Enable Int FR RI */
 #define PCM990_CTRL_ENAINT2     0x0004  /* Enable Int MMC1 Detect */
@@ -102,32 +101,6 @@
 #define PCM990_CTRL_ACPRES      0x0004  /* DC Present */
 #define PCM990_CTRL_ACALARM     0x0008  /* Error Akku */
 
-#define PCM990_CTRL_P2V(x)      ((x) - PCM990_CTRL_PHYS + PCM990_CTRL_BASE)
-#define PCM990_CTRL_V2P(x)      ((x) - PCM990_CTRL_BASE + PCM990_CTRL_PHYS)
-
-#ifndef __ASSEMBLY__
-#  define __PCM990_CTRL_REG(x) \
-                (*((volatile unsigned char *)PCM990_CTRL_P2V(x)))
-#else
-#  define __PCM990_CTRL_REG(x)  PCM990_CTRL_P2V(x)
-#endif
-
-#define PCM990_INTMSKENA __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG7)
-#define PCM990_INTSETCLR __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG6)
-#define PCM990_CTRL0    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG0)
-#define PCM990_CTRL1    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG1)
-#define PCM990_CTRL2    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG2)
-#define PCM990_CTRL3    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG3)
-#define PCM990_CTRL4    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG4)
-#define PCM990_CTRL5    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG5)
-#define PCM990_CTRL6    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG6)
-#define PCM990_CTRL7    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG7)
-#define PCM990_CTRL8    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG8)
-#define PCM990_CTRL9    __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG9)
-#define PCM990_CTRL10   __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG10)
-#define PCM990_CTRL11   __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG11)
-
-
 /*
  * IDE
  */
@@ -166,24 +139,6 @@
 #define PCM990_IDE_PLD_P2V(x) ((x) - PCM990_IDE_PLD_PHYS + PCM990_IDE_PLD_BASE)
 #define PCM990_IDE_PLD_V2P(x) ((x) - PCM990_IDE_PLD_BASE + PCM990_IDE_PLD_PHYS)
 
-#ifndef __ASSEMBLY__
-# define  __PCM990_IDE_PLD_REG(x) \
-        (*((volatile unsigned char *)PCM990_IDE_PLD_P2V(x)))
-#else
-# define  __PCM990_IDE_PLD_REG(x)       PCM990_IDE_PLD_P2V(x)
-#endif
-
-#define PCM990_IDE0 \
-        __PCM990_IDE_PLD_REG(PCM990_IDE_PLD_PHYS + PCM990_IDE_PLD_REG0)
-#define PCM990_IDE1 \
-        __PCM990_IDE_PLD_REG(PCM990_IDE_PLD_PHYS + PCM990_IDE_PLD_REG1)
-#define PCM990_IDE2 \
-        __PCM990_IDE_PLD_REG(PCM990_IDE_PLD_PHYS + PCM990_IDE_PLD_REG2)
-#define PCM990_IDE3 \
-        __PCM990_IDE_PLD_REG(PCM990_IDE_PLD_PHYS + PCM990_IDE_PLD_REG3)
-#define PCM990_IDE4 \
-        __PCM990_IDE_PLD_REG(PCM990_IDE_PLD_PHYS + PCM990_IDE_PLD_REG4)
-
 /*
  * Compact Flash
  */
@@ -196,10 +151,6 @@
 #define PCM990_CF_CD_EDGE       IRQ_TYPE_EDGE_RISING
 
 #define PCM990_CF_PLD_PHYS      0x30000000      /* 16 bit wide */
-#define PCM990_CF_PLD_BASE      0xef000000
-#define PCM990_CF_PLD_SIZE      (1*1024*1024)
-#define PCM990_CF_PLD_P2V(x)    ((x) - PCM990_CF_PLD_PHYS + PCM990_CF_PLD_BASE)
-#define PCM990_CF_PLD_V2P(x)    ((x) - PCM990_CF_PLD_BASE + PCM990_CF_PLD_PHYS)
 
 /* visible CPLD (U6) registers */
 #define PCM990_CF_PLD_REG0      0x1000  /* OFFSET CF REGISTER 0 */
@@ -239,21 +190,6 @@
 #define PCM990_CF_REG6_CD1      0x0001  /* R CF Card_Detect1 */
 #define PCM990_CF_REG6_CD2      0x0002  /* R CF Card_Detect2 */
 
-#ifndef __ASSEMBLY__
-#  define  __PCM990_CF_PLD_REG(x) \
-        (*((volatile unsigned char *)PCM990_CF_PLD_P2V(x)))
-#else
-#  define  __PCM990_CF_PLD_REG(x)       PCM990_CF_PLD_P2V(x)
-#endif
-
-#define PCM990_CF0 __PCM990_CF_PLD_REG(PCM990_CF_PLD_PHYS + PCM990_CF_PLD_REG0)
-#define PCM990_CF1 __PCM990_CF_PLD_REG(PCM990_CF_PLD_PHYS + PCM990_CF_PLD_REG1)
-#define PCM990_CF2 __PCM990_CF_PLD_REG(PCM990_CF_PLD_PHYS + PCM990_CF_PLD_REG2)
-#define PCM990_CF3 __PCM990_CF_PLD_REG(PCM990_CF_PLD_PHYS + PCM990_CF_PLD_REG3)
-#define PCM990_CF4 __PCM990_CF_PLD_REG(PCM990_CF_PLD_PHYS + PCM990_CF_PLD_REG4)
-#define PCM990_CF5 __PCM990_CF_PLD_REG(PCM990_CF_PLD_PHYS + PCM990_CF_PLD_REG5)
-#define PCM990_CF6 __PCM990_CF_PLD_REG(PCM990_CF_PLD_PHYS + PCM990_CF_PLD_REG6)
-
 /*
  * Wolfson AC97 Touch
  */
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 8de0651d7efb..2db697cd2b4e 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -579,12 +579,8 @@ static struct platform_device power_supply = {
  */
 
 static struct regulator_consumer_supply bq24022_consumers[] = {
-        {
-                .supply = "vbus_draw",
-        },
-        {
-                .supply = "ac_draw",
-        },
+        REGULATOR_SUPPLY("vbus_draw", NULL),
+        REGULATOR_SUPPLY("ac_draw", NULL),
 };
 
 static struct regulator_init_data bq24022_init_data = {
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 061d57009cee..bf99022b021f 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -103,6 +103,7 @@ static unsigned long mioa701_pin_config[] = {
         GPIO82_CIF_DD_5,
         GPIO84_CIF_FV,
         GPIO85_CIF_LV,
+        MIO_CFG_OUT(GPIO56_MT9M111_nOE, AF0, DRIVE_LOW),
 
         /* Bluetooth */
         MIO_CFG_IN(GPIO14_BT_nACTIVITY, AF0),
@@ -581,9 +582,7 @@ static struct wm97xx_pdata mioa701_wm97xx_pdata = {
  * Voltage regulation
  */
 static struct regulator_consumer_supply max1586_consumers[] = {
-        {
-                .supply = "vcc_core",
-        }
+        REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data max1586_v3_info = {
@@ -705,6 +704,7 @@ static struct gpio global_gpios[] = {
         { GPIO9_CHARGE_EN, GPIOF_OUT_INIT_HIGH, "Charger enable" },
         { GPIO18_POWEROFF, GPIOF_OUT_INIT_LOW, "Power Off" },
         { GPIO87_LCD_POWER, GPIOF_OUT_INIT_LOW, "LCD Power" },
+        { GPIO56_MT9M111_nOE, GPIOF_OUT_INIT_LOW, "Camera nOE" },
 };
 
 static void __init mioa701_machine_init(void)
diff --git a/arch/arm/mach-pxa/palm27x.c b/arch/arm/mach-pxa/palm27x.c
index fbc10d7b95d1..dad71cfa34c8 100644
--- a/arch/arm/mach-pxa/palm27x.c
+++ b/arch/arm/mach-pxa/palm27x.c
@@ -429,9 +429,7 @@ void __init palm27x_power_init(int ac, int usb)
 #if defined(CONFIG_REGULATOR_MAX1586) || \
     defined(CONFIG_REGULATOR_MAX1586_MODULE)
 static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
-        {
-                .supply = "vcc_core",
-        }
+        REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data palm27x_max1587a_v3_info = {
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index abab4e2b122c..cb723e84bc27 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -65,6 +65,18 @@ static unsigned long pcm990_pin_config[] __initdata = {
         GPIO31_AC97_SYNC,
 };
 
+static void __iomem *pcm990_cpld_base;
+
+static u8 pcm990_cpld_readb(unsigned int reg)
+{
+        return readb(pcm990_cpld_base + reg);
+}
+
+static void pcm990_cpld_writeb(u8 value, unsigned int reg)
+{
+        writeb(value, pcm990_cpld_base + reg);
+}
+
 /*
  * pcm990_lcd_power - control power supply to the LCD
  * @on: 0 = switch off, 1 = switch on
@@ -78,13 +90,13 @@ static void pcm990_lcd_power(int on, struct fb_var_screeninfo *var)
                 /* enable LCD-Latches
                  * power on LCD
                  */
-                __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG3) =
-                        PCM990_CTRL_LCDPWR + PCM990_CTRL_LCDON;
+                pcm990_cpld_writeb(PCM990_CTRL_LCDPWR + PCM990_CTRL_LCDON,
+                                PCM990_CTRL_REG3);
         } else {
                 /* disable LCD-Latches
                  * power off LCD
                  */
-                __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG3) = 0x00;
+                pcm990_cpld_writeb(0, PCM990_CTRL_REG3);
         }
 }
 #endif
@@ -243,15 +255,26 @@ static unsigned long pcm990_irq_enabled;
 static void pcm990_mask_ack_irq(struct irq_data *d)
 {
         int pcm990_irq = (d->irq - PCM027_IRQ(0));
-        PCM990_INTMSKENA = (pcm990_irq_enabled &= ~(1 << pcm990_irq));
+
+        pcm990_irq_enabled &= ~(1 << pcm990_irq);
+
+        pcm990_cpld_writeb(pcm990_irq_enabled, PCM990_CTRL_INTMSKENA);
 }
 
 static void pcm990_unmask_irq(struct irq_data *d)
 {
         int pcm990_irq = (d->irq - PCM027_IRQ(0));
+        u8 val;
+
         /* the irq can be acknowledged only if deasserted, so it's done here */
-        PCM990_INTSETCLR |= 1 << pcm990_irq;
-        PCM990_INTMSKENA  = (pcm990_irq_enabled |= (1 << pcm990_irq));
+
+        pcm990_irq_enabled |= (1 << pcm990_irq);
+
+        val = pcm990_cpld_readb(PCM990_CTRL_INTSETCLR);
+        val |= 1 << pcm990_irq;
+        pcm990_cpld_writeb(val, PCM990_CTRL_INTSETCLR);
+
+        pcm990_cpld_writeb(pcm990_irq_enabled, PCM990_CTRL_INTMSKENA);
 }
 
 static struct irq_chip pcm990_irq_chip = {
@@ -261,7 +284,10 @@ static struct irq_chip pcm990_irq_chip = {
 
 static void pcm990_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
-        unsigned long pending = (~PCM990_INTSETCLR) & pcm990_irq_enabled;
+        unsigned long pending;
+
+        pending = ~pcm990_cpld_readb(PCM990_CTRL_INTSETCLR);
+        pending &= pcm990_irq_enabled;
 
         do {
                 /* clear our parent IRQ */
@@ -270,7 +296,8 @@ static void pcm990_irq_handler(unsigned int irq, struct irq_desc *desc)
                         irq = PCM027_IRQ(0) + __ffs(pending);
                         generic_handle_irq(irq);
                 }
-                pending = (~PCM990_INTSETCLR) & pcm990_irq_enabled;
+                pending = ~pcm990_cpld_readb(PCM990_CTRL_INTSETCLR);
+                pending &= pcm990_irq_enabled;
         } while (pending);
 }
 
@@ -285,8 +312,9 @@ static void __init pcm990_init_irq(void)
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
-        PCM990_INTMSKENA = 0x00;        /* disable all Interrupts */
-        PCM990_INTSETCLR = 0xFF;
+        /* disable all Interrupts */
+        pcm990_cpld_writeb(0x0, PCM990_CTRL_INTMSKENA);
+        pcm990_cpld_writeb(0xff, PCM990_CTRL_INTSETCLR);
 
         irq_set_chained_handler(PCM990_CTRL_INT_IRQ, pcm990_irq_handler);
         irq_set_irq_type(PCM990_CTRL_INT_IRQ, PCM990_CTRL_INT_IRQ_EDGE);
@@ -309,13 +337,16 @@ static int pcm990_mci_init(struct device *dev, irq_handler_t mci_detect_int,
 static void pcm990_mci_setpower(struct device *dev, unsigned int vdd)
 {
         struct pxamci_platform_data *p_d = dev->platform_data;
+        u8 val;
+
+        val = pcm990_cpld_readb(PCM990_CTRL_REG5);
 
         if ((1 << vdd) & p_d->ocr_mask)
-                __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG5) =
-                                                PCM990_CTRL_MMC2PWR;
+                val |= PCM990_CTRL_MMC2PWR;
         else
-                __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG5) =
-                                                ~PCM990_CTRL_MMC2PWR;
+                val &= ~PCM990_CTRL_MMC2PWR;
+
+        pcm990_cpld_writeb(PCM990_CTRL_MMC2PWR, PCM990_CTRL_REG5);
 }
 
 static void pcm990_mci_exit(struct device *dev, void *data)
@@ -481,23 +512,6 @@ static struct platform_device pcm990_camera[] = {
 #endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */
 
 /*
- * enable generic access to the base board control CPLDs U6 and U7
- */
-static struct map_desc pcm990_io_desc[] __initdata = {
-        {
-                .virtual        = PCM990_CTRL_BASE,
-                .pfn            = __phys_to_pfn(PCM990_CTRL_PHYS),
-                .length         = PCM990_CTRL_SIZE,
-                .type           = MT_DEVICE     /* CPLD */
-        }, {
-                .virtual        = PCM990_CF_PLD_BASE,
-                .pfn            = __phys_to_pfn(PCM990_CF_PLD_PHYS),
-                .length         = PCM990_CF_PLD_SIZE,
-                .type           = MT_DEVICE     /* CPLD */
-        }
-};
-
-/*
  * system init for baseboard usage. Will be called by pcm027 init.
  *
  * Add platform devices present on this baseboard and init
@@ -507,8 +521,11 @@ void __init pcm990_baseboard_init(void)
 {
         pxa2xx_mfp_config(ARRAY_AND_SIZE(pcm990_pin_config));
 
-        /* register CPLD access */
-        iotable_init(ARRAY_AND_SIZE(pcm990_io_desc));
+        pcm990_cpld_base = ioremap(PCM990_CTRL_PHYS, PCM990_CTRL_SIZE);
+        if (!pcm990_cpld_base) {
+                pr_err("pcm990: failed to ioremap cpld\n");
+                return;
+        }
 
         /* register CPLD's IRQ controller */
         pcm990_init_irq();
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index df2ab0fb2ace..363d91b44ecb 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -877,9 +877,7 @@ static struct i2c_board_info spitz_i2c_devs[] = {
 };
 
 static struct regulator_consumer_supply isl6271a_consumers[] = {
-        {
-                .supply = "vcc_core",
-        }
+        REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data isl6271a_info[] = {
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 4cd645e29b64..30b1b0b3c7f7 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -151,10 +151,7 @@ static struct platform_device sht15 = {
 };
 
 static struct regulator_consumer_supply stargate2_sensor_3_con[] = {
-        {
-                .dev_name = "sht15",
-                .supply = "vcc",
-        },
+        REGULATOR_SUPPLY("vcc", "sht15"),
 };
 
 enum stargate2_ldos{
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index c57ab636ea9c..e1740acd15f1 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -640,9 +640,7 @@ static inline void vpac270_ide_init(void) {}
 #if defined(CONFIG_REGULATOR_MAX1586) || \
     defined(CONFIG_REGULATOR_MAX1586_MODULE)
 static struct regulator_consumer_supply vpac270_max1587a_consumers[] = {
-        {
-                .supply = "vcc_core",
-        }
+        REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data vpac270_max1587a_v3_info = {
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index fa8619970841..b9320cb8a11f 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -615,9 +615,7 @@ static inline void z2_spi_init(void) {}
 #if defined(CONFIG_REGULATOR_TPS65023) || \
         defined(CONFIG_REGULATOR_TPS65023_MODULE)
 static struct regulator_consumer_supply z2_tps65021_consumers[] = {
-        {
-                .supply = "vcc_core",
-        }
+        REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data z2_tps65021_info[] = {