From patchwork Mon Jan 27 22:45:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13951809 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 C70351990B7; Mon, 27 Jan 2025 22:46:37 +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=1738017999; cv=none; b=ges4V8OugBEPIf6YX1TUxqWBgFvTTwKThjar1f1UT7zQUS9OQ8stp1KFoSHSGA4Ty++M9/07iVFAcSme4dTdiJVskTNX8L7/UEy3upLCJ3/aXPC+oDvJ6VfnQlZTePFIHt3ryLyeTb8u9SPUdiGey9eZKmMGvU2SJvjRL1D8xUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738017999; c=relaxed/simple; bh=3vxlekL2NwQk9PnikoW9frxyAG29LNSo8zkvrDcJwAc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sSutHbsR++RkvSPH/UWMWt3FImXsHkH4SeMaeSbKvIMqUOyD911JqShW0/y3SRKyVmmofeHAF+x7hhL2wle4hUXY2DZ/9bviJvSl3hSfWzzmSPQpZcsCofzKosyYoJhxgiIGg5smLKX/zEU8gskbp1ZQYwaDIRac2ZmP+K4e52g= 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=a1PXokrc; 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="a1PXokrc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017995; bh=3vxlekL2NwQk9PnikoW9frxyAG29LNSo8zkvrDcJwAc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=a1PXokrcsQXHUjr0hjGhVxWX7MmWFwnz4e6ky/6jGBZSUDqIE7oxIxNuDcG0kgK6Y v7JsckuU0CIwziCIIeq/fFQfX3WmEuTFF3upkOXUG2qqw8b9DQqvWax6PaDi6bkGqV HnT1OkdvoIVJk1Lu9eOGhk6Yk9jtAkwXn/gu88fU= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:33 +0100 Subject: [PATCH v3 01/13] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Support 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-1-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=2491; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=B88zuB3EiTSe4leTz3qIgobxf2MVkyWm8XcBBZJBjxw=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAy+59Qct4/WK4mu2K27IykEC7zQBjLOHTAmA u89Bf+w8rKJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMvgAKCRBy2EO4nU3X Vi8CD/4mXCIy1fqhfLfWKANE7M3x4rKvnks1u6+X6NHuloHYWWU4Bon695k2uR99sCAYJ1faZD7 loHs5WkCwrJ0SCksOeTSazaHmQKhEte9YcJvGkjB/3O4O59NMHOp7ZWmLEy4aBussRlCdJnOEm+ VFHSgPK2n5eon61BulcLnZ4+RQ/hj+rG4Z0qkYA04dwriXlakRBgJOFifazuSunF+2IphIJjXy+ mDPMjIANi9cKnQQufuzltHdasBNn2TqwYGifWUY2EX2t8h3otmddfo7VKZ8hvlXa0RTi9YW5Rix htXcfoibOEW5NnM/7B7J9S0eNLLcx7K7/UXJf7aKdfvmxnvbZ4r6Ehm1wLbrynl7goMLUFituyb c0/qSP3fAcRBL8kcUzMhMFNWVUGOVvOtsw6Jp2mT+Q6PgzR5wUyqN8hqH0BSmaaAUPnCH/9p5du WWV2l/p+Z9aF+053o67JLc51kZjlGW1LsqkLoE/EcoOqUUSa0QvrAFOrL/PHgYsEYKhjJ2jVWBl e3Pzn6d2RKooG6dskE5eCtiW7hAtMzNoP4uJaEL/paUmcVcjFGwrGJCx2oCF4GsSbCH98eE3Iu2 9+Z3uVb9BNPiqWuD5N6YcztxKUByEYlgTw8sCNObrDV/gdHhoLmHHY88Vk0PdfhTU3ewiqNClkY ypeQ5jLbMC/SaPg== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD From: Matti Lehtimäki Add support for platforms such as MSM8974 which have 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 | 34 +++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml index 588b010b2a9e53946a615219fc1468bc700deef8..c81364daa34b545e99261bf1f94ae2ad28d48ea7 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml @@ -70,16 +70,17 @@ 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) - description: MSS proxy power domain (control handed over after startup) (only valid for qcom,msm8953-mss-pil) - minItems: 2 + minItems: 1 power-domain-names: items: - const: cx - - const: mx + - const: mx # not valid for qcom,msm8974-mss-pil - const: mss # only valid for qcom,msm8953-mss-pil - minItems: 2 + minItems: 1 pll-supply: description: PLL proxy supply (control handed over after startup) @@ -207,13 +208,38 @@ allOf: required: - power-domains - power-domain-names - else: + + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8909-mss-pil + - qcom,msm8916-mss-pil + then: properties: power-domains: + minItems: 2 maxItems: 2 power-domain-names: + minItems: 2 maxItems: 2 + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8974-mss-pil + then: + properties: + power-domains: + maxItems: 1 + power-domain-names: + maxItems: 1 + required: + - mx-supply + - if: properties: compatible: 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: 13951810 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:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13951811 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 52A4F1DCB24; 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=1738018000; cv=none; b=jBfNHjoOpwsxvQEcGekTld12eXcYZ9Ef+8bp2j8iM0UTtuleguKz+dN4ER+c+KB/5c0Jry1yYWuZKJVPJz+jXCXoPc9IIuLpdXRgfkoEYhV6PBDSRVAMn5c4hSaPjlODvH6YvyWjY1BwTGZGHWS5W1aR2WU5QgKKPU5Bxz09bw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018000; c=relaxed/simple; bh=CKTBuBHD6xeKe48dpn+0pMpE6FM15R41axuY0NX3+XM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DhAwbahrAhwESHTw55pBS5SnJjBWTdpck358IanqtRc5SxeaP6Xdz0tX1aClBp0CepqeUMa0lELNd915vb/GBux/VTNr5MEOCmsM2jFmz+Zaxrt9VHBGINtI2ZaMrjzoKrpl5lXttuwNqbc3BouDGgaZmQ8+NXY/7g+kmpYUuX4= 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=Wu2aGJQj; 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="Wu2aGJQj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017996; bh=CKTBuBHD6xeKe48dpn+0pMpE6FM15R41axuY0NX3+XM=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Wu2aGJQjJ+jXNgr2q4we25kP4KI17TGMVsR5FJ4AH9JLSegoPSNNDmArDdsSUBNdL hruBZadW0C8e1HctdEMid9decIIEfylzS1jW0NkG2tnytf6uX0ImOl8aWMHiDDY5+x ntUJoZ/XJLV/23YVQP8g35oT+RYaCwVPJ3GKBywE= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:35 +0100 Subject: [PATCH v3 03/13] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Add 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-3-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=2408; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=CKTBuBHD6xeKe48dpn+0pMpE6FM15R41axuY0NX3+XM=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzA3cqIa5vq60VBxJ37MZVrFnm1yt5j/Vc8q +iAlVkHc/WJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMwAAKCRBy2EO4nU3X Vo66EADMSfMRf8CJFcr9SW+p//BaGmFbqCjPV5UZComI8N11usMbwc6s3Cr2ga7SApf0IWbvTbO FC1Tax5t/skHkG6VtTOdYWu5gQZHxDdSy4a44Jq+ItWLsccYhR/IRkpwceneTIqK3+LvpIrizoE 36an1lq2iIL4RnQy6TwN72bgB0mvB0T+wDFjzAKnCSIvqPoQiAh+oVrLxVwnKh3+ORS5ZBaWGuY bb0Sjbn1LL97ucsC6zvyJ7ER15+yQ7rZRW7qBt3mrr4gfchM/1RGXbf1cOd4/w/XSVx35ys4m7T TRE2o0rz5jvUTupne/8DdyCwsB8FQM0UvsTYV7j4losa3K/6ZvzBuVmVREWvTpREwVUdvNEu8Kj LlH1UZ0yQ8XRgHqmtTC/x9FU0WS6e1vwsG2wZUU49XxgIrQk2TSXn721JcqHQaG1zaTt1VYotSK rW/KZ7e2zrk8QB7wx+lM/7Lul00lRUj+kkVJ2W8JN4enAq1iPyLvD8h/0VSM1R5+vj3GHpCJ7d4 ShNniR5O8c9J727CrB90kLHAMss3yRoAdnuDVohs6vJl9e2Detr20aJTGno39+nIkxDa5kdf+ii WX1uQNXxh15LTTNjkHklzeczlM6OZy8Gf5kGafw9al/Z+QDmBZN71W9QyfmtTMu5HOfJM9gosY8 GD6vtxYyr2yaEag== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Compared to MSM8226 the LTE-capable MSM8926 requires mss-supply and doesn't require qcom,ext-bhs-reg. Signed-off-by: Luca Weiss Reviewed-by: Krzysztof Kozlowski --- .../devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml index 0a3e39c55ec3dcfc9a4d4ac28f5debd77dc49b99..c179b560572b2c1aa85521e4bd01d1857530f6c4 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml @@ -20,6 +20,7 @@ properties: - qcom,msm8226-mss-pil - qcom,msm8909-mss-pil - qcom,msm8916-mss-pil + - qcom,msm8926-mss-pil - qcom,msm8953-mss-pil - qcom,msm8974-mss-pil @@ -71,7 +72,8 @@ 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,msm8226-mss-pil or qcom,msm8974-mss-pil) + (not valid for qcom,msm8226-mss-pil, qcom,msm8926-mss-pil + and qcom,msm8974-mss-pil) - description: MSS proxy power domain (control handed over after startup) (only valid for qcom,msm8953-mss-pil) minItems: 1 @@ -79,7 +81,7 @@ properties: power-domain-names: items: - const: cx - - const: mx # not valid for qcom,msm8226-mss-pil or qcom,msm8974-mss-pil + - const: mx # not valid for qcom,msm8226-mss-pil, qcom-msm8926-mss-pil and qcom,msm8974-mss-pil - const: mss # only valid for qcom,msm8953-mss-pil minItems: 1 @@ -241,6 +243,7 @@ allOf: contains: enum: - qcom,msm8226-mss-pil + - qcom,msm8926-mss-pil - qcom,msm8974-mss-pil then: properties: @@ -265,7 +268,10 @@ allOf: - if: properties: compatible: - const: qcom,msm8974-mss-pil + contains: + enum: + - qcom,msm8926-mss-pil + - qcom,msm8974-mss-pil then: required: - mss-supply 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: 13951812 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 Reviewed-by: Stephan Gerhold --- 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:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13951815 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 EAC191DE2BD; 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=uS7DmN64f2D2odq2lljON4GwYP1WL24hbEnax36nFenyjsQp1kueMYDjb15qcTZlDnqKETp6U04aZdVQAOLkj/e/MLft6TyO5fdVGTHbEqf75KbMNtVsvn3ZsZFFYIJreeH6sTZPjXnc5vebWA1ZEiwQisX86f05vQnV8K6v1T0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018003; c=relaxed/simple; bh=8z+JuB535l7cRJzFcRHCvWml03C9Vi2YRxRm44GJLpw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oyWkBpTUqoQt386cJyEU4e3SVSzaB7aSgMRjW7AQmE9QcJhjqJofufSuMTSKL48+3H6PXh3rTtZA+FLTSrIQ1kZRWmFU+L8xfFPc7POWo+/XnT1xk65CsAu+5PXGdBYWVpZ3749shAQJgKYMKDJ3MnUzohF9lyzrmlk7nkvKgRY= 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=Id7U+SnB; 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="Id7U+SnB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017997; bh=8z+JuB535l7cRJzFcRHCvWml03C9Vi2YRxRm44GJLpw=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Id7U+SnB0ODrIKWJHQYPLqgXOyfRMuHdGiBJj5oNABOmJq6eNFLPMia9dSJ5A05b7 48EzXZb2j5D2OjNkiBhUhHSUAySnnmObnLz6+zc4NddiO6MEP32XK6kf0QJbsS9x9D EVzdBLCqtVJl/c8AtLxJyZXEQQIvLiaFOW6HYGoE= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:37 +0100 Subject: [PATCH v3 05/13] remoteproc: qcom_q6v5_mss: Add modem support on 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-5-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=8160; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=8z+JuB535l7cRJzFcRHCvWml03C9Vi2YRxRm44GJLpw=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzCRBdlHl4KmBtfNFXDLjCKHo+4eAF5X7LN8 imT1vIWeI6JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMwgAKCRBy2EO4nU3X VrxKD/0eMIpPTO7zM+MPQk/0+V+anbghyNImlqppRS1nRf98JD2Dt2N1q9/FBunIc4MSuIeoPO/ 7VJJ/dUyBEQbn0ELy/bmXZuHDibwj7BqZ2fL6znD+jab6LyvIum9zEnV1CIo3ajowaL6ASnHJXW oHG3xmkchmKwartKaQ11sMqn/oguP5cI8ft3+p9Tvv60J3/04/DI/EF6snY9sxw1XQIE1nTe7h3 Mf7A3aWusdQUYRjla30Zvx/HyMbST6jg0q6eqptlaMS2fEP+201TymmKSIsVzk/WcLseyOdPejj yF/LChffh4htR9qyNVVpn9wWXt3b+8YxJCHUs8Z0ubRTo69t3JpxlLmLC6h5rE4MLqX60VVr3vs JP/qNRBUVY/R2kHtzDzbFLs2x+MEej9Vd+MpLhtFdOjpYJ22uS1FmxIkop4foiYOORl/g1HN8Pz ytLn++2cF5+JnzetyUjxPQ7GdfRJpO8Ju/F3wvKRozMUQ0GnK549dasJ8mKrPmVyXDd0epGJsMW r89pLc7GQS74YbfeAClCKsEuAQEZ25WiTU1BMo1dTlZ35n81trhJq8VJ+5t/D8xqjnUXd3hKOZl VE4n9+cwpSJV2777EsohwPI0qMceGmXPRa08L3hHDZOAzGNcSInnqiKb/nHKFwPHRUVxR08lpPu ZjaV80SqpdhT1hw== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Add support for the external power block headswitch register needed by MSM8226 and some other qcom platforms. Co-developed-by: Matti Lehtimäki Signed-off-by: Matti Lehtimäki Signed-off-by: Luca Weiss --- drivers/remoteproc/qcom_q6v5_mss.c | 113 +++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 0e1b0934ceedd13d5790b798afc95d68a8314c75..32f35fe89416f167fe49be7ca02a24af842e0073 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -134,6 +134,11 @@ #define BOOT_FSM_TIMEOUT 10000 #define BHS_CHECK_MAX_LOOPS 200 +/* External power block headswitch */ +#define EXTERNAL_BHS_ON BIT(0) +#define EXTERNAL_BHS_STATUS BIT(4) +#define EXTERNAL_BHS_TIMEOUT_US 50 + struct reg_info { struct regulator *reg; int uV; @@ -161,6 +166,7 @@ struct rproc_hexagon_res { bool has_mba_logs; bool has_spare_reg; bool has_qaccept_regs; + bool has_ext_bhs_reg; bool has_ext_cntl_regs; bool has_vq6; }; @@ -180,6 +186,7 @@ struct q6v5 { u32 halt_nc; u32 halt_vq6; u32 conn_box; + u32 ext_bhs; u32 qaccept_mdm; u32 qaccept_cx; @@ -237,6 +244,7 @@ struct q6v5 { bool has_mba_logs; bool has_spare_reg; bool has_qaccept_regs; + bool has_ext_bhs_reg; bool has_ext_cntl_regs; bool has_vq6; u64 mpss_perm; @@ -246,6 +254,7 @@ struct q6v5 { }; enum { + MSS_MSM8226, MSS_MSM8909, MSS_MSM8916, MSS_MSM8953, @@ -1750,6 +1759,23 @@ static int q6v5_init_mem(struct q6v5 *qproc, struct platform_device *pdev) qproc->qaccept_axi = args.args[2]; } + if (qproc->has_ext_bhs_reg) { + ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node, + "qcom,ext-bhs-reg", + 1, 0, &args); + if (ret < 0) { + dev_err(&pdev->dev, "failed to parse ext-bhs-reg index 0\n"); + return -EINVAL; + } + + qproc->conn_map = syscon_node_to_regmap(args.np); + of_node_put(args.np); + if (IS_ERR(qproc->conn_map)) + return PTR_ERR(qproc->conn_map); + + qproc->ext_bhs = args.args[0]; + } + if (qproc->has_ext_cntl_regs) { ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node, "qcom,ext-regs", @@ -1871,6 +1897,34 @@ static void q6v5_pds_detach(struct q6v5 *qproc, struct device **pds, dev_pm_domain_detach(pds[i], false); } +static int q6v5_external_bhs_enable(struct q6v5 *qproc) +{ + u32 val; + int ret = 0; + + /* + * Enable external power block headswitch and wait for it to + * stabilize + */ + regmap_set_bits(qproc->conn_map, qproc->ext_bhs, EXTERNAL_BHS_ON); + + ret = regmap_read_poll_timeout(qproc->conn_map, qproc->ext_bhs, + val, val & EXTERNAL_BHS_STATUS, + 1, EXTERNAL_BHS_TIMEOUT_US); + + if (ret) { + dev_err(qproc->dev, "External BHS timed out\n"); + ret = -ETIMEDOUT; + } + + return ret; +} + +static void q6v5_external_bhs_disable(struct q6v5 *qproc) +{ + regmap_clear_bits(qproc->conn_map, qproc->ext_bhs, EXTERNAL_BHS_ON); +} + static int q6v5_init_reset(struct q6v5 *qproc) { qproc->mss_restart = devm_reset_control_get_exclusive(qproc->dev, @@ -2021,6 +2075,7 @@ static int q6v5_probe(struct platform_device *pdev) platform_set_drvdata(pdev, qproc); qproc->has_qaccept_regs = desc->has_qaccept_regs; + qproc->has_ext_bhs_reg = desc->has_ext_bhs_reg; qproc->has_ext_cntl_regs = desc->has_ext_cntl_regs; qproc->has_vq6 = desc->has_vq6; qproc->has_spare_reg = desc->has_spare_reg; @@ -2079,6 +2134,12 @@ static int q6v5_probe(struct platform_device *pdev) qproc->proxy_pd_count = ret; } + if (qproc->has_ext_bhs_reg) { + ret = q6v5_external_bhs_enable(qproc); + if (ret < 0) + goto detach_proxy_pds; + } + qproc->has_alt_reset = desc->has_alt_reset; ret = q6v5_init_reset(qproc); if (ret) @@ -2143,6 +2204,9 @@ static void q6v5_remove(struct platform_device *pdev) qcom_remove_smd_subdev(rproc, &qproc->smd_subdev); qcom_remove_glink_subdev(rproc, &qproc->glink_subdev); + if (qproc->has_ext_bhs_reg) + q6v5_external_bhs_disable(qproc); + q6v5_pds_detach(qproc, qproc->proxy_pds, qproc->proxy_pd_count); } @@ -2174,6 +2238,7 @@ static const struct rproc_hexagon_res sc7180_mss = { .has_mba_logs = true, .has_spare_reg = true, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_SC7180, @@ -2202,6 +2267,7 @@ static const struct rproc_hexagon_res sc7280_mss = { .has_mba_logs = true, .has_spare_reg = false, .has_qaccept_regs = true, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = true, .has_vq6 = true, .version = MSS_SC7280, @@ -2233,6 +2299,7 @@ static const struct rproc_hexagon_res sdm660_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_SDM660, @@ -2268,6 +2335,7 @@ static const struct rproc_hexagon_res sdm845_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_SDM845, @@ -2299,6 +2367,7 @@ static const struct rproc_hexagon_res msm8998_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_MSM8998, @@ -2337,6 +2406,7 @@ static const struct rproc_hexagon_res msm8996_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_MSM8996, @@ -2371,6 +2441,7 @@ static const struct rproc_hexagon_res msm8909_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_MSM8909, @@ -2416,6 +2487,7 @@ static const struct rproc_hexagon_res msm8916_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_MSM8916, @@ -2451,6 +2523,7 @@ static const struct rproc_hexagon_res msm8953_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_MSM8953, @@ -2504,13 +2577,53 @@ static const struct rproc_hexagon_res msm8974_mss = { .has_mba_logs = false, .has_spare_reg = false, .has_qaccept_regs = false, + .has_ext_bhs_reg = false, .has_ext_cntl_regs = false, .has_vq6 = false, .version = MSS_MSM8974, }; +static const struct rproc_hexagon_res msm8226_mss = { + .hexagon_mba_image = "mba.b00", + .proxy_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "pll", + .uA = 100000, + }, + { + .supply = "mx", + .uV = 1050000, + }, + {} + }, + .proxy_clk_names = (char*[]){ + "xo", + NULL + }, + .active_clk_names = (char*[]){ + "iface", + "bus", + "mem", + NULL + }, + .proxy_pd_names = (char*[]){ + "cx", + NULL + }, + .need_mem_protection = false, + .has_alt_reset = false, + .has_mba_logs = false, + .has_spare_reg = false, + .has_qaccept_regs = false, + .has_ext_bhs_reg = true, + .has_ext_cntl_regs = false, + .has_vq6 = false, + .version = MSS_MSM8226, +}; + static const struct of_device_id q6v5_of_match[] = { { .compatible = "qcom,q6v5-pil", .data = &msm8916_mss}, + { .compatible = "qcom,msm8226-mss-pil", .data = &msm8226_mss}, { .compatible = "qcom,msm8909-mss-pil", .data = &msm8909_mss}, { .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss}, { .compatible = "qcom,msm8953-mss-pil", .data = &msm8953_mss}, From patchwork Mon Jan 27 22:45:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13951813 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 907C71DD88F; 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=FVGIWbjkSFzv6sDd0HeN6da2bEpqNG2PWX5owYx7B7hvnxyRjDVeirIdURweVyCO55pTZYo5bRPRk5JBVZfCNt9X38yKTixOmnsVcWmu9qsqIdeA/8V7V+5O3G193fGBhYRTzpkTa0USM1+Op0n8oT1MCy8dPH8g/BoBwDll6pk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018002; c=relaxed/simple; bh=iDH8bJYGp5bK4xIZwe0+LJf90ZSZFmB7uJ36rweWBhI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MbdMtkwTxdoUuRbcwBbsYuEBEvFsJYcBPH37Mxt8ntrnZz/XB7rtaJy5huLXYqB8TUgT8SRW3FONPCT0dFhFRLRuKbBcTLgDa+KPI8uYFbfTApt5DDeiJlcrk0HzVyT9uUOfandptpCz8Amx/5IT4NZ6wOR5DIebnYroU/R9ZDI= 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=eqIVKu8W; 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="eqIVKu8W" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017997; bh=iDH8bJYGp5bK4xIZwe0+LJf90ZSZFmB7uJ36rweWBhI=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=eqIVKu8WppmuKXAj7CITGqv83doGmrz8ugqtDgoBglue4i+SXar4QZzoLI+sWXt3B DpyxT9N9seCpxaFnUEGGUoVwAmkOGVwgfXtLqc1nmwgzSSeL5CdTQhqfkxw3mtRf90 dwZub6n3W1939oQJHVfu1glpMBm4pc/uRSVF+fwE= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:38 +0100 Subject: [PATCH v3 06/13] remoteproc: qcom_q6v5_mss: Add modem support on 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-6-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=2369; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=iDH8bJYGp5bK4xIZwe0+LJf90ZSZFmB7uJ36rweWBhI=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzDGALGH9HS6xFqPeLY6r7NCeUu3SrPJzpIQ Qynw7ljKBSJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMwwAKCRBy2EO4nU3X VkgFD/4++GB2uabaKtVEEmpcUYxr2yrrgWRy5817GiYl7zdy91b0vqitXN7KpyMJqG7kcgAJn2R fSRdB0RIneDcE/jfys0gLPksQ+h9Ap4AiHQUjR3sX1neXZsfB/84ovCCP/hcm64by2hA+k3xxFZ UD9BG2fqQjslcjMXK53pdkcqj/Sie5qodpQKAOqDIUtErFNr+fcQcm+9889u1AJFfIWjkaxEryu E5I0WoR1xs6GyeQ0v2BO0nT2sdO4bqkMzdOU4rFlRdrfOZ1l/r6fhiTKl5kb+T+cRVJtaVmvhhl uoUejLGry5wo9Ax6s+54J42V8MNWzeNjB+RdPoSH4q6HQV0dkQeQ0S0bsl7C8bfhlncHSzGOian wBcF9uS7nIYDgAjzowy/BMla6CrRA6qi1BuyT0lddHp55NMpsXLnjgJYl7DCjf4DlUmLtSZ4u3Z hq5SAzYe6GU+FKbEEcLkid0nisSyh22R7lRJbczjK6F6uLwJL7y1RvZGBErorYU9J8ioQ0uXS2F QXxCoRh7tJQj59ZIopa+rMWTKeuBWdtzY1PNZSiUJXapvQmBbJjvKjwY6zIda7l6RDal7UMd1cN gzpWyuaMxHtPHeKa1slyRfqytaewTEhnw1ssAgwQm4PXlYjcYlL4sGV4juPHFfTvk9/yCw5oUHH msCVQ+cJEQobnbQ== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD While MSM8926 being 'just' an LTE-capable variant of MSM8226 it appears the modem setup has changed significantly, by requiring mss-supply and not using the ext-bhs-reg. Add a new compatible and new struct to support that. Signed-off-by: Luca Weiss Reviewed-by: Stephan Gerhold --- drivers/remoteproc/qcom_q6v5_mss.c | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 32f35fe89416f167fe49be7ca02a24af842e0073..cd7ea7bb345f558636f9414c43460b29b3be6f5c 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -257,6 +257,7 @@ enum { MSS_MSM8226, MSS_MSM8909, MSS_MSM8916, + MSS_MSM8926, MSS_MSM8953, MSS_MSM8974, MSS_MSM8996, @@ -2621,11 +2622,58 @@ static const struct rproc_hexagon_res msm8226_mss = { .version = MSS_MSM8226, }; +static const struct rproc_hexagon_res msm8926_mss = { + .hexagon_mba_image = "mba.b00", + .proxy_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "pll", + .uA = 100000, + }, + { + .supply = "mx", + .uV = 1050000, + }, + {} + }, + .active_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "mss", + .uV = 1050000, + .uA = 100000, + }, + {} + }, + .proxy_clk_names = (char*[]){ + "xo", + NULL + }, + .active_clk_names = (char*[]){ + "iface", + "bus", + "mem", + NULL + }, + .proxy_pd_names = (char*[]){ + "cx", + NULL + }, + .need_mem_protection = false, + .has_alt_reset = false, + .has_mba_logs = false, + .has_spare_reg = false, + .has_qaccept_regs = false, + .has_ext_bhs_reg = false, + .has_ext_cntl_regs = false, + .has_vq6 = false, + .version = MSS_MSM8926, +}; + static const struct of_device_id q6v5_of_match[] = { { .compatible = "qcom,q6v5-pil", .data = &msm8916_mss}, { .compatible = "qcom,msm8226-mss-pil", .data = &msm8226_mss}, { .compatible = "qcom,msm8909-mss-pil", .data = &msm8909_mss}, { .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss}, + { .compatible = "qcom,msm8926-mss-pil", .data = &msm8926_mss}, { .compatible = "qcom,msm8953-mss-pil", .data = &msm8953_mss}, { .compatible = "qcom,msm8974-mss-pil", .data = &msm8974_mss}, { .compatible = "qcom,msm8996-mss-pil", .data = &msm8996_mss}, 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: 13951814 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: 13951816 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: 13951818 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 Reviewed-by: Stephan Gerhold --- .../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:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13951817 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 A33101DE3A4; 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=gMxI/rFRYvhwX6swxDxuumT3yesdfO9DcynkJbmtD/XyGwMfIjWJcv+UhJBwoG2UxIKDzUHGmicGABD23Ni8+Xx10CGbAUz7/YjHtlpTMdCjC6/FF6YotD3IhlRz2ZTlmO9l0SV7ANwMqMw4VCESP9yVu520RRV8CP8uuJEPniM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018003; c=relaxed/simple; bh=6O44VzCK6ZQX9n11tItDrPeEP6WQi0aIao3attwQ2Rs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jp/VfXPnoyHOuitIeyVK+0sxAscvcitc8vS9qj56HkF+TcQSVTr2jNjUXc/z5scgFhZyp2/wV84jrW5U9MgS1gMBl3K4IWdZp/4lQGUNt0SxYVyirr+JgzVVDMscF70i22FwTG/eoEQcVb1i7TmB4/ASR7HzW0zgAuTHGJLyFfI= 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=B6dGu+Y6; 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="B6dGu+Y6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017998; bh=6O44VzCK6ZQX9n11tItDrPeEP6WQi0aIao3attwQ2Rs=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=B6dGu+Y6WFuUQva/XLayyXfBGrCtId2AeO+0ofs0wQLTrK36t+vzS1dgIa0vsNt6+ 3vVSIYW2aAcYIm7vSxfVxcgfnPSuJ0tvN5UhI67DEbcQHdQoJ9iljBvLlBe93Av3kQ r/rY85q/2j33MYxT/hKgbqCHOKr5hxaKtjhrz4p4= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:42 +0100 Subject: [PATCH v3 10/13] ARM: dts: qcom: msm8226: Add BAM DMUX Ethernet/IP device 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-10-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=1651; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=6O44VzCK6ZQX9n11tItDrPeEP6WQi0aIao3attwQ2Rs=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzH5EVYJppFU8n3K6xsRCc5AYn88vYgo1hZC XW+7NttcFiJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMxwAKCRBy2EO4nU3X Vv/vEAClQKp7+VOWuVfC1JBa8P657fjfduE43OC8JZnXw/nia/tp7Q7RFmuDQAVbqOYqgKwXTTp afQGMt1eRSVS6a2d7br7fg1SZtkKjdu70utsksfYcr+8h1xzIQ4CEuqFkoMKYFGzd/T0FVgVne5 ypMwYjaByVc3y/gdc0l9sWoZHGy5swpK+O6OqKH60zW+QKYeG0bAcUraTinGj411vrg59V/XQ3B E+eYs2lXllnsfrhhf39sJ3OiiPAEoEJN8Ur+zz6s9l/jCeAgirwJLNVf/v8a1uikjaVGY1oIASQ 6IBOy7aC1J/7WL/rAvRIl/iHjKWWNQf2rUOi0IlzHr0Qeq3Rww8zddIEmCSrcHmBUqA85VAd6DD Dw+HiGPPY7GpKbkptcXni/wglp+LDWm7HEB2w4NJD3JRCdelYtdzocBTNTOAnB0tW8910oKSa8c cYZdBzSqFOBlIVcUEdv13SfN7CW3CM5E+JSLnv9B1Usro8E5E63yYdF2mpbdF8CEZhjhG9cUaYL qdkj8ZNwqS9a7NA7857m6o6/tU6l+rBmmPp/rRJNyZKHsMYV57IHs/xz8rwcSpRfFXajXPwOjxv nU9TYT9+aIY1UMuTQzBLOUsRPja4fCkXm9TQgMo2pTxmPvbeTHGrts7M8/i11EuV0wentOTdACj 9bYOK8tpy8d3t5A== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD BAM DMUX is used as the network interface to the modem. Reviewed-by: Stephan Gerhold Signed-off-by: Luca Weiss --- arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi index 55bb070dcf489064f5b14902da1acd2762232ef9..1091eb13576c1cce1821a9200d4c344387851583 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi @@ -916,6 +916,18 @@ spmi_bus: spmi@fc4cf000 { #interrupt-cells = <4>; }; + bam_dmux_dma: dma-controller@fc834000 { + compatible = "qcom,bam-v1.4.0"; + reg = <0xfc834000 0x7000>; + interrupts = ; + #dma-cells = <1>; + qcom,ee = <0>; + + num-channels = <6>; + qcom,num-ees = <1>; + qcom,powered-remotely; + }; + modem: remoteproc@fc880000 { compatible = "qcom,msm8226-mss-pil"; reg = <0xfc880000 0x100>, @@ -951,6 +963,20 @@ modem: remoteproc@fc880000 { status = "disabled"; + bam_dmux: bam-dmux { + compatible = "qcom,bam-dmux"; + + interrupt-parent = <&modem_smsm>; + interrupts = <1 IRQ_TYPE_EDGE_BOTH>, <11 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "pc", "pc-ack"; + + qcom,smem-states = <&apps_smsm 1>, <&apps_smsm 11>; + qcom,smem-state-names = "pc", "pc-ack"; + + dmas = <&bam_dmux_dma 4>, <&bam_dmux_dma 5>; + dma-names = "tx", "rx"; + }; + smd-edge { interrupts = ; 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: 13951820 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 Reviewed-by: Stephan Gerhold Reviewed-by: Konrad Dybcio --- 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" / { From patchwork Mon Jan 27 22:45:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13951819 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 8AB8C1DE3DE; 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=tD8b8JYJAXyZWif1b1CPAFUgQyBZd5JsIXYzNuUPGYJUHGfA58IxwHgCiXcEYccpCL8LVRiNcli1KT0LUdbZh96VIS2i3ynC6DwmRf45dW2m3CuAzAAwyqqBSX0naw+5tkTOiZfHIZqj0J83GH7afQYtSovJrXALZlY7eSFokHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018004; c=relaxed/simple; bh=06UuhUdOb7H0JX3y/VpolH3SD9Ck90DkDCHJlIZg1+0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AH9o9LbGGttS/NUL3hE64BbkJQb7YuAH5YEZTDSb4uRwk3PBB835EB4LkFmNGGBGozk29cujNALDGVZu8U0LV+DYAgCUcJllMvzCCWO09zegOshe4kaxA6IC7WDYZow5fwxRtA6FxhRYeH1lm2HBjH8LtF1UX0MvWq4jlB44Azo= 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=1dwka2Rm; 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="1dwka2Rm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017999; bh=06UuhUdOb7H0JX3y/VpolH3SD9Ck90DkDCHJlIZg1+0=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=1dwka2RmxeN1a8AW7OcK7uO2Ay6Z8760h0tbpki93cATfQrm2QCcUSth2sVkx7zDA kKMXThd8v03f5HUrkhTD3DVmTZOQ2GKq6EEnM2b504pODczmjj6AH+e8dJ37MjN/GR w5BSdLqr7/2aAT1WrUQMywcyk+Uwed5AfCsAFqcg= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:44 +0100 Subject: [PATCH v3 12/13] ARM: dts: qcom: msm8926-htc-memul: Enable modem 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-12-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=891; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=06UuhUdOb7H0JX3y/VpolH3SD9Ck90DkDCHJlIZg1+0=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzJLSXgzfCt9SzhkrTRTIgnQIboW8e8oJacZ QdeMhoZJCaJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMyQAKCRBy2EO4nU3X VjsFEADCtQzoFdclASAJORA3ycPnVa878pKs9sqKYnPAnyfMENz0Yf+ldemQVAn1rx30fDgn2fd LueiJoeBLTKFHi9+Z2xzA8ErhhFNmimGPZZusQMH1lh26rOSvrXKk+YVNWg1TZ4eHDmwvhALVnu NmXnowRQ9AKlU1HBFrL8uIRA8h0KI22NS/DfRYHzlhiUCQ3RYxTmDDH4nHol9/fA0uolLfSQW3A I2wy3XJsMUPpRPAXwZsYuV7twKT4q4W81gpl1YhTuxY2/3Y9gaT3uY2aK6sWZ6OwTZtgn/DytwC /vGV6PVWwx5bzYYA4c5gRY+saYoWM03M1iHOOaQHt+Va1IvYbAifCRdx2wi3ipZXg+imCO/YOUo HMax4ixplqB02hU7ZsB5t9byddwLchWBX7nKAqY5Xt5OeJooTp6XtU7EX97CcIPZlCkYqQrgNod ZH4ZgJT7GArQObLchvZMmfM3yfAakYOPhheL3aPqSFDGGwNZQeAb17lb17UXWPUdSFEnYL48Hgw 9/Wq+UEvwXusu3K/1fxEJ6VzLvR8+IqxbxEu40LYjrEHz04H5CMpMLzWSp1731z5CpiyRu42j5k XZwdoLTKzMDhBLqMdXUbs7jjyXQvLvZqTxsBpryGd7Ale1QGHTBmgGNg3/v7ain8+3yqbYcH2vy FWnb4hCyAuODEvg== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Enable the modem found on the MSM8926 HTC One Mini 2. Signed-off-by: Luca Weiss Reviewed-by: Stephan Gerhold --- arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 d6eaa82cee4daf6a1386902f537f1351811d4a06..cb571aa13c11598182dc020f064fe8268bcc061f 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts @@ -195,6 +195,16 @@ &blsp1_i2c6 { /* TPS61310 Flash/Torch @ 33 */ }; +&modem { + mx-supply = <&pm8226_l3>; + pll-supply = <&pm8226_l8>; + mss-supply = <&pm8226_s5>; + + firmware-name = "qcom/msm8926/memul/mba.b00", "qcom/msm8926/memul/modem.mdt"; + + status = "okay"; +}; + &pm8226_vib { status = "okay"; }; From patchwork Mon Jan 27 22:45:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13951821 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 61DB31DFD89; Mon, 27 Jan 2025 22:46:43 +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=1738018006; cv=none; b=ssbTtn5mNJw+BqnduHFHhK4/kYezhRwaD8Vfe4ifse7YwQHXbHxofeD3+ngJBhYalCVkwpEGLYWrCmkfvrksT9Llenujc+gWJLHRP0ZZO/+wkWQ7eHfggRDuZnRpUhYz/CTmg0ZQckUnR5euH07RRZpUn3ecndpVj5Lnaf3A5UU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738018006; c=relaxed/simple; bh=mE3WxwSPnjxQoKLiFGLPQWGmaOQeOmzENxg/qdhMBSY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hXJ+s56eIYJmB9Ye4E8x/oDSnWFeSP87C3w/aNRS4a9Ij0euCRStOM1VmWmamssPZejbVRcUNeXRWmV2rfqH3Xov2Upe6himkL0mKLEWHCXQltXErP4IIQL97ZdCHlQ4ZI43LR/bX1RhL3XhR36JEs6W0x+XhsjxgV5iGJ4DNTk= 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=elp8XQ6Y; 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="elp8XQ6Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1738017999; bh=mE3WxwSPnjxQoKLiFGLPQWGmaOQeOmzENxg/qdhMBSY=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=elp8XQ6YPrAK8OtHqOjPR3Z2wovcRsEvjy294brNbAseqPwMdhQYpsxRG5n+1rtx+ 7guJZ9yc2yM4uSYUWM09ipieHjZ+NmBkFfJ3jlJ9VCcfgPqPhQg4MXDk8F5eBE7wQL NJdn6BKzqSEWl2pUlIM/UpcDjs7aEERu4uuhQ/Dk= From: Luca Weiss Date: Mon, 27 Jan 2025 23:45:45 +0100 Subject: [PATCH v3 13/13] ARM: dts: qcom: msm8226-samsung-matisse-common: Enable modem 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-13-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=1665; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=p2uZKUC/cC98/Emuc0q/l0zqi6X3Z3jBScIikxvDilk=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBnmAzKNlbaD0ZX5QiUDcIYnGuLuMVE3gatnoYnd 6I5XwrlcF+JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ5gMygAKCRBy2EO4nU3X VoTyD/9uQ0kSlsnJs99087Xs5np1NycVcUZRUyyE3DhAkUFUy4KKAYkYFqBTkpC/trMWSW8L2lG uYKrmPvXiQQ8TzdpDzIolkotGIgw/RmHzvvvOpnxWU1GYguVUKkGIHppLQ4WZL9s78vATw/OHdY 5cC57nkMm5IzVpqi7ouSDxcknv4dUmJlujc/KzKaWuD2HPvSFyMWhPkDX2sPjkWmbdDOlnubCZS ve2dJUeeOZTAe9GKQupO5tMvbrd129GSFwieYvzc13k/D9/s874f+NUUPJdhgb9AOI12bzErB3N ouql9nmFFbYqLQC8rQiZq654WRC2UCaAcKHuKbUTFYCVbaNwAiFVjbvdxbCRYTCNzrbosPOd975 Eadk/EnqgQe/Rg1zEU95S3wRa9otB8TPE6iuXOHYcbDmTuGbTzGFtRkgMhdXbaoxcu6AWlHpuSe mM0qPpSZJon4XZOZ7Lg8nSUZ2A+lf2qlwcK1vR4X910EsAxNB/kGjEUbo7w/lM8Vc1u8aJxsNAP mtYDtw+n+UfFhB2JuAvoEczk8SivGoR1oUX9LxOa226tnT1VjWeNWZgCo/U2JN+XB/IvH64JBIS 4g5Rn+S2iIKunsCpf80ZMpKAqR2JuBME/OEHzN6M3BIBfij3QxIrXsG/O8HphUse7Hdv+InDW5y gsggzCvs9vM+pHQ== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD From: Matti Lehtimäki Enable modem remoteproc on samsung,matisse-wifi & matisselte. The mattisselte - being msm8926 - requires an extra mss-supply, so add that as well. Signed-off-by: Matti Lehtimäki Signed-off-by: Luca Weiss Reviewed-by: Stephan Gerhold --- arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi | 7 +++++++ arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts | 4 ++++ 2 files changed, 11 insertions(+) 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 0a3147656f36ca2616e0e3cc7c1dd808b55f3a88..f1544a7e8369c329360e235c48291a5d4c261fdc 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 @@ -229,6 +229,13 @@ &blsp1_uart3 { status = "okay"; }; +&modem { + mx-supply = <&pm8226_l3>; + pll-supply = <&pm8226_l8>; + + status = "okay"; +}; + &rpm_requests { regulators { compatible = "qcom,rpm-pm8226-regulators"; 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 772827cad972ad4ff032cfb9310568c5d2f0170f..73e19176eb97af569d99580c6b28fb2e0ec7f1b3 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts @@ -28,6 +28,10 @@ reg_tsp_3p3v: regulator-tsp-3p3v { }; }; +&modem { + mss-supply = <&pm8226_s5>; +}; + &tlmm { tsp_en1_default_state: tsp-en1-default-state { pins = "gpio32";