Merge branch 'cleanup/__iomem' into next/cleanup2

* cleanup/__iomem:
  ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
  ARM: ux500: use __iomem pointers for MMIO

Two new cleanup patches that were not already part of the
first cleanup branch.

Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined arch/arm/mach-shmobile/board-armadillo800eva.c
index 453a6e50db8be95f5fdb8574672fa00aa1671ecb,2f32aa64c2b135b608ea2335ae0b51cdd8cec0ee..45b33e02dff55c17aece60c0c3bb5b5adf196397
--- 1/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 2/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@ -135,7 -135,7 +135,7 @@@
   *    usbhsf_power_ctrl()
   */
  #define IRQ7          evt2irq(0x02e0)
- #define USBCR1                0xe605810a
+ #define USBCR1                IOMEM(0xe605810a)
  #define USBH          0xC6700000
  #define USBH_USBCTR   0x10834
  
@@@ -520,14 -520,13 +520,14 @@@ static struct platform_device hdmi_lcdc
  };
  
  /* GPIO KEY */
 -#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 }
 +#define GPIO_KEY(c, g, d, ...) \
 +      { .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ }
  
  static struct gpio_keys_button gpio_buttons[] = {
 -      GPIO_KEY(KEY_POWER,     GPIO_PORT99,    "SW1"),
 -      GPIO_KEY(KEY_BACK,      GPIO_PORT100,   "SW2"),
 -      GPIO_KEY(KEY_MENU,      GPIO_PORT97,    "SW3"),
 -      GPIO_KEY(KEY_HOME,      GPIO_PORT98,    "SW4"),
 +      GPIO_KEY(KEY_POWER,     GPIO_PORT99,    "SW3", .wakeup = 1),
 +      GPIO_KEY(KEY_BACK,      GPIO_PORT100,   "SW4"),
 +      GPIO_KEY(KEY_MENU,      GPIO_PORT97,    "SW5"),
 +      GPIO_KEY(KEY_HOME,      GPIO_PORT98,    "SW6"),
  };
  
  static struct gpio_keys_platform_data gpio_key_info = {
@@@ -902,8 -901,8 +902,8 @@@ static struct platform_device *eva_devi
        &camera_device,
        &ceu0_device,
        &fsi_device,
 -      &fsi_hdmi_device,
        &fsi_wm8978_device,
 +      &fsi_hdmi_device,
  };
  
  static void __init eva_clock_init(void)
@@@ -950,8 -949,8 +950,8 @@@ clock_error
  /*
   * board init
   */
