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

diff --cc drivers/spi/spi-rspi.c
index 90c81b3f343181ac978ee11cd8cd682c7b3f8a83,cfdbb422a40a9283b7e1a1200811dd5c2ff037fb..587722495cf2ef680679f9cadd4c7d6d552ee616
--- 1/drivers/spi/spi-rspi.c
--- 2/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;