From patchwork Thu Jun 15 16:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 108649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp781472vqr; Thu, 15 Jun 2023 10:02:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ69peIGTqpgwYp8doJ8/wu+9NegVktQsAKM7Mb6qDSnAlyvUtPRtAgpOQDe8Aj9ZAJVR42L X-Received: by 2002:a17:902:da91:b0:1b5:1e24:8a76 with SMTP id j17-20020a170902da9100b001b51e248a76mr2133701plx.65.1686848565696; Thu, 15 Jun 2023 10:02:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686848565; cv=pass; d=google.com; s=arc-20160816; b=vq1qz67sVpMlSeglytZZ6GRnyivxm8bWqvmi1LMaWPO9hrE0cvm/8ET8TsyISivYb+ ggDqfS902RhuHH0Gi5EzD5JnRXyAvcGSVrZLFodjFX3RnKg0ZoBku7BodUgZxU9rHb55 tIZvSUmmi4gjLjV50VWOfrh+tByFoGqfiXYpRqE9KWEQStiSu8Y3YZv9gtUecTp1tqh6 Uuongl2Dje81OTU/tT/RZItgB8W/7qC3i7fAVF9+73m7rlE+mtl6KrUqvR+6vS2Es5SF eUB9q5LaRcqp8d4JoDdQqDB7iUynVlrzKAKYqDcGXPAA4iUt6FTMYnP5weJGnUhqFTxU 6E8w== ARC-Message-Signature: i=2; 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:dkim-signature; bh=Vj5Z5EeVRMBdfZYdOR4Fv2Get1Ee6bFBctEVmqEZJKI=; b=pjeVIsoPHo+MRVDkbAoQu2hjtRYTkeQiY8mY4sjnhCfj//q29IDoCF7qafrGPMLRm9 8ALCHS7/Q2V3QMtRuK/OT5v+5/tx3Pu1fzwvZXw/vw8v1jcnEBPc0X9Dw2Rc9LaT53AR h8YlJGnNx6V/aPbJkQkHgkhRzbHKa/zihqBITpke4VAIJOTIDD98S7nOKyXAp2BZ3ONC oJ3xG37el1knvvKx183O6rh99J3AplLkEdZ/IGA13Wpax549XsI5hTkxyeGW81oNMTIP eurOp13+wrM6K0QrpR/6vcgLK/lC1UmaroxEAlQaFmXHbjzzF8FjUkETM7agUHORzS3n w6/A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=Vmb8S5jG; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n2-20020a170902d2c200b001afcd047456si7123537plc.636.2023.06.15.10.02.30; Thu, 15 Jun 2023 10:02:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=Vmb8S5jG; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237679AbjFOQwX (ORCPT + 99 others); Thu, 15 Jun 2023 12:52:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237188AbjFOQvP (ORCPT ); Thu, 15 Jun 2023 12:51:15 -0400 Received: from mo4-p03-ob.smtp.rzone.de (mo4-p03-ob.smtp.rzone.de [81.169.146.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45FCD297B; Thu, 15 Jun 2023 09:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686847859; cv=none; d=strato.com; s=strato-dkim-0002; b=Q1BPpixcWCrnN3Om+WeezEJOrJZCrEXheP0xrzO8DhC6tthXM0aTmrg41RWsq3fIak cdIfxjD+jcIwBqZn8IND1YmOn0jtc+Q6LezfcH2UYI6diSHyVywbCUsqlxl1GcSvPWll +RoH6Xygkee878KeB6D5Mdb/JXLTavSYUXxJLESwdZERgtg6ADrtFtIp7VAeF2bK6bcS CSkEGsvhTd7HBvkpHEFJT3vmpym1vELHqvC2FLJeGVA4PrZ187qrFjIa9lyTJttBI8o0 VUZLcqkotixhMOAGgb3TP9FzdsnI01HZpZmU8+SUwtVDSxp5DmmlB/UQe1WTgAkVkUkK iz2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1686847859; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=Vj5Z5EeVRMBdfZYdOR4Fv2Get1Ee6bFBctEVmqEZJKI=; b=azWN9MDhO0mR/ouGwI6ftlh/HmnDENE/rwje2yy9X2UUR5xQmTkb0evKbNiUyYHj4j +njyyd3eWn1+ROG2oqCXR2OYtMzA3ZwPudTS8/A4Pu527ipPZwa/QdJLXAWDm4/jLJSW xAe5BHWFCgnfO4JW+zveQmA7xraZeHv/5nX/bfXLaSovPSetkBp9sYp51tNXCrqUYFl3 EhS7kRjGCZBI/1MGYXHgavakT0xqA+4nWHgDMA1o8p8rPHEAcqfYRo9hf4f1UG5H/NT9 6Ytk/SY7G6yR0e43D3R2GDxqaSoPujSeCl1/Q16aC16jywd1SxDiiYIHiI3PHspMhw9O mU9w== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo03 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1686847859; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=Vj5Z5EeVRMBdfZYdOR4Fv2Get1Ee6bFBctEVmqEZJKI=; b=Vmb8S5jGoHwDyAZxsKz7Q+NV/Jt6J24Sxq+fg9875vi+RdVvTNeGjsymzOWOqpF6gh opZZFXKje988RKLh8J/Ox6lAbYFqKdIyS4hz6l8M1yIDSj0pcp/O5A2EqberMK1Pj45P +syxVQcmOKEuwdgrHWfCZFRb4Yn9jRt+cYIOuA+BbcaEJ+3WCsZ0Am5T9AEqB4nKHNMz QttZaTJn6joQbj5itLT5B5syYocm0733V+zxr8DBjU4wyTSqLjFPHPKx2pqlH7QN0PK4 FY9Sxyv9+0PnDZHTvdnSzFPlMTMpt59qGpW7oSj0nvwiyKUFumXk2sWakzhpLUelcF/P aFVA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1686847859; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=Vj5Z5EeVRMBdfZYdOR4Fv2Get1Ee6bFBctEVmqEZJKI=; b=IkoX7UXpRIv6CmNWgJapnA+R6/eemhsymGaED5VAWPBm3jvLJXLSO1z63/Gm4xqEFf ZwyOnaf+PdZjQxF6EUCg== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOf59w==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.6.0 DYNA|AUTH) with ESMTPSA id D0d0a8z5FGow42n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 15 Jun 2023 18:50:58 +0200 (CEST) From: Stephan Gerhold Date: Thu, 15 Jun 2023 18:50:45 +0200 Subject: [PATCH v3 12/13] ARM: dts: qcom: Add rpm-proc node for SMD platforms MIME-Version: 1.0 Message-Id: <20230531-rpm-rproc-v3-12-a07dcdefd918@gerhold.net> References: <20230531-rpm-rproc-v3-0-a07dcdefd918@gerhold.net> In-Reply-To: <20230531-rpm-rproc-v3-0-a07dcdefd918@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mathieu Poirier , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org, Stephan Gerhold X-Mailer: b4 0.12.2 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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768788921417155740?= X-GMAIL-MSGID: =?utf-8?q?1768788921417155740?= Rather than having the RPM SMD channels as the only child of a dummy SMD node, switch to representing the RPM as remoteproc like all the other remoteprocs (WCNSS, modem DSP). This allows assigning additional subdevices to it like the MPM interrupt-controller or rpm-master-stats. Reviewed-by: Konrad Dybcio Signed-off-by: Stephan Gerhold --- arch/arm/boot/dts/qcom-apq8084.dtsi | 6 ++--- arch/arm/boot/dts/qcom-msm8226.dtsi | 38 ++++++++++++++++---------------- arch/arm/boot/dts/qcom-msm8974.dtsi | 44 ++++++++++++++++++------------------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi index 8f178bc87e1d..2b1f9d0fb510 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -784,10 +784,10 @@ spmi_bus: spmi@fc4cf000 { }; }; - smd { - compatible = "qcom,smd"; + rpm: remoteproc { + compatible = "qcom,apq8084-rpm-proc", "qcom,rpm-proc"; - rpm { + smd-edge { interrupts = ; qcom,ipc = <&apcs 8 0>; qcom,smd-edge = <15>; diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-msm8226.dtsi index 313a726f4704..612c305c1540 100644 --- a/arch/arm/boot/dts/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom-msm8226.dtsi @@ -53,26 +53,10 @@ pmu { IRQ_TYPE_LEVEL_HIGH)>; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - smem_region: smem@3000000 { - reg = <0x3000000 0x100000>; - no-map; - }; - - adsp_region: adsp@dc00000 { - reg = <0x0dc00000 0x1900000>; - no-map; - }; - }; - - smd { - compatible = "qcom,smd"; + rpm: remoteproc { + compatible = "qcom,msm8226-rpm-proc", "qcom,rpm-proc"; - rpm { + smd-edge { interrupts = ; qcom,ipc = <&apcs 8 0>; qcom,smd-edge = <15>; @@ -120,6 +104,22 @@ rpmpd_opp_super_turbo: opp6 { }; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + smem_region: smem@3000000 { + reg = <0x3000000 0x100000>; + no-map; + }; + + adsp_region: adsp@dc00000 { + reg = <0x0dc00000 0x1900000>; + no-map; + }; + }; + smem { compatible = "qcom,smem"; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index aeca504918a0..706fef53767e 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -113,6 +113,28 @@ pmu { interrupts = ; }; + rpm: remoteproc { + compatible = "qcom,msm8974-rpm-proc", "qcom,rpm-proc"; + + smd-edge { + interrupts = ; + qcom,ipc = <&apcs 8 0>; + qcom,smd-edge = <15>; + + rpm_requests: rpm-requests { + compatible = "qcom,rpm-msm8974"; + qcom,smd-channels = "rpm_requests"; + + rpmcc: clock-controller { + compatible = "qcom,rpmcc-msm8974", "qcom,rpmcc"; + #clock-cells = <1>; + clocks = <&xo_board>; + clock-names = "xo"; + }; + }; + }; + }; + reserved-memory { #address-cells = <1>; #size-cells = <1>; @@ -293,28 +315,6 @@ wcnss_smsm: wcnss@7 { }; }; - smd { - compatible = "qcom,smd"; - - rpm { - interrupts = ; - qcom,ipc = <&apcs 8 0>; - qcom,smd-edge = <15>; - - rpm_requests: rpm-requests { - compatible = "qcom,rpm-msm8974"; - qcom,smd-channels = "rpm_requests"; - - rpmcc: clock-controller { - compatible = "qcom,rpmcc-msm8974", "qcom,rpmcc"; - #clock-cells = <1>; - clocks = <&xo_board>; - clock-names = "xo"; - }; - }; - }; - }; - soc: soc { #address-cells = <1>; #size-cells = <1>;