- #define GPIO_PORT7CR  0xe6050007
- #define GPIO_PORT8CR  0xe6050008
+ #define GPIO_PORT7CR  IOMEM(0xe6050007)
+ #define GPIO_PORT8CR  IOMEM(0xe6050008)
  static void __init eva_init(void)
  {
        struct platform_device *usb = NULL;

diff --combined arch/arm/mach-shmobile/board-mackerel.c
index c129542f6aedf1ee69f99f463eb554d31d13ed2d,d271b464a8aaf493413dae808459824c1481d85e..0dce90ee6cf265881085c622d128021609614cd7
--- 1/arch/arm/mach-shmobile/board-mackerel.c
--- 2/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -583,8 -583,8 +583,8 @@@ out
  #define USBHS0_POLL_INTERVAL (HZ * 5)
  
  struct usbhs_private {
-       unsigned int usbphyaddr;
-       unsigned int usbcrcaddr;
+       void __iomem *usbphyaddr;
+       void __iomem *usbcrcaddr;
        struct renesas_usbhs_platform_info info;
        struct delayed_work work;
        struct platform_device *pdev;
@@@ -642,7 -642,7 +642,7 @@@ static void usbhs0_hardware_exit(struc
  }
  
  static struct usbhs_private usbhs0_private = {
-       .usbcrcaddr     = 0xe605810c,           /* USBCR2 */
+       .usbcrcaddr     = IOMEM(0xe605810c),            /* USBCR2 */
        .info = {
                .platform_callback = {
                        .hardware_init  = usbhs0_hardware_init,
@@@ -695,7 -695,6 +695,7 @@@ static struct platform_device usbhs0_de
   *  - J30 "open"
   *  - modify usbhs1_get_id() USBHS_HOST -> USBHS_GADGET
   *  - add .get_vbus = usbhs_get_vbus in usbhs1_private
 + *  - check usbhs0_device(pio)/usbhs1_device(irq) order in mackerel_devices.
   */
  #define IRQ8 evt2irq(0x0300)
  #define USB_PHY_MODE          (1 << 4)
@@@ -776,8 -775,8 +776,8 @@@ static u32 usbhs1_pipe_cfg[] = 
  };
  
  static struct usbhs_private usbhs1_private = {
-       .usbphyaddr     = 0xe60581e2,           /* USBPHY1INTAP */
-       .usbcrcaddr     = 0xe6058130,           /* USBCR4 */
+       .usbphyaddr     = IOMEM(0xe60581e2),    /* USBPHY1INTAP */
+       .usbcrcaddr     = IOMEM(0xe6058130),    /* USBCR4 */
        .info = {
                .platform_callback = {
                        .hardware_init  = usbhs1_hardware_init,
@@@ -1326,8 -1325,8 +1326,8 @@@ static struct platform_device *mackerel
        &nor_flash_device,
        &smc911x_device,
        &lcdc_device,
 -      &usbhs1_device,
        &usbhs0_device,
 +      &usbhs1_device,
        &leds_device,
        &fsi_device,
        &fsi_ak4643_device,
@@@ -1402,12 -1401,12 +1402,12 @@@ static struct i2c_board_info i2c1_devic
        },
  };
  
- #define GPIO_PORT9CR  0xE6051009
- #define GPIO_PORT10CR 0xE605100A
- #define GPIO_PORT167CR        0xE60520A7
- #define GPIO_PORT168CR        0xE60520A8
- #define SRCR4         0xe61580bc
- #define USCCR1                0xE6058144
+ #define GPIO_PORT9CR  IOMEM(0xE6051009)
+ #define GPIO_PORT10CR IOMEM(0xE605100A)
+ #define GPIO_PORT167CR        IOMEM(0xE60520A7)
+ #define GPIO_PORT168CR        IOMEM(0xE60520A8)
+ #define SRCR4         IOMEM(0xe61580bc)
+ #define USCCR1                IOMEM(0xE6058144)
  static void __init mackerel_init(void)
  {
        u32 srcr4;

diff --combined arch/arm/mach-shmobile/intc-sh73a0.c
index 588555a67d9c438ffb4d0ea0908923056554f635,a8b2dd779429c53f10959a213d81877d3b3cc8fe..f0c5e5190601d4a58b20338915799e84f4ee08e3
--- 1/arch/arm/mach-shmobile/intc-sh73a0.c
--- 2/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/arch/arm/mach-shmobile/intc-sh73a0.c
@@@ -259,9 -259,9 +259,9 @@@ static int sh73a0_set_wake(struct irq_d
        return 0; /* always allow wakeup */
  }
  
 -#define RELOC_BASE 0x1000
 +#define RELOC_BASE 0x1200
  
 -/* INTCA IRQ pins at INTCS + 0x1000 to make space for GIC+INTC handling */
 +/* INTCA IRQ pins at INTCS + RELOC_BASE to make space for GIC+INTC handling */
  #define INTCS_VECT_RELOC(n, vect) INTCS_VECT((n), (vect) + RELOC_BASE)
  
  INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000,
@@@ -366,10 -366,12 +366,12 @@@ static irqreturn_t sh73a0_irq_pin_demux
  
  static struct irqaction sh73a0_irq_pin_cascade[32];
  
- #define PINTER0 0xe69000a0
- #define PINTER1 0xe69000a4
- #define PINTRR0 0xe69000d0
- #define PINTRR1 0xe69000d4
+ #define PINTER0_PHYS 0xe69000a0
+ #define PINTER1_PHYS 0xe69000a4
+ #define PINTER0_VIRT IOMEM(0xe69000a0)
+ #define PINTER1_VIRT IOMEM(0xe69000a4)
+ #define PINTRR0 IOMEM(0xe69000d0)
+ #define PINTRR1 IOMEM(0xe69000d4)
  
  #define PINT0A_IRQ(n, irq) INTC_IRQ((n), SH73A0_PINT0_IRQ(irq))
  #define PINT0B_IRQ(n, irq) INTC_IRQ((n), SH73A0_PINT0_IRQ(irq + 8))
@@@ -377,14 -379,14 +379,14 @@@
  #define PINT0D_IRQ(n, irq) INTC_IRQ((n), SH73A0_PINT0_IRQ(irq + 24))
  #define PINT1E_IRQ(n, irq) INTC_IRQ((n), SH73A0_PINT1_IRQ(irq))
  
- INTC_PINT(intc_pint0, PINTER0, 0xe69000b0, "sh73a0-pint0",            \
+ INTC_PINT(intc_pint0, PINTER0_PHYS, 0xe69000b0, "sh73a0-pint0",               \
    INTC_PINT_E(A), INTC_PINT_E(B), INTC_PINT_E(C), INTC_PINT_E(D),     \
    INTC_PINT_V(A, PINT0A_IRQ), INTC_PINT_V(B, PINT0B_IRQ),             \
    INTC_PINT_V(C, PINT0C_IRQ), INTC_PINT_V(D, PINT0D_IRQ),             \
    INTC_PINT_E(A), INTC_PINT_E(B), INTC_PINT_E(C), INTC_PINT_E(D),     \
    INTC_PINT_E(A), INTC_PINT_E(B), INTC_PINT_E(C), INTC_PINT_E(D));
  
- INTC_PINT(intc_pint1, PINTER1, 0xe69000c0, "sh73a0-pint1",            \
+ INTC_PINT(intc_pint1, PINTER1_PHYS, 0xe69000c0, "sh73a0-pint1",               \
    INTC_PINT_E(E), INTC_PINT_E_EMPTY, INTC_PINT_E_EMPTY, INTC_PINT_E_EMPTY, \
    INTC_PINT_V(E, PINT1E_IRQ), INTC_PINT_V_NONE,                               \
    INTC_PINT_V_NONE, INTC_PINT_V_NONE,                                 \
@@@ -394,7 -396,7 +396,7 @@@
  static struct irqaction sh73a0_pint0_cascade;
  static struct irqaction sh73a0_pint1_cascade;
  
- static void pint_demux(unsigned long rr, unsigned long er, int base_irq)
+ static void pint_demux(void __iomem *rr, void __iomem *er, int base_irq)
  {
        unsigned long value =  ioread32(rr) & ioread32(er);
        int k;
@@@ -409,13 -411,13 +411,13 @@@
  
  static irqreturn_t sh73a0_pint0_demux(int irq, void *dev_id)
  {
-       pint_demux(PINTRR0, PINTER0, SH73A0_PINT0_IRQ(0));
+       pint_demux(PINTRR0, PINTER0_VIRT, SH73A0_PINT0_IRQ(0));
        return IRQ_HANDLED;
  }
  
  static irqreturn_t sh73a0_pint1_demux(int irq, void *dev_id)
  {
-       pint_demux(PINTRR1, PINTER1, SH73A0_PINT1_IRQ(0));
+       pint_demux(PINTRR1, PINTER1_VIRT, SH73A0_PINT1_IRQ(0));
        return IRQ_HANDLED;
  }