From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4F281C5F27 for ; Tue, 28 Jan 2025 08:07:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738051656; cv=none; b=q2cTeXOeWFbRxRkdZQJj4z2hDHAaZQiwZJqwKvuGIOPRdlhk64NrQTPW1d8SaGl3WqwRIrkId8Kfmp8P9hCdxg/2Bx7XOIVFJLwnHrNL0tbUXW+jcvG8YrTkXVcdX5Zkj/LL/f7TerCQF1s/HXpX2I7idZUDziG772iQ3AfmK+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738051656; c=relaxed/simple; bh=fU/tckP/5UqPp7g2LTABAExa7RQaGvyFPzFMOwFUios=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XCv2BWgOp7cQ1jWCc88Bb3KPTQZ55gzlM0aVBzcVF9RMh9CdQdNKNqha87cJsO8AfkUkNTiI1vT+kraKqRuJ8wU8IEikhdBItPriiIkHv6Ovmt8TCVoZFFTRmKPb/Mavp5x9hpTsGPwEMpAuozKriRihSLbyB/maM9mGahyjAhg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=G3HY/E84; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="G3HY/E84" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4361e89b6daso34375255e9.3 for ; Tue, 28 Jan 2025 00:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738051652; x=1738656452; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=Nk+4dUfm3RLF6cEwakRkyvt72Fn0RenQLoBqykugPCY=; b=G3HY/E84F4Sh0OYCd5C+8+0YcXlEPXWEtVHUVKWDl7Mn5LJy0UuZ6xGh8ynbZx+zIJ v+VL7a+3c58VOyWchoQkuFZPrWcPxveVIkf5Xv0/xS0yJAPrEvHEdWbLpJtMJL4OKZEV czGZxBwZm0KnVB31QULaJ+0/USeBqAqtZHnptkP1XzLHPOOSUbOu7bTHZJS8KLqd7pcT tA8ub/AcxkCI9EREjocuBBDybx6yEizE0PuH1EUX5Rsxwka6iiOTLMONGhATPFwYCnD7 6+d3qkjLPrsKABxKR6HOiQkXXBJgnl7R1HqqGHH9aq/kH9WiKrtY5V5uy6+rIchrwG5Z bUlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738051652; x=1738656452; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Nk+4dUfm3RLF6cEwakRkyvt72Fn0RenQLoBqykugPCY=; b=aegg14abl+MyLDEHhHNudobPmVlAGo3EhQsDeBDbJOh7X0LS0hI32VMOnLdEsoJSWT pjbpwDYLdgyuG7c2zw52pizGsBMGJh5V8BJJBfdBv5xcOKAbz/kkR8T4ZyB2f5xn6V4e /1Bw0eewWVMz/mxMr5q3eCd8uOz/hhpnIvEP2ig3cIRMzgJ1mKLniyXBNGZV9eTZzFze 5rBvCKmC8AK2yBRxk6/RDcV5+A0JAKvZojy5IvifFgTq0sAvtoBPIvlxHz1fdNbMi59z PVlj16WwStHI/sTUDsmywDduQ3C5u/lYuM8exdtbA+SjpYJT/jfl5anjzppqtkgo0Mv4 k2Rg== X-Forwarded-Encrypted: i=1; AJvYcCW8kXN3a4xaPVwuMRva83+rZ48spAl7ITQQdNleuQbxUPkz8VNeHrgbCwUEpifslsLRfvdb7kP6x46B@vger.kernel.org X-Gm-Message-State: AOJu0YxHtoI+wnorI/0oHcxyAVzWW/6Vz+0k7H+/ItkQmzvMSySuUQ3n VDbl9vs7t/SUqxy0MxL3UGyM+6QhYMW84JbUejxyk92eMp1/fp+gAgg956Flexs= X-Gm-Gg: ASbGnctsnRd5f3alM2kxwOClmRx+nIcBPjLWuTKRz+Z+2G1gORWH4bgfMXFJt+xjlbX oLuqEw97qXj6iIhMlowXxZm6nYWzruZD0zNEaY20zBhtxbeSOQSrP6IgEp2+kYdwW2/o8BGG9Yw VDQ56tZSAbKvEXV3Gch1laQ25B4yUy57imeafFc14Ziww13kxQc9Oepyy0K+y59cGQUz9OZ0uay OO542y9T00jS3IjHrnsSe2ackS9SgJumiQOOMKlcqpUrg4VhvrfVvvmnPNlIaa3CrcymRFiMymU ELiGyCtL2/ISChVbLkdeLDeBZcaJtiFw4gvl6g== X-Google-Smtp-Source: AGHT+IFHFytzRhe8qShNNxEVr/A1T+bzdYm6EGCEgGEM29/hYF2iePKBkaJ5GE7ot1uukB9F3g8xsw== X-Received: by 2002:a05:600c:34d0:b0:434:fbda:1f44 with SMTP id 5b1f17b1804b1-4389142e805mr370329005e9.19.1738051652123; Tue, 28 Jan 2025 00:07:32 -0800 (PST) Received: from linaro.org ([2a02:2454:ff21:ef30:3210:3bfd:4b47:59da]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438bd50233dsm156786785e9.15.2025.01.28.00.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2025 00:07:31 -0800 (PST) Date: Tue, 28 Jan 2025 09:07:29 +0100 From: Stephan Gerhold To: Luca Weiss Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephan Gerhold , Konrad Dybcio , Matti =?iso-8859-1?Q?Lehtim=E4ki?= , 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 Message-ID: References: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> <20250127-msm8226-modem-v3-11-67e968787eef@lucaweiss.eu> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit 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 > --- > 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 > 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 > + */ > + > +#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 > */ > > -#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 > > 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 > */ > > +/* > + * The .dts should first include qcom-msm8226.dtsi or msm8926.dtsi depending on > + * the SoC on the given device. > + */ > + > #include > -#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 >