From: Mark Brown <broonie@linaro.org>
Date: Tue, 14 Jan 2014 14:14:47 +0000 (+0000)
Subject: Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: next-20140116~34^2^25~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13ea3300100ec3461560b1e061033cd167333a86;p=karo-tx-linux.git

Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi
---

13ea3300100ec3461560b1e061033cd167333a86
diff --cc drivers/spi/spi-rspi.c
index 90c81b3f3431,cfdbb422a40a..587722495cf2
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@@ -300,10 -268,10 +300,10 @@@ static int qspi_set_config_register(con
  		spcmd = SPCMD_SPB_8BIT;
  	else if (access_size == 16)
  		spcmd = SPCMD_SPB_16BIT;
- 	else if (access_size == 32)
+ 	else
  		spcmd = SPCMD_SPB_32BIT;
  
 -	spcmd |= SPCMD_SCKDEN | SPCMD_SLNDEN | SPCMD_SSLKP | SPCMD_SPNDEN;
 +	spcmd |= SPCMD_SCKDEN | SPCMD_SLNDEN | rspi->spcmd | SPCMD_SPNDEN;
  
  	/* Resets transfer data length */
  	rspi_write32(rspi, 0, QSPI_SPBMUL0);
@@@ -1003,12 -956,12 +993,13 @@@ static int rspi_probe(struct platform_d
  	master->setup = rspi_setup;
  	master->transfer = rspi_transfer;
  	master->cleanup = rspi_cleanup;
 +	master->mode_bits = SPI_CPHA | SPI_CPOL;
  
- 	ret = request_irq(irq, rspi_irq, 0, dev_name(&pdev->dev), rspi);
+ 	ret = devm_request_irq(&pdev->dev, irq, rspi_irq, 0,
+ 			       dev_name(&pdev->dev), rspi);
  	if (ret < 0) {
  		dev_err(&pdev->dev, "request_irq error\n");
- 		goto error3;
+ 		goto error1;
  	}
  
  	rspi->irq = irq;