diff options
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 7d98a64e6a09..c702fc536a77 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
@@ -1066,6 +1066,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) | |||
1066 | 1066 | ||
1067 | pdata->num_chipselect = 1; | 1067 | pdata->num_chipselect = 1; |
1068 | pdata->enable_dma = true; | 1068 | pdata->enable_dma = true; |
1069 | pdata->tx_chan_id = -1; | ||
1070 | pdata->rx_chan_id = -1; | ||
1069 | 1071 | ||
1070 | return pdata; | 1072 | return pdata; |
1071 | } | 1073 | } |
@@ -1073,6 +1075,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) | |||
1073 | static struct acpi_device_id pxa2xx_spi_acpi_match[] = { | 1075 | static struct acpi_device_id pxa2xx_spi_acpi_match[] = { |
1074 | { "INT33C0", 0 }, | 1076 | { "INT33C0", 0 }, |
1075 | { "INT33C1", 0 }, | 1077 | { "INT33C1", 0 }, |
1078 | { "INT3430", 0 }, | ||
1079 | { "INT3431", 0 }, | ||
1076 | { "80860F0E", 0 }, | 1080 | { "80860F0E", 0 }, |
1077 | { }, | 1081 | { }, |
1078 | }; | 1082 | }; |
@@ -1291,6 +1295,9 @@ static int pxa2xx_spi_resume(struct device *dev) | |||
1291 | /* Enable the SSP clock */ | 1295 | /* Enable the SSP clock */ |
1292 | clk_prepare_enable(ssp->clk); | 1296 | clk_prepare_enable(ssp->clk); |
1293 | 1297 | ||
1298 | /* Restore LPSS private register bits */ | ||
1299 | lpss_ssp_setup(drv_data); | ||
1300 | |||
1294 | /* Start the queue running */ | 1301 | /* Start the queue running */ |
1295 | status = spi_master_resume(drv_data->master); | 1302 | status = spi_master_resume(drv_data->master); |
1296 | if (status != 0) { | 1303 | if (status != 0) { |