Skip to content

Commit fc532eb

Browse files
z3ntuandersson
authored andcommitted
ARM: dts: qcom: Introduce dtsi for LTE-capable MSM8926
MSM8926, while being 'just' an LTE-capable variant of MSM8226, the dts needs to slightly change since the modem doesn't use the ext-bhs-reg and needs mss-supply, therefore it gets a new compatible. Since we already have two -common.dtsi files which are used on both APQ8026/MSM8226 and MSM8926 devices, change the setup a bit by removing the SoC include from those and requiring the device dts to pick the correct one. Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Signed-off-by: Luca Weiss <luca@lucaweiss.eu> Link: https://lore.kernel.org/r/20250217-msm8226-modem-v5-11-2bc74b80e0ae@lucaweiss.eu Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 6b47ce0 commit fc532eb

12 files changed

Lines changed: 30 additions & 4 deletions
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) 2025, Luca Weiss <luca@lucaweiss.eu>
4+
*/
5+
6+
#include "qcom-msm8226.dtsi"
7+
8+
&modem {
9+
compatible = "qcom,msm8926-mss-pil";
10+
/delete-property/ qcom,ext-bhs-reg;
11+
};

arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/dts-v1/;
77

8+
#include "qcom-msm8226.dtsi"
89
#include "qcom-msm8226-samsung-matisse-common.dtsi"
910

1011
/ {

arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
99
*/
1010

11-
#include "qcom-msm8226.dtsi"
11+
/*
12+
* The .dts should first include qcom-msm8226.dtsi or msm8926.dtsi depending on
13+
* the SoC on the given device.
14+
*/
15+
1216
#include "pm8226.dtsi"
1317
#include <dt-bindings/input/input.h>
1418

arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/dts-v1/;
1010

11+
#include "qcom-msm8226.dtsi"
1112
#include "qcom-msm8226-microsoft-common.dtsi"
1213

1314
/ {

arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/dts-v1/;
1010

11+
#include "qcom-msm8226.dtsi"
1112
#include "qcom-msm8226-microsoft-common.dtsi"
1213

1314
/ {

arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/dts-v1/;
1010

11+
#include "qcom-msm8226.dtsi"
1112
#include "qcom-msm8226-microsoft-common.dtsi"
1213

1314
/* This device has no magnetometer */

arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
* Copyright (c) 2022, Matti Lehtimäki <matti.lehtimaki@gmail.com>
44
*/
55

6+
/*
7+
* The .dts should first include qcom-msm8226.dtsi or msm8926.dtsi depending on
8+
* the SoC on the given device.
9+
*/
10+
611
#include <dt-bindings/input/input.h>
7-
#include "qcom-msm8226.dtsi"
812
#include "pm8226.dtsi"
913

1014
/delete-node/ &adsp_region;

arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/dts-v1/;
77

8-
#include "qcom-msm8226.dtsi"
8+
#include "msm8926.dtsi"
99
#include "pm8226.dtsi"
1010

1111
/delete-node/ &adsp_region;

arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/dts-v1/;
1010

11+
#include "msm8926.dtsi"
1112
#include "qcom-msm8226-microsoft-common.dtsi"
1213

1314
/* This device has touchscreen on i2c3 instead */

arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/dts-v1/;
1010

11+
#include "msm8926.dtsi"
1112
#include "qcom-msm8226-microsoft-common.dtsi"
1213

1314
/* This device has touchscreen on i2c1 instead */

0 commit comments

Comments
 (0)