Merge branch 'next' into for-linus-3.0

diff --combined arch/arm/mach-ep93xx/core.c
index 6659a0d137a32f246895a011195d1ead66657841,cc9f1d4b104dafded9fcd0d3e22dced6f3f873f1..dd87a8272237d8850f9edb4eeb062625a32ca5b9
--- 1/arch/arm/mach-ep93xx/core.c
--- 2/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@@ -251,9 -251,9 +251,9 @@@ static void ep93xx_uart_set_mctrl(struc
        unsigned int mcr;
  
        mcr = 0;
 -      if (!(mctrl & TIOCM_RTS))
 +      if (mctrl & TIOCM_RTS)
                mcr |= 2;
 -      if (!(mctrl & TIOCM_DTR))
 +      if (mctrl & TIOCM_DTR)
                mcr |= 1;
  
        __raw_writel(mcr, base + EP93XX_UART_MCR_OFFSET);
@@@ -402,15 -402,11 +402,15 @@@ static struct resource ep93xx_eth_resou
        }
  };
  
 +static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);
 +
  static struct platform_device ep93xx_eth_device = {
        .name           = "ep93xx-eth",
        .id             = -1,
        .dev            = {
 -              .platform_data  = &ep93xx_eth_data,
 +              .platform_data          = &ep93xx_eth_data,
 +              .coherent_dma_mask      = DMA_BIT_MASK(32),
 +              .dma_mask               = &ep93xx_eth_dma_mask,
        },
        .num_resources  = ARRAY_SIZE(ep93xx_eth_resource),
        .resource       = ep93xx_eth_resource,
@@@ -492,11 -488,15 +492,15 @@@ static struct resource ep93xx_spi_resou
        },
  };
  
+ static u64 ep93xx_spi_dma_mask = DMA_BIT_MASK(32);
+ 
  static struct platform_device ep93xx_spi_device = {
        .name           = "ep93xx-spi",
        .id             = 0,
        .dev            = {
-               .platform_data = &ep93xx_spi_master_data,
+               .platform_data          = &ep93xx_spi_master_data,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+               .dma_mask               = &ep93xx_spi_dma_mask,
        },
        .num_resources  = ARRAY_SIZE(ep93xx_spi_resources),
        .resource       = ep93xx_spi_resources,