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

diff --cc drivers/spi/spi-sirf.c
index e262736f91639b9c02ad7d2f8dd4eaba32d88fbe,e00b437fa2a283ac055922edba50e6fdc51011ba..fc20bcfd90c30dd7bf90faa9eb4cd8785822b38e
--- 1/drivers/spi/spi-sirf.c
--- 2/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;