Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx
  ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210
  ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
  ARM: S3C24XX: Use generic s3c_set_platdata for devices
  ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI
  ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON
  ARM: SAMSUNG: Use generic s3c_set_platdata for FB
  ARM: SAMSUNG: Use generic s3c_set_platdata for TS
  ARM: S3C64XX: Add PWM backlight support on SMDK6410
  ARM: S5P64X0: Add PWM backlight support on SMDK6450
  ARM: S5P64X0: Add PWM backlight support on SMDK6440
  ARM: S5PC100: Add PWM backlight support on SMDKC100
  ARM: S5PV210: Add PWM backlight support on SMDKV210
  ARM: EXYNOS4: Add PWM backlight support on SMDKC210
  ARM: EXYNOS4: Add PWM backlight support on SMDKV310
  ARM: SAMSUNG: Create a common infrastructure for PWM backlight support
  clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c

6 files changed, 87 insertions, 173 deletions

diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index b2248e76ec8b..b199596f9c3d 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -12,6 +12,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#define pr_fmt(fmt) "%s: " fmt, __func__
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -161,10 +162,10 @@ static mfp_cfg_t cm_x3xx_mfp_cfg[] __initdata = {
         GPIO99_GPIO,                    /* Ethernet IRQ */
 
         /* RTC GPIOs */
-        GPIO95_GPIO,                    /* RTC CS */
-        GPIO96_GPIO,                    /* RTC WR */
-        GPIO97_GPIO,                    /* RTC RD */
-        GPIO98_GPIO,                    /* RTC IO */
+        GPIO95_GPIO | MFP_LPM_DRIVE_HIGH,       /* RTC CS */
+        GPIO96_GPIO | MFP_LPM_DRIVE_HIGH,       /* RTC WR */
+        GPIO97_GPIO | MFP_LPM_DRIVE_HIGH,       /* RTC RD */
+        GPIO98_GPIO,                            /* RTC IO */
 
         /* Standard I2C */
         GPIO21_I2C_SCL,
@@ -484,14 +485,13 @@ static int cm_x300_ulpi_phy_reset(void)
         int err;
 
         /* reset the PHY */
-        err = gpio_request(GPIO_ULPI_PHY_RST, "ulpi reset");
+        err = gpio_request_one(GPIO_ULPI_PHY_RST, GPIOF_OUT_INIT_LOW,
+                               "ulpi reset");
         if (err) {
-                pr_err("%s: failed to request ULPI reset GPIO: %d\n",
-                       __func__, err);
+                pr_err("failed to request ULPI reset GPIO: %d\n", err);
                 return err;
         }
 
-        gpio_direction_output(GPIO_ULPI_PHY_RST, 0);
         msleep(10);
         gpio_set_value(GPIO_ULPI_PHY_RST, 1);
         msleep(10);
@@ -510,8 +510,7 @@ static inline int cm_x300_u2d_init(struct device *dev)
                 pout_clk = clk_get(NULL, "CLK_POUT");
                 if (IS_ERR(pout_clk)) {
                         err = PTR_ERR(pout_clk);
-                        pr_err("%s: failed to get CLK_POUT: %d\n",
-                               __func__, err);
+                        pr_err("failed to get CLK_POUT: %d\n", err);
                         return err;
                 }
                 clk_enable(pout_clk);
@@ -768,39 +767,36 @@ static void __init cm_x300_init_da9030(void)
         irq_set_irq_wake(IRQ_WAKEUP0, 1);
 }
 
