From 48767fd8982d39d90a9e83b1461dc5feedf73e29 Mon Sep 17 00:00:00 2001 From: Naga Sureshkumar Relli Date: Tue, 8 Aug 2017 10:59:33 +0200 Subject: spi: cadence: change sequence of calling runtime_enable call pm_runtime_enable after set_active other wise it will enable clock always. Signed-off-by: Naga Sureshkumar Relli Signed-off-by: Michal Simek Signed-off-by: Mark Brown --- drivers/spi/spi-cadence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/spi/spi-cadence.c') diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c index f0b5c7b91f37..5e02f9b91688 100644 --- 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) -- cgit v1.2.3 From 802740890c4200c9266aee3139c5bd8e9b154e8f Mon Sep 17 00:00:00 2001 From: Shubhrajyoti Datta Date: Tue, 8 Aug 2017 11:00:03 +0200 Subject: spi: cadence: Add support for context loss Context could be lost across the suspend and resume. Reinit the driver to tide over. Signed-off-by: Shubhrajyoti Datta Signed-off-by: Michal Simek Signed-off-by: Mark Brown --- drivers/spi/spi-cadence.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/spi/spi-cadence.c') diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c index 5e02f9b91688..5c9516ae4942 100644 --- a/drivers/spi/spi-cadence.c +++ b/drivers/spi/spi-cadence.c @@ -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); } -- cgit v1.2.3