Merge branch 'topic/asoc' into for-linus

diff --combined arch/arm/mach-pxa/include/mach/regs-ssp.h
index cf31986f6f05d1b0f8637e020c4fd421e97e03fd,f43905a277370d6f1a23eb7c21adf898181b0798..018f6d65b57ba93948dc58c3d4745700fd5d0064
--- 1/arch/arm/mach-pxa/include/mach/regs-ssp.h
--- 2/arch/arm/mach-pxa/include/mach/regs-ssp.h
+++ b/arch/arm/mach-pxa/include/mach/regs-ssp.h
@@@ -41,16 -41,13 +41,16 @@@
  #elif defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
  #define SSCR0_SCR     (0x000fff00)    /* Serial Clock Rate (mask) */
  #define SSCR0_SerClkDiv(x) (((x) - 1) << 8) /* Divisor [1..4096] */
 +#endif
 +
 +#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
  #define SSCR0_EDSS    (1 << 20)       /* Extended data size select */
  #define SSCR0_NCS     (1 << 21)       /* Network clock select */
  #define SSCR0_RIM     (1 << 22)       /* Receive FIFO overrrun interrupt mask */
  #define SSCR0_TUM     (1 << 23)       /* Transmit FIFO underrun interrupt mask */
  #define SSCR0_FRDC    (0x07000000)    /* Frame rate divider control (mask) */
  #define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24)        /* Time slots per frame [1..8] */
- #define SSCR0_ADC     (1 << 30)       /* Audio clock select */
+ #define SSCR0_ACS     (1 << 30)       /* Audio clock select */
  #define SSCR0_MOD     (1 << 31)       /* Mode (normal or network) */
  #endif
  
@@@ -109,6 -106,11 +109,11 @@@
  #define SSSR_TINT             (1 << 19)       /* Receiver Time-out Interrupt */
  #define SSSR_PINT             (1 << 18)       /* Peripheral Trailing Byte Interrupt */
  
+ #if defined(CONFIG_PXA3xx)
+ #define SSPSP_EDMYSTOP(x)     ((x) << 28)     /* Extended Dummy Stop */
+ #define SSPSP_EDMYSTRT(x)     ((x) << 26)     /* Extended Dummy Start */
+ #endif
+ 
  #define SSPSP_FSRT            (1 << 25)       /* Frame Sync Relative Timing */
  #define SSPSP_DMYSTOP(x)      ((x) << 23)     /* Dummy Stop */
  #define SSPSP_SFRMWDTH(x)     ((x) << 16)     /* Serial Frame Width */