92 files changed, 4233 insertions, 2470 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 89c992b8f75b..d89c6adbe8bc 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -2,29 +2,105 @@ if ARCH_PXA
 menu "Intel PXA2xx/PXA3xx Implementations"
-if PXA3xx
+comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
-menu "Supported PXA3xx Processor Variants"
+config ARCH_LUBBOCK
+        bool "Intel DBPXA250 Development Platform (aka Lubbock)"
+        select PXA25x
+        select SA1111
+        select PXA_HAVE_BOARD_IRQS
-config CPU_PXA300
+config MACH_MAINSTONE
-        bool "PXA300 (codename Monahans-L)"
+        bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
+        select PXA27x
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
-config CPU_PXA310
+config MACH_ZYLONITE
-        bool "PXA310 (codename Monahans-LV)"
+        bool
+        select PXA3xx
+        select PXA_SSP
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
+config MACH_ZYLONITE300
+        bool "PXA3xx Development Platform (aka Zylonite) PXA300/310"
        select CPU_PXA300
+        select CPU_PXA310
+        select MACH_ZYLONITE
-config CPU_PXA320
+config MACH_ZYLONITE320
-        bool "PXA320 (codename Monahans-P)"
+        bool "PXA3xx Development Platform (aka Zylonite) PXA320"
+        select CPU_PXA320
+        select MACH_ZYLONITE
-config CPU_PXA930
+config MACH_LITTLETON
-        bool "PXA930 (codename Tavor-P)"
+        bool "PXA3xx Form Factor Platform (aka Littleton)"
+        select PXA3xx
+        select PXA_SSP
-config CPU_PXA935
+config MACH_TAVOREVB
-        bool "PXA935 (codename Tavor-P65)"
+        bool "PXA930 Evaluation Board (aka TavorEVB)"
+        select PXA3xx
+        select CPU_PXA930
-endmenu
+config MACH_SAAR
+        bool "PXA930 Handheld Platform (aka SAAR)"
+        select PXA3xx
+        select CPU_PXA930
-endif
+comment "Third Party Dev Platforms (sorted by vendor name)"
+config ARCH_PXA_IDP
+        bool "Accelent Xscale IDP"
+        select PXA25x
+config ARCH_VIPER
+        bool "Arcom/Eurotech VIPER SBC"
+        select PXA25x
+        select ISA
+        select I2C_GPIO
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
+        select PXA_HAVE_ISA_IRQS
+config MACH_BALLOON3
+        bool "Balloon 3 board"
+        select PXA27x
+        select IWMMXT
+        select PXA_HAVE_BOARD_IRQS
+config MACH_CSB726
+        bool "Enable Cogent CSB726 System On a Module"
+        select PXA27x
+        select IWMMXT
+        help
+          Say Y here if you intend to run this kernel on a Cogent
+          CSB726 System On Module.
+config CSB726_CSB701
+        bool "Enable support for CSB701 baseboard"
+        depends on MACH_CSB726
+config MACH_ARMCORE
+        bool "CompuLab CM-X255/CM-X270 modules"
+        select PXA27x
+        select IWMMXT
+        select PXA25x
+        select PXA_SSP
+config MACH_EM_X270
+        bool "CompuLab EM-x270 platform"
+        select PXA27x
+config MACH_EXEDA
+        bool "CompuLab eXeda platform"
+        select PXA27x
+config MACH_CM_X300
+        bool "CompuLab CM-X300 modules"
+        select PXA3xx
+        select CPU_PXA300
 config ARCH_GUMSTIX
        bool "Gumstix XScale 255 boards"
@@ -57,179 +133,24 @@ config MACH_STARGATE2
        select IWMMXT
        select PXA_HAVE_BOARD_IRQS
-config ARCH_LUBBOCK
+config MACH_XCEP
-        bool "Intel DBPXA250 Development Platform"
+        bool "Iskratel Electronics XCEP"
-        select PXA25x
-        select SA1111
-        select PXA_HAVE_BOARD_IRQS
-config MACH_LOGICPD_PXA270
-        bool "LogicPD PXA270 Card Engine Development Platform"
-        select PXA27x
-        select HAVE_PWM
-        select PXA_HAVE_BOARD_IRQS
-config MACH_MAINSTONE
-        bool "Intel HCDDBBVA0 Development Platform"
-        select PXA27x
-        select HAVE_PWM
-        select PXA_HAVE_BOARD_IRQS
-config MACH_MP900C
-        bool "Nec Mobilepro 900/c"
-        select PXA25x
-config ARCH_PXA_IDP
-        bool "Accelent Xscale IDP"
-        select PXA25x
-config PXA_SHARPSL
-        bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
-        select SHARP_SCOOP
-        select SHARP_PARAM
-        help
-          Say Y here if you intend to run this kernel on a
-          Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
-          SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita),
-          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
-          handheld computer.
-config SHARPSL_PM
-        bool
-        select APM_EMULATION
-config CORGI_SSP_DEPRECATED
-        bool
-        select PXA_SSP
-        help
-          This option will include corgi_ssp.c and corgi_lcd.c
-          that corgi_ts.c and other legacy drivers (corgi_bl.c
-          and sharpsl_pm.c) may depend on.
-config MACH_POODLE
-        bool "Enable Sharp SL-5600 (Poodle) Support"
-        depends on PXA_SHARPSL
        select PXA25x
-        select SHARP_LOCOMO
+        select MTD
+        select MTD_PARTITIONS
+        select MTD_PHYSMAP
+        select MTD_CFI_INTELEXT
+        select MTD_CFI
+        select MTD_CHAR
+        select SMC91X
        select PXA_SSP
-config MACH_CORGI
-        bool "Enable Sharp SL-C700 (Corgi) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_SHARP_C7xx
-config MACH_SHEPHERD
-        bool "Enable Sharp SL-C750 (Shepherd) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_SHARP_C7xx
-config MACH_HUSKY
-        bool "Enable Sharp SL-C760 (Husky) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_SHARP_C7xx
-config MACH_AKITA
-        bool "Enable Sharp SL-1000 (Akita) Support"
-        depends on PXA_SHARPSL
-        select PXA27x
-        select PXA_SHARP_Cxx00
-        select MACH_SPITZ
-        select I2C
-        select I2C_PXA
-config MACH_SPITZ
-        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-        depends on PXA_SHARPSL
-        select PXA27x
-        select PXA_SHARP_Cxx00
-config MACH_BORZOI
-        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-        depends on PXA_SHARPSL
-        select PXA27x
-        select PXA_SHARP_Cxx00
-config MACH_TOSA
-        bool "Enable Sharp SL-6000x (Tosa) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_HAVE_BOARD_IRQS
-config ARCH_VIPER
-        bool "Arcom/Eurotech VIPER SBC"
-        select PXA25x
-        select ISA
-        select I2C_GPIO
-        select HAVE_PWM
-        select PXA_HAVE_BOARD_IRQS
-        select PXA_HAVE_ISA_IRQS
-config ARCH_PXA_ESERIES
-        bool "PXA based Toshiba e-series PDAs"
-        select PXA25x
-        select PXA_HAVE_BOARD_IRQS
-config MACH_E330
-        bool "Toshiba e330"
-        default y
-        depends on ARCH_PXA_ESERIES
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e330 family PDA.
-config MACH_E350
-        bool "Toshiba e350"
-        default y
-        depends on ARCH_PXA_ESERIES
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e350 family PDA.
-config MACH_E740
-        bool "Toshiba e740"
-        default y
-        depends on ARCH_PXA_ESERIES
-        select FB_W100
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e740 family PDA.
-config MACH_E750
-        bool "Toshiba e750"
-        default y
-        depends on ARCH_PXA_ESERIES
-        select FB_W100
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e750 family PDA.
-config MACH_E400
-        bool "Toshiba e400"
-        default y
-        depends on ARCH_PXA_ESERIES
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e400 family PDA.
-config MACH_E800
-        bool "Toshiba e800"
-        default y
-        depends on ARCH_PXA_ESERIES
-        select FB_W100
        help
-          Say Y here if you intend to run this kernel on a Toshiba
+          PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
-          e800 family PDA.
+          Tuned for usage in Libera instruments for particle accelerators.
 config TRIZEPS_PXA
        bool "PXA based Keith und Koep Trizeps DIMM-Modules"
-config MACH_H5000
-        bool "HP iPAQ h5000"
-        select PXA25x
 config MACH_TRIZEPS4
        bool "Keith und Koep Trizeps4 DIMM-Module"
        depends on TRIZEPS_PXA
@@ -263,13 +184,38 @@ config TRIZEPS_PCMCIA
        help
          Enable PCMCIA support for Trizeps modules
-config MACH_EM_X270
+config MACH_LOGICPD_PXA270
-        bool "CompuLab EM-x270 platform"
+        bool "LogicPD PXA270 Card Engine Development Platform"
        select PXA27x
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
-config MACH_EXEDA
+config MACH_PCM027
-        bool "CompuLab eXeda platform"
+        bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
        select PXA27x
+        select IWMMXT
+        select PXA_SSP
+        select PXA_HAVE_BOARD_IRQS
+config MACH_PCM990_BASEBOARD
+        bool "PHYTEC PCM-990 development board"
+        select HAVE_PWM
+        depends on MACH_PCM027
+choice
+        prompt "display on pcm990"
+        depends on MACH_PCM990_BASEBOARD
+config PCM990_DISPLAY_SHARP
+        bool "sharp lq084v1dg21 stn display"
+config PCM990_DISPLAY_NEC
+        bool "nec nl6448bc20_18d tft display"
+config PCM990_DISPLAY_NONE
+        bool "no display"
+endchoice
 config MACH_COLIBRI
        bool "Toradex Colibri PXA270"
@@ -279,45 +225,15 @@ config MACH_COLIBRI300
        bool "Toradex Colibri PXA300/310"
        select PXA3xx
        select CPU_PXA300
+        select CPU_PXA310
+        select HAVE_PWM
 config MACH_COLIBRI320
        bool "Toradex Colibri PXA320"
        select PXA3xx
        select CPU_PXA320
-config MACH_ZYLONITE
+comment "End-user Products (sorted by vendor name)"
-        bool "PXA3xx Development Platform (aka Zylonite)"
-        select PXA3xx
-        select PXA_SSP
-        select HAVE_PWM
-        select PXA_HAVE_BOARD_IRQS
-config MACH_LITTLETON
-        bool "PXA3xx Form Factor Platform (aka Littleton)"
-        select PXA3xx
-        select PXA_SSP
-config MACH_TAVOREVB
-        bool "PXA930 Evaluation Board (aka TavorEVB)"
-        select PXA3xx
-        select CPU_PXA930
-config MACH_SAAR
-        bool "PXA930 Handheld Platform (aka SAAR)"
-        select PXA3xx
-        select CPU_PXA930
-config MACH_ARMCORE
-        bool "CompuLab CM-X255/CM-X270 modules"
-        select PXA27x
-        select IWMMXT
-        select PXA25x
-        select PXA_SSP
-config MACH_CM_X300
-        bool "CompuLab CM-X300 modules"
-        select PXA3xx
-        select CPU_PXA300
 config MACH_H4700
        bool "HP iPAQ hx4700"
@@ -327,6 +243,15 @@ config MACH_H4700
        select HAVE_PWM
        select PXA_HAVE_BOARD_IRQS
+config MACH_H5000
+        bool "HP iPAQ h5000"
+        select PXA25x
+config MACH_HIMALAYA
+        bool "HTC Himalaya Support"
+        select CPU_PXA26x
+        select FB_W100
 config MACH_MAGICIAN
        bool "Enable HTC Magician Support"
        select PXA27x
@@ -335,11 +260,6 @@ config MACH_MAGICIAN
        select HAVE_PWM
        select PXA_HAVE_BOARD_IRQS
-config MACH_HIMALAYA
-        bool "HTC Himalaya Support"
-        select CPU_PXA26x
-        select FB_W100
 config MACH_MIOA701
        bool "Mitac Mio A701 Support"
        select PXA27x
@@ -351,13 +271,47 @@ config MACH_MIOA701
          MIO A701. Currently there is only basic support
          for this PDA.
-config MACH_PCM027
+config PXA_EZX
-        bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
+        bool "Motorola EZX Platform"
        select PXA27x
        select IWMMXT
-        select PXA_SSP
+        select HAVE_PWM
        select PXA_HAVE_BOARD_IRQS
+config MACH_EZX_A780
+        bool "Motorola EZX A780"
+        default y
+        depends on PXA_EZX
+config MACH_EZX_E680
+        bool "Motorola EZX E680"
+        default y
+        depends on PXA_EZX
+config MACH_EZX_A1200
+        bool "Motorola EZX A1200"
+        default y
+        depends on PXA_EZX
+config MACH_EZX_A910
+        bool "Motorola EZX A910"
+        default y
+        depends on PXA_EZX
+config MACH_EZX_E6
+        bool "Motorola EZX E6"
+        default y
+        depends on PXA_EZX
+config MACH_EZX_E2
+        bool "Motorola EZX E2"
+        default y
+        depends on PXA_EZX
+config MACH_MP900C
+        bool "Nec Mobilepro 900/c"
+        select PXA25x
 config ARCH_PXA_PALM
        bool "PXA based Palm PDAs"
        select HAVE_PWM
@@ -371,6 +325,15 @@ config MACH_PALMTE2
          Say Y here if you intend to run this kernel on a Palm Tungsten|E2
          handheld computer.
+config MACH_PALMTC
+        bool "Palm Tungsten|C"
+        default y
+        depends on ARCH_PXA_PALM
+        select PXA25x
+        help
+          Say Y here if you intend to run this kernel on a Palm Tungsten|C
+          handheld computer.
 config MACH_PALMT5
        bool "Palm Tungsten|T5"
        default y
@@ -401,93 +364,172 @@ config MACH_PALMZ72
          Say Y here if you intend to run this kernel on Palm Zire 72
          handheld computer.
-config MACH_TREO680
+config MACH_PALMLD
-        bool "Palm Treo 680"
+        bool "Palm LifeDrive"
        default y
        depends on ARCH_PXA_PALM
        select PXA27x
        select IWMMXT
        help
-          Say Y here if you intend to run this kernel on Palm Treo 680
+          Say Y here if you intend to run this kernel on a Palm LifeDrive
+          handheld computer.
+config PALM_TREO
+        bool
+        depends on ARCH_PXA_PALM
+config MACH_CENTRO
+        bool "Palm Centro 685 (GSM)"
+        default y
+        depends on ARCH_PXA_PALM
+        select PXA27x
+        select IWMMXT
+        select PALM_TREO
+        help
+          Say Y here if you intend to run this kernel on Palm Centro 685 (GSM)
          smartphone.
-config MACH_PALMLD
+config MACH_TREO680
-        bool "Palm LifeDrive"
+        bool "Palm Treo 680"
        default y
        depends on ARCH_PXA_PALM
        select PXA27x
        select IWMMXT
+        select PALM_TREO
        help
-          Say Y here if you intend to run this kernel on a Palm LifeDrive
+          Say Y here if you intend to run this kernel on Palm Treo 680
+          smartphone.
+config PXA_SHARPSL
+        bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
+        select SHARP_SCOOP
+        select SHARP_PARAM
+        help
+          Say Y here if you intend to run this kernel on a
+          Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
+          SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita),
+          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
-config MACH_PCM990_BASEBOARD
+config SHARPSL_PM
-        bool "PHYTEC PCM-990 development board"
+        bool
-        select HAVE_PWM
+        select APM_EMULATION
-        depends on MACH_PCM027
-choice
+config CORGI_SSP_DEPRECATED
-        prompt "display on pcm990"
+        bool
-        depends on MACH_PCM990_BASEBOARD
+        select PXA_SSP
+        help
+          This option will include corgi_ssp.c and corgi_lcd.c
+          that corgi_ts.c and other legacy drivers (corgi_bl.c
+          and sharpsl_pm.c) may depend on.
-config PCM990_DISPLAY_SHARP
+config MACH_POODLE
-        bool "sharp lq084v1dg21 stn display"
+        bool "Enable Sharp SL-5600 (Poodle) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select SHARP_LOCOMO
+        select PXA_SSP
-config PCM990_DISPLAY_NEC
+config MACH_CORGI
-        bool "nec nl6448bc20_18d tft display"
+        bool "Enable Sharp SL-C700 (Corgi) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
-config PCM990_DISPLAY_NONE
+config MACH_SHEPHERD
-        bool "no display"
+        bool "Enable Sharp SL-C750 (Shepherd) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
-endchoice
+config MACH_HUSKY
+        bool "Enable Sharp SL-C760 (Husky) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
-config MACH_CSB726
+config MACH_AKITA
-        bool "Enable Cogent CSB726 System On a Module"
+        bool "Enable Sharp SL-1000 (Akita) Support"
+        depends on PXA_SHARPSL
        select PXA27x
-        select IWMMXT
+        select PXA_SHARP_Cxx00
-        help
+        select MACH_SPITZ
-          Say Y here if you intend to run this kernel on a Cogent
+        select I2C
-          CSB726 System On Module.
+        select I2C_PXA
-config CSB726_CSB701
+config MACH_SPITZ
-        bool "Enable supprot for CSB701 baseboard"
+        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-        depends on MACH_CSB726
+        depends on PXA_SHARPSL
+        select PXA27x
+        select PXA_SHARP_Cxx00
-config PXA_EZX
+config MACH_BORZOI
-        bool "Motorola EZX Platform"
+        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
+        depends on PXA_SHARPSL
        select PXA27x
-        select IWMMXT
+        select PXA_SHARP_Cxx00
-        select HAVE_PWM
-config MACH_EZX_A780
+config MACH_TOSA
-        bool "Motorola EZX A780"
+        bool "Enable Sharp SL-6000x (Tosa) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_HAVE_BOARD_IRQS
+config ARCH_PXA_ESERIES
+        bool "PXA based Toshiba e-series PDAs"
+        select PXA25x
+        select PXA_HAVE_BOARD_IRQS
+config MACH_E330
+        bool "Toshiba e330"
        default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e330 family PDA.
-config MACH_EZX_E680
+config MACH_E350
-        bool "Motorola EZX E680"
+        bool "Toshiba e350"
        default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e350 family PDA.
-config MACH_EZX_A1200
+config MACH_E740
-        bool "Motorola EZX A1200"
+        bool "Toshiba e740"
        default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        select FB_W100
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e740 family PDA.
-config MACH_EZX_A910
+config MACH_E750
-        bool "Motorola EZX A910"
+        bool "Toshiba e750"
        default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        select FB_W100
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e750 family PDA.
-config MACH_EZX_E6
+config MACH_E400
-        bool "Motorola EZX E6"
+        bool "Toshiba e400"
        default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e400 family PDA.
-config MACH_EZX_E2
+config MACH_E800
-        bool "Motorola EZX E2"
+        bool "Toshiba e800"
        default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        select FB_W100
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e800 family PDA.
 endmenu
@@ -515,6 +557,42 @@ config PXA3xx
        help
          Select code specific to PXA3xx variants
+config CPU_PXA300
+        bool
+        select PXA3xx
+        help
+          PXA300 (codename Monahans-L)
+config CPU_PXA310
+        bool
+        select CPU_PXA300
+        help
+          PXA310 (codename Monahans-LV)
+config CPU_PXA320
+        bool
+        select PXA3xx
+        help
+          PXA320 (codename Monahans-P)
+config CPU_PXA930
+        bool
+        select PXA3xx
+        help
+          PXA930 (codename Tavor-P)
+config CPU_PXA935
+        bool
+        select CPU_PXA930
+        help
+          PXA935 (codename Tavor-P65)
+config CPU_PXA950
+        bool
+        select CPU_PXA930
+        help
+          PXA950 (codename Tavor-PV2)
 config PXA_SHARP_C7xx
        bool
        select PXA_SSP
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index d4c6122a342f..b5d29e60a341 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -24,32 +24,63 @@ obj-$(CONFIG_CPU_PXA300)	+= pxa300.o
 obj-$(CONFIG_CPU_PXA320)        += pxa320.o
 obj-$(CONFIG_CPU_PXA930)        += pxa930.o
-# Specific board support
+# NOTE: keep the order of boards in accordance to their order in Kconfig
-obj-$(CONFIG_ARCH_GUMSTIX)      += gumstix.o
-obj-$(CONFIG_GUMSTIX_AM200EPD)  += am200epd.o
+# Intel/Marvell Dev Platforms
-obj-$(CONFIG_GUMSTIX_AM300EPD)  += am300epd.o
 obj-$(CONFIG_ARCH_LUBBOCK)      += lubbock.o
-obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
 obj-$(CONFIG_MACH_MAINSTONE)    += mainstone.o
-obj-$(CONFIG_MACH_MP900C)       += mp900.o
+obj-$(CONFIG_MACH_ZYLONITE300)  += zylonite.o zylonite_pxa300.o
+obj-$(CONFIG_MACH_ZYLONITE320)  += zylonite.o zylonite_pxa320.o
+obj-$(CONFIG_MACH_LITTLETON)    += littleton.o
+obj-$(CONFIG_MACH_TAVOREVB)     += tavorevb.o
+obj-$(CONFIG_MACH_SAAR)         += saar.o
+# 3rd Party Dev Platforms
 obj-$(CONFIG_ARCH_PXA_IDP)      += idp.o
+obj-$(CONFIG_ARCH_VIPER)        += viper.o
+obj-$(CONFIG_MACH_BALLOON3)     += balloon3.o
+obj-$(CONFIG_MACH_CSB726)       += csb726.o
+obj-$(CONFIG_CSB726_CSB701)     += csb701.o
+obj-$(CONFIG_MACH_ARMCORE)      += cm-x2xx.o cm-x255.o cm-x270.o
+ifeq ($(CONFIG_PCI),y)
+obj-$(CONFIG_MACH_ARMCORE)      += cm-x2xx-pci.o
+endif
+obj-$(CONFIG_MACH_EM_X270)      += em-x270.o
+obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o
+obj-$(CONFIG_ARCH_GUMSTIX)      += gumstix.o
+obj-$(CONFIG_GUMSTIX_AM200EPD)  += am200epd.o
+obj-$(CONFIG_GUMSTIX_AM300EPD)  += am300epd.o
+obj-$(CONFIG_MACH_INTELMOTE2)   += imote2.o
+obj-$(CONFIG_MACH_STARGATE2)    += stargate2.o
+obj-$(CONFIG_MACH_XCEP)         += xcep.o
 obj-$(CONFIG_MACH_TRIZEPS4)     += trizeps4.o
+obj-$(CONFIG_MACH_LOGICPD_PXA270)       += lpd270.o
+obj-$(CONFIG_MACH_PCM027)               += pcm027.o
+obj-$(CONFIG_MACH_PCM990_BASEBOARD)     += pcm990-baseboard.o
 obj-$(CONFIG_MACH_COLIBRI)      += colibri-pxa270.o
 obj-$(CONFIG_MACH_COLIBRI300)   += colibri-pxa3xx.o colibri-pxa300.o
 obj-$(CONFIG_MACH_COLIBRI320)   += colibri-pxa3xx.o colibri-pxa320.o
+# End-user Products
+obj-$(CONFIG_MACH_H4700)        += hx4700.o
 obj-$(CONFIG_MACH_H5000)        += h5000.o
+obj-$(CONFIG_MACH_HIMALAYA)     += himalaya.o
+obj-$(CONFIG_MACH_MAGICIAN)     += magician.o
+obj-$(CONFIG_MACH_MIOA701)      += mioa701.o mioa701_bootresume.o
+obj-$(CONFIG_PXA_EZX)           += ezx.o
+obj-$(CONFIG_MACH_MP900C)       += mp900.o
+obj-$(CONFIG_MACH_PALMTE2)      += palmte2.o
+obj-$(CONFIG_MACH_PALMTC)       += palmtc.o
+obj-$(CONFIG_MACH_PALMT5)       += palmt5.o
+obj-$(CONFIG_MACH_PALMTX)       += palmtx.o
+obj-$(CONFIG_MACH_PALMZ72)      += palmz72.o
+obj-$(CONFIG_MACH_PALMLD)       += palmld.o
+obj-$(CONFIG_PALM_TREO)         += palmtreo.o
 obj-$(CONFIG_PXA_SHARP_C7xx)    += corgi.o sharpsl_pm.o corgi_pm.o
 obj-$(CONFIG_PXA_SHARP_Cxx00)   += spitz.o sharpsl_pm.o spitz_pm.o
 obj-$(CONFIG_CORGI_SSP_DEPRECATED)      += corgi_ssp.o corgi_lcd.o
 obj-$(CONFIG_MACH_POODLE)       += poodle.o
-obj-$(CONFIG_MACH_PCM027)       += pcm027.o
-obj-$(CONFIG_MACH_PCM990_BASEBOARD)     += pcm990-baseboard.o
 obj-$(CONFIG_MACH_TOSA)         += tosa.o
-obj-$(CONFIG_MACH_EM_X270)      += em-x270.o
-obj-$(CONFIG_MACH_H4700)        += hx4700.o
-obj-$(CONFIG_MACH_MAGICIAN)     += magician.o
-obj-$(CONFIG_MACH_HIMALAYA)     += himalaya.o
-obj-$(CONFIG_MACH_MIOA701)      += mioa701.o mioa701_bootresume.o
 obj-$(CONFIG_ARCH_PXA_ESERIES)  += eseries.o
 obj-$(CONFIG_MACH_E330)         += e330.o
 obj-$(CONFIG_MACH_E350)         += e350.o
@@ -57,31 +88,6 @@ obj-$(CONFIG_MACH_E740)		+= e740.o
 obj-$(CONFIG_MACH_E750)         += e750.o
 obj-$(CONFIG_MACH_E400)         += e400.o
 obj-$(CONFIG_MACH_E800)         += e800.o
-obj-$(CONFIG_MACH_PALMTE2)      += palmte2.o
-obj-$(CONFIG_MACH_PALMT5)       += palmt5.o
-obj-$(CONFIG_MACH_PALMTX)       += palmtx.o
-obj-$(CONFIG_MACH_PALMLD)       += palmld.o
-obj-$(CONFIG_MACH_PALMZ72)      += palmz72.o
-obj-$(CONFIG_MACH_TREO680)      += treo680.o
-obj-$(CONFIG_ARCH_VIPER)        += viper.o
-ifeq ($(CONFIG_MACH_ZYLONITE),y)
-  obj-y                         += zylonite.o
-  obj-$(CONFIG_CPU_PXA300)      += zylonite_pxa300.o
-  obj-$(CONFIG_CPU_PXA320)      += zylonite_pxa320.o
-endif
-obj-$(CONFIG_MACH_LITTLETON)    += littleton.o
-obj-$(CONFIG_MACH_TAVOREVB)     += tavorevb.o
-obj-$(CONFIG_MACH_SAAR)         += saar.o
-obj-$(CONFIG_MACH_ARMCORE)      += cm-x2xx.o cm-x255.o cm-x270.o
-obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o
-obj-$(CONFIG_PXA_EZX)           += ezx.o
-obj-$(CONFIG_MACH_INTELMOTE2)   += imote2.o
-obj-$(CONFIG_MACH_STARGATE2)    += stargate2.o
-obj-$(CONFIG_MACH_CSB726)       += csb726.o
-obj-$(CONFIG_CSB726_CSB701)     += csb701.o
 # Support for blinky lights
 led-y := leds.o
@@ -91,8 +97,4 @@ led-$(CONFIG_ARCH_PXA_IDP)	+= leds-idp.o
 obj-$(CONFIG_LEDS)              += $(led-y)
-ifeq ($(CONFIG_PCI),y)
-obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o
-endif
 obj-$(CONFIG_TOSA_BT)           += tosa-bt.o
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
new file mode 100644
index 000000000000..b8cd07ca9380
--- /dev/null
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -0,0 +1,365 @@
+/*
+ *  linux/arch/arm/mach-pxa/balloon3.c
+ *
+ *  Support for Balloonboard.org Balloon3 board.
+ *
+ *  Author:     Nick Bane, Wookey, Jonathan McDowell
+ *  Created:    June, 2006
+ *  Copyright:  Toby Churchill Ltd
+ *  Derived from mainstone.c, by Nico Pitre
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/sysdev.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+#include <linux/bitops.h>
+#include <linux/fb.h>
+#include <linux/gpio.h>
+#include <linux/ioport.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/types.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+#include <asm/sizes.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
+#include <mach/pxa27x.h>
+#include <mach/balloon3.h>
+#include <mach/audio.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
+#include <mach/udc.h>
+#include <mach/pxa27x-udc.h>
+#include <mach/irda.h>
+#include <mach/ohci.h>
+#include <plat/i2c.h>
+#include "generic.h"
+#include "devices.h"
+static unsigned long balloon3_irq_enabled;
+static unsigned long balloon3_features_present =
+                (1 << BALLOON3_FEATURE_OHCI) | (1 << BALLOON3_FEATURE_CF) |
+                (1 << BALLOON3_FEATURE_AUDIO) |
+                (1 << BALLOON3_FEATURE_TOPPOLY);
+int balloon3_has(enum balloon3_features feature)
+{
+        return (balloon3_features_present & (1 << feature)) ? 1 : 0;
+}
+EXPORT_SYMBOL_GPL(balloon3_has);
+int __init parse_balloon3_features(char *arg)
+{
+        if (!arg)
+                return 0;
+        return strict_strtoul(arg, 0, &balloon3_features_present);
+}
+early_param("balloon3_features", parse_balloon3_features);
+static void balloon3_mask_irq(unsigned int irq)
+{
+        int balloon3_irq = (irq - BALLOON3_IRQ(0));
+        balloon3_irq_enabled &= ~(1 << balloon3_irq);
+        __raw_writel(~balloon3_irq_enabled, BALLOON3_INT_CONTROL_REG);
+}
+static void balloon3_unmask_irq(unsigned int irq)
+{
+        int balloon3_irq = (irq - BALLOON3_IRQ(0));
+        balloon3_irq_enabled |= (1 << balloon3_irq);
+        __raw_writel(~balloon3_irq_enabled, BALLOON3_INT_CONTROL_REG);
+}
+static struct irq_chip balloon3_irq_chip = {
+        .name           = "FPGA",
+        .ack            = balloon3_mask_irq,
+        .mask           = balloon3_mask_irq,
+        .unmask         = balloon3_unmask_irq,
+};
+static void balloon3_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+        unsigned long pending = __raw_readl(BALLOON3_INT_CONTROL_REG) &
+                                        balloon3_irq_enabled;
+        do {
+                /* clear useless edge notification */
+                if (desc->chip->ack)
+                        desc->chip->ack(BALLOON3_AUX_NIRQ);
+                while (pending) {
+                        irq = BALLOON3_IRQ(0) + __ffs(pending);
+                        generic_handle_irq(irq);
+                        pending &= pending - 1;
+                }
+                pending = __raw_readl(BALLOON3_INT_CONTROL_REG) &
+                                balloon3_irq_enabled;
+        } while (pending);
+}
+static void __init balloon3_init_irq(void)
+{
+        int irq;
+        pxa27x_init_irq();
+        /* setup extra Balloon3 irqs */
+        for (irq = BALLOON3_IRQ(0); irq <= BALLOON3_IRQ(7); irq++) {
+                set_irq_chip(irq, &balloon3_irq_chip);
+                set_irq_handler(irq, handle_level_irq);
+                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+        }
+        set_irq_chained_handler(BALLOON3_AUX_NIRQ, balloon3_irq_handler);
+        set_irq_type(BALLOON3_AUX_NIRQ, IRQ_TYPE_EDGE_FALLING);
+        pr_debug("%s: chained handler installed - irq %d automatically "
+                "enabled\n", __func__, BALLOON3_AUX_NIRQ);
+}
+static void balloon3_backlight_power(int on)
+{
+        pr_debug("%s: power is %s\n", __func__, on ? "on" : "off");
+        gpio_set_value(BALLOON3_GPIO_RUN_BACKLIGHT, on);
+}
+static unsigned long balloon3_lcd_pin_config[] = {
+        /* LCD - 16bpp Active TFT */
+        GPIO58_LCD_LDD_0,
+        GPIO59_LCD_LDD_1,
+        GPIO60_LCD_LDD_2,
+        GPIO61_LCD_LDD_3,
+        GPIO62_LCD_LDD_4,
+        GPIO63_LCD_LDD_5,
+        GPIO64_LCD_LDD_6,
+        GPIO65_LCD_LDD_7,
+        GPIO66_LCD_LDD_8,
+        GPIO67_LCD_LDD_9,
+        GPIO68_LCD_LDD_10,
+        GPIO69_LCD_LDD_11,
+        GPIO70_LCD_LDD_12,
+        GPIO71_LCD_LDD_13,
+        GPIO72_LCD_LDD_14,
+        GPIO73_LCD_LDD_15,
+        GPIO74_LCD_FCLK,
+        GPIO75_LCD_LCLK,
+        GPIO76_LCD_PCLK,
+        GPIO77_LCD_BIAS,
+        GPIO99_GPIO,            /* Backlight */
+};
+static struct pxafb_mode_info balloon3_lcd_modes[] = {
+        {
+                .pixclock               = 38000,
+                .xres                   = 480,
+                .yres                   = 640,
+                .bpp                    = 16,
+                .hsync_len              = 8,
+                .left_margin            = 8,
+                .right_margin           = 8,
+                .vsync_len              = 2,
+                .upper_margin           = 4,
+                .lower_margin           = 5,
+                .sync                   = 0,
+        },
+};
+static struct pxafb_mach_info balloon3_pxafb_info = {
+        .modes                  = balloon3_lcd_modes,
+        .num_modes              = ARRAY_SIZE(balloon3_lcd_modes),
+        .lcd_conn               = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
+        .pxafb_backlight_power  = balloon3_backlight_power,
+};
+static unsigned long balloon3_mmc_pin_config[] = {
+        GPIO32_MMC_CLK,
+        GPIO92_MMC_DAT_0,
+        GPIO109_MMC_DAT_1,
+        GPIO110_MMC_DAT_2,
+        GPIO111_MMC_DAT_3,
+        GPIO112_MMC_CMD,
+};
+static void balloon3_mci_setpower(struct device *dev, unsigned int vdd)
+{
+        struct pxamci_platform_data *p_d = dev->platform_data;
+        if ((1 << vdd) & p_d->ocr_mask) {
+                pr_debug("%s: on\n", __func__);
+                /* FIXME something to prod here? */
+        } else {
+                pr_debug("%s: off\n", __func__);
+                /* FIXME something to prod here? */
+        }
+}
+static struct pxamci_platform_data balloon3_mci_platform_data = {
+        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .setpower       = balloon3_mci_setpower,
+};
+static int balloon3_udc_is_connected(void)
+{
+        pr_debug("%s: udc connected\n", __func__);
+        return 1;
+}
+static void balloon3_udc_command(int cmd)
+{
+        switch (cmd) {
+        case PXA2XX_UDC_CMD_CONNECT:
+                UP2OCR |= (UP2OCR_DPPUE + UP2OCR_DPPUBE);
+                pr_debug("%s: connect\n", __func__);
+                break;
+        case PXA2XX_UDC_CMD_DISCONNECT:
+                UP2OCR &= ~UP2OCR_DPPUE;
+                pr_debug("%s: disconnect\n", __func__);
+                break;
+        }
+}
+static struct pxa2xx_udc_mach_info balloon3_udc_info = {
+        .udc_is_connected = balloon3_udc_is_connected,
+        .udc_command      = balloon3_udc_command,
+};
+static struct pxaficp_platform_data balloon3_ficp_platform_data = {
+        .transceiver_cap  = IR_SIRMODE | IR_FIRMODE | IR_OFF,
+};
+static unsigned long balloon3_ohci_pin_config[] = {
+        GPIO88_USBH1_PWR,
+        GPIO89_USBH1_PEN,
+};
+static struct pxaohci_platform_data balloon3_ohci_platform_data = {
+        .port_mode      = PMM_PERPORT_MODE,
+        .flags          = ENABLE_PORT_ALL | POWER_CONTROL_LOW | POWER_SENSE_LOW,
+};
+static unsigned long balloon3_pin_config[] __initdata = {
+        /* Select BTUART 'COM1/ttyS0' as IO option for pins 42/43/44/45 */
+        GPIO42_BTUART_RXD,
+        GPIO43_BTUART_TXD,
+        GPIO44_BTUART_CTS,
+        GPIO45_BTUART_RTS,
+        /* Wakeup GPIO */
+        GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,
+        /* NAND & IDLE LED GPIOs */
+        GPIO9_GPIO,
+        GPIO10_GPIO,
+};
+static struct gpio_led balloon3_gpio_leds[] = {
+        {
+                .name                   = "balloon3:green:idle",
+                .default_trigger        = "heartbeat",
+                .gpio                   = BALLOON3_GPIO_LED_IDLE,
+                .active_low             = 1,
+        },
+        {
+                .name                   = "balloon3:green:nand",
+                .default_trigger        = "nand-disk",
+                .gpio                   = BALLOON3_GPIO_LED_NAND,
+                .active_low             = 1,
+        },
+};
+static struct gpio_led_platform_data balloon3_gpio_leds_platform_data = {
+        .leds           = balloon3_gpio_leds,
+        .num_leds       = ARRAY_SIZE(balloon3_gpio_leds),
+};
+static struct platform_device balloon3led_device = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &balloon3_gpio_leds_platform_data,
+        },
+};
+static void __init balloon3_init(void)
+{
+        pr_info("Initialising Balloon3\n");
+        /* system bus arbiter setting
+         * - Core_Park
+         * - LCD_wt:DMA_wt:CORE_Wt = 2:3:4
+         */
+        ARB_CNTRL = ARB_CORE_PARK | 0x234;
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+        pxa_set_i2c_info(NULL);
+        if (balloon3_has(BALLOON3_FEATURE_AUDIO))
+                pxa_set_ac97_info(NULL);
+        if (balloon3_has(BALLOON3_FEATURE_TOPPOLY)) {
+                pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_lcd_pin_config));
+                gpio_request(BALLOON3_GPIO_RUN_BACKLIGHT,
+                        "LCD Backlight Power");
+                gpio_direction_output(BALLOON3_GPIO_RUN_BACKLIGHT, 1);
+                set_pxa_fb_info(&balloon3_pxafb_info);
+        }
+        if (balloon3_has(BALLOON3_FEATURE_MMC)) {
+                pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_mmc_pin_config));
+                pxa_set_mci_info(&balloon3_mci_platform_data);
+        }
+        pxa_set_ficp_info(&balloon3_ficp_platform_data);
+        if (balloon3_has(BALLOON3_FEATURE_OHCI)) {
+                pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_ohci_pin_config));
+                pxa_set_ohci_info(&balloon3_ohci_platform_data);
+        }
+        pxa_set_udc_info(&balloon3_udc_info);
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(balloon3_pin_config));
+        platform_device_register(&balloon3led_device);
+}
+static struct map_desc balloon3_io_desc[] __initdata = {
+        {       /* CPLD/FPGA */
+                .virtual        =  BALLOON3_FPGA_VIRT,
+                .pfn            = __phys_to_pfn(BALLOON3_FPGA_PHYS),
+                .length         = BALLOON3_FPGA_LENGTH,
+                .type           = MT_DEVICE,
+        },
+};
+static void __init balloon3_map_io(void)
+{
+        pxa_map_io();
+        iotable_init(balloon3_io_desc, ARRAY_SIZE(balloon3_io_desc));
+}
+MACHINE_START(BALLOON3, "Balloon3")
+        /* Maintainer: Nick Bane. */
+        .phys_io        = 0x40000000,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = balloon3_map_io,
+        .init_irq       = balloon3_init_irq,
+        .timer          = &pxa_timer,
+        .init_machine   = balloon3_init,
+        .boot_params    = PHYS_OFFSET + 0x100,
+MACHINE_END
diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h
index 5599bceff738..978a3667e90d 100644
--- a/arch/arm/mach-pxa/clock.h
+++ b/arch/arm/mach-pxa/clock.h
@@ -12,7 +12,6 @@ struct clk {
        unsigned int            cken;
        unsigned int            delay;
        unsigned int            enabled;
-        struct clk              *other;
 };
 #define INIT_CLKREG(_clk,_devname,_conname)             \
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index 1d2cec25391d..eea78b6c2bc5 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -13,13 +13,18 @@
 #include <linux/sysdev.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
+#include <linux/delay.h>
 #include <linux/rtc-v3020.h>
 #include <video/mbxfb.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/libertas_spi.h>
 #include <mach/pxa27x.h>
 #include <mach/ohci.h>
 #include <mach/mmc.h>
+#include <mach/pxa2xx_spi.h>
 #include "generic.h"
@@ -34,6 +39,10 @@
 /* MMC power enable */
 #define GPIO105_MMC_POWER       (105)
+/* WLAN GPIOS */
+#define GPIO19_WLAN_STRAP       (19)
+#define GPIO102_WLAN_RST        (102)
 static unsigned long cmx270_pin_config[] = {
        /* AC'97 */
        GPIO28_AC97_BITCLK,
@@ -94,8 +103,8 @@ static unsigned long cmx270_pin_config[] = {
        GPIO26_SSP1_RXD,
        /* SSP2 */
-        GPIO19_SSP2_SCLK,
+        GPIO19_GPIO,    /* SSP2 clock is used as GPIO for Libertas pin-strap */
-        GPIO14_SSP2_SFRM,
+        GPIO14_GPIO,
        GPIO87_SSP2_TXD,
        GPIO88_SSP2_RXD,
@@ -123,6 +132,7 @@ static unsigned long cmx270_pin_config[] = {
        GPIO0_GPIO      | WAKEUP_ON_EDGE_BOTH,
        GPIO105_GPIO    | MFP_LPM_DRIVE_HIGH,   /* MMC/SD power */
        GPIO53_GPIO,                            /* PC card reset */
+        GPIO102_GPIO,                           /* WLAN reset */
        /* NAND controls */
        GPIO11_GPIO     | MFP_LPM_DRIVE_HIGH,   /* NAND CE# */
@@ -131,6 +141,7 @@ static unsigned long cmx270_pin_config[] = {
        /* interrupts */
        GPIO10_GPIO,    /* DM9000 interrupt */
        GPIO83_GPIO,    /* MMC card detect */
+        GPIO95_GPIO,    /* WLAN interrupt */
 };
 /* V3020 RTC */
@@ -271,64 +282,114 @@ static inline void cmx270_init_ohci(void) {}
 #endif
 #if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)
-static int cmx270_mci_init(struct device *dev,
+static struct pxamci_platform_data cmx270_mci_platform_data = {
-                           irq_handler_t cmx270_detect_int,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-                           void *data)
+        .gpio_card_detect       = GPIO83_MMC_IRQ,
+        .gpio_card_ro           = -1,
+        .gpio_power             = GPIO105_MMC_POWER,
+        .gpio_power_invert      = 1,
+};
+static void __init cmx270_init_mmc(void)
 {
-        int err;
+        pxa_set_mci_info(&cmx270_mci_platform_data);
+}
+#else
+static inline void cmx270_init_mmc(void) {}
+#endif
+#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)
+static struct pxa2xx_spi_master cm_x270_spi_info = {
+        .num_chipselect = 1,
+        .enable_dma     = 1,
+};
+static struct pxa2xx_spi_chip cm_x270_libertas_chip = {
+        .rx_threshold   = 1,
+        .tx_threshold   = 1,
+        .timeout        = 1000,
+        .gpio_cs        = 14,
+};
+static unsigned long cm_x270_libertas_pin_config[] = {
+        /* SSP2 */
+        GPIO19_SSP2_SCLK,
+        GPIO14_GPIO,
+        GPIO87_SSP2_TXD,
+        GPIO88_SSP2_RXD,
+};
-        err = gpio_request(GPIO105_MMC_POWER, "MMC/SD power");
+static int cm_x270_libertas_setup(struct spi_device *spi)
-        if (err) {
+{
-                dev_warn(dev, "power gpio unavailable\n");
+        int err = gpio_request(GPIO19_WLAN_STRAP, "WLAN STRAP");
+        if (err)
                return err;
-        }
-        gpio_direction_output(GPIO105_MMC_POWER, 0);
+        err = gpio_request(GPIO102_WLAN_RST, "WLAN RST");
+        if (err)
+                goto err_free_strap;
-        err = request_irq(CMX270_MMC_IRQ, cmx270_detect_int,
+        err = gpio_direction_output(GPIO102_WLAN_RST, 0);
-                          IRQF_DISABLED | IRQF_TRIGGER_FALLING,
+        if (err)
-                          "MMC card detect", data);
+                goto err_free_strap;
-        if (err) {
+        msleep(100);
-                gpio_free(GPIO105_MMC_POWER);
-                dev_err(dev, "cmx270_mci_init: MMC/SD: can't"
+        err = gpio_direction_output(GPIO19_WLAN_STRAP, 1);
-                        " request MMC card detect IRQ\n");
+        if (err)
-        }
+                goto err_free_strap;
+        msleep(100);
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(cm_x270_libertas_pin_config));
+        gpio_set_value(GPIO102_WLAN_RST, 1);
+        msleep(100);
+        spi->bits_per_word = 16;
+        spi_setup(spi);
+        return 0;
+err_free_strap:
+        gpio_free(GPIO19_WLAN_STRAP);
        return err;
 }
-static void cmx270_mci_setpower(struct device *dev, unsigned int vdd)
+static int cm_x270_libertas_teardown(struct spi_device *spi)
 {
-        struct pxamci_platform_data *p_d = dev->platform_data;
+        gpio_set_value(GPIO102_WLAN_RST, 0);
+        gpio_free(GPIO102_WLAN_RST);
-        if ((1 << vdd) & p_d->ocr_mask) {
+        gpio_free(GPIO19_WLAN_STRAP);
-                dev_dbg(dev, "power on\n");
-                gpio_set_value(GPIO105_MMC_POWER, 0);
-        } else {
-                gpio_set_value(GPIO105_MMC_POWER, 1);
-                dev_dbg(dev, "power off\n");
-        }
-}
-static void cmx270_mci_exit(struct device *dev, void *data)
+        return 0;
-{
-        free_irq(CMX270_MMC_IRQ, data);
-        gpio_free(GPIO105_MMC_POWER);
 }
-static struct pxamci_platform_data cmx270_mci_platform_data = {
+struct libertas_spi_platform_data cm_x270_libertas_pdata = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .use_dummy_writes       = 1,
-        .init           = cmx270_mci_init,
+        .setup                  = cm_x270_libertas_setup,
-        .setpower       = cmx270_mci_setpower,
+        .teardown               = cm_x270_libertas_teardown,
-        .exit           = cmx270_mci_exit,
 };
-static void __init cmx270_init_mmc(void)
+static struct spi_board_info cm_x270_spi_devices[] __initdata = {
+        {
+                .modalias               = "libertas_spi",
+                .max_speed_hz           = 13000000,
+                .bus_num                = 2,
+                .irq                    = gpio_to_irq(95),
+                .chip_select            = 0,
+                .controller_data        = &cm_x270_libertas_chip,
+                .platform_data          = &cm_x270_libertas_pdata,
+        },
+};
+static void __init cmx270_init_spi(void)
 {
-        pxa_set_mci_info(&cmx270_mci_platform_data);
+        pxa2xx_set_spi_info(2, &cm_x270_spi_info);
+        spi_register_board_info(ARRAY_AND_SIZE(cm_x270_spi_devices));
 }
 #else
-static inline void cmx270_init_mmc(void) {}
+static inline void cmx270_init_spi(void) {}
 #endif
 void __init cmx270_init(void)
@@ -343,4 +404,5 @@ void __init cmx270_init(void)
        cmx270_init_mmc();
        cmx270_init_ohci();
        cmx270_init_2700G();
+        cmx270_init_spi();
 }
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index b50ef39eabfc..bff6e78f033d 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -453,6 +453,10 @@ static inline void cmx2xx_init_ac97(void) {}
 static void __init cmx2xx_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        cmx2xx_pm_init();
        if (cpu_is_pxa25x())
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 465da26591bd..d37cfa132a65 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -3,9 +3,10 @@
 *
 * Support for the CompuLab CM-X300 modules
 *
- * Copyright (C) 2008 CompuLab Ltd.
+ * Copyright (C) 2008,2009 CompuLab Ltd.
 *
 * Mike Rapoport <mike@compulab.co.il>
+ * Igor Grinberg <grinberg@compulab.co.il>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
@@ -16,44 +17,55 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/dm9000.h>
 #include <linux/leds.h>
 #include <linux/rtc-v3020.h>
+#include <linux/pwm_backlight.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pca953x.h>
+#include <linux/mfd/da903x.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
+#include <linux/spi/tdo24m.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/setup.h>
 #include <mach/pxa300.h>
+#include <mach/pxa27x-udc.h>
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
 #include <mach/ohci.h>
 #include <plat/i2c.h>
-#include <mach/pxa3xx_nand.h>
+#include <plat/pxa3xx_nand.h>
+#include <mach/audio.h>
 #include <asm/mach/map.h>
 #include "generic.h"
+#include "devices.h"
 #define CM_X300_ETH_PHYS        0x08000010
-#define GPIO82_MMC2_IRQ         (82)
+#define GPIO82_MMC_IRQ          (82)
-#define GPIO85_MMC2_WP          (85)
+#define GPIO85_MMC_WP           (85)
-#define CM_X300_MMC2_IRQ        IRQ_GPIO(GPIO82_MMC2_IRQ)
+#define CM_X300_MMC_IRQ         IRQ_GPIO(GPIO82_MMC_IRQ)
 #define GPIO95_RTC_CS           (95)
 #define GPIO96_RTC_WR           (96)
 #define GPIO97_RTC_RD           (97)
 #define GPIO98_RTC_IO           (98)
-static mfp_cfg_t cm_x300_mfp_cfg[] __initdata = {
+static mfp_cfg_t cm_x3xx_mfp_cfg[] __initdata = {
        /* LCD */
        GPIO54_LCD_LDD_0,
        GPIO55_LCD_LDD_1,
@@ -137,7 +149,6 @@ static mfp_cfg_t cm_x300_mfp_cfg[] __initdata = {
        GPIO36_UART1_DTR,
        /* GPIOs */
-        GPIO79_GPIO,                    /* LED */
        GPIO82_GPIO | MFP_PULL_HIGH,    /* MMC CD */
        GPIO85_GPIO,                    /* MMC WP */
        GPIO99_GPIO,                    /* Ethernet IRQ */
@@ -151,6 +162,50 @@ static mfp_cfg_t cm_x300_mfp_cfg[] __initdata = {
        /* Standard I2C */
        GPIO21_I2C_SCL,
        GPIO22_I2C_SDA,
+        /* PWM Backlight */
+        GPIO19_PWM2_OUT,
+};
+static mfp_cfg_t cm_x3xx_rev_lt130_mfp_cfg[] __initdata = {
+        /* GPIOs */
+        GPIO79_GPIO,                    /* LED */
+        GPIO77_GPIO,                    /* WiFi reset */
+        GPIO78_GPIO,                    /* BT reset */
+};
+static mfp_cfg_t cm_x3xx_rev_ge130_mfp_cfg[] __initdata = {
+        /* GPIOs */
+        GPIO76_GPIO,                    /* LED */
+        GPIO71_GPIO,                    /* WiFi reset */
+        GPIO70_GPIO,                    /* BT reset */
+};
+static mfp_cfg_t cm_x310_mfp_cfg[] __initdata = {
+        /* USB PORT 2 */
+        ULPI_STP,
+        ULPI_NXT,
+        ULPI_DIR,
+        GPIO30_ULPI_DATA_OUT_0,
+        GPIO31_ULPI_DATA_OUT_1,
+        GPIO32_ULPI_DATA_OUT_2,
+        GPIO33_ULPI_DATA_OUT_3,
+        GPIO34_ULPI_DATA_OUT_4,
+        GPIO35_ULPI_DATA_OUT_5,
+        GPIO36_ULPI_DATA_OUT_6,
+        GPIO37_ULPI_DATA_OUT_7,
+        GPIO38_ULPI_CLK,
+        /* external PHY reset pin */
+        GPIO127_GPIO,
+        /* USB PORT 3 */
+        GPIO77_USB_P3_1,
+        GPIO78_USB_P3_2,
+        GPIO79_USB_P3_3,
+        GPIO80_USB_P3_4,
+        GPIO81_USB_P3_5,
+        GPIO82_USB_P3_6,
+        GPIO0_2_USBH_PEN,
 };
 #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
@@ -195,17 +250,18 @@ static void __init cm_x300_init_dm9000(void)
 static inline void cm_x300_init_dm9000(void) {}
 #endif
+/* LCD */
 #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
 static struct pxafb_mode_info cm_x300_lcd_modes[] = {
        [0] = {
-                .pixclock       = 38000,
+                .pixclock       = 38250,
                .bpp            = 16,
                .xres           = 480,
                .yres           = 640,
                .hsync_len      = 8,
                .vsync_len      = 2,
                .left_margin    = 8,
-                .upper_margin   = 0,
+                .upper_margin   = 2,
                .right_margin   = 24,
                .lower_margin   = 4,
                .cmap_greyscale = 0,
@@ -227,7 +283,7 @@ static struct pxafb_mode_info cm_x300_lcd_modes[] = {
 static struct pxafb_mach_info cm_x300_lcd = {
        .modes                  = cm_x300_lcd_modes,
-        .num_modes              = 2,
+        .num_modes              = ARRAY_SIZE(cm_x300_lcd_modes),
        .lcd_conn               = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
 };
@@ -239,6 +295,87 @@ static void __init cm_x300_init_lcd(void)
 static inline void cm_x300_init_lcd(void) {}
 #endif
+#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
+static struct platform_pwm_backlight_data cm_x300_backlight_data = {
+        .pwm_id         = 2,
+        .max_brightness = 100,
+        .dft_brightness = 100,
+        .pwm_period_ns  = 10000,
+};
+static struct platform_device cm_x300_backlight_device = {
+        .name           = "pwm-backlight",
+        .dev            = {
+                .parent = &pxa27x_device_pwm0.dev,
+                .platform_data  = &cm_x300_backlight_data,
+        },
+};
+static void cm_x300_init_bl(void)
+{
+        platform_device_register(&cm_x300_backlight_device);
+}
+#else
+static inline void cm_x300_init_bl(void) {}
+#endif
+#if defined(CONFIG_SPI_GPIO) || defined(CONFIG_SPI_GPIO_MODULE)
+#define GPIO_LCD_BASE   (144)
+#define GPIO_LCD_DIN    (GPIO_LCD_BASE + 8)     /* aux_gpio3_0 */
+#define GPIO_LCD_DOUT   (GPIO_LCD_BASE + 9)     /* aux_gpio3_1 */
+#define GPIO_LCD_SCL    (GPIO_LCD_BASE + 10)    /* aux_gpio3_2 */
+#define GPIO_LCD_CS     (GPIO_LCD_BASE + 11)    /* aux_gpio3_3 */
+#define LCD_SPI_BUS_NUM (1)
+static struct spi_gpio_platform_data cm_x300_spi_gpio_pdata = {
+        .sck            = GPIO_LCD_SCL,
+        .mosi           = GPIO_LCD_DIN,
+        .miso           = GPIO_LCD_DOUT,
+        .num_chipselect = 1,
+};
+static struct platform_device cm_x300_spi_gpio = {
+        .name           = "spi_gpio",
+        .id             = LCD_SPI_BUS_NUM,
+        .dev            = {
+                .platform_data  = &cm_x300_spi_gpio_pdata,
+        },
+};
+static struct tdo24m_platform_data cm_x300_tdo24m_pdata = {
+        .model = TDO35S,
+};
+static struct spi_board_info cm_x300_spi_devices[] __initdata = {
+        {
+                .modalias               = "tdo24m",
+                .max_speed_hz           = 1000000,
+                .bus_num                = LCD_SPI_BUS_NUM,
+                .chip_select            = 0,
+                .controller_data        = (void *) GPIO_LCD_CS,
+                .platform_data          = &cm_x300_tdo24m_pdata,
+        },
+};
+static void __init cm_x300_init_spi(void)
+{
+        spi_register_board_info(cm_x300_spi_devices,
+                                ARRAY_SIZE(cm_x300_spi_devices));
+        platform_device_register(&cm_x300_spi_gpio);
+}
+#else
+static inline void cm_x300_init_spi(void) {}
+#endif
+#if defined(CONFIG_SND_PXA2XX_LIB_AC97)
+static void __init cm_x300_init_ac97(void)
+{
+        pxa_set_ac97_info(NULL);
+}
+#else
+static inline void cm_x300_init_ac97(void) {}
+#endif
 #if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE)
 static struct mtd_partition cm_x300_nand_partitions[] = {
        [0] = {
@@ -292,82 +429,35 @@ static inline void cm_x300_init_nand(void) {}
 #endif
 #if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)
-/* The first MMC slot of CM-X300 is hardwired to Libertas card and has
-   no detection/ro pins */
-static int cm_x300_mci_init(struct device *dev,
-                            irq_handler_t cm_x300_detect_int,
-                            void *data)
-{
-        return 0;
-}
-static void cm_x300_mci_exit(struct device *dev, void *data)
-{
-}
 static struct pxamci_platform_data cm_x300_mci_platform_data = {
-        .detect_delay   = 20,
+        .detect_delay           = 20,
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = cm_x300_mci_init,
+        .gpio_card_detect       = GPIO82_MMC_IRQ,
-        .exit           = cm_x300_mci_exit,
+        .gpio_card_ro           = GPIO85_MMC_WP,
+        .gpio_power             = -1,
 };
-static int cm_x300_mci2_ro(struct device *dev)
+/* The second MMC slot of CM-X300 is hardwired to Libertas card and has
-{
+   no detection/ro pins */
-        return gpio_get_value(GPIO85_MMC2_WP);
-}
 static int cm_x300_mci2_init(struct device *dev,
                             irq_handler_t cm_x300_detect_int,
-                             void *data)
+        void *data)
 {
-        int err;
-        /*
-         * setup GPIO for CM-X300 MMC controller
-         */
-        err = gpio_request(GPIO82_MMC2_IRQ, "mmc card detect");
-        if (err)
-                goto err_request_cd;
-        gpio_direction_input(GPIO82_MMC2_IRQ);
-        err = gpio_request(GPIO85_MMC2_WP, "mmc write protect");
-        if (err)
-                goto err_request_wp;
-        gpio_direction_input(GPIO85_MMC2_WP);
-        err = request_irq(CM_X300_MMC2_IRQ, cm_x300_detect_int,
-                          IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-                          "MMC card detect", data);
-        if (err) {
-                printk(KERN_ERR "%s: MMC/SD/SDIO: "
-                                "can't request card detect IRQ\n", __func__);
-                goto err_request_irq;
-        }
        return 0;
-err_request_irq:
-        gpio_free(GPIO85_MMC2_WP);
-err_request_wp:
-        gpio_free(GPIO82_MMC2_IRQ);
-err_request_cd:
-        return err;
 }
 static void cm_x300_mci2_exit(struct device *dev, void *data)
 {
-        free_irq(CM_X300_MMC2_IRQ, data);
-        gpio_free(GPIO82_MMC2_IRQ);
-        gpio_free(GPIO85_MMC2_WP);
 }
 static struct pxamci_platform_data cm_x300_mci2_platform_data = {
-        .detect_delay   = 20,
+        .detect_delay           = 20,
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = cm_x300_mci2_init,
+        .init                   = cm_x300_mci2_init,
-        .exit           = cm_x300_mci2_exit,
+        .exit                   = cm_x300_mci2_exit,
-        .get_ro         = cm_x300_mci2_ro,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static void __init cm_x300_init_mmc(void)
@@ -380,9 +470,19 @@ static inline void cm_x300_init_mmc(void) {}
 #endif
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+static int cm_x300_ohci_init(struct device *dev)
+{
+        if (cpu_is_pxa300())
+                UP2OCR = UP2OCR_HXS
+                        | UP2OCR_HXOE | UP2OCR_DMPDE | UP2OCR_DPPDE;
+        return 0;
+}
 static struct pxaohci_platform_data cm_x300_ohci_platform_data = {
        .port_mode      = PMM_PERPORT_MODE,
-        .flags          = ENABLE_PORT1 | ENABLE_PORT2 | POWER_CONTROL_LOW,
+        .flags          = ENABLE_PORT_ALL | POWER_CONTROL_LOW,
+        .init           = cm_x300_ohci_init,
 };
 static void __init cm_x300_init_ohci(void)
@@ -398,7 +498,6 @@ static struct gpio_led cm_x300_leds[] = {
        [0] = {
                .name = "cm-x300:green",
                .default_trigger = "heartbeat",
-                .gpio = 79,
                .active_low = 1,
        },
 };
@@ -418,6 +517,11 @@ static struct platform_device cm_x300_led_device = {
 static void __init cm_x300_init_leds(void)
 {
+        if (system_rev < 130)
+                cm_x300_leds[0].gpio = 79;
+        else
+                cm_x300_leds[0].gpio = 76;
        platform_device_register(&cm_x300_led_device);
 }
 #else
@@ -480,11 +584,94 @@ static void __init cm_x300_init_rtc(void)
 static inline void cm_x300_init_rtc(void) {}
 #endif
-static void __init cm_x300_init(void)
+/* DA9030 */
+struct da903x_subdev_info cm_x300_da9030_subdevs[] = {
+        {
+                .name = "da903x-backlight",
+                .id = DA9030_ID_WLED,
+        }
+};
+static struct da903x_platform_data cm_x300_da9030_info = {
+        .num_subdevs = ARRAY_SIZE(cm_x300_da9030_subdevs),
+        .subdevs = cm_x300_da9030_subdevs,
+};
+static struct i2c_board_info cm_x300_pmic_info = {
+        I2C_BOARD_INFO("da9030", 0x49),
+        .irq = IRQ_GPIO(0),
+        .platform_data = &cm_x300_da9030_info,
+};
+static struct i2c_pxa_platform_data cm_x300_pwr_i2c_info = {
+        .use_pio = 1,
+};
+static void __init cm_x300_init_da9030(void)
+{
+        pxa3xx_set_i2c_power_info(&cm_x300_pwr_i2c_info);
+        i2c_register_board_info(1, &cm_x300_pmic_info, 1);
+}
+static void __init cm_x300_init_wi2wi(void)
+{
+        int bt_reset, wlan_en;
+        int err;
+        if (system_rev < 130) {
+                wlan_en = 77;
+                bt_reset = 78;
+        } else {
+                wlan_en = 71;
+                bt_reset = 70;
+        }
+        /* Libertas and CSR reset */
+        err = gpio_request(wlan_en, "wlan en");
+        if (err) {
+                pr_err("CM-X300: failed to request wlan en gpio: %d\n", err);
+        } else {
+                gpio_direction_output(wlan_en, 1);
+                gpio_free(wlan_en);
+        }
+        err = gpio_request(bt_reset, "bt reset");
+        if (err) {
+                pr_err("CM-X300: failed to request bt reset gpio: %d\n", err);
+        } else {
+                gpio_direction_output(bt_reset, 1);
+                udelay(10);
+                gpio_set_value(bt_reset, 0);
+                udelay(10);
+                gpio_set_value(bt_reset, 1);
+                gpio_free(bt_reset);
+        }
+}
+/* MFP */
+static void __init cm_x300_init_mfp(void)
 {
        /* board-processor specific GPIO initialization */
-        pxa3xx_mfp_config(ARRAY_AND_SIZE(cm_x300_mfp_cfg));
+        pxa3xx_mfp_config(ARRAY_AND_SIZE(cm_x3xx_mfp_cfg));
+        if (system_rev < 130)
+                pxa3xx_mfp_config(ARRAY_AND_SIZE(cm_x3xx_rev_lt130_mfp_cfg));
+        else
+                pxa3xx_mfp_config(ARRAY_AND_SIZE(cm_x3xx_rev_ge130_mfp_cfg));
+        if (cpu_is_pxa310())
+                pxa3xx_mfp_config(ARRAY_AND_SIZE(cm_x310_mfp_cfg));
+}
+static void __init cm_x300_init(void)
+{
+        cm_x300_init_mfp();
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+        cm_x300_init_da9030();
        cm_x300_init_dm9000();
        cm_x300_init_lcd();
        cm_x300_init_ohci();
@@ -492,7 +679,11 @@ static void __init cm_x300_init(void)
        cm_x300_init_nand();
        cm_x300_init_leds();
        cm_x300_init_i2c();
+        cm_x300_init_spi();
        cm_x300_init_rtc();
+        cm_x300_init_ac97();
+        cm_x300_init_wi2wi();
+        cm_x300_init_bl();
 }
 static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags,
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c
index 01bcfaae75bc..061c45316de8 100644
--- a/arch/arm/mach-pxa/colibri-pxa270.c
+++ b/arch/arm/mach-pxa/colibri-pxa270.c
@@ -130,6 +130,9 @@ static struct platform_device *colibri_pxa270_devices[] __initdata = {
 static void __init colibri_pxa270_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa270_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_add_devices(ARRAY_AND_SIZE(colibri_pxa270_devices));
 }
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c
index 7c9c34c19ae2..45c23fd6df31 100644
--- a/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/arch/arm/mach-pxa/colibri-pxa300.c
@@ -170,8 +170,13 @@ static inline void colibri_pxa310_init_ac97(void) {}
 void __init colibri_pxa300_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        colibri_pxa300_init_eth();
        colibri_pxa300_init_ohci();
+        colibri_pxa3xx_init_nand();
        colibri_pxa300_init_lcd();
        colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO));
        colibri_pxa310_init_ac97();
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c
index a18d37b3c5e6..ae835fad7d10 100644
--- a/arch/arm/mach-pxa/colibri-pxa320.c
+++ b/arch/arm/mach-pxa/colibri-pxa320.c
@@ -27,6 +27,7 @@
 #include <mach/colibri.h>
 #include <mach/pxafb.h>
 #include <mach/ohci.h>
+#include <mach/audio.h>
 #include "generic.h"
 #include "devices.h"
@@ -145,7 +146,8 @@ static void __init colibri_pxa320_init_lcd(void)
 static inline void colibri_pxa320_init_lcd(void) {}
 #endif
-#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE)
+#if     defined(CONFIG_SND_AC97_CODEC) || \
+        defined(CONFIG_SND_AC97_CODEC_MODULE)
 static mfp_cfg_t colibri_pxa320_ac97_pin_config[] __initdata = {
        GPIO34_AC97_SYSCLK,
        GPIO35_AC97_SDATA_IN_0,
@@ -164,15 +166,52 @@ static inline void __init colibri_pxa320_init_ac97(void)
 static inline void colibri_pxa320_init_ac97(void) {}
 #endif
+/*
+ * The following configuration is verified to work with the Toradex Orchid
+ * carrier board
+ */
+static mfp_cfg_t colibri_pxa320_uart_pin_config[] __initdata = {
+        /* UART 1 configuration (may be set by bootloader) */
+        GPIO99_UART1_CTS,
+        GPIO104_UART1_RTS,
+        GPIO97_UART1_RXD,
+        GPIO98_UART1_TXD,
+        GPIO101_UART1_DTR,
+        GPIO103_UART1_DSR,
+        GPIO100_UART1_DCD,
+        GPIO102_UART1_RI,
+        /* UART 2 configuration */
+        GPIO109_UART2_CTS,
+        GPIO112_UART2_RTS,
+        GPIO110_UART2_RXD,
+        GPIO111_UART2_TXD,
+        /* UART 3 configuration */
+        GPIO30_UART3_RXD,
+        GPIO31_UART3_TXD,
+};
+static void __init colibri_pxa320_init_uart(void)
+{
+        pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa320_uart_pin_config));
+}
 void __init colibri_pxa320_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        colibri_pxa320_init_eth();
        colibri_pxa320_init_ohci();
+        colibri_pxa3xx_init_nand();
        colibri_pxa320_init_lcd();
        colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO));
        colibri_pxa320_init_ac97();
        colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config),
                                mfp_to_gpio(MFP_PIN_GPIO28));
+        colibri_pxa320_init_uart();
 }
 MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c b/arch/arm/mach-pxa/colibri-pxa3xx.c
index ea34e34f8cd8..e6c0a2287eb8 100644
--- a/arch/arm/mach-pxa/colibri-pxa3xx.c
+++ b/arch/arm/mach-pxa/colibri-pxa3xx.c
@@ -25,6 +25,7 @@
 #include <mach/colibri.h>
 #include <mach/mmc.h>
 #include <mach/pxafb.h>
+#include <plat/pxa3xx_nand.h>
 #include "generic.h"
 #include "devices.h"
@@ -95,10 +96,13 @@ static void colibri_pxa3xx_mci_exit(struct device *dev, void *data)
 }
 static struct pxamci_platform_data colibri_pxa3xx_mci_platform_data = {
-        .detect_delay   = 20,
+        .detect_delay           = 20,
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .init           = colibri_pxa3xx_mci_init,
+        .init                   = colibri_pxa3xx_mci_init,
-        .exit           = colibri_pxa3xx_mci_exit,
+        .exit                   = colibri_pxa3xx_mci_exit,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 void __init colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin)
@@ -154,3 +158,43 @@ void __init colibri_pxa3xx_init_lcd(int bl_pin)
 }
 #endif
+#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE)
+static struct mtd_partition colibri_nand_partitions[] = {
+        {
+                .name        = "bootloader",
+                .offset      = 0,
+                .size        = SZ_512K,
+                .mask_flags  = MTD_WRITEABLE, /* force read-only */
+        },
+        {
+                .name        = "kernel",
+                .offset      = MTDPART_OFS_APPEND,
+                .size        = SZ_4M,
+                .mask_flags  = MTD_WRITEABLE, /* force read-only */
+        },
+        {
+                .name        = "reserved",
+                .offset      = MTDPART_OFS_APPEND,
+                .size        = SZ_1M,
+                .mask_flags  = MTD_WRITEABLE, /* force read-only */
+        },
+        {
+                .name        = "fs",
+                .offset      = MTDPART_OFS_APPEND,
+                .size        = MTDPART_SIZ_FULL,
+        },
+};
+static struct pxa3xx_nand_platform_data colibri_nand_info = {
+        .enable_arbiter = 1,
+        .keep_config    = 1,
+        .parts          = colibri_nand_partitions,
+        .nr_parts       = ARRAY_SIZE(colibri_nand_partitions),
+};
+void __init colibri_pxa3xx_init_nand(void)
+{
+        pxa3xx_set_nand_info(&colibri_nand_info);
+}
+#endif
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 5363e1aea3fb..74446cf8ae69 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -29,6 +29,7 @@
 #include <linux/spi/ads7846.h>
 #include <linux/spi/corgi_lcd.h>
 #include <linux/mtd/sharpsl.h>
+#include <linux/input/matrix_keypad.h>
 #include <video/w100fb.h>
 #include <asm/setup.h>
@@ -104,6 +105,28 @@ static unsigned long corgi_pin_config[] __initdata = {
        GPIO6_MMC_CLK,
        GPIO8_MMC_CS0,
+        /* GPIO Matrix Keypad */
+        GPIO66_GPIO,    /* column 0 */
+        GPIO67_GPIO,    /* column 1 */
+        GPIO68_GPIO,    /* column 2 */
+        GPIO69_GPIO,    /* column 3 */
+        GPIO70_GPIO,    /* column 4 */
+        GPIO71_GPIO,    /* column 5 */
+        GPIO72_GPIO,    /* column 6 */
+        GPIO73_GPIO,    /* column 7 */
+        GPIO74_GPIO,    /* column 8 */
+        GPIO75_GPIO,    /* column 9 */
+        GPIO76_GPIO,    /* column 10 */
+        GPIO77_GPIO,    /* column 11 */
+        GPIO58_GPIO,    /* row 0 */
+        GPIO59_GPIO,    /* row 1 */
+        GPIO60_GPIO,    /* row 2 */
+        GPIO61_GPIO,    /* row 3 */
+        GPIO62_GPIO,    /* row 4 */
+        GPIO63_GPIO,    /* row 5 */
+        GPIO64_GPIO,    /* row 6 */
+        GPIO65_GPIO,    /* row 7 */
        /* GPIO */
        GPIO9_GPIO,     /* CORGI_GPIO_nSD_DETECT */
        GPIO7_GPIO,     /* CORGI_GPIO_nSD_WP */
@@ -267,9 +290,115 @@ static struct platform_device corgifb_device = {
 /*
 * Corgi Keyboard Device
 */
+#define CORGI_KEY_CALENDER      KEY_F1
+#define CORGI_KEY_ADDRESS       KEY_F2
+#define CORGI_KEY_FN            KEY_F3
+#define CORGI_KEY_CANCEL        KEY_F4
+#define CORGI_KEY_OFF           KEY_SUSPEND
+#define CORGI_KEY_EXOK          KEY_F5
+#define CORGI_KEY_EXCANCEL      KEY_F6
+#define CORGI_KEY_EXJOGDOWN     KEY_F7
+#define CORGI_KEY_EXJOGUP       KEY_F8
+#define CORGI_KEY_JAP1          KEY_LEFTCTRL
+#define CORGI_KEY_JAP2          KEY_LEFTALT
+#define CORGI_KEY_MAIL          KEY_F10
+#define CORGI_KEY_OK            KEY_F11
+#define CORGI_KEY_MENU          KEY_F12
+static const uint32_t corgikbd_keymap[] = {
+        KEY(0, 1, KEY_1),
+        KEY(0, 2, KEY_3),
+        KEY(0, 3, KEY_5),
+        KEY(0, 4, KEY_6),
+        KEY(0, 5, KEY_7),
+        KEY(0, 6, KEY_9),
+        KEY(0, 7, KEY_0),
+        KEY(0, 8, KEY_BACKSPACE),
+        KEY(1, 1, KEY_2),
+        KEY(1, 2, KEY_4),
+        KEY(1, 3, KEY_R),
+        KEY(1, 4, KEY_Y),
+        KEY(1, 5, KEY_8),
+        KEY(1, 6, KEY_I),
+        KEY(1, 7, KEY_O),
+        KEY(1, 8, KEY_P),
+        KEY(2, 0, KEY_TAB),
+        KEY(2, 1, KEY_Q),
+        KEY(2, 2, KEY_E),
+        KEY(2, 3, KEY_T),
+        KEY(2, 4, KEY_G),
+        KEY(2, 5, KEY_U),
+        KEY(2, 6, KEY_J),
+        KEY(2, 7, KEY_K),
+        KEY(3, 0, CORGI_KEY_CALENDER),
+        KEY(3, 1, KEY_W),
+        KEY(3, 2, KEY_S),
+        KEY(3, 3, KEY_F),
+        KEY(3, 4, KEY_V),
+        KEY(3, 5, KEY_H),
+        KEY(3, 6, KEY_M),
+        KEY(3, 7, KEY_L),
+        KEY(3, 9, KEY_RIGHTSHIFT),
+        KEY(4, 0, CORGI_KEY_ADDRESS),
+        KEY(4, 1, KEY_A),
+        KEY(4, 2, KEY_D),
+        KEY(4, 3, KEY_C),
+        KEY(4, 4, KEY_B),
+        KEY(4, 5, KEY_N),
+        KEY(4, 6, KEY_DOT),
+        KEY(4, 8, KEY_ENTER),
+        KEY(4, 10, KEY_LEFTSHIFT),
+        KEY(5, 0, CORGI_KEY_MAIL),
+        KEY(5, 1, KEY_Z),
+        KEY(5, 2, KEY_X),
+        KEY(5, 3, KEY_MINUS),
+        KEY(5, 4, KEY_SPACE),
+        KEY(5, 5, KEY_COMMA),
+        KEY(5, 7, KEY_UP),
+        KEY(5, 11, CORGI_KEY_FN),
+        KEY(6, 0, KEY_SYSRQ),
+        KEY(6, 1, CORGI_KEY_JAP1),
+        KEY(6, 2, CORGI_KEY_JAP2),
+        KEY(6, 3, CORGI_KEY_CANCEL),
+        KEY(6, 4, CORGI_KEY_OK),
+        KEY(6, 5, CORGI_KEY_MENU),
+        KEY(6, 6, KEY_LEFT),
+        KEY(6, 7, KEY_DOWN),
+        KEY(6, 8, KEY_RIGHT),
+        KEY(7, 0, CORGI_KEY_OFF),
+        KEY(7, 1, CORGI_KEY_EXOK),
+        KEY(7, 2, CORGI_KEY_EXCANCEL),
+        KEY(7, 3, CORGI_KEY_EXJOGDOWN),
+        KEY(7, 4, CORGI_KEY_EXJOGUP),
+};
+static struct matrix_keymap_data corgikbd_keymap_data = {
+        .keymap         = corgikbd_keymap,
+        .keymap_size    = ARRAY_SIZE(corgikbd_keymap),
+};
+static const int corgikbd_row_gpios[] =
+                { 58, 59, 60, 61, 62, 63, 64, 65 };
+static const int corgikbd_col_gpios[] =
+                { 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77 };
+static struct matrix_keypad_platform_data corgikbd_pdata = {
+        .keymap_data            = &corgikbd_keymap_data,
+        .row_gpios              = corgikbd_row_gpios,
+        .col_gpios              = corgikbd_col_gpios,
+        .num_row_gpios          = ARRAY_SIZE(corgikbd_row_gpios),
+        .num_col_gpios          = ARRAY_SIZE(corgikbd_col_gpios),
+        .col_scan_delay_us      = 10,
+        .debounce_ms            = 10,
+        .wakeup                 = 1,
+};
 static struct platform_device corgikbd_device = {
-        .name           = "corgi-keyboard",
+        .name           = "matrix-keypad",
        .id             = -1,
+        .dev            = {
+                .platform_data = &corgikbd_pdata,
+        },
 };
 /*
@@ -307,111 +436,20 @@ static struct platform_device corgiled_device = {
 * The card detect interrupt isn't debounced so we delay it by 250ms
 * to give the card a chance to fully insert/eject.
 */
-static struct pxamci_platform_data corgi_mci_platform_data;
-static int corgi_mci_init(struct device *dev, irq_handler_t corgi_detect_int, void *data)
-{
-        int err;
-        err = gpio_request(CORGI_GPIO_nSD_DETECT, "nSD_DETECT");
-        if (err)
-                goto err_out;
-        err = gpio_request(CORGI_GPIO_nSD_WP, "nSD_WP");
-        if (err)
-                goto err_free_1;
-        err = gpio_request(CORGI_GPIO_SD_PWR, "SD_PWR");
-        if (err)
-                goto err_free_2;
-        gpio_direction_input(CORGI_GPIO_nSD_DETECT);
-        gpio_direction_input(CORGI_GPIO_nSD_WP);
-        gpio_direction_output(CORGI_GPIO_SD_PWR, 0);
-        corgi_mci_platform_data.detect_delay = msecs_to_jiffies(250);
-        err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int,
-                                IRQF_DISABLED | IRQF_TRIGGER_RISING |
-                                IRQF_TRIGGER_FALLING,
-                                "MMC card detect", data);
-        if (err) {
-                pr_err("%s: MMC/SD: can't request MMC card detect IRQ\n",
-                                __func__);
-                goto err_free_3;
-        }
-        return 0;
-err_free_3:
-        gpio_free(CORGI_GPIO_SD_PWR);
-err_free_2:
-        gpio_free(CORGI_GPIO_nSD_WP);
-err_free_1:
-        gpio_free(CORGI_GPIO_nSD_DETECT);
-err_out:
-        return err;
-}
-static void corgi_mci_setpower(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data* p_d = dev->platform_data;
-        gpio_set_value(CORGI_GPIO_SD_PWR, ((1 << vdd) & p_d->ocr_mask));
-}
-static int corgi_mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(CORGI_GPIO_nSD_WP);
-}
-static void corgi_mci_exit(struct device *dev, void *data)
-{
-        free_irq(CORGI_IRQ_GPIO_nSD_DETECT, data);
-        gpio_free(CORGI_GPIO_SD_PWR);
-        gpio_free(CORGI_GPIO_nSD_WP);
-        gpio_free(CORGI_GPIO_nSD_DETECT);
-}
 static struct pxamci_platform_data corgi_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = corgi_mci_init,
+        .gpio_card_detect       = -1,
-        .get_ro         = corgi_mci_get_ro,
+        .gpio_card_ro           = CORGI_GPIO_nSD_WP,
-        .setpower       = corgi_mci_setpower,
+        .gpio_power             = CORGI_GPIO_SD_PWR,
-        .exit           = corgi_mci_exit,
 };
 /*
 * Irda
 */
-static void corgi_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(CORGI_GPIO_IR_ON, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
-static int corgi_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(CORGI_GPIO_IR_ON, "IR_ON");
-        if (err)
-                return err;
-        gpio_direction_output(CORGI_GPIO_IR_ON, 1);
-        return 0;
-}
-static void corgi_irda_shutdown(struct device *dev)
-{
-        gpio_free(CORGI_GPIO_IR_ON);
-}
 static struct pxaficp_platform_data corgi_ficp_platform_data = {
+        .gpio_pwdown            = CORGI_GPIO_IR_ON,
        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_mode       = corgi_irda_transceiver_mode,
-        .startup                = corgi_irda_startup,
-        .shutdown               = corgi_irda_shutdown,
 };
@@ -633,9 +671,14 @@ static void __init corgi_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(corgi_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        corgi_init_spi();
        pxa_set_udc_info(&udc_info);
+        corgi_mci_platform_data.detect_delay = msecs_to_jiffies(250);
        pxa_set_mci_info(&corgi_mci_platform_data);
        pxa_set_ficp_info(&corgi_ficp_platform_data);
        pxa_set_i2c_info(NULL);
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index a093282fe4db..d4a0733e905b 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -214,8 +214,8 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {
        .fatal_acin_volt  = SHARPSL_FATAL_ACIN_VOLT,
        .fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT,
        .bat_levels       = 40,
-        .bat_levels_noac  = spitz_battery_levels_noac,
+        .bat_levels_noac  = sharpsl_battery_levels_noac,
-        .bat_levels_acin  = spitz_battery_levels_acin,
+        .bat_levels_acin  = sharpsl_battery_levels_acin,
        .status_high_acin = 188,
        .status_low_acin  = 178,
        .status_high_noac = 185,
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
index 3a8ee2272add..9e4d9816726a 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c
+++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
@@ -155,7 +155,7 @@ MODULE_PARM_DESC(pxa255_turbo_table, "Selects the frequency table (0 = run table
 static pxa_freqs_t pxa27x_freqs[] = {
        {104000, 104000, PXA27x_CCCR(1,  8, 2), 0, CCLKCFG2(1, 0, 1),  900000, 1705000 },
-        {156000, 104000, PXA27x_CCCR(1,  8, 6), 0, CCLKCFG2(1, 1, 1), 1000000, 1705000 },
+        {156000, 104000, PXA27x_CCCR(1,  8, 3), 0, CCLKCFG2(1, 0, 1), 1000000, 1705000 },
        {208000, 208000, PXA27x_CCCR(0, 16, 2), 1, CCLKCFG2(0, 0, 1), 1180000, 1705000 },
        {312000, 208000, PXA27x_CCCR(1, 16, 3), 1, CCLKCFG2(1, 0, 1), 1250000, 1705000 },
        {416000, 208000, PXA27x_CCCR(1, 16, 4), 1, CCLKCFG2(1, 0, 1), 1350000, 1705000 },
@@ -447,6 +447,7 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy)
                pxa27x_freq_table[i].frequency = freq;
                pxa27x_freq_table[i].index = i;
        }
+        pxa27x_freq_table[i].index = i;
        pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;
        /*
diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
index 67f34a8d8e60..149cdd9aee4d 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c
+++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
@@ -102,7 +102,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy,
                table[i].index = i;
                table[i].frequency = freqs[i].cpufreq_mhz * 1000;
        }
-        table[num].frequency = i;
+        table[num].index = i;
        table[num].frequency = CPUFREQ_TABLE_END;
        pxa3xx_freqs = freqs;
diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c
index 7d3e1b46e550..88575b87bd33 100644
--- a/arch/arm/mach-pxa/csb726.c
+++ b/arch/arm/mach-pxa/csb726.c
@@ -130,61 +130,17 @@ static struct pxamci_platform_data csb726_mci_data;
 static int csb726_mci_init(struct device *dev,
                irq_handler_t detect, void *data)
 {
-        int err;
        csb726_mci_data.detect_delay = msecs_to_jiffies(500);
-        err = gpio_request(CSB726_GPIO_MMC_DETECT, "MMC detect");
-        if (err)
-                goto err_det_req;
-        err = gpio_direction_input(CSB726_GPIO_MMC_DETECT);
-        if (err)
-                goto err_det_dir;
-        err = gpio_request(CSB726_GPIO_MMC_RO, "MMC ro");
-        if (err)
-                goto err_ro_req;
-        err = gpio_direction_input(CSB726_GPIO_MMC_RO);
-        if (err)
-                goto err_ro_dir;
-        err = request_irq(gpio_to_irq(CSB726_GPIO_MMC_DETECT), detect,
-                        IRQF_DISABLED, "MMC card detect", data);
-        if (err)
-                goto err_irq;
        return 0;
-err_irq:
-err_ro_dir:
-        gpio_free(CSB726_GPIO_MMC_RO);
-err_ro_req:
-err_det_dir:
-        gpio_free(CSB726_GPIO_MMC_DETECT);
-err_det_req:
-        return err;
-}
-static int csb726_mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(CSB726_GPIO_MMC_RO);
-}
-static void csb726_mci_exit(struct device *dev, void *data)
-{
-        free_irq(gpio_to_irq(CSB726_GPIO_MMC_DETECT), data);
-        gpio_free(CSB726_GPIO_MMC_RO);
-        gpio_free(CSB726_GPIO_MMC_DETECT);
 }
 static struct pxamci_platform_data csb726_mci = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = csb726_mci_init,
+        .init                   = csb726_mci_init,
-        .get_ro         = csb726_mci_get_ro,
        /* FIXME setpower */
-        .exit           = csb726_mci_exit,
+        .gpio_card_detect       = CSB726_GPIO_MMC_DETECT,
+        .gpio_card_ro           = CSB726_GPIO_MMC_RO,
+        .gpio_power             = -1,
 };
 static struct pxaohci_platform_data csb726_ohci_platform_data = {
@@ -282,7 +238,7 @@ static struct resource csb726_lan_resources[] = {
 };
 struct smsc911x_platform_config csb726_lan_config = {
-        .irq_type       = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
        .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
        .flags          = SMSC911X_USE_32BIT,
        .phy_interface  = PHY_INTERFACE_MODE_MII,
@@ -312,6 +268,9 @@ static void __init csb726_init(void)
 /*      MSC2 = 0x06697ff4; *//* none/SM501 */
        MSC2 = (MSC2 & ~0xffff) | 0x7ff4; /* SM501 */
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
        pxa27x_set_i2c_power_info(NULL);
        pxa_set_mci_info(&csb726_mci);
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index ecc08f360b68..3395463bb5a6 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -4,17 +4,18 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <mach/hardware.h>
 #include <mach/udc.h>
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
 #include <mach/irda.h>
-#include <plat/i2c.h>
 #include <mach/ohci.h>
 #include <mach/pxa27x_keypad.h>
 #include <mach/pxa2xx_spi.h>
 #include <mach/camera.h>
 #include <mach/audio.h>
-#include <mach/pxa3xx_nand.h>
+#include <plat/i2c.h>
+#include <plat/pxa3xx_nand.h>
 #include "devices.h"
 #include "generic.h"
@@ -167,13 +168,18 @@ static struct resource pxa_resource_ffuart[] = {
        }
 };
-struct platform_device pxa_device_ffuart= {
+struct platform_device pxa_device_ffuart = {
        .name           = "pxa2xx-uart",
        .id             = 0,
        .resource       = pxa_resource_ffuart,
        .num_resources  = ARRAY_SIZE(pxa_resource_ffuart),
 };
+void __init pxa_set_ffuart_info(void *info)
+{
+        pxa_register_device(&pxa_device_ffuart, info);
+}
 static struct resource pxa_resource_btuart[] = {
        {
                .start  = 0x40200000,
@@ -193,6 +199,11 @@ struct platform_device pxa_device_btuart = {
        .num_resources  = ARRAY_SIZE(pxa_resource_btuart),
 };
+void __init pxa_set_btuart_info(void *info)
+{
+        pxa_register_device(&pxa_device_btuart, info);
+}
 static struct resource pxa_resource_stuart[] = {
        {
                .start  = 0x40700000,
@@ -212,6 +223,11 @@ struct platform_device pxa_device_stuart = {
        .num_resources  = ARRAY_SIZE(pxa_resource_stuart),
 };
+void __init pxa_set_stuart_info(void *info)
+{
+        pxa_register_device(&pxa_device_stuart, info);
+}
 static struct resource pxa_resource_hwuart[] = {
        {
                .start  = 0x41600000,
@@ -231,6 +247,14 @@ struct platform_device pxa_device_hwuart = {
        .num_resources  = ARRAY_SIZE(pxa_resource_hwuart),
 };
+void __init pxa_set_hwuart_info(void *info)
+{
+        if (cpu_is_pxa255())
+                pxa_register_device(&pxa_device_hwuart, info);
+        else
+                pr_info("UART: Ignoring attempt to register HWUART on non-PXA255 hardware");
+}
 static struct resource pxai2c_resources[] = {
        {
                .start  = 0x40301680,
@@ -935,6 +959,33 @@ void __init pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info)
 {
        pxa_register_device(&pxa3xx_device_nand, info);
 }
+static struct resource pxa3xx_resources_gcu[] = {
+        {
+                .start  = 0x54000000,
+                .end    = 0x54000fff,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = IRQ_GCU,
+                .end    = IRQ_GCU,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static u64 pxa3xx_gcu_dmamask = DMA_BIT_MASK(32);
+struct platform_device pxa3xx_device_gcu = {
+        .name           = "pxa3xx-gcu",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(pxa3xx_resources_gcu),
+        .resource       = pxa3xx_resources_gcu,
+        .dev            = {
+                .dma_mask = &pxa3xx_gcu_dmamask,
+                .coherent_dma_mask = 0xffffffff,
+        },
+};
 #endif /* CONFIG_PXA3xx */
 /* pxa2xx-spi platform-device ID equals respective SSP platform-device ID + 1.
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index ecc24a4dca6d..93817d99761e 100644
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
@@ -35,4 +35,6 @@ extern struct platform_device pxa27x_device_pwm1;
 extern struct platform_device pxa3xx_device_nand;
 extern struct platform_device pxa3xx_device_i2c_power;
+extern struct platform_device pxa3xx_device_gcu;
 void __init pxa_register_device(struct platform_device *dev, void *data);
diff --git a/arch/arm/mach-pxa/e330.c b/arch/arm/mach-pxa/e330.c
index 74d3f8987c5c..8fde3387279d 100644
--- a/arch/arm/mach-pxa/e330.c
+++ b/arch/arm/mach-pxa/e330.c
@@ -55,6 +55,9 @@ static struct platform_device *devices[] __initdata = {
 static void __init e330_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        eseries_register_clks();
        eseries_get_tmio_gpios();
        platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/arch/arm/mach-pxa/e350.c b/arch/arm/mach-pxa/e350.c
index 080036272131..f50f055f5720 100644
--- a/arch/arm/mach-pxa/e350.c
+++ b/arch/arm/mach-pxa/e350.c
@@ -56,6 +56,9 @@ static struct platform_device *devices[] __initdata = {
 static void __init e350_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        eseries_register_clks();
        eseries_get_tmio_gpios();
        platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/arch/arm/mach-pxa/e400.c b/arch/arm/mach-pxa/e400.c
index ed9c0c3f64a2..55b950f12844 100644
--- a/arch/arm/mach-pxa/e400.c
+++ b/arch/arm/mach-pxa/e400.c
@@ -130,6 +130,9 @@ static struct platform_device *devices[] __initdata = {
 static void __init e400_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        /* Fixme - e400 may have a switched clock */
        eseries_register_clks();
        eseries_get_tmio_gpios();
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c
index a36fc17f671d..94b23a9e3877 100644
--- a/arch/arm/mach-pxa/e740.c
+++ b/arch/arm/mach-pxa/e740.c
@@ -192,6 +192,9 @@ static struct platform_device *devices[] __initdata = {
 static void __init e740_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        eseries_register_clks();
        clk_add_alias("CLK_CK48M", e740_t7l66xb_device.name,
                        "UDCCLK", &pxa25x_device_udc.dev),
@@ -199,7 +202,6 @@ static void __init e740_init(void)
        platform_add_devices(devices, ARRAY_SIZE(devices));
        pxa_set_udc_info(&e7xx_udc_mach_info);
        pxa_set_ac97_info(NULL);
-        e7xx_irda_init();
        pxa_set_ficp_info(&e7xx_ficp_platform_data);
 }
diff --git a/arch/arm/mach-pxa/e750.c b/arch/arm/mach-pxa/e750.c
index 1d00110590e5..5eccbce73a33 100644
--- a/arch/arm/mach-pxa/e750.c
+++ b/arch/arm/mach-pxa/e750.c
@@ -194,13 +194,15 @@ static struct platform_device *devices[] __initdata = {
 static void __init e750_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e750_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        clk_add_alias("CLK_CK3P6MI", e750_tc6393xb_device.name,
                        "GPIO11_CLK", NULL),
        eseries_get_tmio_gpios();
        platform_add_devices(devices, ARRAY_SIZE(devices));
        pxa_set_udc_info(&e7xx_udc_mach_info);
        pxa_set_ac97_info(NULL);
-        e7xx_irda_init();
        pxa_set_ficp_info(&e7xx_ficp_platform_data);
 }
diff --git a/arch/arm/mach-pxa/e800.c b/arch/arm/mach-pxa/e800.c
index 9866c7b9e784..aad129bed199 100644
--- a/arch/arm/mach-pxa/e800.c
+++ b/arch/arm/mach-pxa/e800.c
@@ -195,6 +195,9 @@ static struct platform_device *devices[] __initdata = {
 static void __init e800_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        clk_add_alias("CLK_CK3P6MI", e800_tc6393xb_device.name,
                        "GPIO11_CLK", NULL),
        eseries_get_tmio_gpios();
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 9cd09465a0e8..1c0de808b54d 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -646,13 +646,16 @@ static int em_x270_mci_get_ro(struct device *dev)
 }
 static struct pxamci_platform_data em_x270_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_20_21|MMC_VDD_21_22|MMC_VDD_22_23|
+        .ocr_mask               = MMC_VDD_20_21|MMC_VDD_21_22|MMC_VDD_22_23|
-                          MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27|
+                                  MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27|
-                          MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
+                                  MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
-                          MMC_VDD_30_31|MMC_VDD_31_32,
+                                  MMC_VDD_30_31|MMC_VDD_31_32,
-        .init           = em_x270_mci_init,
+        .init                   = em_x270_mci_init,
-        .setpower       = em_x270_mci_setpower,
+        .setpower               = em_x270_mci_setpower,
-        .exit           = em_x270_mci_exit,
+        .exit                   = em_x270_mci_exit,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static void __init em_x270_init_mmc(void)
@@ -964,7 +967,7 @@ static inline void em_x270_init_gpio_keys(void) {}
 #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)
 static struct regulator *em_x270_camera_ldo;
-static int em_x270_sensor_init(struct device *dev)
+static int em_x270_sensor_init(void)
 {
        int ret;
@@ -993,7 +996,6 @@ static int em_x270_sensor_init(struct device *dev)
 }
 struct pxacamera_platform_data em_x270_camera_platform_data = {
-        .init   = em_x270_sensor_init,
        .flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |
                PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,
        .mclk_10khz = 2600,
@@ -1022,22 +1024,34 @@ static int em_x270_sensor_power(struct device *dev, int on)
        return 0;
 }
-static struct soc_camera_link iclink = {
-        .bus_id = 0,
-        .power = em_x270_sensor_power,
-};
 static struct i2c_board_info em_x270_i2c_cam_info[] = {
        {
                I2C_BOARD_INFO("mt9m111", 0x48),
+        },
+};
+static struct soc_camera_link iclink = {
+        .bus_id         = 0,
+        .power          = em_x270_sensor_power,
+        .board_info     = &em_x270_i2c_cam_info[0],
+        .i2c_adapter_id = 0,
+        .module_name    = "mt9m111",
+};
+static struct platform_device em_x270_camera = {
+        .name   = "soc-camera-pdrv",
+        .id     = -1,
+        .dev    = {
                .platform_data = &iclink,
        },
 };
 static void  __init em_x270_init_camera(void)
 {
-        i2c_register_board_info(0, ARRAY_AND_SIZE(em_x270_i2c_cam_info));
+        if (em_x270_sensor_init() == 0) {
-        pxa_set_camera_info(&em_x270_camera_platform_data);
+                pxa_set_camera_info(&em_x270_camera_platform_data);
+                platform_device_register(&em_x270_camera);
+        }
 }
 #else
 static inline void em_x270_init_camera(void) {}
@@ -1103,6 +1117,7 @@ REGULATOR_CONSUMER(ldo5, NULL, "vcc cam");
 REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio");
 REGULATOR_CONSUMER(ldo12, NULL, "vcc usb");
 REGULATOR_CONSUMER(ldo19, &em_x270_gprs_userspace_consumer.dev, "vcc gprs");
+REGULATOR_CONSUMER(buck2, NULL, "vcc_core");
 #define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask)               \
        static struct regulator_init_data _ldo##_data = {               \
@@ -1125,6 +1140,7 @@ REGULATOR_INIT(ldo10, 2000000, 3200000,
               REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE);
 REGULATOR_INIT(ldo12, 3000000, 3000000, REGULATOR_CHANGE_STATUS);
 REGULATOR_INIT(ldo19, 3200000, 3200000, REGULATOR_CHANGE_STATUS);
+REGULATOR_INIT(buck2, 1000000, 1650000, REGULATOR_CHANGE_VOLTAGE);
 struct led_info em_x270_led_info = {
        .name = "em-x270:orange",
@@ -1194,6 +1210,8 @@ struct da903x_subdev_info em_x270_da9030_subdevs[] = {
        DA9030_LDO(12),
        DA9030_LDO(19),
+        DA9030_SUBDEV(regulator, BUCK2, &buck2_data),
        DA9030_SUBDEV(led, LED_PC, &em_x270_led_info),
        DA9030_SUBDEV(backlight, WLED, &em_x270_led_info),
        DA9030_SUBDEV(battery, BAT, &em_x270_batterty_info),
@@ -1245,7 +1263,6 @@ static void __init em_x270_init_i2c(void)
 static void __init em_x270_module_init(void)
 {
-        pr_info("%s\n", __func__);
        pxa2xx_mfp_config(ARRAY_AND_SIZE(em_x270_pin_config));
        mmc_cd = GPIO13_MMC_CD;
@@ -1257,7 +1274,6 @@ static void __init em_x270_module_init(void)
 static void __init em_x270_exeda_init(void)
 {
-        pr_info("%s\n", __func__);
        pxa2xx_mfp_config(ARRAY_AND_SIZE(exeda_pin_config));
        mmc_cd = GPIO114_MMC_CD;
@@ -1271,6 +1287,10 @@ static void __init em_x270_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(common_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
 #ifdef CONFIG_PM
        pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP);
 #endif
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index c60dadf847a6..91417f035069 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -47,44 +47,9 @@ struct pxa2xx_udc_mach_info e7xx_udc_mach_info = {
        .gpio_pullup_inverted = 1
 };
-static void e7xx_irda_transceiver_mode(struct device *dev, int mode)
-{
-        if (mode & IR_OFF) {
-                gpio_set_value(GPIO_E7XX_IR_OFF, 1);
-                pxa2xx_transceiver_mode(dev, mode);
-        } else {
-                pxa2xx_transceiver_mode(dev, mode);
-                gpio_set_value(GPIO_E7XX_IR_OFF, 0);
-        }
-}
-int e7xx_irda_init(void)
-{
-        int ret;
-        ret = gpio_request(GPIO_E7XX_IR_OFF, "IrDA power");
-        if (ret)
-                goto out;
-        ret = gpio_direction_output(GPIO_E7XX_IR_OFF, 0);
-        if (ret)
-                goto out;
-        e7xx_irda_transceiver_mode(NULL, IR_SIRMODE | IR_OFF);
-out:
-        return ret;
-}
-static void e7xx_irda_shutdown(struct device *dev)
-{
-        e7xx_irda_transceiver_mode(dev, IR_SIRMODE | IR_OFF);
-        gpio_free(GPIO_E7XX_IR_OFF);
-}
 struct pxaficp_platform_data e7xx_ficp_platform_data = {
-        .transceiver_cap  = IR_SIRMODE | IR_OFF,
+        .gpio_pwdown            = GPIO_E7XX_IR_OFF,
-        .transceiver_mode = e7xx_irda_transceiver_mode,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .shutdown = e7xx_irda_shutdown,
 };
 int eseries_tmio_enable(struct platform_device *dev)
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index 588b265e5755..626c82b13970 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -17,7 +17,11 @@
 #include <linux/delay.h>
 #include <linux/pwm_backlight.h>
 #include <linux/input.h>
+#include <linux/gpio.h>
 #include <linux/gpio_keys.h>
+#include <linux/leds-lp3944.h>
+#include <media/soc_camera.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -29,6 +33,7 @@
 #include <plat/i2c.h>
 #include <mach/hardware.h>
 #include <mach/pxa27x_keypad.h>
+#include <mach/camera.h>
 #include "devices.h"
 #include "generic.h"
@@ -38,6 +43,9 @@
 #define GPIO15_A910_FLIP_LID            15
 #define GPIO12_E680_LOCK_SWITCH         12
 #define GPIO15_E6_LOCK_SWITCH           15
+#define GPIO50_nCAM_EN                  50
+#define GPIO19_GEN1_CAM_RST             19
+#define GPIO28_GEN2_CAM_RST             28
 static struct platform_pwm_backlight_data ezx_backlight_data = {
        .pwm_id         = 0,
@@ -191,8 +199,8 @@ static unsigned long gen1_pin_config[] __initdata = {
        GPIO94_CIF_DD_5,
        GPIO17_CIF_DD_6,
        GPIO108_CIF_DD_7,
-        GPIO50_GPIO,                            /* CAM_EN */
+        GPIO50_GPIO | MFP_LPM_DRIVE_HIGH,       /* CAM_EN */
-        GPIO19_GPIO,                            /* CAM_RST */
+        GPIO19_GPIO | MFP_LPM_DRIVE_HIGH,       /* CAM_RST */
        /* EMU */
        GPIO120_GPIO,                           /* EMU_MUX1 */
@@ -248,8 +256,8 @@ static unsigned long gen2_pin_config[] __initdata = {
        GPIO48_CIF_DD_5,
        GPIO93_CIF_DD_6,
        GPIO12_CIF_DD_7,
-        GPIO50_GPIO,                            /* CAM_EN */
+        GPIO50_GPIO | MFP_LPM_DRIVE_HIGH,       /* CAM_EN */
-        GPIO28_GPIO,                            /* CAM_RST */
+        GPIO28_GPIO | MFP_LPM_DRIVE_HIGH,       /* CAM_RST */
        GPIO17_GPIO,                            /* CAM_FLASH */
 };
 #endif
@@ -683,6 +691,81 @@ static struct platform_device a780_gpio_keys = {
        },
 };
+/* camera */
+static int a780_camera_init(void)
+{
+        int err;
+        /*
+         * GPIO50_nCAM_EN is active low
+         * GPIO19_GEN1_CAM_RST is active on rising edge
+         */
+        err = gpio_request(GPIO50_nCAM_EN, "nCAM_EN");
+        if (err) {
+                pr_err("%s: Failed to request nCAM_EN\n", __func__);
+                goto fail;
+        }
+        err = gpio_request(GPIO19_GEN1_CAM_RST, "CAM_RST");
+        if (err) {
+                pr_err("%s: Failed to request CAM_RST\n", __func__);
+                goto fail_gpio_cam_rst;
+        }
+        gpio_direction_output(GPIO50_nCAM_EN, 1);
+        gpio_direction_output(GPIO19_GEN1_CAM_RST, 0);
+        return 0;
+fail_gpio_cam_rst:
+        gpio_free(GPIO50_nCAM_EN);
+fail:
+        return err;
+}
+static int a780_camera_power(struct device *dev, int on)
+{
+        gpio_set_value(GPIO50_nCAM_EN, !on);
+        return 0;
+}
+static int a780_camera_reset(struct device *dev)
+{
+        gpio_set_value(GPIO19_GEN1_CAM_RST, 0);
+        msleep(10);
+        gpio_set_value(GPIO19_GEN1_CAM_RST, 1);
+        return 0;
+}
+struct pxacamera_platform_data a780_pxacamera_platform_data = {
+        .flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |
+                PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,
+        .mclk_10khz = 5000,
+};
+static struct i2c_board_info a780_camera_i2c_board_info = {
+        I2C_BOARD_INFO("mt9m111", 0x5d),
+};
+static struct soc_camera_link a780_iclink = {
+        .bus_id         = 0,
+        .flags          = SOCAM_SENSOR_INVERT_PCLK,
+        .i2c_adapter_id = 0,
+        .board_info     = &a780_camera_i2c_board_info,
+        .module_name    = "mt9m111",
+        .power          = a780_camera_power,
+        .reset          = a780_camera_reset,
+};
+static struct platform_device a780_camera = {
+        .name   = "soc-camera-pdrv",
+        .id     = 0,
+        .dev    = {
+                .platform_data = &a780_iclink,
+        },
+};
 static struct platform_device *a780_devices[] __initdata = {
        &a780_gpio_keys,
 };
@@ -693,12 +776,21 @@ static void __init a780_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gen1_pin_config));
        pxa2xx_mfp_config(ARRAY_AND_SIZE(a780_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
        set_pxa_fb_info(&ezx_fb_info_1);
        pxa_set_keypad_info(&a780_keypad_platform_data);
+        if (a780_camera_init() == 0) {
+                pxa_set_camera_info(&a780_pxacamera_platform_data);
+                platform_device_register(&a780_camera);
+        }
        platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
        platform_add_devices(ARRAY_AND_SIZE(a780_devices));
 }
@@ -754,6 +846,10 @@ static void __init e680_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gen1_pin_config));
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e680_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
        i2c_register_board_info(0, ARRAY_AND_SIZE(e680_i2c_board_info));
@@ -816,6 +912,10 @@ static void __init a1200_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gen2_pin_config));
        pxa2xx_mfp_config(ARRAY_AND_SIZE(a1200_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
        i2c_register_board_info(0, ARRAY_AND_SIZE(a1200_i2c_board_info));
@@ -864,6 +964,131 @@ static struct platform_device a910_gpio_keys = {
        },
 };
+/* camera */
+static int a910_camera_init(void)
+{
+        int err;
+        /*
+         * GPIO50_nCAM_EN is active low
+         * GPIO28_GEN2_CAM_RST is active on rising edge
+         */
+        err = gpio_request(GPIO50_nCAM_EN, "nCAM_EN");
+        if (err) {
+                pr_err("%s: Failed to request nCAM_EN\n", __func__);
+                goto fail;
+        }
+        err = gpio_request(GPIO28_GEN2_CAM_RST, "CAM_RST");
+        if (err) {
+                pr_err("%s: Failed to request CAM_RST\n", __func__);
+                goto fail_gpio_cam_rst;
+        }
+        gpio_direction_output(GPIO50_nCAM_EN, 1);
+        gpio_direction_output(GPIO28_GEN2_CAM_RST, 0);
+        return 0;
+fail_gpio_cam_rst:
+        gpio_free(GPIO50_nCAM_EN);
+fail:
+        return err;
+}
+static int a910_camera_power(struct device *dev, int on)
+{
+        gpio_set_value(GPIO50_nCAM_EN, !on);
+        return 0;
+}
+static int a910_camera_reset(struct device *dev)
+{
+        gpio_set_value(GPIO28_GEN2_CAM_RST, 0);
+        msleep(10);
+        gpio_set_value(GPIO28_GEN2_CAM_RST, 1);
+        return 0;
+}
+struct pxacamera_platform_data a910_pxacamera_platform_data = {
+        .flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |
+                PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,
+        .mclk_10khz = 5000,
+};
+static struct i2c_board_info a910_camera_i2c_board_info = {
+        I2C_BOARD_INFO("mt9m111", 0x5d),
+};
+static struct soc_camera_link a910_iclink = {
+        .bus_id         = 0,
+        .i2c_adapter_id = 0,
+        .board_info     = &a910_camera_i2c_board_info,
+        .module_name    = "mt9m111",
+        .power          = a910_camera_power,
+        .reset          = a910_camera_reset,
+};
+static struct platform_device a910_camera = {
+        .name   = "soc-camera-pdrv",
+        .id     = 0,
+        .dev    = {
+                .platform_data = &a910_iclink,
+        },
+};
+/* leds-lp3944 */
+static struct lp3944_platform_data a910_lp3944_leds = {
+        .leds_size = LP3944_LEDS_MAX,
+        .leds = {
+                [0] = {
+                        .name = "a910:red:",
+                        .status = LP3944_LED_STATUS_OFF,
+                        .type = LP3944_LED_TYPE_LED,
+                },
+                [1] = {
+                        .name = "a910:green:",
+                        .status = LP3944_LED_STATUS_OFF,
+                        .type = LP3944_LED_TYPE_LED,
+                },
+                [2] {
+                        .name = "a910:blue:",
+                        .status = LP3944_LED_STATUS_OFF,
+                        .type = LP3944_LED_TYPE_LED,
+                },
+                /* Leds 3 and 4 are used as display power switches */
+                [3] = {
+                        .name = "a910::cli_display",
+                        .status = LP3944_LED_STATUS_OFF,
+                        .type = LP3944_LED_TYPE_LED_INVERTED
+                },
+                [4] = {
+                        .name = "a910::main_display",
+                        .status = LP3944_LED_STATUS_ON,
+                        .type = LP3944_LED_TYPE_LED_INVERTED
+                },
+                [5] = { .type = LP3944_LED_TYPE_NONE },
+                [6] = {
+                        .name = "a910::torch",
+                        .status = LP3944_LED_STATUS_OFF,
+                        .type = LP3944_LED_TYPE_LED,
+                },
+                [7] = {
+                        .name = "a910::flash",
+                        .status = LP3944_LED_STATUS_OFF,
+                        .type = LP3944_LED_TYPE_LED_INVERTED,
+                },
+        },
+};
+static struct i2c_board_info __initdata a910_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("lp3944", 0x60),
+                .platform_data = &a910_lp3944_leds,
+        },
+};
 static struct platform_device *a910_devices[] __initdata = {
        &a910_gpio_keys,
 };
@@ -874,12 +1099,22 @@ static void __init a910_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gen2_pin_config));
        pxa2xx_mfp_config(ARRAY_AND_SIZE(a910_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
+        i2c_register_board_info(0, ARRAY_AND_SIZE(a910_i2c_board_info));
        set_pxa_fb_info(&ezx_fb_info_2);
        pxa_set_keypad_info(&a910_keypad_platform_data);
+        if (a910_camera_init() == 0) {
+                pxa_set_camera_info(&a910_pxacamera_platform_data);
+                platform_device_register(&a910_camera);
+        }
        platform_add_devices(ARRAY_AND_SIZE(ezx_devices));
        platform_add_devices(ARRAY_AND_SIZE(a910_devices));
 }
@@ -935,6 +1170,10 @@ static void __init e6_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gen2_pin_config));
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e6_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
        i2c_register_board_info(0, ARRAY_AND_SIZE(e6_i2c_board_info));
@@ -971,6 +1210,10 @@ static void __init e2_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gen2_pin_config));
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e2_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_i2c_info(NULL);
        i2c_register_board_info(0, ARRAY_AND_SIZE(e2_i2c_board_info));
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index 485fede83d97..890fb90a672f 100644
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
@@ -67,3 +67,8 @@ extern struct sysdev_class pxa_irq_sysclass;
 extern struct sysdev_class pxa_gpio_sysclass;
 extern struct sysdev_class pxa2xx_mfp_sysclass;
 extern struct sysdev_class pxa3xx_mfp_sysclass;
+void __init pxa_set_ffuart_info(void *info);
+void __init pxa_set_btuart_info(void *info);
+void __init pxa_set_stuart_info(void *info);
+void __init pxa_set_hwuart_info(void *info);
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index ca9912ea78d9..96c345129135 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -88,7 +88,10 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_MMC_PXA
 static struct pxamci_platform_data gumstix_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static void __init gumstix_mmc_init(void)
@@ -208,6 +211,11 @@ static void __init gumstix_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+        pxa_set_hwuart_info(NULL);
        gumstix_bluetooth_init();
        gumstix_udc_init();
        gumstix_mmc_init();
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c
index f3d220c32e07..c1cab0871c99 100644
--- a/arch/arm/mach-pxa/h5000.c
+++ b/arch/arm/mach-pxa/h5000.c
@@ -193,6 +193,9 @@ static void __init h5000_init(void)
        fix_msc();
        pxa2xx_mfp_config(ARRAY_AND_SIZE(h5000_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        pxa_set_udc_info(&h5000_udc_mach_info);
        platform_add_devices(ARRAY_AND_SIZE(devices));
 }
diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c
index cea99fe65b97..f9a2e4b0f090 100644
--- a/arch/arm/mach-pxa/himalaya.c
+++ b/arch/arm/mach-pxa/himalaya.c
@@ -150,6 +150,9 @@ static void __init himalaya_lcd_init(void)
 static void __init himalaya_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        himalaya_lcd_init();
        platform_add_devices(devices, ARRAY_SIZE(devices));
 }
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 81359d574f88..848c861dd23f 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -45,6 +45,7 @@
 #include <mach/irda.h>
 #include <mach/pxa2xx_spi.h>
+#include <video/platform_lcd.h>
 #include <video/w100fb.h>
 #include "devices.h"
@@ -174,14 +175,9 @@ static int hx4700_gpio_request(struct gpio_ress *gpios, int size)
 * IRDA
 */
-static void irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO105_HX4700_nIR_ON, mode & IR_OFF);
-}
 static struct pxaficp_platform_data ficp_info = {
-        .transceiver_cap  = IR_SIRMODE | IR_OFF,
+        .gpio_pwdown            = GPIO105_HX4700_nIR_ON,
-        .transceiver_mode = irda_transceiver_mode,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
 };
 /*
@@ -368,8 +364,6 @@ static struct platform_device egpio = {
 * LCD - Sony display connected to ATI Imageon w3220
 */
-static int lcd_power;
 static void sony_lcd_init(void)
 {
        gpio_set_value(GPIO84_HX4700_LCD_SQN, 1);
@@ -410,35 +404,6 @@ static void sony_lcd_off(void)
        gpio_set_value(GPIO110_HX4700_LCD_LVDD_3V3_ON, 0);
 }
-static int hx4700_lcd_set_power(struct lcd_device *ldev, int level)
-{
-        switch (level) {
-        case FB_BLANK_UNBLANK:
-                sony_lcd_init();
-                break;
-        case FB_BLANK_NORMAL:
-        case FB_BLANK_VSYNC_SUSPEND:
-        case FB_BLANK_HSYNC_SUSPEND:
-        case FB_BLANK_POWERDOWN:
-                sony_lcd_off();
-                break;
-        }
-        lcd_power = level;
-        return 0;
-}
-static int hx4700_lcd_get_power(struct lcd_device *lm)
-{
-        return lcd_power;
-}
-static struct lcd_ops hx4700_lcd_ops = {
-        .get_power = hx4700_lcd_get_power,
-        .set_power = hx4700_lcd_set_power,
-};
-static struct lcd_device *hx4700_lcd_device;
 #ifdef CONFIG_PM
 static void w3220_lcd_suspend(struct w100fb_par *wfb)
 {
@@ -573,6 +538,27 @@ static struct platform_device w3220 = {
        .resource      = w3220_resources,
 };
+static void hx4700_lcd_set_power(struct plat_lcd_data *pd, unsigned int power)
+{
+        if (power)
+                sony_lcd_init();
+        else
+                sony_lcd_off();
+}
+static struct plat_lcd_data hx4700_lcd_data = {
+        .set_power = hx4700_lcd_set_power,
+};
+static struct platform_device hx4700_lcd = {
+        .name = "platform-lcd",
+        .id   = -1,
+        .dev  = {
+                .platform_data = &hx4700_lcd_data,
+                .parent        = &w3220.dev,
+        },
+};
 /*
 * Backlight
 */
@@ -618,7 +604,7 @@ static struct platform_device gpio_vbus = {
 static const struct ads7846_platform_data tsc2046_info = {
        .model            = 7846,
        .vref_delay_usecs = 100,
-        .pressure_max     = 512,
+        .pressure_max     = 1024,
        .debounce_max     = 10,
        .debounce_tol     = 3,
        .debounce_rep     = 1,
@@ -834,6 +820,7 @@ static struct platform_device *devices[] __initdata = {
        &gpio_keys,
        &backlight,
        &w3220,
+        &hx4700_lcd,
        &egpio,
        &bq24022,
        &gpio_vbus,
@@ -863,6 +850,10 @@ static void __init hx4700_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(hx4700_pin_config));
        hx4700_gpio_request(ARRAY_AND_SIZE(global_gpios));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_add_devices(devices, ARRAY_SIZE(devices));
        pxa_set_ficp_info(&ficp_info);
@@ -872,9 +863,6 @@ static void __init hx4700_init(void)
        pxa2xx_set_spi_info(2, &pxa_ssp2_master_info);
        spi_register_board_info(ARRAY_AND_SIZE(tsc2046_board_info));
-        hx4700_lcd_device = lcd_device_register("w100fb", NULL,
-                                        (void *)&w3220_info, &hx4700_lcd_ops);
        gpio_set_value(GPIO71_HX4700_ASIC3_nRESET, 0);
        mdelay(10);
        gpio_set_value(GPIO71_HX4700_ASIC3_nRESET, 1);
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index b6243b59d9be..5c9e11d74f49 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -168,7 +168,10 @@ static struct pxafb_mach_info sharp_lm8v31 = {
 };
 static struct pxamci_platform_data idp_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static void __init idp_init(void)
@@ -176,6 +179,9 @@ static void __init idp_init(void)
        printk("idp_init()\n");
        pxa2xx_mfp_config(ARRAY_AND_SIZE(idp_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_device_register(&smc91x_device);
        //platform_device_register(&mst_audio_device);
diff --git a/arch/arm/mach-pxa/imote2.c b/arch/arm/mach-pxa/imote2.c
index 961807dc6467..5b0862df61ab 100644
--- a/arch/arm/mach-pxa/imote2.c
+++ b/arch/arm/mach-pxa/imote2.c
@@ -389,6 +389,9 @@ static int imote2_mci_get_ro(struct device *dev)
 static struct pxamci_platform_data imote2_mci_platform_data = {
        .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, /* default anyway */
        .get_ro = imote2_mci_get_ro,
+        .gpio_card_detect = -1,
+        .gpio_card_ro   = -1,
+        .gpio_power = -1,
 };
 static struct mtd_partition imote2flash_partitions[] = {
@@ -551,8 +554,12 @@ static struct i2c_pxa_platform_data i2c_pdata = {
 static void __init imote2_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(imote2_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        /* SPI chip select directions - all other directions should
         * be handled by drivers.*/
        gpio_direction_output(37, 0);
diff --git a/arch/arm/mach-pxa/include/mach/audio.h b/arch/arm/mach-pxa/include/mach/audio.h
index 16eb02552d5d..a3449e35a6f5 100644
--- a/arch/arm/mach-pxa/include/mach/audio.h
+++ b/arch/arm/mach-pxa/include/mach/audio.h
@@ -3,10 +3,12 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
+#include <sound/ac97_codec.h>
 /*
 * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95)
 *              a -1 value means no gpio will be used for reset
+ * @codec_pdata: AC97 codec platform_data
 * reset_gpio should only be specified for pxa27x CPUs where a silicon
 * bug prevents correct operation of the reset line. If not specified,
@@ -20,6 +22,7 @@ typedef struct {
        void (*resume)(void *);
        void *priv;
        int reset_gpio;
+        void *codec_pdata[AC97_BUS_MAX_DEVICES];
 } pxa2xx_audio_ops_t;
 extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops);
diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h
new file mode 100644
index 000000000000..bfec09b1814b
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/balloon3.h
@@ -0,0 +1,134 @@
+/*
+ *  linux/include/asm-arm/arch-pxa/balloon3.h
+ *
+ *  Authors:    Nick Bane and Wookey
+ *  Created:    Oct, 2005
+ *  Copyright:  Toby Churchill Ltd
+ *  Cribbed from mainstone.c, by Nicholas Pitre
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef ASM_ARCH_BALLOON3_H
+#define ASM_ARCH_BALLOON3_H
+enum balloon3_features {
+        BALLOON3_FEATURE_OHCI,
+        BALLOON3_FEATURE_MMC,
+        BALLOON3_FEATURE_CF,
+        BALLOON3_FEATURE_AUDIO,
+        BALLOON3_FEATURE_TOPPOLY,
+};
+#define BALLOON3_FPGA_PHYS      PXA_CS4_PHYS
+#define BALLOON3_FPGA_VIRT      (0xf1000000)    /* as per balloon2 */
+#define BALLOON3_FPGA_LENGTH    0x01000000
+/* FPGA/CPLD registers */
+#define BALLOON3_PCMCIA0_REG            (BALLOON3_FPGA_VIRT + 0x00e00008)
+/* fixme - same for now */
+#define BALLOON3_PCMCIA1_REG            (BALLOON3_FPGA_VIRT + 0x00e00008)
+#define BALLOON3_NANDIO_IO_REG          (BALLOON3_FPGA_VIRT + 0x00e00000)
+/* fpga/cpld interrupt control register */
+#define BALLOON3_INT_CONTROL_REG        (BALLOON3_FPGA_VIRT + 0x00e0000C)
+#define BALLOON3_NANDIO_CTL2_REG        (BALLOON3_FPGA_VIRT + 0x00e00010)
+#define BALLOON3_NANDIO_CTL_REG         (BALLOON3_FPGA_VIRT + 0x00e00014)
+#define BALLOON3_VERSION_REG            (BALLOON3_FPGA_VIRT + 0x00e0001c)
+#define BALLOON3_SAMOSA_ADDR_REG        (BALLOON3_FPGA_VIRT + 0x00c00000)
+#define BALLOON3_SAMOSA_DATA_REG        (BALLOON3_FPGA_VIRT + 0x00c00004)
+#define BALLOON3_SAMOSA_STATUS_REG      (BALLOON3_FPGA_VIRT + 0x00c0001c)
+/* GPIOs for irqs */
+#define BALLOON3_GPIO_AUX_NIRQ          (94)
+#define BALLOON3_GPIO_CODEC_IRQ         (95)
+/* Timer and Idle LED locations */
+#define BALLOON3_GPIO_LED_NAND          (9)
+#define BALLOON3_GPIO_LED_IDLE          (10)
+/* backlight control */
+#define BALLOON3_GPIO_RUN_BACKLIGHT     (99)
+#define BALLOON3_GPIO_S0_CD             (105)
+/* FPGA Interrupt Mask/Acknowledge Register */
+#define BALLOON3_INT_S0_IRQ             (1 << 0)  /* PCMCIA 0 IRQ */
+#define BALLOON3_INT_S0_STSCHG          (1 << 1)  /* PCMCIA 0 status changed */
+/* CF Status Register */
+#define BALLOON3_PCMCIA_nIRQ            (1 << 0)  /* IRQ / ready signal */
+#define BALLOON3_PCMCIA_nSTSCHG_BVD1    (1 << 1)
+                                        /* VDD sense / card status changed */
+/* CF control register (write) */
+#define BALLOON3_PCMCIA_RESET           (1 << 0)   /* Card reset signal */
+#define BALLOON3_PCMCIA_ENABLE          (1 << 1)
+#define BALLOON3_PCMCIA_ADD_ENABLE      (1 << 2)
+/* CPLD (and FPGA) interface definitions */
+#define CPLD_LCD0_DATA_SET             0x00
+#define CPLD_LCD0_DATA_CLR             0x10
+#define CPLD_LCD0_COMMAND_SET          0x01
+#define CPLD_LCD0_COMMAND_CLR          0x11
+#define CPLD_LCD1_DATA_SET             0x02
+#define CPLD_LCD1_DATA_CLR             0x12
+#define CPLD_LCD1_COMMAND_SET          0x03
+#define CPLD_LCD1_COMMAND_CLR          0x13
+#define CPLD_MISC_SET                  0x07
+#define CPLD_MISC_CLR                  0x17
+#define CPLD_MISC_LOON_NRESET_BIT      0
+#define CPLD_MISC_LOON_UNSUSP_BIT      1
+#define CPLD_MISC_RUN_5V_BIT           2
+#define CPLD_MISC_CHG_D0_BIT           3
+#define CPLD_MISC_CHG_D1_BIT           4
+#define CPLD_MISC_DAC_NCS_BIT          5
+#define CPLD_LCD_SET                   0x08
+#define CPLD_LCD_CLR                   0x18
+#define CPLD_LCD_BACKLIGHT_EN_0_BIT    0
+#define CPLD_LCD_BACKLIGHT_EN_1_BIT    1
+#define CPLD_LCD_LED_RED_BIT           4
+#define CPLD_LCD_LED_GREEN_BIT         5
+#define CPLD_LCD_NRESET_BIT            7
+#define CPLD_LCD_RO_SET                0x09
+#define CPLD_LCD_RO_CLR                0x19
+#define CPLD_LCD_RO_LCD0_nWAIT_BIT     0
+#define CPLD_LCD_RO_LCD1_nWAIT_BIT     1
+#define CPLD_SERIAL_SET                0x0a
+#define CPLD_SERIAL_CLR                0x1a
+#define CPLD_SERIAL_GSM_RI_BIT         0
+#define CPLD_SERIAL_GSM_CTS_BIT        1
+#define CPLD_SERIAL_GSM_DTR_BIT        2
+#define CPLD_SERIAL_LPR_CTS_BIT        3
+#define CPLD_SERIAL_TC232_CTS_BIT      4
+#define CPLD_SERIAL_TC232_DSR_BIT      5
+#define CPLD_SROUTING_SET              0x0b
+#define CPLD_SROUTING_CLR              0x1b
+#define CPLD_SROUTING_MSP430_LPR       0
+#define CPLD_SROUTING_MSP430_TC232     1
+#define CPLD_SROUTING_MSP430_GSM       2
+#define CPLD_SROUTING_LOON_LPR         (0 << 4)
+#define CPLD_SROUTING_LOON_TC232       (1 << 4)
+#define CPLD_SROUTING_LOON_GSM         (2 << 4)
+#define CPLD_AROUTING_SET              0x0c
+#define CPLD_AROUTING_CLR              0x1c
+#define CPLD_AROUTING_MIC2PHONE_BIT    0
+#define CPLD_AROUTING_PHONE2INT_BIT    1
+#define CPLD_AROUTING_PHONE2EXT_BIT    2
+#define CPLD_AROUTING_LOONL2INT_BIT    3
+#define CPLD_AROUTING_LOONL2EXT_BIT    4
+#define CPLD_AROUTING_LOONR2PHONE_BIT  5
+#define CPLD_AROUTING_LOONR2INT_BIT    6
+#define CPLD_AROUTING_LOONR2EXT_BIT    7
+extern int balloon3_has(enum balloon3_features feature);
+#endif
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h
index a88d7caff0d1..811743c56147 100644
--- a/arch/arm/mach-pxa/include/mach/colibri.h
+++ b/arch/arm/mach-pxa/include/mach/colibri.h
@@ -23,6 +23,12 @@ static inline void colibri_pxa3xx_init_lcd(int bl_pin) {}
 extern void colibri_pxa3xx_init_eth(struct ax_plat_data *plat_data);
 #endif
+#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE)
+extern void colibri_pxa3xx_init_nand(void);
+#else
+static inline void colibri_pxa3xx_init_nand(void) {}
+#endif
 /* physical memory regions */
 #define COLIBRI_SDRAM_BASE      0xa0000000      /* SDRAM region */
diff --git a/arch/arm/mach-pxa/include/mach/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S
index f6b4bf3e73d2..a73bc86a3c26 100644
--- a/arch/arm/mach-pxa/include/mach/entry-macro.S
+++ b/arch/arm/mach-pxa/include/mach/entry-macro.S
@@ -24,34 +24,28 @@
                mov     \tmp, \tmp, lsr #13
                and     \tmp, \tmp, #0x7                @ Core G
                cmp     \tmp, #1
-                bhi     1004f
+                bhi     1002f
+                @ Core Generation 1 (PXA25x)
                mov     \base, #io_p2v(0x40000000)      @ IIR Ctl = 0x40d00000
                add     \base, \base, #0x00d00000
                ldr     \irqstat, [\base, #0]           @ ICIP
                ldr     \irqnr, [\base, #4]             @ ICMR
-                b       1002f
-1004:
-                mrc     p6, 0, \irqstat, c6, c0, 0      @ ICIP2
-                mrc     p6, 0, \irqnr, c7, c0, 0        @ ICMR2
                ands    \irqnr, \irqstat, \irqnr
-                beq     1003f
+                beq     1001f
                rsb     \irqstat, \irqnr, #0
                and     \irqstat, \irqstat, \irqnr
                clz     \irqnr, \irqstat
-                rsb     \irqnr, \irqnr, #31
+                rsb     \irqnr, \irqnr, #(31 + PXA_IRQ(0))
-                add     \irqnr, \irqnr, #(32 + PXA_IRQ(0))
                b       1001f
-1003:
-                mrc     p6, 0, \irqstat, c0, c0, 0      @ ICIP
-                mrc     p6, 0, \irqnr, c1, c0, 0        @ ICMR
 1002:
-                ands    \irqnr, \irqstat, \irqnr
+                @ Core Generation 2 (PXA27x) or Core Generation 3 (PXA3xx)
+                mrc     p6, 0, \irqstat, c5, c0, 0      @ ICHP
+                tst     \irqstat, #0x80000000
                beq     1001f
-                rsb     \irqstat, \irqnr, #0
+                bic     \irqstat, \irqstat, #0x80000000
-                and     \irqstat, \irqstat, \irqnr
+                mov     \irqnr, \irqstat, lsr #16
-                clz     \irqnr, \irqstat
+                add     \irqnr, \irqnr, #(PXA_IRQ(0))
-                rsb     \irqnr, \irqnr, #(31 + PXA_IRQ(0))
 1001:
                .endm
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
index 16ab79547dae..50f1297bf5ac 100644
--- a/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -105,6 +105,7 @@
 *
 *  PXA935      A0      0x56056931      0x1E653013
 *  PXA935      B0      0x56056936      0x6E653013
+ *  PXA935      B1      0x56056938      0x8E653013
 */
 #ifdef CONFIG_PXA25x
 #define __cpu_is_pxa210(id)                             \
@@ -197,6 +198,16 @@
 #define __cpu_is_pxa935(id)     (0)
 #endif
+#ifdef CONFIG_CPU_PXA950
+#define __cpu_is_pxa950(id)                             \
+        ({                                              \
+                unsigned int _id = (id) >> 4 & 0xfff;   \
+                id == 0x697;                            \
+         })
+#else
+#define __cpu_is_pxa950(id)     (0)
+#endif
 #define cpu_is_pxa210()                                 \
        ({                                              \
                __cpu_is_pxa210(read_cpuid_id());       \
@@ -249,6 +260,13 @@
                __cpu_is_pxa935(id);                    \
         })
+#define cpu_is_pxa950()                                 \
+        ({                                              \
+                unsigned int id = read_cpuid(CPUID_ID); \
+                __cpu_is_pxa950(id);                    \
+         })
 /*
 * CPUID Core Generation Bit
 * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
@@ -266,7 +284,7 @@
                _id == 0x3;                             \
         })
-#define __cpu_is_pxa9xx(id)                             \
+#define __cpu_is_pxa93x(id)                             \
        ({                                              \
                unsigned int _id = (id) >> 4 & 0xfff;   \
                _id == 0x683 || _id == 0x693;           \
@@ -282,9 +300,9 @@
                __cpu_is_pxa3xx(read_cpuid_id());       \
         })
-#define cpu_is_pxa9xx()                                 \
+#define cpu_is_pxa93x()                                 \
        ({                                              \
-                __cpu_is_pxa9xx(read_cpuid_id());       \
+                __cpu_is_pxa93x(read_cpuid_id());       \
         })
 /*
 * return current memory and LCD clock frequency in units of 10kHz
diff --git a/arch/arm/mach-pxa/include/mach/irda.h b/arch/arm/mach-pxa/include/mach/irda.h
index 0a50c3c763df..3cd41f77dda4 100644
--- a/arch/arm/mach-pxa/include/mach/irda.h
+++ b/arch/arm/mach-pxa/include/mach/irda.h
@@ -12,6 +12,8 @@ struct pxaficp_platform_data {
        void (*transceiver_mode)(struct device *dev, int mode);
        int (*startup)(struct device *dev);
        void (*shutdown)(struct device *dev);
+        int gpio_pwdown;                /* powerdown GPIO for the IrDA chip */
+        bool gpio_pwdown_inverted;      /* gpio_pwdown is inverted */
 };
 extern void pxa_set_ficp_info(struct pxaficp_platform_data *info);
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 6a1d95993342..3677a9af9c87 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -68,9 +68,10 @@
 #ifdef CONFIG_PXA3xx
 #define IRQ_SSP4        PXA_IRQ(13)     /* SSP4 service request */
 #define IRQ_CIR         PXA_IRQ(34)     /* Consumer IR */
+#define IRQ_COMM_WDT    PXA_IRQ(35)     /* Comm WDT interrupt */
 #define IRQ_TSI         PXA_IRQ(36)     /* Touch Screen Interface (PXA320) */
 #define IRQ_USIM2       PXA_IRQ(38)     /* USIM2 Controller */
-#define IRQ_GRPHICS     PXA_IRQ(39)     /* Graphics Controller */
+#define IRQ_GCU         PXA_IRQ(39)     /* Graphics Controller */
 #define IRQ_MMC2        PXA_IRQ(41)     /* MMC2 Controller */
 #define IRQ_1WIRE       PXA_IRQ(44)     /* 1-Wire Controller */
 #define IRQ_NAND        PXA_IRQ(45)     /* NAND Controller */
@@ -81,8 +82,31 @@
 #define IRQ_MMC3        PXA_IRQ(55)     /* MMC3 Controller (PXA310) */
 #endif
-#define PXA_GPIO_IRQ_BASE       PXA_IRQ(64)
+#ifdef CONFIG_CPU_PXA935
-#define PXA_GPIO_IRQ_NUM        (128)
+#define IRQ_U2O         PXA_IRQ(64)     /* USB OTG 2.0 Controller (PXA935) */
+#define IRQ_U2H         PXA_IRQ(65)     /* USB Host 2.0 Controller (PXA935) */
+#define IRQ_MMC3_PXA935 PXA_IRQ(72)     /* MMC3 Controller (PXA935) */
+#define IRQ_MMC4_PXA935 PXA_IRQ(73)     /* MMC4 Controller (PXA935) */
+#define IRQ_MMC5_PXA935 PXA_IRQ(74)     /* MMC5 Controller (PXA935) */
+#define IRQ_U2P         PXA_IRQ(93)     /* USB PHY D+/D- Lines (PXA935) */
+#endif
+#ifdef CONFIG_CPU_PXA930
+#define IRQ_ENHROT      PXA_IRQ(37)     /* Enhanced Rotary (PXA930) */
+#define IRQ_ACIPC0      PXA_IRQ(5)
+#define IRQ_ACIPC1      PXA_IRQ(40)
+#define IRQ_ACIPC2      PXA_IRQ(19)
+#define IRQ_TRKBALL     PXA_IRQ(43)     /* Track Ball */
+#endif
+#ifdef CONFIG_CPU_PXA950
+#define IRQ_GC500       PXA_IRQ(70)     /* Graphics Controller (PXA950) */
+#endif
+#define PXA_GPIO_IRQ_BASE       PXA_IRQ(96)
+#define PXA_GPIO_IRQ_NUM        (192)
 #define GPIO_2_x_TO_IRQ(x)      (PXA_GPIO_IRQ_BASE + (x))
 #define IRQ_GPIO(x)     (((x) < 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x))
@@ -105,6 +129,8 @@
 #define IRQ_BOARD_END           (IRQ_BOARD_START + 70)
 #elif defined(CONFIG_MACH_ZYLONITE)
 #define IRQ_BOARD_END           (IRQ_BOARD_START + 32)
+#elif defined(CONFIG_PXA_EZX)
+#define IRQ_BOARD_END           (IRQ_BOARD_START + 23)
 #else
 #define IRQ_BOARD_END           (IRQ_BOARD_START + 16)
 #endif
@@ -237,6 +263,16 @@
 #define MAINSTONE_S1_STSCHG_IRQ MAINSTONE_IRQ(14)
 #define MAINSTONE_S1_IRQ        MAINSTONE_IRQ(15)
+/* Balloon3 Interrupts */
+#define BALLOON3_IRQ(x)         (IRQ_BOARD_START + (x))
+#define BALLOON3_BP_CF_NRDY_IRQ BALLOON3_IRQ(0)
+#define BALLOON3_BP_NSTSCHG_IRQ BALLOON3_IRQ(1)
+#define BALLOON3_AUX_NIRQ       IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ)
+#define BALLOON3_CODEC_IRQ      IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)
+#define BALLOON3_S0_CD_IRQ      IRQ_GPIO(BALLOON3_GPIO_S0_CD)
 /* LoCoMo Interrupts (CONFIG_SHARP_LOCOMO) */
 #define IRQ_LOCOMO_KEY_BASE     (IRQ_BOARD_START + 0)
 #define IRQ_LOCOMO_GPIO_BASE    (IRQ_BOARD_START + 1)
diff --git a/arch/arm/mach-pxa/include/mach/mfp.h b/arch/arm/mach-pxa/include/mach/mfp.h
index 482185053a92..271e249ae34f 100644
--- a/arch/arm/mach-pxa/include/mach/mfp.h
+++ b/arch/arm/mach-pxa/include/mach/mfp.h
@@ -16,305 +16,6 @@
 #ifndef __ASM_ARCH_MFP_H
 #define __ASM_ARCH_MFP_H
-#define mfp_to_gpio(m)  ((m) % 128)
+#include <plat/mfp.h>
-/* list of all the configurable MFP pins */
-enum {
-        MFP_PIN_INVALID = -1,
-        MFP_PIN_GPIO0 = 0,
-        MFP_PIN_GPIO1,
-        MFP_PIN_GPIO2,
-        MFP_PIN_GPIO3,
-        MFP_PIN_GPIO4,
-        MFP_PIN_GPIO5,
-        MFP_PIN_GPIO6,
-        MFP_PIN_GPIO7,
-        MFP_PIN_GPIO8,
-        MFP_PIN_GPIO9,
-        MFP_PIN_GPIO10,
-        MFP_PIN_GPIO11,
-        MFP_PIN_GPIO12,
-        MFP_PIN_GPIO13,
-        MFP_PIN_GPIO14,
-        MFP_PIN_GPIO15,
-        MFP_PIN_GPIO16,
-        MFP_PIN_GPIO17,
-        MFP_PIN_GPIO18,
-        MFP_PIN_GPIO19,
-        MFP_PIN_GPIO20,
-        MFP_PIN_GPIO21,
-        MFP_PIN_GPIO22,
-        MFP_PIN_GPIO23,
-        MFP_PIN_GPIO24,
-        MFP_PIN_GPIO25,
-        MFP_PIN_GPIO26,
-        MFP_PIN_GPIO27,
-        MFP_PIN_GPIO28,
-        MFP_PIN_GPIO29,
-        MFP_PIN_GPIO30,
-        MFP_PIN_GPIO31,
-        MFP_PIN_GPIO32,
-        MFP_PIN_GPIO33,
-        MFP_PIN_GPIO34,
-        MFP_PIN_GPIO35,
-        MFP_PIN_GPIO36,
-        MFP_PIN_GPIO37,
-        MFP_PIN_GPIO38,
-        MFP_PIN_GPIO39,
-        MFP_PIN_GPIO40,
-        MFP_PIN_GPIO41,
-        MFP_PIN_GPIO42,
-        MFP_PIN_GPIO43,
-        MFP_PIN_GPIO44,
-        MFP_PIN_GPIO45,
-        MFP_PIN_GPIO46,
-        MFP_PIN_GPIO47,
-        MFP_PIN_GPIO48,
-        MFP_PIN_GPIO49,
-        MFP_PIN_GPIO50,
-        MFP_PIN_GPIO51,
-        MFP_PIN_GPIO52,
-        MFP_PIN_GPIO53,
-        MFP_PIN_GPIO54,
-        MFP_PIN_GPIO55,
-        MFP_PIN_GPIO56,
-        MFP_PIN_GPIO57,
-        MFP_PIN_GPIO58,
-        MFP_PIN_GPIO59,
-        MFP_PIN_GPIO60,
-        MFP_PIN_GPIO61,
-        MFP_PIN_GPIO62,
-        MFP_PIN_GPIO63,
-        MFP_PIN_GPIO64,
-        MFP_PIN_GPIO65,
-        MFP_PIN_GPIO66,
-        MFP_PIN_GPIO67,
-        MFP_PIN_GPIO68,
-        MFP_PIN_GPIO69,
-        MFP_PIN_GPIO70,
-        MFP_PIN_GPIO71,
-        MFP_PIN_GPIO72,
-        MFP_PIN_GPIO73,
-        MFP_PIN_GPIO74,
-        MFP_PIN_GPIO75,
-        MFP_PIN_GPIO76,
-        MFP_PIN_GPIO77,
-        MFP_PIN_GPIO78,
-        MFP_PIN_GPIO79,
-        MFP_PIN_GPIO80,
-        MFP_PIN_GPIO81,
-        MFP_PIN_GPIO82,
-        MFP_PIN_GPIO83,
-        MFP_PIN_GPIO84,
-        MFP_PIN_GPIO85,
-        MFP_PIN_GPIO86,
-        MFP_PIN_GPIO87,
-        MFP_PIN_GPIO88,
-        MFP_PIN_GPIO89,
-        MFP_PIN_GPIO90,
-        MFP_PIN_GPIO91,
-        MFP_PIN_GPIO92,
-        MFP_PIN_GPIO93,
-        MFP_PIN_GPIO94,
-        MFP_PIN_GPIO95,
-        MFP_PIN_GPIO96,
-        MFP_PIN_GPIO97,
-        MFP_PIN_GPIO98,
-        MFP_PIN_GPIO99,
-        MFP_PIN_GPIO100,
-        MFP_PIN_GPIO101,
-        MFP_PIN_GPIO102,
-        MFP_PIN_GPIO103,
-        MFP_PIN_GPIO104,
-        MFP_PIN_GPIO105,
-        MFP_PIN_GPIO106,
-        MFP_PIN_GPIO107,
-        MFP_PIN_GPIO108,
-        MFP_PIN_GPIO109,
-        MFP_PIN_GPIO110,
-        MFP_PIN_GPIO111,
-        MFP_PIN_GPIO112,
-        MFP_PIN_GPIO113,
-        MFP_PIN_GPIO114,
-        MFP_PIN_GPIO115,
-        MFP_PIN_GPIO116,
-        MFP_PIN_GPIO117,
-        MFP_PIN_GPIO118,
-        MFP_PIN_GPIO119,
-        MFP_PIN_GPIO120,
-        MFP_PIN_GPIO121,
-        MFP_PIN_GPIO122,
-        MFP_PIN_GPIO123,
-        MFP_PIN_GPIO124,
-        MFP_PIN_GPIO125,
-        MFP_PIN_GPIO126,
-        MFP_PIN_GPIO127,
-        MFP_PIN_GPIO0_2,
-        MFP_PIN_GPIO1_2,
-        MFP_PIN_GPIO2_2,
-        MFP_PIN_GPIO3_2,
-        MFP_PIN_GPIO4_2,
-        MFP_PIN_GPIO5_2,
-        MFP_PIN_GPIO6_2,
-        MFP_PIN_GPIO7_2,
-        MFP_PIN_GPIO8_2,
-        MFP_PIN_GPIO9_2,
-        MFP_PIN_GPIO10_2,
-        MFP_PIN_GPIO11_2,
-        MFP_PIN_GPIO12_2,
-        MFP_PIN_GPIO13_2,
-        MFP_PIN_GPIO14_2,
-        MFP_PIN_GPIO15_2,
-        MFP_PIN_GPIO16_2,
-        MFP_PIN_GPIO17_2,
-        MFP_PIN_ULPI_STP,
-        MFP_PIN_ULPI_NXT,
-        MFP_PIN_ULPI_DIR,
-        MFP_PIN_nXCVREN,
-        MFP_PIN_DF_CLE_nOE,
-        MFP_PIN_DF_nADV1_ALE,
-        MFP_PIN_DF_SCLK_E,
-        MFP_PIN_DF_SCLK_S,
-        MFP_PIN_nBE0,
-        MFP_PIN_nBE1,
-        MFP_PIN_DF_nADV2_ALE,
-        MFP_PIN_DF_INT_RnB,
-        MFP_PIN_DF_nCS0,
-        MFP_PIN_DF_nCS1,
-        MFP_PIN_nLUA,
-        MFP_PIN_nLLA,
-        MFP_PIN_DF_nWE,
-        MFP_PIN_DF_ALE_nWE,
-        MFP_PIN_DF_nRE_nOE,
-        MFP_PIN_DF_ADDR0,
-        MFP_PIN_DF_ADDR1,
-        MFP_PIN_DF_ADDR2,
-        MFP_PIN_DF_ADDR3,
-        MFP_PIN_DF_IO0,
-        MFP_PIN_DF_IO1,
-        MFP_PIN_DF_IO2,
-        MFP_PIN_DF_IO3,
-        MFP_PIN_DF_IO4,
-        MFP_PIN_DF_IO5,
-        MFP_PIN_DF_IO6,
-        MFP_PIN_DF_IO7,
-        MFP_PIN_DF_IO8,
-        MFP_PIN_DF_IO9,
-        MFP_PIN_DF_IO10,
-        MFP_PIN_DF_IO11,
-        MFP_PIN_DF_IO12,
-        MFP_PIN_DF_IO13,
-        MFP_PIN_DF_IO14,
-        MFP_PIN_DF_IO15,
-        /* additional pins on PXA930 */
-        MFP_PIN_GSIM_UIO,
-        MFP_PIN_GSIM_UCLK,
-        MFP_PIN_GSIM_UDET,
-        MFP_PIN_GSIM_nURST,
-        MFP_PIN_PMIC_INT,
-        MFP_PIN_RDY,
-        MFP_PIN_MAX,
-};
-/*
- * a possible MFP configuration is represented by a 32-bit integer
- *
- * bit  0.. 9 - MFP Pin Number (1024 Pins Maximum)
- * bit 10..12 - Alternate Function Selection
- * bit 13..15 - Drive Strength
- * bit 16..18 - Low Power Mode State
- * bit 19..20 - Low Power Mode Edge Detection
- * bit 21..22 - Run Mode Pull State
- *
- * to facilitate the definition, the following macros are provided
- *
- * MFP_CFG_DEFAULT - default MFP configuration value, with
- *                alternate function = 0,
- *                drive strength = fast 3mA (MFP_DS03X)
- *                low power mode = default
- *                edge detection = none
- *
- * MFP_CFG      - default MFPR value with alternate function
- * MFP_CFG_DRV  - default MFPR value with alternate function and
- *                pin drive strength
- * MFP_CFG_LPM  - default MFPR value with alternate function and
- *                low power mode
- * MFP_CFG_X    - default MFPR value with alternate function,
- *                pin drive strength and low power mode
- */
-typedef unsigned long mfp_cfg_t;
-#define MFP_PIN(x)              ((x) & 0x3ff)
-#define MFP_AF0                 (0x0 << 10)
-#define MFP_AF1                 (0x1 << 10)
-#define MFP_AF2                 (0x2 << 10)
-#define MFP_AF3                 (0x3 << 10)
-#define MFP_AF4                 (0x4 << 10)
-#define MFP_AF5                 (0x5 << 10)
-#define MFP_AF6                 (0x6 << 10)
-#define MFP_AF7                 (0x7 << 10)
-#define MFP_AF_MASK             (0x7 << 10)
-#define MFP_AF(x)               (((x) >> 10) & 0x7)
-#define MFP_DS01X               (0x0 << 13)
-#define MFP_DS02X               (0x1 << 13)
-#define MFP_DS03X               (0x2 << 13)
-#define MFP_DS04X               (0x3 << 13)
-#define MFP_DS06X               (0x4 << 13)
-#define MFP_DS08X               (0x5 << 13)
-#define MFP_DS10X               (0x6 << 13)
-#define MFP_DS13X               (0x7 << 13)
-#define MFP_DS_MASK             (0x7 << 13)
-#define MFP_DS(x)               (((x) >> 13) & 0x7)
-#define MFP_LPM_DEFAULT         (0x0 << 16)
-#define MFP_LPM_DRIVE_LOW       (0x1 << 16)
-#define MFP_LPM_DRIVE_HIGH      (0x2 << 16)
-#define MFP_LPM_PULL_LOW        (0x3 << 16)
-#define MFP_LPM_PULL_HIGH       (0x4 << 16)
-#define MFP_LPM_FLOAT           (0x5 << 16)
-#define MFP_LPM_INPUT           (0x6 << 16)
-#define MFP_LPM_STATE_MASK      (0x7 << 16)
-#define MFP_LPM_STATE(x)        (((x) >> 16) & 0x7)
-#define MFP_LPM_EDGE_NONE       (0x0 << 19)
-#define MFP_LPM_EDGE_RISE       (0x1 << 19)
-#define MFP_LPM_EDGE_FALL       (0x2 << 19)
-#define MFP_LPM_EDGE_BOTH       (0x3 << 19)
-#define MFP_LPM_EDGE_MASK       (0x3 << 19)
-#define MFP_LPM_EDGE(x)         (((x) >> 19) & 0x3)
-#define MFP_PULL_NONE           (0x0 << 21)
-#define MFP_PULL_LOW            (0x1 << 21)
-#define MFP_PULL_HIGH           (0x2 << 21)
-#define MFP_PULL_BOTH           (0x3 << 21)
-#define MFP_PULL_MASK           (0x3 << 21)
-#define MFP_PULL(x)             (((x) >> 21) & 0x3)
-#define MFP_CFG_DEFAULT         (MFP_AF0 | MFP_DS03X | MFP_LPM_DEFAULT |\
-                                 MFP_LPM_EDGE_NONE | MFP_PULL_NONE)
-#define MFP_CFG(pin, af)                \
-        ((MFP_CFG_DEFAULT & ~MFP_AF_MASK) |\
-         (MFP_PIN(MFP_PIN_##pin) | MFP_##af))
-#define MFP_CFG_DRV(pin, af, drv)       \
-        ((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_DS_MASK)) |\
-         (MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_##drv))
-#define MFP_CFG_LPM(pin, af, lpm)       \
-        ((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_LPM_STATE_MASK)) |\
-         (MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_LPM_##lpm))
-#define MFP_CFG_X(pin, af, drv, lpm)    \
-        ((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_DS_MASK | MFP_LPM_STATE_MASK)) |\
-         (MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_##drv | MFP_LPM_##lpm))
 #endif /* __ASM_ARCH_MFP_H */
diff --git a/arch/arm/mach-pxa/include/mach/mmc.h b/arch/arm/mach-pxa/include/mach/mmc.h
index 6d1304c9270f..02a69dc2ee63 100644
--- a/arch/arm/mach-pxa/include/mach/mmc.h
+++ b/arch/arm/mach-pxa/include/mach/mmc.h
@@ -14,6 +14,11 @@ struct pxamci_platform_data {
        int (*get_ro)(struct device *);
        void (*setpower)(struct device *, unsigned int);
        void (*exit)(struct device *, void *);
+        int gpio_card_detect;                   /* gpio detecting card insertion */
+        int gpio_card_ro;                       /* gpio detecting read only toggle */
+        bool gpio_card_ro_invert;               /* gpio ro is inverted */
+        int gpio_power;                         /* gpio powering up MMC bus */
+        bool gpio_power_invert;                 /* gpio power is inverted */
 };
 extern void pxa_set_mci_info(struct pxamci_platform_data *info);
diff --git a/arch/arm/mach-pxa/include/mach/palmtc.h b/arch/arm/mach-pxa/include/mach/palmtc.h
new file mode 100644
index 000000000000..3dc9b074ab46
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/palmtc.h
@@ -0,0 +1,86 @@
+/*
+ * linux/include/asm-arm/arch-pxa/palmtc-gpio.h
+ *
+ * GPIOs and interrupts for Palm Tungsten|C Handheld Computer
+ *
+ * Authors:     Alex Osborne <bobofdoom@gmail.com>
+ *              Marek Vasut <marek.vasut@gmail.com>
+ *              Holger Bocklet <bitz.email@gmx.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#ifndef _INCLUDE_PALMTC_H_
+#define _INCLUDE_PALMTC_H_
+/** HERE ARE GPIOs **/
+/* GPIOs */
+#define GPIO_NR_PALMTC_EARPHONE_DETECT  2
+#define GPIO_NR_PALMTC_CRADLE_DETECT    5
+#define GPIO_NR_PALMTC_HOTSYNC_BUTTON   7
+/* SD/MMC */
+#define GPIO_NR_PALMTC_SD_DETECT_N      12
+#define GPIO_NR_PALMTC_SD_POWER         32
+#define GPIO_NR_PALMTC_SD_READONLY      54
+/* WLAN */
+#define GPIO_NR_PALMTC_PCMCIA_READY     13
+#define GPIO_NR_PALMTC_PCMCIA_PWRREADY  14
+#define GPIO_NR_PALMTC_PCMCIA_POWER1    15
+#define GPIO_NR_PALMTC_PCMCIA_POWER2    33
+#define GPIO_NR_PALMTC_PCMCIA_POWER3    55
+#define GPIO_NR_PALMTC_PCMCIA_RESET     78
+/* UDC */
+#define GPIO_NR_PALMTC_USB_DETECT_N     4
+#define GPIO_NR_PALMTC_USB_POWER        36
+/* LCD/BACKLIGHT */
+#define GPIO_NR_PALMTC_BL_POWER         16
+#define GPIO_NR_PALMTC_LCD_POWER        44
+#define GPIO_NR_PALMTC_LCD_BLANK        38
+/* UART */
+#define GPIO_NR_PALMTC_RS232_POWER      37
+/* IRDA */
+#define GPIO_NR_PALMTC_IR_DISABLE       45
+/* IRQs */
+#define IRQ_GPIO_PALMTC_SD_DETECT_N     IRQ_GPIO(GPIO_NR_PALMTC_SD_DETECT_N)
+#define IRQ_GPIO_PALMTC_WLAN_READY      IRQ_GPIO(GPIO_NR_PALMTC_WLAN_READY)
+/* UCB1400 GPIOs */
+#define GPIO_NR_PALMTC_POWER_DETECT     (0x80 | 0x00)
+#define GPIO_NR_PALMTC_HEADPHONE_DETECT (0x80 | 0x01)
+#define GPIO_NR_PALMTC_SPEAKER_ENABLE   (0x80 | 0x03)
+#define GPIO_NR_PALMTC_VIBRA_POWER      (0x80 | 0x05)
+#define GPIO_NR_PALMTC_LED_POWER        (0x80 | 0x07)
+/** HERE ARE INIT VALUES **/
+#define PALMTC_UCB1400_GPIO_OFFSET      0x80
+/* BATTERY */
+#define PALMTC_BAT_MAX_VOLTAGE          4000    /* 4.00V maximum voltage */
+#define PALMTC_BAT_MIN_VOLTAGE          3550    /* 3.55V critical voltage */
+#define PALMTC_BAT_MAX_CURRENT          0       /* unknokn */
+#define PALMTC_BAT_MIN_CURRENT          0       /* unknown */
+#define PALMTC_BAT_MAX_CHARGE           1       /* unknown */
+#define PALMTC_BAT_MIN_CHARGE           1       /* unknown */
+#define PALMTC_MAX_LIFE_MINS            240     /* on-life in minutes */
+#define PALMTC_BAT_MEASURE_DELAY        (HZ * 1)
+/* BACKLIGHT */
+#define PALMTC_MAX_INTENSITY            0xFE
+#define PALMTC_DEFAULT_INTENSITY        0x7E
+#define PALMTC_LIMIT_MASK               0x7F
+#define PALMTC_PRESCALER                0x3F
+#define PALMTC_PERIOD_NS                3500
+#endif
diff --git a/arch/arm/mach-pxa/include/mach/palmtreo.h b/arch/arm/mach-pxa/include/mach/palmtreo.h
new file mode 100644
index 000000000000..2d3f14e3be29
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/palmtreo.h
@@ -0,0 +1,67 @@
+/*
+ * GPIOs and interrupts for Palm Treo smartphones
+ *
+ * currently supported:
+ *     Palm Treo 680 (GSM)
+ *     Palm Centro 685 (GSM)
+ *
+ * Author:     Tomas Cech <sleep_walker@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * find more info at www.hackndev.com
+ *
+ */
+#ifndef _INCLUDE_TREO_H_
+#define _INCLUDE_TREO_H_
+/* GPIOs */
+#define GPIO_NR_TREO_POWER_DETECT       0
+#define GPIO_NR_TREO_AMP_EN             27
+#define GPIO_NR_TREO_GREEN_LED  20
+#define GPIO_NR_TREO_RED_LED            79
+#define GPIO_NR_TREO_SD_DETECT_N        113
+#define GPIO_NR_TREO_EP_DETECT_N        116
+#define GPIO_NR_TREO_USB_DETECT 1
+#define GPIO_NR_TREO_USB_PULLUP 114
+#define GPIO_NR_TREO_GSM_POWER  40
+#define GPIO_NR_TREO_GSM_RESET  87
+#define GPIO_NR_TREO_GSM_WAKE   57
+#define GPIO_NR_TREO_GSM_HOST_WAKE      14
+#define GPIO_NR_TREO_GSM_TRIGGER        10
+#define GPIO_NR_TREO_IR_EN              115
+#define GPIO_NR_TREO_IR_TXD             47
+#define GPIO_NR_TREO_BL_POWER   38
+#define GPIO_NR_TREO_LCD_POWER  25
+/* Treo680 specific GPIOs */
+#ifdef CONFIG_MACH_TREO680
+#define GPIO_NR_TREO680_SD_READONLY     33
+#define GPIO_NR_TREO680_SD_POWER        42
+#define GPIO_NR_TREO680_VIBRATE_EN      44
+#define GPIO_NR_TREO680_KEYB_BL         24
+#define GPIO_NR_TREO680_BT_EN           43
+#endif /* CONFIG_MACH_TREO680 */
+/* Centro685 specific GPIOs */
+#define GPIO_NR_CENTRO_SD_POWER         21
+#define GPIO_NR_CENTRO_VIBRATE_EN       22
+#define GPIO_NR_CENTRO_KEYB_BL          33
+#define GPIO_NR_CENTRO_BT_EN            80
+/* Various addresses  */
+#define TREO_PHYS_RAM_START     0xa0000000
+#define TREO_PHYS_IO_START      0x40000000
+#define TREO_STR_BASE   0xa2000000
+/* BACKLIGHT */
+#define TREO_MAX_INTENSITY              254
+#define TREO_DEFAULT_INTENSITY  160
+#define TREO_LIMIT_MASK         0x7F
+#define TREO_PRESCALER          63
+#define TREO_PERIOD_NS          3500
+#endif
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h
index e74082c872e1..1be0db6ed55e 100644
--- a/arch/arm/mach-pxa/include/mach/palmtx.h
+++ b/arch/arm/mach-pxa/include/mach/palmtx.h
@@ -82,6 +82,11 @@
 #define PALMTX_PHYS_FLASH_START PXA_CS0_PHYS    /* ChipSelect 0 */
 #define PALMTX_PHYS_NAND_START  PXA_CS1_PHYS    /* ChipSelect 1 */
+#define PALMTX_NAND_ALE_PHYS    (PALMTX_PHYS_NAND_START | (1 << 24))
+#define PALMTX_NAND_CLE_PHYS    (PALMTX_PHYS_NAND_START | (1 << 25))
+#define PALMTX_NAND_ALE_VIRT    0xff100000
+#define PALMTX_NAND_CLE_VIRT    0xff200000
 /* TOUCHSCREEN */
 #define AC97_LINK_FRAME                 21
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
index d5a48a96dea7..7b4eadc6df3a 100644
--- a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
+++ b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
@@ -2,9 +2,12 @@
 #define __ASM_ARCH_PXA27x_KEYPAD_H
 #include <linux/input.h>
+#include <linux/input/matrix_keypad.h>
 #define MAX_MATRIX_KEY_ROWS     (8)
 #define MAX_MATRIX_KEY_COLS     (8)
+#define MATRIX_ROW_SHIFT        (3)
+#define MAX_DIRECT_KEY_NUM      (8)
 /* pxa3xx keypad platform specific parameters
 *
@@ -33,7 +36,7 @@ struct pxa27x_keypad_platform_data {
        /* direct keys */
        int             direct_key_num;
-        unsigned int    direct_key_map[8];
+        unsigned int    direct_key_map[MAX_DIRECT_KEY_NUM];
        /* rotary encoders 0 */
        int             enable_rotary0;
@@ -51,8 +54,6 @@ struct pxa27x_keypad_platform_data {
        unsigned int    debounce_interval;
 };
-#define KEY(row, col, val)      (((row) << 28) | ((col) << 24) | (val))
 extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);
 #endif /* __ASM_ARCH_PXA27x_KEYPAD_H */
diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
index 7d1a059b3d43..e91d63cfe811 100644
--- a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
+++ b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
@@ -208,7 +208,7 @@
 #define CKEN_MVED       43      /* < MVED clock enable */
 /* Note: GCU clock enable bit differs on PXA300/PXA310 and PXA320 */
-#define PXA300_CKEN_GRAPHICS    42      /* Graphics controller clock enable */
+#define CKEN_PXA300_GCU         42      /* Graphics controller clock enable */
-#define PXA320_CKEN_GRAPHICS    7       /* Graphics controller clock enable */
+#define CKEN_PXA320_GCU         7       /* Graphics controller clock enable */
 #endif /* __ASM_ARCH_PXA3XX_REGS_H */
diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
deleted file mode 100644
index 3478eae32d8a..000000000000
--- a/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef __ASM_ARCH_PXA3XX_NAND_H
-#define __ASM_ARCH_PXA3XX_NAND_H
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-struct pxa3xx_nand_timing {
-        unsigned int    tCH;  /* Enable signal hold time */
-        unsigned int    tCS;  /* Enable signal setup time */
-        unsigned int    tWH;  /* ND_nWE high duration */
-        unsigned int    tWP;  /* ND_nWE pulse time */
-        unsigned int    tRH;  /* ND_nRE high duration */
-        unsigned int    tRP;  /* ND_nRE pulse width */
-        unsigned int    tR;   /* ND_nWE high to ND_nRE low for read */
-        unsigned int    tWHR; /* ND_nWE high to ND_nRE low for status read */
-        unsigned int    tAR;  /* ND_ALE low to ND_nRE low delay */
-};
-struct pxa3xx_nand_cmdset {
-        uint16_t        read1;
-        uint16_t        read2;
-        uint16_t        program;
-        uint16_t        read_status;
-        uint16_t        read_id;
-        uint16_t        erase;
-        uint16_t        reset;
-        uint16_t        lock;
-        uint16_t        unlock;
-        uint16_t        lock_status;
-};
-struct pxa3xx_nand_flash {
-        const struct pxa3xx_nand_timing *timing; /* NAND Flash timing */
-        const struct pxa3xx_nand_cmdset *cmdset;
-        uint32_t page_per_block;/* Pages per block (PG_PER_BLK) */
-        uint32_t page_size;     /* Page size in bytes (PAGE_SZ) */
-        uint32_t flash_width;   /* Width of Flash memory (DWIDTH_M) */
-        uint32_t dfc_width;     /* Width of flash controller(DWIDTH_C) */
-        uint32_t num_blocks;    /* Number of physical blocks in Flash */
-        uint32_t chip_id;
-};
-struct pxa3xx_nand_platform_data {
-        /* the data flash bus is shared between the Static Memory
-         * Controller and the Data Flash Controller,  the arbiter
-         * controls the ownership of the bus
-         */
-        int     enable_arbiter;
-        /* allow platform code to keep OBM/bootloader defined NFC config */
-        int     keep_config;
-        const struct mtd_partition              *parts;
-        unsigned int                            nr_parts;
-        const struct pxa3xx_nand_flash *        flash;
-        size_t                                  num_flash;
-};
-extern void pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info);
-#endif /* __ASM_ARCH_PXA3XX_NAND_H */
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h
index 6932720ba04e..160ec83f51a6 100644
--- a/arch/arm/mach-pxa/include/mach/pxafb.h
+++ b/arch/arm/mach-pxa/include/mach/pxafb.h
@@ -76,7 +76,8 @@ struct pxafb_mode_info {
        u_char          bpp;
        u_int           cmap_greyscale:1,
                        depth:8,
-                        unused:23;
+                        transparency:1,
+                        unused:22;
        /* Parallel Mode Timing */
        u_char          hsync_len;
@@ -118,7 +119,8 @@ struct pxafb_mach_info {
        u_int           fixed_modes:1,
                        cmap_inverse:1,
                        cmap_static:1,
-                        unused:29;
+                        acceleration_enabled:1,
+                        unused:28;
        /* The following should be defined in LCCR0
         *      LCCR0_Act or LCCR0_Pas          Active or Passive
diff --git a/arch/arm/mach-pxa/include/mach/regs-intc.h b/arch/arm/mach-pxa/include/mach/regs-intc.h
index ad23e74b762f..68464ce1c1ea 100644
--- a/arch/arm/mach-pxa/include/mach/regs-intc.h
+++ b/arch/arm/mach-pxa/include/mach/regs-intc.h
@@ -13,6 +13,7 @@
 #define ICFP            __REG(0x40D0000C)  /* Interrupt Controller FIQ Pending Register */
 #define ICPR            __REG(0x40D00010)  /* Interrupt Controller Pending Register */
 #define ICCR            __REG(0x40D00014)  /* Interrupt Controller Control Register */
+#define ICHP            __REG(0x40D00018)  /* Interrupt Controller Highest Priority Register */
 #define ICIP2           __REG(0x40D0009C)  /* Interrupt Controller IRQ Pending Register 2 */
 #define ICMR2           __REG(0x40D000A0)  /* Interrupt Controller Mask Register 2 */
@@ -20,4 +21,14 @@
 #define ICFP2           __REG(0x40D000A8)  /* Interrupt Controller FIQ Pending Register 2 */
 #define ICPR2           __REG(0x40D000AC)  /* Interrupt Controller Pending Register 2 */
+#define ICIP3           __REG(0x40D00130)  /* Interrupt Controller IRQ Pending Register 3 */
+#define ICMR3           __REG(0x40D00134)  /* Interrupt Controller Mask Register 3 */
+#define ICLR3           __REG(0x40D00138)  /* Interrupt Controller Level Register 3 */
+#define ICFP3           __REG(0x40D0013C)  /* Interrupt Controller FIQ Pending Register 3 */
+#define ICPR3           __REG(0x40D00140)  /* Interrupt Controller Pending Register 3 */
+#define IPR(x)          __REG(0x40D0001C + (x < 32 ? (x << 2)           \
+                                : (x < 64 ? (0x94 + ((x - 32) << 2))    \
+                                : (0x128 + ((x - 64) << 2)))))
 #endif /* __ASM_MACH_REGS_INTC_H */
diff --git a/arch/arm/mach-pxa/include/mach/regs-u2d.h b/arch/arm/mach-pxa/include/mach/regs-u2d.h
new file mode 100644
index 000000000000..44b0b20b69a4
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/regs-u2d.h
@@ -0,0 +1,199 @@
+#ifndef __ASM_ARCH_PXA3xx_U2D_H
+#define __ASM_ARCH_PXA3xx_U2D_H
+#include <mach/bitfield.h>
+/*
+ * USB2 device controller registers and bits definitions
+ */
+#define U2DCR           (0x0000)        /* U2D Control Register */
+#define U2DCR_NDC       (1   << 31)     /* NAK During Config */
+#define U2DCR_HSTC      (0x7 << 28)     /* High Speed Timeout Calibration */
+#define U2DCR_SPEOREN   (1   << 27)     /* Short Packet EOR INTR generation Enable */
+#define U2DCR_FSTC      (0x7 << 24)     /* Full Speed Timeout Calibration */
+#define U2DCR_UCLKOVR   (1   << 22)     /* UTM Clock Override */
+#define U2DCR_ABP       (1   << 21)     /* Application Bus Power */
+#define U2DCR_ADD       (1   << 20)     /* Application Device Disconnect */
+#define U2DCR_CC        (1   << 19)     /* Configuration Change */
+#define U2DCR_HS        (1   << 18)     /* High Speed USB Detection */
+#define U2DCR_SMAC      (1   << 17)     /* Switch Endpoint Memory to Active Configuration */
+#define U2DCR_DWRE      (1   << 16)     /* Device Remote Wake-up Feature */
+#define U2DCR_ACN       (0xf << 12)     /* Active U2D Configuration Number */
+#define U2DCR_AIN       (0xf << 8)      /* Active U2D Interface Number */
+#define U2DCR_AAISN     (0xf << 4)      /* Active U2D Alternate Interface Setting Number */
+#define U2DCR_EMCE      (1   << 3)      /* Endpoint Memory Configuration Error */
+#define U2DCR_UDR       (1   << 2)      /* U2D Resume */
+#define U2DCR_UDA       (1   << 1)      /* U2D Active */
+#define U2DCR_UDE       (1   << 0)      /* U2D Enable */
+#define U2DICR                  (0x0004)        /* U2D Interrupt Control Register */
+#define U2DISR                  (0x000C)        /* U2D Interrupt Status Register */
+#define U2DINT_CC               (1 << 31)       /* Interrupt - Configuration Change */
+#define U2DINT_SOF              (1 << 30)       /* Interrupt - SOF */
+#define U2DINT_USOF             (1 << 29)       /* Interrupt - micro SOF */
+#define U2DINT_RU               (1 << 28)       /* Interrupt - Resume */
+#define U2DINT_SU               (1 << 27)       /* Interrupt - Suspend */
+#define U2DINT_RS               (1 << 26)       /* Interrupt - Reset */
+#define U2DINT_DPE              (1 << 25)       /* Interrupt - Data Packet Error */
+#define U2DINT_FIFOERR          (0x4)           /* Interrupt - endpoint FIFO error */
+#define U2DINT_PACKETCMP        (0x2)           /* Interrupt - endpoint packet complete */
+#define U2DINT_SPACKETCMP       (0x1)           /* Interrupt - endpoint short packet complete */
+#define U2DFNR                  (0x0014)        /* U2D Frame Number Register */
+#define U2DINT(n, intr)         (((intr) & 0x07) << (((n) & 0x07) * 3))
+#define U2DICR2                 (0x0008)        /* U2D Interrupt Control Register 2 */
+#define U2DISR2                 (0x0010)        /* U2D Interrupt Status Register 2 */
+#define U2DOTGCR                (0x0020)        /* U2D OTG Control Register */
+#define U2DOTGCR_OTGEN          (1 << 31)       /* On-The-Go Enable */
+#define U2DOTGCR_AALTHNP        (1 << 30)       /* A-device Alternate Host Negotiation Protocal Port Support */
+#define U2DOTGCR_AHNP           (1 << 29)       /* A-device Host Negotiation Protocal Support */
+#define U2DOTGCR_BHNP           (1 << 28)       /* B-device Host Negotiation Protocal Enable */
+#ifdef CONFIG_CPU_PXA930
+#define U2DOTGCR_LPA            (1 << 15)       /* ULPI low power mode active */
+#define U2DOTGCR_IESI           (1 << 13)       /* OTG interrupt Enable */
+#define U2DOTGCR_ISSI           (1 << 12)       /* OTG interrupt status */
+#endif
+#define U2DOTGCR_CKAF   (1 << 5)        /* Carkit Mode Alternate Function Select */
+#define U2DOTGCR_UTMID  (1 << 4)        /* UTMI Interface Disable */
+#define U2DOTGCR_ULAF   (1 << 3)        /* ULPI Mode Alternate Function Select */
+#define U2DOTGCR_SMAF   (1 << 2)        /* Serial Mode Alternate Function Select */
+#define U2DOTGCR_RTSM   (1 << 1)        /* Return to Synchronous Mode (ULPI Mode) */
+#define U2DOTGCR_ULE    (1 << 0)        /* ULPI Wrapper Enable */
+#define U2DOTGICR       (0x0024)        /* U2D OTG Interrupt Control Register */
+#define U2DOTGISR       (0x0028)        /* U2D OTG Interrupt Status Register */
+#define U2DOTGINT_SF    (1 << 17)       /* OTG Set Feature Command Received */
+#define U2DOTGINT_SI    (1 << 16)       /* OTG Interrupt */
+#define U2DOTGINT_RLS1  (1 << 14)       /* RXCMD Linestate[1] Change Interrupt Rise */
+#define U2DOTGINT_RLS0  (1 << 13)       /* RXCMD Linestate[0] Change Interrupt Rise */
+#define U2DOTGINT_RID   (1 << 12)       /* RXCMD OTG ID Change Interrupt Rise */
+#define U2DOTGINT_RSE   (1 << 11)       /* RXCMD OTG Session End Interrupt Rise */
+#define U2DOTGINT_RSV   (1 << 10)       /* RXCMD OTG Session Valid Interrupt Rise */
+#define U2DOTGINT_RVV   (1 << 9)        /* RXCMD OTG Vbus Valid Interrupt Rise */
+#define U2DOTGINT_RCK   (1 << 8)        /* RXCMD Carkit Interrupt Rise */
+#define U2DOTGINT_FLS1  (1 << 6)        /* RXCMD Linestate[1] Change Interrupt Fall */
+#define U2DOTGINT_FLS0  (1 << 5)        /* RXCMD Linestate[0] Change Interrupt Fall */
+#define U2DOTGINT_FID   (1 << 4)        /* RXCMD OTG ID Change Interrupt Fall */
+#define U2DOTGINT_FSE   (1 << 3)        /* RXCMD OTG Session End Interrupt Fall */
+#define U2DOTGINT_FSV   (1 << 2)        /* RXCMD OTG Session Valid Interrupt Fall */
+#define U2DOTGINT_FVV   (1 << 1)        /* RXCMD OTG Vbus Valid Interrupt Fall */
+#define U2DOTGINT_FCK   (1 << 0)        /* RXCMD Carkit Interrupt Fall */
+#define U2DOTGUSR       (0x002C)        /* U2D OTG ULPI Status Register */
+#define U2DOTGUSR_LPA   (1 << 31)       /* ULPI Low Power Mode Active */
+#define U2DOTGUSR_S6A   (1 << 30)       /* ULPI Serial Mode (6-pin) Active */
+#define U2DOTGUSR_S3A   (1 << 29)       /* ULPI Serial Mode (3-pin) Active */
+#define U2DOTGUSR_CKA   (1 << 28)       /* ULPI Car Kit Mode Active */
+#define U2DOTGUSR_LS1   (1 << 6)        /* RXCMD Linestate 1 Status */
+#define U2DOTGUSR_LS0   (1 << 5)        /* RXCMD Linestate 0 Status */
+#define U2DOTGUSR_ID    (1 << 4)        /* OTG IDGnd Status */
+#define U2DOTGUSR_SE    (1 << 3)        /* OTG Session End Status */
+#define U2DOTGUSR_SV    (1 << 2)        /* OTG Session Valid Status */
+#define U2DOTGUSR_VV    (1 << 1)        /* OTG Vbus Valid Status */
+#define U2DOTGUSR_CK    (1 << 0)        /* Carkit Interrupt Status */
+#define U2DOTGUCR       (0x0030)        /* U2D OTG ULPI Control Register */
+#define U2DOTGUCR_RUN   (1    << 25)    /* RUN */
+#define U2DOTGUCR_RNW   (1    << 24)    /* Read or Write operation */
+#define U2DOTGUCR_ADDR  (0x3f << 16)    /* Address of the ULPI PHY register */
+#define U2DOTGUCR_WDATA (0xff << 8)     /* The data for a WRITE command */
+#define U2DOTGUCR_RDATA (0xff << 0)     /* The data for a READ command */
+#define U2DP3CR         (0x0034)        /* U2D Port 3 Control Register */
+#define U2DP3CR_P2SS    (0x3 << 8)      /* Host Port 2 Serial Mode Select */
+#define U2DP3CR_P3SS    (0x7 << 4)      /* Host Port 3 Serial Mode Select */
+#define U2DP3CR_VPVMBEN (0x1 << 2)      /* Host Port 3 Vp/Vm Block Enable */
+#define U2DP3CR_CFG     (0x3 << 0)      /* Host Port 3 Configuration */
+#define U2DCSR0         (0x0100)        /* U2D Control/Status Register - Endpoint 0 */
+#define U2DCSR0_IPA     (1 << 8)        /* IN Packet Adjusted */
+#define U2DCSR0_SA      (1 << 7)        /* SETUP Active */
+#define U2DCSR0_RNE     (1 << 6)        /* Receive FIFO Not Empty */
+#define U2DCSR0_FST     (1 << 5)        /* Force Stall */
+#define U2DCSR0_SST     (1 << 4)        /* Send Stall */
+#define U2DCSR0_DME     (1 << 3)        /* DMA Enable */
+#define U2DCSR0_FTF     (1 << 2)        /* Flush Transmit FIFO */
+#define U2DCSR0_IPR     (1 << 1)        /* IN Packet Ready */
+#define U2DCSR0_OPC     (1 << 0)        /* OUT Packet Complete */
+#define U2DCSR(x)       (0x0100 + ((x) << 2))   /* U2D Control/Status Register - Endpoint x */
+#define U2DCSR_BF       (1 << 10)       /* Buffer Full, for OUT eps */
+#define U2DCSR_BE       (1 << 10)       /* Buffer Empty, for IN eps */
+#define U2DCSR_DPE      (1 << 9)        /* Data Packet Error, for ISO eps only */
+#define U2DCSR_FEF      (1 << 8)        /* Flush Endpoint FIFO */
+#define U2DCSR_SP       (1 << 7)        /* Short Packet Control/Status, for OUT eps only, readonly */
+#define U2DCSR_BNE      (1 << 6)        /* Buffer Not Empty, for OUT eps */
+#define U2DCSR_BNF      (1 << 6)        /* Buffer Not Full, for IN eps */
+#define U2DCSR_FST      (1 << 5)        /* Force STALL, write 1 set */
+#define U2DCSR_SST      (1 << 4)        /* Sent STALL, write 1 clear */
+#define U2DCSR_DME      (1 << 3)        /* DMA Enable */
+#define U2DCSR_TRN      (1 << 2)        /* Tx/Rx NAK, write 1 clear */
+#define U2DCSR_PC       (1 << 1)        /* Packet Complete, write 1 clear */
+#define U2DCSR_FS       (1 << 0)        /* FIFO needs Service */
+#define U2DBCR0         (0x0200)                /* U2D Byte Count Register - Endpoint 0 */
+#define U2DBCR(x)       (0x0200 + ((x) << 2))   /* U2D Byte Count Register - Endpoint x */
+#define U2DDR0          (0x0300)                /* U2D Data Register - Endpoint 0 */
+#define U2DEPCR(x)      (0x0400 + ((x) << 2))   /* U2D Configuration Register - Endpoint x */
+#define U2DEPCR_EE      (1 << 0)                /* Endpoint Enable */
+#define U2DEPCR_BS_MASK (0x3FE)                 /* Buffer Size, BS*8=FIFO size, max 8184B = 8KB */
+#define U2DSCA          (0x0500)                /* U2D Setup Command Address */
+#define U2DSCA_VALUE    (0x0120)
+#define U2DEN0          (0x0504)                /* U2D Endpoint Information Register - Endpoint 0 */
+#define U2DEN(x)        (0x0504 + ((x) << 2))   /* U2D Endpoint Information Register - Endpoint x */
+/* U2DMA registers */
+#define U2DMACSR0               (0x1000)        /* U2DMA Control/Status Register - Channel 0 */
+#define U2DMACSR(x)             (0x1000 + ((x) << 2))   /* U2DMA Control/Status Register - Channel x */
+#define U2DMACSR_RUN            (1 << 31)       /* Run Bit (read / write) */
+#define U2DMACSR_STOPIRQEN      (1 << 29)       /* Stop Interrupt Enable (read / write) */
+#define U2DMACSR_EORIRQEN       (1 << 28)       /* End of Receive Interrupt Enable (R/W) */
+#define U2DMACSR_EORJMPEN       (1 << 27)       /* Jump to next descriptor on EOR */
+#define U2DMACSR_EORSTOPEN      (1 << 26)       /* STOP on an EOR */
+#define U2DMACSR_RASIRQEN       (1 << 23)       /* Request After Cnannel Stopped Interrupt Enable */
+#define U2DMACSR_MASKRUN        (1 << 22)       /* Mask Run */
+#define U2DMACSR_SCEMC          (3 << 18)       /* System Bus Split Completion Error Message Class */
+#define U2DMACSR_SCEMI          (0x1f << 13)    /* System Bus Split Completion Error Message Index */
+#define U2DMACSR_BUSERRTYPE     (7 << 10)       /* PX Bus Error Type */
+#define U2DMACSR_EORINTR        (1 << 9)        /* End Of Receive */
+#define U2DMACSR_REQPEND        (1 << 8)        /* Request Pending */
+#define U2DMACSR_RASINTR        (1 << 4)        /* Request After Channel Stopped (read / write 1 clear) */#define U2DMACSR_STOPINTR     (1 << 3)        /* Stop Interrupt (read only) */
+#define U2DMACSR_ENDINTR        (1 << 2)        /* End Interrupt (read / write 1 clear) */
+#define U2DMACSR_STARTINTR      (1 << 1)        /* Start Interrupt (read / write 1 clear) */
+#define U2DMACSR_BUSERRINTR     (1 << 0)        /* Bus Error Interrupt (read / write 1 clear) */
+#define U2DMACR         (0x1080)                /* U2DMA Control Register */
+#define U2DMAINT        (0x10F0)                /* U2DMA Interrupt Register */
+#define U2DMABR0        (0x1100)                /* U2DMA Branch Register - Channel 0 */
+#define U2DMABR(x)      (0x1100 + (x) << 2)     /* U2DMA Branch Register - Channel x */
+#define U2DMADADR0      (0x1200)                /* U2DMA Descriptor Address Register - Channel 0 */
+#define U2DMADADR(x)    (0x1200 + (x) * 0x10)   /* U2DMA Descriptor Address Register - Channel x */
+#define U2DMADADR_STOP  (1U << 0)
+#define U2DMASADR0      (0x1204)                /* U2DMA Source Address Register - Channel 0 */
+#define U2DMASADR(x)    (0x1204 + (x) * 0x10)   /* U2DMA Source Address Register - Channel x */
+#define U2DMATADR0      (0x1208)                /* U2DMA Target Address Register - Channel 0 */
+#define U2DMATADR(x)    (0x1208 + (x) * 0x10)   /* U2DMA Target Address Register - Channel x */
+#define U2DMACMDR0      (0x120C)                /* U2DMA Command Address Register - Channel 0 */
+#define U2DMACMDR(x)    (0x120C + (x) * 0x10)   /* U2DMA Command Address Register - Channel x */
+#define U2DMACMDR_XFRDIS        (1 << 31)       /* Transfer Direction */
+#define U2DMACMDR_STARTIRQEN    (1 << 22)       /* Start Interrupt Enable */
+#define U2DMACMDR_ENDIRQEN      (1 << 21)       /* End Interrupt Enable */
+#define U2DMACMDR_PACKCOMP      (1 << 13)       /* Packet Complete */
+#define U2DMACMDR_LEN           (0x07ff)        /* length mask (max = 2K - 1) */
+#endif /* __ASM_ARCH_PXA3xx_U2D_H */
diff --git a/arch/arm/mach-pxa/include/mach/treo680.h b/arch/arm/mach-pxa/include/mach/treo680.h
deleted file mode 100644
index af443b24d99a..000000000000
--- a/arch/arm/mach-pxa/include/mach/treo680.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * GPIOs and interrupts for Palm Treo 680 smartphone
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#ifndef _INCLUDE_TREO680_H_
-#define _INCLUDE_TREO680_H_
-/* GPIOs */
-#define GPIO_NR_TREO680_POWER_DETECT    0
-#define GPIO_NR_TREO680_AMP_EN          27
-#define GPIO_NR_TREO680_KEYB_BL         24
-#define GPIO_NR_TREO680_VIBRATE_EN      44
-#define GPIO_NR_TREO680_GREEN_LED       20
-#define GPIO_NR_TREO680_RED_LED         79
-#define GPIO_NR_TREO680_SD_DETECT_N     113
-#define GPIO_NR_TREO680_SD_READONLY     33
-#define GPIO_NR_TREO680_EP_DETECT_N     116
-#define GPIO_NR_TREO680_SD_POWER        42
-#define GPIO_NR_TREO680_USB_DETECT      1
-#define GPIO_NR_TREO680_USB_PULLUP      114
-#define GPIO_NR_TREO680_GSM_POWER       40
-#define GPIO_NR_TREO680_GSM_RESET       87
-#define GPIO_NR_TREO680_GSM_WAKE        57
-#define GPIO_NR_TREO680_GSM_HOST_WAKE   14
-#define GPIO_NR_TREO680_GSM_TRIGGER     10
-#define GPIO_NR_TREO680_BT_EN           43
-#define GPIO_NR_TREO680_IR_EN           115
-#define GPIO_NR_TREO680_IR_TXD          47
-#define GPIO_NR_TREO680_BL_POWER        38
-#define GPIO_NR_TREO680_LCD_POWER       25
-/* Various addresses  */
-#define TREO680_PHYS_RAM_START  0xa0000000
-#define TREO680_PHYS_IO_START   0x40000000
-#define TREO680_STR_BASE        0xa2000000
-/* BACKLIGHT */
-#define TREO680_MAX_INTENSITY           254
-#define TREO680_DEFAULT_INTENSITY       160
-#define TREO680_LIMIT_MASK              0x7F
-#define TREO680_PRESCALER               63
-#define TREO680_PERIOD_NS               3500
-#endif
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h
index b54749413e96..237734b5b1be 100644
--- a/arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -37,7 +37,7 @@ static inline void arch_decomp_setup(void)
 {
        if (machine_is_littleton() || machine_is_intelmote2()
            || machine_is_csb726() || machine_is_stargate2()
-            || machine_is_cm_x300())
+            || machine_is_cm_x300() || machine_is_balloon3())
                UART = STUART;
 }
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index f6e0300e4f64..6112af431fa4 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -25,6 +25,8 @@
 #include "generic.h"
+#define MAX_INTERNAL_IRQS       128
 #define IRQ_BIT(n)      (((n) - PXA_IRQ(0)) & 0x1f)
 #define _ICMR(n)        (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICMR2 : &ICMR))
 #define _ICLR(n)        (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICLR2 : &ICLR))
@@ -120,7 +122,9 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn)
 void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 {
-        int irq;
+        int irq, i;
+        BUG_ON(irq_nr > MAX_INTERNAL_IRQS);
        pxa_internal_irq_nr = irq_nr;
@@ -129,6 +133,12 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
                _ICLR(irq) = 0; /* all IRQs are IRQ, not FIQ */
        }
+        /* initialize interrupt priority */
+        if (cpu_is_pxa27x() || cpu_is_pxa3xx()) {
+                for (i = 0; i < irq_nr; i++)
+                        IPR(i) = i | (1 << 31);
+        }
        /* only unmasked interrupts kick us out of idle */
        ICCR = 1;
@@ -143,7 +153,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 }
 #ifdef CONFIG_PM
-static unsigned long saved_icmr[2];
+static unsigned long saved_icmr[MAX_INTERNAL_IRQS/32];
+static unsigned long saved_ipr[MAX_INTERNAL_IRQS];
 static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
 {
@@ -153,6 +164,8 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
                saved_icmr[i] = _ICMR(irq);
                _ICMR(irq) = 0;
        }
+        for (i = 0; i < pxa_internal_irq_nr; i++)
+                saved_ipr[i] = IPR(i);
        return 0;
 }
@@ -165,6 +178,8 @@ static int pxa_irq_resume(struct sys_device *dev)
                _ICMR(irq) = saved_icmr[i];
                _ICLR(irq) = 0;
        }
+        for (i = 0; i < pxa_internal_irq_nr; i++)
+                IPR(i) = saved_ipr[i];
        ICCR = 1;
        return 0;
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index 55b3788fd1ae..f28c1715b910 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -44,10 +44,10 @@
 #include <mach/ssp.h>
 #include <mach/mmc.h>
 #include <mach/pxa2xx_spi.h>
-#include <plat/i2c.h>
 #include <mach/pxa27x_keypad.h>
-#include <mach/pxa3xx_nand.h>
 #include <mach/littleton.h>
+#include <plat/i2c.h>
+#include <plat/pxa3xx_nand.h>
 #include "generic.h"
@@ -265,45 +265,12 @@ static inline void littleton_init_keypad(void) {}
 #endif
 #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
-static int littleton_mci_init(struct device *dev,
-                              irq_handler_t littleton_detect_int, void *data)
-{
-        int err, gpio_cd = GPIO_MMC1_CARD_DETECT;
-        err = gpio_request(gpio_cd, "mmc card detect");
-        if (err)
-                goto err_request_cd;
-        gpio_direction_input(gpio_cd);
-        err = request_irq(gpio_to_irq(gpio_cd), littleton_detect_int,
-                          IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-                          "mmc card detect", data);
-        if (err) {
-                dev_err(dev, "failed to request card detect IRQ\n");
-                goto err_request_irq;
-        }
-        return 0;
-err_request_irq:
-        gpio_free(gpio_cd);
-err_request_cd:
-        return err;
-}
-static void littleton_mci_exit(struct device *dev, void *data)
-{
-        int gpio_cd = GPIO_MMC1_CARD_DETECT;
-        free_irq(gpio_to_irq(gpio_cd), data);
-        gpio_free(gpio_cd);
-}
 static struct pxamci_platform_data littleton_mci_platform_data = {
-        .detect_delay   = 20,
+        .detect_delay           = 20,
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .init           = littleton_mci_init,
+        .gpio_card_detect       = GPIO_MMC1_CARD_DETECT,
-        .exit           = littleton_mci_exit,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static void __init littleton_init_mmc(void)
@@ -446,6 +413,10 @@ static void __init littleton_init(void)
        /* initialize MFP configurations */
        pxa3xx_mfp_config(ARRAY_AND_SIZE(littleton_mfp_cfg));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        /*
         * Note: we depend bootloader set the correct
         * value to MSC register for SMC91x.
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index d64395f26a3e..1373c22dbb83 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -455,6 +455,10 @@ static void __init lpd270_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(lpd270_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        lpd270_flash_data[0].width = (BOOT_DEF & 1) ? 2 : 4;
        lpd270_flash_data[1].width = 4;
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index f04c8333dff7..98ee7e590299 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -482,11 +482,14 @@ static void lubbock_mci_exit(struct device *dev, void *data)
 }
 static struct pxamci_platform_data lubbock_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .detect_delay   = 1,
+        .detect_delay           = 1,
-        .init           = lubbock_mci_init,
+        .init                   = lubbock_mci_init,
-        .get_ro         = lubbock_mci_get_ro,
+        .get_ro                 = lubbock_mci_get_ro,
-        .exit           = lubbock_mci_exit,
+        .exit                   = lubbock_mci_exit,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static void lubbock_irda_transceiver_mode(struct device *dev, int mode)
@@ -504,8 +507,9 @@ static void lubbock_irda_transceiver_mode(struct device *dev, int mode)
 }
 static struct pxaficp_platform_data lubbock_ficp_platform_data = {
-        .transceiver_cap  = IR_SIRMODE | IR_FIRMODE,
+        .gpio_pwdown            = -1,
-        .transceiver_mode = lubbock_irda_transceiver_mode,
+        .transceiver_cap        = IR_SIRMODE | IR_FIRMODE,
+        .transceiver_mode       = lubbock_irda_transceiver_mode,
 };
 static void __init lubbock_init(void)
@@ -514,6 +518,10 @@ static void __init lubbock_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL);
        pxa_set_udc_info(&udc_info);
        set_pxa_fb_info(&sharp_lm8v31);
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index ca39669cffc5..8a38d604dc77 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -140,15 +140,9 @@ static unsigned long magician_pin_config[] __initdata = {
 * IRDA
 */
-static void magician_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO83_MAGICIAN_nIR_EN, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
 static struct pxaficp_platform_data magician_ficp_info = {
-        .transceiver_cap  = IR_SIRMODE | IR_OFF,
+        .gpio_pwdown            = GPIO83_MAGICIAN_nIR_EN,
-        .transceiver_mode = magician_irda_transceiver_mode,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
 };
 /*
@@ -651,55 +645,24 @@ static struct platform_device bq24022 = {
 static int magician_mci_init(struct device *dev,
                                irq_handler_t detect_irq, void *data)
 {
-        int err;
+        return request_irq(IRQ_MAGICIAN_SD, detect_irq,
-        err = request_irq(IRQ_MAGICIAN_SD, detect_irq,
                                IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
-                                "MMC card detect", data);
+                                "mmc card detect", data);
-        if (err)
-                goto err_request_irq;
-        err = gpio_request(EGPIO_MAGICIAN_SD_POWER, "SD_POWER");
-        if (err)
-                goto err_request_power;
-        err = gpio_request(EGPIO_MAGICIAN_nSD_READONLY, "nSD_READONLY");
-        if (err)
-                goto err_request_readonly;
-        return 0;
-err_request_readonly:
-        gpio_free(EGPIO_MAGICIAN_SD_POWER);
-err_request_power:
-        free_irq(IRQ_MAGICIAN_SD, data);
-err_request_irq:
-        return err;
-}
-static void magician_mci_setpower(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data *pdata = dev->platform_data;
-        gpio_set_value(EGPIO_MAGICIAN_SD_POWER, (1 << vdd) & pdata->ocr_mask);
-}
-static int magician_mci_get_ro(struct device *dev)
-{
-        return (!gpio_get_value(EGPIO_MAGICIAN_nSD_READONLY));
 }
 static void magician_mci_exit(struct device *dev, void *data)
 {
-        gpio_free(EGPIO_MAGICIAN_nSD_READONLY);
-        gpio_free(EGPIO_MAGICIAN_SD_POWER);
        free_irq(IRQ_MAGICIAN_SD, data);
 }
 static struct pxamci_platform_data magician_mci_info = {
-        .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init     = magician_mci_init,
+        .init                   = magician_mci_init,
-        .get_ro   = magician_mci_get_ro,
+        .exit                   = magician_mci_exit,
-        .setpower = magician_mci_setpower,
+        .gpio_card_detect       = -1,
-        .exit     = magician_mci_exit,
+        .gpio_card_ro           = EGPIO_MAGICIAN_nSD_READONLY,
+        .gpio_card_ro_invert    = 1,
+        .gpio_power             = EGPIO_MAGICIAN_SD_POWER,
 };
@@ -779,6 +742,10 @@ static void __init magician_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(magician_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_add_devices(ARRAY_AND_SIZE(devices));
        err = gpio_request(GPIO83_MAGICIAN_nIR_EN, "nIR_EN");
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index f4dabf0273ca..851ee0fc32e2 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -450,10 +450,13 @@ static void mainstone_mci_exit(struct device *dev, void *data)
 }
 static struct pxamci_platform_data mainstone_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = mainstone_mci_init,
+        .init                   = mainstone_mci_init,
-        .setpower       = mainstone_mci_setpower,
+        .setpower               = mainstone_mci_setpower,
-        .exit           = mainstone_mci_exit,
+        .exit                   = mainstone_mci_exit,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static void mainstone_irda_transceiver_mode(struct device *dev, int mode)
@@ -476,8 +479,9 @@ static void mainstone_irda_transceiver_mode(struct device *dev, int mode)
 }
 static struct pxaficp_platform_data mainstone_ficp_platform_data = {
-        .transceiver_cap  = IR_SIRMODE | IR_FIRMODE | IR_OFF,
+        .gpio_pwdown            = -1,
-        .transceiver_mode = mainstone_irda_transceiver_mode,
+        .transceiver_cap        = IR_SIRMODE | IR_FIRMODE | IR_OFF,
+        .transceiver_mode       = mainstone_irda_transceiver_mode,
 };
 static struct gpio_keys_button gpio_keys_button[] = {
@@ -572,6 +576,10 @@ static void __init mainstone_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(mainstone_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        mst_flash_data[0].width = (BOOT_DEF & 1) ? 2 : 4;
        mst_flash_data[1].width = 4;
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 2d28132c725b..2466a44d8fda 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -434,72 +434,15 @@ struct gpio_vbus_mach_info gpio_vbus_data = {
 /*
 * SDIO/MMC Card controller
 */
-static void mci_setpower(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data *p_d = dev->platform_data;
-        if ((1 << vdd) & p_d->ocr_mask)
-                gpio_set_value(GPIO91_SDIO_EN, 1);      /* enable SDIO power */
-        else
-                gpio_set_value(GPIO91_SDIO_EN, 0);      /* disable SDIO power */
-}
-static int mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(GPIO78_SDIO_RO);
-}
-struct gpio_ress mci_gpios[] = {
-        MIO_GPIO_IN(GPIO78_SDIO_RO,     "SDIO readonly detect"),
-        MIO_GPIO_IN(GPIO15_SDIO_INSERT, "SDIO insertion detect"),
-        MIO_GPIO_OUT(GPIO91_SDIO_EN, 0, "SDIO power enable")
-};
-static void mci_exit(struct device *dev, void *data)
-{
-        mio_gpio_free(ARRAY_AND_SIZE(mci_gpios));
-        free_irq(gpio_to_irq(GPIO15_SDIO_INSERT), data);
-}
-static struct pxamci_platform_data mioa701_mci_info;
 /**
 * The card detect interrupt isn't debounced so we delay it by 250ms
 * to give the card a chance to fully insert/eject.
 */
-static int mci_init(struct device *dev, irq_handler_t detect_int, void *data)
-{
-        int rc;
-        int irq = gpio_to_irq(GPIO15_SDIO_INSERT);
-        rc = mio_gpio_request(ARRAY_AND_SIZE(mci_gpios));
-        if (rc)
-                goto err_gpio;
-        /* enable RE/FE interrupt on card insertion and removal */
-        rc = request_irq(irq, detect_int,
-                         IRQF_DISABLED | IRQF_TRIGGER_RISING |
-                         IRQF_TRIGGER_FALLING,
-                         "MMC card detect", data);
-        if (rc)
-                goto err_irq;
-        mioa701_mci_info.detect_delay = msecs_to_jiffies(250);
-        return 0;
-err_irq:
-        dev_err(dev, "mioa701_mci_init: MMC/SD:"
-                " can't request MMC card detect IRQ\n");
-        mio_gpio_free(ARRAY_AND_SIZE(mci_gpios));
-err_gpio:
-        return rc;
-}
 static struct pxamci_platform_data mioa701_mci_info = {
-        .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .init     = mci_init,
+        .gpio_card_detect       = GPIO15_SDIO_INSERT,
-        .get_ro   = mci_get_ro,
+        .gpio_card_ro           = GPIO78_SDIO_RO,
-        .setpower = mci_setpower,
+        .gpio_power             = GPIO91_SDIO_EN,
-        .exit     = mci_exit,
 };
 /* FlashRAM */
@@ -765,19 +708,20 @@ static struct i2c_board_info __initdata mioa701_pi2c_devices[] = {
        },
 };
-static struct soc_camera_link iclink = {
-        .bus_id = 0, /* Must match id in pxa27x_device_camera in device.c */
-};
 /* Board I2C devices. */
 static struct i2c_board_info __initdata mioa701_i2c_devices[] = {
        {
-                /* Must initialize before the camera(s) */
                I2C_BOARD_INFO("mt9m111", 0x5d),
-                .platform_data = &iclink,
        },
 };
+static struct soc_camera_link iclink = {
+        .bus_id         = 0, /* Match id in pxa27x_device_camera in device.c */
+        .board_info     = &mioa701_i2c_devices[0],
+        .i2c_adapter_id = 0,
+        .module_name    = "mt9m111",
+};
 struct i2c_pxa_platform_data i2c_pdata = {
        .fast_mode = 1,
 };
@@ -811,6 +755,7 @@ MIO_SIMPLE_DEV(pxa2xx_pcm,	  "pxa2xx-pcm",	    NULL)
 MIO_SIMPLE_DEV(mioa701_sound,     "mioa701-wm9713", NULL)
 MIO_SIMPLE_DEV(mioa701_board,     "mioa701-board",  NULL)
 MIO_SIMPLE_DEV(gpio_vbus,         "gpio-vbus",      &gpio_vbus_data);
+MIO_SIMPLE_DEV(mioa701_camera,    "soc-camera-pdrv",&iclink);
 static struct platform_device *devices[] __initdata = {
        &mioa701_gpio_keys,
@@ -821,6 +766,7 @@ static struct platform_device *devices[] __initdata = {
        &power_dev,
        &strataflash,
        &gpio_vbus,
+        &mioa701_camera,
        &mioa701_board,
 };
@@ -841,7 +787,7 @@ static void mioa701_restart(char c, const char *cmd)
 static struct gpio_ress global_gpios[] = {
        MIO_GPIO_OUT(GPIO9_CHARGE_EN, 1, "Charger enable"),
        MIO_GPIO_OUT(GPIO18_POWEROFF, 0, "Power Off"),
-        MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power")
+        MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power"),
 };
 static void __init mioa701_machine_init(void)
@@ -852,9 +798,13 @@ static void __init mioa701_machine_init(void)
        UP2OCR = UP2OCR_HXOE;
        pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        mio_gpio_request(ARRAY_AND_SIZE(global_gpios));
        bootstrap_init();
        set_pxa_fb_info(&mioa701_pxafb_info);
+        mioa701_mci_info.detect_delay = msecs_to_jiffies(250);
        pxa_set_mci_info(&mioa701_mci_info);
        pxa_set_keypad_info(&mioa701_keypad_info);
        wm97xx_bat_set_pdata(&mioa701_battery_data);
@@ -869,7 +819,6 @@ static void __init mioa701_machine_init(void)
        pxa_set_i2c_info(&i2c_pdata);
        pxa27x_set_i2c_power_info(NULL);
        pxa_set_camera_info(&mioa701_pxacamera_platform_data);
-        i2c_register_board_info(0, ARRAY_AND_SIZE(mioa701_i2c_devices));
 }
 static void mioa701_machine_exit(void)
diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c
index a65713ce019e..6d4503927a76 100644
--- a/arch/arm/mach-pxa/mp900.c
+++ b/arch/arm/mach-pxa/mp900.c
@@ -84,6 +84,9 @@ static struct platform_device *devices[] __initdata = {
 static void __init mp900c_init(void)
 {
        printk(KERN_INFO "MobilePro 900/C machine init\n");
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_add_devices(devices, ARRAY_SIZE(devices));
 }
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
index 169fcc18154e..59140217890a 100644
--- a/arch/arm/mach-pxa/palmld.c
+++ b/arch/arm/mach-pxa/palmld.c
@@ -25,6 +25,9 @@
 #include <linux/wm97xx_batt.h>
 #include <linux/power_supply.h>
 #include <linux/sysdev.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -141,85 +144,50 @@ static unsigned long palmld_pin_config[] __initdata = {
 };
 /******************************************************************************
- * SD/MMC card controller
+ * NOR Flash
 ******************************************************************************/
-static int palmld_mci_init(struct device *dev, irq_handler_t palmld_detect_int,
+static struct mtd_partition palmld_partitions[] = {
-                                void *data)
+        {
-{
+                .name           = "Flash",
-        int err = 0;
+                .offset         = 0x00000000,
+                .size           = MTDPART_SIZ_FULL,
-        /* Setup an interrupt for detecting card insert/remove events */
+                .mask_flags     = 0
-        err = gpio_request(GPIO_NR_PALMLD_SD_DETECT_N, "SD IRQ");
-        if (err)
-                goto err;
-        err = gpio_direction_input(GPIO_NR_PALMLD_SD_DETECT_N);
-        if (err)
-                goto err2;
-        err = request_irq(gpio_to_irq(GPIO_NR_PALMLD_SD_DETECT_N),
-                        palmld_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                        "SD/MMC card detect", data);
-        if (err) {
-                printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
-                                __func__);
-                goto err2;
        }
+};
-        err = gpio_request(GPIO_NR_PALMLD_SD_POWER, "SD_POWER");
+static struct physmap_flash_data palmld_flash_data[] = {
-        if (err)
+        {
-                goto err3;
+                .width          = 2,                    /* bankwidth in bytes */
-        err = gpio_direction_output(GPIO_NR_PALMLD_SD_POWER, 0);
+                .parts          = palmld_partitions,
-        if (err)
+                .nr_parts       = ARRAY_SIZE(palmld_partitions)
-                goto err4;
+        }
+};
-        err = gpio_request(GPIO_NR_PALMLD_SD_READONLY, "SD_READONLY");
-        if (err)
-                goto err4;
-        err = gpio_direction_input(GPIO_NR_PALMLD_SD_READONLY);
-        if (err)
-                goto err5;
-        printk(KERN_DEBUG "%s: irq registered\n", __func__);
-        return 0;
-err5:
-        gpio_free(GPIO_NR_PALMLD_SD_READONLY);
-err4:
-        gpio_free(GPIO_NR_PALMLD_SD_POWER);
-err3:
-        free_irq(gpio_to_irq(GPIO_NR_PALMLD_SD_DETECT_N), data);
-err2:
-        gpio_free(GPIO_NR_PALMLD_SD_DETECT_N);
-err:
-        return err;
-}
-static void palmld_mci_exit(struct device *dev, void *data)
-{
-        gpio_free(GPIO_NR_PALMLD_SD_READONLY);
-        gpio_free(GPIO_NR_PALMLD_SD_POWER);
-        free_irq(gpio_to_irq(GPIO_NR_PALMLD_SD_DETECT_N), data);
-        gpio_free(GPIO_NR_PALMLD_SD_DETECT_N);
-}
-static void palmld_mci_power(struct device *dev, unsigned int vdd)
+static struct resource palmld_flash_resource = {
-{
+        .start  = PXA_CS0_PHYS,
-        struct pxamci_platform_data *p_d = dev->platform_data;
+        .end    = PXA_CS0_PHYS + SZ_4M - 1,
-        gpio_set_value(GPIO_NR_PALMLD_SD_POWER, p_d->ocr_mask & (1 << vdd));
+        .flags  = IORESOURCE_MEM,
-}
+};
-static int palmld_mci_get_ro(struct device *dev)
+static struct platform_device palmld_flash = {
-{
+        .name           = "physmap-flash",
-        return gpio_get_value(GPIO_NR_PALMLD_SD_READONLY);
+        .id             = 0,
-}
+        .resource       = &palmld_flash_resource,
+        .num_resources  = 1,
+        .dev            = {
+                .platform_data = palmld_flash_data,
+        },
+};
+/******************************************************************************
+ * SD/MMC card controller
+ ******************************************************************************/
 static struct pxamci_platform_data palmld_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .setpower       = palmld_mci_power,
+        .gpio_card_detect       = GPIO_NR_PALMLD_SD_DETECT_N,
-        .get_ro         = palmld_mci_get_ro,
+        .gpio_card_ro           = GPIO_NR_PALMLD_SD_READONLY,
-        .init           = palmld_mci_init,
+        .gpio_power             = GPIO_NR_PALMLD_SD_POWER,
-        .exit           = palmld_mci_exit,
+        .detect_delay           = 20,
 };
 /******************************************************************************
@@ -336,35 +304,9 @@ static struct platform_device palmld_backlight = {
 /******************************************************************************
 * IrDA
 ******************************************************************************/
-static int palmld_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(GPIO_NR_PALMLD_IR_DISABLE, "IR DISABLE");
-        if (err)
-                goto err;
-        err = gpio_direction_output(GPIO_NR_PALMLD_IR_DISABLE, 1);
-        if (err)
-                gpio_free(GPIO_NR_PALMLD_IR_DISABLE);
-err:
-        return err;
-}
-static void palmld_irda_shutdown(struct device *dev)
-{
-        gpio_free(GPIO_NR_PALMLD_IR_DISABLE);
-}
-static void palmld_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO_NR_PALMLD_IR_DISABLE, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
 static struct pxaficp_platform_data palmld_ficp_platform_data = {
-        .startup                = palmld_irda_startup,
+        .gpio_pwdown            = GPIO_NR_PALMLD_IR_DISABLE,
-        .shutdown               = palmld_irda_shutdown,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_cap        = IR_SIRMODE | IR_FIRMODE | IR_OFF,
-        .transceiver_mode       = palmld_irda_transceiver_mode,
 };
 /******************************************************************************
@@ -560,6 +502,7 @@ static struct platform_device *devices[] __initdata = {
        &power_supply,
        &palmld_asoc,
        &palmld_hdd,
+        &palmld_flash,
 };
 static struct map_desc palmld_io_desc[] __initdata = {
@@ -587,6 +530,10 @@ static void __init palmld_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmld_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        palmld_pm_init();
        set_pxa_fb_info(&palmld_lcd_screen);
        pxa_set_mci_info(&palmld_mci_platform_data);
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index 33f726ff55e5..7f89ca20f13a 100644
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -124,83 +124,12 @@ static unsigned long palmt5_pin_config[] __initdata = {
 /******************************************************************************
 * SD/MMC card controller
 ******************************************************************************/
-static int palmt5_mci_init(struct device *dev, irq_handler_t palmt5_detect_int,
-                                void *data)
-{
-        int err = 0;
-        /* Setup an interrupt for detecting card insert/remove events */
-        err = gpio_request(GPIO_NR_PALMT5_SD_DETECT_N, "SD IRQ");
-        if (err)
-                goto err;
-        err = gpio_direction_input(GPIO_NR_PALMT5_SD_DETECT_N);
-        if (err)
-                goto err2;
-        err = request_irq(gpio_to_irq(GPIO_NR_PALMT5_SD_DETECT_N),
-                        palmt5_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                        "SD/MMC card detect", data);
-        if (err) {
-                printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
-                                __func__);
-                goto err2;
-        }
-        err = gpio_request(GPIO_NR_PALMT5_SD_POWER, "SD_POWER");
-        if (err)
-                goto err3;
-        err = gpio_direction_output(GPIO_NR_PALMT5_SD_POWER, 0);
-        if (err)
-                goto err4;
-        err = gpio_request(GPIO_NR_PALMT5_SD_READONLY, "SD_READONLY");
-        if (err)
-                goto err4;
-        err = gpio_direction_input(GPIO_NR_PALMT5_SD_READONLY);
-        if (err)
-                goto err5;
-        printk(KERN_DEBUG "%s: irq registered\n", __func__);
-        return 0;
-err5:
-        gpio_free(GPIO_NR_PALMT5_SD_READONLY);
-err4:
-        gpio_free(GPIO_NR_PALMT5_SD_POWER);
-err3:
-        free_irq(gpio_to_irq(GPIO_NR_PALMT5_SD_DETECT_N), data);
-err2:
-        gpio_free(GPIO_NR_PALMT5_SD_DETECT_N);
-err:
-        return err;
-}
-static void palmt5_mci_exit(struct device *dev, void *data)
-{
-        gpio_free(GPIO_NR_PALMT5_SD_READONLY);
-        gpio_free(GPIO_NR_PALMT5_SD_POWER);
-        free_irq(IRQ_GPIO_PALMT5_SD_DETECT_N, data);
-        gpio_free(GPIO_NR_PALMT5_SD_DETECT_N);
-}
-static void palmt5_mci_power(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data *p_d = dev->platform_data;
-        gpio_set_value(GPIO_NR_PALMT5_SD_POWER, p_d->ocr_mask & (1 << vdd));
-}
-static int palmt5_mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(GPIO_NR_PALMT5_SD_READONLY);
-}
 static struct pxamci_platform_data palmt5_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .setpower       = palmt5_mci_power,
+        .gpio_card_detect       = GPIO_NR_PALMT5_SD_DETECT_N,
-        .get_ro         = palmt5_mci_get_ro,
+        .gpio_card_ro           = GPIO_NR_PALMT5_SD_READONLY,
-        .init           = palmt5_mci_init,
+        .gpio_power             = GPIO_NR_PALMT5_SD_POWER,
-        .exit           = palmt5_mci_exit,
+        .detect_delay           = 20,
 };
 /******************************************************************************
@@ -314,35 +243,9 @@ static struct platform_device palmt5_backlight = {
 /******************************************************************************
 * IrDA
 ******************************************************************************/
-static int palmt5_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(GPIO_NR_PALMT5_IR_DISABLE, "IR DISABLE");
-        if (err)
-                goto err;
-        err = gpio_direction_output(GPIO_NR_PALMT5_IR_DISABLE, 1);
-        if (err)
-                gpio_free(GPIO_NR_PALMT5_IR_DISABLE);
-err:
-        return err;
-}
-static void palmt5_irda_shutdown(struct device *dev)
-{
-        gpio_free(GPIO_NR_PALMT5_IR_DISABLE);
-}
-static void palmt5_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO_NR_PALMT5_IR_DISABLE, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
 static struct pxaficp_platform_data palmt5_ficp_platform_data = {
-        .startup                = palmt5_irda_startup,
+        .gpio_pwdown            = GPIO_NR_PALMT5_IR_DISABLE,
-        .shutdown               = palmt5_irda_shutdown,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_cap        = IR_SIRMODE | IR_FIRMODE | IR_OFF,
-        .transceiver_mode       = palmt5_irda_transceiver_mode,
 };
 /******************************************************************************
@@ -516,6 +419,10 @@ static void __init palmt5_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        palmt5_pm_init();
        set_pxa_fb_info(&palmt5_lcd_screen);
        pxa_set_mci_info(&palmt5_mci_platform_data);
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c
new file mode 100644
index 000000000000..308417592007
--- /dev/null
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -0,0 +1,441 @@
+/*
+ * linux/arch/arm/mach-pxa/palmtc.c
+ *
+ * Support for the Palm Tungsten|C
+ *
+ * Author:      Marek Vasut <marek.vasut@gmail.com>
+ *
+ * Based on work of:
+ *              Petr Blaha <p3t3@centrum.cz>
+ *              Chetan S. Kumar <shivakumar.chetan@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/input.h>
+#include <linux/pwm_backlight.h>
+#include <linux/gpio.h>
+#include <linux/input/matrix_keypad.h>
+#include <linux/ucb1400.h>
+#include <linux/power_supply.h>
+#include <linux/gpio_keys.h>
+#include <linux/mtd/physmap.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/audio.h>
+#include <mach/palmtc.h>
+#include <mach/mmc.h>
+#include <mach/pxafb.h>
+#include <mach/mfp-pxa25x.h>
+#include <mach/irda.h>
+#include <mach/udc.h>
+#include <mach/pxa2xx-regs.h>
+#include "generic.h"
+#include "devices.h"
+/******************************************************************************
+ * Pin configuration
+ ******************************************************************************/
+static unsigned long palmtc_pin_config[] __initdata = {
+        /* MMC */
+        GPIO6_MMC_CLK,
+        GPIO8_MMC_CS0,
+        GPIO12_GPIO,    /* detect */
+        GPIO32_GPIO,    /* power */
+        GPIO54_GPIO,    /* r/o switch */
+        /* PCMCIA */
+        GPIO52_nPCE_1,
+        GPIO53_nPCE_2,
+        GPIO50_nPIOR,
+        GPIO51_nPIOW,
+        GPIO49_nPWE,
+        GPIO48_nPOE,
+        GPIO52_nPCE_1,
+        GPIO53_nPCE_2,
+        GPIO57_nIOIS16,
+        GPIO56_nPWAIT,
+        /* AC97 */
+        GPIO28_AC97_BITCLK,
+        GPIO29_AC97_SDATA_IN_0,
+        GPIO30_AC97_SDATA_OUT,
+        GPIO31_AC97_SYNC,
+        /* IrDA */
+        GPIO45_GPIO,    /* ir disable */
+        GPIO46_FICP_RXD,
+        GPIO47_FICP_TXD,
+        /* PWM */
+        GPIO17_PWM1_OUT,
+        /* USB */
+        GPIO4_GPIO,     /* detect */
+        GPIO36_GPIO,    /* pullup */
+        /* LCD */
+        GPIO58_LCD_LDD_0,
+        GPIO59_LCD_LDD_1,
+        GPIO60_LCD_LDD_2,
+        GPIO61_LCD_LDD_3,
+        GPIO62_LCD_LDD_4,
+        GPIO63_LCD_LDD_5,
+        GPIO64_LCD_LDD_6,
+        GPIO65_LCD_LDD_7,
+        GPIO66_LCD_LDD_8,
+        GPIO67_LCD_LDD_9,
+        GPIO68_LCD_LDD_10,
+        GPIO69_LCD_LDD_11,
+        GPIO70_LCD_LDD_12,
+        GPIO71_LCD_LDD_13,
+        GPIO72_LCD_LDD_14,
+        GPIO73_LCD_LDD_15,
+        GPIO74_LCD_FCLK,
+        GPIO75_LCD_LCLK,
+        GPIO76_LCD_PCLK,
+        GPIO77_LCD_BIAS,
+        /* MATRIX KEYPAD */
+        GPIO0_GPIO | WAKEUP_ON_EDGE_BOTH,       /* in 0 */
+        GPIO9_GPIO | WAKEUP_ON_EDGE_BOTH,       /* in 1 */
+        GPIO10_GPIO | WAKEUP_ON_EDGE_BOTH,      /* in 2 */
+        GPIO11_GPIO | WAKEUP_ON_EDGE_BOTH,      /* in 3 */
+        GPIO18_GPIO | MFP_LPM_DRIVE_LOW,        /* out 0 */
+        GPIO19_GPIO | MFP_LPM_DRIVE_LOW,        /* out 1 */
+        GPIO20_GPIO | MFP_LPM_DRIVE_LOW,        /* out 2 */
+        GPIO21_GPIO | MFP_LPM_DRIVE_LOW,        /* out 3 */
+        GPIO22_GPIO | MFP_LPM_DRIVE_LOW,        /* out 4 */
+        GPIO23_GPIO | MFP_LPM_DRIVE_LOW,        /* out 5 */
+        GPIO24_GPIO | MFP_LPM_DRIVE_LOW,        /* out 6 */
+        GPIO25_GPIO | MFP_LPM_DRIVE_LOW,        /* out 7 */
+        GPIO26_GPIO | MFP_LPM_DRIVE_LOW,        /* out 8 */
+        GPIO27_GPIO | MFP_LPM_DRIVE_LOW,        /* out 9 */
+        GPIO79_GPIO | MFP_LPM_DRIVE_LOW,        /* out 10 */
+        GPIO80_GPIO | MFP_LPM_DRIVE_LOW,        /* out 11 */
+        /* PXA GPIO KEYS */
+        GPIO7_GPIO | WAKEUP_ON_EDGE_BOTH,       /* hotsync button on cradle */
+        /* MISC */
+        GPIO1_RST,      /* reset */
+        GPIO2_GPIO,     /* earphone detect */
+        GPIO16_GPIO,    /* backlight switch */
+};
+/******************************************************************************
+ * SD/MMC card controller
+ ******************************************************************************/
+static struct pxamci_platform_data palmtc_mci_platform_data = {
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .gpio_power             = GPIO_NR_PALMTC_SD_POWER,
+        .gpio_card_ro           = GPIO_NR_PALMTC_SD_READONLY,
+        .gpio_card_detect       = GPIO_NR_PALMTC_SD_DETECT_N,
+        .detect_delay           = 20,
+};
+/******************************************************************************
+ * GPIO keys
+ ******************************************************************************/
+static struct gpio_keys_button palmtc_pxa_buttons[] = {
+        {KEY_F8, GPIO_NR_PALMTC_HOTSYNC_BUTTON, 1, "HotSync Button", EV_KEY, 1},
+};
+static struct gpio_keys_platform_data palmtc_pxa_keys_data = {
+        .buttons        = palmtc_pxa_buttons,
+        .nbuttons       = ARRAY_SIZE(palmtc_pxa_buttons),
+};
+static struct platform_device palmtc_pxa_keys = {
+        .name   = "gpio-keys",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &palmtc_pxa_keys_data,
+        },
+};
+/******************************************************************************
+ * Backlight
+ ******************************************************************************/
+static int palmtc_backlight_init(struct device *dev)
+{
+        int ret;
+        ret = gpio_request(GPIO_NR_PALMTC_BL_POWER, "BL POWER");
+        if (ret)
+                goto err;
+        ret = gpio_direction_output(GPIO_NR_PALMTC_BL_POWER, 1);
+        if (ret)
+                goto err2;
+        return 0;
+err2:
+        gpio_free(GPIO_NR_PALMTC_BL_POWER);
+err:
+        return ret;
+}
+static int palmtc_backlight_notify(int brightness)
+{
+        /* backlight is on when GPIO16 AF0 is high */
+        gpio_set_value(GPIO_NR_PALMTC_BL_POWER, brightness);
+        return brightness;
+}
+static void palmtc_backlight_exit(struct device *dev)
+{
+        gpio_free(GPIO_NR_PALMTC_BL_POWER);
+}
+static struct platform_pwm_backlight_data palmtc_backlight_data = {
+        .pwm_id         = 1,
+        .max_brightness = PALMTC_MAX_INTENSITY,
+        .dft_brightness = PALMTC_MAX_INTENSITY,
+        .pwm_period_ns  = PALMTC_PERIOD_NS,
+        .init           = palmtc_backlight_init,
+        .notify         = palmtc_backlight_notify,
+        .exit           = palmtc_backlight_exit,
+};
+static struct platform_device palmtc_backlight = {
+        .name   = "pwm-backlight",
+        .dev    = {
+                .parent         = &pxa25x_device_pwm1.dev,
+                .platform_data  = &palmtc_backlight_data,
+        },
+};
+/******************************************************************************
+ * IrDA
+ ******************************************************************************/
+static struct pxaficp_platform_data palmtc_ficp_platform_data = {
+        .gpio_pwdown            = GPIO_NR_PALMTC_IR_DISABLE,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
+};
+/******************************************************************************
+ * Keyboard
+ ******************************************************************************/
+static const uint32_t palmtc_matrix_keys[] = {
+        KEY(0, 0, KEY_F1),
+        KEY(0, 1, KEY_X),
+        KEY(0, 2, KEY_POWER),
+        KEY(0, 3, KEY_TAB),
+        KEY(0, 4, KEY_A),
+        KEY(0, 5, KEY_Q),
+        KEY(0, 6, KEY_LEFTSHIFT),
+        KEY(0, 7, KEY_Z),
+        KEY(0, 8, KEY_S),
+        KEY(0, 9, KEY_W),
+        KEY(0, 10, KEY_E),
+        KEY(0, 11, KEY_UP),
+        KEY(1, 0, KEY_F2),
+        KEY(1, 1, KEY_DOWN),
+        KEY(1, 3, KEY_D),
+        KEY(1, 4, KEY_C),
+        KEY(1, 5, KEY_F),
+        KEY(1, 6, KEY_R),
+        KEY(1, 7, KEY_SPACE),
+        KEY(1, 8, KEY_V),
+        KEY(1, 9, KEY_G),
+        KEY(1, 10, KEY_T),
+        KEY(1, 11, KEY_LEFT),
+        KEY(2, 0, KEY_F3),
+        KEY(2, 1, KEY_LEFTCTRL),
+        KEY(2, 3, KEY_H),
+        KEY(2, 4, KEY_Y),
+        KEY(2, 5, KEY_N),
+        KEY(2, 6, KEY_J),
+        KEY(2, 7, KEY_U),
+        KEY(2, 8, KEY_M),
+        KEY(2, 9, KEY_K),
+        KEY(2, 10, KEY_I),
+        KEY(2, 11, KEY_RIGHT),
+        KEY(3, 0, KEY_F4),
+        KEY(3, 1, KEY_ENTER),
+        KEY(3, 3, KEY_DOT),
+        KEY(3, 4, KEY_L),
+        KEY(3, 5, KEY_O),
+        KEY(3, 6, KEY_LEFTALT),
+        KEY(3, 7, KEY_ENTER),
+        KEY(3, 8, KEY_BACKSPACE),
+        KEY(3, 9, KEY_P),
+        KEY(3, 10, KEY_B),
+        KEY(3, 11, KEY_FN),
+};
+const struct matrix_keymap_data palmtc_keymap_data = {
+        .keymap                 = palmtc_matrix_keys,
+        .keymap_size            = ARRAY_SIZE(palmtc_matrix_keys),
+};
+const static unsigned int palmtc_keypad_row_gpios[] = {
+        0, 9, 10, 11
+};
+const static unsigned int palmtc_keypad_col_gpios[] = {
+        18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 79, 80
+};
+static struct matrix_keypad_platform_data palmtc_keypad_platform_data = {
+        .keymap_data    = &palmtc_keymap_data,
+        .row_gpios      = palmtc_keypad_row_gpios,
+        .num_row_gpios  = ARRAY_SIZE(palmtc_keypad_row_gpios),
+        .col_gpios      = palmtc_keypad_col_gpios,
+        .num_col_gpios  = ARRAY_SIZE(palmtc_keypad_col_gpios),
+        .active_low     = 1,
+        .debounce_ms            = 20,
+        .col_scan_delay_us      = 5,
+};
+static struct platform_device palmtc_keyboard = {
+        .name   = "matrix-keypad",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &palmtc_keypad_platform_data,
+        },
+};
+/******************************************************************************
+ * UDC
+ ******************************************************************************/
+static struct pxa2xx_udc_mach_info palmtc_udc_info __initdata = {
+        .gpio_vbus              = GPIO_NR_PALMTC_USB_DETECT_N,
+        .gpio_vbus_inverted     = 1,
+        .gpio_pullup            = GPIO_NR_PALMTC_USB_POWER,
+};
+/******************************************************************************
+ * Touchscreen / Battery / GPIO-extender
+ ******************************************************************************/
+static struct platform_device palmtc_ucb1400_core = {
+        .name   = "ucb1400_core",
+        .id     = -1,
+};
+/******************************************************************************
+ * NOR Flash
+ ******************************************************************************/
+static struct resource palmtc_flash_resource = {
+        .start  = PXA_CS0_PHYS,
+        .end    = PXA_CS0_PHYS + SZ_16M - 1,
+        .flags  = IORESOURCE_MEM,
+};
+static struct mtd_partition palmtc_flash_parts[] = {
+        {
+                .name   = "U-Boot Bootloader",
+                .offset = 0x0,
+                .size   = 0x40000,
+        },
+        {
+                .name   = "Linux Kernel",
+                .offset = 0x40000,
+                .size   = 0x2c0000,
+        },
+        {
+                .name   = "Filesystem",
+                .offset = 0x300000,
+                .size   = 0xcc0000,
+        },
+        {
+                .name   = "U-Boot Environment",
+                .offset = 0xfc0000,
+                .size   = MTDPART_SIZ_FULL,
+        },
+};
+static struct physmap_flash_data palmtc_flash_data = {
+        .width          = 4,
+        .parts          = palmtc_flash_parts,
+        .nr_parts       = ARRAY_SIZE(palmtc_flash_parts),
+};
+static struct platform_device palmtc_flash = {
+        .name           = "physmap-flash",
+        .id             = -1,
+        .resource       = &palmtc_flash_resource,
+        .num_resources  = 1,
+        .dev = {
+                .platform_data  = &palmtc_flash_data,
+        },
+};
+/******************************************************************************
+ * Framebuffer
+ ******************************************************************************/
+static struct pxafb_mode_info palmtc_lcd_modes[] = {
+{
+        .pixclock       = 115384,
+        .xres           = 320,
+        .yres           = 320,
+        .bpp            = 16,
+        .left_margin    = 27,
+        .right_margin   = 7,
+        .upper_margin   = 7,
+        .lower_margin   = 8,
+        .hsync_len      = 6,
+        .vsync_len      = 1,
+},
+};
+static struct pxafb_mach_info palmtc_lcd_screen = {
+        .modes                  = palmtc_lcd_modes,
+        .num_modes              = ARRAY_SIZE(palmtc_lcd_modes),
+        .lcd_conn               = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
+};
+/******************************************************************************
+ * Machine init
+ ******************************************************************************/
+static struct platform_device *devices[] __initdata = {
+        &palmtc_backlight,
+        &palmtc_ucb1400_core,
+        &palmtc_keyboard,
+        &palmtc_pxa_keys,
+        &palmtc_flash,
+};
+static void __init palmtc_init(void)
+{
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtc_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+        pxa_set_hwuart_info(NULL);
+        set_pxa_fb_info(&palmtc_lcd_screen);
+        pxa_set_mci_info(&palmtc_mci_platform_data);
+        pxa_set_udc_info(&palmtc_udc_info);
+        pxa_set_ac97_info(NULL);
+        pxa_set_ficp_info(&palmtc_ficp_platform_data);
+        platform_add_devices(devices, ARRAY_SIZE(devices));
+};
+MACHINE_START(PALMTC, "Palm Tungsten|C")
+        .phys_io        = 0x40000000,
+        .boot_params    = 0xa0000100,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa25x_init_irq,
+        .timer          = &pxa_timer,
+        .init_machine   = palmtc_init
+MACHINE_END
diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c
index d823b09801df..265d62bae7de 100644
--- a/arch/arm/mach-pxa/palmte2.c
+++ b/arch/arm/mach-pxa/palmte2.c
@@ -117,83 +117,11 @@ static unsigned long palmte2_pin_config[] __initdata = {
 /******************************************************************************
 * SD/MMC card controller
 ******************************************************************************/
-static int palmte2_mci_init(struct device *dev,
-                                irq_handler_t palmte2_detect_int, void *data)
-{
-        int err = 0;
-        /* Setup an interrupt for detecting card insert/remove events */
-        err = gpio_request(GPIO_NR_PALMTE2_SD_DETECT_N, "SD IRQ");
-        if (err)
-                goto err;
-        err = gpio_direction_input(GPIO_NR_PALMTE2_SD_DETECT_N);
-        if (err)
-                goto err2;
-        err = request_irq(gpio_to_irq(GPIO_NR_PALMTE2_SD_DETECT_N),
-                        palmte2_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                        "SD/MMC card detect", data);
-        if (err) {
-                printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
-                                __func__);
-                goto err2;
-        }
-        err = gpio_request(GPIO_NR_PALMTE2_SD_POWER, "SD_POWER");
-        if (err)
-                goto err3;
-        err = gpio_direction_output(GPIO_NR_PALMTE2_SD_POWER, 0);
-        if (err)
-                goto err4;
-        err = gpio_request(GPIO_NR_PALMTE2_SD_READONLY, "SD_READONLY");
-        if (err)
-                goto err4;
-        err = gpio_direction_input(GPIO_NR_PALMTE2_SD_READONLY);
-        if (err)
-                goto err5;
-        printk(KERN_DEBUG "%s: irq registered\n", __func__);
-        return 0;
-err5:
-        gpio_free(GPIO_NR_PALMTE2_SD_READONLY);
-err4:
-        gpio_free(GPIO_NR_PALMTE2_SD_POWER);
-err3:
-        free_irq(gpio_to_irq(GPIO_NR_PALMTE2_SD_DETECT_N), data);
-err2:
-        gpio_free(GPIO_NR_PALMTE2_SD_DETECT_N);
-err:
-        return err;
-}
-static void palmte2_mci_exit(struct device *dev, void *data)
-{
-        gpio_free(GPIO_NR_PALMTE2_SD_READONLY);
-        gpio_free(GPIO_NR_PALMTE2_SD_POWER);
-        free_irq(gpio_to_irq(GPIO_NR_PALMTE2_SD_DETECT_N), data);
-        gpio_free(GPIO_NR_PALMTE2_SD_DETECT_N);
-}
-static void palmte2_mci_power(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data *p_d = dev->platform_data;
-        gpio_set_value(GPIO_NR_PALMTE2_SD_POWER, p_d->ocr_mask & (1 << vdd));
-}
-static int palmte2_mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(GPIO_NR_PALMTE2_SD_READONLY);
-}
 static struct pxamci_platform_data palmte2_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .setpower       = palmte2_mci_power,
+        .gpio_card_detect       = GPIO_NR_PALMTE2_SD_DETECT_N,
-        .get_ro         = palmte2_mci_get_ro,
+        .gpio_card_ro           = GPIO_NR_PALMTE2_SD_READONLY,
-        .init           = palmte2_mci_init,
+        .gpio_power             = GPIO_NR_PALMTE2_SD_POWER,
-        .exit           = palmte2_mci_exit,
 };
 /******************************************************************************
@@ -287,35 +215,9 @@ static struct platform_device palmte2_backlight = {
 /******************************************************************************
 * IrDA
 ******************************************************************************/
-static int palmte2_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(GPIO_NR_PALMTE2_IR_DISABLE, "IR DISABLE");
-        if (err)
-                goto err;
-        err = gpio_direction_output(GPIO_NR_PALMTE2_IR_DISABLE, 1);
-        if (err)
-                gpio_free(GPIO_NR_PALMTE2_IR_DISABLE);
-err:
-        return err;
-}
-static void palmte2_irda_shutdown(struct device *dev)
-{
-        gpio_free(GPIO_NR_PALMTE2_IR_DISABLE);
-}
-static void palmte2_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO_NR_PALMTE2_IR_DISABLE, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
 static struct pxaficp_platform_data palmte2_ficp_platform_data = {
-        .startup                = palmte2_irda_startup,
+        .gpio_pwdown            = GPIO_NR_PALMTE2_IR_DISABLE,
-        .shutdown               = palmte2_irda_shutdown,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_cap        = IR_SIRMODE | IR_FIRMODE | IR_OFF,
-        .transceiver_mode       = palmte2_irda_transceiver_mode,
 };
 /******************************************************************************
@@ -471,6 +373,10 @@ static void __init palmte2_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmte2_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        set_pxa_fb_info(&palmte2_lcd_screen);
        pxa_set_mci_info(&palmte2_mci_platform_data);
        palmte2_udc_init();
diff --git a/arch/arm/mach-pxa/treo680.c b/arch/arm/mach-pxa/palmtreo.c
index 753ec4df17b9..606eb7e8a17e 100644
--- a/arch/arm/mach-pxa/treo680.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -1,5 +1,9 @@
 /*
- * Hardware definitions for Palm Treo 680
+ * Hardware definitions for Palm Treo smartphones
+ *
+ * currently supported:
+ *     Palm Treo 680 (GSM)
+ *     Palm Centro 685 (GSM)
 *
 * Author:     Tomas Cech <sleep_walker@suse.cz>
 *
@@ -31,7 +35,7 @@
 #include <mach/pxa27x.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/audio.h>
-#include <mach/treo680.h>
+#include <mach/palmtreo.h>
 #include <mach/mmc.h>
 #include <mach/pxafb.h>
 #include <mach/irda.h>
@@ -50,7 +54,7 @@
 /******************************************************************************
 * Pin configuration
 ******************************************************************************/
-static unsigned long treo680_pin_config[] __initdata = {
+static unsigned long treo_pin_config[] __initdata = {
        /* MMC */
        GPIO32_MMC_CLK,
        GPIO92_MMC_DAT_0,
@@ -58,7 +62,6 @@ static unsigned long treo680_pin_config[] __initdata = {
        GPIO110_MMC_DAT_2,
        GPIO111_MMC_DAT_3,
        GPIO112_MMC_CMD,
-        GPIO33_GPIO,                            /* SD read only */
        GPIO113_GPIO,                           /* SD detect */
        /* AC97 */
@@ -80,12 +83,10 @@ static unsigned long treo680_pin_config[] __initdata = {
        GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,       /* usb detect */
        /* MATRIX KEYPAD */
-        GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH,
        GPIO101_KP_MKIN_1,
        GPIO102_KP_MKIN_2,
        GPIO97_KP_MKIN_3,
        GPIO98_KP_MKIN_4,
-        GPIO99_KP_MKIN_5,
        GPIO91_KP_MKIN_6,
        GPIO13_KP_MKIN_7,
        GPIO103_KP_MKOUT_0 | MFP_LPM_DRIVE_HIGH,
@@ -150,95 +151,57 @@ static unsigned long treo680_pin_config[] __initdata = {
        GPIO11_GPIO | WAKEUP_ON_EDGE_BOTH,      /* bluetooth host wake up */
 };
+#ifdef CONFIG_MACH_TREO680
+static unsigned long treo680_pin_config[] __initdata = {
+        GPIO33_GPIO,    /* SD read only */
+        /* MATRIX KEYPAD - different wake up source */
+        GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH,
+        GPIO99_KP_MKIN_5,
+};
+#endif /* CONFIG_MACH_TREO680 */
+#ifdef CONFIG_MACH_CENTRO
+static unsigned long centro685_pin_config[] __initdata = {
+        /* Bluetooth attached to BT UART*/
+        MFP_CFG_OUT(GPIO80, AF0, DRIVE_LOW),    /* power: LOW = off */
+        GPIO42_BTUART_RXD,
+        GPIO43_BTUART_TXD,
+        GPIO44_BTUART_CTS,
+        GPIO45_BTUART_RTS,
+        /* MATRIX KEYPAD - different wake up source */
+        GPIO100_KP_MKIN_0,
+        GPIO99_KP_MKIN_5 | WAKEUP_ON_LEVEL_HIGH,
+};
+#endif /* CONFIG_MACH_CENTRO */
 /******************************************************************************
 * SD/MMC card controller
 ******************************************************************************/
-static int treo680_mci_init(struct device *dev,
+#ifdef CONFIG_MACH_TREO680
-                irq_handler_t treo680_detect_int, void *data)
-{
-        int err = 0;
-        /* Setup an interrupt for detecting card insert/remove events */
-        err = gpio_request(GPIO_NR_TREO680_SD_DETECT_N, "SD IRQ");
-        if (err)
-                goto err;
-        err = gpio_direction_input(GPIO_NR_TREO680_SD_DETECT_N);
-        if (err)
-                goto err2;
-        err = request_irq(gpio_to_irq(GPIO_NR_TREO680_SD_DETECT_N),
-                        treo680_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                        "SD/MMC card detect", data);
-        if (err) {
-                dev_err(dev, "%s: cannot request SD/MMC card detect IRQ\n",
-                             __func__);
-                goto err2;
-        }
-        err = gpio_request(GPIO_NR_TREO680_SD_POWER, "SD_POWER");
-        if (err)
-                goto err3;
-        err = gpio_direction_output(GPIO_NR_TREO680_SD_POWER, 1);
-        if (err)
-                goto err4;
-        err = gpio_request(GPIO_NR_TREO680_SD_READONLY, "SD_READONLY");
-        if (err)
-                goto err4;
-        err = gpio_direction_input(GPIO_NR_TREO680_SD_READONLY);
-        if (err)
-                goto err5;
-        return 0;
-err5:
-        gpio_free(GPIO_NR_TREO680_SD_READONLY);
-err4:
-        gpio_free(GPIO_NR_TREO680_SD_POWER);
-err3:
-        free_irq(gpio_to_irq(GPIO_NR_TREO680_SD_DETECT_N), data);
-err2:
-        gpio_free(GPIO_NR_TREO680_SD_DETECT_N);
-err:
-        return err;
-}
-static void treo680_mci_exit(struct device *dev, void *data)
-{
-        gpio_free(GPIO_NR_TREO680_SD_READONLY);
-        gpio_free(GPIO_NR_TREO680_SD_POWER);
-        free_irq(gpio_to_irq(GPIO_NR_TREO680_SD_DETECT_N), data);
-        gpio_free(GPIO_NR_TREO680_SD_DETECT_N);
-}
-static void treo680_mci_power(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data *p_d = dev->platform_data;
-        gpio_set_value(GPIO_NR_TREO680_SD_POWER, p_d->ocr_mask & (1 << vdd));
-}
-static int treo680_mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(GPIO_NR_TREO680_SD_READONLY);
-}
 static struct pxamci_platform_data treo680_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .setpower       = treo680_mci_power,
+        .gpio_card_detect       = GPIO_NR_TREO_SD_DETECT_N,
-        .get_ro         = treo680_mci_get_ro,
+        .gpio_card_ro           = GPIO_NR_TREO680_SD_READONLY,
-        .init           = treo680_mci_init,
+        .gpio_power             = GPIO_NR_TREO680_SD_POWER,
-        .exit           = treo680_mci_exit,
+};
+#endif /* CONFIG_MACH_TREO680 */
+#ifdef CONFIG_MACH_CENTRO
+static struct pxamci_platform_data centro_mci_platform_data = {
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .gpio_card_detect       = GPIO_NR_TREO_SD_DETECT_N,
+        .gpio_card_ro           = -1,
+        .gpio_power             = GPIO_NR_CENTRO_SD_POWER,
+        .gpio_power_invert      = 1,
 };
+#endif /* CONFIG_MACH_CENTRO */
 /******************************************************************************
 * GPIO keyboard
 ******************************************************************************/
+#ifdef CONFIG_MACH_TREO680
 static unsigned int treo680_matrix_keys[] = {
        KEY(0, 0, KEY_F8),              /* Red/Off/Power */
        KEY(0, 1, KEY_LEFT),
@@ -308,135 +271,167 @@ static struct pxa27x_keypad_platform_data treo680_keypad_platform_data = {
        .debounce_interval      = 30,
 };
+#endif /* CONFIG_MACH_TREO680 */
+#ifdef CONFIG_MACH_CENTRO
+static unsigned int centro_matrix_keys[] = {
+        KEY(0, 0, KEY_F9),              /* Home */
+        KEY(0, 1, KEY_LEFT),
+        KEY(0, 2, KEY_LEFTCTRL),        /* Alternate */
+        KEY(0, 3, KEY_L),
+        KEY(0, 4, KEY_A),
+        KEY(0, 5, KEY_Q),
+        KEY(0, 6, KEY_P),
+        KEY(1, 0, KEY_RIGHTCTRL),       /* Menu */
+        KEY(1, 1, KEY_RIGHT),
+        KEY(1, 2, KEY_LEFTSHIFT),       /* Left shift */
+        KEY(1, 3, KEY_Z),
+        KEY(1, 4, KEY_S),
+        KEY(1, 5, KEY_W),
+        KEY(2, 0, KEY_F1),              /* Phone */
+        KEY(2, 1, KEY_UP),
+        KEY(2, 2, KEY_0),
+        KEY(2, 3, KEY_X),
+        KEY(2, 4, KEY_D),
+        KEY(2, 5, KEY_E),
+        KEY(3, 0, KEY_F10),             /* Calendar */
+        KEY(3, 1, KEY_DOWN),
+        KEY(3, 2, KEY_SPACE),
+        KEY(3, 3, KEY_C),
+        KEY(3, 4, KEY_F),
+        KEY(3, 5, KEY_R),
+        KEY(4, 0, KEY_F12),             /* Mail */
+        KEY(4, 1, KEY_KPENTER),
+        KEY(4, 2, KEY_RIGHTALT),        /* Alt */
+        KEY(4, 3, KEY_V),
+        KEY(4, 4, KEY_G),
+        KEY(4, 5, KEY_T),
+        KEY(5, 0, KEY_F8),              /* Red/Off/Power */
+        KEY(5, 1, KEY_PAGEUP),          /* Side up */
+        KEY(5, 2, KEY_DOT),
+        KEY(5, 3, KEY_B),
+        KEY(5, 4, KEY_H),
+        KEY(5, 5, KEY_Y),
+        KEY(6, 0, KEY_TAB),             /* Side Activate */
+        KEY(6, 1, KEY_PAGEDOWN),        /* Side down */
+        KEY(6, 2, KEY_ENTER),
+        KEY(6, 3, KEY_N),
+        KEY(6, 4, KEY_J),
+        KEY(6, 5, KEY_U),
+        KEY(7, 0, KEY_F6),              /* Green/Call */
+        KEY(7, 1, KEY_O),
+        KEY(7, 2, KEY_BACKSPACE),
+        KEY(7, 3, KEY_M),
+        KEY(7, 4, KEY_K),
+        KEY(7, 5, KEY_I),
+};
+static struct pxa27x_keypad_platform_data centro_keypad_platform_data = {
+        .matrix_key_rows        = 8,
+        .matrix_key_cols        = 7,
+        .matrix_key_map         = centro_matrix_keys,
+        .matrix_key_map_size    = ARRAY_SIZE(centro_matrix_keys),
+        .direct_key_map         = { KEY_CONNECT },
+        .direct_key_num         = 1,
+        .debounce_interval      = 30,
+};
+#endif /* CONFIG_MACH_CENTRO */
 /******************************************************************************
 * aSoC audio
 ******************************************************************************/
-static pxa2xx_audio_ops_t treo680_ac97_pdata = {
+static pxa2xx_audio_ops_t treo_ac97_pdata = {
        .reset_gpio     = 95,
 };
 /******************************************************************************
 * Backlight
 ******************************************************************************/
-static int treo680_backlight_init(struct device *dev)
+static int treo_backlight_init(struct device *dev)
 {
        int ret;
-        ret = gpio_request(GPIO_NR_TREO680_BL_POWER, "BL POWER");
+        ret = gpio_request(GPIO_NR_TREO_BL_POWER, "BL POWER");
        if (ret)
                goto err;
-        ret = gpio_direction_output(GPIO_NR_TREO680_BL_POWER, 0);
+        ret = gpio_direction_output(GPIO_NR_TREO_BL_POWER, 0);
-        if (ret)
-                goto err2;
-        ret = gpio_request(GPIO_NR_TREO680_LCD_POWER, "LCD POWER");
        if (ret)
                goto err2;
-        ret = gpio_direction_output(GPIO_NR_TREO680_LCD_POWER, 0);
-        if (ret)
-                goto err3;
        return 0;
-err3:
-        gpio_free(GPIO_NR_TREO680_LCD_POWER);
 err2:
-        gpio_free(GPIO_NR_TREO680_BL_POWER);
+        gpio_free(GPIO_NR_TREO_BL_POWER);
 err:
        return ret;
 }
-static int treo680_backlight_notify(int brightness)
+static int treo_backlight_notify(int brightness)
 {
-        gpio_set_value(GPIO_NR_TREO680_BL_POWER, brightness);
+        gpio_set_value(GPIO_NR_TREO_BL_POWER, brightness);
-        return TREO680_MAX_INTENSITY - brightness;
+        return TREO_MAX_INTENSITY - brightness;
 };
-static void treo680_backlight_exit(struct device *dev)
+static void treo_backlight_exit(struct device *dev)
 {
-        gpio_free(GPIO_NR_TREO680_BL_POWER);
+        gpio_free(GPIO_NR_TREO_BL_POWER);
-        gpio_free(GPIO_NR_TREO680_LCD_POWER);
 }
-static struct platform_pwm_backlight_data treo680_backlight_data = {
+static struct platform_pwm_backlight_data treo_backlight_data = {
        .pwm_id         = 0,
-        .max_brightness = TREO680_MAX_INTENSITY,
+        .max_brightness = TREO_MAX_INTENSITY,
-        .dft_brightness = TREO680_DEFAULT_INTENSITY,
+        .dft_brightness = TREO_DEFAULT_INTENSITY,
-        .pwm_period_ns  = TREO680_PERIOD_NS,
+        .pwm_period_ns  = TREO_PERIOD_NS,
-        .init           = treo680_backlight_init,
+        .init           = treo_backlight_init,
-        .notify         = treo680_backlight_notify,
+        .notify         = treo_backlight_notify,
-        .exit           = treo680_backlight_exit,
+        .exit           = treo_backlight_exit,
 };
-static struct platform_device treo680_backlight = {
+static struct platform_device treo_backlight = {
        .name   = "pwm-backlight",
        .dev    = {
                .parent         = &pxa27x_device_pwm0.dev,
-                .platform_data  = &treo680_backlight_data,
+                .platform_data  = &treo_backlight_data,
        },
 };
 /******************************************************************************
 * IrDA
 ******************************************************************************/
-static void treo680_transceiver_mode(struct device *dev, int mode)
+static struct pxaficp_platform_data treo_ficp_info = {
-{
+        .gpio_pwdown            = GPIO_NR_TREO_IR_EN,
-        gpio_set_value(GPIO_NR_TREO680_IR_EN, mode & IR_OFF);
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        pxa2xx_transceiver_mode(dev, mode);
-}
-static int treo680_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(GPIO_NR_TREO680_IR_EN, "Ir port disable");
-        if (err)
-                goto err1;
-        err = gpio_direction_output(GPIO_NR_TREO680_IR_EN, 1);
-        if (err)
-                goto err2;
-        return 0;
-err2:
-        dev_err(dev, "treo680_irda: cannot change IR gpio direction\n");
-        gpio_free(GPIO_NR_TREO680_IR_EN);
-err1:
-        dev_err(dev, "treo680_irda: cannot allocate IR gpio\n");
-        return err;
-}
-static void treo680_irda_shutdown(struct device *dev)
-{
-        gpio_free(GPIO_NR_TREO680_IR_EN);
-}
-static struct pxaficp_platform_data treo680_ficp_info = {
-        .transceiver_cap  = IR_FIRMODE | IR_SIRMODE | IR_OFF,
-        .startup          = treo680_irda_startup,
-        .shutdown         = treo680_irda_shutdown,
-        .transceiver_mode = treo680_transceiver_mode,
 };
 /******************************************************************************
 * UDC
 ******************************************************************************/
-static struct pxa2xx_udc_mach_info treo680_udc_info __initdata = {
+static struct pxa2xx_udc_mach_info treo_udc_info __initdata = {
-        .gpio_vbus              = GPIO_NR_TREO680_USB_DETECT,
+        .gpio_vbus              = GPIO_NR_TREO_USB_DETECT,
        .gpio_vbus_inverted     = 1,
-        .gpio_pullup            = GPIO_NR_TREO680_USB_PULLUP,
+        .gpio_pullup            = GPIO_NR_TREO_USB_PULLUP,
 };
 /******************************************************************************
 * USB host
 ******************************************************************************/
+#ifdef CONFIG_MACH_TREO680
 static struct pxaohci_platform_data treo680_ohci_info = {
        .port_mode    = PMM_PERPORT_MODE,
        .flags        = ENABLE_PORT1 | ENABLE_PORT3,
        .power_budget = 0,
 };
+#endif /* CONFIG_MACH_TREO680 */
 /******************************************************************************
 * Power supply
@@ -445,41 +440,41 @@ static int power_supply_init(struct device *dev)
 {
        int ret;
-        ret = gpio_request(GPIO_NR_TREO680_POWER_DETECT, "CABLE_STATE_AC");
+        ret = gpio_request(GPIO_NR_TREO_POWER_DETECT, "CABLE_STATE_AC");
        if (ret)
                goto err1;
-        ret = gpio_direction_input(GPIO_NR_TREO680_POWER_DETECT);
+        ret = gpio_direction_input(GPIO_NR_TREO_POWER_DETECT);
        if (ret)
                goto err2;
        return 0;
 err2:
-        gpio_free(GPIO_NR_TREO680_POWER_DETECT);
+        gpio_free(GPIO_NR_TREO_POWER_DETECT);
 err1:
        return ret;
 }
-static int treo680_is_ac_online(void)
+static int treo_is_ac_online(void)
 {
-        return gpio_get_value(GPIO_NR_TREO680_POWER_DETECT);
+        return gpio_get_value(GPIO_NR_TREO_POWER_DETECT);
 }
 static void power_supply_exit(struct device *dev)
 {
-        gpio_free(GPIO_NR_TREO680_POWER_DETECT);
+        gpio_free(GPIO_NR_TREO_POWER_DETECT);
 }
-static char *treo680_supplicants[] = {
+static char *treo_supplicants[] = {
        "main-battery",
 };
 static struct pda_power_pdata power_supply_info = {
        .init            = power_supply_init,
-        .is_ac_online    = treo680_is_ac_online,
+        .is_ac_online    = treo_is_ac_online,
        .exit            = power_supply_exit,
-        .supplied_to     = treo680_supplicants,
+        .supplied_to     = treo_supplicants,
-        .num_supplicants = ARRAY_SIZE(treo680_supplicants),
+        .num_supplicants = ARRAY_SIZE(treo_supplicants),
 };
 static struct platform_device power_supply = {
@@ -493,7 +488,8 @@ static struct platform_device power_supply = {
 /******************************************************************************
 * Vibra and LEDs
 ******************************************************************************/
-static struct gpio_led gpio_leds[] = {
+#ifdef CONFIG_MACH_TREO680
+static struct gpio_led treo680_gpio_leds[] = {
        {
                .name                   = "treo680:vibra:vibra",
                .default_trigger        = "none",
@@ -502,34 +498,68 @@ static struct gpio_led gpio_leds[] = {
        {
                .name                   = "treo680:green:led",
                .default_trigger        = "mmc0",
-                .gpio                   = GPIO_NR_TREO680_GREEN_LED,
+                .gpio                   = GPIO_NR_TREO_GREEN_LED,
        },
        {
-                .name                   = "treo680:keybbl:keybbl",
+                .name                   = "treo680:white:keybbl",
                .default_trigger        = "none",
                .gpio                   = GPIO_NR_TREO680_KEYB_BL,
        },
 };
-static struct gpio_led_platform_data gpio_led_info = {
+static struct gpio_led_platform_data treo680_gpio_led_info = {
-        .leds           = gpio_leds,
+        .leds           = treo680_gpio_leds,
-        .num_leds       = ARRAY_SIZE(gpio_leds),
+        .num_leds       = ARRAY_SIZE(treo680_gpio_leds),
 };
 static struct platform_device treo680_leds = {
        .name   = "leds-gpio",
        .id     = -1,
        .dev    = {
-                .platform_data  = &gpio_led_info,
+                .platform_data  = &treo680_gpio_led_info,
        }
 };
+#endif /* CONFIG_MACH_TREO680 */
+#ifdef CONFIG_MACH_CENTRO
+static struct gpio_led centro_gpio_leds[] = {
+        {
+                .name                   = "centro:vibra:vibra",
+                .default_trigger        = "none",
+                .gpio                   = GPIO_NR_CENTRO_VIBRATE_EN,
+        },
+        {
+                .name                   = "centro:green:led",
+                .default_trigger        = "mmc0",
+                .gpio                   = GPIO_NR_TREO_GREEN_LED,
+        },
+        {
+                .name                   = "centro:white:keybbl",
+                .default_trigger        = "none",
+                .active_low             = 1,
+                .gpio                   = GPIO_NR_CENTRO_KEYB_BL,
+        },
+};
+static struct gpio_led_platform_data centro_gpio_led_info = {
+        .leds           = centro_gpio_leds,
+        .num_leds       = ARRAY_SIZE(centro_gpio_leds),
+};
+static struct platform_device centro_leds = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &centro_gpio_led_info,
+        }
+};
+#endif /* CONFIG_MACH_CENTRO */
 /******************************************************************************
 * Framebuffer
 ******************************************************************************/
 /* TODO: add support for 324x324 */
-static struct pxafb_mode_info treo680_lcd_modes[] = {
+static struct pxafb_mode_info treo_lcd_modes[] = {
 {
        .pixclock               = 86538,
        .xres                   = 320,
@@ -546,16 +576,21 @@ static struct pxafb_mode_info treo680_lcd_modes[] = {
 },
 };
-static struct pxafb_mach_info treo680_lcd_screen = {
+static void treo_lcd_power(int on, struct fb_var_screeninfo *info)
-        .modes          = treo680_lcd_modes,
+{
-        .num_modes      = ARRAY_SIZE(treo680_lcd_modes),
+        gpio_set_value(GPIO_NR_TREO_BL_POWER, on);
+}
+static struct pxafb_mach_info treo_lcd_screen = {
+        .modes          = treo_lcd_modes,
+        .num_modes      = ARRAY_SIZE(treo_lcd_modes),
        .lcd_conn       = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
 };
 /******************************************************************************
 * Power management - standby
 ******************************************************************************/
-static void __init treo680_pm_init(void)
+static void __init treo_pm_init(void)
 {
        static u32 resume[] = {
                0xe3a00101,     /* mov  r0,     #0x40000000 */
@@ -564,49 +599,118 @@ static void __init treo680_pm_init(void)
        };
        /* this is where the bootloader jumps */
-        memcpy(phys_to_virt(TREO680_STR_BASE), resume, sizeof(resume));
+        memcpy(phys_to_virt(TREO_STR_BASE), resume, sizeof(resume));
 }
 /******************************************************************************
 * Machine init
 ******************************************************************************/
-static struct platform_device *devices[] __initdata = {
+static struct platform_device *treo_devices[] __initdata = {
-        &treo680_backlight,
+        &treo_backlight,
-        &treo680_leds,
        &power_supply,
 };
+#ifdef CONFIG_MACH_TREO680
+static struct platform_device *treo680_devices[] __initdata = {
+        &treo680_leds,
+};
+#endif /* CONFIG_MACH_TREO680 */
+#ifdef CONFIG_MACH_CENTRO
+static struct platform_device *centro_devices[] __initdata = {
+        &centro_leds,
+};
+#endif /* CONFIG_MACH_CENTRO */
 /* setup udc GPIOs initial state */
-static void __init treo680_udc_init(void)
+static void __init treo_udc_init(void)
 {
-        if (!gpio_request(GPIO_NR_TREO680_USB_PULLUP, "UDC Vbus")) {
+        if (!gpio_request(GPIO_NR_TREO_USB_PULLUP, "UDC Vbus")) {
-                gpio_direction_output(GPIO_NR_TREO680_USB_PULLUP, 1);
+                gpio_direction_output(GPIO_NR_TREO_USB_PULLUP, 1);
-                gpio_free(GPIO_NR_TREO680_USB_PULLUP);
+                gpio_free(GPIO_NR_TREO_USB_PULLUP);
        }
 }
+static void __init treo_lcd_power_init(void)
+{
+        int ret;
+        ret = gpio_request(GPIO_NR_TREO_LCD_POWER, "LCD POWER");
+        if (ret) {
+                pr_err("Treo680: LCD power GPIO request failed!\n");
+                return;
+        }
+        ret = gpio_direction_output(GPIO_NR_TREO_LCD_POWER, 0);
+        if (ret) {
+                pr_err("Treo680: setting LCD power GPIO direction failed!\n");
+                gpio_free(GPIO_NR_TREO_LCD_POWER);
+                return;
+        }
+        treo_lcd_screen.pxafb_lcd_power = treo_lcd_power;
+}
+static void __init treo_init(void)
+{
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+        treo_pm_init();
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(treo_pin_config));
+        treo_lcd_power_init();
+        set_pxa_fb_info(&treo_lcd_screen);
+        treo_udc_init();
+        pxa_set_udc_info(&treo_udc_info);
+        pxa_set_ac97_info(&treo_ac97_pdata);
+        pxa_set_ficp_info(&treo_ficp_info);
+        platform_add_devices(ARRAY_AND_SIZE(treo_devices));
+}
+#ifdef CONFIG_MACH_TREO680
 static void __init treo680_init(void)
 {
-        treo680_pm_init();
+        treo_init();
        pxa2xx_mfp_config(ARRAY_AND_SIZE(treo680_pin_config));
-        pxa_set_keypad_info(&treo680_keypad_platform_data);
-        set_pxa_fb_info(&treo680_lcd_screen);
        pxa_set_mci_info(&treo680_mci_platform_data);
-        treo680_udc_init();
+        pxa_set_keypad_info(&treo680_keypad_platform_data);
-        pxa_set_udc_info(&treo680_udc_info);
-        pxa_set_ac97_info(&treo680_ac97_pdata);
-        pxa_set_ficp_info(&treo680_ficp_info);
        pxa_set_ohci_info(&treo680_ohci_info);
-        platform_add_devices(devices, ARRAY_SIZE(devices));
+        platform_add_devices(ARRAY_AND_SIZE(treo680_devices));
 }
 MACHINE_START(TREO680, "Palm Treo 680")
-        .phys_io        = TREO680_PHYS_IO_START,
+        .phys_io        = TREO_PHYS_IO_START,
-        .io_pg_offst    = io_p2v(0x40000000),
+        .io_pg_offst    = io_p2v(0x40000000),
-        .boot_params    = 0xa0000100,
+        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
+        .map_io         = pxa_map_io,
-        .init_irq       = pxa27x_init_irq,
+        .init_irq       = pxa27x_init_irq,
-        .timer          = &pxa_timer,
+        .timer          = &pxa_timer,
-        .init_machine   = treo680_init,
+        .init_machine   = treo680_init,
+MACHINE_END
+#endif /* CONFIG_MACH_TREO680 */
+#ifdef CONFIG_MACH_CENTRO
+static void __init centro_init(void)
+{
+        treo_init();
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(centro685_pin_config));
+        pxa_set_mci_info(&centro_mci_platform_data);
+        pxa_set_keypad_info(&centro_keypad_platform_data);
+        platform_add_devices(ARRAY_AND_SIZE(centro_devices));
+}
+MACHINE_START(CENTRO, "Palm Centro 685")
+        .phys_io        = TREO_PHYS_IO_START,
+        .io_pg_offst    = io_p2v(0x40000000),
+        .boot_params    = 0xa0000100,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa27x_init_irq,
+        .timer          = &pxa_timer,
+       .init_machine   = centro_init,
 MACHINE_END
+#endif /* CONFIG_MACH_CENTRO */
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 83d020879581..7bf18c2f002f 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -28,6 +28,10 @@
 #include <linux/wm97xx_batt.h>
 #include <linux/power_supply.h>
 #include <linux/usb/gpio_vbus.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/physmap.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -131,6 +135,10 @@ static unsigned long palmtx_pin_config[] __initdata = {
        GPIO34_FFUART_RXD,
        GPIO39_FFUART_TXD,
+        /* NAND */
+        GPIO15_nCS_1,
+        GPIO18_RDY,
        /* MISC. */
        GPIO10_GPIO,    /* hotsync button */
        GPIO12_GPIO,    /* power detect */
@@ -138,85 +146,50 @@ static unsigned long palmtx_pin_config[] __initdata = {
 };
 /******************************************************************************
- * SD/MMC card controller
+ * NOR Flash
 ******************************************************************************/
-static int palmtx_mci_init(struct device *dev, irq_handler_t palmtx_detect_int,
+static struct mtd_partition palmtx_partitions[] = {
-                                void *data)
+        {
-{
+                .name           = "Flash",
-        int err = 0;
+                .offset         = 0x00000000,
+                .size           = MTDPART_SIZ_FULL,
-        /* Setup an interrupt for detecting card insert/remove events */
+                .mask_flags     = 0
-        err = gpio_request(GPIO_NR_PALMTX_SD_DETECT_N, "SD IRQ");
-        if (err)
-                goto err;
-        err = gpio_direction_input(GPIO_NR_PALMTX_SD_DETECT_N);
-        if (err)
-                goto err2;
-        err = request_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N),
-                        palmtx_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                        "SD/MMC card detect", data);
-        if (err) {
-                printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
-                                __func__);
-                goto err2;
        }
+};
-        err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER");
+static struct physmap_flash_data palmtx_flash_data[] = {
-        if (err)
+        {
-                goto err3;
+                .width          = 2,                    /* bankwidth in bytes */
-        err = gpio_direction_output(GPIO_NR_PALMTX_SD_POWER, 0);
+                .parts          = palmtx_partitions,
-        if (err)
+                .nr_parts       = ARRAY_SIZE(palmtx_partitions)
-                goto err4;
+        }
+};
-        err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY");
-        if (err)
-                goto err4;
-        err = gpio_direction_input(GPIO_NR_PALMTX_SD_READONLY);
-        if (err)
-                goto err5;
-        printk(KERN_DEBUG "%s: irq registered\n", __func__);
-        return 0;
-err5:
-        gpio_free(GPIO_NR_PALMTX_SD_READONLY);
-err4:
-        gpio_free(GPIO_NR_PALMTX_SD_POWER);
-err3:
-        free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data);
-err2:
-        gpio_free(GPIO_NR_PALMTX_SD_DETECT_N);
-err:
-        return err;
-}
-static void palmtx_mci_exit(struct device *dev, void *data)
-{
-        gpio_free(GPIO_NR_PALMTX_SD_READONLY);
-        gpio_free(GPIO_NR_PALMTX_SD_POWER);
-        free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data);
-        gpio_free(GPIO_NR_PALMTX_SD_DETECT_N);
-}
-static void palmtx_mci_power(struct device *dev, unsigned int vdd)
+static struct resource palmtx_flash_resource = {
-{
+        .start  = PXA_CS0_PHYS,
-        struct pxamci_platform_data *p_d = dev->platform_data;
+        .end    = PXA_CS0_PHYS + SZ_8M - 1,
-        gpio_set_value(GPIO_NR_PALMTX_SD_POWER, p_d->ocr_mask & (1 << vdd));
+        .flags  = IORESOURCE_MEM,
-}
+};
-static int palmtx_mci_get_ro(struct device *dev)
+static struct platform_device palmtx_flash = {
-{
+        .name           = "physmap-flash",
-        return gpio_get_value(GPIO_NR_PALMTX_SD_READONLY);
+        .id             = 0,
-}
+        .resource       = &palmtx_flash_resource,
+        .num_resources  = 1,
+        .dev            = {
+                .platform_data = palmtx_flash_data,
+        },
+};
+/******************************************************************************
+ * SD/MMC card controller
+ ******************************************************************************/
 static struct pxamci_platform_data palmtx_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .setpower       = palmtx_mci_power,
+        .gpio_card_detect       = GPIO_NR_PALMTX_SD_DETECT_N,
-        .get_ro         = palmtx_mci_get_ro,
+        .gpio_card_ro           = GPIO_NR_PALMTX_SD_READONLY,
-        .init           = palmtx_mci_init,
+        .gpio_power             = GPIO_NR_PALMTX_SD_POWER,
-        .exit           = palmtx_mci_exit,
+        .detect_delay           = 20,
 };
 /******************************************************************************
@@ -330,35 +303,9 @@ static struct platform_device palmtx_backlight = {
 /******************************************************************************
 * IrDA
 ******************************************************************************/
-static int palmtx_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(GPIO_NR_PALMTX_IR_DISABLE, "IR DISABLE");
-        if (err)
-                goto err;
-        err = gpio_direction_output(GPIO_NR_PALMTX_IR_DISABLE, 1);
-        if (err)
-                gpio_free(GPIO_NR_PALMTX_IR_DISABLE);
-err:
-        return err;
-}
-static void palmtx_irda_shutdown(struct device *dev)
-{
-        gpio_free(GPIO_NR_PALMTX_IR_DISABLE);
-}
-static void palmtx_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
 static struct pxaficp_platform_data palmtx_ficp_platform_data = {
-        .startup                = palmtx_irda_startup,
+        .gpio_pwdown            = GPIO_NR_PALMTX_IR_DISABLE,
-        .shutdown               = palmtx_irda_shutdown,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_cap        = IR_SIRMODE | IR_FIRMODE | IR_OFF,
-        .transceiver_mode       = palmtx_irda_transceiver_mode,
 };
 /******************************************************************************
@@ -493,6 +440,68 @@ static struct pxafb_mach_info palmtx_lcd_screen = {
 };
 /******************************************************************************
+ * NAND Flash
+ ******************************************************************************/
+static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
+                                 unsigned int ctrl)
+{
+        struct nand_chip *this = mtd->priv;
+        unsigned long nandaddr = (unsigned long)this->IO_ADDR_W;
+        if (cmd == NAND_CMD_NONE)
+                return;
+        if (ctrl & NAND_CLE)
+                writeb(cmd, PALMTX_NAND_CLE_VIRT);
+        else if (ctrl & NAND_ALE)
+                writeb(cmd, PALMTX_NAND_ALE_VIRT);
+        else
+                writeb(cmd, nandaddr);
+}
+static struct mtd_partition palmtx_partition_info[] = {
+        [0] = {
+                .name   = "palmtx-0",
+                .offset = 0,
+                .size   = MTDPART_SIZ_FULL
+        },
+};
+static const char *palmtx_part_probes[] = { "cmdlinepart", NULL };
+struct platform_nand_data palmtx_nand_platdata = {
+        .chip   = {
+                .nr_chips               = 1,
+                .chip_offset            = 0,
+                .nr_partitions          = ARRAY_SIZE(palmtx_partition_info),
+                .partitions             = palmtx_partition_info,
+                .chip_delay             = 20,
+                .part_probe_types       = palmtx_part_probes,
+        },
+        .ctrl   = {
+                .cmd_ctrl       = palmtx_nand_cmd_ctl,
+        },
+};
+static struct resource palmtx_nand_resource[] = {
+        [0]     = {
+                .start  = PXA_CS1_PHYS,
+                .end    = PXA_CS1_PHYS + SZ_1M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+static struct platform_device palmtx_nand = {
+        .name           = "gen_nand",
+        .num_resources  = ARRAY_SIZE(palmtx_nand_resource),
+        .resource       = palmtx_nand_resource,
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &palmtx_nand_platdata,
+        }
+};
+/******************************************************************************
 * Power management - standby
 ******************************************************************************/
 static void __init palmtx_pm_init(void)
@@ -518,6 +527,8 @@ static struct platform_device *devices[] __initdata = {
        &power_supply,
        &palmtx_asoc,
        &palmtx_gpio_vbus,
+        &palmtx_flash,
+        &palmtx_nand,
 };
 static struct map_desc palmtx_io_desc[] __initdata = {
@@ -525,8 +536,18 @@ static struct map_desc palmtx_io_desc[] __initdata = {
        .virtual        = PALMTX_PCMCIA_VIRT,
        .pfn            = __phys_to_pfn(PALMTX_PCMCIA_PHYS),
        .length         = PALMTX_PCMCIA_SIZE,
-        .type           = MT_DEVICE
+        .type           = MT_DEVICE,
-},
+}, {
+        .virtual        = PALMTX_NAND_ALE_VIRT,
+        .pfn            = __phys_to_pfn(PALMTX_NAND_ALE_PHYS),
+        .length         = SZ_1M,
+        .type           = MT_DEVICE,
+}, {
+        .virtual        = PALMTX_NAND_CLE_VIRT,
+        .pfn            = __phys_to_pfn(PALMTX_NAND_CLE_PHYS),
+        .length         = SZ_1M,
+        .type           = MT_DEVICE,
+}
 };
 static void __init palmtx_map_io(void)
@@ -549,6 +570,10 @@ static void __init palmtx_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        palmtx_pm_init();
        set_pxa_fb_info(&palmtx_lcd_screen);
        pxa_set_mci_info(&palmtx_mci_platform_data);
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c
index c3645aa3fa3d..d787ac7cfdd8 100644
--- a/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@ -129,88 +129,14 @@ static unsigned long palmz72_pin_config[] __initdata = {
 /******************************************************************************
 * SD/MMC card controller
 ******************************************************************************/
-static int palmz72_mci_init(struct device *dev,
+/* SD_POWER is not actually power, but it is more like chip
-                                irq_handler_t palmz72_detect_int, void *data)
+ * select, i.e. it is inverted */
-{
-        int err = 0;
-        /* Setup an interrupt for detecting card insert/remove events */
-        err = gpio_request(GPIO_NR_PALMZ72_SD_DETECT_N, "SD IRQ");
-        if (err)
-                goto err;
-        err = gpio_direction_input(GPIO_NR_PALMZ72_SD_DETECT_N);
-        if (err)
-                goto err2;
-        err = request_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N),
-                        palmz72_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                        "SD/MMC card detect", data);
-        if (err) {
-                printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
-                                __func__);
-                goto err2;
-        }
-        /* SD_POWER is not actually power, but it is more like chip
-         * select, i.e. it is inverted */
-        err = gpio_request(GPIO_NR_PALMZ72_SD_POWER_N, "SD_POWER");
-        if (err)
-                goto err3;
-        err = gpio_direction_output(GPIO_NR_PALMZ72_SD_POWER_N, 0);
-        if (err)
-                goto err4;
-        err = gpio_request(GPIO_NR_PALMZ72_SD_RO, "SD_RO");
-        if (err)
-                goto err4;
-        err = gpio_direction_input(GPIO_NR_PALMZ72_SD_RO);
-        if (err)
-                goto err5;
-        printk(KERN_DEBUG "%s: irq registered\n", __func__);
-        return 0;
-err5:
-        gpio_free(GPIO_NR_PALMZ72_SD_RO);
-err4:
-        gpio_free(GPIO_NR_PALMZ72_SD_POWER_N);
-err3:
-        free_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N), data);
-err2:
-        gpio_free(GPIO_NR_PALMZ72_SD_DETECT_N);
-err:
-        return err;
-}
-static void palmz72_mci_exit(struct device *dev, void *data)
-{
-        gpio_free(GPIO_NR_PALMZ72_SD_POWER_N);
-        free_irq(gpio_to_irq(GPIO_NR_PALMZ72_SD_DETECT_N), data);
-        gpio_free(GPIO_NR_PALMZ72_SD_DETECT_N);
-        gpio_free(GPIO_NR_PALMZ72_SD_RO);
-}
-static void palmz72_mci_power(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data *p_d = dev->platform_data;
-        if (p_d->ocr_mask & (1 << vdd))
-                gpio_set_value(GPIO_NR_PALMZ72_SD_POWER_N, 0);
-        else
-                gpio_set_value(GPIO_NR_PALMZ72_SD_POWER_N, 1);
-}
-static int palmz72_mci_ro(struct device *dev)
-{
-        return gpio_get_value(GPIO_NR_PALMZ72_SD_RO);
-}
 static struct pxamci_platform_data palmz72_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .setpower       = palmz72_mci_power,
+        .gpio_card_detect       = GPIO_NR_PALMZ72_SD_DETECT_N,
-        .get_ro         = palmz72_mci_ro,
+        .gpio_card_ro           = GPIO_NR_PALMZ72_SD_RO,
-        .init           = palmz72_mci_init,
+        .gpio_power             = GPIO_NR_PALMZ72_SD_POWER_N,
-        .exit           = palmz72_mci_exit,
+        .gpio_power_invert      = 1,
 };
 /******************************************************************************
@@ -304,35 +230,9 @@ static struct platform_device palmz72_backlight = {
 /******************************************************************************
 * IrDA
 ******************************************************************************/
-static int palmz72_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(GPIO_NR_PALMZ72_IR_DISABLE, "IR DISABLE");
-        if (err)
-                goto err;
-        err = gpio_direction_output(GPIO_NR_PALMZ72_IR_DISABLE, 1);
-        if (err)
-                gpio_free(GPIO_NR_PALMZ72_IR_DISABLE);
-err:
-        return err;
-}
-static void palmz72_irda_shutdown(struct device *dev)
-{
-        gpio_free(GPIO_NR_PALMZ72_IR_DISABLE);
-}
-static void palmz72_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(GPIO_NR_PALMZ72_IR_DISABLE, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
 static struct pxaficp_platform_data palmz72_ficp_platform_data = {
-        .startup                = palmz72_irda_startup,
+        .gpio_pwdown            = GPIO_NR_PALMZ72_IR_DISABLE,
-        .shutdown               = palmz72_irda_shutdown,
        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_mode       = palmz72_irda_transceiver_mode,
 };
 /******************************************************************************
@@ -591,6 +491,10 @@ static void __init palmz72_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmz72_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        set_pxa_fb_info(&palmz72_lcd_screen);
        pxa_set_mci_info(&palmz72_mci_platform_data);
        palmz72_udc_init();
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c
index 6abfa2979c61..2190af066470 100644
--- a/arch/arm/mach-pxa/pcm027.c
+++ b/arch/arm/mach-pxa/pcm027.c
@@ -227,6 +227,10 @@ static void __init pcm027_init(void)
        pxa2xx_mfp_config(pcm027_pin_config, ARRAY_SIZE(pcm027_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_add_devices(devices, ARRAY_SIZE(devices));
        /* at last call the baseboard to initialize itself */
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 01791d74e08e..d5255ae74fe3 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -321,11 +321,14 @@ static void pcm990_mci_exit(struct device *dev, void *data)
 #define MSECS_PER_JIFFY (1000/HZ)
 static struct pxamci_platform_data pcm990_mci_platform_data = {
-        .detect_delay   = 250 / MSECS_PER_JIFFY,
+        .detect_delay           = 250 / MSECS_PER_JIFFY,
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .init           = pcm990_mci_init,
+        .init                   = pcm990_mci_init,
-        .setpower       = pcm990_mci_setpower,
+        .setpower               = pcm990_mci_setpower,
-        .exit           = pcm990_mci_exit,
+        .exit                   = pcm990_mci_exit,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 static struct pxaohci_platform_data pcm990_ohci_platform_data = {
@@ -356,19 +359,12 @@ static unsigned long pcm990_camera_pin_config[] = {
        GPIO44_CIF_LV,
 };
-static int pcm990_pxacamera_init(struct device *dev)
-{
-        pxa2xx_mfp_config(ARRAY_AND_SIZE(pcm990_camera_pin_config));
-        return 0;
-}
 /*
 * CICR4: PCLK_EN:      Pixel clock is supplied by the sensor
 *      MCLK_EN:        Master clock is generated by PXA
 *      PCP:            Data sampled on the falling edge of pixel clock
 */
 struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
-        .init   = pcm990_pxacamera_init,
        .flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | PXA_CAMERA_DATAWIDTH_10 |
                PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN/* | PXA_CAMERA_PCP*/,
        .mclk_10khz = 1000,
@@ -427,25 +423,56 @@ static void pcm990_camera_free_bus(struct soc_camera_link *link)
        gpio_bus_switch = -EINVAL;
 }
-static struct soc_camera_link iclink = {
-        .bus_id = 0, /* Must match with the camera ID above */
-        .query_bus_param = pcm990_camera_query_bus_param,
-        .set_bus_param = pcm990_camera_set_bus_param,
-        .free_bus = pcm990_camera_free_bus,
-};
 /* Board I2C devices. */
 static struct i2c_board_info __initdata pcm990_i2c_devices[] = {
        {
                /* Must initialize before the camera(s) */
                I2C_BOARD_INFO("pca9536", 0x41),
                .platform_data = &pca9536_data,
-        }, {
+        },
+};
+static struct i2c_board_info pcm990_camera_i2c[] = {
+        {
                I2C_BOARD_INFO("mt9v022", 0x48),
-                .platform_data = &iclink, /* With extender */
        }, {
                I2C_BOARD_INFO("mt9m001", 0x5d),
-                .platform_data = &iclink, /* With extender */
+        },
+};
+static struct soc_camera_link iclink[] = {
+        {
+                .bus_id                 = 0, /* Must match with the camera ID */
+                .board_info             = &pcm990_camera_i2c[0],
+                .i2c_adapter_id         = 0,
+                .query_bus_param        = pcm990_camera_query_bus_param,
+                .set_bus_param          = pcm990_camera_set_bus_param,
+                .free_bus               = pcm990_camera_free_bus,
+                .module_name            = "mt9v022",
+        }, {
+                .bus_id                 = 0, /* Must match with the camera ID */
+                .board_info             = &pcm990_camera_i2c[1],
+                .i2c_adapter_id         = 0,
+                .query_bus_param        = pcm990_camera_query_bus_param,
+                .set_bus_param          = pcm990_camera_set_bus_param,
+                .free_bus               = pcm990_camera_free_bus,
+                .module_name            = "mt9m001",
+        },
+};
+static struct platform_device pcm990_camera[] = {
+        {
+                .name   = "soc-camera-pdrv",
+                .id     = 0,
+                .dev    = {
+                        .platform_data = &iclink[0],
+                },
+        }, {
+                .name   = "soc-camera-pdrv",
+                .id     = 1,
+                .dev    = {
+                        .platform_data = &iclink[1],
+                },
        },
 };
 #endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */
@@ -498,9 +525,13 @@ void __init pcm990_baseboard_init(void)
        pxa_set_ac97_info(NULL);
 #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(pcm990_camera_pin_config));
        pxa_set_camera_info(&pcm990_pxacamera_platform_data);
        i2c_register_board_info(0, ARRAY_AND_SIZE(pcm990_i2c_devices));
+        platform_device_register(&pcm990_camera[0]);
+        platform_device_register(&pcm990_camera[1]);
 #endif
        printk(KERN_INFO "PCM-990 Evaluation baseboard initialized\n");
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 9352d4a34837..e5eeb3a62d01 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -245,20 +245,10 @@ static inline void poodle_init_spi(void) {}
 * The card detect interrupt isn't debounced so we delay it by 250ms
 * to give the card a chance to fully insert/eject.
 */
-static struct pxamci_platform_data poodle_mci_platform_data;
 static int poodle_mci_init(struct device *dev, irq_handler_t poodle_detect_int, void *data)
 {
        int err;
-        err = gpio_request(POODLE_GPIO_nSD_DETECT, "nSD_DETECT");
-        if (err)
-                goto err_out;
-        err = gpio_request(POODLE_GPIO_nSD_WP, "nSD_WP");
-        if (err)
-                goto err_free_1;
        err = gpio_request(POODLE_GPIO_SD_PWR, "SD_PWR");
        if (err)
                goto err_free_2;
@@ -267,34 +257,14 @@ static int poodle_mci_init(struct device *dev, irq_handler_t poodle_detect_int,
        if (err)
                goto err_free_3;
-        gpio_direction_input(POODLE_GPIO_nSD_DETECT);
-        gpio_direction_input(POODLE_GPIO_nSD_WP);
        gpio_direction_output(POODLE_GPIO_SD_PWR, 0);
        gpio_direction_output(POODLE_GPIO_SD_PWR1, 0);
-        poodle_mci_platform_data.detect_delay = msecs_to_jiffies(250);
-        err = request_irq(POODLE_IRQ_GPIO_nSD_DETECT, poodle_detect_int,
-                          IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-                          "MMC card detect", data);
-        if (err) {
-                pr_err("%s: MMC/SD: can't request MMC card detect IRQ\n",
-                                __func__);
-                goto err_free_4;
-        }
        return 0;
-err_free_4:
-        gpio_free(POODLE_GPIO_SD_PWR1);
 err_free_3:
        gpio_free(POODLE_GPIO_SD_PWR);
 err_free_2:
-        gpio_free(POODLE_GPIO_nSD_WP);
-err_free_1:
-        gpio_free(POODLE_GPIO_nSD_DETECT);
-err_out:
        return err;
 }
@@ -312,62 +282,29 @@ static void poodle_mci_setpower(struct device *dev, unsigned int vdd)
        }
 }
-static int poodle_mci_get_ro(struct device *dev)
-{
-        return !!gpio_get_value(POODLE_GPIO_nSD_WP);
-        return GPLR(POODLE_GPIO_nSD_WP) & GPIO_bit(POODLE_GPIO_nSD_WP);
-}
 static void poodle_mci_exit(struct device *dev, void *data)
 {
-        free_irq(POODLE_IRQ_GPIO_nSD_DETECT, data);
        gpio_free(POODLE_GPIO_SD_PWR1);
        gpio_free(POODLE_GPIO_SD_PWR);
-        gpio_free(POODLE_GPIO_nSD_WP);
-        gpio_free(POODLE_GPIO_nSD_DETECT);
 }
 static struct pxamci_platform_data poodle_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = poodle_mci_init,
+        .init                   = poodle_mci_init,
-        .get_ro         = poodle_mci_get_ro,
+        .setpower               = poodle_mci_setpower,
-        .setpower       = poodle_mci_setpower,
+        .exit                   = poodle_mci_exit,
-        .exit           = poodle_mci_exit,
+        .gpio_card_detect       = POODLE_IRQ_GPIO_nSD_DETECT,
+        .gpio_card_ro           = POODLE_GPIO_nSD_WP,
+        .gpio_power             = -1,
 };
 /*
 * Irda
 */
-static void poodle_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(POODLE_GPIO_IR_ON, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
-static int poodle_irda_startup(struct device *dev)
-{
-        int err;
-        err = gpio_request(POODLE_GPIO_IR_ON, "IR_ON");
-        if (err)
-                return err;
-        gpio_direction_output(POODLE_GPIO_IR_ON, 1);
-        return 0;
-}
-static void poodle_irda_shutdown(struct device *dev)
-{
-        gpio_free(POODLE_GPIO_IR_ON);
-}
 static struct pxaficp_platform_data poodle_ficp_platform_data = {
+        .gpio_pwdown            = POODLE_GPIO_IR_ON,
        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_mode       = poodle_irda_transceiver_mode,
-        .startup                = poodle_irda_startup,
-        .shutdown               = poodle_irda_shutdown,
 };
@@ -512,6 +449,10 @@ static void __init poodle_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(poodle_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_scoop_config = &poodle_pcmcia_config;
        ret = platform_add_devices(devices, ARRAY_SIZE(devices));
@@ -521,6 +462,7 @@ static void __init poodle_init(void)
        set_pxa_fb_parent(&poodle_locomo_device.dev);
        set_pxa_fb_info(&poodle_fb_info);
        pxa_set_udc_info(&udc_info);
+        poodle_mci_platform_data.detect_delay = msecs_to_jiffies(250);
        pxa_set_mci_info(&poodle_mci_platform_data);
        pxa_set_ficp_info(&poodle_ficp_platform_data);
        pxa_set_i2c_info(NULL);
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 77c2693cfeef..2c1b0b70d01d 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -322,9 +322,6 @@ void __init pxa26x_init_irq(void)
 static struct platform_device *pxa25x_devices[] __initdata = {
        &pxa25x_device_udc,
-        &pxa_device_ffuart,
-        &pxa_device_btuart,
-        &pxa_device_stuart,
        &pxa_device_i2s,
        &sa1100_device_rtc,
        &pxa25x_device_ssp,
@@ -372,10 +369,8 @@ static int __init pxa25x_init(void)
        }
        /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
-        if (cpu_is_pxa255()) {
+        if (cpu_is_pxa255())
                clks_register(&pxa25x_hwuart_clkreg, 1);
-                ret = platform_device_register(&pxa_device_hwuart);
-        }
        return ret;
 }
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index ec68cc16b4e3..6a0b73167e03 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -364,9 +364,6 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info)
 static struct platform_device *devices[] __initdata = {
        &pxa27x_device_udc,
-        &pxa_device_ffuart,
-        &pxa_device_btuart,
-        &pxa_device_stuart,
        &pxa_device_i2s,
        &sa1100_device_rtc,
        &pxa_device_rtc,
diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c
index 2f3394f85917..868270421b8c 100644
--- a/arch/arm/mach-pxa/pxa2xx.c
+++ b/arch/arm/mach-pxa/pxa2xx.c
@@ -52,3 +52,4 @@ void pxa2xx_transceiver_mode(struct device *dev, int mode)
        } else
                BUG();
 }
+EXPORT_SYMBOL_GPL(pxa2xx_transceiver_mode);
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index 4ba6d21f851c..f4af6e2bef89 100644
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -84,9 +84,11 @@ static struct mfp_addr_map pxa310_mfp_addr_map[] __initdata = {
 };
 static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0);
+static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
 static struct clk_lookup common_clkregs[] = {
        INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
+        INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
 };
 static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c
index 8b3d97efadab..c7373e74a109 100644
--- a/arch/arm/mach-pxa/pxa320.c
+++ b/arch/arm/mach-pxa/pxa320.c
@@ -78,9 +78,11 @@ static struct mfp_addr_map pxa320_mfp_addr_map[] __initdata = {
 };
 static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0);
+static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);
 static struct clk_lookup pxa320_clkregs[] = {
        INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
+        INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
 };
 static int __init pxa320_init(void)
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 09b7b1a10cad..fcb0721f4669 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -30,6 +30,7 @@
 #include <mach/pm.h>
 #include <mach/dma.h>
 #include <mach/ssp.h>
+#include <mach/regs-intc.h>
 #include <plat/i2c.h>
 #include "generic.h"
@@ -45,6 +46,9 @@
 #define ACCR_D0CS       (1 << 26)
 #define ACCR_PCCE       (1 << 11)
+#define PECR_IE(n)      ((1 << ((n) * 2)) << 28)
+#define PECR_IS(n)      ((1 << ((n) * 2)) << 29)
 /* crystal frequency to static memory controller multiplier (SMCFS) */
 static unsigned char smcfs_mult[8] = { 6, 0, 8, 0, 0, 16, };
@@ -237,6 +241,7 @@ static DEFINE_PXA3_CKEN(pxa3xx_stuart, STUART, 14857000, 1);
 static DEFINE_PXA3_CKEN(pxa3xx_i2c, I2C, 32842000, 0);
 static DEFINE_PXA3_CKEN(pxa3xx_udc, UDC, 48000000, 5);
 static DEFINE_PXA3_CKEN(pxa3xx_usbh, USBH, 48000000, 0);
+static DEFINE_PXA3_CKEN(pxa3xx_u2d, USB2, 48000000, 0);
 static DEFINE_PXA3_CKEN(pxa3xx_keypad, KEYPAD, 32768, 0);
 static DEFINE_PXA3_CKEN(pxa3xx_ssp1, SSP1, 13000000, 0);
 static DEFINE_PXA3_CKEN(pxa3xx_ssp2, SSP2, 13000000, 0);
@@ -261,6 +266,7 @@ static struct clk_lookup pxa3xx_clkregs[] = {
        INIT_CLKREG(&clk_pxa3xx_i2c, "pxa2xx-i2c.0", NULL),
        INIT_CLKREG(&clk_pxa3xx_udc, "pxa27x-udc", NULL),
        INIT_CLKREG(&clk_pxa3xx_usbh, "pxa27x-ohci", NULL),
+        INIT_CLKREG(&clk_pxa3xx_u2d, NULL, "U2DCLK"),
        INIT_CLKREG(&clk_pxa3xx_keypad, "pxa27x-keypad", NULL),
        INIT_CLKREG(&clk_pxa3xx_ssp1, "pxa27x-ssp.0", NULL),
        INIT_CLKREG(&clk_pxa3xx_ssp2, "pxa27x-ssp.1", NULL),
@@ -530,6 +536,43 @@ static inline void pxa3xx_init_pm(void) {}
 #define pxa3xx_set_wake NULL
 #endif
+static void pxa_ack_ext_wakeup(unsigned int irq)
+{
+        PECR |= PECR_IS(irq - IRQ_WAKEUP0);
+}
+static void pxa_mask_ext_wakeup(unsigned int irq)
+{
+        ICMR2 &= ~(1 << ((irq - PXA_IRQ(0)) & 0x1f));
+        PECR &= ~PECR_IE(irq - IRQ_WAKEUP0);
+}
+static void pxa_unmask_ext_wakeup(unsigned int irq)
+{
+        ICMR2 |= 1 << ((irq - PXA_IRQ(0)) & 0x1f);
+        PECR |= PECR_IE(irq - IRQ_WAKEUP0);
+}
+static struct irq_chip pxa_ext_wakeup_chip = {
+        .name           = "WAKEUP",
+        .ack            = pxa_ack_ext_wakeup,
+        .mask           = pxa_mask_ext_wakeup,
+        .unmask         = pxa_unmask_ext_wakeup,
+};
+static void __init pxa_init_ext_wakeup_irq(set_wake_t fn)
+{
+        int irq;
+        for (irq = IRQ_WAKEUP0; irq <= IRQ_WAKEUP1; irq++) {
+                set_irq_chip(irq, &pxa_ext_wakeup_chip);
+                set_irq_handler(irq, handle_edge_irq);
+                set_irq_flags(irq, IRQF_VALID);
+        }
+        pxa_ext_wakeup_chip.set_wake = fn;
+}
 void __init pxa3xx_init_irq(void)
 {
        /* enable CP6 access */
@@ -539,6 +582,7 @@ void __init pxa3xx_init_irq(void)
        __asm__ __volatile__("mcr p15, 0, %0, c15, c1, 0\n": :"r"(value));
        pxa_init_irq(56, pxa3xx_set_wake);
+        pxa_init_ext_wakeup_irq(pxa3xx_set_wake);
        pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL);
 }
@@ -553,9 +597,6 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)
 static struct platform_device *devices[] __initdata = {
        &pxa27x_device_udc,
-        &pxa_device_ffuart,
-        &pxa_device_btuart,
-        &pxa_device_stuart,
        &pxa_device_i2s,
        &sa1100_device_rtc,
        &pxa_device_rtc,
diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c
index 71131742fffd..064292008288 100644
--- a/arch/arm/mach-pxa/pxa930.c
+++ b/arch/arm/mach-pxa/pxa930.c
@@ -176,13 +176,30 @@ static struct mfp_addr_map pxa930_mfp_addr_map[] __initdata = {
        MFP_ADDR_END,
 };
+static struct mfp_addr_map pxa935_mfp_addr_map[] __initdata = {
+        MFP_ADDR(GPIO159, 0x0524),
+        MFP_ADDR(GPIO163, 0x0534),
+        MFP_ADDR(GPIO167, 0x0544),
+        MFP_ADDR(GPIO168, 0x0548),
+        MFP_ADDR(GPIO169, 0x054c),
+        MFP_ADDR(GPIO170, 0x0550),
+        MFP_ADDR(GPIO171, 0x0554),
+        MFP_ADDR(GPIO172, 0x0558),
+        MFP_ADDR(GPIO173, 0x055c),
+        MFP_ADDR_END,
+};
 static int __init pxa930_init(void)
 {
-        if (cpu_is_pxa930()) {
+        if (cpu_is_pxa930() || cpu_is_pxa935()) {
                mfp_init_base(io_p2v(MFPR_BASE));
                mfp_init_addr(pxa930_mfp_addr_map);
        }
+        if (cpu_is_pxa935())
+                mfp_init_addr(pxa935_mfp_addr_map);
        return 0;
 }
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c
index 8241a63ea589..115b6f234bdd 100644
--- a/arch/arm/mach-pxa/saar.c
+++ b/arch/arm/mach-pxa/saar.c
@@ -22,9 +22,13 @@
 #include <linux/i2c.h>
 #include <linux/smc91x.h>
 #include <linux/mfd/da903x.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/onenand.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/flash.h>
 #include <mach/pxa930.h>
 #include <plat/i2c.h>
@@ -33,7 +37,7 @@
 #include "devices.h"
 #include "generic.h"
-#define GPIO_LCD_RESET  (16)
+#define GPIO_LCD_RESET          (16)
 /* SAAR MFP configurations */
 static mfp_cfg_t saar_mfp_cfg[] __initdata = {
@@ -56,6 +60,31 @@ static mfp_cfg_t saar_mfp_cfg[] __initdata = {
        /* Ethernet */
        DF_nCS1_nCS3,
        GPIO97_GPIO,
+        /* DFI */
+        DF_INT_RnB_ND_INT_RnB,
+        DF_nRE_nOE_ND_nRE,
+        DF_nWE_ND_nWE,
+        DF_CLE_nOE_ND_CLE,
+        DF_nADV1_ALE_ND_ALE,
+        DF_nADV2_ALE_nCS3,
+        DF_nCS0_ND_nCS0,
+        DF_IO0_ND_IO0,
+        DF_IO1_ND_IO1,
+        DF_IO2_ND_IO2,
+        DF_IO3_ND_IO3,
+        DF_IO4_ND_IO4,
+        DF_IO5_ND_IO5,
+        DF_IO6_ND_IO6,
+        DF_IO7_ND_IO7,
+        DF_IO8_ND_IO8,
+        DF_IO9_ND_IO9,
+        DF_IO10_ND_IO10,
+        DF_IO11_ND_IO11,
+        DF_IO12_ND_IO12,
+        DF_IO13_ND_IO13,
+        DF_IO14_ND_IO14,
+        DF_IO15_ND_IO15,
 };
 #define SAAR_ETH_PHYS   (0x14000000)
@@ -451,10 +480,15 @@ static inline void saar_init_lcd(void) {}
 #endif
 #if defined(CONFIG_I2C_PXA) || defined(CONFIG_I2C_PXA_MODULE)
+static struct da9034_backlight_pdata saar_da9034_backlight = {
+        .output_current = 4,    /* 4mA */
+};
 static struct da903x_subdev_info saar_da9034_subdevs[] = {
        [0] = {
                .name           = "da903x-backlight",
                .id             = DA9034_ID_WLED,
+                .platform_data  = &saar_da9034_backlight,
        },
 };
@@ -480,12 +514,81 @@ static void __init saar_init_i2c(void)
 #else
 static inline void saar_init_i2c(void) {}
 #endif
+#if defined(CONFIG_MTD_ONENAND) || defined(CONFIG_MTD_ONENAND_MODULE)
+static struct mtd_partition saar_onenand_partitions[] = {
+        {
+                .name           = "bootloader",
+                .offset         = 0,
+                .size           = SZ_1M,
+                .mask_flags     = MTD_WRITEABLE,
+        }, {
+                .name           = "reserved",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = SZ_128K,
+                .mask_flags     = MTD_WRITEABLE,
+        }, {
+                .name           = "reserved",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = SZ_8M,
+                .mask_flags     = MTD_WRITEABLE,
+        }, {
+                .name           = "kernel",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = (SZ_2M + SZ_1M),
+                .mask_flags     = 0,
+        }, {
+                .name           = "filesystem",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = SZ_48M,
+                .mask_flags     = 0,
+        }
+};
+static struct onenand_platform_data saar_onenand_info = {
+        .parts          = saar_onenand_partitions,
+        .nr_parts       = ARRAY_SIZE(saar_onenand_partitions),
+};
+#define SMC_CS0_PHYS_BASE       (0x10000000)
+static struct resource saar_resource_onenand[] = {
+        [0] = {
+                .start  = SMC_CS0_PHYS_BASE,
+                .end    = SMC_CS0_PHYS_BASE + SZ_1M,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+static struct platform_device saar_device_onenand = {
+        .name           = "onenand-flash",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &saar_onenand_info,
+        },
+        .resource       = saar_resource_onenand,
+        .num_resources  = ARRAY_SIZE(saar_resource_onenand),
+};
+static void __init saar_init_onenand(void)
+{
+        platform_device_register(&saar_device_onenand);
+}
+#else
+static void __init saar_init_onenand(void) {}
+#endif
 static void __init saar_init(void)
 {
        /* initialize MFP configurations */
        pxa3xx_mfp_config(ARRAY_AND_SIZE(saar_mfp_cfg));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_device_register(&smc91x_device);
+        saar_init_onenand();
        saar_init_i2c();
        saar_init_lcd();
diff --git a/arch/arm/mach-pxa/sharpsl.h b/arch/arm/mach-pxa/sharpsl.h
index 55259f4756c8..1439785d3979 100644
--- a/arch/arm/mach-pxa/sharpsl.h
+++ b/arch/arm/mach-pxa/sharpsl.h
@@ -42,8 +42,8 @@ void corgi_lcdtg_hw_init(int mode);
 #define MAX1111_BATT_TEMP   2u
 #define MAX1111_ACIN_VOLT   6u
-extern struct battery_thresh spitz_battery_levels_acin[];
+extern struct battery_thresh sharpsl_battery_levels_acin[];
-extern struct battery_thresh spitz_battery_levels_noac[];
+extern struct battery_thresh sharpsl_battery_levels_noac[];
 int sharpsl_pm_pxa_read_max1111(int channel);
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 2546c066cd6e..67229a1ef55c 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -78,7 +78,7 @@ DEFINE_LED_TRIGGER(sharpsl_charge_led_trigger);
-struct battery_thresh spitz_battery_levels_acin[] = {
+struct battery_thresh sharpsl_battery_levels_acin[] = {
        { 213, 100},
        { 212,  98},
        { 211,  95},
@@ -121,7 +121,7 @@ struct battery_thresh spitz_battery_levels_acin[] = {
        {   0,   0},
 };
-struct battery_thresh  spitz_battery_levels_noac[] = {
+struct battery_thresh sharpsl_battery_levels_noac[] = {
        { 213, 100},
        { 212,  98},
        { 211,  95},
@@ -165,19 +165,20 @@ struct battery_thresh  spitz_battery_levels_noac[] = {
 };
 /* MAX1111 Commands */
-#define MAXCTRL_PD0      1u << 0
+#define MAXCTRL_PD0      (1u << 0)
-#define MAXCTRL_PD1      1u << 1
+#define MAXCTRL_PD1      (1u << 1)
-#define MAXCTRL_SGL      1u << 2
+#define MAXCTRL_SGL      (1u << 2)
-#define MAXCTRL_UNI      1u << 3
+#define MAXCTRL_UNI      (1u << 3)
 #define MAXCTRL_SEL_SH   4
-#define MAXCTRL_STR      1u << 7
+#define MAXCTRL_STR      (1u << 7)
 /*
 * Read MAX1111 ADC
 */
 int sharpsl_pm_pxa_read_max1111(int channel)
 {
-        if (machine_is_tosa()) // Ugly, better move this function into another module
+        /* Ugly, better move this function into another module */
+        if (machine_is_tosa())
            return 0;
 #ifdef CONFIG_CORGI_SSP_DEPRECATED
@@ -238,7 +239,7 @@ EXPORT_SYMBOL(sharpsl_battery_kick);
 static void sharpsl_battery_thread(struct work_struct *private_)
 {
-        int voltage, percent, apm_status, i = 0;
+        int voltage, percent, apm_status, i;
        if (!sharpsl_pm.machinfo)
                return;
@@ -250,15 +251,14 @@ static void sharpsl_battery_thread(struct work_struct *private_)
                        && time_after(jiffies, sharpsl_pm.charge_start_time +  SHARPSL_CHARGE_ON_TIME_INTERVAL))
                schedule_delayed_work(&toggle_charger, 0);
-        while(1) {
+        for (i = 0; i < 5; i++) {
                voltage = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT);
+                if (voltage > 0)
-                if (voltage > 0) break;
-                if (i++ > 5) {
-                        voltage = sharpsl_pm.machinfo->bat_levels_noac[0].voltage;
-                        dev_warn(sharpsl_pm.dev, "Warning: Cannot read main battery!\n");
                        break;
-                }
+        }
+        if (voltage <= 0) {
+                voltage = sharpsl_pm.machinfo->bat_levels_noac[0].voltage;
+                dev_warn(sharpsl_pm.dev, "Warning: Cannot read main battery!\n");
        }
        voltage = sharpsl_average_value(voltage);
@@ -266,8 +266,10 @@ static void sharpsl_battery_thread(struct work_struct *private_)
        percent = get_percentage(voltage);
        /* At low battery voltages, the voltage has a tendency to start
-           creeping back up so we try to avoid this here */
+           creeping back up so we try to avoid this here */
-        if ((sharpsl_pm.battstat.ac_status == APM_AC_ONLINE) || (apm_status == APM_BATTERY_STATUS_HIGH) ||  percent <= sharpsl_pm.battstat.mainbat_percent) {
+        if ((sharpsl_pm.battstat.ac_status == APM_AC_ONLINE)
+            || (apm_status == APM_BATTERY_STATUS_HIGH)
+            || percent <= sharpsl_pm.battstat.mainbat_percent) {
                sharpsl_pm.battstat.mainbat_voltage = voltage;
                sharpsl_pm.battstat.mainbat_status = apm_status;
                sharpsl_pm.battstat.mainbat_percent = percent;
@@ -279,8 +281,8 @@ static void sharpsl_battery_thread(struct work_struct *private_)
 #ifdef CONFIG_BACKLIGHT_CORGI
        /* If battery is low. limit backlight intensity to save power. */
        if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
-                        && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) ||
+            && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)
-                        (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
+            || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
                if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {
                        sharpsl_pm.machinfo->backlight_limit(1);
                        sharpsl_pm.flags |= SHARPSL_BL_LIMIT;
@@ -293,8 +295,8 @@ static void sharpsl_battery_thread(struct work_struct *private_)
        /* Suspend if critical battery level */
        if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
-                        && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)
+             && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)
-                        && !(sharpsl_pm.flags & SHARPSL_APM_QUEUED)) {
+             && !(sharpsl_pm.flags & SHARPSL_APM_QUEUED)) {
                sharpsl_pm.flags |= SHARPSL_APM_QUEUED;
                dev_err(sharpsl_pm.dev, "Fatal Off\n");
                apm_queue_event(APM_CRITICAL_SUSPEND);
@@ -346,7 +348,7 @@ static void sharpsl_charge_error(void)
 static void sharpsl_charge_toggle(struct work_struct *private_)
 {
-        dev_dbg(sharpsl_pm.dev, "Toogling Charger at time: %lx\n", jiffies);
+        dev_dbg(sharpsl_pm.dev, "Toggling Charger at time: %lx\n", jiffies);
        if (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN)) {
                sharpsl_charge_off();
@@ -368,7 +370,7 @@ static void sharpsl_ac_timer(unsigned long data)
 {
        int acin = sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN);
-        dev_dbg(sharpsl_pm.dev, "AC Status: %d\n",acin);
+        dev_dbg(sharpsl_pm.dev, "AC Status: %d\n", acin);
        sharpsl_average_clear();
        if (acin && (sharpsl_pm.charge_mode != CHRG_ON))
@@ -472,14 +474,14 @@ static int sharpsl_average_value(int ad)
        sharpsl_ad[sharpsl_ad_index] = ad;
        sharpsl_ad_index++;
        if (sharpsl_ad_index >= SHARPSL_CNV_VALUE_NUM) {
-                for (i=0; i < (SHARPSL_CNV_VALUE_NUM-1); i++)
+                for (i = 0; i < (SHARPSL_CNV_VALUE_NUM-1); i++)
                        sharpsl_ad[i] = sharpsl_ad[i+1];
                sharpsl_ad_index = SHARPSL_CNV_VALUE_NUM - 1;
        }
-        for (i=0; i < sharpsl_ad_index; i++)
+        for (i = 0; i < sharpsl_ad_index; i++)
                ad_val += sharpsl_ad[i];
-        return (ad_val / sharpsl_ad_index);
+        return ad_val / sharpsl_ad_index;
 }
 /*
@@ -492,8 +494,8 @@ static int get_select_val(int *val)
        /* Find MAX val */
        temp = val[0];
-        j=0;
+        j = 0;
-        for (i=1; i<5; i++) {
+        for (i = 1; i < 5; i++) {
                if (temp < val[i]) {
                        temp = val[i];
                        j = i;
@@ -502,21 +504,21 @@ static int get_select_val(int *val)
        /* Find MIN val */
        temp = val[4];
-        k=4;
+        k = 4;
-        for (i=3; i>=0; i--) {
+        for (i = 3; i >= 0; i--) {
                if (temp > val[i]) {
                        temp = val[i];
                        k = i;
                }
        }
-        for (i=0; i<5; i++)
+        for (i = 0; i < 5; i++)
-                if (i != j && i != k )
+                if (i != j && i != k)
                        sum += val[i];
        dev_dbg(sharpsl_pm.dev, "Average: %d from values: %d, %d, %d, %d, %d\n", sum/3, val[0], val[1], val[2], val[3], val[4]);
-        return (sum/3);
+        return sum/3;
 }
 static int sharpsl_check_battery_temp(void)
@@ -524,7 +526,7 @@ static int sharpsl_check_battery_temp(void)
        int val, i, buff[5];
        /* Check battery temperature */
-        for (i=0; i<5; i++) {
+        for (i = 0; i < 5; i++) {
                mdelay(SHARPSL_CHECK_BATTERY_WAIT_TIME_TEMP);
                sharpsl_pm.machinfo->measure_temp(1);
                mdelay(SHARPSL_CHECK_BATTERY_WAIT_TIME_TEMP);
@@ -557,7 +559,7 @@ static int sharpsl_check_battery_voltage(void)
                sharpsl_pm.machinfo->discharge1(1);
        /* Check battery voltage */
-        for (i=0; i<5; i++) {
+        for (i = 0; i < 5; i++) {
                buff[i] = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT);
                mdelay(SHARPSL_CHECK_BATTERY_WAIT_TIME_VOLT);
        }
@@ -581,16 +583,16 @@ static int sharpsl_ac_check(void)
 {
        int temp, i, buff[5];
-        for (i=0; i<5; i++) {
+        for (i = 0; i < 5; i++) {
                buff[i] = sharpsl_pm.machinfo->read_devdata(SHARPSL_ACIN_VOLT);
                mdelay(SHARPSL_CHECK_BATTERY_WAIT_TIME_ACIN);
        }
        temp = get_select_val(buff);
-        dev_dbg(sharpsl_pm.dev, "AC Voltage: %d\n",temp);
+        dev_dbg(sharpsl_pm.dev, "AC Voltage: %d\n", temp);
        if ((temp > sharpsl_pm.machinfo->charge_acin_high) || (temp < sharpsl_pm.machinfo->charge_acin_low)) {
-                dev_err(sharpsl_pm.dev, "Error: AC check failed.\n");
+                dev_err(sharpsl_pm.dev, "Error: AC check failed: voltage %d.\n", temp);
                return -1;
        }
@@ -624,9 +626,9 @@ static int sharpsl_pm_resume(struct platform_device *pdev)
 static void corgi_goto_sleep(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state)
 {
-        dev_dbg(sharpsl_pm.dev, "Time is: %08x\n",RCNR);
+        dev_dbg(sharpsl_pm.dev, "Time is: %08x\n", RCNR);
-        dev_dbg(sharpsl_pm.dev, "Offline Charge Activate = %d\n",sharpsl_pm.flags & SHARPSL_DO_OFFLINE_CHRG);
+        dev_dbg(sharpsl_pm.dev, "Offline Charge Activate = %d\n", sharpsl_pm.flags & SHARPSL_DO_OFFLINE_CHRG);
        /* not charging and AC-IN! */
        if ((sharpsl_pm.flags & SHARPSL_DO_OFFLINE_CHRG) && (sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN))) {
@@ -644,12 +646,12 @@ static void corgi_goto_sleep(unsigned long alarm_time, unsigned int alarm_enable
        if ((sharpsl_pm.charge_mode == CHRG_ON) && ((alarm_enable && ((alarm_time - RCNR) > (SHARPSL_BATCHK_TIME_SUSPEND + 30))) || !alarm_enable)) {
                RTSR &= RTSR_ALE;
                RTAR = RCNR + SHARPSL_BATCHK_TIME_SUSPEND;
-                dev_dbg(sharpsl_pm.dev, "Charging alarm at: %08x\n",RTAR);
+                dev_dbg(sharpsl_pm.dev, "Charging alarm at: %08x\n", RTAR);
                sharpsl_pm.flags |= SHARPSL_ALARM_ACTIVE;
        } else if (alarm_enable) {
                RTSR &= RTSR_ALE;
                RTAR = alarm_time;
-                dev_dbg(sharpsl_pm.dev, "User alarm at: %08x\n",RTAR);
+                dev_dbg(sharpsl_pm.dev, "User alarm at: %08x\n", RTAR);
        } else {
                dev_dbg(sharpsl_pm.dev, "No alarms set.\n");
        }
@@ -658,19 +660,18 @@ static void corgi_goto_sleep(unsigned long alarm_time, unsigned int alarm_enable
        sharpsl_pm.machinfo->postsuspend();
-        dev_dbg(sharpsl_pm.dev, "Corgi woken up from suspend: %08x\n",PEDR);
+        dev_dbg(sharpsl_pm.dev, "Corgi woken up from suspend: %08x\n", PEDR);
 }
 static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state)
 {
-        if (!sharpsl_pm.machinfo->should_wakeup(!(sharpsl_pm.flags & SHARPSL_ALARM_ACTIVE) && alarm_enable) )
+        if (!sharpsl_pm.machinfo->should_wakeup(!(sharpsl_pm.flags & SHARPSL_ALARM_ACTIVE) && alarm_enable)) {
-        {
                if (!(sharpsl_pm.flags & SHARPSL_ALARM_ACTIVE)) {
                        dev_dbg(sharpsl_pm.dev, "No user triggered wakeup events and not charging. Strange. Suspend.\n");
                        corgi_goto_sleep(alarm_time, alarm_enable, state);
                        return 1;
                }
-                if(sharpsl_off_charge_battery()) {
+                if (sharpsl_off_charge_battery()) {
                        dev_dbg(sharpsl_pm.dev, "Charging. Suspend...\n");
                        corgi_goto_sleep(alarm_time, alarm_enable, state);
                        return 1;
@@ -678,8 +679,8 @@ static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enab
                dev_dbg(sharpsl_pm.dev, "User triggered wakeup in offline charger.\n");
        }
-        if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || (sharpsl_fatal_check() < 0) )
+        if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) ||
-        {
+            (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_FATAL))) {
                dev_err(sharpsl_pm.dev, "Fatal condition. Suspend.\n");
                corgi_goto_sleep(alarm_time, alarm_enable, state);
                return 1;
@@ -697,7 +698,7 @@ static int corgi_pxa_pm_enter(suspend_state_t state)
        corgi_goto_sleep(alarm_time, alarm_status, state);
-        while (corgi_enter_suspend(alarm_time,alarm_status,state))
+        while (corgi_enter_suspend(alarm_time, alarm_status, state))
                {}
        if (sharpsl_pm.machinfo->earlyresume)
@@ -732,7 +733,7 @@ static int sharpsl_fatal_check(void)
                sharpsl_pm.machinfo->discharge1(1);
        /* Check battery : check inserting battery ? */
-        for (i=0; i<5; i++) {
+        for (i = 0; i < 5; i++) {
                buff[i] = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT);
                mdelay(SHARPSL_CHECK_BATTERY_WAIT_TIME_VOLT);
        }
@@ -812,7 +813,7 @@ static int sharpsl_off_charge_battery(void)
                mdelay(SHARPSL_CHARGE_CO_CHECK_TIME);
                time = RCNR;
-                while(1) {
+                while (1) {
                        /* Check if any wakeup event had occurred */
                        if (sharpsl_pm.machinfo->charger_wakeup() != 0)
                                return 0;
@@ -835,9 +836,9 @@ static int sharpsl_off_charge_battery(void)
        mdelay(SHARPSL_CHARGE_CO_CHECK_TIME);
        time = RCNR;
-        while(1) {
+        while (1) {
                /* Check if any wakeup event had occurred */
-                if (sharpsl_pm.machinfo->charger_wakeup() != 0)
+                if (sharpsl_pm.machinfo->charger_wakeup())
                        return 0;
                /* Check for timeout */
                if ((RCNR-time) > SHARPSL_WAIT_CO_TIME) {
@@ -864,12 +865,12 @@ static int sharpsl_off_charge_battery(void)
 static ssize_t battery_percentage_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        return sprintf(buf, "%d\n",sharpsl_pm.battstat.mainbat_percent);
+        return sprintf(buf, "%d\n", sharpsl_pm.battstat.mainbat_percent);
 }
 static ssize_t battery_voltage_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        return sprintf(buf, "%d\n",sharpsl_pm.battstat.mainbat_voltage);
+        return sprintf(buf, "%d\n", sharpsl_pm.battstat.mainbat_voltage);
 }
 static DEVICE_ATTR(battery_percentage, 0444, battery_percentage_show, NULL);
@@ -943,8 +944,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
                }
        }
-        if (sharpsl_pm.machinfo->batfull_irq)
+        if (sharpsl_pm.machinfo->batfull_irq) {
-        {
                /* Register interrupt handler. */
                if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING, "CO", sharpsl_chrg_full_isr)) {
                        dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull));
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index dda310fe71c8..4b50f144fa48 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/gpio_keys.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/mtd/physmap.h>
@@ -24,6 +25,7 @@
 #include <linux/spi/ads7846.h>
 #include <linux/spi/corgi_lcd.h>
 #include <linux/mtd/sharpsl.h>
+#include <linux/input/matrix_keypad.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -111,6 +113,26 @@ static unsigned long spitz_pin_config[] __initdata = {
        GPIO105_GPIO,   /* SPITZ_GPIO_CF_IRQ */
        GPIO106_GPIO,   /* SPITZ_GPIO_CF2_IRQ */
+        /* GPIO matrix keypad */
+        GPIO88_GPIO,    /* column 0 */
+        GPIO23_GPIO,    /* column 1 */
+        GPIO24_GPIO,    /* column 2 */
+        GPIO25_GPIO,    /* column 3 */
+        GPIO26_GPIO,    /* column 4 */
+        GPIO27_GPIO,    /* column 5 */
+        GPIO52_GPIO,    /* column 6 */
+        GPIO103_GPIO,   /* column 7 */
+        GPIO107_GPIO,   /* column 8 */
+        GPIO108_GPIO,   /* column 9 */
+        GPIO114_GPIO,   /* column 10 */
+        GPIO12_GPIO,    /* row 0 */
+        GPIO17_GPIO,    /* row 1 */
+        GPIO91_GPIO,    /* row 2 */
+        GPIO34_GPIO,    /* row 3 */
+        GPIO36_GPIO,    /* row 4 */
+        GPIO38_GPIO,    /* row 5 */
+        GPIO39_GPIO,    /* row 6 */
        /* I2C */
        GPIO117_I2C_SCL,
        GPIO118_I2C_SDA,
@@ -242,9 +264,152 @@ EXPORT_SYMBOL(spitzscoop2_device);
 /*
 * Spitz Keyboard Device
 */
+#define SPITZ_KEY_CALENDAR      KEY_F1
+#define SPITZ_KEY_ADDRESS       KEY_F2
+#define SPITZ_KEY_FN            KEY_F3
+#define SPITZ_KEY_CANCEL        KEY_F4
+#define SPITZ_KEY_EXOK          KEY_F5
+#define SPITZ_KEY_EXCANCEL      KEY_F6
+#define SPITZ_KEY_EXJOGDOWN     KEY_F7
+#define SPITZ_KEY_EXJOGUP       KEY_F8
+#define SPITZ_KEY_JAP1          KEY_LEFTALT
+#define SPITZ_KEY_JAP2          KEY_RIGHTCTRL
+#define SPITZ_KEY_SYNC          KEY_F9
+#define SPITZ_KEY_MAIL          KEY_F10
+#define SPITZ_KEY_OK            KEY_F11
+#define SPITZ_KEY_MENU          KEY_F12
+static const uint32_t spitzkbd_keymap[] = {
+        KEY(0, 0, KEY_LEFTCTRL),
+        KEY(0, 1, KEY_1),
+        KEY(0, 2, KEY_3),
+        KEY(0, 3, KEY_5),
+        KEY(0, 4, KEY_6),
+        KEY(0, 5, KEY_7),
+        KEY(0, 6, KEY_9),
+        KEY(0, 7, KEY_0),
+        KEY(0, 8, KEY_BACKSPACE),
+        KEY(0, 9, SPITZ_KEY_EXOK),      /* EXOK */
+        KEY(0, 10, SPITZ_KEY_EXCANCEL), /* EXCANCEL */
+        KEY(1, 1, KEY_2),
+        KEY(1, 2, KEY_4),
+        KEY(1, 3, KEY_R),
+        KEY(1, 4, KEY_Y),
+        KEY(1, 5, KEY_8),
+        KEY(1, 6, KEY_I),
+        KEY(1, 7, KEY_O),
+        KEY(1, 8, KEY_P),
+        KEY(1, 9, SPITZ_KEY_EXJOGDOWN), /* EXJOGDOWN */
+        KEY(1, 10, SPITZ_KEY_EXJOGUP),  /* EXJOGUP */
+        KEY(2, 0, KEY_TAB),
+        KEY(2, 1, KEY_Q),
+        KEY(2, 2, KEY_E),
+        KEY(2, 3, KEY_T),
+        KEY(2, 4, KEY_G),
+        KEY(2, 5, KEY_U),
+        KEY(2, 6, KEY_J),
+        KEY(2, 7, KEY_K),
+        KEY(3, 0, SPITZ_KEY_ADDRESS),   /* ADDRESS */
+        KEY(3, 1, KEY_W),
+        KEY(3, 2, KEY_S),
+        KEY(3, 3, KEY_F),
+        KEY(3, 4, KEY_V),
+        KEY(3, 5, KEY_H),
+        KEY(3, 6, KEY_M),
+        KEY(3, 7, KEY_L),
+        KEY(3, 9, KEY_RIGHTSHIFT),
+        KEY(4, 0, SPITZ_KEY_CALENDAR),  /* CALENDAR */
+        KEY(4, 1, KEY_A),
+        KEY(4, 2, KEY_D),
+        KEY(4, 3, KEY_C),
+        KEY(4, 4, KEY_B),
+        KEY(4, 5, KEY_N),
+        KEY(4, 6, KEY_DOT),
+        KEY(4, 8, KEY_ENTER),
+        KEY(4, 9, KEY_LEFTSHIFT),
+        KEY(5, 0, SPITZ_KEY_MAIL),      /* MAIL */
+        KEY(5, 1, KEY_Z),
+        KEY(5, 2, KEY_X),
+        KEY(5, 3, KEY_MINUS),
+        KEY(5, 4, KEY_SPACE),
+        KEY(5, 5, KEY_COMMA),
+        KEY(5, 7, KEY_UP),
+        KEY(5, 10, SPITZ_KEY_FN),       /* FN */
+        KEY(6, 0, KEY_SYSRQ),
+        KEY(6, 1, SPITZ_KEY_JAP1),      /* JAP1 */
+        KEY(6, 2, SPITZ_KEY_JAP2),      /* JAP2 */
+        KEY(6, 3, SPITZ_KEY_CANCEL),    /* CANCEL */
+        KEY(6, 4, SPITZ_KEY_OK),        /* OK */
+        KEY(6, 5, SPITZ_KEY_MENU),      /* MENU */
+        KEY(6, 6, KEY_LEFT),
+        KEY(6, 7, KEY_DOWN),
+        KEY(6, 8, KEY_RIGHT),
+};
+static const struct matrix_keymap_data spitzkbd_keymap_data = {
+        .keymap         = spitzkbd_keymap,
+        .keymap_size    = ARRAY_SIZE(spitzkbd_keymap),
+};
+static const uint32_t spitzkbd_row_gpios[] =
+                { 12, 17, 91, 34, 36, 38, 39 };
+static const uint32_t spitzkbd_col_gpios[] =
+                { 88, 23, 24, 25, 26, 27, 52, 103, 107, 108, 114 };
+static struct matrix_keypad_platform_data spitzkbd_pdata = {
+        .keymap_data            = &spitzkbd_keymap_data,
+        .row_gpios              = spitzkbd_row_gpios,
+        .col_gpios              = spitzkbd_col_gpios,
+        .num_row_gpios          = ARRAY_SIZE(spitzkbd_row_gpios),
+        .num_col_gpios          = ARRAY_SIZE(spitzkbd_col_gpios),
+        .col_scan_delay_us      = 10,
+        .debounce_ms            = 10,
+        .wakeup                 = 1,
+};
 static struct platform_device spitzkbd_device = {
-        .name           = "spitz-keyboard",
+        .name           = "matrix-keypad",
        .id             = -1,
+        .dev            = {
+                .platform_data = &spitzkbd_pdata,
+        },
+};
+static struct gpio_keys_button spitz_gpio_keys[] = {
+        {
+                .type   = EV_PWR,
+                .code   = KEY_SUSPEND,
+                .gpio   = SPITZ_GPIO_ON_KEY,
+                .desc   = "On/Off",
+                .wakeup = 1,
+        },
+        /* Two buttons detecting the lid state */
+        {
+                .type   = EV_SW,
+                .code   = 0,
+                .gpio   = SPITZ_GPIO_SWA,
+                .desc   = "Display Down",
+        },
+        {
+                .type   = EV_SW,
+                .code   = 1,
+                .gpio   = SPITZ_GPIO_SWB,
+                .desc   = "Lid Closed",
+        },
+};
+static struct gpio_keys_platform_data spitz_gpio_keys_platform_data = {
+        .buttons        = spitz_gpio_keys,
+        .nbuttons       = ARRAY_SIZE(spitz_gpio_keys),
+};
+static struct platform_device spitz_gpio_keys_device = {
+        .name   = "gpio-keys",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &spitz_gpio_keys_platform_data,
+        },
 };
@@ -296,6 +461,7 @@ static struct ads7846_platform_data spitz_ads7846_info = {
        .vref_delay_usecs       = 100,
        .x_plate_ohms           = 419,
        .y_plate_ohms           = 486,
+        .pressure_max           = 1024,
        .gpio_pendown           = SPITZ_GPIO_TP_INT,
        .wait_for_sync          = spitz_wait_for_hsync,
 };
@@ -378,45 +544,6 @@ static inline void spitz_init_spi(void) {}
 * The card detect interrupt isn't debounced so we delay it by 250ms
 * to give the card a chance to fully insert/eject.
 */
-static struct pxamci_platform_data spitz_mci_platform_data;
-static int spitz_mci_init(struct device *dev, irq_handler_t spitz_detect_int, void *data)
-{
-        int err;
-        err = gpio_request(SPITZ_GPIO_nSD_DETECT, "nSD_DETECT");
-        if (err)
-                goto err_out;
-        err = gpio_request(SPITZ_GPIO_nSD_WP, "nSD_WP");
-        if (err)
-                goto err_free_1;
-        gpio_direction_input(SPITZ_GPIO_nSD_DETECT);
-        gpio_direction_input(SPITZ_GPIO_nSD_WP);
-        spitz_mci_platform_data.detect_delay = msecs_to_jiffies(250);
-        err = request_irq(SPITZ_IRQ_GPIO_nSD_DETECT, spitz_detect_int,
-                          IRQF_DISABLED | IRQF_TRIGGER_RISING |
-                          IRQF_TRIGGER_FALLING,
-                          "MMC card detect", data);
-        if (err) {
-                pr_err("%s: MMC/SD: can't request MMC card detect IRQ\n",
-                                __func__);
-                goto err_free_2;
-        }
-        return 0;
-err_free_2:
-        gpio_free(SPITZ_GPIO_nSD_WP);
-err_free_1:
-        gpio_free(SPITZ_GPIO_nSD_DETECT);
-err_out:
-        return err;
-}
 static void spitz_mci_setpower(struct device *dev, unsigned int vdd)
 {
        struct pxamci_platform_data* p_d = dev->platform_data;
@@ -427,24 +554,12 @@ static void spitz_mci_setpower(struct device *dev, unsigned int vdd)
                spitz_card_pwr_ctrl(SPITZ_PWR_SD, 0x0000);
 }
-static int spitz_mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(SPITZ_GPIO_nSD_WP);
-}
-static void spitz_mci_exit(struct device *dev, void *data)
-{
-        free_irq(SPITZ_IRQ_GPIO_nSD_DETECT, data);
-        gpio_free(SPITZ_GPIO_nSD_WP);
-        gpio_free(SPITZ_GPIO_nSD_DETECT);
-}
 static struct pxamci_platform_data spitz_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = spitz_mci_init,
+        .setpower               = spitz_mci_setpower,
-        .get_ro         = spitz_mci_get_ro,
+        .gpio_card_detect       = SPITZ_GPIO_nSD_DETECT,
-        .setpower       = spitz_mci_setpower,
+        .gpio_card_ro           = SPITZ_GPIO_nSD_WP,
-        .exit           = spitz_mci_exit,
+        .gpio_power             = -1,
 };
@@ -484,50 +599,10 @@ static struct pxaohci_platform_data spitz_ohci_platform_data = {
 /*
 * Irda
 */
-static int spitz_irda_startup(struct device *dev)
-{
-        int rc;
-        rc = gpio_request(SPITZ_GPIO_IR_ON, "IrDA on");
-        if (rc)
-                goto err;
-        rc = gpio_direction_output(SPITZ_GPIO_IR_ON, 1);
-        if (rc)
-                goto err_dir;
-        return 0;
-err_dir:
-        gpio_free(SPITZ_GPIO_IR_ON);
-err:
-        return rc;
-}
-static void spitz_irda_shutdown(struct device *dev)
-{
-        gpio_free(SPITZ_GPIO_IR_ON);
-}
-static void spitz_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(SPITZ_GPIO_IR_ON, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
-#ifdef CONFIG_MACH_AKITA
-static void akita_irda_transceiver_mode(struct device *dev, int mode)
-{
-        gpio_set_value(AKITA_GPIO_IR_ON, mode & IR_OFF);
-        pxa2xx_transceiver_mode(dev, mode);
-}
-#endif
 static struct pxaficp_platform_data spitz_ficp_platform_data = {
+/* .gpio_pwdown is set in spitz_init() and akita_init() accordingly */
        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .transceiver_mode       = spitz_irda_transceiver_mode,
-        .startup                = spitz_irda_startup,
-        .shutdown               = spitz_irda_shutdown,
 };
@@ -652,6 +727,7 @@ static struct platform_device sharpsl_rom_device = {
 static struct platform_device *devices[] __initdata = {
        &spitzscoop_device,
        &spitzkbd_device,
+        &spitz_gpio_keys_device,
        &spitzled_device,
        &sharpsl_nand_device,
        &sharpsl_rom_device,
@@ -692,9 +768,14 @@ static void __init common_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(spitz_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        spitz_init_spi();
        platform_add_devices(devices, ARRAY_SIZE(devices));
+        spitz_mci_platform_data.detect_delay = msecs_to_jiffies(250);
        pxa_set_mci_info(&spitz_mci_platform_data);
        pxa_set_ohci_info(&spitz_ohci_platform_data);
        pxa_set_ficp_info(&spitz_ficp_platform_data);
@@ -702,9 +783,36 @@ static void __init common_init(void)
        pxa_set_i2c_info(NULL);
 }
+#if defined(CONFIG_MACH_AKITA) || defined(CONFIG_MACH_BORZOI)
+static struct nand_bbt_descr sharpsl_akita_bbt = {
+        .options = 0,
+        .offs = 4,
+        .len = 1,
+        .pattern = scan_ff_pattern
+};
+static struct nand_ecclayout akita_oobinfo = {
+        .eccbytes = 24,
+        .eccpos = {
+                   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
+                   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
+                   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
+        .oobfree = {{0x08, 0x09}}
+};
+#endif
 #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)
 static void __init spitz_init(void)
 {
+        spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
+#ifdef CONFIG_MACH_BORZOI
+        if (machine_is_borzoi()) {
+                sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
+                sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
+        }
+#endif
        platform_scoop_config = &spitz_pcmcia_config;
        common_init();
@@ -729,25 +837,9 @@ static struct i2c_board_info akita_i2c_board_info[] = {
        },
 };
-static struct nand_bbt_descr sharpsl_akita_bbt = {
-        .options = 0,
-        .offs = 4,
-        .len = 1,
-        .pattern = scan_ff_pattern
-};
-static struct nand_ecclayout akita_oobinfo = {
-        .eccbytes = 24,
-        .eccpos = {
-                   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
-                   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
-                   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
-        .oobfree = {{0x08, 0x09}}
-};
 static void __init akita_init(void)
 {
-        spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
+        spitz_ficp_platform_data.gpio_pwdown = AKITA_GPIO_IR_ON;
        sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
        sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 724ffb030317..fc5a70c40358 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -103,7 +103,7 @@ static void spitz_presuspend(void)
        PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
        PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC;
        PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
-        PKSR = 0xffffffff; // clear
+        PKSR = 0xffffffff; /* clear */
        /* nRESET_OUT Disable */
        PSLR |= PSLR_SL_ROD;
@@ -149,7 +149,7 @@ static int spitz_should_wakeup(unsigned int resume_on_alarm)
        if (resume_on_alarm && (PEDR & PWER_RTC))
                is_resume |= PWER_RTC;
-        dev_dbg(sharpsl_pm.dev, "is_resume: %x\n",is_resume);
+        dev_dbg(sharpsl_pm.dev, "is_resume: %x\n", is_resume);
        return is_resume;
 }
@@ -160,7 +160,7 @@ static unsigned long spitz_charger_wakeup(void)
 unsigned long spitzpm_read_devdata(int type)
 {
-        switch(type) {
+        switch (type) {
        case SHARPSL_STATUS_ACIN:
                return (((~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN)) != 0);
        case SHARPSL_STATUS_LOCK:
@@ -199,7 +199,7 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
 #if defined(CONFIG_LCD_CORGI)
        .backlight_limit = corgi_lcd_limit_intensity,
 #elif defined(CONFIG_BACKLIGHT_CORGI)
-        .backlight_limit  = corgibl_limit_intensity,
+        .backlight_limit  = corgibl_limit_intensity,
 #endif
        .charge_on_volt   = SHARPSL_CHARGE_ON_VOLT,
        .charge_on_temp   = SHARPSL_CHARGE_ON_TEMP,
@@ -208,8 +208,8 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
        .fatal_acin_volt  = SHARPSL_FATAL_ACIN_VOLT,
        .fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT,
        .bat_levels       = 40,
-        .bat_levels_noac  = spitz_battery_levels_noac,
+        .bat_levels_noac  = sharpsl_battery_levels_noac,
-        .bat_levels_acin  = spitz_battery_levels_acin,
+        .bat_levels_acin  = sharpsl_battery_levels_acin,
        .status_high_acin = 188,
        .status_low_acin  = 178,
        .status_high_noac = 185,
@@ -241,7 +241,7 @@ static int __devinit spitzpm_init(void)
 static void spitzpm_exit(void)
 {
-        platform_device_unregister(spitzpm_device);
+        platform_device_unregister(spitzpm_device);
 }
 module_init(spitzpm_init);
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c
index 965e38c6bafe..9ebe658590fa 100644
--- a/arch/arm/mach-pxa/ssp.c
+++ b/arch/arm/mach-pxa/ssp.c
@@ -342,8 +342,9 @@ void ssp_free(struct ssp_device *ssp)
 }
 EXPORT_SYMBOL(ssp_free);
-static int __devinit ssp_probe(struct platform_device *pdev, int type)
+static int __devinit ssp_probe(struct platform_device *pdev)
 {
+        const struct platform_device_id *id = platform_get_device_id(pdev);
        struct resource *res;
        struct ssp_device *ssp;
        int ret = 0;
@@ -413,7 +414,7 @@ static int __devinit ssp_probe(struct platform_device *pdev, int type)
         */
        ssp->port_id = pdev->id + 1;
        ssp->use_count = 0;
-        ssp->type = type;
+        ssp->type = (int)id->driver_data;
        mutex_lock(&ssp_lock);
        list_add(&ssp->node, &ssp_list);
@@ -457,75 +458,31 @@ static int __devexit ssp_remove(struct platform_device *pdev)
        return 0;
 }
-static int __devinit pxa25x_ssp_probe(struct platform_device *pdev)
+static const struct platform_device_id ssp_id_table[] = {
-{
+        { "pxa25x-ssp",         PXA25x_SSP },
-        return ssp_probe(pdev, PXA25x_SSP);
+        { "pxa25x-nssp",        PXA25x_NSSP },
-}
+        { "pxa27x-ssp",         PXA27x_SSP },
+        { },
-static int __devinit pxa25x_nssp_probe(struct platform_device *pdev)
-{
-        return ssp_probe(pdev, PXA25x_NSSP);
-}
-static int __devinit pxa27x_ssp_probe(struct platform_device *pdev)
-{
-        return ssp_probe(pdev, PXA27x_SSP);
-}
-static struct platform_driver pxa25x_ssp_driver = {
-        .driver         = {
-                .name   = "pxa25x-ssp",
-        },
-        .probe          = pxa25x_ssp_probe,
-        .remove         = __devexit_p(ssp_remove),
 };
-static struct platform_driver pxa25x_nssp_driver = {
+static struct platform_driver ssp_driver = {
-        .driver         = {
+        .probe          = ssp_probe,
-                .name   = "pxa25x-nssp",
-        },
-        .probe          = pxa25x_nssp_probe,
        .remove         = __devexit_p(ssp_remove),
-};
-static struct platform_driver pxa27x_ssp_driver = {
        .driver         = {
-                .name   = "pxa27x-ssp",
+                .owner  = THIS_MODULE,
+                .name   = "pxa2xx-ssp",
        },
-        .probe          = pxa27x_ssp_probe,
+        .id_table       = ssp_id_table,
-        .remove         = __devexit_p(ssp_remove),
 };
 static int __init pxa_ssp_init(void)
 {
-        int ret = 0;
+        return platform_driver_register(&ssp_driver);
-        ret = platform_driver_register(&pxa25x_ssp_driver);
-        if (ret) {
-                printk(KERN_ERR "failed to register pxa25x_ssp_driver");
-                return ret;
-        }
-        ret = platform_driver_register(&pxa25x_nssp_driver);
-        if (ret) {
-                printk(KERN_ERR "failed to register pxa25x_nssp_driver");
-                return ret;
-        }
-        ret = platform_driver_register(&pxa27x_ssp_driver);
-        if (ret) {
-                printk(KERN_ERR "failed to register pxa27x_ssp_driver");
-                return ret;
-        }
-        return ret;
 }
 static void __exit pxa_ssp_exit(void)
 {
-        platform_driver_unregister(&pxa25x_ssp_driver);
+        platform_driver_unregister(&ssp_driver);
-        platform_driver_unregister(&pxa25x_nssp_driver);
-        platform_driver_unregister(&pxa27x_ssp_driver);
 }
 arch_initcall(pxa_ssp_init);
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 3b205b69f3fb..a98a434f0111 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -760,6 +760,10 @@ static void __init stargate2_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(stargate2_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        /* spi chip selects */
        gpio_direction_output(37, 0);
        gpio_direction_output(24, 0);
diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c
index b75353a2ec75..f02dcb5b4e97 100644
--- a/arch/arm/mach-pxa/tavorevb.c
+++ b/arch/arm/mach-pxa/tavorevb.c
@@ -477,6 +477,10 @@ static void __init tavorevb_init(void)
        /* initialize MFP configurations */
        pxa3xx_mfp_config(ARRAY_AND_SIZE(tavorevb_mfp_cfg));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        platform_device_register(&smc91x_device);
        tavorevb_init_lcd();
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 117ad5920e53..c854c168a451 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -247,49 +247,10 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {
 /*
 * MMC/SD Device
 */
-static struct pxamci_platform_data tosa_mci_platform_data;
 static int tosa_mci_init(struct device *dev, irq_handler_t tosa_detect_int, void *data)
 {
        int err;
-        tosa_mci_platform_data.detect_delay = msecs_to_jiffies(250);
-        err = gpio_request(TOSA_GPIO_nSD_DETECT, "MMC/SD card detect");
-        if (err) {
-                printk(KERN_ERR "tosa_mci_init: can't request nSD_DETECT gpio\n");
-                goto err_gpio_detect;
-        }
-        err = gpio_direction_input(TOSA_GPIO_nSD_DETECT);
-        if (err)
-                goto err_gpio_detect_dir;
-        err = request_irq(TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int,
-                          IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-                                "MMC/SD card detect", data);
-        if (err) {
-                printk(KERN_ERR "tosa_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
-                goto err_irq;
-        }
-        err = gpio_request(TOSA_GPIO_SD_WP, "SD Write Protect");
-        if (err) {
-                printk(KERN_ERR "tosa_mci_init: can't request SD_WP gpio\n");
-                goto err_gpio_wp;
-        }
-        err = gpio_direction_input(TOSA_GPIO_SD_WP);
-        if (err)
-                goto err_gpio_wp_dir;
-        err = gpio_request(TOSA_GPIO_PWR_ON, "SD Power");
-        if (err) {
-                printk(KERN_ERR "tosa_mci_init: can't request SD_PWR gpio\n");
-                goto err_gpio_pwr;
-        }
-        err = gpio_direction_output(TOSA_GPIO_PWR_ON, 0);
-        if (err)
-                goto err_gpio_pwr_dir;
        err = gpio_request(TOSA_GPIO_nSD_INT, "SD Int");
        if (err) {
                printk(KERN_ERR "tosa_mci_init: can't request SD_PWR gpio\n");
@@ -304,51 +265,21 @@ static int tosa_mci_init(struct device *dev, irq_handler_t tosa_detect_int, void
 err_gpio_int_dir:
        gpio_free(TOSA_GPIO_nSD_INT);
 err_gpio_int:
-err_gpio_pwr_dir:
-        gpio_free(TOSA_GPIO_PWR_ON);
-err_gpio_pwr:
-err_gpio_wp_dir:
-        gpio_free(TOSA_GPIO_SD_WP);
-err_gpio_wp:
-        free_irq(TOSA_IRQ_GPIO_nSD_DETECT, data);
-err_irq:
-err_gpio_detect_dir:
-        gpio_free(TOSA_GPIO_nSD_DETECT);
-err_gpio_detect:
        return err;
 }
-static void tosa_mci_setpower(struct device *dev, unsigned int vdd)
-{
-        struct pxamci_platform_data* p_d = dev->platform_data;
-        if (( 1 << vdd) & p_d->ocr_mask) {
-                gpio_set_value(TOSA_GPIO_PWR_ON, 1);
-        } else {
-                gpio_set_value(TOSA_GPIO_PWR_ON, 0);
-        }
-}
-static int tosa_mci_get_ro(struct device *dev)
-{
-        return gpio_get_value(TOSA_GPIO_SD_WP);
-}
 static void tosa_mci_exit(struct device *dev, void *data)
 {
        gpio_free(TOSA_GPIO_nSD_INT);
-        gpio_free(TOSA_GPIO_PWR_ON);
-        gpio_free(TOSA_GPIO_SD_WP);
-        free_irq(TOSA_IRQ_GPIO_nSD_DETECT, data);
-        gpio_free(TOSA_GPIO_nSD_DETECT);
 }
 static struct pxamci_platform_data tosa_mci_platform_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
-        .init           = tosa_mci_init,
+        .init                   = tosa_mci_init,
-        .get_ro         = tosa_mci_get_ro,
+        .exit                   = tosa_mci_exit,
-        .setpower       = tosa_mci_setpower,
+        .gpio_card_detect       = TOSA_GPIO_nSD_DETECT,
-        .exit           = tosa_mci_exit,
+        .gpio_card_ro           = TOSA_GPIO_SD_WP,
+        .gpio_power             = TOSA_GPIO_PWR_ON,
 };
 /*
@@ -406,10 +337,11 @@ static void tosa_irda_shutdown(struct device *dev)
 }
 static struct pxaficp_platform_data tosa_ficp_platform_data = {
-        .transceiver_cap  = IR_SIRMODE | IR_OFF,
+        .gpio_pwdown            = -1,
-        .transceiver_mode = tosa_irda_transceiver_mode,
+        .transceiver_cap        = IR_SIRMODE | IR_OFF,
-        .startup = tosa_irda_startup,
+        .transceiver_mode       = tosa_irda_transceiver_mode,
-        .shutdown = tosa_irda_shutdown,
+        .startup                = tosa_irda_startup,
+        .shutdown               = tosa_irda_shutdown,
 };
 /*
@@ -893,6 +825,11 @@ static void __init tosa_init(void)
        int dummy;
        pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        gpio_set_wake(MFP_PIN_GPIO1, 1);
        /* We can't pass to gpio-keys since it will drop the Reset altfunc */
@@ -910,6 +847,7 @@ static void __init tosa_init(void)
        dummy = gpiochip_reserve(TOSA_SCOOP_JC_GPIO_BASE, 12);
        dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16);
+        tosa_mci_platform_data.detect_delay = msecs_to_jiffies(250);
        pxa_set_mci_info(&tosa_mci_platform_data);
        pxa_set_udc_info(&udc_info);
        pxa_set_ficp_info(&tosa_ficp_platform_data);
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 825f540176d2..0aa858ebc573 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -367,6 +367,9 @@ static struct pxamci_platform_data trizeps4_mci_platform_data = {
        .exit           = trizeps4_mci_exit,
        .get_ro         = NULL, /* write-protection not supported */
        .setpower       = NULL, /* power-switching not supported */
+        .gpio_card_detect = -1,
+        .gpio_card_ro   = -1,
+        .gpio_power     = -1,
 };
 /****************************************************************************
@@ -412,6 +415,7 @@ static void trizeps4_irda_transceiver_mode(struct device *dev, int mode)
 }
 static struct pxaficp_platform_data trizeps4_ficp_platform_data = {
+        .gpio_pwdown            = -1,
        .transceiver_cap        = IR_SIRMODE | IR_FIRMODE | IR_OFF,
        .transceiver_mode       = trizeps4_irda_transceiver_mode,
        .startup                = trizeps4_irda_startup,
@@ -520,6 +524,10 @@ static void __init trizeps4_init(void)
                                        ARRAY_SIZE(trizeps4_devices));
        }
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        if (0)  /* dont know how to determine LCD */
                set_pxa_fb_info(&sharp_lcd);
        else
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index d33c232b686c..cf0d71b7797e 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -301,15 +301,6 @@ static void __init viper_init_irq(void)
        set_irq_chained_handler(gpio_to_irq(VIPER_CPLD_GPIO),
                                viper_irq_handler);
        set_irq_type(gpio_to_irq(VIPER_CPLD_GPIO), IRQ_TYPE_EDGE_BOTH);
-#ifndef CONFIG_SERIAL_PXA
-        /*
-         * 8250 doesn't support IRQ_TYPE being passed as part
-         * of the plat_serial8250_port structure...
-         */
-        set_irq_type(gpio_to_irq(VIPER_UARTA_GPIO), IRQ_TYPE_EDGE_RISING);
-        set_irq_type(gpio_to_irq(VIPER_UARTB_GPIO), IRQ_TYPE_EDGE_RISING);
-#endif
 }
 /* Flat Panel */
@@ -539,6 +530,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
        {
                .mapbase        = VIPER_UARTA_PHYS,
                .irq            = gpio_to_irq(VIPER_UARTA_GPIO),
+                .irqflags       = IRQF_TRIGGER_RISING,
                .uartclk        = 1843200,
                .regshift       = 1,
                .iotype         = UPIO_MEM,
@@ -548,6 +540,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
        {
                .mapbase        = VIPER_UARTB_PHYS,
                .irq            = gpio_to_irq(VIPER_UARTB_GPIO),
+                .irqflags       = IRQF_TRIGGER_RISING,
                .uartclk        = 1843200,
                .regshift       = 1,
                .iotype         = UPIO_MEM,
@@ -908,6 +901,10 @@ static void __init viper_init(void)
        pxa2xx_mfp_config(ARRAY_AND_SIZE(viper_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        /* Wake-up serial console */
        viper_init_serial_gpio();
diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c
new file mode 100644
index 000000000000..d3b4e3f2e033
--- /dev/null
+++ b/arch/arm/mach-pxa/xcep.c
@@ -0,0 +1,192 @@
+/*  linux/arch/arm/mach-pxa/xcep.c
+ *
+ *  Support for the Iskratel Electronics XCEP platform as used in
+ *  the Libera instruments from Instrumentation Technologies.
+ *
+ *  Author:     Ales Bardorfer <ales@i-tech.si>
+ *  Contributions by: Abbott, MG (Michael) <michael.abbott@diamond.ac.uk>
+ *  Contributions by: Matej Kenda <matej.kenda@i-tech.si>
+ *  Created:    June 2006
+ *  Copyright:  (C) 2006-2009 Instrumentation Technologies
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/smc91x.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/map.h>
+#include <plat/i2c.h>
+#include <mach/hardware.h>
+#include <mach/pxa2xx-regs.h>
+#include <mach/mfp-pxa25x.h>
+#include "generic.h"
+#define XCEP_ETH_PHYS           (PXA_CS3_PHYS + 0x00000300)
+#define XCEP_ETH_PHYS_END       (PXA_CS3_PHYS + 0x000fffff)
+#define XCEP_ETH_ATTR           (PXA_CS3_PHYS + 0x02000000)
+#define XCEP_ETH_ATTR_END       (PXA_CS3_PHYS + 0x020fffff)
+#define XCEP_ETH_IRQ            IRQ_GPIO0
+/*  XCEP CPLD base */
+#define XCEP_CPLD_BASE          0xf0000000
+/* Flash partitions. */
+static struct mtd_partition xcep_partitions[] = {
+        {
+                .name =         "Bootloader",
+                .size =         0x00040000,
+                .offset =       0,
+                .mask_flags =   MTD_WRITEABLE
+        }, {
+                .name =         "Bootloader ENV",
+                .size =         0x00040000,
+                .offset =       0x00040000,
+                .mask_flags =   MTD_WRITEABLE
+        }, {
+                .name =         "Kernel",
+                .size =         0x00100000,
+                .offset =       0x00080000,
+        }, {
+                .name =         "Rescue fs",
+                .size =         0x00280000,
+                .offset =       0x00180000,
+        }, {
+                .name =         "Filesystem",
+                .size =         MTDPART_SIZ_FULL,
+                .offset =       0x00400000
+        }
+};
+static struct physmap_flash_data xcep_flash_data[] = {
+        {
+                .width          = 4,            /* bankwidth in bytes */
+                .parts          = xcep_partitions,
+                .nr_parts       = ARRAY_SIZE(xcep_partitions)
+        }
+};
+static struct resource flash_resource = {
+        .start  = PXA_CS0_PHYS,
+        .end    = PXA_CS0_PHYS + SZ_32M - 1,
+        .flags  = IORESOURCE_MEM,
+};
+static struct platform_device flash_device = {
+        .name   = "physmap-flash",
+        .id     = 0,
+        .dev    = {
+                .platform_data = xcep_flash_data,
+        },
+        .resource = &flash_resource,
+        .num_resources = 1,
+};
+/* SMC LAN91C111 network controller. */
+static struct resource smc91x_resources[] = {
+        [0] = {
+                .name   = "smc91x-regs",
+                .start  = XCEP_ETH_PHYS,
+                .end    = XCEP_ETH_PHYS_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = XCEP_ETH_IRQ,
+                .end    = XCEP_ETH_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .name   = "smc91x-attrib",
+                .start  = XCEP_ETH_ATTR,
+                .end    = XCEP_ETH_ATTR_END,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+static struct smc91x_platdata xcep_smc91x_info = {
+        .flags  = SMC91X_USE_32BIT | SMC91X_NOWAIT | SMC91X_USE_DMA,
+};
+static struct platform_device smc91x_device = {
+        .name           = "smc91x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc91x_resources),
+        .resource       = smc91x_resources,
+        .dev            = {
+                .platform_data = &xcep_smc91x_info,
+        },
+};
+static struct platform_device *devices[] __initdata = {
+        &flash_device,
+        &smc91x_device,
+};
+/* We have to state that there are HWMON devices on the I2C bus on XCEP.
+ * Drivers for HWMON verify capabilities of the adapter when loading and
+ * refuse to attach if the adapter doesn't support HWMON class of devices.
+ * See also Documentation/i2c/porting-clients. */
+static struct i2c_pxa_platform_data xcep_i2c_platform_data  = {
+        .class = I2C_CLASS_HWMON
+};
+static mfp_cfg_t xcep_pin_config[] __initdata = {
+        GPIO79_nCS_3,   /* SMC 91C111 chip select. */
+        GPIO80_nCS_4,   /* CPLD chip select. */
+        /* SSP communication to MSP430 */
+        GPIO23_SSP1_SCLK,
+        GPIO24_SSP1_SFRM,
+        GPIO25_SSP1_TXD,
+        GPIO26_SSP1_RXD,
+        GPIO27_SSP1_EXTCLK
+};
+static void __init xcep_init(void)
+{
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(xcep_pin_config));
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+        pxa_set_hwuart_info(NULL);
+        /* See Intel XScale Developer's Guide for details */
+        /* Set RDF and RDN to appropriate values (chip select 3 (smc91x)) */
+        MSC1 = (MSC1 & 0xffff) | 0xD5540000;
+        /* Set RDF and RDN to appropriate values (chip select 5 (fpga)) */
+        MSC2 = (MSC2 & 0xffff) | 0x72A00000;
+        platform_add_devices(ARRAY_AND_SIZE(devices));
+        pxa_set_i2c_info(&xcep_i2c_platform_data);
+}
+MACHINE_START(XCEP, "Iskratel XCEP")
+        .phys_io        = 0x40000000,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .boot_params    = 0xa0000100,
+        .init_machine   = xcep_init,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa25x_init_irq,
+        .timer          = &pxa_timer,
+MACHINE_END
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index 218d2001f1df..b66e9e2d06e7 100644
--- a/arch/arm/mach-pxa/zylonite.c
+++ b/arch/arm/mach-pxa/zylonite.c
@@ -31,7 +31,7 @@
 #include <mach/mmc.h>
 #include <mach/ohci.h>
 #include <mach/pxa27x_keypad.h>
-#include <mach/pxa3xx_nand.h>
+#include <plat/pxa3xx_nand.h>
 #include "devices.h"
 #include "generic.h"
@@ -290,6 +290,9 @@ static struct pxamci_platform_data zylonite_mci_platform_data = {
        .init           = zylonite_mci_init,
        .exit           = zylonite_mci_exit,
        .get_ro         = zylonite_mci_ro,
+        .gpio_card_detect = -1,
+        .gpio_card_ro   = -1,
+        .gpio_power     = -1,
 };
 static struct pxamci_platform_data zylonite_mci2_platform_data = {
@@ -441,6 +444,10 @@ static inline void zylonite_init_ohci(void) {}
 static void __init zylonite_init(void)
 {
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
        /* board-processor specific initialization */
        zylonite_pxa300_init();
        zylonite_pxa320_init();