67 files changed, 1873 insertions, 725 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index a6f8eab14ba5..d89c6adbe8bc 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -2,34 +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
-        bool "PXA300 (codename Monahans-L)"
+config MACH_MAINSTONE
+        bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
+        select PXA27x
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
 
-config CPU_PXA310
-        bool "PXA310 (codename Monahans-LV)"
+config MACH_ZYLONITE
+        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
-        bool "PXA320 (codename Monahans-P)"
+config MACH_ZYLONITE320
+        bool "PXA3xx Development Platform (aka Zylonite) PXA320"
+        select CPU_PXA320
+        select MACH_ZYLONITE
 
-config CPU_PXA930
-        bool "PXA930 (codename Tavor-P)"
+config MACH_LITTLETON
+        bool "PXA3xx Form Factor Platform (aka Littleton)"
+        select PXA3xx
+        select PXA_SSP
 
-config CPU_PXA935
-        bool "PXA935 (codename Tavor-P65)"
+config MACH_TAVOREVB
+        bool "PXA930 Evaluation Board (aka TavorEVB)"
+        select PXA3xx
         select CPU_PXA930
 
-config CPU_PXA950
-        bool "PXA950 (codename Tavor-PV2)"
+config MACH_SAAR
+        bool "PXA930 Handheld Platform (aka SAAR)"
+        select PXA3xx
         select CPU_PXA930
 
-endmenu
+comment "Third Party Dev Platforms (sorted by vendor name)"
 
-endif
+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"
@@ -62,185 +133,24 @@ config MACH_STARGATE2
         select IWMMXT
         select PXA_HAVE_BOARD_IRQS
 
-config ARCH_LUBBOCK
-        bool "Intel DBPXA250 Development Platform"
-        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 MACH_BALLOON3
-        bool "Balloon 3 board"
-        select PXA27x
-        select IWMMXT
-        select PXA_HAVE_BOARD_IRQS
-
-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
+config MACH_XCEP
+        bool "Iskratel Electronics XCEP"
         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
-          e800 family PDA.
+          PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
+          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
@@ -274,13 +184,38 @@ config TRIZEPS_PCMCIA
         help
           Enable PCMCIA support for Trizeps modules
 
-config MACH_EM_X270
-        bool "CompuLab EM-x270 platform"
+config MACH_LOGICPD_PXA270
+        bool "LogicPD PXA270 Card Engine Development Platform"
         select PXA27x
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
 
-config MACH_EXEDA
-        bool "CompuLab eXeda platform"
+config MACH_PCM027
+        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"
@@ -290,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
-        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
+comment "End-user Products (sorted by vendor name)"
 
 config MACH_H4700
         bool "HP iPAQ hx4700"
@@ -338,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
@@ -346,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
@@ -362,13 +271,47 @@ config MACH_MIOA701
           MIO A701. Currently there is only basic support
           for this PDA.
 
-config MACH_PCM027
-        bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
+config PXA_EZX
+        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
@@ -421,109 +364,172 @@ config MACH_PALMZ72
           Say Y here if you intend to run this kernel on Palm Zire 72
           handheld computer.
 
-config MACH_TREO680
-        bool "Palm Treo 680"
+config MACH_PALMLD
+        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
-        bool "Palm LifeDrive"
+config MACH_TREO680
+        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
-        bool "PHYTEC PCM-990 development board"
-        select HAVE_PWM
-        depends on MACH_PCM027
+config SHARPSL_PM
+        bool
+        select APM_EMULATION
 
-choice
-        prompt "display on pcm990"
-        depends on MACH_PCM990_BASEBOARD
+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 PCM990_DISPLAY_SHARP
-        bool "sharp lq084v1dg21 stn display"
+config MACH_POODLE
+        bool "Enable Sharp SL-5600 (Poodle) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select SHARP_LOCOMO
+        select PXA_SSP
 
-config PCM990_DISPLAY_NEC
-        bool "nec nl6448bc20_18d tft display"
+config MACH_CORGI
+        bool "Enable Sharp SL-C700 (Corgi) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
 
-config PCM990_DISPLAY_NONE
-        bool "no display"
+config MACH_SHEPHERD
+        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
-        bool "Enable Cogent CSB726 System On a Module"
+config MACH_AKITA
+        bool "Enable Sharp SL-1000 (Akita) Support"
+        depends on PXA_SHARPSL
         select PXA27x
