From: Mark Brown <broonie@linaro.org>
Date: Mon, 17 Jun 2013 16:19:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/sirf' into spi-next
X-Git-Tag: next-20130619~36^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9405075e8b92b6606976485feb1b5510c7b9dba0;p=karo-tx-linux.git

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

9405075e8b92b6606976485feb1b5510c7b9dba0
diff --cc drivers/spi/spi-sirf.c
index e262736f9163,e00b437fa2a2..fc20bcfd90c3
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@@ -554,15 -540,8 +538,10 @@@ static int spi_sirfsoc_probe(struct pla
  	sspi->bitbang.txrx_bufs = spi_sirfsoc_transfer;
  	sspi->bitbang.master->setup = spi_sirfsoc_setup;
  	master->bus_num = pdev->id;
 +	master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(12) |
 +					SPI_BPW_MASK(16) | SPI_BPW_MASK(32);
  	sspi->bitbang.master->dev.of_node = pdev->dev.of_node;
  
- 	sspi->p = pinctrl_get_select_default(&pdev->dev);
- 	ret = IS_ERR(sspi->p);
- 	if (ret)
- 		goto free_master;
- 
  	sspi->clk = clk_get(&pdev->dev, NULL);
  	if (IS_ERR(sspi->clk)) {
  		ret = -EINVAL;