From: Mark Brown <broonie@linaro.org>
Date: Tue, 16 Jul 2013 10:37:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
X-Git-Tag: next-20130717~27^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=44c2bc31d4d636863c4c2a474b0e7e6b8e93b23e;p=karo-tx-linux.git

Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
---

44c2bc31d4d636863c4c2a474b0e7e6b8e93b23e
diff --cc drivers/spi/spi-xilinx.c
index 09a942852593,e5d3716da21a..fea815c2bc95
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@@ -375,25 -376,18 +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