From patchwork Mon Mar 27 19:56:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 667496 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 1D1B1C76195 for ; Mon, 27 Mar 2023 19:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232489AbjC0T4O (ORCPT ); Mon, 27 Mar 2023 15:56:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232523AbjC0T4M (ORCPT ); Mon, 27 Mar 2023 15:56:12 -0400 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47A111BD9 for ; Mon, 27 Mar 2023 12:56:11 -0700 (PDT) Received: by mail-il1-x12a.google.com with SMTP id s1so5218648ild.6 for ; Mon, 27 Mar 2023 12:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679946970; 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=GP/VsmA4BckPjvamc/Cc2ascVR6mBrF8rg+wdmACWrI=; b=NPNz3TVGkvaO256UAKbq4AubVwD+LlOkMzWl/F3X1abnmdB7IWo0A3SAGTy/00pgTy cMTBmDkYS14dxTWMFY2M0esWPSjbT9R7ab8eQSyHKmE8vDwTTGm99/8BLok8VPFE/y4o SXB7+cxAOpscjb6W6+h7ozPEb01UfKx9veJIbeOa357LtTn1P/yO2Lc3XjvEgypoeyaT adiev2b3zMuPuNkvAIEnsygXPD8ZkCLxgYnrskSt2GJacyI85hETwPEbX4HdfDuTtsxz /r/pywZVaJBBmor6Xbu2qIu7Yz4uVdQV7M0qSEXXh8jSTbXIOEjJVoV/72VoOraH0Gu0 UBqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679946970; 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=GP/VsmA4BckPjvamc/Cc2ascVR6mBrF8rg+wdmACWrI=; b=MJ123Ui6fO8svb759hmpMWmK0cX+3f3DUQ1HvRxGYJ+jmwvqxzXdQbV8UXiB1QI7Mm mRn0nMFKk8gM832r91tInBa3PkAMK1LhOwP+4HnikmKgksz8dK5Llx8Vs9JE4SUt6sMu vE8o1JAuadKeFRNf+a2Ozyub4GzKklnJkNr04TpZYmjNP5ZuXMMtqwl+3YCn3+HlM2f3 8gimkfM8FjCFz4Vfl82bslUotGwduVbaJym2lxzTKMht6SQ2jhkpG4LtNV1H8TNzdFt8 VYbO9cxGWv4ELtchhb20ral+Xozca6PZgMkJwQqRrJSYbAkZA8/5BsH/qTA2cvvj4o7u G0sA== X-Gm-Message-State: AAQBX9fU//+nKgL8A7fmiW8Y/WB46O64UxkqOK1gTu3jRi3dlN7XqonK aANA4l1BPDJctSgrCBHlx/5vkw== X-Google-Smtp-Source: AKy350YwcQ7Kuco3hoH7bmd+Ta4BhXfbhheCtvvYo8i2ejIhv5KSKJPA9zIS1Xnel98M0jk2sa3Atw== X-Received: by 2002:a92:dc91:0:b0:325:c8ee:96e2 with SMTP id c17-20020a92dc91000000b00325c8ee96e2mr9606416iln.7.1679946970638; Mon, 27 Mar 2023 12:56:10 -0700 (PDT) Received: from localhost.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id a18-20020a027a12000000b003e69be53404sm9011984jac.150.2023.03.27.12.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:56:10 -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 v3 1/2] ARM: dts: qcom: sdx65: add IPA information Date: Mon, 27 Mar 2023 14:56:04 -0500 Message-Id: <20230327195605.2854123-2-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327195605.2854123-1-elder@linaro.org> References: <20230327195605.2854123-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 --- v3: - Use ipa@3f40000 rather than ipa@3e04000 for the IPA node. 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..74671cc12c884 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@3f40000 { + compatible = "qcom,sdx65-ipa"; + + reg = <0x03f40000 0x10000>, + <0x03f50000 0x5000>, + <0x03e04000 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:56:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 668237 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 B7364C77B6C for ; Mon, 27 Mar 2023 19:56:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232631AbjC0T4P (ORCPT ); Mon, 27 Mar 2023 15:56:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232493AbjC0T4O (ORCPT ); Mon, 27 Mar 2023 15:56:14 -0400 Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72FA430E5 for ; Mon, 27 Mar 2023 12:56:12 -0700 (PDT) Received: by mail-io1-xd31.google.com with SMTP id q6so4414938iot.2 for ; Mon, 27 Mar 2023 12:56:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679946972; 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=lH7WjDhRatoLIWeRekjA6Q2wRRz8ocWvRkg9eIDfK6c=; b=vJYbbHJrFCK00Ie+LZfdSJ9WynZk14oWpMucOHxrU6bOD8IT7ntctL/Q0eogZX5VaZ O9SWnHs9G5+ndrbv52VRN/ucw0o6tF05CJEpaH0KP8I9ofAwGet8Q63cfjuSaF/WTkb+ jlFBhJV2QcM3p64P5NDe2s0ou5Iiv7UA27PbbcssQQ08d8FZqifn+Eu7WDhGTyglTLVf H1Lv12kUH2WMNtRShYzovz1EPso5uo7yH9J+/v6uIblj4c4qnwJqxJiBduahVQq4DbZ1 XoAGx7+bRPc907ryBDLzPtRXhzikGVQiBmz6kmeKYXBnM90gZsyQHdqKyujb7K71oJ8a FQuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679946972; 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=lH7WjDhRatoLIWeRekjA6Q2wRRz8ocWvRkg9eIDfK6c=; b=v8NPxFn7N5nfukF44vLz2/3IGq4/gxAoG7fkln8ghGcoKMrxOXRJXCZNoKy0TZA/Hs Rw+5Qj0pDKK4HvNhSrhHbY+6v/E0q1fs9rUiuZv44vvp0ytHkHrugrr6zyRrqsyfHe+J 3H70vQV3MA66/CEWUrlIMYDlZq1c1kKa6Vp0JhqoUI7d7KSR3QwuWdlYNDcV4haejSiL SoAh+4uw53FM6jzhwVeyAczoyRn+V1jtfQm0TpNrfmszqtXZ3ZSir7WsIgHBj9qDlclr J5QFDWbpJxc1qrNnRSx6GnbXSawdim/9qGmxunIHZrLLHjFNx59j6IbBNWuFEmZQczY4 wLgQ== X-Gm-Message-State: AO0yUKWZUTZgbPAJ25dkMLKpicodjdGoyqiYHr5Uvc0EF0I9o++u1Uqx xQbiTc9vmNagb7BlcccHyGcjmA== X-Google-Smtp-Source: AK7set9ogJLbgaIMGt7IdzPrW7LogdjWngrwM/15exNOolmnt0rboCdUPeqnHhkLOaXuZzBp51CH/g== X-Received: by 2002:a5e:d601:0:b0:74c:a578:e3a0 with SMTP id w1-20020a5ed601000000b0074ca578e3a0mr8975492iom.5.1679946971841; Mon, 27 Mar 2023 12:56:11 -0700 (PDT) Received: from localhost.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id a18-20020a027a12000000b003e69be53404sm9011984jac.150.2023.03.27.12.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:56:11 -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 v3 2/2] ARM: dts: qcom-sdx65: move status properties to end of nodes Date: Mon, 27 Mar 2023 14:56:05 -0500 Message-Id: <20230327195605.2854123-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327195605.2854123-1-elder@linaro.org> References: <20230327195605.2854123-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 74671cc12c884..525dd8a1f6649 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>;