+/* wi2wi gpio setting for system_rev >= 130 */
+static struct gpio cm_x300_wi2wi_gpios[] __initdata = {
+        { 71, GPIOF_OUT_INIT_HIGH, "wlan en" },
+        { 70, GPIOF_OUT_INIT_HIGH, "bt reset" },
+};
+
 static void __init cm_x300_init_wi2wi(void)
 {
         int bt_reset, wlan_en;
         int err;
 
         if (system_rev < 130) {
-                wlan_en = 77;
-                bt_reset = 78;
-        } else {
-                wlan_en = 71;
-                bt_reset = 70;
+                cm_x300_wi2wi_gpios[0].gpio = 77;       /* wlan en */
+                cm_x300_wi2wi_gpios[1].gpio = 78;       /* bt reset */
         }
 
         /* Libertas and CSR reset */
-        err = gpio_request(wlan_en, "wlan en");
+        err = gpio_request_array(ARRAY_AND_SIZE(cm_x300_wi2wi_gpios));
         if (err) {
-                pr_err("CM-X300: failed to request wlan en gpio: %d\n", err);
-        } else {
-                gpio_direction_output(wlan_en, 1);
-                gpio_free(wlan_en);
+                pr_err("failed to request wifi/bt gpios: %d\n", err);
+                return;
         }
 
-        err = gpio_request(bt_reset, "bt reset");
-        if (err) {
-                pr_err("CM-X300: failed to request bt reset gpio: %d\n", err);
-        } else {
-                gpio_direction_output(bt_reset, 1);
-                udelay(10);
-                gpio_set_value(bt_reset, 0);
-                udelay(10);
-                gpio_set_value(bt_reset, 1);
-                gpio_free(bt_reset);
-        }
+        udelay(10);
+        gpio_set_value(bt_reset, 0);
+        udelay(10);
+        gpio_set_value(bt_reset, 1);
+
+        gpio_free(wlan_en);
+        gpio_free(bt_reset);
 }
 
 /* MFP */
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index f941a495a4a8..99960a1814e0 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -135,42 +135,6 @@ static unsigned long hx4700_pin_config[] __initdata = {
         GPIO66_GPIO,    /* nSDIO_IRQ */
 };
 
-#define HX4700_GPIO_IN(num, _desc) \
-        { .gpio = (num), .dir = 0, .desc = (_desc) }
-#define HX4700_GPIO_OUT(num, _init, _desc) \
-        { .gpio = (num), .dir = 1, .init = (_init), .desc = (_desc) }
-struct gpio_ress {
-        unsigned gpio : 8;
-        unsigned dir : 1;
-        unsigned init : 1;
-        char *desc;
-};
-
-static int hx4700_gpio_request(struct gpio_ress *gpios, int size)
-{
-        int i, rc = 0;
-        int gpio;
-        int dir;
-
-        for (i = 0; (!rc) && (i < size); i++) {
-                gpio = gpios[i].gpio;
-                dir = gpios[i].dir;
-                rc = gpio_request(gpio, gpios[i].desc);
-                if (rc) {
-                        pr_err("Error requesting GPIO %d(%s) : %d\n",
-                               gpio, gpios[i].desc, rc);
-                        continue;
-                }
-                if (dir)
-                        gpio_direction_output(gpio, gpios[i].init);
-                else
-                        gpio_direction_input(gpio);
-        }
-        while ((rc) && (--i >= 0))
-                gpio_free(gpios[i].gpio);
-        return rc;
-}
-
 /*
  * IRDA
  */
@@ -829,26 +793,30 @@ static struct platform_device *devices[] __initdata = {
         &pcmcia,
 };
 
-static struct gpio_ress global_gpios[] = {
-        HX4700_GPIO_IN(GPIO12_HX4700_ASIC3_IRQ, "ASIC3_IRQ"),
-        HX4700_GPIO_IN(GPIO13_HX4700_W3220_IRQ, "W3220_IRQ"),
-        HX4700_GPIO_IN(GPIO14_HX4700_nWLAN_IRQ, "WLAN_IRQ"),
-        HX4700_GPIO_OUT(GPIO59_HX4700_LCD_PC1,          1, "LCD_PC1"),
-        HX4700_GPIO_OUT(GPIO62_HX4700_LCD_nRESET,       1, "LCD_RESET"),
-        HX4700_GPIO_OUT(GPIO70_HX4700_LCD_SLIN1,        1, "LCD_SLIN1"),
-        HX4700_GPIO_OUT(GPIO84_HX4700_LCD_SQN,          1, "LCD_SQN"),
-        HX4700_GPIO_OUT(GPIO110_HX4700_LCD_LVDD_3V3_ON, 1, "LCD_LVDD"),
-        HX4700_GPIO_OUT(GPIO111_HX4700_LCD_AVDD_3V3_ON, 1, "LCD_AVDD"),
-        HX4700_GPIO_OUT(GPIO32_HX4700_RS232_ON,         1, "RS232_ON"),
-        HX4700_GPIO_OUT(GPIO71_HX4700_ASIC3_nRESET,     1, "ASIC3_nRESET"),
-        HX4700_GPIO_OUT(GPIO82_HX4700_EUART_RESET,      1, "EUART_RESET"),
-        HX4700_GPIO_OUT(GPIO105_HX4700_nIR_ON,          1, "nIR_EN"),
+static struct gpio global_gpios[] = {
+        { GPIO12_HX4700_ASIC3_IRQ, GPIOF_IN, "ASIC3_IRQ" },
+        { GPIO13_HX4700_W3220_IRQ, GPIOF_IN, "W3220_IRQ" },
+        { GPIO14_HX4700_nWLAN_IRQ, GPIOF_IN, "WLAN_IRQ" },
+        { GPIO59_HX4700_LCD_PC1,          GPIOF_OUT_INIT_HIGH, "LCD_PC1" },
+        { GPIO62_HX4700_LCD_nRESET,       GPIOF_OUT_INIT_HIGH, "LCD_RESET" },
+        { GPIO70_HX4700_LCD_SLIN1,        GPIOF_OUT_INIT_HIGH, "LCD_SLIN1" },
+        { GPIO84_HX4700_LCD_SQN,          GPIOF_OUT_INIT_HIGH, "LCD_SQN" },
+        { GPIO110_HX4700_LCD_LVDD_3V3_ON, GPIOF_OUT_INIT_HIGH, "LCD_LVDD" },
+        { GPIO111_HX4700_LCD_AVDD_3V3_ON, GPIOF_OUT_INIT_HIGH, "LCD_AVDD" },
+        { GPIO32_HX4700_RS232_ON,         GPIOF_OUT_INIT_HIGH, "RS232_ON" },
+        { GPIO71_HX4700_ASIC3_nRESET,     GPIOF_OUT_INIT_HIGH, "ASIC3_nRESET" },
+        { GPIO82_HX4700_EUART_RESET,      GPIOF_OUT_INIT_HIGH, "EUART_RESET" },
+        { GPIO105_HX4700_nIR_ON,          GPIOF_OUT_INIT_HIGH, "nIR_EN" },
 };
 
 static void __init hx4700_init(void)
 {
+        int ret;
+
         pxa2xx_mfp_config(ARRAY_AND_SIZE(hx4700_pin_config));
-        hx4700_gpio_request(ARRAY_AND_SIZE(global_gpios));
+        ret = gpio_request_array(ARRAY_AND_SIZE(global_gpios));
+        if (ret)
+                pr_err ("hx4700: Failed to request GPIOs.\n");
 
         pxa_set_ffuart_info(NULL);
         pxa_set_btuart_info(NULL);
diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
index 0a2efcf7947c..7cbfc5d3f9df 100644
--- a/arch/arm/mach-pxa/include/mach/magician.h
+++ b/arch/arm/mach-pxa/include/mach/magician.h
@@ -12,6 +12,7 @@
 #ifndef _MAGICIAN_H_
 #define _MAGICIAN_H_
 
+#include <linux/gpio.h>
 #include <mach/irqs.h>
 
 /*
@@ -77,7 +78,7 @@
  * CPLD EGPIOs
  */
 
-#define MAGICIAN_EGPIO_BASE                     0x80 /* GPIO_BOARD_START */
+#define MAGICIAN_EGPIO_BASE                     NR_BUILTIN_GPIO
 #define MAGICIAN_EGPIO(reg,bit) \
         (MAGICIAN_EGPIO_BASE + 8*reg + bit)
 
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index e1920572948a..0e42798942f7 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -344,22 +344,14 @@ static struct pxafb_mach_info samsung_info = {
  * Backlight
  */
 
+static struct gpio magician_bl_gpios[] = {
+        { EGPIO_MAGICIAN_BL_POWER,  GPIOF_DIR_OUT, "Backlight power" },
+        { EGPIO_MAGICIAN_BL_POWER2, GPIOF_DIR_OUT, "Backlight power 2" },
+};
+
 static int magician_backlight_init(struct device *dev)
 {
-        int ret;
-
-        ret = gpio_request(EGPIO_MAGICIAN_BL_POWER, "BL_POWER");
-        if (ret)
-                goto err;
-        ret = gpio_request(EGPIO_MAGICIAN_BL_POWER2, "BL_POWER2");
-        if (ret)
-                goto err2;
-        return 0;
-
-err2:
-        gpio_free(EGPIO_MAGICIAN_BL_POWER);
-err:
-        return ret;
+        return gpio_request_array(ARRAY_AND_SIZE(magician_bl_gpios));
 }
 
 static int magician_backlight_notify(struct device *dev, int brightness)
@@ -376,8 +368,7 @@ static int magician_backlight_notify(struct device *dev, int brightness)
 
 static void magician_backlight_exit(struct device *dev)
 {
-        gpio_free(EGPIO_MAGICIAN_BL_POWER);
-        gpio_free(EGPIO_MAGICIAN_BL_POWER2);
+        gpio_free_array(ARRAY_AND_SIZE(magician_bl_gpios));
 }
 
 static struct platform_pwm_backlight_data backlight_data = {
@@ -712,16 +703,25 @@ static struct platform_device *devices[] __initdata = {
         &leds_gpio,
 };
 
+static struct gpio magician_global_gpios[] = {
+        { GPIO13_MAGICIAN_CPLD_IRQ,   GPIOF_IN, "CPLD_IRQ" },
+        { GPIO107_MAGICIAN_DS1WM_IRQ, GPIOF_IN, "DS1WM_IRQ" },
+        { GPIO104_MAGICIAN_LCD_POWER_1, GPIOF_OUT_INIT_LOW, "LCD power 1" },
+        { GPIO105_MAGICIAN_LCD_POWER_2, GPIOF_OUT_INIT_LOW, "LCD power 2" },
+        { GPIO106_MAGICIAN_LCD_POWER_3, GPIOF_OUT_INIT_LOW, "LCD power 3" },
+        { GPIO83_MAGICIAN_nIR_EN, GPIOF_OUT_INIT_HIGH, "nIR_EN" },
+};
+
 static void __init magician_init(void)
 {
         void __iomem *cpld;
         int lcd_select;
         int err;
 
-        gpio_request(GPIO13_MAGICIAN_CPLD_IRQ, "CPLD_IRQ");
-        gpio_request(GPIO107_MAGICIAN_DS1WM_IRQ, "DS1WM_IRQ");
-
         pxa2xx_mfp_config(ARRAY_AND_SIZE(magician_pin_config));
+        err = gpio_request_array(ARRAY_AND_SIZE(magician_global_gpios));
+        if (err)
+                pr_err("magician: Failed to request GPIOs: %d\n", err);
 
         pxa_set_ffuart_info(NULL);
         pxa_set_btuart_info(NULL);
@@ -729,11 +729,7 @@ static void __init magician_init(void)
 
         platform_add_devices(ARRAY_AND_SIZE(devices));
 
-        err = gpio_request(GPIO83_MAGICIAN_nIR_EN, "nIR_EN");
-        if (!err) {
-                gpio_direction_output(GPIO83_MAGICIAN_nIR_EN, 1);
-                pxa_set_ficp_info(&magician_ficp_info);
-        }
+        pxa_set_ficp_info(&magician_ficp_info);
         pxa27x_set_i2c_power_info(NULL);
         pxa_set_i2c_info(&i2c_info);
         pxa_set_mci_info(&magician_mci_info);
@@ -747,16 +743,9 @@ static void __init magician_init(void)
                 system_rev = board_id & 0x7;
                 lcd_select = board_id & 0x8;
                 pr_info("LCD type: %s\n", lcd_select ? "Samsung" : "Toppoly");
-                if (lcd_select && (system_rev < 3)) {
-                        gpio_request(GPIO75_MAGICIAN_SAMSUNG_POWER, "SAMSUNG_POWER");
-                        gpio_direction_output(GPIO75_MAGICIAN_SAMSUNG_POWER, 0);
-                }
-                gpio_request(GPIO104_MAGICIAN_LCD_POWER_1, "LCD_POWER_1");
-                gpio_request(GPIO105_MAGICIAN_LCD_POWER_2, "LCD_POWER_2");
-                gpio_request(GPIO106_MAGICIAN_LCD_POWER_3, "LCD_POWER_3");
-                gpio_direction_output(GPIO104_MAGICIAN_LCD_POWER_1, 0);
-                gpio_direction_output(GPIO105_MAGICIAN_LCD_POWER_2, 0);
-                gpio_direction_output(GPIO106_MAGICIAN_LCD_POWER_3, 0);
+                if (lcd_select && (system_rev < 3))
+                        gpio_request_one(GPIO75_MAGICIAN_SAMSUNG_POWER,
+                                         GPIOF_OUT_INIT_LOW, "SAMSUNG_POWER");
                 pxa_set_fb_info(NULL, lcd_select ? &samsung_info : &toppoly_info);
         } else
                 pr_err("LCD detection: CPLD mapping failed\n");
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index e3470137c934..aa67637ae41d 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -177,50 +177,6 @@ static unsigned long mioa701_pin_config[] = {
         MFP_CFG_OUT(GPIO116, AF0, DRIVE_HIGH),
 };
 
-#define MIO_GPIO_IN(num, _desc) \
-        { .gpio = (num), .dir = 0, .desc = (_desc) }
-#define MIO_GPIO_OUT(num, _init, _desc) \
-        { .gpio = (num), .dir = 1, .init = (_init), .desc = (_desc) }
-struct gpio_ress {
-        unsigned gpio : 8;
-        unsigned dir : 1;
-        unsigned init : 1;
-        char *desc;
-};
-
-static int mio_gpio_request(struct gpio_ress *gpios, int size)
-{
-        int i, rc = 0;
-        int gpio;
-        int dir;
-
-        for (i = 0; (!rc) && (i < size); i++) {
-                gpio = gpios[i].gpio;
-                dir = gpios[i].dir;
-                rc = gpio_request(gpio, gpios[i].desc);
-                if (rc) {
-                        printk(KERN_ERR "Error requesting GPIO %d(%s) : %d\n",
-                               gpio, gpios[i].desc, rc);
-                        continue;
-                }
-                if (dir)
-                        gpio_direction_output(gpio, gpios[i].init);
-                else
-                        gpio_direction_input(gpio);
-        }
-        while ((rc) && (--i >= 0))
-                gpio_free(gpios[i].gpio);
-        return rc;
-}
-
-static void mio_gpio_free(struct gpio_ress *gpios, int size)
-{
-        int i;
-
-        for (i = 0; i < size; i++)
-                gpio_free(gpios[i].gpio);
-}
-
 /* LCD Screen and Backlight */
 static struct platform_pwm_backlight_data mioa701_backlight_data = {
         .pwm_id         = 0,
@@ -346,16 +302,16 @@ irqreturn_t gsm_on_irq(int irq, void *p)
         return IRQ_HANDLED;
 }
 
-struct gpio_ress gsm_gpios[] = {
-        MIO_GPIO_IN(GPIO25_GSM_MOD_ON_STATE, "GSM state"),
-        MIO_GPIO_IN(GPIO113_GSM_EVENT, "GSM event"),
+static struct gpio gsm_gpios[] = {
+        { GPIO25_GSM_MOD_ON_STATE, GPIOF_IN, "GSM state" },
+        { GPIO113_GSM_EVENT, GPIOF_IN, "GSM event" },
 };
 
 static int __init gsm_init(void)
 {
         int rc;
 
-        rc = mio_gpio_request(ARRAY_AND_SIZE(gsm_gpios));
+        rc = gpio_request_array(ARRAY_AND_SIZE(gsm_gpios));
         if (rc)
                 goto err_gpio;
         rc = request_irq(gpio_to_irq(GPIO25_GSM_MOD_ON_STATE), gsm_on_irq,
@@ -369,7 +325,7 @@ static int __init gsm_init(void)
 
 err_irq:
         printk(KERN_ERR "Mioa701: Can't request GSM_ON irq\n");
-        mio_gpio_free(ARRAY_AND_SIZE(gsm_gpios));
+        gpio_free_array(ARRAY_AND_SIZE(gsm_gpios));
 err_gpio:
         printk(KERN_ERR "Mioa701: gsm not available\n");
         return rc;
@@ -378,7 +334,7 @@ err_gpio:
 static void gsm_exit(void)
 {
         free_irq(gpio_to_irq(GPIO25_GSM_MOD_ON_STATE), NULL);
-        mio_gpio_free(ARRAY_AND_SIZE(gsm_gpios));
+        gpio_free_array(ARRAY_AND_SIZE(gsm_gpios));
 }
 
 /*
@@ -749,14 +705,16 @@ static void mioa701_restart(char c, const char *cmd)
         arm_machine_restart('s', cmd);
 }
 
-static struct gpio_ress global_gpios[] = {
-        MIO_GPIO_OUT(GPIO9_CHARGE_EN, 1, "Charger enable"),
-        MIO_GPIO_OUT(GPIO18_POWEROFF, 0, "Power Off"),
-        MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power"),
+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" },
 };
 
 static void __init mioa701_machine_init(void)
 {
+        int rc;
+
         PSLR  = 0xff100000; /* SYSDEL=125ms, PWRDEL=125ms, PSLR_SL_ROD=1 */
         PCFR = PCFR_DC_EN | PCFR_GPR_EN | PCFR_OPDE;
         RTTR = 32768 - 1; /* Reset crazy WinCE value */
@@ -766,7 +724,9 @@ static void __init mioa701_machine_init(void)
         pxa_set_ffuart_info(NULL);
         pxa_set_btuart_info(NULL);
         pxa_set_stuart_info(NULL);
-        mio_gpio_request(ARRAY_AND_SIZE(global_gpios));
+        rc = gpio_request_array(ARRAY_AND_SIZE(global_gpios));
+        if (rc)
+                pr_err("MioA701: Failed to request GPIOs: %d", rc);
         bootstrap_init();
         pxa_set_fb_info(NULL, &mioa701_pxafb_info);
         pxa_set_mci_info(&mioa701_mci_info);
diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c
index 9322fe527c7f..e53a3334c944 100644
--- a/arch/arm/mach-pxa/saarb.c
+++ b/arch/arm/mach-pxa/saarb.c
@@ -104,7 +104,7 @@ static void __init saarb_init(void)
 
 MACHINE_START(SAARB, "PXA955 Handheld Platform (aka SAARB)")
         .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
+        .map_io         = pxa3xx_map_io,
         .nr_irqs        = SAARB_NR_IRQS,
         .init_irq       = pxa95x_init_irq,
         .timer          = &pxa_timer,