Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/common/locomo.c
Simple merge

diff --cc arch/arm/mach-at91/gpio.c
Simple merge

diff --cc arch/arm/mach-ep93xx/core.c
Simple merge

diff --cc arch/arm/mach-footbridge/isa-irq.c
Simple merge

diff --cc arch/arm/mach-h720x/common.c
Simple merge

diff --cc arch/arm/mach-imx/irq.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_cp.c
Simple merge

diff --cc arch/arm/mach-ixp2000/core.c
Simple merge

diff --cc arch/arm/mach-ixp2000/ixdp2x00.c
Simple merge

diff --cc arch/arm/mach-ixp2000/ixdp2x01.c
Simple merge

diff --cc arch/arm/mach-netx/generic.c
Simple merge

diff --cc arch/arm/mach-omap1/fpga.c
Simple merge

diff --cc arch/arm/mach-orion5x/irq.c
Simple merge

diff --cc arch/arm/mach-pxa/Kconfig
index e484f609feda8b1da86ffaeecf3f9243e822bcb8,f781873431f39b52bb83f1301ce32a13eae1bb3e..f27f6b3d6e6f61be1b350c883dcd09cc383501a8
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -207,10 -254,16 +254,17 @@@ config MACH_SAA
        select PXA930
  
  config MACH_ARMCORE
-       bool "CompuLab CM-X270 modules"
+       bool "CompuLab CM-X255/CM-X270 modules"
        select PXA27x
        select IWMMXT
 +      select ZONE_DMA if PCI
+       select PXA25x
+       select PXA_SSP
+ 
+ config MACH_CM_X300
+       bool "CompuLab CM-X300 modules"
+       select PXA3xx
+       select CPU_PXA300
  
  config MACH_MAGICIAN
        bool "Enable HTC Magician Support"

diff --cc arch/arm/mach-pxa/corgi.c
index 4cbf08bd546ba0f16a4a19bcba553e15a6603653,5c08c4e9cd22fd3b13761fb5b3f9ba73f4f15496..65558d6aa220d396e1e10c350ae5ebbc679f53bf
--- 1/arch/arm/mach-pxa/corgi.c
--- 2/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@@ -20,8 -20,11 +20,12 @@@
  #include <linux/interrupt.h>
  #include <linux/mmc/host.h>
  #include <linux/pm.h>
+ #include <linux/gpio.h>
  #include <linux/backlight.h>
 +#include <linux/io.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
+ #include <linux/spi/corgi_lcd.h>
  #include <video/w100fb.h>
  
  #include <asm/setup.h>

diff --cc arch/arm/mach-pxa/gpio.c
Simple merge

diff --cc arch/arm/mach-pxa/include/mach/hardware.h
index a1a0a2ffd642299bcbf1cb498aa721a72b16ebe9,9dc71114e2871dadc1b9c0dcb73ea1d996dc436f..a582a6d9b92b10c93d6ecae6d95128472b4ae9a3
--- 1/arch/arm/mach-pxa/include/mach/hardware.h
--- 2/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@@ -62,20 -62,63 +62,65 @@@
  
  #ifndef __ASSEMBLY__
  
 +#include <asm/cputype.h>
 +
+ /*
+  *   CPU     Stepping     CPU_ID         JTAG_ID
+  *
+  *  PXA210    B0      0x69052922      0x2926C013
+  *  PXA210    B1      0x69052923      0x3926C013
+  *  PXA210    B2      0x69052924      0x4926C013
+  *  PXA210    C0      0x69052D25      0x5926C013
+  *
+  *  PXA250    A0      0x69052100      0x09264013
+  *  PXA250    A1      0x69052101      0x19264013
+  *  PXA250    B0      0x69052902      0x29264013
+  *  PXA250    B1      0x69052903      0x39264013
+  *  PXA250    B2      0x69052904      0x49264013
+  *  PXA250    C0      0x69052D05      0x59264013
+  *
+  *  PXA255    A0      0x69052D06      0x69264013
+  *
+  *  PXA26x    A0      0x69052903      0x39264013
+  *  PXA26x    B0      0x69052D05      0x59264013
+  *
+  *  PXA27x    A0      0x69054110      0x09265013
+  *  PXA27x    A1      0x69054111      0x19265013
+  *  PXA27x    B0      0x69054112      0x29265013
+  *  PXA27x    B1      0x69054113      0x39265013
+  *  PXA27x    C0      0x69054114      0x49265013
+  *  PXA27x    C5      0x69054117      0x79265013
+  *
+  *  PXA30x    A0      0x69056880      0x0E648013
+  *  PXA30x    A1      0x69056881      0x1E648013
+  *  PXA31x    A0      0x69056890      0x0E649013
+  *  PXA31x    A1      0x69056891      0x1E649013
+  *  PXA31x    A2      0x69056892      0x2E649013
+  *  PXA32x    B1      0x69056825      0x5E642013
+  *  PXA32x    B2      0x69056826      0x6E642013
+  *
+  *  PXA930    B0      0x69056835      0x5E643013
+  *  PXA930    B1      0x69056837      0x7E643013
+  *  PXA930    B2      0x69056838      0x8E643013
+  */
  #ifdef CONFIG_PXA25x
- #define __cpu_is_pxa21x(id)                           \
+ #define __cpu_is_pxa210(id)                           \
        ({                                              \
-               unsigned int _id = (id) >> 4 & 0xf3f;   \
-               _id == 0x212;                           \
+               unsigned int _id = (id) & 0xf3f0;       \
+               _id == 0x2120;                          \
        })
  
- #define __cpu_is_pxa255(id)                             \
-       ({                                              \
-               unsigned int _id = (id) >> 4 & 0xfff;   \
-               _id == 0x2d0;                           \
-        })
+ #define __cpu_is_pxa250(id)                           \
+       ({                                              \
+               unsigned int _id = (id) & 0xf3ff;       \
+               _id <= 0x2105;                          \
+       })
+ 
+ #define __cpu_is_pxa255(id)                           \
+       ({                                              \
+               unsigned int _id = (id) & 0xffff;       \
+               _id == 0x2d06;                          \
+       })
  
  #define __cpu_is_pxa25x(id)                           \
        ({                                              \

diff --cc arch/arm/mach-pxa/spitz.c
index 7e181afcca3935cf19682923b2b2710e2b46f5bb,7ef346182371b88355b1a11fb0a2d436754e45fd..9b4f24c7c055de37a2eedf97c2289e60a015f5a3
--- 1/arch/arm/mach-pxa/spitz.c
--- 2/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@@ -22,7 -24,11 +24,12 @@@
  #include <linux/mmc/host.h>
  #include <linux/pm.h>
  #include <linux/backlight.h>
 +#include <linux/io.h>
+ #include <linux/i2c.h>
+ #include <linux/i2c/pca953x.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
+ #include <linux/spi/corgi_lcd.h>
  
  #include <asm/setup.h>
  #include <asm/memory.h>

diff --cc arch/arm/mach-s3c2410/bast-irq.c
Simple merge

diff --cc arch/arm/mach-s3c2412/irq.c
Simple merge

diff --cc arch/arm/mach-s3c2440/irq.c
Simple merge

diff --cc arch/arm/mach-s3c2443/irq.c
Simple merge

diff --cc arch/arm/mach-versatile/core.c
Simple merge

diff --cc arch/arm/plat-omap/gpio.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/irq.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/s3c244x-irq.c
Simple merge