Merge tag 'v3.19-rc3' into spi-sh-msiof

Linux 3.19-rc3

2 files changed, 9 insertions, 4 deletions

diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c
index b410499cddca..aad6683db81b 100644
--- a/drivers/spi/spi-img-spfi.c
+++ b/drivers/spi/spi-img-spfi.c
@@ -341,7 +341,7 @@ static int img_spfi_start_dma(struct spi_master *master,
                 default:
                         rxconf.src_addr = spfi->phys + SPFI_RX_8BIT_VALID_DATA;
                         rxconf.src_addr_width = 1;
-                        rxconf.src_maxburst = 1;
+                        rxconf.src_maxburst = 4;
                 }
                 dmaengine_slave_config(spfi->rx_ch, &rxconf);
 
@@ -368,7 +368,7 @@ static int img_spfi_start_dma(struct spi_master *master,
                 default:
                         txconf.dst_addr = spfi->phys + SPFI_TX_8BIT_VALID_DATA;
                         txconf.dst_addr_width = 1;
-                        txconf.dst_maxburst = 1;
+                        txconf.dst_maxburst = 4;
                         break;
                 }
                 dmaengine_slave_config(spfi->tx_ch, &txconf);
@@ -390,14 +390,14 @@ static int img_spfi_start_dma(struct spi_master *master,
                 dma_async_issue_pending(spfi->rx_ch);
         }
 
+        spfi_start(spfi);
+
         if (xfer->tx_buf) {
                 spfi->tx_dma_busy = true;
                 dmaengine_submit(txdesc);
                 dma_async_issue_pending(spfi->tx_ch);
         }
 
-        spfi_start(spfi);
-
         return 1;
 
 stop_dma:
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 6b13836de307..c58c2494a297 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -525,6 +525,8 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
         struct device_node      *np = spi->master->dev.of_node;
         struct sh_msiof_spi_priv *p = spi_master_get_devdata(spi->master);
 
+        pm_runtime_get_sync(&p->pdev->dev);
+
         if (!np) {
                 /*
                  * Use spi->controller_data for CS (same strategy as spi_gpio),
@@ -543,6 +545,9 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
         if (spi->cs_gpio >= 0)
                 gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
 
+
+        pm_runtime_put_sync(&p->pdev->dev);
+
         return 0;
 }