a0eff5ddff
These patches have been accepted upstream. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 73ae625da5c36300fccd809738e7c68f49ebce35 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
|
Date: Tue, 23 Feb 2021 16:18:50 +0100
|
|
Subject: [PATCH 1/2] spi: bcm63xx-spi: fix pm_runtime
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The driver sets auto_runtime_pm to true, but it doesn't call
|
|
pm_runtime_enable(), which results in "Failed to power device" when PM support
|
|
is enabled.
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Link: https://lore.kernel.org/r/20210223151851.4110-2-noltari@gmail.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-bcm63xx.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/spi/spi-bcm63xx.c
|
|
+++ b/drivers/spi/spi-bcm63xx.c
|
|
@@ -593,11 +593,13 @@ static int bcm63xx_spi_probe(struct plat
|
|
|
|
bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);
|
|
|
|
+ pm_runtime_enable(&pdev->dev);
|
|
+
|
|
/* register and we are done */
|
|
ret = devm_spi_register_master(dev, master);
|
|
if (ret) {
|
|
dev_err(dev, "spi register failed\n");
|
|
- goto out_clk_disable;
|
|
+ goto out_pm_disable;
|
|
}
|
|
|
|
dev_info(dev, "at %pr (irq %d, FIFOs size %d)\n",
|
|
@@ -605,6 +607,8 @@ static int bcm63xx_spi_probe(struct plat
|
|
|
|
return 0;
|
|
|
|
+out_pm_disable:
|
|
+ pm_runtime_disable(&pdev->dev);
|
|
out_clk_disable:
|
|
clk_disable_unprepare(clk);
|
|
out_err:
|