From patchwork Mon Nov 13 08:56:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164375 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1077197vqg; Mon, 13 Nov 2023 00:57:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFKiXjMZaYJrr3wP472Pz1D/l3XyATnd3vs/QBaM70xVEQuDTnqHfBHEA4bka4v9ilL+Xsk X-Received: by 2002:a17:903:2284:b0:1ca:86db:1d31 with SMTP id b4-20020a170903228400b001ca86db1d31mr4550509plh.7.1699865871304; Mon, 13 Nov 2023 00:57:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699865871; cv=none; d=google.com; s=arc-20160816; b=JpQ10DfdWhxzrC14JeTydXxAnKZRMWyxRDCYqAGWgz3adHL+PJCrnnUDWngfCkW0Z/ 4pHHCP9/xpzkR3eYDECFORO1pnQkk3YFGJR8ZlZkgI4dJ4WcdQEIjAPC4ecRS/Es396y 1u2cBw0falWKDIOGAIpvn9jYzeFhJvDLlFV4Hi46AnDvBK0ffTsDoihs1qgwEuQujxRl BZhu8CTjMttwPigZyYKKuLyrUEfYhBx2F6F4KUr9zYzAtf3JKPX36qQJ/G17pLZa0gnF j/GiQG/vRwfsHtsspvK/F2+6UAlpCP3R8GwTEBKuFoE1FUR7ywRgtNYbGQxzdhNS7X+K 28qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=8Yy2i2F+9pJywYxY6AKw4sbn/DiDdL44GgjGmpRdRoA=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=bhUS05MoWP4gIqD0e7ZlelseuWtG38aC/L3E8gmArNFwL7oin+YFpyIYHGwCrB1KfE NOoIvMGjvsER4nnIWm/OepIU4crk7SKx33T2qvEvOg78Sdx4DLLANkHIcWlyWDMtwBXp X0FkD5RJKitit5/SMMafThTHov7U7Q9/tKy6BM2CI5s0Y8Lb1UvzzFvcttPdGSI75vt2 6g0M5+5RiCMT7VnMJoJit6mz6PpcEhUibzBSVtoy0IC7GYREINPMHjbCrAIc8Enx5nT8 25XdsiMjH9YhaFTG+kzOVyhDqwXd4JUzYb69rG9L8WlMJsvK/QuCDl++/2d/WitUV8Y3 llgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=3asjtuz7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ja13-20020a170902efcd00b001cc0fdbea2asi4997917plb.142.2023.11.13.00.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:57:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=3asjtuz7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 96F5480699DD; Mon, 13 Nov 2023 00:56:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233288AbjKMI4e (ORCPT + 29 others); Mon, 13 Nov 2023 03:56:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233238AbjKMI42 (ORCPT ); Mon, 13 Nov 2023 03:56:28 -0500 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 E631F10DA for ; Mon, 13 Nov 2023 00:56:23 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9e1fb7faa9dso632728666b.2 for ; Mon, 13 Nov 2023 00:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865782; x=1700470582; 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=8Yy2i2F+9pJywYxY6AKw4sbn/DiDdL44GgjGmpRdRoA=; b=3asjtuz7sgt8quCwhI1cdHSBLmVtwRjEFYRU9UTkuX8DFtQYc5UuI85sxenC1MLo+S LI/bwueDq3LNbZD7UNwel4436vXjg/oDoiIy/fClR3dU34uY1NAZ+ad+/TY8AfKaQokm b11EN04wMukjV8kBpF6U77vmAG9jcMef8eBrgcVAOh13xtS405t3a1AZSbzny8YyiRKq gQSdWmxyE9QsSHummEALpZcQWon7pQKPHhH/IlGYKSreghHBjekbsMoyGDu3f7rA+yNS dpOcIwsp0ROzqnfqu1ye6gvG5UTUkPRoiF5JMQ8Qt+hDnlE+YQZ2enVFh+IcpKQCsUnT +Qjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865782; x=1700470582; 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=8Yy2i2F+9pJywYxY6AKw4sbn/DiDdL44GgjGmpRdRoA=; b=etKfpWTuDB7PBuB/lCaCF05BaCeKTCWP9q9Ojtz5nOaaFnjL1whNxzV0yMt5cJ2ZIl ycFAKDpsP2Ayo3lx/kiSkK8JbSb+CT5joIgeoFCA8bIYX8jIW6ygrjRZtI7RlkuHFvwB JzOrVEShr+4UfK6mUG1rT4F7wKA1AbF4SRncLzcshRR8RlqWWzoUjRgQ21/blIQNqfxs pUVLKYpfJDqnMNucp61YxXzWadAzUV1oUxy/WJP+noHLx2yemh0rJTa0g22fSGnzOrs/ fuW3MHjkJ/gRTIt7+eXVYg/rJmyKh/y0JbkQ2PIMiQK1W+dFgfFDV8Rez2dnb3J1Kpa4 hXNA== X-Gm-Message-State: AOJu0YyH3966LrAVBfCkrEZ1oSCUjMciLl3aJkkY0tZP1ikW5tS8lBJZ zIlZdBS2/nHfyrIqlwZQViLQ6g== X-Received: by 2002:a17:906:4708:b0:9e5:2e15:35c6 with SMTP id y8-20020a170906470800b009e52e1535c6mr4195362ejq.44.1699865782434; Mon, 13 Nov 2023 00:56:22 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:21 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:12 +0100 Subject: [PATCH v2 01/11] dt-bindings: remoteproc: qcom: sc7180-pas: Fix SC7280 MPSS PD-names MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-1-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:56:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782438555557033224 X-GMAIL-MSGID: 1782438555557033224 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 Mon Nov 13 08:56:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1081194vqg; Mon, 13 Nov 2023 01:07:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmU/43iXKBDcr8EJ2dGEiqku9qRfRGD1k97CuRlPQKKlkt/Fsy78U18V+yDfhmLkf2o7uk X-Received: by 2002:a17:90b:33c3:b0:27f:bd9e:5a19 with SMTP id lk3-20020a17090b33c300b0027fbd9e5a19mr3489101pjb.25.1699866422210; Mon, 13 Nov 2023 01:07:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699866422; cv=none; d=google.com; s=arc-20160816; b=j4WIQTJn/y8kKr08bVEJetDxWYvVGKz42dzsKHI7cTeNCQpsN5/AxaQdNitES2XdmC /BeVbpkVDha7cgQj1wvQbw51vcDb5dM2HxGNKwaKa2MRCZkzMM/5IY9fJi5Zfyr09QZE t2P8ZVeqOVI8DXg8I6ku3V6G1fsF6d2apXrHzUyLvKJaniMc9LaSvXqlwYda1JQU4bYe fcGe1KOjtmhTSYtcZHMY9qCMylK/WbK87vtYHXhQHXA9IKSG7suFKK+i3Jdb/5I+qAe/ 6ousmxYcbXzYcy/B/DEP4yDbNUYTdRsMV66VApogVYgZBJLc7arSwK+JhMpYX9BMILDg czmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=u7LwuWo/xQR19drDlZX7ccinmtAJFTBRZl3P7VkhCjE=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=kI18eixelExIORg+BH/TyzwFDzLtsWKo8r3gXVPQzZQiR3hGZ0qQGv4ixkvWnPIPK1 ZYER/hv8aKDo8HVTkoP1B8vVFMlxPwtD3gnCJUowoawIezYIc0c1qGB0VMiLS9Qc/6GA ouuop41YdO6cUfY4lGqOO4aqJvfZ4fIJaOETEh+YuBslaYbKXziicINwaQ91Is9dE2Ir j+lAicxF+5Qr/OO/KxQeDEB3K7ebd8v2EhLKnT7SrcVw+dWBnOFMy5x7EcJtjZAnwgGt VeXckeJbF88fcY7rABuZOqavxxE/2vCfAHLNAH+ymMnRmqJ/CsYEbLipff7yYVFlDKqb qWIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=HMvEqzIm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id nv14-20020a17090b1b4e00b0028047ab56desi5975424pjb.36.2023.11.13.01.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 01:07:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=HMvEqzIm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id DAF1B8057E7B; Mon, 13 Nov 2023 00:57:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233329AbjKMI4l (ORCPT + 29 others); Mon, 13 Nov 2023 03:56:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233270AbjKMI43 (ORCPT ); Mon, 13 Nov 2023 03:56:29 -0500 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 431FA10F9 for ; Mon, 13 Nov 2023 00:56:25 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-9dd6dc9c00cso637214266b.3 for ; Mon, 13 Nov 2023 00:56:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865783; x=1700470583; 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=u7LwuWo/xQR19drDlZX7ccinmtAJFTBRZl3P7VkhCjE=; b=HMvEqzIm3huRRk/LvVMyldJayReJUcIvxGNx6551nf/ecvuReoVKyPJYDRc90kO5D0 4ti8Svgmr4NyuuVql0OtmxNYh53osg0cNqB2uul+sNjsv34Sr5Z2XD+5y+/S724wU5Zu RzPFWBIXQ90vubdusccSXjhLxWlkNCANazc4OuTRcQCiLB7qXPCHb3bao3gWWBAYkFdC eltMxQm3y4ZZR5h9nBL9sAQnoiERgaqI9h9Vpg2Ahio80+z1ekgGNQ1Kq5htWmebkfj1 ICnGXKUe5DvTm4iO0bE36ELYdJ7bh1RA1CY52h2vSIEmyQWDO7c9W0GZZhdt1OEUXp/k XkoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865783; x=1700470583; 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=u7LwuWo/xQR19drDlZX7ccinmtAJFTBRZl3P7VkhCjE=; b=myX8KlPetl2eaIQ+rgerHbU/Bhw7EwBvfO7ENXokVCxUUcg05oXJ6aY6E0CMOXTb6x GwrFYtp8SNDzoj7myyJGuWymCf9ct8Jrthcz2/z+KGuTMDREOY/eIznTmcpltXCvf1dV 3nCa3ZmboJEF0b2tNe+CCLDNpmHYuAw3ubRkWhk3GAOQtXFoXoYDXdQCNo2xsfRlSOv/ ZbMZESo1CrycMP3GRsGD/ZlV04tYxSsNW+QfiklP7cVPguoJ9UWmCo3uAJUoR9OR/CY6 kGI3TJjoIeoa3CSnkKo8WElelBCTLLQ+VrNLyYaNT59UV4GTAGxEWRxl+hU39RDIWexx axRg== X-Gm-Message-State: AOJu0YwRtB/fbBtBqBIHpJf7gwYea7alLZq/RlAaCpeqe1GXxhIjjl33 LKW1cceBaeToQBqJJYw81WuBTQ== X-Received: by 2002:a17:906:44e:b0:9e6:c845:dba6 with SMTP id e14-20020a170906044e00b009e6c845dba6mr3579811eja.66.1699865783665; Mon, 13 Nov 2023 00:56:23 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:23 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:13 +0100 Subject: [PATCH v2 02/11] arm64: dts: qcom: sc7280: Remove unused second MPSS reg MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-2-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:57:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782439133535168709 X-GMAIL-MSGID: 1782439133535168709 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 5db468d1a06e..0d9cc44066ce 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2848,8 +2848,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 Mon Nov 13 08:56:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164384 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1086347vqg; Mon, 13 Nov 2023 01:20:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IFnFz0+8C2xb7AejYbaveND1Z+/NYaG2qW5wCp4Owa0QayStIE93VvPP2ATbCdENCNQ35jX X-Received: by 2002:a05:6870:d0cc:b0:1ba:cc77:1d81 with SMTP id k12-20020a056870d0cc00b001bacc771d81mr8644907oaa.46.1699867245986; Mon, 13 Nov 2023 01:20:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699867245; cv=none; d=google.com; s=arc-20160816; b=bUEbFAtLu3Q0bthTq/8OiOgOMzEVTRzmZedVDvSmaLqUZ5l4d7MayW+iLwfGwtU95r uLtSAiGgX6CmfhEieaV3n5nO1a/inb+LbuJ+MB+XYa5WSErF15linI32VzceHGDr5pUl UUM6FRhA10uiC5jF0oPlEIq6r8rqrK44AZZdU6bIl6ECkEBdHvP41BPzUgvXXcWJgL9/ GO7ogfeHg4tTFH2r4xPtitm5tOswieofafKz21Wcp/lmIV0t8atreEGHoDs9EmJrjhqU tSbeu/Z9uuUdWN1sAvoR0uzMYDH0gaDcG9OPq3My1lHkqxMutA7lPJbT2i6idqG2spaK LL4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=mASKoKAO36kXxxMIcfJoCKkWeIfM9SAibAagzp3xhpQ=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=kA+coWQam227ZZORuVxmNvHI5GM1P8pEPd88FbIMzbwFoYdBiDtS9Gtdhf18plu44E R6eyNjgMsSquDGUlq3DliBcPLL/NZAzWzw6KW0KFZlfcUhjx6BGR0S/aRKS0mZ0ck9gf pcJXknz544Ipcu2uMxkZ1ffq7SG32gx8E30mHsNQx79HAAzstEm+0ccewInchjeDwWTv DV2HjdTcqh5eZOMM8Hb/FoQjCDRPESQzqfMX7wkwl8g4jgyMn0GN9k+XEEDkPI93dRoJ aRjMq8pk4Ok4kP0MYVFq4fP3yPToPF1TLLX8mTKlXRjat3BSJwiAD/8k6l6z/mudfA7i VNgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=xzR8CkdF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id s128-20020a637786000000b005bdd7cadb98si5603651pgc.54.2023.11.13.01.20.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 01:20:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=xzR8CkdF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 14A7A8061416; Mon, 13 Nov 2023 00:57:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233285AbjKMI4h (ORCPT + 29 others); Mon, 13 Nov 2023 03:56:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233273AbjKMI4a (ORCPT ); Mon, 13 Nov 2023 03:56:30 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DF8310FF for ; Mon, 13 Nov 2023 00:56:26 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-54366784377so6447648a12.3 for ; Mon, 13 Nov 2023 00:56:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865785; x=1700470585; 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=mASKoKAO36kXxxMIcfJoCKkWeIfM9SAibAagzp3xhpQ=; b=xzR8CkdFZFvjC5RM4klrN0DKCXoipWjgczpVUZDYiP74iCSmWvARruR7QKQd81Q8pe 5JebVBXSwjgrgt+F68SUaySd+L/UnKxrUuSN69H+iBikOi8Q3DlBGWaddWMGLneO6C/f XUKnTz5N3XPGbcrg8gVXDHGSeWDPV1303y0IQRJzJVmtmS9aTxCHow/Tno5cfkQsWJMa RR4diMZNQgwzO1hoKnSZTYoG3+NlPbRKj1Q9onB9FPJhc6ARo1WQIrSVnx+kenk4ziXQ ZMT0G7qc/Jg1LDiRq5SgX70P8KsAdYC3hbDZOdR7jspAzk0YBOwVpZPyG1BBQ+diWQOT eg6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865785; x=1700470585; 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=mASKoKAO36kXxxMIcfJoCKkWeIfM9SAibAagzp3xhpQ=; b=NKf3jMTOP/UAZSrhJwvwuxwLLjGhgkTVb85OomnKyVq1hVyZh+EYR/v7KxZm0aS8xC 97pNnZx/gCtqt2CIYY1dEDsqUfFt36rw5shPnmrBslHrCGPxFULQctnt2SzSIYRJRAVg 6P9JNvZAuDZS1HWdnwjy44GZukweuoeCfYjx42bhHdKVbA8/AIHEQxMwnqssQ2/qghjs mN4WTnDDrEBVVj/Rdv9svdnYJHKnlmHq0GxeM8hI/Xch0yC7ERtKgHCeVnz8lFJ5Jaxy OHHFcOmZhbyp0i+1zG6lhi60FiYO/g/gGPr2r+jFcB2s7SHmTd9sQZs1KPVCXZgdX+Iw YBgA== X-Gm-Message-State: AOJu0Yy+QrzpZOUTHSaFZDk4SMDNjxQRM7TXYmV4w7i0T6fFI2+r8ged V1Xy2V4CmJYkWO4r24r/ePGxnA== X-Received: by 2002:a17:906:2a91:b0:9be:85c9:43ef with SMTP id l17-20020a1709062a9100b009be85c943efmr4563373eje.62.1699865784972; Mon, 13 Nov 2023 00:56:24 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:24 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:14 +0100 Subject: [PATCH v2 03/11] arm64: dts: qcom: sc7280: Rename reserved-memory nodes MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-3-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:57:15 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782439997204332723 X-GMAIL-MSGID: 1782439997204332723 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. Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- 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 0d9cc44066ce..7bfe93713eb6 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -91,68 +91,68 @@ 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; }; - rmtfs_mem: memory@9c900000 { + rmtfs_mem: rmtfs@9c900000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x9c900000 0x0 0x280000>; no-map; From patchwork Mon Nov 13 08:56:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164376 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1077203vqg; Mon, 13 Nov 2023 00:57:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IHiINw03itZ9GyRt+AIYlto0jzj0/uxVbgGqxqS6+DpPvAwYDwI8XsDTWza29ygReJ6o6Ak X-Received: by 2002:a17:903:191:b0:1cd:fbc7:2725 with SMTP id z17-20020a170903019100b001cdfbc72725mr7837270plg.65.1699865872265; Mon, 13 Nov 2023 00:57:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699865872; cv=none; d=google.com; s=arc-20160816; b=gPBcP8USfoNF2CQv8FHz7uN1gjI3y6kDeJoyvae34Ebe/7XbgP4TC9Wp6OKPK5a8U2 nxHMohz2HiBcH4wUyMixLsMTgzuoNx9cg0+fxNcj9y8IRqfYj7NTfEO60zcAY4hmiXbQ OejTnCcMaQkFIRHjn47D3fFKEVmhOVR0l8wfoWzwEaa/yzH7k9Zj4cAzldwimzZAlHpL /ZMeS/J7sS1K98/0v9+lfZ3V2oDnvEaIxx2ch+ghvpwlec2ez8k/fgqkd+xhRwh3OyHl I3pRMcUW/N1TEpVFATZmphfxMKC+umeplyRrRoLtz2FP2VWgs3kpELtVN62WCrynmg9R 0mwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=c/hNm4O9kcVsvOqtUmdrdc/s5ca+FA6jP0qMvQxdFYY=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=j6lceZgDBbrbnO+AMYn7qYX3YgGoN9GhZ6Hdt4GsVL1mHxM6d4HWL63CgJ2JlDSeld 0R8P+qYvSjyTjG5jfBBZ6JPxyYK3y/F7rj2i2dep3TN+z8PLdIjBPNgm4sgnA+ArtzoB h4H8kmJDW8gs811TC095fAbWwiGOl1o4meBpSh71g4nOK7pFHnd+py3oq/MHd6lV61Od 0/zVBIwjKwVbgRLB/C/nbTXhK7gOGynTOyPNTGAWcvGiVxBs2inVdmG67rCOw7AwFN3h oMNp7XKOdR6wqltolIXocS+/AGnd8eoarjWdSDSOr3i8F8klWju7C1x6+qBBf3hNKrGX G3bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=Yq+xSWfh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id q9-20020a17090311c900b001cc6afede42si5430461plh.354.2023.11.13.00.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:57:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=Yq+xSWfh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id AD6DD80781E8; Mon, 13 Nov 2023 00:56:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233314AbjKMI4r (ORCPT + 29 others); Mon, 13 Nov 2023 03:56:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233254AbjKMI4b (ORCPT ); Mon, 13 Nov 2023 03:56:31 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A84621701 for ; Mon, 13 Nov 2023 00:56:27 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9d2e7726d5bso629920066b.0 for ; Mon, 13 Nov 2023 00:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865786; x=1700470586; 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=c/hNm4O9kcVsvOqtUmdrdc/s5ca+FA6jP0qMvQxdFYY=; b=Yq+xSWfh0Mky7/oPSXdYDHkxhQft7aCWa2ARVtJcPOc0PkzfTJCNT1UxeES0DdAiBw rQw5LT9RfB0EKafwgtaF7roKMPb5MuFohpLAS261R8F8cDunZcMpPEWoulwUqWiCsYm4 EuZrzeukcDrqJNpvwxVwb3OqMyIEi6QuhO4Yu4KwcntYEpJHTaS/A8u5PeKkIzTgt9hQ 3UrMBelWR8AlPvhOBBFLOdtHEL82rFob9CWwSmJMeYFIL/CdXiFyz6PmS5nqTQpM8R5d 2PPgH2/OhI4eB5ZJqpQCyJnJIpFO2LiTKIksH41FgH+O2d5nHbyDdZi/C4NkgQ/onpiP Q62g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865786; x=1700470586; 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=c/hNm4O9kcVsvOqtUmdrdc/s5ca+FA6jP0qMvQxdFYY=; b=J6pC92PEXIFPHQN4GkerGYLdxboxT2yffgXCsuRizTswZ5j1uGu71sk9+roQqFlmmU q8qXX7p1/KMmNuz/f677J1Z5b4wW4I7OHPuLZDBGrYbe/8/nEnUiXKzq64Z0jJlsph+B PkiZptTFUV+0m0m1Mts0OhMX2EZ0Axkj0TF8FgOdW3BC3kjqLRAt65VmmUZhh3E9KgXn Jz0mJOH8CsEbu3C7KFpI59H1lA2gDvmQ0u3DjvaTuR56TZ+OlSovwHxBP1hintiDJqvb CFCikqERVykxFdxPbzIMzYkceNQ+OLxSGR5IEfuVHc9NDw7YiBSt+ak1t5+k3gynJRlq Zgow== X-Gm-Message-State: AOJu0Yz2IY9wkG1HWWBUUpDWY2L9BRDdrzvHrM4HDP97WMoOiHFBftku itNPBd2PnzfJjKHsOr2aXKX4Bw== X-Received: by 2002:a17:907:6d07:b0:9e8:de5e:911a with SMTP id sa7-20020a1709076d0700b009e8de5e911amr2802953ejc.73.1699865786243; Mon, 13 Nov 2023 00:56:26 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:25 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:15 +0100 Subject: [PATCH v2 04/11] arm64: dts: qcom: sc7280*: move MPSS and WPSS memory to dtsi MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-4-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:56:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782438556856664798 X-GMAIL-MSGID: 1782438556856664798 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 cc092735ce17..cb78b03bd831 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -85,16 +85,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 cd491e46666d..69e30d539dc6 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -38,11 +38,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 7bfe93713eb6..e41200bd7bed 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -152,6 +152,16 @@ ipa_fw_mem: ipa-fw@8b700000 { 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 Mon Nov 13 08:56:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164383 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1084619vqg; Mon, 13 Nov 2023 01:16:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGKGv1+nUgpg22zfEU2PhgnLcN3sz4fVGTaVU4jlUKVepgeU8j76Pnv0IfsC1ZzK3SRfJug X-Received: by 2002:a05:6358:60cb:b0:16b:c1a4:e184 with SMTP id i11-20020a05635860cb00b0016bc1a4e184mr4658938rwi.17.1699866963727; Mon, 13 Nov 2023 01:16:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699866963; cv=none; d=google.com; s=arc-20160816; b=mnV2ozVpGLaiq/mLPSEQcUScL5g3vY7HIDVtuHdBI2AHSfJ6uqtCePrQIN5+m2mHJM 1enjtKGyV1+98oNi5ljubrnitMnAMEIWeI3C3eoLlm3xruBmR03+4BO5XQpmAgcrnTcJ VomQOqsZdMLTI8sk0UvVat59UopbnHw0Dh1kgUkODPnyXUNeuPdeINOCjKIwT0Yodn+k g75bbi09ewW56UvBQJCNTvt+d3YucrxjZIT2ubrRPxSDosyZjecl2/KsHnGXEPY5lKIH 8xRAuokNjbtPGGS0Nl2jMkz/Ss8/z1ylg8YN5bvc0PNzZzoyxMYnyT2c7UukuxI6pwhg lrRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=VRhWkDdnGigvskQkUKrgh/oalrp9HqrPtGT3d3EYkwo=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=Dwh03F7hLxDgCjkIt+9L99k2rNVg3ZONjjncdaFIVkpI9XOj5+cOero5aWhqiGtEaW 7PJmA7KHiVhsCHeYGtRD9FUhqc3JoFL7hG/UPBgxf7jeGR+egWGN2uJWn0qkWrCPdmxf CTGkwTey0m9eBTbmF3gTMew0hDT812uO2fzPSsfOZ0IbjMj+YJ+Je2CjPkCjOQKT3Vl9 7n1anE/ux2vmYl0PXA+U8uLiJHSLwXMrUnfAceUeXNAXmfx1fSKSqL4ZAL5FfXGRRS6q ikLOPudxcz8b1cfRg0ZFe/oXytsGRk5O2jh4arCMbkrctuMU9oiSkv0LYe59zv1aG1Wr n28A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=G8P8w7Fs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u9-20020a632349000000b00584b6af3b9fsi5160926pgm.524.2023.11.13.01.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 01:16:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=G8P8w7Fs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 579798057D9B; Mon, 13 Nov 2023 00:58:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233351AbjKMI47 (ORCPT + 29 others); Mon, 13 Nov 2023 03:56:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233240AbjKMI4d (ORCPT ); Mon, 13 Nov 2023 03:56:33 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12DFA10D4 for ; Mon, 13 Nov 2023 00:56:29 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-53e08b60febso6376358a12.1 for ; Mon, 13 Nov 2023 00:56:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865787; x=1700470587; 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=VRhWkDdnGigvskQkUKrgh/oalrp9HqrPtGT3d3EYkwo=; b=G8P8w7FsfgnzZdy+JLVvAkYibjIwpbs9vfkmyoMM1UGh0RS8nfoZoYzA+Sarevjfpj Yl1EQq87fNbhdcg34gJU7t4LR6Zln5Kvtdc2S3GQFhmfpwYpZdlJHHRtHnxUOE0T3MnP RtIOqpTugnWk+IBJO5wyjDYARiGHgvUHBwBZ6sw4Gx3oc9iFOOsfPYSZLlPUS+lISpIm 7DoqxK7yoeT8OHHgCIAhWByB6LwYSQEDaHB7Pa22o5ufvbfVKOnjVl44Q3mL/Qjhdbg7 q1vYuyOh0qQG8b2Pifw94ndGaKIm0YIOLCTcw+00tSyG08eBuP46qMQzXOyXlnHpYtpi /hBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865787; x=1700470587; 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=VRhWkDdnGigvskQkUKrgh/oalrp9HqrPtGT3d3EYkwo=; b=hh1evZVQTHUVzkZlyHWpAGWQCMz5SCMyu0q++DPvA9lkxMbIvh9lBeYbMpAwixn8lK O1smCi0buTUJSvPDkcTdKEBr3Xq940a+zulk8RgItwa/bEw22Xo/TTKSqBJ58GieNwBE vUjk53eIlEMJR78KcB6Yra3XdC8VufRj9XSiq6k4XmYIRFrp3I+pw7iTrEKW++Wl5tya sca6tceanozLJaR3Mp8HjfDz7JKcRRRYWpHjntImQLwbbuxHW1O5/dL7Q00Zpz8Wq9O3 an2KUwE8tDQt/6r8WHZ1FdJWDK9NKqERpDnz4R1Hf2Upl1mDFA9yA3hs1KvD+b39NgaE CcOg== X-Gm-Message-State: AOJu0YzyuI2/8CbIHeG7L29dr0MlXi8WRSqpx9Vr3GYGQmciiQsKaKoU DLwDLEZBRy+SyzqfY2K60r2Hag== X-Received: by 2002:a17:906:249b:b0:9dd:dd4a:d799 with SMTP id e27-20020a170906249b00b009dddd4ad799mr4322856ejb.22.1699865787503; Mon, 13 Nov 2023 00:56:27 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:26 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:16 +0100 Subject: [PATCH v2 05/11] dt-bindings: remoteproc: qcom: sc7180-pas: Add SC7280 compatibles MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-5-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:58:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782439701179074992 X-GMAIL-MSGID: 1782439701179074992 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 Mon Nov 13 08:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164382 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1084399vqg; Mon, 13 Nov 2023 01:15:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDz+A+g0aLdNnXVtj9BbPewDPnrdostzznILt0+3o24+TJE1hArETXLjUoqa9CCG6GiXBo X-Received: by 2002:a17:90b:b06:b0:281:3a5:d2ec with SMTP id bf6-20020a17090b0b0600b0028103a5d2ecmr13513473pjb.8.1699866922117; Mon, 13 Nov 2023 01:15:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699866922; cv=none; d=google.com; s=arc-20160816; b=ZNA7usdsraRoi2GigDWIWjrhwWW4ShzJSB2MIA/pbWAThQZrzQ2HpuYjJ1U16nx8g5 epek3WXsMn3fGYYxWhPJ4Fm4pEuzEAGxSREY/reHwlkFFKUNxq58Nz8jAHFKTnvAcdZW ngf6xNwUMhYdeT42ERrgAp53KKmZkYhQNNOiDPcKpngqCJe/kuuxq/mfqpbNtPO1SOlJ TKDanEM5fDIq1Z4fsCvJdGIPq2TvPrkc1OIMrHuhRQmAEmOJti4uhPCVQ3rtYe1yZBKw T0oRzg/lPTt6h4xxfSs44yXW+sfoHXRYVFnRWSyExMbEJUc7CB9ZuiqRYlXotpOsCaAF XZKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=tcn0Z6SH1iEGlywsG8bbVDvChWKOwTZ/D1g5QR3UiaQ=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=iabNaiwgoAq++UEgPKMrX2n9uT33t5Eb/BoeXJ4ptK4S7NS6iZqHuBREmTVg0z8JN4 aAAfDg+qqvq2P/bOLq+R/mo1/k6a7p6QM8Us+ip8/ZQQlUGu9S/rXMcpPjKjeBTqe1WZ iOUqM2toqzbTHjr3yLwcutqfcePCG9RQ33mm8EJ45niZ3seKsr1Ch8PfU0HmGIU5SgAn 8Z0CmfaDCKPveGURtn2qb4F6WoiGR+Zc59y6L1WqtEzNuSk99JFCrQf+ceXACwu945Ug AkhdPb5ep94Nc8A1eDJzn8VpzLeC7+2caxBCqODoYdMKhvOT9WuENciw0fPNjwHPN9GD czhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=REgad8FK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id kb7-20020a17090ae7c700b002804113621esi10509390pjb.100.2023.11.13.01.15.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 01:15:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=REgad8FK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5E4F080ADF0B; Mon, 13 Nov 2023 00:57:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233320AbjKMI4y (ORCPT + 29 others); Mon, 13 Nov 2023 03:56:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233272AbjKMI4d (ORCPT ); Mon, 13 Nov 2023 03:56:33 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C85E110F5 for ; Mon, 13 Nov 2023 00:56:29 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-543923af573so6409761a12.0 for ; Mon, 13 Nov 2023 00:56:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865788; x=1700470588; 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=tcn0Z6SH1iEGlywsG8bbVDvChWKOwTZ/D1g5QR3UiaQ=; b=REgad8FK6EdeLoY0lzZQ14XlgojkpyS8NYZbEz+wO28oJT6wVrHZQe25y63MWeLQ5u NjGK1P+kgcRv8Re67jDW6Hh+aEa95JCfeKumN7qgvt1tUoONwTBgdKLsvjIL+svTa37x W9Uh9fbXm5CpXZTRkPT0pQOIuuSLgct/KCw0N9a9/Txp/Rw0u0fLcVEYCyAz3oZaPtIK nnJT/65POHpfP72TFcnqeDU5CRlTr4Y5Dqo/nSij6njyw5KyEirtto6CfHWv1vOVha7N G/7I2/AjrzqUQhfSUWp9k/VpZ64GlUKmVuSeah3wvo8FLAiGw4iDWfnqEkIkcUupek5S S76g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865788; x=1700470588; 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=tcn0Z6SH1iEGlywsG8bbVDvChWKOwTZ/D1g5QR3UiaQ=; b=GKqJnoWprO+l2EwSp4Zuk3Q57fMR2DXoQNBtti/YO6PSsL1Jpbth6GTX8Y9GcJ4Gdq Vl5sK4Ks9vuTx4oN90HvcD+pWXVbK6cN5bzCqNEXqfPiuF1Fsz7f/sSrBwR65MrS1XnQ MwVXBR/UpX94POljh9BBbHgiK0SqKMBW8y7L0p2LvpaxY7IjeOXk6gtakdP8/6ZzdyrG 9VvRNo478qXtgJ+lLcwJjb5SneAcVJiY2Qvj1JvL7BfEOkf3ckunuOIzeg+/iPp8GtFQ 8L/h5m1OOybPxfK2OluefkaEeostZzn0RzpW0SCr+T5Ikx5U+aZ9tlRKYdO2gKMMSo2X XEow== X-Gm-Message-State: AOJu0Yx77Z7K9iakCxA6afQt/ha9+7KgMOn4OK9r4SkdfHdKz/EAu5Vf oVkwneoiLn9z/pOJHqoZC3oMGQ== X-Received: by 2002:a17:906:4098:b0:9d3:608d:cdf6 with SMTP id u24-20020a170906409800b009d3608dcdf6mr4359583ejj.19.1699865788306; Mon, 13 Nov 2023 00:56:28 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:28 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:17 +0100 Subject: [PATCH v2 06/11] remoteproc: qcom_q6v5_pas: Add SC7280 ADSP, CDSP & WPSS MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-6-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:57:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782439657878370134 X-GMAIL-MSGID: 1782439657878370134 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. Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- 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 Mon Nov 13 08:56:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164377 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1077213vqg; Mon, 13 Nov 2023 00:57:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHY8v3lx3boYDlOCF41G/Vq/x+XEi1JUMLLUJk9jNJoALl8zgvhV/o3mFVHexTA5xfEPYKZ X-Received: by 2002:a17:90b:4b04:b0:280:2985:56af with SMTP id lx4-20020a17090b4b0400b00280298556afmr7064490pjb.45.1699865873842; Mon, 13 Nov 2023 00:57:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699865873; cv=none; d=google.com; s=arc-20160816; b=Orj0Ha63E1uFB4Ioz6eX/u+OFjXx3/FXV627/Pe2NVo7aYoS0BQ94j70AqXyqw9k44 IuwN0SYLQI5knemqKbaOl3pFVMIo84/ZOCAx6Y5vRS2ofK7uWjSqaKWYWjgyJLsYJLeQ 14dGfqHTQ5edhHV9cL0cZXOYRbIELPa2oyNPXA/hX9FfCie1CPQC98WUZKazq29vz9dk 1NpXkVofsrx4IUAftFhi+Sl6Zr+UokVtCkpo8rmValRq7kjAfzxpOCWhdsZDiu2WXtM3 /Gs/L5scvt/uY7THMAOlaoVaPOc1Wbi0pe1IsL6uZXoxvtSo2aNtv/hRVnse+BogpOVa iQGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=NPOKnPWJWlf3ec742Gzw6PZKKL7Ki4xwsO0/KV2T8GM=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=JsCrDf+AUBfWMMMk7fGiZhvJPWdpGW7ylI2eKBAELcTTanDhRgA5YwTiPNXgSiOnFo PUc28yz0sLEZxjbvA8mF32Cblrp8K8DLXgZzVHVJ3Ct0M2cvbUXHTDdE0o14CIsQa+dO kYWtnstbuSludQCwwQw2o6Wya3L9BAMkvGmkIZLNO2vYTBQzZlpKxbHzmC6rbBQCynLr qGtL3O2T09Ty40GU1GkYhpRCaBYDsUnYZXOiixSkVYdwwuzNioODVppakU/wzTeeoxGO o3S/7NKE+3rfoMb7YvOyeFNLkt8fN61VmV9Rfj7CQhjvkry9hWT6RlhD4Ml832cTgBWU B6tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b="2mF/AodJ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id t15-20020a17090ad50f00b0027d10266b46si7385936pju.122.2023.11.13.00.57.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:57:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b="2mF/AodJ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 60FED80598B7; Mon, 13 Nov 2023 00:57:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233356AbjKMI5E (ORCPT + 29 others); Mon, 13 Nov 2023 03:57:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233291AbjKMI4e (ORCPT ); Mon, 13 Nov 2023 03:56:34 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0118510FD for ; Mon, 13 Nov 2023 00:56:30 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-53e08e439c7so6869045a12.0 for ; Mon, 13 Nov 2023 00:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865789; x=1700470589; 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=NPOKnPWJWlf3ec742Gzw6PZKKL7Ki4xwsO0/KV2T8GM=; b=2mF/AodJUPuSRVTW7HObaBMPbbAeK26gYBOu7iDaXYQrgf20FnJv0nSQIXeM2RzLc3 4/XHFbQ1Vit4vlewth2Xn+BhODuJY2uO1UMq2axh5VSAGqazakUylb4aWZj0O8MHIINz zh8n/Km+3XOV81WX1XaMS704NZzq11fGnAf9FSpiTwmpZQsXsblQV6ZuFrQFhVPJ+J48 V27yGNsEUHPgdL1xmSezCIRwXRU2Sou8GLMT4vzUh2l92AFeJP/IReyYhy2zYTzWGE15 7jhEoJ4Ir6qgDTmr7RGWweBJWSPuYlmP6BhTxZVlyeKn2rDQ5yrxPRLdqCnR1e7A93vk 7yCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865789; x=1700470589; 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=NPOKnPWJWlf3ec742Gzw6PZKKL7Ki4xwsO0/KV2T8GM=; b=E+rUdiAFJPwJE0TxP4xlQ1fAppvF+OEyG2YmitremmNdKckCIQtKI884114lnvC+qE WChPoXhZmFXxeZjRtpl0a7ihjuvKn1dDzb2ngkyeFg8u1L3xWGceu4wqRrlw0J5RkR0z 2tY+I70iyTrW8a7Gb5TgevaNIJLgOsHiMoOeO4eMK0iTh/v1td1Mp/eEdFt22odc3V7w eEAu6AMCy7gajRXTYpPZG08JSefKV15PQ83Hl28tXK6TvRXD5eMp/UEMUsbhavcN2exu 9tJ5Fv3myfDB8vLfVAy/XzslvQxAP/14nfngCsFzogOEn9uyAlU+xFU0sp9Yh22mWLLR OzTg== X-Gm-Message-State: AOJu0YyIECvwWTR2tlciU1UTsN6uH4zWPa+GA0FnOx0L2EIKXtMjjERg ADdVTUbthu2pqO0H1fWJtnICjL036kC7aKg7GjmS3g== X-Received: by 2002:a17:906:6888:b0:9e7:3af8:1fd2 with SMTP id n8-20020a170906688800b009e73af81fd2mr4108989ejr.58.1699865789559; Mon, 13 Nov 2023 00:56:29 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:28 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:18 +0100 Subject: [PATCH v2 07/11] arm64: dts: qcom: sc7280: Use WPSS PAS instead of PIL MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-7-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:57:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782438558289913644 X-GMAIL-MSGID: 1782438558289913644 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 69e30d539dc6..14511a69658c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -90,8 +90,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 e41200bd7bed..8c21695646c6 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3589,7 +3589,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>, @@ -3601,12 +3601,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>; @@ -3619,11 +3615,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 Mon Nov 13 08:56:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164379 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1080522vqg; Mon, 13 Nov 2023 01:05:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IF9Lrefrxc5UKO5tmmz6IeILKd5BVVl/jz5t3fNwnLgbbngtUnHyCxTbXsu3JTlT/wJbX7W X-Received: by 2002:a05:6358:7f0f:b0:168:d966:c1e8 with SMTP id p15-20020a0563587f0f00b00168d966c1e8mr6947870rwn.30.1699866328124; Mon, 13 Nov 2023 01:05:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699866328; cv=none; d=google.com; s=arc-20160816; b=AwFRmp3CfuftbGSXt5P7/mcTfGV/JrgB6jp9irJnNGmCqRvra7LSfwDk7jMm9O+zSM Bp/436HpEl3Bri43jbFUDgfE4m7bY8UHQY4mmO44r1QsD/2RAEimRb9LytyFBSnffQBY VJsGbVp8EtrRkQxIMhFGKdOYSgIgb/Qx9PP4V056EaxluUeSTCV/tQVfzTcpPDRTMxGk nLlehR9wpBA52A3GoQkwbGWoD0lc45PB4ICfFU1epMLKrHGXYjr/v/lGogpZda3FWJl2 SRyqc+anGNwt1KRFvuhMuf9HfB6pY6cCjE7d69KUsMj3gly3ShXRKrUBu4SNCMqxglTr EI+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=tTZ4Jv1zdCihXH8N7DKF5MknE/I83u0rI4dws1dftsM=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=TFwQrWngFOjhUJbB1ibmWhaPqBokPsc+p6FabtGfQ0DAGaWRb/8f7CpWmCxmIShs8/ CmhHGsxfrEPGLKe3/L7QDB8Z6qiPDlUY9QGMOfbBai1VZ2TGJIAM+cXGi8RBuJ9Pp36b XrTKQH6naPGjT6ANge1lz6uAH8Oeq0IiFsShdS/4zatapd3tPG+xO0XYXzk1uijbpnCs RZewTewVPc4B57kzk3nHuiCc3SfhL07Fnmr1DqwGTsTOndo9Mfdg4gXyp1aAJ8qtvlhD tHRA787ksWHI+b0ViLmt8CILn/U0h2W7yVUqwYrmy6Loor7oKEc1MOXWnk/8reAdwt8S Gi9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b="Bmn9WL+/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 184-20020a6302c1000000b005b942de1e92si5269584pgc.443.2023.11.13.01.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 01:05:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b="Bmn9WL+/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 555D2804C21E; Mon, 13 Nov 2023 00:57:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233361AbjKMI5Q (ORCPT + 29 others); Mon, 13 Nov 2023 03:57:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233319AbjKMI4l (ORCPT ); Mon, 13 Nov 2023 03:56:41 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BFD810CF for ; Mon, 13 Nov 2023 00:56:32 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9df8d0c2505so847253566b.0 for ; Mon, 13 Nov 2023 00:56:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865791; x=1700470591; 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=tTZ4Jv1zdCihXH8N7DKF5MknE/I83u0rI4dws1dftsM=; b=Bmn9WL+/Mm7B0Q5UdRZgXyXwp00f5pyQAb6K+/vCCRyE6c4Shi5/3+NV1zfd1Du+F1 a7O9dhdN8lTZdgAz6vW7GJVC1036poyZ+hlNHgTib4TWsmQfv7Wfg0phCUAcaFjwxwH/ MZ23PiRbBUnmM9qHQ5lA+jN5b4oMUN7+P2WFr9wbXreDA2u8T3sFEXkqLbMRV0F1FUaa PieTzXzD5Zw9kpYm6MNdZtYaoZBrGe50Uff0NqyeedZ4XOe8grt2YLdyuW3CcPIuKV8e CYuA34ph/lLW6zMo9aQlKmQ4DBIGcJ3PIFUoy8phT2CEiXJ+Kmk0UEv6axkdJ5neWuVG ASlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865791; x=1700470591; 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=tTZ4Jv1zdCihXH8N7DKF5MknE/I83u0rI4dws1dftsM=; b=pJ8trKUmUuaNJakHQBKlDR/X9O15qogxTflX0M4H1uiNnr5dJYyvn2nHyjSV1hNATY bfi8dtpVFeyDsxIYWK5fSA5yZiu3dyoNZCp42TXw4VUyzYV03reMAn2myBZJYPwA09RR ySFfso6fkOrrij4/7gOQ+lNQKpB44mmqM9kZ76+T+dFB3ZF5L8yVJeaybtqHDLobglT3 yPiq65vdblLOSKBps/Cq7CYvvHJsJZqG9tu5HT+x1bU4RebFzHdppGhvw9Yz8T31tk3l 0AQsgig+c2ltzc6fg5+7zIDtPhKvHMf970pH1NPjqVvrewY4O8Arndu5i6oe1X3cjsOy qoUA== X-Gm-Message-State: AOJu0YxGNMmk6mLN07GLktJvTadHiuu9IPUJD2XvQm+77Km+PuBl9+Ia GJyLIvgC1U4W2vEdrJdEp8ZINg== X-Received: by 2002:a17:906:f215:b0:9e8:1ba0:18fb with SMTP id gt21-20020a170906f21500b009e81ba018fbmr4288808ejb.29.1699865790754; Mon, 13 Nov 2023 00:56:30 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:30 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:19 +0100 Subject: [PATCH v2 08/11] arm64: dts: qcom: sc7280: Add ADSP node MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-8-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:57:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782439034897376688 X-GMAIL-MSGID: 1782439034897376688 Add the node for the ADSP found on the SC7280 SoC, using standard Qualcomm firmware. Signed-off-by: Luca Weiss Acked-by: Konrad Dybcio --- 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 cb78b03bd831..92be951fc0e4 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -75,11 +75,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 14511a69658c..9cbe0fe64420 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -24,11 +24,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 8c21695646c6..2b11ccc9a6b8 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -142,6 +142,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; @@ -3588,6 +3593,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 Mon Nov 13 08:56:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1077184vqg; Mon, 13 Nov 2023 00:57:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYMFeSOcCVYf1MiM7SmSU2LhdSns8PhzuGeBts08HbhCmzR1IqfahDFfcl2aPwLetBDx0n X-Received: by 2002:a05:6808:6504:b0:3af:7908:7fa7 with SMTP id fm4-20020a056808650400b003af79087fa7mr8773566oib.53.1699865868438; Mon, 13 Nov 2023 00:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699865868; cv=none; d=google.com; s=arc-20160816; b=CMbtuwk8ELx/9OUa4U0Axxt7ip4VXSK0Su/BkIHxgtd9yaY6pWElZyP57kkiKXqB8h xWHP6v+apy/C5B0Gs3yUUqvFXTIOz6YrdpBM1BXdY6TI8U92uEJb+YKQorDhJSDBI1c9 uE5AniXCwTK5C1r9oRfJfI3L2+7bBCHv4YIs09c9ER5DSG+O87AEVFkD4wDyweDU5jfn IJBJdxbZb+F0fCdNvXHIZOhZ4pfdNrCLg4FLZuCMUE+tIaTdblWS3nSAr5sLrYy9FaeC /ofnmoWsliBEUGp9tNSHSaMAS3pQIku51DKt2Fl/XoC1jz1LsO88o7CqC1RNoRxP1NOU F+UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=PEjSvQsvdQFJ/4jtMEKfqAXOd5wQ7erlEtHlveUl/DY=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=n4Y1CkVLbzPqX8mYBCzeHEpcF62UwPqI0Qg9m0BUtX4w/03cS3GlWrpxh9aDaIpQdN 7nwjzCcLWINq4j2RF2IlH8rkU8gYQglH6X7bzoxEkg8iZX2nfAZIEirg2IbEpgOEz8I4 xscOXLmWRKnElgf6rXHDMjBHrkMU8sfuU9huYhqbMd5bIJYluuo/hSa50iWTOK4CfBQQ rLNmv4yIt7+/Ro1Ugnv/XJ6iXvNc4XfcvkxWQbO3QptloGpCMXOyEPLIFlNctSrqFig0 6Nqt9OxV/nKlBsbuNuTY6UCC2EW4F0XfA213FgL+ZQnxa53/odquH/LryiBFnq34xaoV M1ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=VD2p9lmM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id m125-20020a633f83000000b0055793097dbesi5548094pga.469.2023.11.13.00.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:57:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=VD2p9lmM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 38D3C805360F; Mon, 13 Nov 2023 00:57:22 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233422AbjKMI5M (ORCPT + 29 others); Mon, 13 Nov 2023 03:57:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233301AbjKMI4o (ORCPT ); Mon, 13 Nov 2023 03:56:44 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11C8110FE for ; Mon, 13 Nov 2023 00:56:33 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-53e04b17132so6438622a12.0 for ; Mon, 13 Nov 2023 00:56:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865791; x=1700470591; 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=PEjSvQsvdQFJ/4jtMEKfqAXOd5wQ7erlEtHlveUl/DY=; b=VD2p9lmMDR8JpG7JirHA6CrUhHqi4KUYCcJX8T0RbBQRmi9SWA36G/Cu3YJLLmxk7P kbFaU/rcXhNTeC/4uCE21xlGTMqkwZrA/VrCYaiwgR39FsTG7quD77mIcQHlvl3HkcCy iV/JzSEwwQZklYh962Hxe+kblD8aj+i334+9w0ybkxAIO9oADY8vRSaDH8l0hb1xZK6V a8FndzWmSjUt/1WtnaLlMg6+AlkgfNQ0mvIQzW5WRb1MEKcA4yxrb4JijTLMIsz6GKG8 WVPJ2WX5nLnqLhQlh4XxFNIYpHAsAHF1fBRCXbyFTg8uAMmlHXF84jubQ9rCKxMkfaKu /paA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865791; x=1700470591; 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=PEjSvQsvdQFJ/4jtMEKfqAXOd5wQ7erlEtHlveUl/DY=; b=Penb+6e3IiHKHnJMp6TwJc6IPMyzWZbTEmvNWe8fFbNlZXQ4ZE8s4A9h7ZK1duV9HU PZkPnLEgCP79x9AGpglzpkqvYvrQTBg7Pa4XBqcwB+XbUsReeBTem9KdbkXeuwJCG7Qe S/ttFOoduZ+ZsjxU7fuRzS/PBCtCTM54Yfps/eeQg8fryqFeCOvOOwR1379sfvQrbC54 oEV7dxvx1dsVBlrr/4t4WcXoL2LhoSd64iP4SPfOZ2Q0gQ42NYBs/f5pYixOGyY2G5b1 ENH+S/SUehOGxdJ8+nalW8AVKp7Yv+cwPI9bGn3zMuyjzm0kT49GsQ55P004l/Ql2S2Z /UvQ== X-Gm-Message-State: AOJu0Yzomjqj8g4Hwr+LJEw3VM3EYiNMNxpZjgS8WsiRxfzYwx4bV74o KhkWzmHYRdjavJwG5hPr8O97PQ== X-Received: by 2002:a17:906:fa9b:b0:9dd:6664:1a3a with SMTP id lt27-20020a170906fa9b00b009dd66641a3amr4034381ejb.51.1699865791582; Mon, 13 Nov 2023 00:56:31 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:31 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:20 +0100 Subject: [PATCH v2 09/11] arm64: dts: qcom: sc7280: Add CDSP node MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-9-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:57:22 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782438553237910201 X-GMAIL-MSGID: 1782438553237910201 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. Signed-off-by: Luca Weiss Acked-by: Konrad Dybcio --- 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 92be951fc0e4..77ba05b77d68 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -75,11 +75,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 9cbe0fe64420..43f0a512c46c 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/ &hyp_mem; /delete-node/ &xbl_mem; /delete-node/ &reserved_xbl_uefi_log; @@ -84,6 +85,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 2b11ccc9a6b8..8306a64875fd 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -147,6 +147,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; @@ -3830,6 +3835,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 Mon Nov 13 08:56:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 164385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1086374vqg; Mon, 13 Nov 2023 01:20:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IEP8pgc+uJJu1ylt3b29KDOIh7EAzchtuCT0MPhfIj26Pp8tDp19SC9tZrp8hu7lQbFyMtR X-Received: by 2002:a05:6830:1116:b0:6b8:807b:b50 with SMTP id w22-20020a056830111600b006b8807b0b50mr7025326otq.22.1699867251631; Mon, 13 Nov 2023 01:20:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699867251; cv=none; d=google.com; s=arc-20160816; b=xQDECAhSeoboqo3E12YneaPXzmsh9DGex9u8VA4NcgFQRjBCmAozzL4fnLjHfGBBuv vh5lvQosqaa4JYTW+bAuplHjSFvxaXQRZNMqnSZpKRUyHBDW6ej64dydtyH0Nm5jSYZk MG9tEzFCyHDd1hv1xTCDnyC60JJeaxSfLiRVJ1stBtJCuTQ1882u5evhYCbeYyFDT7t8 wUZyJDs5BplvvufVACwaE7LuepCJd5Oeng76MYl8B3pCX0wD7jeJQCuhBqu3x/Du1mBU 6gOoDP4MepISiCqODO18YqlFqihy0UUhCrrC91nPpKmT+9S3reAauYrB2zL+S38QeCXN N5YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=IHFRmzvU5T3tlzyLJ6u+L9D1svx2JsEEqR5zHg9JW1s=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=sabWcC0c2GXD/QNG1V2P/nnS4katBvHs55Q3lLVxLOlwrDsMAwr1x69R6IKMRvrpC8 HFAOjVm40Zu4J3FTlw/+ArRHoF2cxXt09y09u5Jq2NRAAOkSUjCvixeIzKAJSF5bevuw xnvLjpkfgzFE9pfpXNEXywJtBA6PGe9rAHivInemNly0J9P5pNxZ2ge82J/fb+hZVbWf q4WMCrJOdYW6v4tfPjGgaVVgtG4fxS7tw8u/zjiAN7O6wsH5eudgxB+zUPwsqahyWk5e w/yMifbm97QEUGfs/5n4MceYQzn+M6W18iv9DPIwhEb8LYG/rktlEs253mpPLpSfFH8a +gUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=qUwO+ta1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id y70-20020a638a49000000b005ad11a5ac8fsi5186902pgd.323.2023.11.13.01.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 01:20:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=qUwO+ta1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id AEC0480AEB19; Mon, 13 Nov 2023 00:57:26 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233369AbjKMI5W (ORCPT + 29 others); Mon, 13 Nov 2023 03:57:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233349AbjKMI4q (ORCPT ); Mon, 13 Nov 2023 03:56:46 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A88C1729 for ; Mon, 13 Nov 2023 00:56:35 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso611622366b.1 for ; Mon, 13 Nov 2023 00:56:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1699865793; x=1700470593; 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=IHFRmzvU5T3tlzyLJ6u+L9D1svx2JsEEqR5zHg9JW1s=; b=qUwO+ta1ElsepjclimtwfnWbQX16Z+Q7FjTwuVNuPDBAhAk1VhXGKqUVy/HgJgBtYw 90VbKbOA2H3fPTMWutCMGwEoooBYSkz618InRSpGLoRDc7emjltlnMlCzsr8rjIeF5Z0 PcRCY2m3ssO5/tEbAwHIGQLHobetEqPS110Odj5c1lNdwnoml8bhoBt8O4Lyxc+tCh8K 7O4FFfts/Nix3cmEhIm0j+lyWu0xkaIwcuJO3kz4Ikadozxi/xePv/MmCh9hmzRlEV3E IPnjiJoz51Kqfx+w6UWHUjne2xCzEzixfvJnRDDpte9qQEoqn72LtSMA+RYR7EYWKtrl tFpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865793; x=1700470593; 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=IHFRmzvU5T3tlzyLJ6u+L9D1svx2JsEEqR5zHg9JW1s=; b=rsLKAhz4tmo0DYJPA8F6NyOIdCX+i8vlnaN40qSxLDCt1RmM9m5hUdFinogzAD0FMI Ehjr5nCTIVetGsKdwoudjQVltpDqnmGbiRtrGo5lRSYBCSzpaa7kltUMn9sRzOh2w1Rb 8okRsgyLoYfhueoBMfkfCq3dOWOWxX/sW1+x+dKbPQZ06g8yg8cZ1+rcT2rDGYZEoh6Q sCwZ5Dzt6epaNu6GcsYQah/o3YW5F8S4lAkMTcaaSDyxzudrbsdiTqc/K1rz/jUw7lb8 RflBgk0++85dc70/1OCGVpRzwZzv9ViVAF3uFZNRJUz2jHcPQRuJ96cYv0/L4DshzFh8 t0Ng== X-Gm-Message-State: AOJu0YwMYvt/N9Py4Nj51uxYW3EskOmLs0zRRmdX0+BDMTPJZDcPL9MS sq8ZGnZkABQcAKxvmKPwB6Amww== X-Received: by 2002:a17:906:7fd7:b0:9de:b20c:be5e with SMTP id r23-20020a1709067fd700b009deb20cbe5emr4170846ejs.53.1699865793553; Mon, 13 Nov 2023 00:56:33 -0800 (PST) Received: from otso.luca.vpn.lucaweiss.eu (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id kk22-20020a170907767600b009c758b6cdefsm3673538ejc.128.2023.11.13.00.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 00:56:32 -0800 (PST) From: Luca Weiss Date: Mon, 13 Nov 2023 09:56:22 +0100 Subject: [PATCH v2 11/11] arm64: dts: qcom: qcm6490-fairphone-fp5: Enable WiFi MIME-Version: 1.0 Message-Id: <20231113-sc7280-remoteprocs-v2-11-e5c5fd5268a7@fairphone.com> References: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@fairphone.com> In-Reply-To: <20231113-sc7280-remoteprocs-v2-0-e5c5fd5268a7@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 00:57:26 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782440003014566648 X-GMAIL-MSGID: 1782440003014566648 Now that the WPSS remoteproc is enabled, enable wifi so we can use it. Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- Depends on (just to resolve merge conflicts, could also rebase without that): https://lore.kernel.org/linux-arm-msm/20231002-sc7280-venus-pas-v2-3-bd2408891317@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 307062c1a0cb..c0287d8f4ed6 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -693,3 +693,8 @@ &venus { firmware-name = "qcom/qcm6490/fairphone5/venus.mbn"; status = "okay"; }; + +&wifi { + qcom,ath11k-calibration-variant = "Fairphone_5"; + status = "okay"; +};