From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 20:13:38 +0000 (-0700)
Subject: Merge branch 'next/cleanup' into late/kirkwood
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b177ab53d0a2303ba287ec8babfd6e1de801500;p=linux.git

Merge branch 'next/cleanup' into late/kirkwood

By Arnd Bergmann (21) and Wei Yongjun (1)
via Olof Johansson (2) and Haojian Zhuang (1)
* next/cleanup: (22 commits)
  ARM: mmp: using for_each_set_bit to simplify the code
  net: seeq: use __iomem pointers for MMIO
  video: da8xx-fb: use __iomem pointers for MMIO
  scsi: eesox: use __iomem pointers for MMIO
  serial: ks8695: use __iomem pointers for MMIO
  input: rpcmouse: use __iomem pointers for MMIO
  ARM: samsung: use __iomem pointers for MMIO
  ARM: spear13xx: use __iomem pointers for MMIO
  ARM: sa1100: use __iomem pointers for MMIO
  ARM: prima2: use __iomem pointers for MMIO
  ARM: nomadik: use __iomem pointers for MMIO
  ARM: msm: use __iomem pointers for MMIO
  ARM: lpc32xx: use __iomem pointers for MMIO
  ARM: ks8695: use __iomem pointers for MMIO
  ARM: ixp4xx: use __iomem pointers for MMIO
  ARM: iop32x: use __iomem pointers for MMIO
  ARM: iop13xx: use __iomem pointers for MMIO
  ARM: integrator: use __iomem pointers for MMIO
  ARM: imx: use __iomem pointers for MMIO
  ARM: ebsa110: use __iomem pointers for MMIO
  ...
---

0b177ab53d0a2303ba287ec8babfd6e1de801500
diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
index 38ed2ddd32655,a13c97b4ba1df..db99a4ade80cd
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@@ -777,10 -757,9 +777,10 @@@ static struct platform_device *sh73a0_l
  	&i2c4_device,
  	&dma0_device,
  	&mpdma0_device,
 +	&pmu_device,
  };
  
- #define SRCR2          0xe61580b0
+ #define SRCR2          IOMEM(0xe61580b0)
  
  void __init sh73a0_add_standard_devices(void)
  {
diff --cc arch/arm/mach-shmobile/sh-gpio.h
index 7ba1877fa97a3,0000000000000..e834763ac2a52
mode 100644,000000..100644
--- a/arch/arm/mach-shmobile/sh-gpio.h
+++ b/arch/arm/mach-shmobile/sh-gpio.h
@@@ -1,48 -1,0 +1,48 @@@
 +/*
 + * Generic GPIO API and pinmux table support
 + *
 + * Copyright (c) 2008  Magnus Damm
 + *
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
 + * for more details.
 + */
 +#ifndef __ASM_ARCH_GPIO_H
 +#define __ASM_ARCH_GPIO_H
 +
 +#include <linux/kernel.h>
 +#include <linux/errno.h>
 +#include <linux/io.h>
 +
 +/*
 + * FIXME !!
 + *
 + * current gpio frame work doesn't have
 + * the method to control only pull up/down/free.
 + * this function should be replaced by correct gpio function
 + */
- static inline void __init gpio_direction_none(u32 addr)
++static inline void __init gpio_direction_none(void __iomem * addr)
 +{
 +	__raw_writeb(0x00, addr);
 +}
 +
- static inline void __init gpio_request_pullup(u32 addr)
++static inline void __init gpio_request_pullup(void __iomem * addr)
 +{
 +	u8 data = __raw_readb(addr);
 +
 +	data &= 0x0F;
 +	data |= 0xC0;
 +	__raw_writeb(data, addr);
 +}
 +
- static inline void __init gpio_request_pulldown(u32 addr)
++static inline void __init gpio_request_pulldown(void __iomem * addr)
 +{
 +	u8 data = __raw_readb(addr);
 +
 +	data &= 0x0F;
 +	data |= 0xA0;
 +
 +	__raw_writeb(data, addr);
 +}
 +
 +#endif /* __ASM_ARCH_GPIO_H */