Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata

Conflicts:
	drivers/spi/spi-rspi.c

diff --cc drivers/spi/spi-altera.c
Simple merge

diff --cc drivers/spi/spi-nuc900.c
Simple merge

diff --cc drivers/spi/spi-rspi.c
index aa5fc52abd0466ed587af2874a4098b936fc338d,00c32320dce87c0adb66eca0eef65e9d2c417e2c..57de139f76dcc8a08f984f85e089b130dc11aa1a
--- 1/drivers/spi/spi-rspi.c
--- 2/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@@ -664,7 -666,8 +666,8 @@@ static irqreturn_t rspi_irq(int irq, vo
  static int rspi_request_dma(struct rspi_data *rspi,
                                      struct platform_device *pdev)
  {
 -      struct rspi_plat_data *rspi_pd = pdev->dev.platform_data;
 +      struct rspi_plat_data *rspi_pd = dev_get_platdata(&pdev->dev);
+       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        dma_cap_mask_t mask;
        struct dma_slave_config cfg;
        int ret;

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge

diff --cc drivers/spi/spi-xilinx.c
index 0bf1b2c457a1dc6b71cc69641216ac6bb8b4a87b,09a9428525934e2e56732e89202680102295dd9b..08ea84a6eb3283418484d4012298271ec6ab77ae
--- 1/drivers/spi/spi-xilinx.c
--- 2/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@@ -376,18 -375,25 +391,19 @@@ static int xilinx_spi_probe(struct plat
        xspi->bitbang.chipselect = xilinx_spi_chipselect;
        xspi->bitbang.setup_transfer = xilinx_spi_setup_transfer;
        xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs;
+       xspi->bitbang.master->setup = xilinx_spi_setup;
        init_completion(&xspi->done);
  
 -      if (!request_mem_region(mem->start, resource_size(mem),
 -              XILINX_SPI_NAME))
 +      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 +      xspi->regs = devm_ioremap_resource(&pdev->dev, res);
 +      if (IS_ERR(xspi->regs)) {
 +              ret = PTR_ERR(xspi->regs);
                goto put_master;
 -
 -      xspi->regs = ioremap(mem->start, resource_size(mem));
 -      if (xspi->regs == NULL) {
 -              dev_warn(dev, "ioremap failure\n");
 -              goto map_failed;
        }
  
 -      master->bus_num = bus_num;
 +      master->bus_num = pdev->dev.id;
        master->num_chipselect = num_cs;
 -      master->dev.of_node = dev->of_node;
 -
 -      xspi->mem = *mem;
 -      xspi->irq = irq;
 +      master->dev.of_node = pdev->dev.of_node;
  
        /*
         * Detect endianess on the IP via loop bit in CR. Detection