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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
  [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
  [ARM] 3855/1: Add generic time support
  [ARM] 3873/1: S3C24XX: Add irq_chip names
  [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
  [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
  [ARM] nommu: confirms the CR_V bit in nommu mode
  [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
  [ARM] 3870/1: AT91: Start removing static memory mappings
  [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
  [ARM] 3868/1: AT91 hardware header update
  [ARM] 3867/1: AT91 GPIO update
  [ARM] 3866/1: AT91 clock update
  [ARM] 3865/1: AT91RM9200 header updates
  [ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
  [ARM] kthread: switch arch/arm/kernel/apm.c
  [ARM] Off-by-one in arch/arm/common/icst*
  [ARM] 3864/1: Refactore sharpsl_pm
  [ARM] 3863/1: Add Locomo SPI Device
  [ARM] 3847/2:  Convert LOMOMO to use struct device for GPIOs
  [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/include/asm-arm/arch-s3c2410/osiris-map.h b/include/asm-arm/arch-s3c2410/osiris-map.h
index e2d406218ae5..a14164dfa525 100644
--- a/include/asm-arm/arch-s3c2410/osiris-map.h
+++ b/include/asm-arm/arch-s3c2410/osiris-map.h
@@ -18,22 +18,22 @@
 
 /* start peripherals off after the S3C2410 */
 
-#define OSIRIS_IOADDR(x)        (S3C2410_ADDR((x) + 0x05000000))
+#define OSIRIS_IOADDR(x)        (S3C2410_ADDR((x) + 0x04000000))
 
-#define OSIRIS_PA_CPLD          (S3C2410_CS1 | (3<<25))
+#define OSIRIS_PA_CPLD          (S3C2410_CS1 | (1<<26))
 
 /* we put the CPLD registers next, to get them out of the way */
 
-#define OSIRIS_VA_CTRL1     OSIRIS_IOADDR(0x00000000)    /* 0x01300000 */
+#define OSIRIS_VA_CTRL1     OSIRIS_IOADDR(0x00000000)
 #define OSIRIS_PA_CTRL1     (OSIRIS_PA_CPLD)
 
-#define OSIRIS_VA_CTRL2     OSIRIS_IOADDR(0x00100000)    /* 0x01400000 */
-#define OSIRIS_PA_CTRL2     (OSIRIS_PA_CPLD + (1<<24))
+#define OSIRIS_VA_CTRL2     OSIRIS_IOADDR(0x00100000)
+#define OSIRIS_PA_CTRL2     (OSIRIS_PA_CPLD + (1<<23))
 
-#define OSIRIS_VA_CTRL3     OSIRIS_IOADDR(0x00200000)    /* 0x01500000 */
-#define OSIRIS_PA_CTRL3     (OSIRIS_PA_CPLD + (2<<24))
+#define OSIRIS_VA_CTRL3     OSIRIS_IOADDR(0x00200000)
+#define OSIRIS_PA_CTRL3     (OSIRIS_PA_CPLD + (2<<23))
 
-#define OSIRIS_VA_CTRL4     OSIRIS_IOADDR(0x00300000)    /* 0x01600000 */
-#define OSIRIS_PA_CTRL4     (OSIRIS_PA_CPLD + (3<<24))
+#define OSIRIS_VA_CTRL4     OSIRIS_IOADDR(0x00300000)
+#define OSIRIS_PA_CTRL4     (OSIRIS_PA_CPLD + (3<<23))
 
 #endif /* __ASM_ARCH_OSIRISMAP_H */