• R
    Merge branch 'pxa-plat' into devel · 0ff66f0c
    Russell King 提交于
    * pxa-plat: (53 commits)
      [ARM] 4762/1: Basic support for Toradex Colibri module
      [ARM] pxa: fix mci_init functions returning -1
      [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
      [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
      [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
      [ARM] 4745/1: pcm027: default configuration
      [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
      [NET] smc91x: Make smc91x use IRQ resource trigger flags
      [ARM] pxa: add default config for littleton
      [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
      [ARM] 4664/1: Add basic support for HTC Magician PDA phones
      [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
      [ARM] pxa: skip registers saving/restoring if entering standby mode
      [ARM] pxa: fix PXA27x resume
      [ARM] pxa: Avoid fiddling with CKEN register on suspend
      [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
      [ARM] pxa: Add zylonite MFP wakeup configurations
      [ARM] pxa: program MFPs for low power mode when suspending
      [ARM] pxa: make MFP configuration processor independent
      [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
      ...
    
    Conflicts:
    
    	arch/arm/mach-pxa/ssp.c
    Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
    0ff66f0c
ssp.c 12.4 KB