From patchwork Mon Feb 17 22:05:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978703 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 A30C21A83F5; Mon, 17 Feb 2025 22:05:56 +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=1739829958; cv=none; b=sQhQlkEdW79UZCeaJcA/t5bgr21NiAg1s90ZbZutzsOwBXV1kZREzWq8wK1kaNbnhjvppsBx+t4aWggyaIgCqTtVw4/BftDKlxT+WLednr/xvR+uvgnlYab36JAHOiJ/0JB1a6fB50Vieqh4OkENSrETCC3ZcxtmtSfJYPMMS7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829958; c=relaxed/simple; bh=3vxlekL2NwQk9PnikoW9frxyAG29LNSo8zkvrDcJwAc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ljxso6jOrmcEgNvZ9da3lo/N1GcAO0rPPgANc2DQ1mj2xtk4Q295/ji6933e0edn2VnBC9Y1kowJYm97M5+InCs3gs5K62q4MXlQoCGrN7GGeEwhgxBpSZhVEml6yzBOLCSFzPDPeQyfqC+8bL6ZGp58/c876PmCNRdyrQyLnMM= 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=JKnSW5Ye; 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="JKnSW5Ye" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829948; bh=3vxlekL2NwQk9PnikoW9frxyAG29LNSo8zkvrDcJwAc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=JKnSW5Ye5n0m422Pb7oOUUC8pZkcdo6tnUiMQsW/I8skD74hHWZlR2LyZEjLUG+LL 9oVB8IT9MeFb5fBxG53uO4YCVvYeE3HLHKyVuewIjfHe6XpgV8BfEZNNQhPe+WhLtG qc0Mmkv14ui/fzOli90X5yj2sLhwl0+qKb6k7wJc= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:15 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-1-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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/ZANAwAIAXLYQ7idTddWAcsmYgBns7KvUqPkYQB5OMHRYEXaA762ULuVwMahn/bdq AuGVs3hvWiJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OyrwAKCRBy2EO4nU3X VjztEACWDfLIvEMH+V29/spkxmNowVcrPtDCyj0DnUjdLsjSmaw0wRx+/bZQ6I+f/U8cFatXAEZ nKlfdSb7OayUnKjiZi+06N85AZB2phhqaErM6GVkWh5IJbuZnBR/ayOXZrGFBcND4pIunNoSHww QM0yY8iYaXwHQj+j2M48kavZGjITjO+EoT161VXhtEaxMxbrpfK/ZRht27GDY6rN+dqsl7JC9ze H9gVwAhTV6zJw9nPopJqSd2xBS+qWTIC92XHteDBIs4EuVtoxpOlAAckZGusqr2bfEwTHPgLq11 scGasvGMImn056CI28hUdJykOyz2k+aUYIA/mdXYYmlC2q7Hqcqjhps0PPCBla2X8dyje2ts5XF AlDQ/Kd/05LD9wbObGnPR8SeXa0Yz3WCuG+NryeHtANpaEi48RozYndyH0hWt3w2kFtNkRFCt+1 ZXnxzCrVoV3Pv3CDyCx2Dy8VcoXNCwVC+cU0oaWdcD8YvH60rj1i3P3+LsYzyYUaL3fsZOsHvTP vacVbnMEOzeMApQZLHEnxfmHUcnhNN4hNRO9wD/3+AcizYBcS+NMqXeBTC7GycGpTjX/YLfMLf1 FRsSaXu9IxnMxNahJcRjDzrfYBDc4rRAv1gs98omSgjiXrI3kgeQooeBXmyp7IE/L6KYG9kFN6+ udrxA6sR6S9CBxA== 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 Feb 17 22:05:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978702 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 A305F1A83F4; Mon, 17 Feb 2025 22:05:56 +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=1739829958; cv=none; b=RwbKyBUZQHyuJwX1diqoHc+31B6uu40UO0MCnSU0I6eJxvPJqPx5h6ikvriKiB6eeUwtYN74wpYdB96awHYbBlJgFWaVBOpO5kd2eSNaNlSokD3vl9VQnVzJEN1crsgY75UpW6T/5P0ezPC6VCE6rZmduEhRslRP102F0QkFyz8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829958; c=relaxed/simple; bh=KM6RJ3fNafu0TIY7cIBZDDJ6AdV0OzMiHaeG4NSr7Nk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JwNv4oOMhWKBNCQSfxv5iOHAEmEB5d9Hw4pfvJ7cQgRKBQ1NJGmv7gZWCAZA2p65qitQaJt3BCP9poIMmZdYsqgc/lUkyHy31tQ7QsDgdYMbWYtEg71KnqAKcucYzb5SNZ3VCoqfNavcS0t4De6vdIV7XPU3LuSPY3fzrN+31Hc= 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=UBO6j8wu; 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="UBO6j8wu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829948; bh=KM6RJ3fNafu0TIY7cIBZDDJ6AdV0OzMiHaeG4NSr7Nk=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=UBO6j8wu3MXiG4bj+FMQfDQ6gisNVxZPXfeSJj0P4RnsGA0qfYSw4ysk3x+vSMl1H XlfrP95YrDuB38GytTjaLv0Hx2yrXVNpUiKm1iNtMsOW857Qy1wCEcjek9xtY5d3QU IloPF1UVLflzzP+Jg3BvyyTIGWdPbMQkUAnpuFMg= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:16 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-2-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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/ZANAwAIAXLYQ7idTddWAcsmYgBns7KwnGz2F99BxIg4tDY+j3yTQ2j19Bu/aiJvT NRluNsHxrGJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OysAAKCRBy2EO4nU3X VmajEADHMnBT88CzWp8SYFNIs+WaivAKGNW4D70e/dKgE4aYdx8bykKi2NIZ25B4K5UoEwZ1bDn O8My2xHAMXJEPq++VpeNAnxYUDmPt24Xix6Gkup1ENGEy39v7zaCFQiY+W0o5diFT6AA8KmWj3t 3HFPvUHs0RY1Er8VbF2c1leR14y0frEBPRJXXoghCQ3/gTPARGINuiIToapirUQ0Bpj4l5LoaYG Nr9w0blEVaOyJytpBP9oeZASsDopX1EFdABbIUXJsx4jXr3M6airCYadd3MguF2SNMTEM9qAEj/ AkFGIoTKiJKlMHaazkcW60OEVf1ZL7IB5vhGtI8FcaITE6tVMrivf8s+bhiRk84B/sg425lsfMl KDG79fVlkN2aV99HkE3USklDfGC3+shUHR7WAt6VQYG41RKzBiTCkDUgN4GDuqaeH2oNt6tWNzw SJFjEWvoWO/s8wmuPaW8W0HhMK5klwt3vyrK8QdhlGT1hz9QEhIPCOGPybQJgm4xeQXh3IGDIBC t8BMtC0R7wbFpzDehFnBLe6yZd/davGPq/o/yM0w5tA+xGrpTnjZZaOmrVsh4ewGKw+EEiQ4k8+ jOeONVB3DEnz8y3tj5kBGhl2TcXPn8t6VtyLwz3J7grxOXfKAkS/y9MpE9t7ts9QmOYoElXKyZn KdDBniAXAaFNjIA== 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 Feb 17 22:05:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978701 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 A30071A5BA7; Mon, 17 Feb 2025 22:05:56 +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=1739829958; cv=none; b=J0Xi1rqOcRK4cUvNgEHALOMDjXGXEyHtc9XNfBoeCv1aJR3kldGSO6l+616g7i/QDa6O34pSmv6dCevag5PMSPRWygGnPvY5uY6XbxNQyO8VFNhF3rWE1Nec+LnNJX3RExT3bX7K6vob72erGLihDHrYjA6TqHZVUUrQR4wggeQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829958; c=relaxed/simple; bh=iEhQRD3Keoeoouk9DWfMQfOJfESRFe9YF/R0gxoyNW8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rQM3dm0Ez8lQzGSN4isuaNteUP5+bmliylVKNAIrh3ENmmk6n6rWfILhm4hLOI63b6Icr1dDG6QrV+kukK8F8duRHsRIrLC6GHC3gCT5f2iG98cCiKCOacL4WDLESCkUHvEeT6KOaWRqcqHfu/kn6T1ugdrBqbAGa2I2WrzCZHA= 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=gxxYgQO6; 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="gxxYgQO6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829949; bh=iEhQRD3Keoeoouk9DWfMQfOJfESRFe9YF/R0gxoyNW8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=gxxYgQO6um3+XKzhor97Ikd7DDlNzVfUiis2bgxQHPijjo4qdQAZBB+W91ncMnQKJ +5eB5kkC7CJU7GuOP48tI80ikzB6jIA8suOhoQW+rtHfxbWHDhqwS65VAX9k/N9Dz/ /OM/oClWxdyfns3TEtpE4dZ0UL/cka0Twz/Bc3ng= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:17 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-3-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=2475; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=iEhQRD3Keoeoouk9DWfMQfOJfESRFe9YF/R0gxoyNW8=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7Kx/peYKLZJ5ho16oMmSW2WyVmeDNzYDCLf9 FG1rOwNr/uJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OysQAKCRBy2EO4nU3X VrybEACfyRe2GsWOu1/2BtwQnISjxdRuWVLe3em3TjRqQFhzQLnPvYBijgFuN+JjIDyyPq5X2gL wYzjx546fUhb/B7EeX1yL8mSpQVbAhg2yiTvxGkBNEHJQA3s7CCm3+vUS/ib4CBticEFaqNhpWJ 8KulC5Eo6fqY6nVScEPGVl2T+SpDxtAzWvS/MlN3pUWoWR1kiWRFacZrQrA/+tXY/kI5Hb9Z7BF rw/WXyA+H0BHvd+uwfktSTDsyhgk0oG1oV8S2IQI65etHJWALJM1QY+w76wzUQheapcqOsn4Zfv vu67V5UkgMS/FmQsddhE5OaU857e+uEPuaMuuDVOucqOR2Z39n3JKHD3ASmDETU25uXN+DEslcr 3T+kcg2ZtLnhFP5nndvDHMWHckrCpZ+pzaAFuLUXdMhOeYToTAVcORXkZjYDxgQyQTEqJYAjj9k KchyItl5y3atKldYNw5aK/Jah8YfAwrvQPrZqzJ0r0s0rL/bfDXz0dc4V0tjjjAgryG0g0bZ+KH ZEbqnbjVkAKkltls8fKFJ+RnWIvGjvlQRVC0wyYi9SbFFI0HUx84aNpcCwQV8hsN3vk/6relIw+ wkpa5U57pEhSTah8ZfQNpznTL9ZkL17SAfuui1Fo0S0bDF/q3dmeJaptx35u8NIDJ5dXna1lxwK tm3kWivIKzBmG0A== 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. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Luca Weiss --- .../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 Feb 17 22:05:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978704 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 A59DA1A8402; Mon, 17 Feb 2025 22:05:56 +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=1739829959; cv=none; b=P08gFfnyN5czKjPdu2q6tDuNVYNaDGL3mQkfiIgdL7B4/RMTprm54+j9XuBgk5T57EiXC3ddx2eUc2SfRaaRltUjy9xEgi+pXOI5FHJ/JQRWZN5pJyFmbPfndnvh117JXoD9WUnRUkfpbXwVxlmCfwrsOv7Nzp4N0zdK8s7v6Jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829959; c=relaxed/simple; bh=nD2pzDV8BppoM+IKRng7alJagSMAro8jZUFi3iMEfnc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aH31k70+/C61yOjePCqXUk+Qb682FJn8be0kLtQ7hZG/JXKwJ1g/AiaesEQVXN2hvq7ecr8eL1KggoZCKBT901IAV3+P+7mqwL1/CVOzShNPRcObuNPwRZMxxrwt4/2PMkttPYmGqXod2PSYsIVNivLLB/zusqEqqaMdfdVY+HU= 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=OexV+Luz; 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="OexV+Luz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829949; bh=nD2pzDV8BppoM+IKRng7alJagSMAro8jZUFi3iMEfnc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=OexV+Luzlk7RruMPginpkJGSUBjN0fAtJUHZ6fbbsnF9nE5hYzZAiFE4wgnzqcSBe 7tcURiJ+NCXoElOMMLBAccXgPJHt6fpf8iTHWsArZOd07f/AjoyjNMgv6rcu7JLX1X B1XPYY95umFzSjkJfjyTOoEtITj1IKKdo9N8kil4= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:18 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-4-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=2347; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=nD2pzDV8BppoM+IKRng7alJagSMAro8jZUFi3iMEfnc=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7KykC+cHZrMdhD5k2PvGPFLk6vqQrVEkG6Hk C9F4OCeq4qJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OysgAKCRBy2EO4nU3X VnuLEACVTQvPW5uzIMpYPU9paimi9NpV2t9a91hoSEbPTogvi17QmsrY7lGqgADT/hwo0O9v960 /EynDgJl/bgE9PbiBSKlgYQsyERdEkc8T14TD6PG8iqBaeKDJl+VftQ9M6M0exuh86F2NHFWhW9 4z030dIsFHypV3iFPCiigc20NB0syUezD8sxNigs0ok4S4jtVvLbx0D0oVJIrBhUUdC44kYe8EZ vOqDMVdH0cE/sTOKomkP7ZLbE3eNDOPFhJ6cNkJpXuN6mkTCjqTOsbNJMU4O5GACZ689L6RoLs7 ChHHq9aCk6ko3SEePzj+yqzX1GoLB/RkhZa2iqsf4FB9YSeb9ho5MtTMAYbpVzpyiZDBcHZUFHk EFwRLe79duz2W9z5vFHbKZhEUpSwFSpXAbqY4MPf8zrs+CC8MWV6WQbfbXt/Ahnf/aI8K5uUhae DXhs3M2tOvJ+udGxOOeJ6f2HCbIOAkAvpWDXa5p2ND88FKJRMe64/WeLlBZM35D4PZOoBRvEwFR Q+bXQDGVv6yHuslNjJ3vyqCodbkksbNFeyQFh+OKRkviVZvcfY81jj3nzwPsJoPZNtDd5fYlHrW W/x5V56k/OxxuEB5QiRykVi1FWCmmyJ1Zpaj2YjJeFX9F3vz0TbX58/nIm6fJFOo3E1R6tu2hIe 8JosycjAwk5w0Ng== 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 Reviewed-by: Stephan Gerhold Signed-off-by: Luca Weiss --- drivers/remoteproc/qcom_q6v5_mss.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index e78bd986dc3f256effce4470222c0a5faeea86ec..2c80d7fe39f8e308eb12e79415a551b5009b3fe4 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, @@ -2481,7 +2495,6 @@ static const struct rproc_hexagon_res msm8974_mss = { NULL }, .proxy_pd_names = (char*[]){ - "mx", "cx", NULL }, From patchwork Mon Feb 17 22:05:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978706 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 47ADC1ADC8F; Mon, 17 Feb 2025 22:05:59 +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=1739829961; cv=none; b=Qkxjj62u6WCc8Fr131Rw7e6hse/hU3jyGxbs2CH3EYFeS6NI83eFuLbc0RysmRUc66UlCPmFYDwpo0cgrzuqepMgKptJMcHFPNnaj+A4onMOPdQqozHFgLR0vwF3TivwHKZUQe73qM866P4GtPOxsYAZ00c/5jO8EGd5Pv0+mNw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829961; c=relaxed/simple; bh=jzcNli27LUdsL9VJ+ehFrcGlpTwcwcoLcSqPL2BYkoQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WI+Rm+F7iLzumWfndR6GS/n8+zfjyMNJyppVQSts9SrjDEwGD2dcaBUY6jPlzMZa94K2EPRfIGQELGt6gYMz0MGRRgy4Tvo6l66gi2hj8Ul4cWwl5JWj8SCuOuANIOFu/mlqF1WAKFSz2WiaLIixFDWX82BV0R2zMP5BN0azt/g= 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=TJxY572n; 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="TJxY572n" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829949; bh=jzcNli27LUdsL9VJ+ehFrcGlpTwcwcoLcSqPL2BYkoQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=TJxY572nFBOjq7LQestd6ttkd6roRQTGkWJ8kxwF9uYIQ10+hB37s+H+vuGsbshC0 iBUNIjN3ma2u9yYMu0D2hFLyi1RVTPJOBwKt3oGvz08NmVj26O4zLakaQjGyjrXMTY tbushUA9G4hhf2YegbQlkV3nuM54DCP84Bs+7RhY= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:19 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-5-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=8753; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=jzcNli27LUdsL9VJ+ehFrcGlpTwcwcoLcSqPL2BYkoQ=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7KzYDAyu/p5fZxXr1PmOTV7skYKsZlPjESWH L9SiMXa2ryJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OyswAKCRBy2EO4nU3X Vl/cD/0dmO1PTqq1oNyUJ/xx5GbgP1CD5XstSkHXQyt7WqtaN2jmtTdgLIh9Oc/gHrqNEQxyoXd fE0nEsHVGvlEbAbOIwLVZ3Vaw5OgljN4kfsQox6iK9utxp0QlnGjGpevR3eagZLcmYz2XtrelR7 m2FGw8wtoJKC+EEMypI8Xti0hDFV52NVNTEVMobq78Tr/6edeE3nmFn+c708lNKHVouTIkIAhcy xvpbiJfC1EmzXD5Zxlv9gHtGnkindYlqYejKpUj15kxU2iNzu9wLM0d/6X5dP90vV6S6u0CCNvA HEf3SgNH+Es4WVUejWkUqAkZ8YxsMw+sRMSQx8VTr/4IQvSGbHSgVMV58u6e6qdaLojBWV6L3So 0h54cysThFf0lf3NplfuTMv/D5zXVG7uR5fz3v3aoKnPuPZsMgWRq9sV5gkgwwfhiIHyqKc0T2x ROSsGTmQqPWadoly0O9u6X2doeG9hOkyYyZdJw1DXvnZNfwlKsvIXdBI2vCy/3Ba/bcBvs2GJlg cd2hOL2McrgJfIUzc/b+wKrCufkOR/NBt3H6pszkwfzz3jrRZYKQawDKJFYCNJ0lOIp8sRVZcmZ TH5aPw+JOQHNcC1x4t/f98qSvF6wQ4jOg3anW2+LohmGSUCnRHoMZSkrmzO988dWfXwYL6Zagbf 43G6UN6x4o/uyzA== 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 Reviewed-by: Stephan Gerhold Signed-off-by: Luca Weiss --- drivers/remoteproc/qcom_q6v5_mss.c | 117 ++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 2c80d7fe39f8e308eb12e79415a551b5009b3fe4..6f590f9128409b4aa427ab6bde1a9c4a966b3d15 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, @@ -415,6 +424,34 @@ static void q6v5_pds_disable(struct q6v5 *qproc, struct device **pds, } } +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_xfer_mem_ownership(struct q6v5 *qproc, u64 *current_perm, bool local, bool remote, phys_addr_t addr, size_t size) @@ -1112,11 +1149,17 @@ static int q6v5_mba_load(struct q6v5 *qproc) goto disable_proxy_clk; } + if (qproc->has_ext_bhs_reg) { + ret = q6v5_external_bhs_enable(qproc); + if (ret < 0) + goto disable_vdd; + } + ret = q6v5_clk_enable(qproc->dev, qproc->reset_clks, qproc->reset_clk_count); if (ret) { dev_err(qproc->dev, "failed to enable reset clocks\n"); - goto disable_vdd; + goto disable_ext_bhs; } ret = q6v5_reset_deassert(qproc); @@ -1214,6 +1257,9 @@ static int q6v5_mba_load(struct q6v5 *qproc) disable_reset_clks: q6v5_clk_disable(qproc->dev, qproc->reset_clks, qproc->reset_clk_count); +disable_ext_bhs: + if (qproc->has_ext_bhs_reg) + q6v5_external_bhs_disable(qproc); disable_vdd: q6v5_regulator_disable(qproc, qproc->active_regs, qproc->active_reg_count); @@ -1281,6 +1327,8 @@ static void q6v5_mba_reclaim(struct q6v5 *qproc) qproc->reset_clk_count); q6v5_clk_disable(qproc->dev, qproc->active_clks, qproc->active_clk_count); + if (qproc->has_ext_bhs_reg) + q6v5_external_bhs_disable(qproc); q6v5_regulator_disable(qproc, qproc->active_regs, qproc->active_reg_count); @@ -1750,6 +1798,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", @@ -2021,6 +2086,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; @@ -2174,6 +2240,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 +2269,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 +2301,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 +2337,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 +2369,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 +2408,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 +2443,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 +2489,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 +2525,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, @@ -2503,13 +2578,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 Feb 17 22:05:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978705 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 47A7F1ADC81; Mon, 17 Feb 2025 22:05:59 +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=1739829961; cv=none; b=rbtXu80MF5qN+Oj9U2wCFR7lwKZy6UIozZXt4vFkWHlbLl+0CML8PoumbHAYcHLtnu5UifAzpmMEVnJCl1sKlLe6rk5I6lXHw7X96AR814V/raxnjKMPHKf3fNHDa077yaMi/myouehFKwzmZvvVNlIq3HqosRB6qDyRT1fm9r0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829961; c=relaxed/simple; bh=WQpAU91b0ofgV9N95YLIs+rsidLddutzsiejwyRckP8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=htNvTJ0qshIbXVIdD4vLH7W94hWYQi3GNYi6TTzqXRmTV/SBv6zBhL5oZuWVfFlSaiG4KcNcoSomCIwaplI+bXH85jE7MGisTsQrkIH1TWhuHGeuwAMdbJ6V7F7aUZ3MuB9pklf0q5KTPqn4aHst8qq7NFXgR2pPnVaP/PGNXLM= 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=TqXwgJue; 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="TqXwgJue" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829949; bh=WQpAU91b0ofgV9N95YLIs+rsidLddutzsiejwyRckP8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=TqXwgJueOIHTrpX13hunlvBTPqF77xfSggqOk78A7FCCZnmWAmLA4mWXfeanXqSeq LiCFaeDIkfJtjbGIAzedG3+Lp1KezqhUDApTLIf6IRXgywPTAAI3EV8X1svZdqWs2a 6Lm5C7ji1h+26pkeJBzI6+fiqRWdvRSkVIFVcRTs= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:20 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-6-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=2428; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=WQpAU91b0ofgV9N95YLIs+rsidLddutzsiejwyRckP8=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7K07p0mjJmO0IXoqEbaFZBIXeyKJL7LY7/Ms v13QOsDevWJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OytAAKCRBy2EO4nU3X VsrvD/9ezZFVJJyExv4G5IwV7HwJHM0qEhaHL1G2K2r1YhfT2h+v/GAK3pXFdxK7SYTX6bLQkQ/ f/EdLbSyfVVJ29fGlg3YVHF2424gQDS20n5gGl5pzEAYhc3SLlpGHK56SHpN0tZfB4mpLYPGHyK 26iNj+DiwTTFe/G3worU44nWxKgF/x3/Zs0J9/8xcaSKN9DUpP6Nc29oRzfDU9fKiy0mclEXcrn Ue2URrS0UctgJzYL+2V/ryFfsOd9E4IUGiPScYI/dmG8ksY2lpPIF4wkTHb123AHMPxLtJ3teD5 GjimBXRNBuoSbfdFIH9uWgkmY5DR5i9RUzG79qV+cjuV3K5x8Wmy/07eIRDOOKRm85lcUppaScs JadCPdIXy1J00NGcN5QI0VtO7IAObFfntu/K5k3KRNxNe8jSZN7wcpDFUwNbxmEA9YAoY0073cu 0/dQtSnQqmPC5itwXSClo/79diA7UHfWKLaRpPloErwKekeKBGqd6wiMn+ZyAOeBuNHRRnZ7tgM 4G0SUxYKtYXfGTF4swlqIpIH+BmRh0YfVT9S8OlNICdst6ZXNYbpN+HBFbi+a0ofBz6EGDUjXu/ OZzFp99zGrrq8FEjITirJLoPxFeZtgPt9oAc7xnipLKrD7Ar04ZCPD0sSX23T4bHFp1JndwrRmo MsUn7HHvIMOeHng== 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. Reviewed-by: Stephan Gerhold Signed-off-by: Luca Weiss --- 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 6f590f9128409b4aa427ab6bde1a9c4a966b3d15..0c0199fb0e68d6286f1e238d110539554d1d5f14 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, @@ -2622,11 +2623,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 Feb 17 22:05:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978707 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 CC28B1AF0B7; Mon, 17 Feb 2025 22:05:59 +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=1739829962; cv=none; b=Yt/hFKCG/pcDLpDLFCUsQcna4oNA5Tt9q5pR+T9rW6Ii4LDD9SwGlrwiY2TiXDXFZD6e5+UqEFX1oZGsl2NmNqQaIx6+IUsd492oHbV/JcfPnlmyMDMDlMr+nYuG1DHSngXDRurqXD8grXgtny/Fudm1bkpiH0fMJg+GIgepa+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829962; c=relaxed/simple; bh=jpy5uWscm5n25aeooQjOuugzo/l5xnqC2dhnFTaNXq0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SouBlKyp1hz9wqkUjwX0gaNiJjWFs27dtLVQ0K25rgtnVA9+dQ24lq4sr8W0Iv+RyDjZ5L3kaxgnQ4oqRJ5vrWN8SmeZvGCuU55iu4iCnxBGLS/5Ik6V288BMcYHyQJF4ZYQMOrgC60j+AyRPubCBNQXpKIh1mL5whpp281lBDU= 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=nO6GCS4y; 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="nO6GCS4y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829949; bh=jpy5uWscm5n25aeooQjOuugzo/l5xnqC2dhnFTaNXq0=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=nO6GCS4yu2/3IjXpqMOIDjQqbzHEhEF0vd7rG2Qmi6lvEpuRN3MvaArFlctnvZtzC DBIpcbfA6X2/YSug1aaGQUmVW8rI145twBcaUU2WvLm3NCR5MVCPy8NzLTiT1PmyXv YjbQZSVEQ0HwikoY3QP7Manj5YCTmMhP2tmiKJjE= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:21 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-7-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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 , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=977; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=EG1Yxy7Ssf9FR6CqB3nM5wo8JTRgwLQbA7US32NjMDg=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7K1h2ZEO1NoQMm7lsMw/nevMv/6YlcD7SfrQ +uMfUXDO6SJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OytQAKCRBy2EO4nU3X VvoIEADaXo8Yg1ff5ApnAnwmd81sgu+nlCM2k99JFmBSM72AtDKaCgATLSKD9w9gul/TB03vjNo KXnTX5KdvsFvrZzOYVfjMvDTu973BLO4r4emD7n1GZq6rEYew58GF6SE89Kqmy725QuCz0L25mY cC8oWajHcsQ8Qc2el+VgDbe0tirKuKsAKxIaD5/YhhiniIAGJk+riIR0U9K/Hxj92u6MEF4jQA5 nfWaqzk85hdHPQYPuVw7guHburDNt2d45PijS+ErfwYCtUChfYPA96BzJR78JgEeXqnHcuds2iH oqtzoSTbRX7ePMzypIXymgKPCSxgt+ncAUYplKjwpN8nlLXZUmGhOjGotobi15olq0WZue1yj7x pJGipVNbq2uJZr1tJqdf1JIJ6kuknaJZF6acgevdt8mdUF4N8p9jHCzwxgYp6Hip13s11oDelPN Zfp551CKIoEmUKxwuLoGRRm5ujY7c8h0roHBy3wPuZ8H+Yr1Q5FyOMmOMyI/RAWC7XHbx2Gpwty 4QdMQimmfpDqE97ZM3wfMhzJEqVJrhPk8GkAwK/iDKJRRk32oNg1+izScYLoP7WCkXzHMSBvg7i hkRQM8QyUotM2NvxUGaRnPc/AjhIW6SlH7QCPyn12X8Vzh4fcW8MNJR/vXWj0Y7fldfi6kY1akC aWyfJ1Yv6LI9mXg== 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 Reviewed-by: Konrad Dybcio Signed-off-by: Luca Weiss --- 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 Feb 17 22:05:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978708 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 CC3B51AF0B8; Mon, 17 Feb 2025 22:05:59 +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=1739829962; cv=none; b=nCwJZZdAl9qkt4RlxQQHhL2BB0zk926zzdw1bc2UrGSnrDfg2yq6zG34f4anvv2ugSxBUpewlYCmzzbb1QKUJrKRAX11wSj8kQFnnd0hU+bA1XvpU9aSZ3WDEMC5fWErU1WW3Oe2F5dqnSkhGCwAT2lDDornIBDJnyeLQbu8VPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829962; c=relaxed/simple; bh=c3OdZXsHQl8Hpj942CA3+f4fIQmaWKu9wILF5OxwWc8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qsgcBh53kpmLuIXbVxQSYsvA9DFWBZ3oJZUSfwjRzgq1aOBC6ZS3EJp4AQF4YPJQ4oX7TBApoKiC3ez6STc0ATQhRLsneLrgA7zKmlC/CSIphmPNmUtszfNHxlEqyiiTAr+lh+p/+f1TmfXCshTM9YroaNUaPoBVmDOWfEqJXVY= 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=CgXwaQk7; 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="CgXwaQk7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829950; bh=c3OdZXsHQl8Hpj942CA3+f4fIQmaWKu9wILF5OxwWc8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=CgXwaQk7cADGv53QDsnXhsjJGIMO7YbnS5LycnugXlnTnqSt7MxT9MQmi6CyUHyx7 dHmIwwmwmcl28kTcBgXqCb2kHeoP3dAgKKPlkNRIbHKde+J3ygj4IbgSTDWZj2LeRH BUeY1VdXNOSQP/R6/dkMUrqrTzGVd71wiNUrYT5k= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:22 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-8-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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/ZANAwAIAXLYQ7idTddWAcsmYgBns7K2Ehl12Gf4BDTiHen3xgTdq7MqB7K2BsV64 O60M3MlRP6JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OytgAKCRBy2EO4nU3X VpUBEACeBtYEOeRYSJ0gKjXahxWLUUvKV/LLHwevWDlt9oeIIr52/q3sRBCXFeBZOLAloUcr3en +pDO3NxZEyrD8/cN4PfTOSmtvb0cUDpY5SZ0cgLHOqOHPw0v+tm1WleQkJZFO+lFADNvsn0GkeV Yx+WCd7qXm/ZuzyCM08Dh0QbEjsq5usY0jQ9civUkfYnxMpZMXFdIXvLjgtSBCasp+mkv+cKqpu qkQafK928eGqttUXVSV2Sb0hLPggnbeIlaA7GJZUPYZrkeDjJ97US+h8NkBTiFY5NKpUJ6Cna8L yY6i17x7U+2CsWRTkwNKUU4f/+5Sezay4+4slDxc8hAanpGJzNvpO0//BE+rjP4Yv9RzY/cRSbw oMPcrbMVUJpBxbZvBgvR1MaSGySXqkZSFyT/PxJOX1Gt3gdoHrDLIut64a24xcHbSprXRm1Fkse ypEOyl9rZ7EP44XDUP0NCrHUTwDKuc6HqNlqwlAGjdcb5Xa0UzmSJa9Pr4Gk1nh+a/r3/dp8JvD TYP5lKL3rVmEzteNu3neN2/pvwN8fHjQ8H4aSqNE0Q6VJvfareArlF8KnKXRXrzn/aSB0nugkrr 2+HUrjFkyir1Z/OQwqCiDKidXfufeAPDd8SPQ+MtZX0GWcAWe2s0NFsXPuGIRKY1klxZ4ZrzzWG CKn8CYlosfLcYLA== 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 Feb 17 22:05:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978710 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 CC1B41AF0B0; Mon, 17 Feb 2025 22:05:59 +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=1739829962; cv=none; b=F9KA41JAz2v/Z5sBQtf1WgJgU9H3ehCw8rO0LVzbaLA0p2Nv0bqMOFv5EJwCQaV3iFggo0jMBxJ81kYER73IQcGP/IKuiqjqguiHMir99tlN9aERwGVY1rI6T2XArln+YBIrVxH/09kBdjxZgWLS/6XZniaNbGnyF0Zy/KfJZzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829962; c=relaxed/simple; bh=lqkXS5bYpxgP0JNQUtpM7L05DqjrVOACSHBykud/Gn4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HhG1YDpzsP9AeVZ8rFJAyeN/9+rSMnAzX/tbHsPSWn42v0mKvUk+o3thIVetFMKai8OzjvgDsfuDRNlk7Yd5sPY/MW4uAFNt+O+VaniKQbmsxQxdZGhp9xPUjhIrFj/D+bQk+YnBrgThRFN0DQ/p+vFiRmQMyy/Au15mraIsng4= 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=J2z3uzBF; 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="J2z3uzBF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829950; bh=lqkXS5bYpxgP0JNQUtpM7L05DqjrVOACSHBykud/Gn4=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=J2z3uzBFG48LSpvXttKn3RNQwgzHbpGsXZ0J8Ta85+WcLspqxKc22pN4aTxMHUvXX CEmQGBPartGRITM1OjOD2Z7qPq8zrvP5baAoEMceIq2XVPP9Y5b/CUhbYrDPqXak9j 1ldAGsVYo9CCY/emLq0AQWxaVfJWGt7DRh4JQIu8= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:23 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-9-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=5470; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=lqkXS5bYpxgP0JNQUtpM7L05DqjrVOACSHBykud/Gn4=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7K3EiowV6eDD2tzN2RDqcushz2DdZtLG9/Db iAbTgLKgL6JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OytwAKCRBy2EO4nU3X ViglD/sFFRp8L8VDAmeuNxowD24eRThxHTvGUD5iC/N4r1pwm2FsJ39evAi4wZ8LE3tPoZ2aCnr DFmywiLgG0hIIJibpChTqlNJvf7iPGo7JdLlb2ywtbXuomH4CjzFwAgQ5PQMaJvrqgGjLmq3eBq 4V/MR7aEXcwgVeBJU/0Ryc9QT6qtqPZOeZsmOTeu0l6AkY/+BHqB7G54jiYiH1k6o85PiaYGv56 63tdqmklB9Q0jJJpJDP6k4cXZY+lD8+C62/ZB1/Rxw3i+qN+CbUUqHQyjglMWX2fFhQSWCniv8y wzI5SatDD8y8Xc3dkWLKzpE5AjGVOrGX/l5Cwk3zhCOCcy/qGSoRnCzDmEUxb5/AIhWywVatylm XzTsLAS1jUSZbsfzsqr7UHzP3RcTJe8WW1N7aPbU1Gu3CB87qTMrRM9xS54QmA/Mma0QQaZVqfr jDtwAt3X4EWi12e3ycxg/GAmPjSdDTFOCd6mRd/Zt25PevApreY7OFLgm8YZ/XkaQukX6e8ZLhO YnituSeZRTKbQr96ZL8nnrv9pKklDtGvgdInqRj6tDjGyi3r3A2oZ+k7WuVgY0LRPcXAZ1WZ+IU U3dO+uMwnoK4k3BN8dK19+eM1FXZzbiNOo8+d8Majpc95Q9JdxjFxHXuO+h8K9axYgShV89ickH 5aaZL42YifWKcPQ== 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 Reviewed-by: Stephan Gerhold 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 | 90 ++++++++++++++++++++++ arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 2 + 4 files changed, 98 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..662911f4cf163c3a5bdd1a4d5d79713074accc20 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,59 @@ spmi_bus: spmi@fc4cf000 { #interrupt-cells = <4>; }; + modem: remoteproc@fc880000 { + compatible = "qcom,msm8226-mss-pil"; + reg = <0xfc880000 0x4040>, + <0xfc820000 0x10000>; + 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>, + <&rpmcc RPM_SMD_XO_CLK_SRC>; + 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 Feb 17 22:05:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978712 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 DFADC1B0103; Mon, 17 Feb 2025 22:05:59 +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=1739829963; cv=none; b=FiNYIhZBjj4mwzbJjJzkHEU3PxGfLrqm+Q6Afi3U+5krz1IEtXDnHZxbB0Rp2iOngHnWuCbnb/I5eMIos123eFAp+6aHIqaBrxdtGSxaPIxZsxeu6IEUOpSG1ZlbIC6fUl+faTk5qxsUAkf6TFP1OpvvuZG9v5nKqzmqne1JQ9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829963; c=relaxed/simple; bh=sGfPDtDxBQh/dYA1FcKq943zfL3D9IzXqjda20D20wc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Dyu858bsIoxhd3g0uBpD7E/28NXYyKF3FComRJr/ZHDt3wy4O7uAjM/yOEAyyr9yXEs1mEuowIkU0l9/kEM0oYDHzsR6zYRXAkt+5VTu6Rk8FAlBVYsxl+S3RbcTqF3cxZPROTp1lwSSvbL+eJJosnChCtm6i+5KZ9I0/QTRhdQ= 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=SOy7HgH1; 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="SOy7HgH1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829950; bh=sGfPDtDxBQh/dYA1FcKq943zfL3D9IzXqjda20D20wc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=SOy7HgH1ny0pgjIkHqbOAZXjBhMcSMJFsD9Dim7cTNPy5S/LPi8MrfUjXpbGgcQ3+ RmmuiDxc0rps/wgQPtoiNb1SJ4Fp1YqrqE8hhVn3bur5xXJAJ4HL8VPDLWRvLvzq+S YL9YmRqj9uckwdH9+qnhrIix0p66jWVmynksJfcQ= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:24 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-10-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=1652; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=sGfPDtDxBQh/dYA1FcKq943zfL3D9IzXqjda20D20wc=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7K453EuxkjQrjxiprXBt1FvJ+Q4boisvnI5m yIIpPj4HfeJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OyuAAKCRBy2EO4nU3X VnYeD/4wxu1xD93+8KLb2SqlX6odehREUQv3mQuBAv0jdLJABt+G5MZtllv1H3m9afQQ+Oo+ZmG wuWzkzcFlw1l6XBD/v5qK3PRqewTQUEUoEFzIXmHnAV+osx1qIVUj1Jmz859arITMOw7Aq/u7BF JXvMHtAcEWVIBrMZAuj0+yhBg8DoxH94jvp6zPFeUrp8q+Ibghys3dRDaC3MxJU/CK0ZbBzbjl3 s8OW69bKHiz1EMjkTwEV7br+MnpelI4bGyFLHcSirmts2giLzNFoM7OU6wdelxmyF2JiJg3HhgW rkK2kZGzJOSq+DED3VzC4P9cjHLJQWDLn2EYtxkhpLCn+G2GQ+tVdbsYD5KgNzESwOnbDAQLp9H J6Gril1y0oEIFdxqv8qXWQea2El3DWRwS80zn+sQm5hRVEARJx60uvgeVKKJZ9R3mSXJPNpwDWU A/wyHmWGKh4//s6d5gPzKl9+C7PoDxzTckvRPtKc+XWLCH0+EJb+7VSsEZW91DLfBQEg/vReDIH eFU4bvMf4sKoI3ha3gBC0qwyXUje7i9NQK2NS2iHpK9iJaw8WSbWzYRpNDDm3XpajKbt/r7/x0w BXWXeLlUHbnShfsPPS43kcBFoOxsGhOfzgqG7SGJLDrrl2xZ8dr0+6aTMmTWcOavTLxfpC1hnPp SRxm7bu+JUUffYg== 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 662911f4cf163c3a5bdd1a4d5d79713074accc20..32defb08b9094956a04f490015383c263901a907 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 0x4040>, @@ -959,6 +971,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 Feb 17 22:05:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978711 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 D5D771AF0D6; Mon, 17 Feb 2025 22:05:59 +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=1739829963; cv=none; b=d4upKfBjkhYqqrcajeutCtSShi/EFZjizL4igBjQr9h944ibU3YmAS4HUvIloNxknrYvzQg24YQ0Rzq76yMWUhJWe/uW11elXTLuurbrOoMJv14lCpXOckJABBKm/+hmRxvtQGnKfJcmVKbxZECK0XehqXpC3QPEo7JdQ0x3U4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829963; c=relaxed/simple; bh=jMq6Fhv262rdqErsWSNESQcM/fy7CRUg0JBtOSajj1Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W/wr5CYJMd9gA8Adi4EPoR3EhAwOxR6dediNQ6ziDSyGFKwbHq8cYAx/INX4uZT2X+0W7hJ/0GLTb1whCaCiqAjDH/qtz9XFBNO51vGIyz1xlG8sbmMd0aGk+8wWq0DGKfFgB1SgqjHCZatZq48rnUzIeiUjRPbrabgrk5pFn/0= 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=6eJEI2Qv; 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="6eJEI2Qv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829951; bh=jMq6Fhv262rdqErsWSNESQcM/fy7CRUg0JBtOSajj1Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=6eJEI2QvlSWcsKFvLUlhuKAcP9hdffTBgRld2iPY+WzV32d2ZLv7qj/lMGD/76PVr 8ue7j6pJiG84t9Sx4Bd1yMaIM/9PvayHj6IYGHmxh5w5qaIpWy3uQMtNwWmypUuAud CQQa5qKRP/pb7E/pEYiORKm2bBr05WdAmR0EP5II= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:25 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-11-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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 , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8009; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=jMq6Fhv262rdqErsWSNESQcM/fy7CRUg0JBtOSajj1Y=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7K590iX4q3/VDCefYiXkwVD9Viw14/QZmfWw KRnWBx020qJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OyuQAKCRBy2EO4nU3X VnXQEADMg8zfRZ88Qjh2tl/fyydBdiUiRywHFS1swrbsEnM9DutWcYJ+rygdKqnBLSXT8qrELuc wccONwmh6HUvI1xH2q96k0VOveBS4GECgve8I3GrF0hm5xuHyKq5ye94t5zvg5NlY4y65hWxu0A TigG8Mm/T5opxwtMM597fdkw6AC205Ieswr/ZdCYqqY7XPSIqx+KXRb1LGkQtzyhgKiDACMWpnM 4Dj9fmjSqeoTkIsjbB/5mGmK1kSmQdsgHvts0VMyE16GQlOHQ2KAxwnK2H9aB+K6ZbREW5YIeWK dHif0TtHhE+PVXwV49kSWs0S0/Pu881V1U7xePh6Q5MSbSifAOok0iGH4VYwhIRZevxGU2uQCD9 IwuWwvqhREqKGiZV8kV4r8XAEFLr+FbDkSlLhHqDMGP5G26iURaFpXLiwzT5ZuYrG6rfZ5FoKYE bPYGE2YGVooI6HTbGnlcfvwNMwZD5me0DLYT46ZEwi3dqKfEYL4K+cn6AWwKQ2l5n+366yEudxC Pa/pqtIRSOcGH6z24VZ8awOvJtpCDsmtZqTC118JIiGOQAn95rAUjN86xfvmiQEBFDovPEqxCT8 qmUHNZBxvgf7jZuVU+bRjvR0EM+5HW8fSAEy+App0nGO3rQ00/Zo2ZXpDwMg3mzVjtfH5YekS8H RHGsqgDPUIedM6w== 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. Reviewed-by: Stephan Gerhold Reviewed-by: Konrad Dybcio 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" / { From patchwork Mon Feb 17 22:05:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978709 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 E1AA91B0403; Mon, 17 Feb 2025 22:05:59 +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=1739829962; cv=none; b=Lre5xKXZ7qX/uQ5EMPKkzq2SnwDRNZ+sxllFmz7PtSg/GwR6mOOi3Z/TY2umFH3SHsKpNk6YVMp9lDCzyIu2tob6AUhqAZ3TiEZH0Ph6sABv8E0wqQTx8oFgg9KAdxt7GI3YQgfu4+1trLvyz6P5zJwrb9HCuxPG0gwfon97aW0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829962; c=relaxed/simple; bh=DLjfEGxFWMNPCYEaP5OzjsuwOiEesmoVFxG+cMzU00A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MnJddXoVCpxUFi3i8zZeuf+CYCMa37XDmczFRRt+JKjXiGq2ARD37y/FmxYBi5ktMDEBb6Gp+zRO582o6FZuaFH+PsKtgvoR/UUUsEaRrz3oJSJwT5EnZ7zkYKoNAktsGjnFJV7US927HaNWjfweoTJoWWdTqNyo0hpOtFH81HI= 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=tOAA0m98; 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="tOAA0m98" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829951; bh=DLjfEGxFWMNPCYEaP5OzjsuwOiEesmoVFxG+cMzU00A=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=tOAA0m98RTxJC6hw7EI7TqeKf5R+no9PpntIEvDtc7KWM6IAPiFCd84hhl2T+e4XD MJU++18ykbcBJj+6jNN2Uet/C/CwGsg/mepxO58vWhiU/t6qIGFgFWr7qT6JMXdJ2d X5VJ0B9NeRt4NPnlK413TkPnCyKe/C655jHNNfKY= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:26 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-12-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=950; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=DLjfEGxFWMNPCYEaP5OzjsuwOiEesmoVFxG+cMzU00A=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7K6qgsPalcZz4J5Vg21CMlhGrqYZQ6WfY+hx BguKa5c9DeJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OyugAKCRBy2EO4nU3X VmeWD/9qBddHdJx/BIRLpAcIRoo0ff8exVe6xtgUKzn/fnMaPwZFC834MquvpTUykmzDVPeK5IQ BCZ34CVijdpECs9d+SPgvJg2X8qljf0r9holoFYjPAmZo1y7Gbi/hfmvDap/G2GITiaVSBfjJfZ zhF5OVMjNZW0DJMAkYazdsqVeiXaV+xEAQN04iPaBzLVXXbQUSJUOutIp2A+IzC/vyEu82Ps8hO 6TTEm4j+1Ygx1Wp/M21XLFayJla1bFHRQdGuNaAuXELYjlS6EE3g0hPsngjCa38Ejb2C/ZWrgNX 8+q+k5+KlE6uvs/1Xiya5Zp67fnuRkDu0uma/MA1Dgns/XUYu1Bh+4ecNHA0d2Fz5QbkZZNg7+L yF0WOYDtiVC2Td1v5VcLjxxLWoG2Ld/TBcxV9+g8TXA7u/+o4qwtqsTi+QiKfoZmU47UxRlrPG3 qt9u7LG3205/ASGJQ4R5VkOV0+WYYO5oN7ts5hYqPyLu8Gu7i3N65vJlFt4Vs6cIFK+cpfYPwq4 sOZtnhfHUx+SpYpS2G7ON9/hIIVu0UfFIMujigb/z1GfQoCIjqxV+iEXBW2kn9H6Lnc4LLyvY81 lpL7ANvZUNb9A0ZlgVfFiEHiTyOMTrD0AJoIqM3zo3oc1kSqAFRk9VQpJCWjJDwM6kivwclhZxL v6ueYbLai8nMC7Q== X-Developer-Key: i=luca@lucaweiss.eu; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Enable the modem found on the MSM8926 HTC One Mini 2. Reviewed-by: Stephan Gerhold Signed-off-by: Luca Weiss --- 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 Feb 17 22:05:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13978713 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 6BF7C1B0F34; Mon, 17 Feb 2025 22:06:01 +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=1739829963; cv=none; b=RqmpYNnRGF+aNe3jdB6zjoCQRoBmQjdXTlAcMwIzDBHrzd/YIM6sja36aOMXBRmxGqdEvzQ20NwY76jgEI9Z3BAZ39OWDWt54MCAswMe/ci5X5UKsiaIowDrkAHGElMQCLDPDsNir5m1FFF0E0inFX8taRsvfTqVyyAk8EFmXZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739829963; c=relaxed/simple; bh=SS4BWu9ddGsvTH1RzieVss0jVfXjz9CbopGLiQCpdOU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L8o0WCqjvY7Un/nbg9CSn0qdgSXbHYRiayXxyEwLSofF+dUeVJ7zsRUlEbiakIrEeqlhWiONpMyCriFqE/iSeRG+hIwYe6kofn4zMmW9q5fHkrdo5+r9f7bP00ykeYRKpUIQYXid/1xemFMOLoLkPXGBLtA/mhmJ6zqe1lBL1JE= 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=ClVkGORw; 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="ClVkGORw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lucaweiss.eu; s=s1; t=1739829951; bh=SS4BWu9ddGsvTH1RzieVss0jVfXjz9CbopGLiQCpdOU=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ClVkGORwEWoJkvhKoz45oNHDsSy5UpNU1a8ZgF7UTkQ5HpnjF5xV2i5gHC40x0v6R 3Lwt+FrvRnvBZc3SL1BSo0mLYnoTKWTVlqqqbp0qhwDDnJV4MGl+iAh3SNRes43KoM 1LV4EVzsFh5Vte3qaIlLsfEZJ7dKw0MqCPLQYQOE= From: Luca Weiss Date: Mon, 17 Feb 2025 23:05:27 +0100 Subject: [PATCH v5 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: <20250217-msm8226-modem-v5-13-2bc74b80e0ae@lucaweiss.eu> References: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@lucaweiss.eu> In-Reply-To: <20250217-msm8226-modem-v5-0-2bc74b80e0ae@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=1724; i=luca@lucaweiss.eu; h=from:subject:message-id; bh=W7bAKRt8yj2yIFDoK8M8DwUBnwPfc/tZ4V5bO84GQEk=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBns7K7LIAhgKul/TdrfYZ9rF6wKCXg+b/I7C1WP GRIwYlBNlyJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZ7OyuwAKCRBy2EO4nU3X VtGdD/9wZhOyZ9rqin2j9RUel1qYSGfVJoksozm9qVZfWKaAaD7ZPNajnbtu7G2e6k0GqkEXJra 8OTTchrK56xrWlLUXonpMIx4WYBCfsRGWfGz0mBQGns6ZDz7wt+B6XN1/Dj2+Gq2mWiTV5bryZ2 pNCMEgxK49Wg1e91+N2CcTWi417ooi0iCvE2Ja08P3u1X6x9GtYTvL7vOZQTiRyxOb/HGienK1J R1L1vUblNN7ACA9c622zpbjBGXJHBI7KLizuyePTZ9JB5R+CqUhgYrn7a7EoQkmMnov+ef+OOXb UsRthJJvyvRwMiCg+KQCc+qj/SK+GowteJQQj1xt3Ue40f09Rwsp0QfW+wunKZoQo76jVOKgPXc v0S5ht7d6RafWcBZvm4ND+VeU1sZbRhy4uw0NvEpuc4pdlYQ6S1Y+L/HRIVYqLePvx1YAErqz7u pJq7uldLt5on7ydlUxjfkGn4P+9LJhPX0rDv6ueMamISWhfMpuxXussjWTsEYQJR4EGMyTpv1Cm oz8JehNasLUIUdiG31biObEDwg2KhnX2I3vDBQsQYAzESn1IXW9RleW44DSVTUNflu10tVIPqxv VRHqkknRDzbJDeD3IkgSXhuXpq4lhqITbnP7ye/cutjZzweKEDoCVkrX4LFbB3IcQV1fMXbtnmD ID3/idDqhhRDIzg== 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 Reviewed-by: Stephan Gerhold Signed-off-by: Luca Weiss --- 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";