Merge remote-tracking branches 'spi/fix/bcm63xx', 'spi/fix/dspi', 'spi/fix/hspi'...

diff --combined drivers/spi/spi-pxa2xx.c
index 7765b19,cb0e1f1,cb0e1f1,cb0e1f1,cb0e1f1,cb0e1f1,91815fa,7765b19,cb0e1f1,cb0e1f1,cb0e1f1..cbc6884
--- 1/drivers/spi/spi-pxa2xx.c
--- 2/drivers/spi/spi-pxa2xx.c
--- 3/drivers/spi/spi-pxa2xx.c
--- 4/drivers/spi/spi-pxa2xx.c
--- 5/drivers/spi/spi-pxa2xx.c
--- 6/drivers/spi/spi-pxa2xx.c
--- 7/drivers/spi/spi-pxa2xx.c
--- 8/drivers/spi/spi-pxa2xx.c
--- 9/drivers/spi/spi-pxa2xx.c
--- 10/drivers/spi/spi-pxa2xx.c
--- 11/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@@@@@@@@@@@ -1066,6 -1066,6 -1066,6 -1066,6 -1066,6 -1066,6 -1066,8 -1066,6 -1066,6 -1066,6 -1066,6 +1066,8 @@@@@@@@@@@@ pxa2xx_spi_acpi_get_pdata(struct platfo
           
                pdata->num_chipselect = 1;
                pdata->enable_dma = true;
++++++ ++++     pdata->tx_chan_id = -1;
++++++ ++++     pdata->rx_chan_id = -1;
           
                return pdata;
           }
@@@@@@@@@@@@ -1073,8 -1073,6 -1073,6 -1073,6 -1073,6 -1073,6 -1075,6 -1073,8 -1073,6 -1073,6 -1073,6 +1075,8 @@@@@@@@@@@@
           static struct acpi_device_id pxa2xx_spi_acpi_match[] = {
                { "INT33C0", 0 },
                { "INT33C1", 0 },
 ++++++ +++     { "INT3430", 0 },
 ++++++ +++     { "INT3431", 0 },
                { "80860F0E", 0 },
                { },
           };
@@@@@@@@@@@@ -1293,9 -1291,6 -1291,6 -1291,6 -1291,6 -1291,6 -1293,6 -1293,9 -1291,6 -1291,6 -1291,6 +1295,9 @@@@@@@@@@@@ static int pxa2xx_spi_resume(struct dev
                /* Enable the SSP clock */
                clk_prepare_enable(ssp->clk);
           
 ++++++ +++     /* Restore LPSS private register bits */
 ++++++ +++     lpss_ssp_setup(drv_data);
 ++++++ +++
                /* Start the queue running */
                status = spi_master_resume(drv_data->master);
                if (status != 0) {