From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Mar 2012 19:17:06 +0000 (-0700)
Subject: Merge tag 'drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.4-rc1~73
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff877c498eb2f9c4ea386270642e383bc867f63c;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'drivers2' of git://git./linux/kernel/git/arm/arm-soc

Pull "ARM: More SoC driver updates" from Olof Johansson:
 "This branch contains a handful of driver updates, mostly to the
  LPC32xx platform but also for Samsung EXYNOS and Davinci.

  It had a few context conflicts against patches already merged through
  fixes-non-critical.  We should have resolved this early during the
  development cycle by pulling them in as a dependency, instead I did it
  after the fact this time."

* tag 'drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  gpio/samsung: use ioremap() for EXYNOS4 GPIOlib
  gpio/samsung: add support GPIOlib for EXYNOS5250
  ARM: EXYNOS: add support GPIO for EXYNOS5250
  ARM: LPC32xx: Ethernet support
  ARM: LPC32xx: USB Support
  ARM: davinci: dm644x evm: add support for VPBE display
  ARM: davinci: dm644x: add support for v4l2 video display
  ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure
  ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure
  arm: lpc32xx: phy3250: add rtc & touch device
  ARM: LPC32xx: clock.c: Clock registration fixes
  ARM: LPC32xx: clock.c: jiffies wrapping
  ARM: LPC32xx: clock.c: Missing header file
  ARM: LPC32XX: Remove broken non-static declaration
  ARM: LPC32xx: clock.c: Fix mutex lock issues
  ARM: LPC32xx: clock.c: warning fix
  ARM: LPC32xx: Added lpc32xx_defconfig
---

ff877c498eb2f9c4ea386270642e383bc867f63c
diff --cc arch/arm/mach-exynos/common.c
index 97ca259,85f0e24..d67e21e
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -160,29 -156,9 +160,14 @@@ static struct map_desc exynos4_iodesc[
  		.length		= SZ_4K,
  		.type		= MT_DEVICE,
  	}, {
- 		.virtual	= (unsigned long)S5P_VA_GPIO1,
- 		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO1),
- 		.length		= SZ_4K,
- 		.type		= MT_DEVICE,
- 	}, {
- 		.virtual	= (unsigned long)S5P_VA_GPIO2,
- 		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO2),
- 		.length		= SZ_4K,
- 		.type		= MT_DEVICE,
- 	}, {
- 		.virtual	= (unsigned long)S5P_VA_GPIO3,
- 		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO3),
- 		.length		= SZ_256,
- 		.type		= MT_DEVICE,
- 	}, {
  		.virtual	= (unsigned long)S5P_VA_DMC0,
  		.pfn		= __phys_to_pfn(EXYNOS4_PA_DMC0),
 -		.length		= SZ_4K,
 +		.length		= SZ_64K,
 +		.type		= MT_DEVICE,
 +	}, {
 +		.virtual	= (unsigned long)S5P_VA_DMC1,
 +		.pfn		= __phys_to_pfn(EXYNOS4_PA_DMC1),
 +		.length		= SZ_64K,
  		.type		= MT_DEVICE,
  	}, {
  		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,