Merge remote-tracking branches 'spi/topic/cadence', 'spi/topic/dt', '…

…spi/topic/ep93xx' and 'spi/topic/falcon' into spi-next
mariux64 · Sep 4, 2017 · a3a4246 · a3a4246
5 parents 45cfc32 + 8027408 + 25c56c8 + d9a0177 + 1a41aa1
commit a3a4246
Show file tree

Hide file tree

Showing 5 changed files with 193 additions and 348 deletions.
diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
@@ -576,10 +576,10 @@ static int cdns_spi_probe(struct platform_device *pdev)
 		goto clk_dis_apb;
 	}
 
-	pm_runtime_enable(&pdev->dev);
 	pm_runtime_use_autosuspend(&pdev->dev);
 	pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
 	pm_runtime_set_active(&pdev->dev);
+	pm_runtime_enable(&pdev->dev);
 
 	ret = of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);
 	if (ret < 0)
@@ -704,7 +704,9 @@ static int __maybe_unused cdns_spi_resume(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct spi_master *master = platform_get_drvdata(pdev);
+	struct cdns_spi *xspi = spi_master_get_devdata(master);
 
+	cdns_spi_init_hw(xspi);
 	return spi_master_resume(master);
 }