From patchwork Mon Mar 27 19:15:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 668241 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 6A47EC761A6 for ; Mon, 27 Mar 2023 19:15:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232671AbjC0TPw (ORCPT ); Mon, 27 Mar 2023 15:15:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229821AbjC0TPt (ORCPT ); Mon, 27 Mar 2023 15:15:49 -0400 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B80D1721 for ; Mon, 27 Mar 2023 12:15:47 -0700 (PDT) Received: by mail-io1-xd2f.google.com with SMTP id z1so4336971iot.11 for ; Mon, 27 Mar 2023 12:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679944547; 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=t963gctnE04mv7BG+3mCC4eaSqmmJmoi+AUYlyxi07Y=; b=GBeKDtuxwsUe9l05JQqubfcmANezRkK96IcnNy670u7OvuwL+d/Ij9EKVdoHp0Ou4r uKMH1DlOxNSUg+me2PIk0Wjyle9NSuoz/nLtC2p/Xwu57wyQzF5j1sWcbM/ZWSIhsYgt zlLwCOYEphyjA2VFIvWpgF1g/lpdbIPD0eXeQTnrBQZsvG1wTs/EmBGgDqk7yrNlrqsC iPLRR8I/SQHFUytK++WUIC3XuugoNLqhKxm7wf+UeN5vzIvX7wawQd161D6GoFJgtp+M eKV7wYmEibw+UgTAWoZZpiyOliCagZyG6Xrxxs5lu+kiAcfXCsJnp+NQ4riTrXdkQ8ST ydOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679944547; 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=t963gctnE04mv7BG+3mCC4eaSqmmJmoi+AUYlyxi07Y=; b=AmAzwxAKXrkMJqAz1IOCG72A2xhoZOqRQ3ht0XhhwCplGKkDqg7dCZJJ/uRtqyGC9V /QmIlA1Tcwg/ivfP26qNA4oXIMukcQRAF+bxGGL+4Aq83LUfYX7/Sce1RkFeV3VdPdma 175XuEP9wzvzKhiT1DZBiNtxPIqVFegYbYiKZ2JKNuRffqX9kVDVRF1OFSySGexYkd+g 0l1CL7ExNT0nEOTqj3lOdTfn5rDSZULmsDUtkPqrxV56I9VQuzCgZaVVNFw2KcLq/2T5 Cr2+JXDl3rP68aV3DSODLZfHqAkD9XHpoAsp4Lrk5YUZBHGz/1mv51PGdoeD2MUYfTO3 /Vsw== X-Gm-Message-State: AO0yUKXLokrhnS9px0NgBR8b11pGDz4HEGXpnSNyhz5LLuBkm1eKG0qU RXrhMjFnACE6RKaySuFpvu8/aPjCKIJNrox326g= X-Google-Smtp-Source: AK7set91sz5GQAVOrxdol27D17aTuRolszXy5yVRTXBTP/F6Oo+BQVGwXSxII4/wd7W623WveRS5PA== X-Received: by 2002:a6b:650f:0:b0:758:6728:7023 with SMTP id z15-20020a6b650f000000b0075867287023mr9245400iob.21.1679944546783; Mon, 27 Mar 2023 12:15:46 -0700 (PDT) Received: from localhost.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id n13-20020a5e8c0d000000b0074555814e73sm3460548ioj.32.2023.03.27.12.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:15:46 -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, Krzysztof Kozlowski Subject: [PATCH v2 1/2] ARM: dts: qcom: sdx65: add IPA information Date: Mon, 27 Mar 2023 14:15:41 -0500 Message-Id: <20230327191542.2765834-2-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327191542.2765834-1-elder@linaro.org> References: <20230327191542.2765834-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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. Reviewed-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski Tested-by: Rohit Agarwal Signed-off-by: Alex Elder --- v2: - Fixed an alignment issue noticed by Krzysztof. - Moved the "iommus" property as suggested by Konrad. arch/arm/boot/dts/qcom-sdx65-mtp.dts | 5 ++++ arch/arm/boot/dts/qcom-sdx65.dtsi | 39 ++++++++++++++++++++++++++++ 2 files changed, 44 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 = "okay"; }; +&ipa { + qcom,gsi-loader = "skip"; + status = "okay"; +}; + &qpic_bam { status = "okay"; }; diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi index 192f9f94bc8b4..f35061e5b7fb8 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 / { #address-cells = <1>; @@ -299,6 +300,44 @@ tcsr_mutex: hwlock@1f40000 { #hwlock-cells = <1>; }; + ipa: ipa@3e04000 { + compatible = "qcom,sdx65-ipa"; + + reg = <0x3f40000 0x10000>, + <0x3f50000 0x5000>, + <0x3e04000 0xfc000>; + reg-names = "ipa-reg", + "ipa-shared", + "gsi"; + + interrupts-extended = <&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 = "ipa", + "gsi", + "ipa-clock-query", + "ipa-setup-ready"; + + iommus = <&apps_smmu 0x5e0 0x0>, + <&apps_smmu 0x5e2 0x0>; + + clocks = <&rpmhcc RPMH_IPA_CLK>; + clock-names = "core"; + + interconnects = <&system_noc MASTER_IPA &mc_virt SLAVE_EBI1>, + <&mem_noc MASTER_APPSS_PROC &system_noc SLAVE_IPA_CFG>; + interconnect-names = "memory", + "config"; + + qcom,smem-states = <&ipa_smp2p_out 0>, + <&ipa_smp2p_out 1>; + qcom,smem-state-names = "ipa-clock-enabled-valid", + "ipa-clock-enabled"; + + status = "disabled"; + }; + remoteproc_mpss: remoteproc@4080000 { compatible = "qcom,sdx55-mpss-pas"; reg = <0x04080000 0x4040>; From patchwork Mon Mar 27 19:15:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 667500 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 EC430C77B6C for ; Mon, 27 Mar 2023 19:15:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232633AbjC0TPv (ORCPT ); Mon, 27 Mar 2023 15:15:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232646AbjC0TPu (ORCPT ); Mon, 27 Mar 2023 15:15:50 -0400 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B9AB1984 for ; Mon, 27 Mar 2023 12:15:48 -0700 (PDT) Received: by mail-io1-xd33.google.com with SMTP id f14so4341528iow.5 for ; Mon, 27 Mar 2023 12:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679944548; 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=0NEkIpk/LEoId79ZUOQ1s4XlmlbZJpAqRfun/DpMKuI=; b=wnD4iHyEBTEx+ITbYa4t6wRAmgVItiIuX2miqj7yFZK+adKyzw52bAfWA3HizObG3K 19sMWLOr/FFGaveF3BwS0+GVkDLrtmAEZpoLh2hPvPOvtFO1q+QC619HKKxl3Qg/8xeM 9CTl+a3PNxycVmy2IRKHmX0+0wezKlnDMQUBl3PiO6sLs1qUvIo/K/rToMvJHHxKM2mM fN4KmDVKdx3W/btwfRWttJ2WmiRFiJB8haPuXiIvSI4M7XGUMyhYJNANeUd2F6cIqEOM ztLhUPP1JC77T1o0Ek/KyG30m20ZYnqj7lFRFZ0NvgHSHISSo/XpN1g9mELlg1Kt4fYU lSEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679944548; 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=0NEkIpk/LEoId79ZUOQ1s4XlmlbZJpAqRfun/DpMKuI=; b=WrAw4jbFXI4B9HuD97HzKRJkVf464+XmQvcmN3eiajrhRg02x1qO65C+Vm+f3SiA3K euSP96ZMvsJ/iFNIphtA87Y4BQdGZSF305MklZJoEhFTe0LmqE6E97qY5TaIXVxbHAOY a1AE4jNtlAYJvGqhmGFBx38nZCnBUhRLN2NIaov8cCrXP9QweAxi08IQxJ2w5waHkRl4 ad/l+EtsFnOMS/BPZsQkDMNAD2Ffm7GxUmZnX46OC2ekDqvsOhzpIJnH4uuJ09MA7/vP adqCQatrKlXedookdDRptkr95Yd1pGJRjGGveDSUK3eMx55c0yuXl3lQyM99KsaCuZGA FxeA== X-Gm-Message-State: AO0yUKXTYVuYVN+LhReLS8Tpfgk//26zyizJzcWp1No31X3VG282UI0u Tss5l4XJyXWbTpTki2Ya5c9dCg== X-Google-Smtp-Source: AK7set9I4/ljS7nflIGziy/qyeSQONWljoFEB1oR7T0y4jrHLZl1M64MmqqoSF9kyk04xgMLuNVgbg== X-Received: by 2002:a6b:a1a:0:b0:759:1e9e:6daa with SMTP id z26-20020a6b0a1a000000b007591e9e6daamr10235039ioi.10.1679944547876; Mon, 27 Mar 2023 12:15:47 -0700 (PDT) Received: from localhost.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id n13-20020a5e8c0d000000b0074555814e73sm3460548ioj.32.2023.03.27.12.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:15:47 -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 v2 2/2] ARM: dts: qcom-sdx65: move status properties to end of nodes Date: Mon, 27 Mar 2023 14:15:42 -0500 Message-Id: <20230327191542.2765834-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327191542.2765834-1-elder@linaro.org> References: <20230327191542.2765834-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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. Reviewed-by: Konrad Dybcio Suggested-by: Konrad Dybcio Signed-off-by: Alex Elder --- 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 { }; &remoteproc_mpss { - status = "okay"; memory-region = <&mpss_adsp_mem>; + status = "okay"; }; &usb { @@ -283,14 +283,14 @@ &usb_dwc3 { }; &usb_hsphy { - status = "okay"; vdda-pll-supply = <&vreg_l4b_0p88>; vdda33-supply = <&vreg_l10b_3p08>; vdda18-supply = <&vreg_l5b_1p8>; + status = "okay"; }; &usb_qmpphy { - status = "okay"; vdda-phy-supply = <&vreg_l4b_0p88>; vdda-pll-supply = <&vreg_l1b_1p2>; + status = "okay"; }; diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi index f35061e5b7fb8..2e1d008bccfd8 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 = <0xff4000 0x120>; #phy-cells = <0>; - status = "disabled"; clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "ref"; resets = <&gcc GCC_QUSB2PHY_BCR>; + status = "disabled"; }; usb_qmpphy: phy@ff6000 { compatible = "qcom,sdx65-qmp-usb3-uni-phy"; reg = <0x00ff6000 0x1c8>; - status = "disabled"; #address-cells = <1>; #size-cells = <1>; ranges; @@ -247,6 +246,8 @@ usb_qmpphy: phy@ff6000 { <&gcc GCC_USB3_PHY_BCR>; reset-names = "phy", "common"; + status = "disabled"; + usb_ssphy: phy@ff6200 { reg = <0x00ff6e00 0x160>, <0x00ff7000 0x1ec>, @@ -394,7 +395,6 @@ mem_noc: interconnect@9680000 { usb: usb@a6f8800 { compatible = "qcom,sdx65-dwc3", "qcom,dwc3"; reg = <0x0a6f8800 0x400>; - status = "disabled"; #address-cells = <1>; #size-cells = <1>; ranges; @@ -424,6 +424,8 @@ usb: usb@a6f8800 { resets = <&gcc GCC_USB30_BCR>; + status = "disabled"; + usb_dwc3: usb@a600000 { compatible = "snps,dwc3"; reg = <0x0a600000 0xcd00>;