From: Stephan Gerhold <stephan.gerhold@linaro.org>
To: Luca Weiss <luca@lucaweiss.eu>
Cc: ~postmarketos/upstreaming@lists.sr.ht,
phone-devel@vger.kernel.org,
"Bjorn Andersson" <andersson@kernel.org>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Stephan Gerhold" <stephan@gerhold.net>,
"Konrad Dybcio" <konradybcio@kernel.org>,
"Matti Lehtimäki" <matti.lehtimaki@gmail.com>,
linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 11/13] ARM: dts: qcom: Introduce dtsi for LTE-capable MSM8926
Date: Tue, 28 Jan 2025 09:07:29 +0100 [thread overview]
Message-ID: <Z5iQQQRtuUzTDRVW@linaro.org> (raw)
In-Reply-To: <20250127-msm8226-modem-v3-11-67e968787eef@lucaweiss.eu>
On Mon, Jan 27, 2025 at 11:45:43PM +0100, Luca Weiss wrote:
> 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.
>
> Signed-off-by: Luca Weiss <luca@lucaweiss.eu>
> ---
> arch/arm/boot/dts/qcom/msm8926.dtsi | 11 +++++++++++
> arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 1 +
> arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi | 6 +++++-
> arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts | 1 +
> arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts | 1 +
> arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts | 1 +
> .../boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi | 6 +++++-
> arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 2 +-
> .../arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts | 1 +
> arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts | 1 +
> arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts | 1 +
> 12 files changed, 30 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/msm8926.dtsi b/arch/arm/boot/dts/qcom/msm8926.dtsi
I'm personally not a big fan of mixing the naming with and without qcom-
prefix. But anyway:
Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org>
> new file mode 100644
> index 0000000000000000000000000000000000000000..629654c525b4bf415e41dca7b3d9fc60a5ee75fd
> --- /dev/null
> +++ b/arch/arm/boot/dts/qcom/msm8926.dtsi
> @@ -0,0 +1,11 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2025, Luca Weiss <luca@lucaweiss.eu>
> + */
> +
> +#include "qcom-msm8226.dtsi"
> +
> +&modem {
> + compatible = "qcom,msm8926-mss-pil";
> + /delete-property/ qcom,ext-bhs-reg;
> +};
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> index da3be658e822fb6408738e7e79453b87c39478e1..4546fa8beba46d31345da1ee3eded20e8a853f6b 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> @@ -5,6 +5,7 @@
>
> /dts-v1/;
>
> +#include "qcom-msm8226.dtsi"
> #include "qcom-msm8226-samsung-matisse-common.dtsi"
>
> / {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
> index ca76bf8af75e463bc3a2a5cfc1c2b574f0ac17f5..d4a32af0ef8f1ca6c0926261d7756a4d6bfba23f 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
> @@ -8,7 +8,11 @@
> * Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
> */
>
> -#include "qcom-msm8226.dtsi"
> +/*
> + * The .dts should first include qcom-msm8226.dtsi or msm8926.dtsi depending on
> + * the SoC on the given device.
> + */
> +
> #include "pm8226.dtsi"
> #include <dt-bindings/input/input.h>
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts
> index 2c664b5934ec54b7d53a2e3a8d86a1df864d33a9..f448c908841610bc53cccccb431d5ce50d205fc1 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts
> @@ -8,6 +8,7 @@
>
> /dts-v1/;
>
> +#include "qcom-msm8226.dtsi"
> #include "qcom-msm8226-microsoft-common.dtsi"
>
> / {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts
> index 731c5c3756784677580f09fad31ba28b0533145d..94bf3b1ad1bd1fb926ac5bb7174394965d52609c 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts
> @@ -8,6 +8,7 @@
>
> /dts-v1/;
>
> +#include "qcom-msm8226.dtsi"
> #include "qcom-msm8226-microsoft-common.dtsi"
>
> / {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts
> index a28a83cb534055a36a55f907094b34f48b6266be..d8cdb75dfbb8bdafd8bb8fecfe3b9ab3f42b41e4 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts
> @@ -8,6 +8,7 @@
>
> /dts-v1/;
>
> +#include "qcom-msm8226.dtsi"
> #include "qcom-msm8226-microsoft-common.dtsi"
>
> /* This device has no magnetometer */
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
> index fbd568c7d6b7415d240aa1a2329d07cf9135274c..0a3147656f36ca2616e0e3cc7c1dd808b55f3a88 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
> @@ -3,8 +3,12 @@
> * Copyright (c) 2022, Matti Lehtimäki <matti.lehtimaki@gmail.com>
> */
>
> +/*
> + * The .dts should first include qcom-msm8226.dtsi or msm8926.dtsi depending on
> + * the SoC on the given device.
> + */
> +
> #include <dt-bindings/input/input.h>
> -#include "qcom-msm8226.dtsi"
> #include "pm8226.dtsi"
>
> /delete-node/ &adsp_region;
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts
> index 18396623a91dd4bf4b66f01c1d983c391722f3b5..d6eaa82cee4daf6a1386902f537f1351811d4a06 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts
> @@ -5,7 +5,7 @@
>
> /dts-v1/;
>
> -#include "qcom-msm8226.dtsi"
> +#include "msm8926.dtsi"
> #include "pm8226.dtsi"
>
> /delete-node/ &adsp_region;
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts
> index 9b48661d69c53829c30ece8544ffff97f3032a59..eea4fd8cd9725f1ef629aae446ff7aa6c49fb2fa 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts
> @@ -8,6 +8,7 @@
>
> /dts-v1/;
>
> +#include "msm8926.dtsi"
> #include "qcom-msm8226-microsoft-common.dtsi"
>
> /* This device has touchscreen on i2c3 instead */
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts
> index 55077a5f2e34f84857ee35d22157362759151c5a..f23bbb94cc5e4343f667e53d66bc289228a85134 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts
> @@ -8,6 +8,7 @@
>
> /dts-v1/;
>
> +#include "msm8926.dtsi"
> #include "qcom-msm8226-microsoft-common.dtsi"
>
> /* This device has touchscreen on i2c1 instead */
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts
> index 376a33125941028a3977e76373ee96959b08ee3e..db3273c755c2b5480b9c00336314b63900a74cbd 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts
> @@ -2,7 +2,7 @@
>
> /dts-v1/;
>
> -#include "qcom-msm8226.dtsi"
> +#include "msm8926.dtsi"
> #include "pm8226.dtsi"
>
> /delete-node/ &smem_region;
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts
> index d0e1bc39f8ef700aa648148ac070f59062d049d7..772827cad972ad4ff032cfb9310568c5d2f0170f 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts
> @@ -6,6 +6,7 @@
>
> /dts-v1/;
>
> +#include "msm8926.dtsi"
> #include "qcom-msm8226-samsung-matisse-common.dtsi"
>
> / {
>
> --
> 2.48.1
>
next prev parent reply other threads:[~2025-01-28 8:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-27 22:45 [PATCH v3 00/13] Modem support for MSM8226 Luca Weiss
2025-01-27 22:45 ` [PATCH v3 01/13] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Support platforms with one power domain Luca Weiss
2025-01-27 22:45 ` [PATCH v3 02/13] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Add MSM8226 Luca Weiss
2025-01-27 22:45 ` [PATCH v3 03/13] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Add MSM8926 Luca Weiss
2025-01-28 7:39 ` Krzysztof Kozlowski
2025-01-27 22:45 ` [PATCH v3 04/13] remoteproc: qcom_q6v5_mss: Handle platforms with one power domain Luca Weiss
2025-01-28 7:33 ` Stephan Gerhold
2025-01-28 10:45 ` Konrad Dybcio
2025-01-28 10:55 ` Stephan Gerhold
2025-01-28 11:15 ` Konrad Dybcio
2025-01-27 22:45 ` [PATCH v3 05/13] remoteproc: qcom_q6v5_mss: Add modem support on MSM8226 Luca Weiss
2025-01-28 7:50 ` Stephan Gerhold
2025-01-27 22:45 ` [PATCH v3 06/13] remoteproc: qcom_q6v5_mss: Add modem support on MSM8926 Luca Weiss
2025-01-28 7:55 ` Stephan Gerhold
2025-01-27 22:45 ` [PATCH v3 07/13] ARM: dts: qcom: msm8226: Add node for TCSR halt regs Luca Weiss
2025-01-28 11:11 ` Konrad Dybcio
2025-01-27 22:45 ` [PATCH v3 08/13] ARM: dts: qcom: msm8226: Add smsm node Luca Weiss
2025-01-27 22:45 ` [PATCH v3 09/13] ARM: dts: qcom: msm8226: Add modem remoteproc node Luca Weiss
2025-01-28 8:05 ` Stephan Gerhold
2025-01-27 22:45 ` [PATCH v3 10/13] ARM: dts: qcom: msm8226: Add BAM DMUX Ethernet/IP device Luca Weiss
2025-01-27 22:45 ` [PATCH v3 11/13] ARM: dts: qcom: Introduce dtsi for LTE-capable MSM8926 Luca Weiss
2025-01-28 8:07 ` Stephan Gerhold [this message]
2025-01-28 16:46 ` Luca Weiss
2025-01-28 17:45 ` Stephan Gerhold
2025-01-28 11:13 ` Konrad Dybcio
2025-01-27 22:45 ` [PATCH v3 12/13] ARM: dts: qcom: msm8926-htc-memul: Enable modem Luca Weiss
2025-01-28 8:12 ` Stephan Gerhold
2025-01-28 11:14 ` Konrad Dybcio
2025-01-28 16:48 ` Luca Weiss
2025-01-27 22:45 ` [PATCH v3 13/13] ARM: dts: qcom: msm8226-samsung-matisse-common: " Luca Weiss
2025-01-28 8:12 ` Stephan Gerhold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z5iQQQRtuUzTDRVW@linaro.org \
--to=stephan.gerhold@linaro.org \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=luca@lucaweiss.eu \
--cc=mathieu.poirier@linaro.org \
--cc=matti.lehtimaki@gmail.com \
--cc=phone-devel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=stephan@gerhold.net \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).