mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
|
From 216e8e80057a9f0b6366327881acf88eaf9f1fd4 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:51 +0100
|
||
|
|
Subject: [PATCH 2/2] spi: bcm63xx-hsspi: 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-3-noltari@gmail.com
|
||
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||
|
|
---
|
||
|
|
drivers/spi/spi-bcm63xx-hsspi.c | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/spi/spi-bcm63xx-hsspi.c
|
||
|
|
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
|
||
|
|
@@ -21,6 +21,7 @@
|
||
|
|
#include <linux/mutex.h>
|
||
|
|
#include <linux/of.h>
|
||
|
|
#include <linux/reset.h>
|
||
|
|
+#include <linux/pm_runtime.h>
|
||
|
|
|
||
|
|
#define HSSPI_GLOBAL_CTRL_REG 0x0
|
||
|
|
#define GLOBAL_CTRL_CS_POLARITY_SHIFT 0
|
||
|
|
@@ -439,13 +440,17 @@ static int bcm63xx_hsspi_probe(struct pl
|
||
|
|
if (ret)
|
||
|
|
goto out_put_master;
|
||
|
|
|
||
|
|
+ pm_runtime_enable(&pdev->dev);
|
||
|
|
+
|
||
|
|
/* register and we are done */
|
||
|
|
ret = devm_spi_register_master(dev, master);
|
||
|
|
if (ret)
|
||
|
|
- goto out_put_master;
|
||
|
|
+ goto out_pm_disable;
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
+out_pm_disable:
|
||
|
|
+ pm_runtime_disable(&pdev->dev);
|
||
|
|
out_put_master:
|
||
|
|
spi_master_put(master);
|
||
|
|
out_disable_pll_clk:
|