Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits)
  ARM: pxa: fix building issue of missing physmap.h
  ARM: mmp: PXA910 drive strength FAST using wrong value
  ARM: mmp: MMP2 drive strength FAST using wrong value
  ARM: pxa: fix recursive calls in pxa_low_gpio_chip
  AT91: Support for gsia18s board
  AT91: Acme Systems FOX Board G20 board files
  AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
  ARM: pxa: fix suspend/resume array index miscalculation
  ARM: pxa: use cpu_has_ipr() consistently in irq.c
  ARM: pxa: remove unused variable in clock-pxa3xx.c
  ARM: pxa: fix warning in zeus.c
  ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
  ARM mxs: clkdev related compile fixes
  ARM i.MX mx31_3ds: Fix MC13783 regulator names
  ARM: plat-stmp3xxx: irq_data conversion.
  ARM: plat-spear: irq_data conversion.
  ARM: plat-orion: irq_data conversion.
  ARM: plat-omap: irq_data conversion.
  ARM: plat-nomadik: irq_data conversion.
  ARM: plat-mxc: irq_data conversion.
  ...

Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert
Buytenhek's irq_data conversion clashing with some omap irq updates)

1 files changed, 29 insertions, 0 deletions

diff --git a/arch/arm/mach-s5pv310/include/mach/map.h b/arch/arm/mach-s5pv310/include/mach/map.h
index 53994467605d..74d400625a23 100644
--- a/arch/arm/mach-s5pv310/include/mach/map.h
+++ b/arch/arm/mach-s5pv310/include/mach/map.h
@@ -39,11 +39,15 @@
 #define S5PV310_PA_SYSCON               (0x10010000)
 #define S5P_PA_SYSCON                   S5PV310_PA_SYSCON
 
+#define S5PV310_PA_PMU                  (0x10020000)
+
 #define S5PV310_PA_CMU                  (0x10030000)
 
 #define S5PV310_PA_WATCHDOG             (0x10060000)
 #define S5PV310_PA_RTC                  (0x10070000)
 
+#define S5PV310_PA_DMC0                 (0x10400000)
+
 #define S5PV310_PA_COMBINER             (0x10448000)
 
 #define S5PV310_PA_COREPERI             (0x10500000)
@@ -61,9 +65,13 @@
 #define S5PV310_PA_GPIO2                (0x11000000)
 #define S5PV310_PA_GPIO3                (0x03860000)
 
+#define S5PV310_PA_MIPI_CSIS0           0x11880000
+#define S5PV310_PA_MIPI_CSIS1           0x11890000
+
 #define S5PV310_PA_HSMMC(x)             (0x12510000 + ((x) * 0x10000))
 
 #define S5PV310_PA_SROMC                (0x12570000)
+#define S5P_PA_SROMC                    S5PV310_PA_SROMC
 
 /* S/PDIF */
 #define S5PV310_PA_SPDIF        0xE1100000
@@ -100,6 +108,25 @@
 #define S5PV310_PA_SDRAM                (0x40000000)
 #define S5P_PA_SDRAM                    S5PV310_PA_SDRAM
 
+#define S5PV310_PA_SYSMMU_MDMA          0x10A40000
+#define S5PV310_PA_SYSMMU_SSS           0x10A50000
+#define S5PV310_PA_SYSMMU_FIMC0         0x11A20000
+#define S5PV310_PA_SYSMMU_FIMC1         0x11A30000
+#define S5PV310_PA_SYSMMU_FIMC2         0x11A40000
+#define S5PV310_PA_SYSMMU_FIMC3         0x11A50000
+#define S5PV310_PA_SYSMMU_JPEG          0x11A60000
+#define S5PV310_PA_SYSMMU_FIMD0         0x11E20000
+#define S5PV310_PA_SYSMMU_FIMD1         0x12220000
+#define S5PV310_PA_SYSMMU_PCIe          0x12620000
+#define S5PV310_PA_SYSMMU_G2D           0x12A20000
+#define S5PV310_PA_SYSMMU_ROTATOR       0x12A30000
+#define S5PV310_PA_SYSMMU_MDMA2         0x12A40000
+#define S5PV310_PA_SYSMMU_TV            0x12E20000
+#define S5PV310_PA_SYSMMU_MFC_L         0x13620000
+#define S5PV310_PA_SYSMMU_MFC_R         0x13630000
+#define S5PV310_SYSMMU_TOTAL_IPNUM      16
+#define S5P_SYSMMU_TOTAL_IPNUM          S5PV310_SYSMMU_TOTAL_IPNUM
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART                     S5PV310_PA_UART
 #define S3C_PA_HSMMC0                   S5PV310_PA_HSMMC(0)
@@ -116,5 +143,7 @@
 #define S3C_PA_IIC7                     S5PV310_PA_IIC(7)
 #define S3C_PA_RTC                      S5PV310_PA_RTC
 #define S3C_PA_WDT                      S5PV310_PA_WATCHDOG
+#define S5P_PA_MIPI_CSIS0               S5PV310_PA_MIPI_CSIS0
+#define S5P_PA_MIPI_CSIS1               S5PV310_PA_MIPI_CSIS1
 
 #endif /* __ASM_ARCH_MAP_H */