-        select IWMMXT
-        help
-          Say Y here if you intend to run this kernel on a Cogent
-          CSB726 System On Module.
+        select PXA_SHARP_Cxx00
+        select MACH_SPITZ
+        select I2C
+        select I2C_PXA
 
-config CSB726_CSB701
-        bool "Enable supprot for CSB701 baseboard"
-        depends on MACH_CSB726
+config MACH_SPITZ
+        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
+        depends on PXA_SHARPSL
+        select PXA27x
+        select PXA_SHARP_Cxx00
 
-config PXA_EZX
-        bool "Motorola EZX Platform"
+config MACH_BORZOI
+        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
+        depends on PXA_SHARPSL
         select PXA27x
-        select IWMMXT
-        select HAVE_PWM
+        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 MACH_EZX_A780
-        bool "Motorola EZX A780"
-        default y
-        depends on PXA_EZX
+config ARCH_PXA_ESERIES
+        bool "PXA based Toshiba e-series PDAs"
+        select PXA25x
+        select PXA_HAVE_BOARD_IRQS
 
-config MACH_EZX_E680
-        bool "Motorola EZX E680"
+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_A1200
-        bool "Motorola EZX A1200"
+config MACH_E350
+        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_A910
-        bool "Motorola EZX A910"
+config MACH_E740
+        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_E6
-        bool "Motorola EZX E6"
+config MACH_E750
+        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_E2
-        bool "Motorola EZX E2"
+config MACH_E400
+        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_XCEP
-        bool "Iskratel Electronics XCEP"
-        select PXA25x
-        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_E800
+        bool "Toshiba e800"
+        default y
+        depends on ARCH_PXA_ESERIES
+        select FB_W100
         help
-          PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
-          Tuned for usage in Libera instruments for particle accelerators.
+          Say Y here if you intend to run this kernel on a Toshiba
+          e800 family PDA.
 
 endmenu
 
@@ -551,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 f10e152bfc27..b5d29e60a341 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -24,33 +24,63 @@ obj-$(CONFIG_CPU_PXA300)	+= pxa300.o
 obj-$(CONFIG_CPU_PXA320)        += pxa320.o
 obj-$(CONFIG_CPU_PXA930)        += pxa930.o
 
-# Specific board support
-obj-$(CONFIG_ARCH_GUMSTIX)      += gumstix.o
-obj-$(CONFIG_GUMSTIX_AM200EPD)  += am200epd.o
-obj-$(CONFIG_GUMSTIX_AM300EPD)  += am300epd.o
+# NOTE: keep the order of boards in accordance to their order in Kconfig
+
+# Intel/Marvell Dev Platforms
 obj-$(CONFIG_ARCH_LUBBOCK)      += lubbock.o
-obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
 obj-$(CONFIG_MACH_MAINSTONE)    += mainstone.o
-obj-$(CONFIG_MACH_BALLOON3)     += balloon3.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
@@ -58,34 +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_PALMTC)       += palmtc.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_XCEP)         += xcep.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
@@ -95,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
index f23138b8fca3..b8cd07ca9380 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -306,6 +306,10 @@ static void __init balloon3_init(void)
          */
         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);
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 102916f1e465..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,30 +17,41 @@
 #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
 
@@ -53,7 +65,7 @@
 #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] = {
@@ -333,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)
@@ -351,7 +498,6 @@ static struct gpio_led cm_x300_leds[] = {
         [0] = {
                 .name = "cm-x300:green",
                 .default_trigger = "heartbeat",
-                .gpio = 79,
                 .active_low = 1,
         },
 };
@@ -371,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
@@ -433,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();
@@ -445,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 37c239c56568..45c23fd6df31 100644
--- a/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/arch/arm/mach-pxa/colibri-pxa300.c
@@ -170,6 +170,10 @@ 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();
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c
index ec0e14b96682..ae835fad7d10 100644
--- a/arch/arm/mach-pxa/colibri-pxa320.c
+++ b/arch/arm/mach-pxa/colibri-pxa320.c
@@ -199,6 +199,10 @@ static void __init colibri_pxa320_init_uart(void)
 
 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();
diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c b/arch/arm/mach-pxa/colibri-pxa3xx.c
index efebaf4d734d..e6c0a2287eb8 100644
--- a/arch/arm/mach-pxa/colibri-pxa3xx.c
+++ b/arch/arm/mach-pxa/colibri-pxa3xx.c
@@ -25,7 +25,7 @@
 #include <mach/colibri.h>
 #include <mach/mmc.h>
 #include <mach/pxafb.h>
-#include <mach/pxa3xx_nand.h>
+#include <plat/pxa3xx_nand.h>
 
 #include "generic.h"
 #include "devices.h"
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index b536b5a5a10d..74446cf8ae69 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -671,6 +671,10 @@ 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);
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_acin  = spitz_battery_levels_acin,
+        .bat_levels_noac  = sharpsl_battery_levels_noac,
+        .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/csb726.c b/arch/arm/mach-pxa/csb726.c
index 965480eb4fe6..88575b87bd33 100644
--- a/arch/arm/mach-pxa/csb726.c
+++ b/arch/arm/mach-pxa/csb726.c
@@ -268,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 46fabe1cca11..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,
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 49acdfa6650d..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),
diff --git a/arch/arm/mach-pxa/e750.c b/arch/arm/mach-pxa/e750.c
index 4052ece3ef49..5eccbce73a33 100644
--- a/arch/arm/mach-pxa/e750.c
+++ b/arch/arm/mach-pxa/e750.c
@@ -194,6 +194,9 @@ 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();
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 aec7f4214b14..1c0de808b54d 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -967,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;
 
@@ -996,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,
@@ -1049,8 +1048,10 @@ static struct platform_device em_x270_camera = {
 
 static void  __init em_x270_init_camera(void)
 {
-        pxa_set_camera_info(&em_x270_camera_platform_data);
-        platform_device_register(&em_x270_camera);
+        if (em_x270_sensor_init() == 0) {
+                pxa_set_camera_info(&em_x270_camera_platform_data);
+                platform_device_register(&em_x270_camera);
+        }
 }
 #else
 static inline void em_x270_init_camera(void) {}
@@ -1286,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/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 */
-        GPIO19_GPIO,                            /* CAM_RST */
+        GPIO50_GPIO | MFP_LPM_DRIVE_HIGH,       /* CAM_EN */
+        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 */
-        GPIO28_GPIO,                            /* CAM_RST */
+        GPIO50_GPIO | MFP_LPM_DRIVE_HIGH,       /* CAM_EN */
+        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 1708c0109844..96c345129135 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -211,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 83bd3c6e3884..848c861dd23f 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -820,6 +820,7 @@ static struct platform_device *devices[] __initdata = {
         &gpio_keys,
         &backlight,
         &w3220,
+        &hx4700_lcd,
         &egpio,
         &bq24022,
         &gpio_vbus,
@@ -849,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);
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index b6486ef20b17..5c9e11d74f49 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -179,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 2a4945db31c5..5b0862df61ab 100644
--- a/arch/arm/mach-pxa/imote2.c
+++ b/arch/arm/mach-pxa/imote2.c
@@ -554,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/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
index aa3d9f70a08a..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)                             \
@@ -283,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;           \
@@ -299,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/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/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 f73061c90b5e..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;
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/littleton.c b/arch/arm/mach-pxa/littleton.c
index 13848955d133..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"
 
@@ -413,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 c6a94d3fdd61..98ee7e590299 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -518,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 5360c07f5138..8a38d604dc77 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -742,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 a4eeae345e64..851ee0fc32e2 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -576,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 3cab452e5567..2466a44d8fda 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -798,6 +798,9 @@ 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);
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 1ad029dd4438..59140217890a 100644
--- a/arch/arm/mach-pxa/palmld.c
+++ b/arch/arm/mach-pxa/palmld.c
@@ -530,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 2dd7ce28556b..7f89ca20f13a 100644
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -419,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
index 0b92291a58f6..308417592007 100644
--- a/arch/arm/mach-pxa/palmtc.c
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -416,6 +416,11 @@ 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);
diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c
index 277c4062e3c6..265d62bae7de 100644
--- a/arch/arm/mach-pxa/palmte2.c
+++ b/arch/arm/mach-pxa/palmte2.c
@@ -373,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 fe085076fbf2..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,19 +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
  ******************************************************************************/
