From patchwork Fri Dec 8 15:07:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485530 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="tA1xbQo6" Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 177C41BD8 for ; Fri, 8 Dec 2023 07:08:50 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a1f5cb80a91so183628666b.3 for ; Fri, 08 Dec 2023 07:08:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048128; x=1702652928; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ADyyGGnuyYVsE20DUsH/ImAyYyUEsvd/x7yinUyvXfA=; b=tA1xbQo6EvGz+aode6ogAKiBk5vrS005u47YwLVcXhOxRTvx5NsrZ4wgXy7kTlaWvk 4n/eYRnuqNAUdc8dBwZsHtITWPkNxJNZcM/hYErNZ7Mrk+b+GvGH8l/dt3DxP4Z+AQno MFSWlPeEMN7vVMQasS/xsGs4I4GP3ADRAqIMCPzgQdv0hBiFvtPeuXtUMasbXTQXviMh o3PPjBpNp9s3icfnDCRqiTQcgcCegoqzh+wE4G8dkuR9UBaREoXrUhNyret8i8uYIU7g o2PxAjwoggGszUySz+d9hacmcdxxoOzpMiCNVGV+XfzUxWw1nYuIkMMXXvR8pdarVcrf TYGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048128; x=1702652928; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ADyyGGnuyYVsE20DUsH/ImAyYyUEsvd/x7yinUyvXfA=; b=YdOXXJms4+xM9LkR5x/CVuHXEsOofkQYBSklq1iP+Ka5DRaJpQUApH3heOlzYF8R0d hr4w4iiX9mdvSQ2rBo9xMu6pFxK/CAhryPf+EM7Ql3UBTamawdmS3AVNrOyjmMhVc4kR wIIRSXqKWRDgD954V1eZODDt1o6CfJ4j7AUxkMZ5fvDh7zJQpuskC/U6FYP+w2T0bslB 982Y7utMZdRX5L96T78x/ytAMPa1Y9vd0zWU/kxQ7MVD4LgiPLYmu75F4qgR6KT+LGv3 fqv1ryFdAGUixtFE793Dy5fjk4rUEJfipVSRedE5COt+2WkJ0KHet+B2YSsQznw9leLJ eNwA== X-Gm-Message-State: AOJu0YwBl9MdwJMeCfKCFkHEagIE1mOMiBOPNgOWgAi90J7rIWvpVaPg Y1Lk45jCw+DTiTMVnjIhxp5wz05RE2ksZLr+k+552A== X-Google-Smtp-Source: AGHT+IGsSCIr4ijXHWnZzYoOk2/a9DsQsa5DZSvHFnPOefRXTzuE3I7g/8SvqT/wIlriLsyjx/sEeg== X-Received: by 2002:a17:906:371b:b0:a1d:767:f068 with SMTP id d27-20020a170906371b00b00a1d0767f068mr48853ejc.31.1702048127721; Fri, 08 Dec 2023 07:08:47 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:08:47 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:07:57 +0100 Subject: [PATCH v3 01/11] dt-bindings: remoteproc: qcom: sc7180-pas: Fix SC7280 MPSS PD-names Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-1-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 The power domains for MPSS on SC7280 are actually named CX and MSS, and not CX and MX. Adjust the name which also aligns the bindings with the dts and fixes validation. Fixes: 8bb92d6fd0b3 ("dt-bindings: remoteproc: qcom,sc7180-pas: split into separate file") Acked-by: Krzysztof Kozlowski Signed-off-by: Luca Weiss --- Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml index f10f329677d8..6f0bd6fa5d26 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml @@ -114,11 +114,11 @@ allOf: power-domains: items: - description: CX power domain - - description: MX power domain + - description: MSS power domain power-domain-names: items: - const: cx - - const: mx + - const: mss unevaluatedProperties: false From patchwork Fri Dec 8 15:07:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485531 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="YKDVDN7K" Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FE2810C0 for ; Fri, 8 Dec 2023 07:08:52 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a1b75f59a12so278456566b.3 for ; Fri, 08 Dec 2023 07:08:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048130; x=1702652930; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Td8GK1EIxCCDRTZZeGpN9dcJOwX/POq3AChRSun4xvc=; b=YKDVDN7KQClyDvfH7YRrxZMz3msS+SyFkLUVmQLpAiJZUVArUaSkLm3TSyVGJ0vgUp soysBYc/jsTZnWnr4/eJEFJ27lS18+xuVpw23beMvdKonWHKvaXPMRZwhVKcHjL1K5Cb q/3aNFwSbXeC8xgm91VQleK2w6+TbCVbVLzi0KZ9eN+aH3sEyQjGjIm+plsnT4brMh/g d3qbsmOMn12ubAIVzZcddzJadggpXMb4HP+Y89iCeGAexMQVp0pbU5X2od55g9iVHm6C XgwRzq9k5os8MdC6mmEXGSwtfk3Z7Rc+dYm7n6OsPXK8hq67RN7/9FbQSI0J/TGUvNkE uLmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048130; x=1702652930; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Td8GK1EIxCCDRTZZeGpN9dcJOwX/POq3AChRSun4xvc=; b=EvfzhHb7Td3uDwPrQ8fAyuzRRMbTWYVw/w50GNAk3oj+8WHpIn0RfUAqwldFfYq38q uO9D4/k3lazs8wEbxmdO72NgRkQ+O4jRjeQIPURGXMB/8pUYMXU3EgfttD9JSJijbYNv QYnytzuv3N2La4P7+fSfYaqD09jBgC7+XZXsTV+xICNqfC0uDRYhQ86+CSGzHv2Fi7sx MtXZjigliqbr/tFZS+BNBdPcWNy+Wi2VAT1OGYYJtvnAUspmvXiz2nLxzbmX4mg7kHvp H5UH4+83PS8xWexOtyBX7paDNTsS2MHx6mVWVnDvvPsrasyqvPvruU4yFmz8AprvisSa JjBQ== X-Gm-Message-State: AOJu0YxnVvPkV8CX/GSXDm28dV5JX3pva27nvD3nfTAw/hGHRRk/Ux2P uhZGCRIIb976+ejkxdiXTkC7lifOFCTjSGYAdyI8MQ== X-Google-Smtp-Source: AGHT+IGm8lL1I7ApGVxuP0X9hWodDNQ8kJi+6CvDt3WbF+Wa45GZg4U7TqhogZpovS1pZkaGw/wpVA== X-Received: by 2002:a17:906:cc10:b0:a1d:2548:f713 with SMTP id ml16-20020a170906cc1000b00a1d2548f713mr26984ejb.261.1702048130382; Fri, 08 Dec 2023 07:08:50 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.08.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:08:50 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:07:58 +0100 Subject: [PATCH v3 02/11] arm64: dts: qcom: sc7280: Remove unused second MPSS reg Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-2-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 The bindings for sc7280-mpss-pas neither expects a second reg nor a reg-names property, which is only required by the sc7280-mss-pil bindings. Move it to sc7280-herobrine-lte-sku.dtsi, the only place where that other compatible is used. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 2 ++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi index 95505549adcc..203274c10532 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi @@ -33,6 +33,8 @@ &ipa { &remoteproc_mpss { compatible = "qcom,sc7280-mss-pil"; + reg = <0 0x04080000 0 0x10000>, <0 0x04180000 0 0x48>; + reg-names = "qdsp6", "rmb"; clocks = <&gcc GCC_MSS_CFG_AHB_CLK>, <&gcc GCC_MSS_OFFLINE_AXI_CLK>, diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 35208248f8cd..1b40e18ff152 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2860,8 +2860,7 @@ adreno_smmu: iommu@3da0000 { remoteproc_mpss: remoteproc@4080000 { compatible = "qcom,sc7280-mpss-pas"; - reg = <0 0x04080000 0 0x10000>, <0 0x04180000 0 0x48>; - reg-names = "qdsp6", "rmb"; + reg = <0 0x04080000 0 0x10000>; interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>, <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, From patchwork Fri Dec 8 15:07:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485532 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="r5nTAEIl" Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E23AB1BEE for ; Fri, 8 Dec 2023 07:08:54 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a1e116f2072so468521166b.0 for ; Fri, 08 Dec 2023 07:08:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048133; x=1702652933; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fnWkFuJY6MJ2ZaOXK6UAiukARQkpq+UgbSGCMQcOUUQ=; b=r5nTAEIlcbgSm2Cf66LfCLht8G1zpc9bipVg0dYpnEhw0pEJDa6b9kF7RDIuMaZXbb cn3wISuRKh83vE8OBsHGGuHzqIPjt61OHsEmJ3ZqE2DpGPo5enPyyYoqb34R9HJ5Llni MKlrJP0YeXZI0sgTEKfciUuZ831MBH9+isoTR+Erw6zx/CBz3aJVb5XiYAP/a5XXTFss iaeh3DWjtZn4w/jU6/86VIIXjE3X9Emtj37CqDvafSksaq0uTke6zHTKA+HlbCLWnVIR gmcH55JTyZCqmscPH2id4s2RI1OV+k+QQI0OA6v8P1clBzElf1Nq6wmICDbrYKxfYAhf 3FCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048133; x=1702652933; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fnWkFuJY6MJ2ZaOXK6UAiukARQkpq+UgbSGCMQcOUUQ=; b=MBJvvK7wVOrLHcAhcu1kcEtiKknDeeJCDcVo++l5SKlNYPLa27G9DSRJavem7xk4Dt Jr3byiwcx00YQ1v5xFHmqqplbF7VGz68M9ThpYNSVZlT50YWDMwLsncUQpy+R4iOGi/o 4deCp76eSQoTXVma73xWpaz6gdAE97Rdk04xrpu0baCu9bTClu6j8O28L+RhstYuAwPp ycBUnz+AI/BqpNoF54Hfnzc2wFrlg3VjGh8CwLyfzZV7XzODjF3fqr+KztkjQSAnpga6 hE6hETXGgrwVEqCL1H2BJpXM9npjv9r7AtL+tWXzWGb0EYErIWLdoWdbTDluj0oEwDiR jLIw== X-Gm-Message-State: AOJu0YyruBHweR4IzIitl0kQKQQxCVAwnUWd2J67XhYZ6nSQ+BgV+XNU J6PjcXC9vOKT2CcyRTxaoVLIQX+pmIhdrx/CKcE+/A== X-Google-Smtp-Source: AGHT+IEmFRxtrsca3mDhjUWqafanESggtlWIY3O+aAEq1bMK37FzHZtm8hQx8Vt2Bt3FOQc2UqMe9g== X-Received: by 2002:a17:906:fe4c:b0:a1c:4eee:3521 with SMTP id wz12-20020a170906fe4c00b00a1c4eee3521mr334656ejb.56.1702048133106; Fri, 08 Dec 2023 07:08:53 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:08:52 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:07:59 +0100 Subject: [PATCH v3 03/11] arm64: dts: qcom: sc7280: Rename reserved-memory nodes Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-3-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 It was clarified a while ago that reserved-memory nodes shouldn't be called memory@ but should have a descriptive name. Update sc7280.dtsi to follow that. Reviewed-by: Konrad Dybcio Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 1b40e18ff152..f4d02d9dcb55 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -92,63 +92,63 @@ reserved-memory { #size-cells = <2>; ranges; - wlan_ce_mem: memory@4cd000 { + wlan_ce_mem: wlan-ce@4cd000 { no-map; reg = <0x0 0x004cd000 0x0 0x1000>; }; - hyp_mem: memory@80000000 { + hyp_mem: hyp@80000000 { reg = <0x0 0x80000000 0x0 0x600000>; no-map; }; - xbl_mem: memory@80600000 { + xbl_mem: xbl@80600000 { reg = <0x0 0x80600000 0x0 0x200000>; no-map; }; - aop_mem: memory@80800000 { + aop_mem: aop@80800000 { reg = <0x0 0x80800000 0x0 0x60000>; no-map; }; - aop_cmd_db_mem: memory@80860000 { + aop_cmd_db_mem: aop-cmd-db@80860000 { reg = <0x0 0x80860000 0x0 0x20000>; compatible = "qcom,cmd-db"; no-map; }; - reserved_xbl_uefi_log: memory@80880000 { + reserved_xbl_uefi_log: xbl-uefi-res@80880000 { reg = <0x0 0x80884000 0x0 0x10000>; no-map; }; - sec_apps_mem: memory@808ff000 { + sec_apps_mem: sec-apps@808ff000 { reg = <0x0 0x808ff000 0x0 0x1000>; no-map; }; - smem_mem: memory@80900000 { + smem_mem: smem@80900000 { reg = <0x0 0x80900000 0x0 0x200000>; no-map; }; - cpucp_mem: memory@80b00000 { + cpucp_mem: cpucp@80b00000 { no-map; reg = <0x0 0x80b00000 0x0 0x100000>; }; - wlan_fw_mem: memory@80c00000 { + wlan_fw_mem: wlan-fw@80c00000 { reg = <0x0 0x80c00000 0x0 0xc00000>; no-map; }; - video_mem: memory@8b200000 { + video_mem: video@8b200000 { reg = <0x0 0x8b200000 0x0 0x500000>; no-map; }; - ipa_fw_mem: memory@8b700000 { + ipa_fw_mem: ipa-fw@8b700000 { reg = <0 0x8b700000 0 0x10000>; no-map; }; @@ -158,7 +158,7 @@ gpu_zap_mem: zap@8b71a000 { no-map; }; - rmtfs_mem: memory@9c900000 { + rmtfs_mem: rmtfs@9c900000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x9c900000 0x0 0x280000>; no-map; From patchwork Fri Dec 8 15:08:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485533 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="VPTGQdeE" Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0FD5173F for ; Fri, 8 Dec 2023 07:08:58 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a1e116f2072so468535666b.0 for ; Fri, 08 Dec 2023 07:08:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048136; x=1702652936; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nqrSmJU5gLvma/2IHMa7gR6Hq0mtDYm0i9eqgtHH0+E=; b=VPTGQdeEGXUU5dn4SH+WlafMU43pffwErmMOBWY4wn3UWyMVCmVBHnJOyAUbSm4LvQ vb7grIoyf3Kat88guVFHVO7kmT3iPyS2woUcnw/vTJAHmBejvTctVBInynMdppBLP678 aC7X3uWPp8SdI2VElmj1S6JktyM3VtHmgbGrjO4pqc8DDxdrOzKO0Vp0iXEE/mAkrczh Vy4AX0YaApaQw9tsysF0FNwUKfg9JYfsQpPAnS161aHnJAPnn81ZF90msaIU12l9yFG1 +9Rcq6OJin98ARBSI3jXvN04+oe5MIP+W566/Hs0Sxmbnp6nBMDnSWq/ESQfMbMJ36D5 KMpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048136; x=1702652936; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nqrSmJU5gLvma/2IHMa7gR6Hq0mtDYm0i9eqgtHH0+E=; b=gZwFz2sVGxZ+RG7w6Bq7LJsvLTw6vdfltH8NxvK3N8z4Yx9m8Z5WBnFEi3TeEBY0WA d/mkCwfu9OHlsA64iXscZWC4WOEIWP2M5q5pMU1ZXjDiLUFNB69PLYlPvz6QcuaRDdjA Q+7Wv/nzky5p8z6VfvD9mVpYrfGGVl/lIOze2rMA8aM3hWs7aKjyidqdprBXUrqUwTuX yi5RBtQRj1WV0WpWmnclcDQkrRfPBgsXoePR6Vji+2R5Nns92H21gwmb1H+ymr/qAvYc t1BdHBDxgna4pBloLmdA497vbHpQNYulQ9TCh0cmc5ZN4VzNK0h0XIfojvdYz7hp54Qb LvJw== X-Gm-Message-State: AOJu0YxaiATMkfqN3cubmZ528Kj45/LzijgWJjiuK6LWrHnbqJx6TJC1 hP7/jXTT/NOepOJHKom8bt4XUMPtQ3DnFMqSHnM75A== X-Google-Smtp-Source: AGHT+IGTQhlhJ1xFyoTKSC+7o/RFvSRTQJNibHssLu7iXJXYPwK6jAMpxaaw1X1WFMINKL0IlQyvPw== X-Received: by 2002:a17:906:f142:b0:a1d:5483:d152 with SMTP id gw2-20020a170906f14200b00a1d5483d152mr286736ejb.68.1702048136590; Fri, 08 Dec 2023 07:08:56 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:08:56 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:00 +0100 Subject: [PATCH v3 04/11] arm64: dts: qcom: sc7280*: move MPSS and WPSS memory to dtsi Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-4-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 It appears that all SC7280-based devices so far have mpss_mem and wpss_mem on the same reg with the same size. Also these memory regions are referenced already in sc7280.dtsi so that's where they should also be defined. Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 10 ---------- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 5 ----- arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 5 ----- arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi | 1 + arch/arm64/boot/dts/qcom/sc7280.dtsi | 10 ++++++++++ 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index de49bb11f3c7..10f4c75aed3f 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -87,16 +87,6 @@ cdsp_mem: cdsp@88f00000 { no-map; }; - mpss_mem: mpss@8b800000 { - reg = <0x0 0x8b800000 0x0 0xf600000>; - no-map; - }; - - wpss_mem: wpss@9ae00000 { - reg = <0x0 0x9ae00000 0x0 0x1900000>; - no-map; - }; - rmtfs_mem: memory@f8500000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0xf8500000 0x0 0x600000>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index 186aa82ce662..fd3ff576d1fc 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -40,11 +40,6 @@ venus_mem: memory@8b200000 { reg = <0x0 0x8b200000 0x0 0x500000>; no-map; }; - - wpss_mem: memory@9ae00000 { - reg = <0x0 0x9ae00000 0x0 0x1900000>; - no-map; - }; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi index 203274c10532..b721a8546800 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi @@ -8,11 +8,6 @@ / { reserved-memory { - mpss_mem: memory@8b800000 { - reg = <0x0 0x8b800000 0x0 0xf600000>; - no-map; - }; - mba_mem: memory@9c700000 { reg = <0x0 0x9c700000 0x0 0x200000>; no-map; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi index 2febd6126d4c..3ebc915f0dc2 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi @@ -7,5 +7,6 @@ /* WIFI SKUs save 256M by not having modem/mba/rmtfs memory regions defined. */ +/delete-node/ &mpss_mem; /delete-node/ &remoteproc_mpss; /delete-node/ &rmtfs_mem; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index f4d02d9dcb55..221ab163c8ad 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -158,6 +158,16 @@ gpu_zap_mem: zap@8b71a000 { no-map; }; + mpss_mem: mpss@8b800000 { + reg = <0x0 0x8b800000 0x0 0xf600000>; + no-map; + }; + + wpss_mem: wpss@9ae00000 { + reg = <0x0 0x9ae00000 0x0 0x1900000>; + no-map; + }; + rmtfs_mem: rmtfs@9c900000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x9c900000 0x0 0x280000>; From patchwork Fri Dec 8 15:08:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485534 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="lqNu828b" Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 002C319BB for ; Fri, 8 Dec 2023 07:09:00 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a1f0616a15bso213343366b.2 for ; Fri, 08 Dec 2023 07:09:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048139; x=1702652939; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=T+fYAGPB7ccYtzFuGwN8+ETe0Pw0bdf6T8UKSdRouAU=; b=lqNu828biHOx3OAsCKtSqWsgvHhMztLC1UeJ3f5rb/ZIzC9l9iqNEcqxjxWXmSFsEU mooVDrZjqxYXACE789MnFKPfiO7i2kJIgt5KuL1GFBpMGL59mCNjVNuzhFoGqB8nENIt mT5AepXsSJQAahnCogW1lbQLq2OCOyOsbDeKb+xORn7dZPvDwuzALzR+oO+cV9UiSUe1 mWbtFbJbJ3mYF5qeLVtjpRfA9TIrtdD5LIJhZ+/ej3CGW3M2KFdM40eqmn8kCaBtHXwq pLHj9R6ZmSZz5kkJO5FVpcPST7SyF/242Bi5FJWjyXW8KL5lAjx/2mNhxOdfLC+dn43r n/GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048139; x=1702652939; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T+fYAGPB7ccYtzFuGwN8+ETe0Pw0bdf6T8UKSdRouAU=; b=afSm1ICoyi6wA2qtph86UV2ZOXLu6e6vy3jXIWObi+o+vPCEYvx3bqvQtQQVKxQkYK wm1U07I0fupIjwYUEhf3COckXbyGt9GyQY6pyNcjNhpm29s1mmQ+yT8bWzYwjUSF7FCW g8nTnIH1+7+lmvfZY5OQpV/L0wE0x8we7How0rstWpCT343Q/0NV0R4hDl89g/2N7Ane 2yyTTDSwfb8s6t8mKEgbZERRtLLklTfwK7KciZQLQVAoFIEZyJXdq3qG27RCXQ3RIv/A 2IW8rhLB0CZfRUZBiVZ1lqAYco4/KPC3WS/hEZaGjOUCS61OSYvfxSk7Atknr5idMwhe QDZA== X-Gm-Message-State: AOJu0Yx5KuIJ3ZIyTPH0+pyzOR2dno4+b7KB8FCwkgGPqRbzngGiOO5S LMKASEx0esx7KNn0gfUypKjeIbkZ0e+MlJpyfighCg== X-Google-Smtp-Source: AGHT+IFIqEHizA58jrWc6V4gUXwbZzpPyQqfiite7PHBiqSOy2F6BVUE922YVn9sDh7PogJGX8czHw== X-Received: by 2002:a17:906:796:b0:a19:a19b:78cd with SMTP id l22-20020a170906079600b00a19a19b78cdmr62252ejc.144.1702048139217; Fri, 08 Dec 2023 07:08:59 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:08:58 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:01 +0100 Subject: [PATCH v3 05/11] dt-bindings: remoteproc: qcom: sc7180-pas: Add SC7280 compatibles Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-5-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 Add the compatibles and constraints for the ADSP, CDSP and WPSS found on the SC7280 SoC. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Luca Weiss --- .../bindings/remoteproc/qcom,sc7180-pas.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml index 6f0bd6fa5d26..c054b84fdcd5 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml @@ -18,7 +18,10 @@ properties: enum: - qcom,sc7180-adsp-pas - qcom,sc7180-mpss-pas + - qcom,sc7280-adsp-pas + - qcom,sc7280-cdsp-pas - qcom,sc7280-mpss-pas + - qcom,sc7280-wpss-pas reg: maxItems: 1 @@ -75,6 +78,7 @@ allOf: compatible: enum: - qcom,sc7180-adsp-pas + - qcom,sc7280-adsp-pas then: properties: power-domains: @@ -120,6 +124,23 @@ allOf: - const: cx - const: mss + - if: + properties: + compatible: + enum: + - qcom,sc7280-cdsp-pas + - qcom,sc7280-wpss-pas + then: + properties: + power-domains: + items: + - description: CX power domain + - description: MX power domain + power-domain-names: + items: + - const: cx + - const: mx + unevaluatedProperties: false examples: From patchwork Fri Dec 8 15:08:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485535 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="uHePl+mO" Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D60BF19A4 for ; Fri, 8 Dec 2023 07:09:03 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9e1021dbd28so288565866b.3 for ; Fri, 08 Dec 2023 07:09:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048141; x=1702652941; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VJgQ/NHkfZyGsRA6kmIqgy2gaPo22Jj0YMIre8gEnCs=; b=uHePl+mOtzdpTLFWRACDlxDaWdkJHv938JnSmyW46u94O8E136XiWXvxgwCO0jTyBD weQawtGQ2f0BmsG29sihpBXyYf77zxlsOoenRhWBeJgpmwG7oomjamsNscVFLwSF6fSq eWu3zV/20WDDJKccFTwfpT0Qv4zPXE9Cm+W+1mwLOVPbuCwi456ReuC6ckYKIy4jS4kF g2fMRLL7Ln0cAKodODVL/PVvb3K2r4im+4RS2np+hemkZmqMatTuFmDpVgLwXIozsntn Ilz8ZtpGD9mOBOatuiYYrCxOz1Zuo1vtnnBC379Ahs73WAOei98flKhJlqj6bj1iNPjW u5rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048141; x=1702652941; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VJgQ/NHkfZyGsRA6kmIqgy2gaPo22Jj0YMIre8gEnCs=; b=PMjOdKB3pU5t30UMQmn+5TDLbyRHTld7GVGhF3ZQd7pFiZoT6EOcOTnjBhEoXiTmDD 9x/advVxNL6DgEFU7tGW5o3er6qW/NlC0HRbdw40MCy2PQu5jNiQGGPYIs0tvQP96XiR Sl4yoO4PnHe7XjOIHr/raZCS13Vi4JVO/Vxq94eHhMrtKx7eNmChMrwspUyUk14TRXYE 3MDFM6GH+K1vpen2Gxrb5neL3/NK8fsGh7x1VtwyRV44KE9WqsSwCop30vxEhdRoE3ZQ crawYf4vCJdiwuxGp23md3S8N2zhJjJqyd7u+MB0zC5qqaub/cYOZqSbv6HTtxJLiFkV lOng== X-Gm-Message-State: AOJu0YyvsfAVv45xJX37lPFoB0tv7sjWRfYBmREOiUBK9qFlVN9sBabh DX4plx8fPiffJsqqEWX8p1PmnR1eZTiueUZoVSKcuw== X-Google-Smtp-Source: AGHT+IHungVZez92cNJRscDc6+GcjcIpV8r8IRuDH3Qu0ZtOU3MgjNRqwZmO2lRoDaZ7vjm2X1VYNg== X-Received: by 2002:a17:906:fca5:b0:a1b:e80a:b68 with SMTP id qw5-20020a170906fca500b00a1be80a0b68mr54529ejb.143.1702048141722; Fri, 08 Dec 2023 07:09:01 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:09:01 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:02 +0100 Subject: [PATCH v3 06/11] remoteproc: qcom_q6v5_pas: Add SC7280 ADSP, CDSP & WPSS Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-6-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 Add support for the ADSP, CDSP and WPSS remoteprocs found on the SC7280 SoC using the q6v5-pas driver. This driver can be used on regular LA ("Linux Android") based releases, however the SC7280 ChromeOS devices need different driver support due to firmware differences. Reviewed-by: Konrad Dybcio Signed-off-by: Luca Weiss --- drivers/remoteproc/qcom_q6v5_pas.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 913a5d2068e8..a9dd58608052 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -1165,6 +1165,22 @@ static const struct adsp_data sm8550_mpss_resource = { .region_assign_idx = 2, }; +static const struct adsp_data sc7280_wpss_resource = { + .crash_reason_smem = 626, + .firmware_name = "wpss.mdt", + .pas_id = 6, + .auto_boot = true, + .proxy_pd_names = (char*[]){ + "cx", + "mx", + NULL + }, + .load_state = "wpss", + .ssr_name = "wpss", + .sysmon_name = "wpss", + .ssctl_id = 0x19, +}; + static const struct of_device_id adsp_of_match[] = { { .compatible = "qcom,msm8226-adsp-pil", .data = &adsp_resource_init}, { .compatible = "qcom,msm8953-adsp-pil", .data = &msm8996_adsp_resource}, @@ -1178,7 +1194,10 @@ static const struct of_device_id adsp_of_match[] = { { .compatible = "qcom,qcs404-wcss-pas", .data = &wcss_resource_init }, { .compatible = "qcom,sc7180-adsp-pas", .data = &sm8250_adsp_resource}, { .compatible = "qcom,sc7180-mpss-pas", .data = &mpss_resource_init}, + { .compatible = "qcom,sc7280-adsp-pas", .data = &sm8350_adsp_resource}, + { .compatible = "qcom,sc7280-cdsp-pas", .data = &sm6350_cdsp_resource}, { .compatible = "qcom,sc7280-mpss-pas", .data = &mpss_resource_init}, + { .compatible = "qcom,sc7280-wpss-pas", .data = &sc7280_wpss_resource}, { .compatible = "qcom,sc8180x-adsp-pas", .data = &sm8150_adsp_resource}, { .compatible = "qcom,sc8180x-cdsp-pas", .data = &sm8150_cdsp_resource}, { .compatible = "qcom,sc8180x-mpss-pas", .data = &sc8180x_mpss_resource}, From patchwork Fri Dec 8 15:08:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485536 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="gYnmLR7Q" Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A2F91BD5 for ; Fri, 8 Dec 2023 07:09:07 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a1ec87a7631so194084166b.0 for ; Fri, 08 Dec 2023 07:09:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048145; x=1702652945; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sT2Zj3HrJ8sHtWfHdRU4zdRK1MHTM/dOy3+Qf7en0Fg=; b=gYnmLR7QGoebl8NMyFsBWAUsXovyRDtw1JiZmSADr0Dlq1QKpl/AbXwd3smb+CQR0y jANGma93Lqt6Sra1oKCIUz3BJzBuB8Lmx2Azf2vYIu4rTGxzxW65zMJqhWN/z3vaNGKz mz7WYpfZY4tjVm3qsWr5WMfJUHUycaUzxyjBVcuXWusrBU+eSYRmPMqlxk9u6R0lQ5d6 gZFP0B9hR4TuMoa3W2KyHUunctOfg6KrSo71MjgU4YXkWW2uKO+2MI7+ZWTVG3u4jvNe xAELlSHp26i3nI1trDQ2poiMLsF+mCw4RL3fI2NEmqQ6Wco1C8LJM3iC+S2E9adtr093 xhdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048145; x=1702652945; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sT2Zj3HrJ8sHtWfHdRU4zdRK1MHTM/dOy3+Qf7en0Fg=; b=ogiWYMOt/aRiYpQNLbsxHkEo9mpLYVuR9ZLwtN4imNpUx0NpAxiU6H1sPhP+pOK9+Q uUTAWZoL2cZXgo823oAM4SIMHceYFgVvpy84hGRIyBj5X9KMO0dj+0XGnDaPyeZ3F9P4 3jjZzaib6YNpuCQCNVWauPQL24e7wMU9YZf9hesuJmZs/jfipDlM99DTp3EtneTyyVYL 2p26oyyo8RGpVKwtVDvmGz/ea4QHSwqAd1oIQxxeeptvp8YU+Hl9cLeicBduyp5MguPR 8cDCfOktynxK2VX9BLE5rwSyOg2EpnetZD7mMx27hRGzGxCM09wlOeVdStVHj+aSy12D Wwjg== X-Gm-Message-State: AOJu0YxbWI8uBPdnGVAMJ32mjSWS8/IFM60+BAzvk2Dei3TVSihMhH0d fq4ujushrk35UMJer3F1u8+qe2rirSRu/EwvCRVSfQ== X-Google-Smtp-Source: AGHT+IEbps1CxCjWp7PlUFJJO1S3IONR4gmI1FeIw1lqERRp811jh2vPtAdZpNvzqb91h8pG78FWuw== X-Received: by 2002:a17:907:350f:b0:a16:3375:6c18 with SMTP id zz15-20020a170907350f00b00a1633756c18mr74053ejb.23.1702048144910; Fri, 08 Dec 2023 07:09:04 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:09:04 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:03 +0100 Subject: [PATCH v3 07/11] arm64: dts: qcom: sc7280: Use WPSS PAS instead of PIL Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-7-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 The wpss-pil driver wants to manage too many resources that cannot be touched with standard Qualcomm firmware. Use the compatible from the PAS driver and move the ChromeOS-specific bits to sc7280-chrome-common.dtsi. Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 19 ++++++++++++++++++- arch/arm64/boot/dts/qcom/sc7280.dtsi | 15 +++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index fd3ff576d1fc..8f7682fe254a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -92,8 +92,25 @@ spi_flash: flash@0 { }; &remoteproc_wpss { - status = "okay"; + compatible = "qcom,sc7280-wpss-pil"; + clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>, + <&gcc GCC_WPSS_AHB_CLK>, + <&gcc GCC_WPSS_RSCP_CLK>, + <&rpmhcc RPMH_CXO_CLK>; + clock-names = "ahb_bdg", + "ahb", + "rscp", + "xo"; + + resets = <&aoss_reset AOSS_CC_WCSS_RESTART>, + <&pdc_reset PDC_WPSS_SYNC_RESET>; + reset-names = "restart", "pdc_sync"; + + qcom,halt-regs = <&tcsr_1 0x17000>; + firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt"; + + status = "okay"; }; &scm { diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 221ab163c8ad..f404276361fa 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3601,7 +3601,7 @@ qspi: spi@88dc000 { }; remoteproc_wpss: remoteproc@8a00000 { - compatible = "qcom,sc7280-wpss-pil"; + compatible = "qcom,sc7280-wpss-pas"; reg = <0 0x08a00000 0 0x10000>; interrupts-extended = <&intc GIC_SPI 587 IRQ_TYPE_EDGE_RISING>, @@ -3613,12 +3613,8 @@ remoteproc_wpss: remoteproc@8a00000 { interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack", "shutdown-ack"; - clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>, - <&gcc GCC_WPSS_AHB_CLK>, - <&gcc GCC_WPSS_RSCP_CLK>, - <&rpmhcc RPMH_CXO_CLK>; - clock-names = "ahb_bdg", "ahb", - "rscp", "xo"; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; power-domains = <&rpmhpd SC7280_CX>, <&rpmhpd SC7280_MX>; @@ -3631,11 +3627,6 @@ remoteproc_wpss: remoteproc@8a00000 { qcom,smem-states = <&wpss_smp2p_out 0>; qcom,smem-state-names = "stop"; - resets = <&aoss_reset AOSS_CC_WCSS_RESTART>, - <&pdc_reset PDC_WPSS_SYNC_RESET>; - reset-names = "restart", "pdc_sync"; - - qcom,halt-regs = <&tcsr_1 0x17000>; status = "disabled"; From patchwork Fri Dec 8 15:08:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485537 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="gNcnwtsH" Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DAF21FC0 for ; Fri, 8 Dec 2023 07:09:10 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a1b75f59a12so278506566b.3 for ; Fri, 08 Dec 2023 07:09:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048147; x=1702652947; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3GYxu5vNb9UOC9+Ks0EEx/+fAHrpRHM/oRCqL4Wixxg=; b=gNcnwtsH5FFL6ln6fYdy36zFKSkOUrAbU9KdB5G/P8wnKFbS4r14Kc3Tum9RKtGX5/ soPsbNEUiSBxrdHO43LEkD2MyQAaftGHHEtQ1kh7GTikGccprmXXKJh7izHmk6uHjcur x7j8hYHDUZXCHTpV0t359pztDD2VYMyahbEGYGjvzm6l0UiZEesVKFaRLDJxymJd+3yt TW/fGgJEUEUXA3HZCWa39ykz+B0ycHd/TJ84UAhXiyvWl6GNvvFw+Pr8ofsluz2fXirW k5fAgQe3Aokmn+MaolrZhr0Zv4HOB+o3QRTIzrWz8I7yQGTQYwmiyMj/mwengNHnBwK5 WK3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048147; x=1702652947; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3GYxu5vNb9UOC9+Ks0EEx/+fAHrpRHM/oRCqL4Wixxg=; b=grjOwKD4PIzC4rljcFrAVnLoQWfp0xmWV227oZkcqLU7eKX8nQrp/mjVvo0ztC6KRn +WKQBbLLyglSCqg/PQVUJ67JA6ulmhF3rQYerga8ZCyrZFUHg0HSyHCIzP+6eHG5IXEr XVTj56dsDc1mk4xWWVy8jHc9AMTrhxddiUPgDeaoDkBfpGdjl4gcMx+myuOUUUqxLtb4 AQE6h+jqe3t6qws5pFrd9D1n/iNgPuQ4vC45m1y5XMf/YlynUEllJ+65fULPpbtB97v/ LLGXuMG5wMYNy0qNxLpQs+5bfqO4ZIWfDh1ACAkO2e7kggRUZsvo23GPta61Jl7H0XlD 3r+A== X-Gm-Message-State: AOJu0YycCey8l07pB5bcBZ/Gj8iAWOkEh2vewcDyiIq5WGPdLRKUbD9z HLR3SxMz3QE9o7FfMMf2FlRVGaumqPhSXycvZU/h5Q== X-Google-Smtp-Source: AGHT+IFPKdSvBmgG4k5t8wjzwxLYY7RoBwUh5zsRCXn1qsCZ87DEkz0BTDFQyQWNgiRhavvMjylrwg== X-Received: by 2002:a17:907:31cd:b0:a1c:9f65:a414 with SMTP id xf13-20020a17090731cd00b00a1c9f65a414mr41229ejb.152.1702048147713; Fri, 08 Dec 2023 07:09:07 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:09:07 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:04 +0100 Subject: [PATCH v3 08/11] arm64: dts: qcom: sc7280: Add ADSP node Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-8-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 Add the node for the ADSP found on the SC7280 SoC, using standard Qualcomm firmware. Acked-by: Konrad Dybcio Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 5 -- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 5 -- arch/arm64/boot/dts/qcom/sc7280.dtsi | 74 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index 10f4c75aed3f..b1ea31720d7b 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -77,11 +77,6 @@ cont_splash_mem: cont-splash@e1000000 { no-map; }; - adsp_mem: adsp@86700000 { - reg = <0x0 0x86700000 0x0 0x2800000>; - no-map; - }; - cdsp_mem: cdsp@88f00000 { reg = <0x0 0x88f00000 0x0 0x1e00000>; no-map; diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index 8f7682fe254a..a60fb58d1bf1 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -26,11 +26,6 @@ / { reserved-memory { - adsp_mem: memory@86700000 { - reg = <0x0 0x86700000 0x0 0x2800000>; - no-map; - }; - camera_mem: memory@8ad00000 { reg = <0x0 0x8ad00000 0x0 0x500000>; no-map; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index f404276361fa..6d319c8c6acf 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -143,6 +143,11 @@ wlan_fw_mem: wlan-fw@80c00000 { no-map; }; + adsp_mem: adsp@86700000 { + reg = <0x0 0x86700000 0x0 0x2800000>; + no-map; + }; + video_mem: video@8b200000 { reg = <0x0 0x8b200000 0x0 0x500000>; no-map; @@ -3600,6 +3605,75 @@ qspi: spi@88dc000 { status = "disabled"; }; + remoteproc_adsp: remoteproc@3700000 { + compatible = "qcom,sc7280-adsp-pas"; + reg = <0 0x03700000 0 0x100>; + + interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>, + <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 7 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", "handover", + "stop-ack", "shutdown-ack"; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + + power-domains = <&rpmhpd SC7280_LCX>, + <&rpmhpd SC7280_LMX>; + power-domain-names = "lcx", "lmx"; + + memory-region = <&adsp_mem>; + + qcom,qmp = <&aoss_qmp>; + + qcom,smem-states = <&adsp_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts-extended = <&ipcc IPCC_CLIENT_LPASS + IPCC_MPROC_SIGNAL_GLINK_QMP + IRQ_TYPE_EDGE_RISING>; + + mboxes = <&ipcc IPCC_CLIENT_LPASS + IPCC_MPROC_SIGNAL_GLINK_QMP>; + + label = "lpass"; + qcom,remote-pid = <2>; + + fastrpc { + compatible = "qcom,fastrpc"; + qcom,glink-channels = "fastrpcglink-apps-dsp"; + label = "adsp"; + qcom,non-secure-domain; + #address-cells = <1>; + #size-cells = <0>; + + compute-cb@3 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <3>; + iommus = <&apps_smmu 0x1803 0x0>; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x1804 0x0>; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x1805 0x0>; + }; + }; + }; + }; + remoteproc_wpss: remoteproc@8a00000 { compatible = "qcom,sc7280-wpss-pas"; reg = <0 0x08a00000 0 0x10000>; From patchwork Fri Dec 8 15:08:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485538 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="4P5H4ocZ" Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A1A81BFE for ; Fri, 8 Dec 2023 07:09:13 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a196f84d217so261740066b.3 for ; Fri, 08 Dec 2023 07:09:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048151; x=1702652951; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Uz469c4gN5niM5rjlwO+5+JkVlMzaiEgq9wGKFyoPqU=; b=4P5H4ocZBphar5DifVkZy6eexJH+QOtyA8Ky+q7fbcZAVkm/KJC15AMIpWmrWdRICq lpxQFuWg8AMfp70Wx3oNC8IaxV49UuweyLge8Sts1BdP2iUZ6kimic09qdV2QOznMCdS 6Vq+e0Jfrerk6mTGBDAVAw5A8f7yoRB3ScQHtSKn65r8RhXoaLCXqest1B320YdQsAoT CbZ36JPWnLwPD6/cuW+v9ViaoDxpBh3QCH+zchpFRqkr4M8da8LB+eVWd7Uu+yIK0gvq BdA440yAjC5WPKGM1uXFcXlqT5oeoltoms/ud2sJ62k7TTor9gIqb5t8zIuKQp15YfzR My7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048151; x=1702652951; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Uz469c4gN5niM5rjlwO+5+JkVlMzaiEgq9wGKFyoPqU=; b=Yp/78l0lPMrTgc2nnEmha+y71o35QtvMlL7HRUSi4Z95riFKMYTeQSoPechc5HV1un 7AbkJN2Bzb/xtJ2m7h+GMt66BTotbJ4A4uKU1qnKBqWq++FtGEexDze+ZPNfki6Q8t8j KWsMyPhulGC8GMZRqICSH5BiisNvR6hhS3TU005uIUBKjTLpaxDBdZG/ZmdWicp9tWRe 5IVSBXbeBXep1LCWfWKkTSNIuIJ40EEkLmmFnhkWnMzKEed2mZfM+1LI0Xfi1bQv2oHx 6SlLXw084KuQPYFffH78pTfLKGn9x1gFMhqIKplIoRgKP8ya7QFpK4PSMA7T4OFyUcDl abPw== X-Gm-Message-State: AOJu0YyMJa4af7vqG7ytdFlMqJ0c8Uc4k9niqtzoohKCDK92v40oxbbO KK57AsWBH1nj4qlPrHc1khKoDrpeaF6uG5XkCPjQvw== X-Google-Smtp-Source: AGHT+IHSQ3i9C6rNLUi/kwzRb7sDWmy7dvRBz70Y0zQN3w/4uY2lGSOJrZIYv/smgSuGvXnSWxrstA== X-Received: by 2002:a17:906:1114:b0:a1c:c318:4bd9 with SMTP id h20-20020a170906111400b00a1cc3184bd9mr56709eja.154.1702048151506; Fri, 08 Dec 2023 07:09:11 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:09:11 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:05 +0100 Subject: [PATCH v3 09/11] arm64: dts: qcom: sc7280: Add CDSP node Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-9-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 Add the node for the ADSP found on the SC7280 SoC, using standard Qualcomm firmware. Remove the reserved-memory node from sc7280-chrome-common since CDSP is currently not used there. Acked-by: Konrad Dybcio Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 5 - arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 6 + arch/arm64/boot/dts/qcom/sc7280.dtsi | 143 +++++++++++++++++++++ 3 files changed, 149 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index b1ea31720d7b..9c25e28a62d9 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -77,11 +77,6 @@ cont_splash_mem: cont-splash@e1000000 { no-map; }; - cdsp_mem: cdsp@88f00000 { - reg = <0x0 0x88f00000 0x0 0x1e00000>; - no-map; - }; - rmtfs_mem: memory@f8500000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0xf8500000 0x0 0x600000>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index a60fb58d1bf1..c53a5f32915a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -17,6 +17,7 @@ * required by the setup for Chrome boards. */ +/delete-node/ &cdsp_mem; /delete-node/ &gpu_zap_mem; /delete-node/ &gpu_zap_shader; /delete-node/ &hyp_mem; @@ -86,6 +87,11 @@ spi_flash: flash@0 { }; }; +/* Currently not used */ +&remoteproc_cdsp { + /delete-property/ memory-region; +}; + &remoteproc_wpss { compatible = "qcom,sc7280-wpss-pil"; clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>, diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 6d319c8c6acf..0c25b4ecd0dc 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -148,6 +148,11 @@ adsp_mem: adsp@86700000 { no-map; }; + cdsp_mem: cdsp@88f00000 { + reg = <0x0 0x88f00000 0x0 0x1e00000>; + no-map; + }; + video_mem: video@8b200000 { reg = <0x0 0x8b200000 0x0 0x500000>; no-map; @@ -3842,6 +3847,144 @@ nsp_noc: interconnect@a0c0000 { qcom,bcm-voters = <&apps_bcm_voter>; }; + remoteproc_cdsp: remoteproc@a300000 { + compatible = "qcom,sc7280-cdsp-pas"; + reg = <0 0x0a300000 0 0x10000>; + + interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>, + <&cdsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&cdsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&cdsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&cdsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>, + <&cdsp_smp2p_in 7 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", "handover", + "stop-ack", "shutdown-ack"; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + + power-domains = <&rpmhpd SC7280_CX>, + <&rpmhpd SC7280_MX>; + power-domain-names = "cx", "mx"; + + interconnects = <&nsp_noc MASTER_CDSP_PROC 0 &mc_virt SLAVE_EBI1 0>; + + memory-region = <&cdsp_mem>; + + qcom,qmp = <&aoss_qmp>; + + qcom,smem-states = <&cdsp_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts-extended = <&ipcc IPCC_CLIENT_CDSP + IPCC_MPROC_SIGNAL_GLINK_QMP + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_CDSP + IPCC_MPROC_SIGNAL_GLINK_QMP>; + + label = "cdsp"; + qcom,remote-pid = <5>; + + fastrpc { + compatible = "qcom,fastrpc"; + qcom,glink-channels = "fastrpcglink-apps-dsp"; + label = "cdsp"; + qcom,non-secure-domain; + #address-cells = <1>; + #size-cells = <0>; + + compute-cb@1 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <1>; + iommus = <&apps_smmu 0x11a1 0x0420>, + <&apps_smmu 0x1181 0x0420>; + }; + + compute-cb@2 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <2>; + iommus = <&apps_smmu 0x11a2 0x0420>, + <&apps_smmu 0x1182 0x0420>; + }; + + compute-cb@3 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <3>; + iommus = <&apps_smmu 0x11a3 0x0420>, + <&apps_smmu 0x1183 0x0420>; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x11a4 0x0420>, + <&apps_smmu 0x1184 0x0420>; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x11a5 0x0420>, + <&apps_smmu 0x1185 0x0420>; + }; + + compute-cb@6 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <6>; + iommus = <&apps_smmu 0x11a6 0x0420>, + <&apps_smmu 0x1186 0x0420>; + }; + + compute-cb@7 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <7>; + iommus = <&apps_smmu 0x11a7 0x0420>, + <&apps_smmu 0x1187 0x0420>; + }; + + compute-cb@8 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <8>; + iommus = <&apps_smmu 0x11a8 0x0420>, + <&apps_smmu 0x1188 0x0420>; + }; + + /* note: secure cb9 in downstream */ + + compute-cb@11 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <11>; + iommus = <&apps_smmu 0x11ab 0x0420>, + <&apps_smmu 0x118b 0x0420>; + }; + + compute-cb@12 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <12>; + iommus = <&apps_smmu 0x11ac 0x0420>, + <&apps_smmu 0x118c 0x0420>; + }; + + compute-cb@13 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <13>; + iommus = <&apps_smmu 0x11ad 0x0420>, + <&apps_smmu 0x118d 0x0420>; + }; + + compute-cb@14 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <14>; + iommus = <&apps_smmu 0x11ae 0x0420>, + <&apps_smmu 0x118e 0x0420>; + }; + }; + }; + }; + usb_1: usb@a6f8800 { compatible = "qcom,sc7280-dwc3", "qcom,dwc3"; reg = <0 0x0a6f8800 0 0x400>; From patchwork Fri Dec 8 15:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485539 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="21gumZTl" Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FADB1FD6 for ; Fri, 8 Dec 2023 07:09:16 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9fa45e75ed9so248168966b.1 for ; Fri, 08 Dec 2023 07:09:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048154; x=1702652954; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=i8hg75fxw9R+dBPdPORPMttaCUpNuozfVfSBn/F7kAo=; b=21gumZTlYpHHCyOvLr0xICTvdQASzRB644cNYztLQzfUSSqdgSIHTiG2DgPuVbiIYd Mzs9OHJva4WrAYyOrLhX5H3VKdHiSHBwtPWZHWIS61DTrJH3bny20bmnvJLMkeG4hG9p 1EKIyznSwd8dsALeDm1WSosu/shbrLe8/RpiaJVGoPy/PLCq2stkR3gyY3PmkhDboU/o n54wcELF2T1j0P3w6fxZ/WnTx2a1/tcqK+Cxci28+rCKgc2+4tqeTwgyj6IPEsREvcgY zD3Y6jTWliGybLBU1DuoWeo9MePcbKSZrRGs7Ng4QyaQaQQXgZ0V2kZDr9zda2zDIZyi c9Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048154; x=1702652954; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i8hg75fxw9R+dBPdPORPMttaCUpNuozfVfSBn/F7kAo=; b=l+0Jnuxk1+ftShUyfIaBE0zQWDtoKC/PyiLZzbLwMFFN30VoMYusK5p7ec6qUvYeCr Ba1CW0noIqO0D6reOsheoLzq60mwVK/gZWSTGQCQS9ZgclDBSbVkFLX3CA20wepEyinL EKyXxAaKpRwhZCrHgX3oaAlxy8/73ltoSUUBqLRK38Sa006ogX2NMrqSGY2ZYr9XL2/c 1lp18blX8Bu/MeH4ZlM3HX0nM+5BA5EceDHZlPbILrRl46j4JOeaPlF3ySF2II+K7Ase wEGuuji5tN112Fk2tDmCtlDuHSbj/3xgSHgzeN98pDLA/2dOqaPNSLXe9TlSSvC82B25 Yaxg== X-Gm-Message-State: AOJu0Yx2BQYxQiT8YWIaxnMsfJa0S8NoylrouNX1RMFNvmO4E9uD23Y0 Jp4rbfO7WI/GDZL+27I35ckt0DsyAVlOi7v6YLrSOA== X-Google-Smtp-Source: AGHT+IHpNXHD7hMM4qjciCbNAZmxBp44HoDMbmCRqYLv3IH/ca5r9OaByDVmFwDOwqNYTv9DcdmjuQ== X-Received: by 2002:a17:906:eecb:b0:a1d:ec18:6ada with SMTP id wu11-20020a170906eecb00b00a1dec186adamr86437ejb.104.1702048154429; Fri, 08 Dec 2023 07:09:14 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:09:13 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:06 +0100 Subject: [PATCH v3 10/11] arm64: dts: qcom: qcm6490-fairphone-fp5: Enable various remoteprocs Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-10-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 Enable the ADSP, CDSP, MPSS and WPSS that are found on the SoC. Reviewed-by: Konrad Dybcio Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index 9c25e28a62d9..830dee4f2a37 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -691,6 +691,26 @@ &qupv3_id_1 { status = "okay"; }; +&remoteproc_adsp { + firmware-name = "qcom/qcm6490/fairphone5/adsp.mbn"; + status = "okay"; +}; + +&remoteproc_cdsp { + firmware-name = "qcom/qcm6490/fairphone5/cdsp.mbn"; + status = "okay"; +}; + +&remoteproc_mpss { + firmware-name = "qcom/qcm6490/fairphone5/modem.mbn"; + status = "okay"; +}; + +&remoteproc_wpss { + firmware-name = "qcom/qcm6490/fairphone5/wpss.mbn"; + status = "okay"; +}; + &sdc2_clk { drive-strength = <16>; bias-disable; From patchwork Fri Dec 8 15:08:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13485540 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="iVSDUnwg" Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81DC319AC for ; Fri, 8 Dec 2023 07:09:19 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a1f0616a15bso213372366b.2 for ; Fri, 08 Dec 2023 07:09:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1702048157; x=1702652957; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5saW7f08DRNg60nP1egaBbrtQdtUawHIZ006YWZ+vGo=; b=iVSDUnwgi00pXXu/e7hHEpen3vn61cDhuVfiXrcTc9yDwHTDzhNMaSnQHXCRn7nSnT 5yahXJP3yTplAMjDrhvx1HWf+iIl841nHgZekgaXvy1r6ynMAEzU127A07AcKIB/zRg3 zCA4sNdz3EuDO9URtJYzvqzmzBX31S6qY5B9VEhYBSWbE/aQxquY23PQyyhGqbN6Akzi QXvyQhGfOZn9V+fEEu+dcaMHNzVbjQ22C70slcyqVX96gmaVRvrAUxEhdQrldpsfeanf bJWdOy690YtuH8CVuIgz3XdSqFTySK7CeddqfJISNfksvm4yLoaeJ26W/xoGOb7zwNO4 fYbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702048157; x=1702652957; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5saW7f08DRNg60nP1egaBbrtQdtUawHIZ006YWZ+vGo=; b=DWPF24fL7IDUX65CLK9vlhe9XDF278OdhR1q1wEcwaUkt+XhPki4cqQveUsevnOgBP +CqbrpMM0ftRKfTpI5szZkNffNgOd2J2fr8g2J7vTRcG8Hctqx+QI8xd+bag6hCzTihK gtrOz2sL0XaSAsr/E1pcUm4TZjcBzuz5kySIcHbpKef23Tt/b0GZJ9SMgYR5SaSbMIjl BTbYlGtZL6hINEvK6KSO+i4n4tsWV+sB8l2RMYx7QF9rlmbZkK4eQYCGXVnWPPW3bHS7 o2/d/JvxNxMX4DmJQ0CSfJZfHDJA6REesxMlDNjMrRf5Qh8bX5F26EZAoWuwHcMbF6qe AbUw== X-Gm-Message-State: AOJu0Yx9XzwVYEEXPLWwSbBufrNnCNGUuFL1MySZmqXmYdff9EOsRQIT +++DVVIbNZTtjqLhTOi5lB/lYsbkP4308nAcqoBQug== X-Google-Smtp-Source: AGHT+IEd51m0JuEJzkDN/9QlvvgYBDbrDZhxRc+YXzhVBNr7lRFtZjwsx9lkYs0+gZHZb4zXuUHSdg== X-Received: by 2002:a17:906:10c7:b0:a1d:2e32:d284 with SMTP id v7-20020a17090610c700b00a1d2e32d284mr60291ejv.23.1702048157297; Fri, 08 Dec 2023 07:09:17 -0800 (PST) Received: from [192.168.55.221] (tmo-113-102.customers.d1-online.com. [80.187.113.102]) by smtp.gmail.com with ESMTPSA id r25-20020a170906351900b00a1cc1be1146sm1096114eja.217.2023.12.08.07.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 07:09:17 -0800 (PST) From: Luca Weiss Date: Fri, 08 Dec 2023 16:08:07 +0100 Subject: [PATCH v3 11/11] arm64: dts: qcom: qcm6490-fairphone-fp5: Enable WiFi Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-sc7280-remoteprocs-v3-11-6aa394d33edf@fairphone.com> References: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> In-Reply-To: <20231208-sc7280-remoteprocs-v3-0-6aa394d33edf@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , 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.12.4 Now that the WPSS remoteproc is enabled, enable wifi so we can use it. Reviewed-by: Konrad Dybcio Signed-off-by: Luca Weiss --- Depends on (just to resolve merge conflicts, could also rebase without that): https://lore.kernel.org/linux-arm-msm/20231201-sc7280-venus-pas-v3-3-bc132dc5fc30@fairphone.com/ --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index 830dee4f2a37..03ec0115b424 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -914,3 +914,8 @@ &venus { firmware-name = "qcom/qcm6490/fairphone5/venus.mbn"; status = "okay"; }; + +&wifi { + qcom,ath11k-calibration-variant = "Fairphone_5"; + status = "okay"; +};