41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
|
From e8a3ffa5768a29b975e7d9fedb1b52205720e797 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ondrej Jirman <megous@megous.com>
|
||
|
|
Date: Sat, 2 Nov 2019 15:17:02 +0100
|
||
|
|
Subject: [PATCH 034/323] firmware: scpi: Don't probe SCP during SCPI driver
|
||
|
|
probe
|
||
|
|
|
||
|
|
We want to have this driver builtin and be able to load SCP after it
|
||
|
|
probes at the same time. This allows that.
|
||
|
|
|
||
|
|
In the future, we'll load SCP firmware from u-boot, but for now
|
||
|
|
we want to be able to experiment more freely, by loading SCP after
|
||
|
|
boot.
|
||
|
|
|
||
|
|
Signed-off-by: Ondrej Jirman <megous@megous.com>
|
||
|
|
---
|
||
|
|
drivers/firmware/arm_scpi.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
|
||
|
|
index 8789a4f3d..958108b64 100644
|
||
|
|
--- a/drivers/firmware/arm_scpi.c
|
||
|
|
+++ b/drivers/firmware/arm_scpi.c
|
||
|
|
@@ -1000,12 +1000,13 @@ static int scpi_probe(struct platform_device *pdev)
|
||
|
|
scpi_info->cmd_priority);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /*
|
||
|
|
ret = scpi_init_versions(scpi_info);
|
||
|
|
if (ret) {
|
||
|
|
dev_err(dev, "incorrect or no SCP firmware found\n");
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ */
|
||
|
|
if (scpi_info->is_legacy && !scpi_info->protocol_version &&
|
||
|
|
!scpi_info->firmware_version)
|
||
|
|
dev_info(dev, "SCP Protocol legacy pre-1.0 firmware\n");
|
||
|
|
--
|
||
|
|
2.34.0
|
||
|
|
|