From: Mark Brown <broonie@linaro.org>
Date: Thu, 29 Aug 2013 12:59:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b5f9a9d5113efe11a3b9dad600a6f833274da595;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

Conflicts:
	drivers/spi/spi-rspi.c
---

b5f9a9d5113efe11a3b9dad600a6f833274da595
diff --cc drivers/spi/spi-rspi.c
index aa5fc52abd04,00c32320dce8..57de139f76dc
--- a/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 = dev_get_platdata(&pdev->dev);
+ 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -	struct rspi_plat_data *rspi_pd = pdev->dev.platform_data;
  	dma_cap_mask_t mask;
  	struct dma_slave_config cfg;
  	int ret;
diff --cc drivers/spi/spi-xilinx.c
index 0bf1b2c457a1,09a942852593..08ea84a6eb32
--- a/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