From patchwork Mon Jan 27 22:45:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 860298 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 74E6B1DB127; Mon, 27 Jan 2025 22:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018000; cv=none; b=FaCHOFkvp3EkNticjvaG8LKWj+E8XIrJZ50ldUVoyPGBL2o898RRV8tCct/bkuZwL03ADonlSJYhHs60aQlcWEnJr7gtviSDlu+Q6cuME+MVR1jzgnmD41IcWqZRJByuBMIDZMhtCf1IX8YjYvJRtXyMqdHPqkyB4qIVizJLRcw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018000; c=relaxed/simple; bh=KM6RJ3fNafu0TIY7cIBZDDJ6AdV0OzMiHaeG4NSr7Nk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T6ZcQN955hiDOt0QRWGanmRE/4xrSTqTdoZuxmNnrIBWu3cMuPynXHD74p7H2ZWa9LuHoThmpRmuYhR/EXqVYoaYRmicmWIFkyQuBRD28kcvDfwN4jcBnSwZV00IKdClrIL01q2/RSYIfkGW94Os/Nea1rWxWB6CELTEHI2B8V0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu; spf=pass smtp.mailfrom=lucaweiss.eu; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b=kL9FmZwn; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b="kL9FmZwn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017995; bh=KM6RJ3fNafu0TIY7cIBZDDJ6AdV0OzMiHaeG4NSr7Nk=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=kL9FmZwndB5OY+kuPYpXviITDcfpuLo6q/FEE/YKSUdrZaIrDlaWtlIfq99TU2d9B +PCozu23mWz5E3Ygj7OrXOQ+AbFotGGREZ8j+uwXmsSa7qLF2zblYoMwK0wVQ4ajhq tZS7vvs7/4J86PISQdY3TOV1mD+3ARz/U+9QdDQs= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:34 +0100 Subject: [PATCH v3 02/13] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Add MSM8226 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250127-msm8226-modem-v3-2-67e968787eef@lucaweiss.eu> References: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> In-Reply-To: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephan Gerhold , Konrad Dybcio , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3045; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=QOX+y9xJxQtU5fC+FAiwYeTe935qVnVO1l/TnrWDH7A=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAy/ayEYMU7l7wa077tciYQXybO0EFZBFS0N6 P+DUXHhCZiJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMvwAKCRBy2EO4nU3X Vjr4EADLkMdMOFfZWxkojYvXte42VqqBUXX8C06MD6gDW/t6SkxpszKujd/2y8nR59RPBlzA101 y0y8V381sFMxOl986hwbr8+ArV6faYY5rHKpnBsmdJXCRNAoJrBufac2fZhp9/ibvUL/EwT2AhA 7Ywy3pBCqylKK/IiYLF45Ds1odHQg/amuaBTVlRDOvmcSHzBKQN9rCVqKNg32jApfhF+yuHKVsM /ePT9Q4TfOvK0OHk+C0QtfThgbh3ALub7+6Da1X9sGgvYBkWWbxvI6l+B/JQ95sdJsfg8Mn9Qsu y7CxW+xz6cBx+vL9HcKlo03O6M3+LK54WYF2mqrpOKxdFiRx4VTKU6QjxoJLV5VVcZUE6fDxuVD OZ/SSBbmxZI5BrBSLi8evSLdbyBra+7/fusbRpYjI+NlpCkIJsmTCZizOK9qBezB0cLK02v3tUv J3mqIC9uYJVqaAWWibrLMzR0PAEDVGj5ZvrQYE2vEy+HMwMmom22MnrKqdGncE14HDulHTv781u s9IWEgG0z3CKn4qzQ2V19nX7p/nLTHsKOGYJ2wkli86/FqkjYlH0JN24zHMCsqowT5+TREJlvYu EXKhZIE9ybxnWQojzIdQ04YvQgEKj6v0hIrNuAITrqgho/T7JANkE0iKY/KzBdDtUbSY0rTnhg1 1iTEdxXzQEllE3g== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD From: Matti Lehtimäki Add support for external power block headswitch (BHS) registers. Similarly to MSM8974 also MSM8226 has the mx voltage rail exposed as regulator and only cx voltage rail as power domain. Signed-off-by: Matti Lehtimäki Reviewed-by: Krzysztof Kozlowski Signed-off-by: Luca Weiss --- .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml index c81364daa34b545e99261bf1f94ae2ad28d48ea7..0a3e39c55ec3dcfc9a4d4ac28f5debd77dc49b99 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml @@ -17,6 +17,7 @@ properties: compatible: oneOf: - enum: + - qcom,msm8226-mss-pil - qcom,msm8909-mss-pil - qcom,msm8916-mss-pil - qcom,msm8953-mss-pil @@ -70,7 +71,7 @@ properties: items: - description: CX proxy power domain (control handed over after startup) - description: MX proxy power domain (control handed over after startup) - (not valid for qcom,msm8974-mss-pil) + (not valid for qcom,msm8226-mss-pil or qcom,msm8974-mss-pil) - description: MSS proxy power domain (control handed over after startup) (only valid for qcom,msm8953-mss-pil) minItems: 1 @@ -78,7 +79,7 @@ properties: power-domain-names: items: - const: cx - - const: mx # not valid for qcom,msm8974-mss-pil + - const: mx # not valid for qcom,msm8226-mss-pil or qcom,msm8974-mss-pil - const: mss # only valid for qcom,msm8953-mss-pil minItems: 1 @@ -107,6 +108,15 @@ properties: items: - const: stop + qcom,ext-bhs-reg: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: External power block headswitch (BHS) register + (only valid for qcom,msm8226-mss-pil) + items: + - items: + - description: phandle to external BHS syscon region + - description: offset to the external BHS register + qcom,halt-regs: $ref: /schemas/types.yaml#/definitions/phandle-array description: @@ -230,6 +240,7 @@ allOf: compatible: contains: enum: + - qcom,msm8226-mss-pil - qcom,msm8974-mss-pil then: properties: @@ -240,6 +251,17 @@ allOf: required: - mx-supply + - if: + properties: + compatible: + const: qcom,msm8226-mss-pil + then: + required: + - qcom,ext-bhs-reg + else: + properties: + qcom,ext-bhs-reg: false + - if: properties: compatible: From patchwork Mon Jan 27 22:45:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 860297 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 C4BC51DDC29; Mon, 27 Jan 2025 22:46:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018001; cv=none; b=u3uP4jU63zV7FLXzouiAKP5s7Fk2D/UWT/NYRgQsTel+Ay01ccNYc2VOZDz7gO6D0YCzlE1k8Q7oQJcxtj42xEpIJMGwzkViN7pzOWpFnLMV3E0R6grt2RLKqlfoBPowX/WASKqjxt9wgeVvijzyW3KoaOOqC7ATi+X2ScsPVRw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018001; c=relaxed/simple; bh=g7XQ7nqrXEs6kLvs+nXBVI5v3iI0Bt/WCnvzpcbjxBY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Hxqqd/JDiI7sVXNBLuVfS1+s8CpvgCbi0vSGNSZLG6da7gflaLGJp+mTf/vRwlNyuqa5VRR9Ojb9KaMMkOcfbeYB4g2pVsLT2d6t6GOC6+6tUyxxst9zIPkkP1LxiGXT53R9z56Z7S/vZVSYx3qazXeqvg5iYvgsJZrXGY3UXXM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu; spf=pass smtp.mailfrom=lucaweiss.eu; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b=Hk7k0/OK; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b="Hk7k0/OK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017996; bh=g7XQ7nqrXEs6kLvs+nXBVI5v3iI0Bt/WCnvzpcbjxBY=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Hk7k0/OKdDlvMMtzi9Mj200JBP3mPgLcZA2KdeTMbfHSmasHna5VQjDccxRiNgzax gtTzv1JfABrKqbjPzD2ICtgfMdw+sXXeONjdVcpvKeEMH3P/nFvzIrEMX578COyDvK D7iLOJSBvNazSc2aCOWB4OwMj+vaYbyyEKzpy6lg= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:36 +0100 Subject: [PATCH v3 04/13] remoteproc: qcom_q6v5_mss: Handle platforms with one power domain Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250127-msm8226-modem-v3-4-67e968787eef@lucaweiss.eu> References: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> In-Reply-To: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephan Gerhold , Konrad Dybcio , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2128; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=g7XQ7nqrXEs6kLvs+nXBVI5v3iI0Bt/WCnvzpcbjxBY=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzBFvtfqXyKAe1snR95HWKJpcG3dB+Xs+IuE FguF91kcmaJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMwQAKCRBy2EO4nU3X VmeID/9aVuOjj8c/QUcv8793JPfc/WwMbMu2LYLfkUzmmlVWQqASeQT/y7iXhCbmJIL76O9Cxme uaJhyEKl79TSIV9kaN/eYnrdzoV4/5aGWbpuubRTG6KrBfeC8kN2dHbKs0/VFuswTOgOfbP9Qak JR3z+IXqishQYHGD2goQhlyss0VnZw8u+3RQCpDnSGw35BEf1c5yVDbyXunkFBE2caciHSL8558 evrhndbVfR6TyKCZxXGrv+UqjW9OO6yje0WnpRJo2ChQBk7eDM1JZfA0Afba1/0p77SmB+ZHFbs 4mXsbiJ0udhv6Plb85SrYKDG4dBGbqSB7R0x35HQPPVNxaLhGVrFkOdhdXC1YsigtIx8tNYkJAE vgP7/IBBvzhKqAUvDo8K2adOUQ+0fif9DG5uuFXNxjFF7qhwdRx4NNQI6Rw7Xm2ydfm0lmoqY2T QDz1IUSplYP/EPWg4PEaMUGQb1KjlRgs2tnr5CSKCLjZo4/hY26D5gseSmHuDhGDIaj4wL26TBa GzTWb+ix4U+RgXoLs1at2SQ9fJ5VVKVvFY4ebPxwZPbi34IWfKWEF07ylNnMw/cXpVe+h7unxEQ 0646vZUu5cDEt9+MU4dl/uVte0cHq/nZFa2Y5SiCWEZWHZosP4ovWNzhmCJEybSymPStycROOfu jDyXgF6seo1TWMw== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD For example MSM8974 has mx voltage rail exposed as regulator and only cx voltage rail is exposed as power domain. This power domain (cx) is attached internally in power domain and cannot be attached in this driver. Fixes: 8750cf392394 ("remoteproc: qcom_q6v5_mss: Allow replacing regulators with power domains") Co-developed-by: Matti Lehtimäki Signed-off-by: Matti Lehtimäki Signed-off-by: Luca Weiss --- drivers/remoteproc/qcom_q6v5_mss.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index e78bd986dc3f256effce4470222c0a5faeea86ec..0e1b0934ceedd13d5790b798afc95d68a8314c75 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1831,6 +1831,13 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, while (pd_names[num_pds]) num_pds++; + /* Handle single power domain */ + if (num_pds == 1 && dev->pm_domain) { + devs[0] = dev; + pm_runtime_enable(dev); + return 1; + } + for (i = 0; i < num_pds; i++) { devs[i] = dev_pm_domain_attach_by_name(dev, pd_names[i]); if (IS_ERR_OR_NULL(devs[i])) { @@ -1851,8 +1858,15 @@ static int q6v5_pds_attach(struct device *dev, struct device **devs, static void q6v5_pds_detach(struct q6v5 *qproc, struct device **pds, size_t pd_count) { + struct device *dev = qproc->dev; int i; + /* Handle single power domain */ + if (pd_count == 1 && dev->pm_domain) { + pm_runtime_disable(dev); + return; + } + for (i = 0; i < pd_count; i++) dev_pm_domain_detach(pds[i], false); } @@ -2449,13 +2463,13 @@ static const struct rproc_hexagon_res msm8974_mss = { .supply = "pll", .uA = 100000, }, - {} - }, - .fallback_proxy_supply = (struct qcom_mss_reg_res[]) { { .supply = "mx", .uV = 1050000, }, + {} + }, + .fallback_proxy_supply = (struct qcom_mss_reg_res[]) { { .supply = "cx", .uA = 100000, From patchwork Mon Jan 27 22:45:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 860296 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 EABBD1DE2BB; Mon, 27 Jan 2025 22:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018002; cv=none; b=jbILL+SGVwT3+qL7fFI4l8xonsW3E61S1Ro+2sjJXdq+uEr+8uxykxxSL+Er0WLDaP0mcvbP6nbZ03zItwP6ZDNoanYUqVKdREa2K+6XuwIm+zHY+uSLWyh5IaLEhcRs58HYJauYuC8VV2Kw5ZUCb+8XcXT7OWz+h5xeGakjYm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018002; c=relaxed/simple; bh=asbDMQ42SDs4b1srxiQIMMXY9QcxxqIiu1L0P2FyiPc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ciWj4wZ9TA3I+GzjzJz9Ju4IFiFGjUdUDlzGT7NELEH7plcdfhdHPGsOBNRpUJAW1euFvy50VVsQPxhggZtB7enUwG0DxY51geJ8AzAyK3kaEm8MyYYmFsscysTZ7Bs/jFq+E1kjuk8OMk0JyH8xVrBj+8KuBSclEh+S2ufLxbU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu; spf=pass smtp.mailfrom=lucaweiss.eu; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b=Jf6MElkT; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b="Jf6MElkT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017997; bh=asbDMQ42SDs4b1srxiQIMMXY9QcxxqIiu1L0P2FyiPc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Jf6MElkTHhrVNdFnyvpZcu8O0Cyaop0+fviS86apngeGwqFndn4g/llJh8dZIUMf9 wqxEM7Xug0k0cqikP4958Tat/UqAU5zNtjaPKJVJx1ekW3Hapn5BOqkzfXpmhUKyLb CkBUWj/Uoe5OnIKiA+VMVEQyHCZS2+/PBETD9hPg= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:39 +0100 Subject: [PATCH v3 07/13] ARM: dts: qcom: msm8226: Add node for TCSR halt regs Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250127-msm8226-modem-v3-7-67e968787eef@lucaweiss.eu> References: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> In-Reply-To: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephan Gerhold , Konrad Dybcio , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=916; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=eB48oZipWmKlZ7VBf2h0qGYYC/OPKdoJotfz6BVVjs0=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzElQbdLP01HB+GPPf4QGcjlrkPZKp2CVAv6 ZONt6cQG/2JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMxAAKCRBy2EO4nU3X VstlEACEonuHnK7OmOZ+n13M44YLp80uCNvwMu3H4w4Id+38iHDXyjz905rLbN3O3lcig0qolIC VROFvyi2CB4Gtz0r1tey165ESV0/xiBIE6uC+1/EgdiT5qppYZcfbO/ek4+p0fZYoWyWicqgHAd 2Ms8L6PNoSgoAFHwbI8C4ovIQh8u41l01tRK93tOj7FJHxWsq3ZTrUA1u9i5FErAL7w9F/miKzA Tj8vUzFVgt70axz+ldnYI1ytTFTqz400Wn1ZVSewmUF3JbpcYlYRN7Z+i9dcfXuMjfz2SNhrelZ WT63VBbdrXx03sMUshEsgnE+BaJLETvLpWYobLrp+lqVHV624hhmVeIK1E/vWpPcl1ofcjAOIAm eAHkb1vf4FHF3VBUoWDsTXcM5+UNb4rGioZzwIV8PCWuy0e+adRUeOGn0DvR2ZNx/Um3gNy/Edv wMNzJEW5Uo2xILo9Rzx3OFFX/KrlVWmwkNgLbIyTnftnJvBwgeWOKbUcZx5rA+jQLa5Yk+LuxHk OJUbis8t0tBVe7fl3ptttdX/PHe2NbcOuwDUYO6pBsUXTrfXyvy5ENwcGueEz7evOyZZ25Bn4bR ZHN3HsXT+za5EKsBtb9iNzaD3MalHx047o6SyK8vmdfsUfAmkll0yrdnrBZT4H2GwJHf3xh+o6u nvg0zmBBUI6kCiw== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD From: Matti Lehtimäki Add a syscon device node for the TCSR halt regs needed by modem and other remoteprocs. Signed-off-by: Matti Lehtimäki Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi index 64c8ac94f352e46dc4a18f902d2c30114ecd91d2..caaeeadf289f78d29403312738bbb714eaad74d2 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi @@ -851,6 +851,11 @@ tcsr_mutex: hwlock@fd484000 { #hwlock-cells = <1>; }; + tcsr_regs_1: syscon@fd485000 { + compatible = "qcom,tcsr-msm8226", "syscon"; + reg = <0xfd485000 0x1000>; + }; + tlmm: pinctrl@fd510000 { compatible = "qcom,msm8226-pinctrl"; reg = <0xfd510000 0x4000>; From patchwork Mon Jan 27 22:45:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 860295 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 EAB4F1DE2BA; Mon, 27 Jan 2025 22:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018003; cv=none; b=bodm8/Q7EI6FtlFb9AF4cmSjSJroM4W1SW6E7yGTmdLdUYYcYT75GfrKq5Rz6d2GvOJ2erRqvkmk7TBTFMzI9t8yRCmEuzZMVGYZF6lrf26NLUDoEgBfW9+8CRUV3LJoad6KmHhDcyfEwe6AJcsR4rCPyzUFr1MOmC/4yUnqWtI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018003; c=relaxed/simple; bh=c3OdZXsHQl8Hpj942CA3+f4fIQmaWKu9wILF5OxwWc8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rKiHHDN0HgPRfjCEUA9D8GsUjPQCm2n/qtdWtLubjPjHpZxaKicoTVknGZZWHjjuznOlHDNxeuVkOmbQXfQBPEgTg9Il6igkAY1UisuM2aLjPhiisHybGEv+J9vshm51i8nz0Dk/uBXGsgOEM6QzVxLCGE2Ddg91FbHOOBSEHoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu; spf=pass smtp.mailfrom=lucaweiss.eu; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b=pVDR+DhI; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b="pVDR+DhI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017998; bh=c3OdZXsHQl8Hpj942CA3+f4fIQmaWKu9wILF5OxwWc8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=pVDR+DhIatgq6Pw2w0H6796kOwPg6LICoCBWMLC1zhnGAdnJk+YYuuxpW7MrKJOE7 qtC/W4pMWqG5+TMv1rYt3ydkExcE6u/q0pDhd8kQkKK+LRJ8vo8PSNuM2f31uBLuw7 XfzhaqZ8PhH8pQenWYx8SBplS5ZkjJHfyK+kJdVk= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:40 +0100 Subject: [PATCH v3 08/13] ARM: dts: qcom: msm8226: Add smsm node Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250127-msm8226-modem-v3-8-67e968787eef@lucaweiss.eu> References: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> In-Reply-To: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephan Gerhold , Konrad Dybcio , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss , Stephan Gerhold X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1545; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=eoHX87/Yfz6a9HStDewruF7nDlvvxRzf55C1aXv2xuE=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzF1tqAQ8fKJpHx5o7eoXVPQBp7i+j51G7zo fsOuAvTwn6JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMxQAKCRBy2EO4nU3X VjgvD/4uo7Ya4Lf5BxLiEqfl/mESJIIWZjuRA/Xz0yorTCcWPRUHtnzhW5bvye557fN8MQFqJdK 9uvl+ubghWLrQcOK/nz/WsOGTqW9wIAF9BiSQqpVPdd7A46Tk9eO/0GESWRgpI4oOhiviECIpck MRgm2QvWo1vb9beNPIDAwD+KkOiZlz1tqnDvQ1NqyUUscEOk+XfP4ODS/io/52mBs4h6K2VNq+p JYRNcNOVoEh3ixcIcxV/G/G5sPVFwty0YQSh1GfKBHujP3cpaabw/LccQFBs/Apz41JNfhEcaw7 4iwdvMw+se+nbNLtOBFYIfNBLqg0OxtvUS5vaFIpc7M+ssTtlQ+8lZmzOT+L5H5Xaz7b+/iPgEx nZu1y4veZrI/2ST3eXxw1BQyiFHQeuAwWpKLLK22YfAmOKmbATeY/coeMauZvUjtyNj7bi4dz2R RTIM73JtUAXC1eoBfcrQF0liSdj8JliVYRlhM38l9B3W2Aw8jkw8/lzZ0gmqNbcgkM1rxVYIYyl ToSLpUJVqO54y/0mX5pV45cmeYP+G8I7ydAJ2muFp0oNE5bPeYq0ZBQkxbPTUKrhRywo/DNPezw uv+vY0Dh8OaAiCChDNzCuuNc0XeYbZvX71ofgHkJVWqcAlTM3IOFjo8uejXbfgJqCYSDvvrYWIL 0m/H7F5Y6EjMNqg== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD From: Matti Lehtimäki Add smsm node for remoteproc cores. Reviewed-by: Stephan Gerhold Signed-off-by: Matti Lehtimäki Co-developed-by: Luca Weiss Signed-off-by: Luca Weiss --- arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi index caaeeadf289f78d29403312738bbb714eaad74d2..7e0838af6c2d0dc26e0082471b70578bc627491d 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi @@ -253,6 +253,40 @@ adsp_smp2p_in: slave-kernel { }; }; + smsm { + compatible = "qcom,smsm"; + #address-cells = <1>; + #size-cells = <0>; + + mboxes = <0>, <&apcs 13>, <&apcs 9>, <&apcs 19>; + + apps_smsm: apps@0 { + reg = <0>; + #qcom,smem-state-cells = <1>; + }; + + modem_smsm: modem@1 { + reg = <1>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <2>; + }; + + adsp_smsm: adsp@2 { + reg = <2>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <2>; + }; + + wcnss_smsm: wcnss@7 { + reg = <7>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + soc: soc { compatible = "simple-bus"; #address-cells = <1>; From patchwork Mon Jan 27 22:45:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 860294 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 A3FC91DE3A5; Mon, 27 Jan 2025 22:46:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018003; cv=none; b=Tny+qMtaI2WVo69MiBvvwrIp2COYjwkXsj2TpfL0RcQSaXSqTszmLvuLALPWbfA79g4APj+u8iLpQ2rLh0B7UK3C0SZY+rEiUc7LD2kTLatgR0uEXDeRN6cTHWW5iFFPYL8GuBDtI/4d5vZqkbaPgK0lPcPwkroibRENTwa6chE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018003; c=relaxed/simple; bh=NCqds1WldAfIGunlSta42yh4OiRk62nu3F1nOpMOdC0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mW4tmg+iJEnBhQrUzKTpMNlWc8z9HM4mTQWZLdLPQNVsl8qLbJS+xFbtEnDyQuATaFVk12BcP6sAcN2QbxdxEm8+2Q5nojs3Zi0Wlq+h8VmyyeCqdlhmosNr5A4y5bA1iRIs3Qw0GpVN8wlF6yrGT+GfBHVRay/FBYvmXRMYSls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu; spf=pass smtp.mailfrom=lucaweiss.eu; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b=b+N7jvaT; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b="b+N7jvaT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017998; bh=NCqds1WldAfIGunlSta42yh4OiRk62nu3F1nOpMOdC0=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=b+N7jvaTtS/mUrFApvULaggmaWZ9otz7WYl7zHWEt8cGsSzP2zj9g0FhEYABC3wfb o5Q3PnxeHoTfQcKu7Vmlkpbpx60+2ZLVTo3xrOd6BlgGPb/n/8e9oJKWBCOymMIeC3 lPsWmHJzD2vNYC/Svyhl3g+Sq992iZHp3h+1vVmc= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:41 +0100 Subject: [PATCH v3 09/13] ARM: dts: qcom: msm8226: Add modem remoteproc node Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250127-msm8226-modem-v3-9-67e968787eef@lucaweiss.eu> References: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> In-Reply-To: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephan Gerhold , Konrad Dybcio , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5310; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=NCqds1WldAfIGunlSta42yh4OiRk62nu3F1nOpMOdC0=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzGquFAwn8lPYWdckyzhWrbd2k06M6icO5cW Blcux4M/SiJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMxgAKCRBy2EO4nU3X VicXEACChVwh7e36CemWgIS21UCfABF20/XbLtK16dIYfxtgSm2NSSiv7k1JR3MNCmV4pxodHDL EBfYgArrMui3PnOp8R2uWngUEBIcJZmXoVn4Xq11huFCjRKbDd0Q+ZIsI0lVqb5Wjf8S9XinNMB EOMyAvCXczMe2JmD5Ic86WHje/1YdQCx5BE+ydNK8x5dcPvcL8bfBu2YVd5ODBNwAMm8oa8ZA/w dwKuKyDLGBoS21wuRoOBPs/yODX8ifV5j0S+OvaFsl0pQBXQJ+fHCXIzECXf/MQj54RLy4FDfsH wSXaeQTpuuIKw3uRTiUzpPyNOiBFG43KWx5tpZtKZfeBFxMBgj//sEvtgF44WvoagRLJ6dfTse4 /mGI7paW4L/XttaHJutEYmjXbDfknTQmyjkPG+EefvWuhussa09N0v+5VqDNoPgfTaEHxbGND1c xeLk5m8gRNdE70NfwAqo4gD4ZvxBfGqjng0A3GutrHZ3hjpqWCmK3uof+bF0+paElfSFqfprmqk VJFEp5Lqh1NPuP0cFwNNkIsO01vSZ6sGzadEKB/ICOEeC/hnlW3Sj1wS41SNBQkmJjas2ey9FhR RyMkq8T3+fRoK1ZrnW+EPqBRDUMaprLIt+Q+r9cPuEuceuH7gF4oLotmk2/oXeBtVtUJURV0Mno NoHEH4qiV0QJlOw== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Add a node for the modem remoteproc found on MSM8226. Co-developed-by: Matti Lehtimäki Signed-off-by: Matti Lehtimäki Signed-off-by: Luca Weiss --- .../dts/qcom/qcom-apq8026-samsung-milletwifi.dts | 2 + .../qcom/qcom-msm8226-samsung-matisse-common.dtsi | 6 +- arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 82 ++++++++++++++++++++++ arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 2 + 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts index 7d519156d91d156d801c477711751aba66cc3224..a8543ca7b5569549418683b6be320784eba1768c 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts @@ -12,6 +12,8 @@ #include "pm8226.dtsi" /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; /delete-node/ &smem_region; / { 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 a15a44fc0181bf23e7531ecdc8978505ca48189d..fbd568c7d6b7415d240aa1a2329d07cf9135274c 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 @@ -8,6 +8,8 @@ #include "pm8226.dtsi" /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; /delete-node/ &smem_region; / { @@ -145,12 +147,12 @@ framebuffer@3200000 { no-map; }; - mpss@8400000 { + mpss_region: mpss@8400000 { reg = <0x08400000 0x1f00000>; no-map; }; - mba@a300000 { + mba_region: mba@a300000 { reg = <0x0a300000 0x100000>; no-map; }; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi index 7e0838af6c2d0dc26e0082471b70578bc627491d..55bb070dcf489064f5b14902da1acd2762232ef9 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi @@ -213,6 +213,18 @@ smem_region: smem@3000000 { no-map; }; + mpss_region: mpss@8000000 { + reg = <0x08000000 0x5100000>; + no-map; + status = "disabled"; + }; + + mba_region: mba@d100000 { + reg = <0x0d100000 0x100000>; + no-map; + status = "disabled"; + }; + adsp_region: adsp@dc00000 { reg = <0x0dc00000 0x1900000>; no-map; @@ -253,6 +265,31 @@ adsp_smp2p_in: slave-kernel { }; }; + smp2p-modem { + compatible = "qcom,smp2p"; + qcom,smem = <435>, <428>; + + interrupt-parent = <&intc>; + interrupts = ; + + mboxes = <&apcs 14>; + + qcom,local-pid = <0>; + qcom,remote-pid = <1>; + + modem_smp2p_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + modem_smp2p_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + smsm { compatible = "qcom,smsm"; #address-cells = <1>; @@ -879,6 +916,51 @@ spmi_bus: spmi@fc4cf000 { #interrupt-cells = <4>; }; + modem: remoteproc@fc880000 { + compatible = "qcom,msm8226-mss-pil"; + reg = <0xfc880000 0x100>, + <0xfc820000 0x020>; + reg-names = "qdsp6", "rmb"; + + interrupts-extended = <&intc GIC_SPI 24 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack"; + + clocks = <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>, + <&gcc GCC_MSS_CFG_AHB_CLK>, + <&gcc GCC_BOOT_ROM_AHB_CLK>, + <&xo_board>; + clock-names = "iface", "bus", "mem", "xo"; + + resets = <&gcc GCC_MSS_RESTART>; + reset-names = "mss_restart"; + + power-domains = <&rpmpd MSM8226_VDDCX>; + power-domain-names = "cx"; + + qcom,ext-bhs-reg = <&tcsr_regs_1 0x194>; + qcom,halt-regs = <&tcsr_regs_1 0x180 0x200 0x280>; + + qcom,smem-states = <&modem_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + memory-region = <&mba_region>, <&mpss_region>; + + status = "disabled"; + + smd-edge { + interrupts = ; + + mboxes = <&apcs 12>; + qcom,smd-edge = <0>; + + label = "modem"; + }; + }; + tcsr_mutex: hwlock@fd484000 { compatible = "qcom,msm8226-tcsr-mutex", "qcom,tcsr-mutex"; reg = <0xfd484000 0x1000>; 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 3037344eb24055071cc77c9cfce0f1d0f95de921..18396623a91dd4bf4b66f01c1d983c391722f3b5 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts @@ -9,6 +9,8 @@ #include "pm8226.dtsi" /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; /delete-node/ &smem_region; / { From patchwork Mon Jan 27 22:45:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 860293 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 8AAD31DE3DD; Mon, 27 Jan 2025 22:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018004; cv=none; b=O/a66sydGiUX2q53+6tXpa86TwDes9mAV32Ej2elNEAWOVUW58UwyhoB7rCilZ5pWqtwh7G1Nh6oKv4ooLJ/ExCH+Y3OPSPrDl1mQ82VgTJClEUHQj+h6Z0uBOI5XmZKw7Vcn7gBGkijB2MXGSp42AP8AH+kbnpt78H4J5o23Lg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018004; c=relaxed/simple; bh=pdaxfgjjHXzyoe6ybtvzaf87CMaY9p1zuRDSarIthKo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XpA6tRrkDvWTz87sAFg9WfkUiIn5bpvrUdpFx88w+PW3pjRbXSfNYUQkuN8xw06URFeTmvUcGPWrsFCx+q+EPRYrel6l9l7sixpXg+5IsU/geE0bOxONol8dpItvdSm+2o/OXvhvpDIdfJZ3kE+WwZQ+nIiJpQQh9DOUo52vtaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu; spf=pass smtp.mailfrom=lucaweiss.eu; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b=OUi6LzPC; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lucaweiss.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=lucaweiss.eu header.i=@lucaweiss.eu header.b="OUi6LzPC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017998; bh=pdaxfgjjHXzyoe6ybtvzaf87CMaY9p1zuRDSarIthKo=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=OUi6LzPCwoKJHMZ2yaWAMhi/AeIboYqn3gAPJYteYVT60DITPvcU6EEMd0TA8zdIM rGMLad3M21IyFqdyigrArjSd6VnHhHOZd9EE1StvU4exPkUijVkMi6kUuhazjkYVbs 7IGvanKbDJ8BWcdLalPP+mdHniImUUoKCWxN5fP8= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:43 +0100 Subject: [PATCH v3 11/13] ARM: dts: qcom: Introduce dtsi for LTE-capable MSM8926 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250127-msm8226-modem-v3-11-67e968787eef@lucaweiss.eu> References: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> In-Reply-To: <20250127-msm8226-modem-v3-0-67e968787eef@lucaweiss.eu> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephan Gerhold , Konrad Dybcio , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7889; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=pdaxfgjjHXzyoe6ybtvzaf87CMaY9p1zuRDSarIthKo=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzIZCoZuMCrhyFl6Lvl+qhlcm946OeCBbFhZ qFdlzgS5i2JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMyAAKCRBy2EO4nU3X VrabD/wL2lkA2ZjwT0X1w93daruEpQATQCwL1Z8mkex5G7S+ehUvzYmley/lj86OID69Xhuf1CI 3MXquB8g6+nVIj+TT/c9ZEr8jzBBnBSAXZZMRunhMx6ptRmlP+XJtaP3m9FvabXLIMNf/Kwg/G9 UN63QOf7RpPbdkTtKonFnhHOURpYSHDtuGW0hlui4KpAkmEsL7bHqx9BOBQ8+ekc0y17Ao1TUPZ mf8pD76lYDGoDeBB+wiB1EZH6CjFnpZxV++lT1uB8mlrvjP0ny015vRkIw+xmkwBtDzA5zxGyli us5ouQOQFLctje3lHPUIzTQUZK/f6ZgQmdO3cmIJBj81urKN2DXnr4i11H2o5PpcPV0DBfotCsl EGlHHk7noZr3vjKsSNEKCcTilb664zj0yQoCG1AYsbJmKKgS/mJLJ259TkCzMCWAFSNMkpJ0XEs u1mXhglQ6o+SAjeG0IorSMemazVIvhbpDfLT/2krLUm6b1SgeWHZjtIDlWcDCcvOoUzMZo63b7c 6url5nIOwaIHwthp4ZmDPAT08TJUlfh4cc8kEK3/QAmdGf252KuZIQKnPcrnzust6Mu10A6I39i Ra2MEzXNnCljxQr7lXKCwga2HdxpwG+r1QsiqZHYe+NlyfAZtB7XKdsKGq0FPNvILSPDUwgSYoc E59drhdHSSvc2UA== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD 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 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" / {