From edf9a2b4e1fb70ca7d6f04a0a0a3d95ebb64a3d7 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Date: Thu, 8 Sep 2022 17:37:42 +0300
Subject: [PATCH] qcom: rename Lenovo ThinkPad X13s firmware paths

After some discussion with Bjorn, the Qualcomm platform maintainer, it
was agreed to follow the established practice and to inject the SoC name
into the firmware paths.

It is highly unlikely that we are going to run Linux off the existing
ACPI data in these platforms anytime soon. And even if we do so, we'd
have to figure out the file names anyway, as they do not follow the
existing standard names.

Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Mark Pearson <markpearson@lenovo.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Josh Boyer <jwboyer@kernel.org>
---
 WHENCE                                         |  17 +++++++++--------
 qcom/{ => sc8280xp}/LENOVO/21BX/adspr.jsn      |   0
 qcom/{ => sc8280xp}/LENOVO/21BX/adspua.jsn     |   0
 qcom/{ => sc8280xp}/LENOVO/21BX/battmgr.jsn    |   0
 qcom/{ => sc8280xp}/LENOVO/21BX/cdspr.jsn      |   0
 qcom/{ => sc8280xp}/LENOVO/21BX/qcadsp8280.mbn | Bin
 qcom/{ => sc8280xp}/LENOVO/21BX/qccdsp8280.mbn | Bin
 .../LENOVO/21BX/qcdxkmsuc8280.mbn              | Bin
 qcom/{ => sc8280xp}/LENOVO/21BX/qcslpi8280.mbn | Bin
 9 files changed, 9 insertions(+), 8 deletions(-)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/adspr.jsn (100%)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/adspua.jsn (100%)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/battmgr.jsn (100%)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/cdspr.jsn (100%)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/qcadsp8280.mbn (100%)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/qccdsp8280.mbn (100%)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/qcdxkmsuc8280.mbn (100%)
 rename qcom/{ => sc8280xp}/LENOVO/21BX/qcslpi8280.mbn (100%)

diff --git a/WHENCE b/WHENCE
index f5aa93c..f3f9a7a 100644
--- a/WHENCE
+++ b/WHENCE
@@ -5595,7 +5595,7 @@ File: qcom/a660_gmu.bin
 File: qcom/a660_sqe.fw
 File: qcom/leia_pfp_470.fw
 File: qcom/leia_pm4_470.fw
-File: qcom/LENOVO/21BX/qcdxkmsuc8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
@@ -5622,13 +5622,14 @@ File: qcom/sm8250/adspr.jsn
 File: qcom/sm8250/adspua.jsn
 File: qcom/sm8250/cdsp.mbn
 File: qcom/sm8250/cdspr.jsn
-File: qcom/LENOVO/21BX/adspr.jsn
-File: qcom/LENOVO/21BX/adspua.jsn
-File: qcom/LENOVO/21BX/battmgr.jsn
-File: qcom/LENOVO/21BX/cdspr.jsn
-File: qcom/LENOVO/21BX/qcadsp8280.mbn
-File: qcom/LENOVO/21BX/qccdsp8280.mbn
-File: qcom/LENOVO/21BX/qcslpi8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/adspr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/adspua.jsn
+File: qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
+Link: qcom/LENOVO/21BX -> ../sc8280xp/LENOVO/21BX
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
diff --git a/qcom/LENOVO/21BX/adspr.jsn b/qcom/sc8280xp/LENOVO/21BX/adspr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/adspr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/adspr.jsn
diff --git a/qcom/LENOVO/21BX/adspua.jsn b/qcom/sc8280xp/LENOVO/21BX/adspua.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/adspua.jsn
rename to qcom/sc8280xp/LENOVO/21BX/adspua.jsn
diff --git a/qcom/LENOVO/21BX/battmgr.jsn b/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/battmgr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
diff --git a/qcom/LENOVO/21BX/cdspr.jsn b/qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/cdspr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
diff --git a/qcom/LENOVO/21BX/qcadsp8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcadsp8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
diff --git a/qcom/LENOVO/21BX/qccdsp8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qccdsp8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
diff --git a/qcom/LENOVO/21BX/qcdxkmsuc8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcdxkmsuc8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
diff --git a/qcom/LENOVO/21BX/qcslpi8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcslpi8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn