[PATCH v2 0/2] arm64: dts: qcom: msm8916: drop dtbTool compatibles

[PATCH v2 0/2] arm64: dts: qcom: msm8916: drop dtbTool compatibles

[Dmitry Baryshkov]

Only two boards ever has adopted the dtbTool-specific compatibles.
However the dtbTool should not be used anymore. It was required only for
the old, broken lk1st bootloader. All users of those boards should have
updated to use lk2nd instead. Otherwise several important features
(secondary CPU cores, WiFi, BT) will not work with the upstream kernel.

Drop these extra compatibles, merging these two boards into the common
bindings case for msm8916.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Changes in v2:
- Drop the compatibles from bindings too (Krzysztof)
- Add cover letter, describing why everybody has switched to lk2nd.
- Link to v1: https://lore.kernel.org/r/20240221-msm8916-drop-compats-v1-1-71acdab14738@linaro.org

---
Dmitry Baryshkov (2):
      dt-bindings: arm: qcom: drop dtbTool-specific compatibles
      arm64: dts: qcom: msm8916: drop dtbTool-specific compatibles

 Documentation/devicetree/bindings/arm/qcom.yaml      | 12 ++----------
 arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts |  2 +-
 arch/arm64/boot/dts/qcom/msm8916-mtp.dts             |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)
---
base-commit: 8ffc8b1bbd505e27e2c8439d326b6059c906c9dd
change-id: 20240221-msm8916-drop-compats-7f608aa48948

Best regards,
-- 
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

[PATCH v2 1/2] dt-bindings: arm: qcom: drop dtbTool-specific compatibles

[Dmitry Baryshkov]

Drop two board compatibles that were used by the skales dtbTool to index
device tree blobs. It was required to boot those devices with the
original bootloader, however all users should have switched to the
lk2nd bootloader by now.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 Documentation/devicetree/bindings/arm/qcom.yaml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index 66beaac60e1d..66c98a1c8ac6 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -187,11 +187,6 @@ properties:
           - const: qcom,msm8974pro
           - const: qcom,msm8974
 
-      - items:
-          - const: qcom,msm8916-mtp
-          - const: qcom,msm8916-mtp/1
-          - const: qcom,msm8916
-
       - items:
           - enum:
               - acer,a1-724
@@ -200,6 +195,8 @@ properties:
               - gplus,fl8005a
               - huawei,g7
               - longcheer,l8910
+              - longcheer,l8150
+              - qcom,msm8916-mtp
               - samsung,a3u-eur
               - samsung,a5u-eur
               - samsung,e5
@@ -220,11 +217,6 @@ properties:
               - yiming,uz801-v3
           - const: qcom,msm8916
 
-      - items:
-          - const: longcheer,l8150
-          - const: qcom,msm8916-v1-qrd/9-v1
-          - const: qcom,msm8916
-
       - items:
           - enum:
               - motorola,potter

-- 
2.39.2

[PATCH v2 2/2] arm64: dts: qcom: msm8916: drop dtbTool-specific compatibles

[Dmitry Baryshkov]

Drop two board compatibles that were used by the skales dtbTool to index
device tree blobs. It was required to boot those devices with the
original bootloader, however all users should have switched to the
lk2nd bootloader by now.

Suggested-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +-
 arch/arm64/boot/dts/qcom/msm8916-mtp.dts             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 3a3e794c022f..7f0c2c1b8a94 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -12,7 +12,7 @@
 
 / {
 	model = "Longcheer L8150";
-	compatible = "longcheer,l8150", "qcom,msm8916-v1-qrd/9-v1", "qcom,msm8916";
+	compatible = "longcheer,l8150", "qcom,msm8916";
 	chassis-type = "handset";
 
 	aliases {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
index ac527a3a0826..c11a845e91bb 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
@@ -9,7 +9,7 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8916 MTP";
-	compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916";
+	compatible = "qcom,msm8916-mtp", "qcom,msm8916";
 	chassis-type = "handset";
 
 	aliases {

-- 
2.39.2

Re: [PATCH v2 1/2] dt-bindings: arm: qcom: drop dtbTool-specific compatibles

[Krzysztof Kozlowski]

On 14/03/2024 02:42, Dmitry Baryshkov wrote:
> Drop two board compatibles that were used by the skales dtbTool to index
> device tree blobs. It was required to boot those devices with the
> original bootloader, however all users should have switched to the
> lk2nd bootloader by now.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH v2 0/2] arm64: dts: qcom: msm8916: drop dtbTool compatibles

[Stephan Gerhold]

rOn Thu, Mar 14, 2024 at 03:42:47AM +0200, Dmitry Baryshkov wrote:
> Only two boards ever has adopted the dtbTool-specific compatibles.
> However the dtbTool should not be used anymore. It was required only for
> the old, broken lk1st bootloader. All users of those boards should have
> updated to use lk2nd instead. Otherwise several important features
> (secondary CPU cores, WiFi, BT) will not work with the upstream kernel.

Nitpick: The term "the old, broken lk1st bootloader" is a bit misleading
here. I believe you are referring to Qualcomm's original LK bootloader.
"lk1st" is actually the name of an alternative configuration in the
lk2nd project that can be used to replace the first-stage bootloader on
devices without secure boot, e.g. DB410c and a few smartphones. lk1st
has exactly the same functionality as lk2nd and is therefore definitely
not old and broken. Both support DTB selection, secondary CPU cores etc. :-)

I don't think we put the cover letter into a merge commit message in the
qcom tree, so there is no need to resend. I just wanted to clarify this.

Thanks for cleaning this up!
Stephan

Re: [PATCH v2 0/2] arm64: dts: qcom: msm8916: drop dtbTool compatibles

[Bjorn Andersson]

On Thu, 14 Mar 2024 03:42:47 +0200, Dmitry Baryshkov wrote:
> Only two boards ever has adopted the dtbTool-specific compatibles.
> However the dtbTool should not be used anymore. It was required only for
> the old, broken lk1st bootloader. All users of those boards should have
> updated to use lk2nd instead. Otherwise several important features
> (secondary CPU cores, WiFi, BT) will not work with the upstream kernel.
> 
> Drop these extra compatibles, merging these two boards into the common
> bindings case for msm8916.
> 
> [...]

Applied, thanks!

[1/2] dt-bindings: arm: qcom: drop dtbTool-specific compatibles
      commit: 88d0e4e10d77bb4e575b74ac0f6dd3140ecc3bcd
[2/2] arm64: dts: qcom: msm8916: drop dtbTool-specific compatibles
      commit: 3867ad6d39cd97875aca7e5f1b17ea6dd5b1107a

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>