diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 15:17:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 15:17:06 -0400 |
| commit | ff877c498eb2f9c4ea386270642e383bc867f63c (patch) | |
| tree | ae37e2f57ac6e6d19d01b7380f77db2a1c6c5b14 /arch/arm/mach-exynos/include/mach/map.h | |
| parent | 529b73fc0a9764050dcc597f4851728e8ff59165 (diff) | |
| parent | 1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544 (diff) | |
Merge tag 'drivers2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 609127df9b02..54307b09813a 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h | |||
| @@ -101,6 +101,10 @@ | |||
| 101 | #define EXYNOS4_PA_GPIO1 0x11400000 | 101 | #define EXYNOS4_PA_GPIO1 0x11400000 |
| 102 | #define EXYNOS4_PA_GPIO2 0x11000000 | 102 | #define EXYNOS4_PA_GPIO2 0x11000000 |
| 103 | #define EXYNOS4_PA_GPIO3 0x03860000 | 103 | #define EXYNOS4_PA_GPIO3 0x03860000 |
| 104 | #define EXYNOS5_PA_GPIO1 0x11400000 | ||
| 105 | #define EXYNOS5_PA_GPIO2 0x13400000 | ||
| 106 | #define EXYNOS5_PA_GPIO3 0x10D10000 | ||
| 107 | #define EXYNOS5_PA_GPIO4 0x03860000 | ||
| 104 | 108 | ||
| 105 | #define EXYNOS4_PA_MIPI_CSIS0 0x11880000 | 109 | #define EXYNOS4_PA_MIPI_CSIS0 0x11880000 |
| 106 | #define EXYNOS4_PA_MIPI_CSIS1 0x11890000 | 110 | #define EXYNOS4_PA_MIPI_CSIS1 0x11890000 |