+#ifdef CONFIG_MACH_TREO680
 static struct pxamci_platform_data treo680_mci_platform_data = {
         .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .gpio_card_detect       = GPIO_NR_TREO680_SD_DETECT_N,
+        .gpio_card_detect       = GPIO_NR_TREO_SD_DETECT_N,
         .gpio_card_ro           = GPIO_NR_TREO680_SD_READONLY,
         .gpio_power             = GPIO_NR_TREO680_SD_POWER,
 };
+#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),
@@ -232,92 +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;
 
         return 0;
 
 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);
-        return TREO680_MAX_INTENSITY - brightness;
+        gpio_set_value(GPIO_NR_TREO_BL_POWER, 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);
 }
 
-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,
-        .dft_brightness = TREO680_DEFAULT_INTENSITY,
-        .pwm_period_ns  = TREO680_PERIOD_NS,
-        .init           = treo680_backlight_init,
-        .notify         = treo680_backlight_notify,
-        .exit           = treo680_backlight_exit,
+        .max_brightness = TREO_MAX_INTENSITY,
+        .dft_brightness = TREO_DEFAULT_INTENSITY,
+        .pwm_period_ns  = TREO_PERIOD_NS,
+        .init           = treo_backlight_init,
+        .notify         = treo_backlight_notify,
+        .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 struct pxaficp_platform_data treo680_ficp_info = {
-        .gpio_pwdown            = GPIO_NR_TREO680_IR_EN,
+static struct pxaficp_platform_data treo_ficp_info = {
+        .gpio_pwdown            = GPIO_NR_TREO_IR_EN,
         .transceiver_cap        = IR_SIRMODE | IR_OFF,
 };
 
 /******************************************************************************
  * UDC
  ******************************************************************************/
-static struct pxa2xx_udc_mach_info treo680_udc_info __initdata = {
-        .gpio_vbus              = GPIO_NR_TREO680_USB_DETECT,
+static struct pxa2xx_udc_mach_info treo_udc_info __initdata = {
+        .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
@@ -326,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,
-        .num_supplicants = ARRAY_SIZE(treo680_supplicants),
+        .supplied_to     = treo_supplicants,
+        .num_supplicants = ARRAY_SIZE(treo_supplicants),
 };
 
 static struct platform_device power_supply = {
@@ -374,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",
@@ -383,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 = {
-        .leds           = gpio_leds,
-        .num_leds       = ARRAY_SIZE(gpio_leds),
+static struct gpio_led_platform_data treo680_gpio_led_info = {
+        .leds           = treo680_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,
@@ -427,21 +576,21 @@ static struct pxafb_mode_info treo680_lcd_modes[] = {
 },
 };
 
-static void treo680_lcd_power(int on, struct fb_var_screeninfo *info)
+static void treo_lcd_power(int on, struct fb_var_screeninfo *info)
 {
-        gpio_set_value(GPIO_NR_TREO680_BL_POWER, on);
+        gpio_set_value(GPIO_NR_TREO_BL_POWER, on);
 }
 
-static struct pxafb_mach_info treo680_lcd_screen = {
-        .modes          = treo680_lcd_modes,
-        .num_modes      = ARRAY_SIZE(treo680_lcd_modes),
+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 */
@@ -450,70 +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 = {
-        &treo680_backlight,
-        &treo680_leds,
+static struct platform_device *treo_devices[] __initdata = {
+        &treo_backlight,
         &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")) {
-                gpio_direction_output(GPIO_NR_TREO680_USB_PULLUP, 1);
-                gpio_free(GPIO_NR_TREO680_USB_PULLUP);
+        if (!gpio_request(GPIO_NR_TREO_USB_PULLUP, "UDC Vbus")) {
+                gpio_direction_output(GPIO_NR_TREO_USB_PULLUP, 1);
+                gpio_free(GPIO_NR_TREO_USB_PULLUP);
         }
 }
 
-static void __init treo680_lcd_power_init(void)
+static void __init treo_lcd_power_init(void)
 {
         int ret;
 
-        ret = gpio_request(GPIO_NR_TREO680_LCD_POWER, "LCD POWER");
+        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_TREO680_LCD_POWER, 0);
+        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_TREO680_LCD_POWER);
+                gpio_free(GPIO_NR_TREO_LCD_POWER);
                 return;
         }
 
-        treo680_lcd_screen.pxafb_lcd_power = treo680_lcd_power;
+        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);
-        treo680_lcd_power_init();
-        set_pxa_fb_info(&treo680_lcd_screen);
         pxa_set_mci_info(&treo680_mci_platform_data);
-        treo680_udc_init();
-        pxa_set_udc_info(&treo680_udc_info);
-        pxa_set_ac97_info(&treo680_ac97_pdata);
-        pxa_set_ficp_info(&treo680_ficp_info);
+        pxa_set_keypad_info(&treo680_keypad_platform_data);
         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,
-        .io_pg_offst    = io_p2v(0x40000000),
-        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
-        .init_irq       = pxa27x_init_irq,
-        .timer          = &pxa_timer,
-        .init_machine   = treo680_init,
+        .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   = 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 76a2b37eaf30..7bf18c2f002f 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -570,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 c2bf493c5f53..d787ac7cfdd8 100644
--- a/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@ -491,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 bbda57078e0f..d5255ae74fe3 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -359,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,
@@ -532,6 +525,7 @@ 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));
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index a186994f77fb..e5eeb3a62d01 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -449,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));
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/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/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 spitz_battery_levels_noac[];
+extern struct battery_thresh sharpsl_battery_levels_acin[];
+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 629e05d1196e..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_PD1      1u << 1
-#define MAXCTRL_SGL      1u << 2
-#define MAXCTRL_UNI      1u << 3
+#define MAXCTRL_PD0      (1u << 0)
+#define MAXCTRL_PD1      (1u << 1)
+#define MAXCTRL_SGL      (1u << 2)
+#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) break;
-                if (i++ > 5) {
-                        voltage = sharpsl_pm.machinfo->bat_levels_noac[0].voltage;
-                        dev_warn(sharpsl_pm.dev, "Warning: Cannot read main battery!\n");
+                if (voltage > 0)
                         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 */
-        if ((sharpsl_pm.battstat.ac_status == APM_AC_ONLINE) || (apm_status == APM_BATTERY_STATUS_HIGH) ||  percent <= sharpsl_pm.battstat.mainbat_percent) {
+           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) {
                 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_CRITICAL))) {
+            && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)
+            || (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.flags & SHARPSL_APM_QUEUED)) {
+             && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)
+             && !(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;
-        for (i=1; i<5; i++) {
+        j = 0;
+        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;
-        for (i=3; i>=0; i--) {
+        k = 4;
+        for (i = 3; i >= 0; i--) {
                 if (temp > val[i]) {
                         temp = val[i];
                         k = i;
                 }
         }
 
-        for (i=0; i<5; i++)
-                if (i != j && i != k )
+        for (i = 0; i < 5; i++)
+                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;
@@ -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 d98023f55503..4b50f144fa48 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -768,6 +768,10 @@ 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));
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_acin  = spitz_battery_levels_acin,
+        .bat_levels_noac  = sharpsl_battery_levels_noac,
+        .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)
-{
-        return ssp_probe(pdev, PXA25x_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 const struct platform_device_id ssp_id_table[] = {
+        { "pxa25x-ssp",         PXA25x_SSP },
+        { "pxa25x-nssp",        PXA25x_NSSP },
+        { "pxa27x-ssp",         PXA27x_SSP },
+        { },
 };
 
-static struct platform_driver pxa25x_nssp_driver = {
-        .driver         = {
-                .name   = "pxa25x-nssp",
-        },
-        .probe          = pxa25x_nssp_probe,
+static struct platform_driver ssp_driver = {
+        .probe          = ssp_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,
-        .remove         = __devexit_p(ssp_remove),
+        .id_table       = ssp_id_table,
 };
 
 static int __init pxa_ssp_init(void)
 {
-        int ret = 0;
-
-        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;
+        return platform_driver_register(&ssp_driver);
 }
 
 static void __exit pxa_ssp_exit(void)
 {
-        platform_driver_unregister(&pxa25x_ssp_driver);
-        platform_driver_unregister(&pxa25x_nssp_driver);
-        platform_driver_unregister(&pxa27x_ssp_driver);
+        platform_driver_unregister(&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 e81a52673d49..c854c168a451 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -825,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 */
 
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 3981e0356d12..0aa858ebc573 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -524,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
index 3fd79cbb36c8..d3b4e3f2e033 100644
--- a/arch/arm/mach-pxa/xcep.c
+++ b/arch/arm/mach-pxa/xcep.c
@@ -165,6 +165,11 @@ 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;
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index 09784d3954e4..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"
@@ -444,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();