From nobody Mon May 6 11:06:15 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCEA0C76195 for ; Fri, 24 Mar 2023 20:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231737AbjCXUQo (ORCPT ); Fri, 24 Mar 2023 16:16:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231704AbjCXUQl (ORCPT ); Fri, 24 Mar 2023 16:16:41 -0400 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25A911A48D for ; Fri, 24 Mar 2023 13:16:39 -0700 (PDT) Received: by mail-io1-xd2a.google.com with SMTP id e13so1271907ioc.0 for ; Fri, 24 Mar 2023 13:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679688998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9Dtj5wCvvcI9i8AwEStAyJGT2y/5uBrj75y51U29C6g=; b=zAa/imWV2mUefmFRMa8BIaY3Ilfwyc5ol+wnOnFBakanyz5DG4C2cog0/S6CJ+g7ca WrfIcLzH3IDAtHNb5hV2ejvRuDY+cOrwZNWt73J0MoPFRJN2Qs6fnBPrNyOl2GrqlU4b /GTdUdsl+EuedoshYBC/z6RJx9ntKXkKxQ4wu/IuWJIHEPIF0u+YeiyZA/5s3w/JBaOm wVFP3guIqM3diM9DMmIgAJ6u9InW4Me3eXUmDc35UAtBSEdVpj8uanRKX5z+Lj//xVGD IvfQMRJG4OnXP3VOH+BYVcuDgxu9UITFFm38jBtudruMDcOyRLszbtXppZMPO0GZjY07 WZEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679688998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Dtj5wCvvcI9i8AwEStAyJGT2y/5uBrj75y51U29C6g=; b=bgqODLaULotx0/rXDLgutc3l6/rNLN89l6SwMlt2LJsk6WjrxR5KIN4NHFexBZUSWa yasP0RTzVnVAsvbLOM+jMIBFgjWUe/lTXh/lu3R8Qn9friMp6lo2uPerrqMePNGPg0zo bHk80Sv1xXTWuFr3v6p5SKcZGnS22mEaNeU1kAe/GjGAkQ+GIvqDsjwfTihoQkVuOZgM zcIlfilcb/OZP9zX5iae/zOQdKkdmwI7vfBL1NdrrY+iCijZWlzOPWdJ3h9Hb7bJEihz 3euAfmqCmSqRKdQkZkc1zt0qKN/tSBp0OSV2/QO8McH6RhwOJ2GxtL76CjmBXNj6E21U uJHA== X-Gm-Message-State: AO0yUKXT3M5k5LbFpa/EiyPLCdBXvPckCU1NjeBQsfTCjWVeWaa2SExZ jsI66WN70d8DKQc41B5r84BN7Q== X-Google-Smtp-Source: AK7set83AMpZtZI1S9jPlUv8qA1bflf98vG6Zpk80qJuh0rUnN3eZWUn+6ZWjrk9AAxtE6JljTpDTw== X-Received: by 2002:a5e:c001:0:b0:752:8aee:6d91 with SMTP id u1-20020a5ec001000000b007528aee6d91mr3041688iol.12.1679688998477; Fri, 24 Mar 2023 13:16:38 -0700 (PDT) Received: from localhost.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id q12-20020a05663810cc00b003e8a17d7b1fsm7173445jad.27.2023.03.24.13.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:16:25 -0700 (PDT) From: Alex Elder To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, andersson@kernel.org, agross@kernel.org, konrad.dybcio@linaro.org Cc: quic_rohiagar@quicinc.com, caleb.connolly@linaro.org, mka@chromium.org, evgreen@chromium.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: qcom: sdx65: add IPA information Date: Fri, 24 Mar 2023 15:15:27 -0500 Message-Id: <20230324201528.2540564-2-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324201528.2540564-1-elder@linaro.org> References: <20230324201528.2540564-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add IPA-related nodes and definitions to "sdx65.dtsi". The SMP2P nodes (ipa_smp2p_out and ipa_smp2p_in) are already present. Enable IPA in "sdx65-mtp.dts"; this GSI firmware is loaded by Trust Zone on this platform. Tested-by: Rohit Agarwal Signed-off-by: Alex Elder Reviewed-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-sdx65-mtp.dts | 5 ++++ arch/arm/boot/dts/qcom-sdx65.dtsi | 38 ++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/arch/arm/boot/dts/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom-= sdx65-mtp.dts index ed98c83c141fc..72e25de0db5fc 100644 --- a/arch/arm/boot/dts/qcom-sdx65-mtp.dts +++ b/arch/arm/boot/dts/qcom-sdx65-mtp.dts @@ -245,6 +245,11 @@ &blsp1_uart3 { status =3D "okay"; }; =20 +&ipa { + qcom,gsi-loader =3D "skip"; + status =3D "okay"; +}; + &qpic_bam { status =3D "okay"; }; diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx= 65.dtsi index 192f9f94bc8b4..360d6dc144811 100644 --- a/arch/arm/boot/dts/qcom-sdx65.dtsi +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include =20 / { #address-cells =3D <1>; @@ -299,6 +300,43 @@ tcsr_mutex: hwlock@1f40000 { #hwlock-cells =3D <1>; }; =20 + ipa: ipa@3e04000 { + compatible =3D "qcom,sdx65-ipa"; + + iommus =3D <&apps_smmu 0x5e0 0x0>, + <&apps_smmu 0x5e2 0x0>; + reg =3D <0x3f40000 0x10000>, + <0x3f50000 0x5000>, + <0x3e04000 0xfc000>; + reg-names =3D "ipa-reg", + "ipa-shared", + "gsi"; + + interrupts-extended =3D <&intc GIC_SPI 241 IRQ_TYPE_EDGE_RISING>, + <&intc GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>, + <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; + interrupt-names =3D "ipa", + "gsi", + "ipa-clock-query", + "ipa-setup-ready"; + + clocks =3D <&rpmhcc RPMH_IPA_CLK>; + clock-names =3D "core"; + + interconnects =3D <&system_noc MASTER_IPA &mc_virt SLAVE_EBI1>, + <&mem_noc MASTER_APPSS_PROC &system_noc SLAVE_IPA_CFG>; + interconnect-names =3D "memory", + "config"; + + qcom,smem-states =3D <&ipa_smp2p_out 0>, + <&ipa_smp2p_out 1>; + qcom,smem-state-names =3D "ipa-clock-enabled-valid", + "ipa-clock-enabled"; + + status =3D "disabled"; + }; + remoteproc_mpss: remoteproc@4080000 { compatible =3D "qcom,sdx55-mpss-pas"; reg =3D <0x04080000 0x4040>; --=20 2.34.1 From nobody Mon May 6 11:06:15 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0EBEC76195 for ; Fri, 24 Mar 2023 20:16:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231794AbjCXUQ5 (ORCPT ); Fri, 24 Mar 2023 16:16:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231808AbjCXUQx (ORCPT ); Fri, 24 Mar 2023 16:16:53 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA4521ABD6 for ; Fri, 24 Mar 2023 13:16:51 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id q6so1261102iot.2 for ; Fri, 24 Mar 2023 13:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679689011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4COcfpw9WG6m5GbVy1D4YLQiwmZKsGAwS1sbqXD1qEo=; b=gUrv+A8U/4sHWHCX7QHYNx/fX6Y4gsuwXZ5oXPeAWwsY1HA2CfpdU5AnXJETkmR/4R 3sfKdnnyOcAiIavfTmHQXuiAyix7IbrrEuDIiX4hGaKzNz/RXBI24ji4Bih+s07l5eDP tHa0gd52lkQ0jB8ZwG7ZjG2H3p7mfFJIsGPtcpHAv9Q5YaalM4uGwcv+WF9H2vj44Jfg Xfzp8z2Nefov+AMBEn5YbqAWsr7b6K7BY3extnNVfm5dnzgPdGMU2PfMIT31utLF7zUE a/NEfk78BhSBZGn4YmuVUfqH19hgq5F+eRI3j1qJAmfojfZK8RLBBjoAJeGdw0u59sro 3Azw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679689011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4COcfpw9WG6m5GbVy1D4YLQiwmZKsGAwS1sbqXD1qEo=; b=SUdFl75+kTk9q6lms/z/YHIPC1IxEWfN8LngwY+elvC+gfIpXdcV6lBh07/z1KQrl2 iC/wjPLaXMYHHAdkdJbBq9IFeXVn3MzLGPBR/5odDanQKQTzkQYcP5fSh7AmQvnL1bae f3SH5HOlzel2R3XyY04LWsm8hdLl5blDBckUoUV4Q2oiF0GRLH5qhS2mQQYJjFEPrr7g 9GSpMaqYndEclzTHewuSX8DuftRdMeRPJ+qeAOp2Y1X96TgJQM4/MXHFUo6/JkQcJhMw hy7rzfX+UjlBBMeEYS+sjgmKpGzeDNHYackymxDGCm+RPxq84saBuaWeCrZIvY+G71tS rteA== X-Gm-Message-State: AO0yUKWge8G8xT+vmE2qio0GNYhjrtD9Hd2qQyx3K1+bdZrH5abxIPMG 5hFtFqTQlt63MoXY3gyaSdZRHg== X-Google-Smtp-Source: AK7set9LgaonR2SHhPcYWqJ5oyOKzict9DML0voVT7n4d0wQ8jpBszqkPscR+e4e9vUkV68emkKufw== X-Received: by 2002:a6b:6f12:0:b0:758:4909:fbd6 with SMTP id k18-20020a6b6f12000000b007584909fbd6mr3154666ioc.12.1679689010900; Fri, 24 Mar 2023 13:16:50 -0700 (PDT) Received: from localhost.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id q12-20020a05663810cc00b003e8a17d7b1fsm7173445jad.27.2023.03.24.13.16.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:16:42 -0700 (PDT) From: Alex Elder To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, andersson@kernel.org, agross@kernel.org, konrad.dybcio@linaro.org Cc: quic_rohiagar@quicinc.com, caleb.connolly@linaro.org, mka@chromium.org, evgreen@chromium.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: dts: qcom-sdx65: move status properties to end of nodes Date: Fri, 24 Mar 2023 15:15:28 -0500 Message-Id: <20230324201528.2540564-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324201528.2540564-1-elder@linaro.org> References: <20230324201528.2540564-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move a few device tree "status" properties so that they are the last specified property, in "qcom-sdx65-mtp.dts" and "qcom-sdx65.dtsi". Note that properties must always be specified before sub-nodes. Suggested-by: Konrad Dybcio Signed-off-by: Alex Elder Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom-sdx65-mtp.dts | 6 +++--- arch/arm/boot/dts/qcom-sdx65.dtsi | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom-= sdx65-mtp.dts index 72e25de0db5fc..57bc3b03d3aac 100644 --- a/arch/arm/boot/dts/qcom-sdx65-mtp.dts +++ b/arch/arm/boot/dts/qcom-sdx65-mtp.dts @@ -270,8 +270,8 @@ nand@0 { }; =20 &remoteproc_mpss { - status =3D "okay"; memory-region =3D <&mpss_adsp_mem>; + status =3D "okay"; }; =20 &usb { @@ -283,14 +283,14 @@ &usb_dwc3 { }; =20 &usb_hsphy { - status =3D "okay"; vdda-pll-supply =3D <&vreg_l4b_0p88>; vdda33-supply =3D <&vreg_l10b_3p08>; vdda18-supply =3D <&vreg_l5b_1p8>; + status =3D "okay"; }; =20 &usb_qmpphy { - status =3D "okay"; vdda-phy-supply =3D <&vreg_l4b_0p88>; vdda-pll-supply =3D <&vreg_l1b_1p2>; + status =3D "okay"; }; diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx= 65.dtsi index 360d6dc144811..a7adf28a395a8 100644 --- a/arch/arm/boot/dts/qcom-sdx65.dtsi +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi @@ -224,16 +224,15 @@ usb_hsphy: phy@ff4000 { "qcom,usb-snps-hs-7nm-phy"; reg =3D <0xff4000 0x120>; #phy-cells =3D <0>; - status =3D "disabled"; clocks =3D <&rpmhcc RPMH_CXO_CLK>; clock-names =3D "ref"; resets =3D <&gcc GCC_QUSB2PHY_BCR>; + status =3D "disabled"; }; =20 usb_qmpphy: phy@ff6000 { compatible =3D "qcom,sdx65-qmp-usb3-uni-phy"; reg =3D <0x00ff6000 0x1c8>; - status =3D "disabled"; #address-cells =3D <1>; #size-cells =3D <1>; ranges; @@ -247,6 +246,8 @@ usb_qmpphy: phy@ff6000 { <&gcc GCC_USB3_PHY_BCR>; reset-names =3D "phy", "common"; =20 + status =3D "disabled"; + usb_ssphy: phy@ff6200 { reg =3D <0x00ff6e00 0x160>, <0x00ff7000 0x1ec>, @@ -393,7 +394,6 @@ mem_noc: interconnect@9680000 { usb: usb@a6f8800 { compatible =3D "qcom,sdx65-dwc3", "qcom,dwc3"; reg =3D <0x0a6f8800 0x400>; - status =3D "disabled"; #address-cells =3D <1>; #size-cells =3D <1>; ranges; @@ -423,6 +423,8 @@ usb: usb@a6f8800 { =20 resets =3D <&gcc GCC_USB30_BCR>; =20 + status =3D "disabled"; + usb_dwc3: usb@a600000 { compatible =3D "snps,dwc3"; reg =3D <0x0a600000 0xcd00>; --=20 2.34.1