Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

Conflicts:

	arch/arm/mach-pxa/pxa25x.c

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/mach-pxa/Kconfig
index 740f0a382bac696117051c5350162a0701f25097,8627e718a6135f53c443bd88ec2304f5452b4f4b..6755c7d6bb31ed3ac17522bac308d6d9e8f5eeb2
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -396,9 -400,14 +402,15 @@@ config PXA27
        help
          Select code specific to PXA27x variants
  
+ config CPU_PXA26x
+       bool
+       select PXA25x
+       help
+         Select code specific to PXA26x (codename Dalhart)
+ 
  config PXA3xx
        bool
 +      select CPU_XSC3
        help
          Select code specific to PXA3xx variants
  

diff --cc arch/arm/mach-pxa/clock.c
index a3e0e1989a6b55dd0873a6c9a61f55516b322173,9fcba78ad5840bd7ed157ccba52ae78b4315a5be..40b77408451488cc11f1408ab8c768f92980a16b
--- 1/arch/arm/mach-pxa/clock.c
--- 2/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
@@@ -12,9 -12,7 +12,8 @@@
  #include <linux/platform_device.h>
  #include <linux/delay.h>
  
 +#include <asm/clkdev.h>
  #include <mach/pxa2xx-regs.h>
- #include <mach/pxa2xx-gpio.h>
  #include <mach/hardware.h>
  
  #include "devices.h"

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

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

diff --cc arch/arm/mach-pxa/pxa25x.c
index 344b3282caf93ed7872d2c75841d279991daa201,265b8a5657b7e1454c367283c38dcb65689cb5a5..6c57522e24692c0b2327bf9f63a858077a172e65
--- 1/arch/arm/mach-pxa/pxa25x.c
--- 2/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@@ -371,8 -358,8 +373,8 @@@ static int __init pxa25x_init(void
        }
  
        /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
-       if (cpu_is_pxa255() || cpu_is_pxa26x()) {
+       if (cpu_is_pxa255()) {
 -              clks_register(&pxa25x_hwuart_clk, 1);
 +              clks_register(&pxa25x_hwuart_clkreg, 1);
                ret = platform_device_register(&pxa_device_hwuart);
        }
  

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

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

diff --cc drivers/media/video/pxa_camera.c
Simple merge

diff --cc drivers/mtd/nand/pxa3xx_nand.c
Simple merge

diff --cc drivers/net/irda/pxaficp_ir.c
index 37424f01ebee4a06913547a187e5642905dba811,ba445133f3eb0ad9cff1a3d5cbc20d6e2819fc2c..0e081292f4f7eb29d721776b6d089f66168d12a0
--- 1/drivers/net/irda/pxaficp_ir.c
--- 2/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@@ -22,10 -22,52 +22,53 @@@
  #include <net/irda/wrapper.h>
  #include <net/irda/irda_device.h>
  
 -#include <asm/dma.h>
 +#include <mach/dma.h>
  #include <mach/irda.h>
 +#include <mach/hardware.h>
  #include <mach/pxa-regs.h>
+ #include <mach/regs-uart.h>
+ 
+ #define FICP          __REG(0x40800000)  /* Start of FICP area */
+ #define ICCR0         __REG(0x40800000)  /* ICP Control Register 0 */
+ #define ICCR1         __REG(0x40800004)  /* ICP Control Register 1 */
+ #define ICCR2         __REG(0x40800008)  /* ICP Control Register 2 */
+ #define ICDR          __REG(0x4080000c)  /* ICP Data Register */
+ #define ICSR0         __REG(0x40800014)  /* ICP Status Register 0 */
+ #define ICSR1         __REG(0x40800018)  /* ICP Status Register 1 */
+ 
+ #define ICCR0_AME     (1 << 7)        /* Address match enable */
+ #define ICCR0_TIE     (1 << 6)        /* Transmit FIFO interrupt enable */
+ #define ICCR0_RIE     (1 << 5)        /* Recieve FIFO interrupt enable */
+ #define ICCR0_RXE     (1 << 4)        /* Receive enable */
+ #define ICCR0_TXE     (1 << 3)        /* Transmit enable */
+ #define ICCR0_TUS     (1 << 2)        /* Transmit FIFO underrun select */
+ #define ICCR0_LBM     (1 << 1)        /* Loopback mode */
+ #define ICCR0_ITR     (1 << 0)        /* IrDA transmission */
+ 
+ #define ICCR2_RXP       (1 << 3)      /* Receive Pin Polarity select */
+ #define ICCR2_TXP       (1 << 2)      /* Transmit Pin Polarity select */
+ #define ICCR2_TRIG    (3 << 0)        /* Receive FIFO Trigger threshold */
+ #define ICCR2_TRIG_8    (0 << 0)      /*      >= 8 bytes */
+ #define ICCR2_TRIG_16   (1 << 0)      /*      >= 16 bytes */
+ #define ICCR2_TRIG_32   (2 << 0)      /*      >= 32 bytes */
+ 
+ #ifdef CONFIG_PXA27x
+ #define ICSR0_EOC     (1 << 6)        /* DMA End of Descriptor Chain */
+ #endif
+ #define ICSR0_FRE     (1 << 5)        /* Framing error */
+ #define ICSR0_RFS     (1 << 4)        /* Receive FIFO service request */
+ #define ICSR0_TFS     (1 << 3)        /* Transnit FIFO service request */
+ #define ICSR0_RAB     (1 << 2)        /* Receiver abort */
+ #define ICSR0_TUR     (1 << 1)        /* Trunsmit FIFO underun */
+ #define ICSR0_EIF     (1 << 0)        /* End/Error in FIFO */
+ 
+ #define ICSR1_ROR     (1 << 6)        /* Receiver FIFO underrun  */
+ #define ICSR1_CRE     (1 << 5)        /* CRC error */
+ #define ICSR1_EOF     (1 << 4)        /* End of frame */
+ #define ICSR1_TNF     (1 << 3)        /* Transmit FIFO not full */
+ #define ICSR1_RNE     (1 << 2)        /* Receive FIFO not empty */
+ #define ICSR1_TBY     (1 << 1)        /* Tramsmiter busy flag */
+ #define ICSR1_RSY     (1 << 0)        /* Recevier synchronized flag */
  
  #define IrSR_RXPL_NEG_IS_ZERO (1<<4)
  #define IrSR_RXPL_POS_IS_ZERO 0x0

diff --cc drivers/serial/pxa.c
Simple merge

diff --cc drivers/video/pxafb.c
Simple merge