diff options
31 files changed, 908 insertions, 953 deletions
diff --git a/conf/machine/qcom-armv8a.conf b/conf/machine/qcom-armv8a.conf index 4ae1a24..848f959 100644 --- a/conf/machine/qcom-armv8a.conf +++ b/conf/machine/qcom-armv8a.conf @@ -25,7 +25,7 @@ KERNEL_DEVICETREE ?= " \ # These DT are not upstreamed (yet) and currenty exist only as a patches against linux-yocto KERNEL_DEVICETREE:append:pn-linux-yocto = " \ qcom/qcm6490-idp.dtb \ - qcom/qcm6490-rb3.dtb \ + qcom/qcs6490-rb3gen2.dtb \ " QCOM_BOOTIMG_PAGE_SIZE[apq8016-sbc] ?= "2048" diff --git a/recipes-kernel/linux/linux-yocto/bsp/qcom-armv8a/qcom.cfg b/recipes-kernel/linux/linux-yocto/bsp/qcom-armv8a/qcom.cfg index 631fc43..e969e08 100644 --- a/recipes-kernel/linux/linux-yocto/bsp/qcom-armv8a/qcom.cfg +++ b/recipes-kernel/linux/linux-yocto/bsp/qcom-armv8a/qcom.cfg @@ -226,5 +226,3 @@ CONFIG_CORESIGHT_CPU_DEBUG=m CONFIG_CORESIGHT_CTI=m CONFIG_CORESIGHT_TPDM=m CONFIG_CORESIGHT_TPDA=m - -CONFIG_ARM64_VA_BITS_48=y diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-FROMLIST-arm64-dts-qcom-qcm6490-idp-Update-protected.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-FROMLIST-arm64-dts-qcom-qcm6490-idp-Update-protected.patch new file mode 100644 index 0000000..68a75c1 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-FROMLIST-arm64-dts-qcom-qcm6490-idp-Update-protected.patch @@ -0,0 +1,64 @@ +From 033eb03a2ab2057f3f79a20be485f5c58af20816 Mon Sep 17 00:00:00 2001 +From: Taniya Das <quic_tdas@quicinc.com> +Date: Mon, 18 Mar 2024 11:05:54 +0530 +Subject: [PATCH 1/3] FROMLIST: arm64: dts: qcom: qcm6490-idp: Update protected + clocks list + +Certain clocks are not accessible on QCM6490-IDP board, +thus mark them as protected. Update the lpassaudio node to +support the new compatible. + +Signed-off-by: Taniya Das <quic_tdas@quicinc.com> +Upstream-Status: Submitted [https://lore.kernel.org/r/20240318053555.20405-8-quic_tdas@quicinc.com] +--- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 28 +++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +index 2a5631b0fa40..3baea71e0248 100644 +--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts ++++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: BSD-3-Clause + /* +- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. ++ * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + + /dts-v1/; +@@ -412,6 +412,32 @@ vreg_bob_3p296: bob { + }; + }; + ++&gcc { ++ protected-clocks = <GCC_AGGRE_NOC_PCIE_1_AXI_CLK> ,<GCC_PCIE_1_AUX_CLK>, ++ <GCC_PCIE_1_AUX_CLK_SRC>, <GCC_PCIE_1_CFG_AHB_CLK>, ++ <GCC_PCIE_1_MSTR_AXI_CLK>, <GCC_PCIE_1_PHY_RCHNG_CLK_SRC>, ++ <GCC_PCIE_1_PIPE_CLK>, <GCC_PCIE_1_PIPE_CLK_SRC>, ++ <GCC_PCIE_1_SLV_AXI_CLK>, <GCC_PCIE_1_SLV_Q2A_AXI_CLK>, ++ <GCC_QSPI_CNOC_PERIPH_AHB_CLK>, <GCC_QSPI_CORE_CLK>, ++ <GCC_QSPI_CORE_CLK_SRC>,<GCC_USB30_SEC_MASTER_CLK>, ++ <GCC_USB30_SEC_MASTER_CLK_SRC>, <GCC_USB30_SEC_MOCK_UTMI_CLK>, ++ <GCC_USB30_SEC_MOCK_UTMI_CLK_SRC>, ++ <GCC_USB30_SEC_MOCK_UTMI_POSTDIV_CLK_SRC>, <GCC_USB30_SEC_SLEEP_CLK>, ++ <GCC_USB3_SEC_PHY_AUX_CLK>, <GCC_USB3_SEC_PHY_AUX_CLK_SRC>, ++ <GCC_USB3_SEC_PHY_COM_AUX_CLK>, <GCC_USB3_SEC_PHY_PIPE_CLK>, ++ <GCC_USB3_SEC_PHY_PIPE_CLK_SRC>, <GCC_CFG_NOC_LPASS_CLK>, ++ <GCC_MSS_GPLL0_MAIN_DIV_CLK_SRC>, <GCC_MSS_CFG_AHB_CLK>, ++ <GCC_MSS_OFFLINE_AXI_CLK>, <GCC_MSS_SNOC_AXI_CLK>, ++ <GCC_MSS_Q6_MEMNOC_AXI_CLK>, <GCC_MSS_Q6SS_BOOT_CLK_SRC>, ++ <GCC_SEC_CTRL_CLK_SRC>, <GCC_WPSS_AHB_CLK>, ++ <GCC_WPSS_AHB_BDG_MST_CLK>, <GCC_WPSS_RSCP_CLK>; ++}; ++ ++&lpass_audiocc { ++ compatible = "qcom,qcm6490-lpassaudiocc"; ++ /delete-property/ power-domains; ++}; ++ + &qupv3_id_0 { + status = "okay"; + }; +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-IDP-board.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-IDP-board.patch deleted file mode 100644 index ccec02e..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-IDP-board.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4cd742fb7632a39176bc2a2006e1cb1d01efe473 Mon Sep 17 00:00:00 2001 -From: Komal Bajaj <quic_kbajaj@quicinc.com> -Date: Wed, 27 Sep 2023 10:53:52 +0530 -Subject: [PATCH] FROMLIST: dt-bindings: arm: qcom: Add QCM6490 IDP board - -Document the qcom,qcm6490-idp board based off qcm6490 SoC. - -Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> -Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> -Signed-off-by: Salendarsingh Gaud <quic_sgaud@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/20231003175456.14774-2-quic_kbajaj@quicinc.com/] ---- - Documentation/devicetree/bindings/arm/qcom.yaml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml -index 5d2cbddb6ab8..fcc301d8c4b5 100644 ---- a/Documentation/devicetree/bindings/arm/qcom.yaml -+++ b/Documentation/devicetree/bindings/arm/qcom.yaml -@@ -386,6 +386,7 @@ properties: - - items: - - enum: - - fairphone,fp5 -+ - qcom,qcm6490-idp - - const: qcom,qcm6490 - - - description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch index 1bcbdce..c53a032 100644 --- a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch @@ -1,4 +1,4 @@ -From 4aed09eb7fca388f4ebf0dbd7b732a70cac6f6c6 Mon Sep 17 00:00:00 2001 +From b51bcd8342aaaffa4d08fd3474b1512f9992886e Mon Sep 17 00:00:00 2001 From: Manish Pandey <quic_mapa@quicinc.com> Date: Tue, 17 Oct 2023 23:46:10 +0530 Subject: [PATCH 1/2] PENDING: arm64: dts: qcom: qcm6490: Add UFS nodes for IDP @@ -16,16 +16,16 @@ Upstream-Status: Pending 1 file changed, 19 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -index 9b1bf7d1c98d..7d609317af82 100644 +index 3baea71e0248..424cd9c2b092 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -@@ -303,6 +303,25 @@ &uart5 { +@@ -463,6 +463,25 @@ &uart5 { status = "okay"; }; +&ufs_mem_hc { + reset-gpios = <&tlmm 175 GPIO_ACTIVE_LOW>; -+ vcc-supply = <&vreg_l7b_2p9>; ++ vcc-supply = <&vreg_l7b_2p952>; + vcc-max-microamp = <800000>; + vccq-supply = <&vreg_l9b_1p2>; + vccq-max-microamp = <900000>; @@ -36,7 +36,7 @@ index 9b1bf7d1c98d..7d609317af82 100644 +}; + +&ufs_mem_phy { -+ vdda-phy-supply = <&vreg_l10c_0p8>; ++ vdda-phy-supply = <&vreg_l10c_0p88>; + vdda-pll-supply = <&vreg_l6b_1p2>; + + status = "okay"; diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-dt-bindings-arm-qcom-Add-QCM6490-RB3-board.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-dt-bindings-arm-qcom-Add-QCM6490-RB3-board.patch deleted file mode 100644 index 7b61519..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-dt-bindings-arm-qcom-Add-QCM6490-RB3-board.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a0fc2104e8484205228819b1aa498fbd51c86ba0 Mon Sep 17 00:00:00 2001 -From: Naina Mehta <quic_nainmeht@quicinc.com> -Date: Tue, 17 Oct 2023 13:29:51 +0530 -Subject: [PATCH 1/2] PENDING: dt-bindings: arm: qcom: Add QCM6490 RB3 board - -Document the qcom,qcm6490-rb3 board based off qcm6490 SoC. - -Signed-off-by: Naina Mehta <quic_nainmeht@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - Documentation/devicetree/bindings/arm/qcom.yaml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml -index fcc301d8c4b5..6481bd03b0de 100644 ---- a/Documentation/devicetree/bindings/arm/qcom.yaml -+++ b/Documentation/devicetree/bindings/arm/qcom.yaml -@@ -387,6 +387,7 @@ properties: - - enum: - - fairphone,fp5 - - qcom,qcm6490-idp -+ - qcom,qcm6490-rb3 - - const: qcom,qcm6490 - - - description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Correct-the-.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Correct-the-.patch new file mode 100644 index 0000000..194e302 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Correct-the-.patch @@ -0,0 +1,37 @@ +From a324118e3760a4a62e623bea5a9f5f262ef97436 Mon Sep 17 00:00:00 2001 +From: Atul Dhudase <quic_adhudase@quicinc.com> +Date: Tue, 2 Apr 2024 15:52:03 +0530 +Subject: [PATCH 1/2] UPSTREAM: arm64: dts: qcom: qcs6490-rb3gen2: Correct the + voltage setting for vph_pwr + +Min and max voltages for vph_pwr should be same, otherwise rpmh +will not probe, so correcting the min and max voltages for vph_pwr. + +Fixes: 04cf333afc75 ("arm64: dts: qcom: Add base qcs6490-rb3gen2 board dts") +Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> +Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> +Link: https://lore.kernel.org/r/20231220110015.25378-3-quic_kbajaj@quicinc.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 5f439c0e64b877c1f9cc7f0bed894b6df45d43d] +--- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index 4266a1200669..d519f2064ea3 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -121,8 +121,8 @@ debug_vm_mem: debug-vm@d0600000 { + vph_pwr: vph-pwr-regulator { + compatible = "regulator-fixed"; + regulator-name = "vph_pwr"; +- regulator-min-microvolt = <2500000>; +- regulator-max-microvolt = <4350000>; ++ regulator-min-microvolt = <3700000>; ++ regulator-max-microvolt = <3700000>; + }; + }; + +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-Fairphone-.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-dt-bindings-arm-qcom-Add-QCM6490-Fairphone-.patch index 3250e15..0010b69 100644 --- a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-Fairphone-.patch +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-dt-bindings-arm-qcom-Add-QCM6490-Fairphone-.patch @@ -1,25 +1,24 @@ -From 5b76f570d28a806bd95390d762c0465d3da83b48 Mon Sep 17 00:00:00 2001 +From 4228299b08120ce8afef3271768dcfa5e760c2c6 Mon Sep 17 00:00:00 2001 From: Luca Weiss <luca.weiss@fairphone.com> Date: Tue, 19 Sep 2023 14:46:00 +0200 -Subject: [PATCH 1/3] FROMLIST: dt-bindings: arm: qcom: Add QCM6490 Fairphone 5 +Subject: [PATCH 1/4] UPSTREAM: dt-bindings: arm: qcom: Add QCM6490 Fairphone 5 Fairphone 5 is a smartphone based on the QCM6490 SoC. Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> -Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> -Signed-off-by: Salendarsingh Gaud <quic_sgaud@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/20230919-fp5-initial-v2-6-14bb7cedadf5@fairphone.com/] +Link: https://lore.kernel.org/r/20230919-fp5-initial-v2-6-14bb7cedadf5@fairphone.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 4b1a16d776b474345b12f834de1fd42bca226d90] --- Documentation/devicetree/bindings/arm/qcom.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml -index 450f616774e0..5d2cbddb6ab8 100644 +index 90f31beb80c2..adee504bffdb 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml -@@ -49,6 +49,7 @@ description: | +@@ -50,6 +50,7 @@ description: | msm8998 qcs404 qcm2290 @@ -27,7 +26,7 @@ index 450f616774e0..5d2cbddb6ab8 100644 qdu1000 qrb2210 qrb4210 -@@ -382,6 +383,11 @@ properties: +@@ -391,6 +392,11 @@ properties: - const: qcom,qrb2210 - const: qcom,qcm2290 diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-UFS-nodes-for-qcm6490-rb3.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-UFS-nodes-for-qcs6490-rb3.patch index 2e0a5bf..8ac2a74 100644 --- a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-UFS-nodes-for-qcm6490-rb3.patch +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-UFS-nodes-for-qcs6490-rb3.patch @@ -1,23 +1,24 @@ -From d92bdf898e27e77de384cf1fa13793b62b9cd95a Mon Sep 17 00:00:00 2001 -From: Manish Pandey <quic_mapa@quicinc.com> -Date: Wed, 1 Nov 2023 11:58:28 +0530 -Subject: [PATCH 2/2] PENDING: arm64: dts: qcom: Add UFS nodes for qcm6490-rb3 +From 4c0b2673c7d702483a526ebe279d57c4eece8f09 Mon Sep 17 00:00:00 2001 +From: Atul Dhudase <quic_adhudase@quicinc.com> +Date: Fri, 22 Mar 2024 14:06:21 +0530 +Subject: [PATCH 2/2] PENDING: arm64: dts: qcom: Add UFS nodes for + qcs6490-rb3gen2 Add UFS host controller and Phy nodes for Qualcomm -qcm6490-rb3 Board. +qcs6490-rb3gen2 board. Signed-off-by: Manish Pandey <quic_mapa@quicinc.com> Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> Upstream-Status: Pending --- - arch/arm64/boot/dts/qcom/qcm6490-rb3.dts | 19 +++++++++++++++++++ + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -diff --git a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -index ddc286157b8f..47ea7d3b5f51 100644 ---- a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -+++ b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -@@ -292,6 +292,25 @@ &uart5 { +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index 84137086c1f6..6dbeb182d014 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -446,6 +446,25 @@ &uart5 { status = "okay"; }; diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Correct-the-volt.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Correct-the-volt.patch new file mode 100644 index 0000000..b161099 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Correct-the-volt.patch @@ -0,0 +1,37 @@ +From a9d2e53efb1dd1bfea1be9c66ddcf319246aa140 Mon Sep 17 00:00:00 2001 +From: Atul Dhudase <quic_adhudase@quicinc.com> +Date: Tue, 2 Apr 2024 15:56:30 +0530 +Subject: [PATCH 2/2] UPSTREAM: arm64: dts: qcom: qcm6490-idp: Correct the + voltage setting for vph_pwr + +Min and max voltages for vph_pwr should be same, otherwise rpmh +will not probe, so correcting the min and max voltages for vph_pwr. + +Fixes: 9af6a9f32ad0 ("arm64: dts: qcom: Add base qcm6490 idp board dts") +Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> +Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> +Link: https://lore.kernel.org/r/20231220110015.25378-2-quic_kbajaj@quicinc.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git aa56130e88de50773f84de4039c7de81ab783744] +--- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +index 123e0e1b9e84..89e653c93ae8 100644 +--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts ++++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +@@ -120,8 +120,8 @@ debug_vm_mem: debug-vm@d0600000 { + vph_pwr: vph-pwr-regulator { + compatible = "regulator-fixed"; + regulator-name = "vph_pwr"; +- regulator-min-microvolt = <2500000>; +- regulator-max-microvolt = <4350000>; ++ regulator-min-microvolt = <3700000>; ++ regulator-max-microvolt = <3700000>; + }; + }; + +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Declare-GCC-.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Declare-GCC-.patch new file mode 100644 index 0000000..5834979 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Declare-GCC-.patch @@ -0,0 +1,56 @@ +From 75600814c282c7e7de67b94786d1dee0b9ddcfe2 Mon Sep 17 00:00:00 2001 +From: Atul Dhudase <quic_adhudase@quicinc.com> +Date: Tue, 2 Apr 2024 12:28:35 +0530 +Subject: [PATCH 2/3] UPSTREAM: arm64: dts: qcom: qcs6490-rb3gen2: Declare GCC + clocks protected + +The SC7280 GCC binding describes clocks which, due to the difference in +security model, are not accessible on the RB3gen2 - in the same way seen +on QCM6490. + +Mark these clocks as protected, to allow the board to boot. In contrast +to the present QCM6490 boards GCC_EDP_CLKREF_EN is left out, as this +does not need to be "protected" and is used on the RB3Gen2 board. + +Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Reviewed-by: Luca Weiss <luca.weiss@fairphone.com> +Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> +Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com> +Link: https://lore.kernel.org/r/20240209-qcm6490-gcc-protected-clocks-v2-1-11cd5fc13bd0@quicinc.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 7c6bef576a8891abce08d448165b53328032aa5f] +--- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index 0beab54c051e..b642ba9d4c00 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -410,6 +410,23 @@ vreg_bob_3p296: bob { + }; + }; + ++&gcc { ++ protected-clocks = <GCC_CFG_NOC_LPASS_CLK>, ++ <GCC_MSS_CFG_AHB_CLK>, ++ <GCC_MSS_GPLL0_MAIN_DIV_CLK_SRC>, ++ <GCC_MSS_OFFLINE_AXI_CLK>, ++ <GCC_MSS_Q6SS_BOOT_CLK_SRC>, ++ <GCC_MSS_Q6_MEMNOC_AXI_CLK>, ++ <GCC_MSS_SNOC_AXI_CLK>, ++ <GCC_QSPI_CNOC_PERIPH_AHB_CLK>, ++ <GCC_QSPI_CORE_CLK>, ++ <GCC_QSPI_CORE_CLK_SRC>, ++ <GCC_SEC_CTRL_CLK_SRC>, ++ <GCC_WPSS_AHB_BDG_MST_CLK>, ++ <GCC_WPSS_AHB_CLK>, ++ <GCC_WPSS_RSCP_CLK>; ++}; ++ + &qupv3_id_0 { + status = "okay"; + }; +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-dt-bindings-arm-qcom-Add-QCM6490-IDP-and-QC.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-dt-bindings-arm-qcom-Add-QCM6490-IDP-and-QC.patch new file mode 100644 index 0000000..7951f09 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-dt-bindings-arm-qcom-Add-QCM6490-IDP-and-QC.patch @@ -0,0 +1,39 @@ +From 4557d6178af17473f392968474b5ca0da56b1175 Mon Sep 17 00:00:00 2001 +From: Komal Bajaj <quic_kbajaj@quicinc.com> +Date: Wed, 29 Nov 2023 12:28:14 +0530 +Subject: [PATCH 2/4] UPSTREAM: dt-bindings: arm: qcom: Add QCM6490 IDP and + QCS6490 RB3Gen2 board + +Document the qcom,qcm6490-idp and qcs6490-rb3gen2 boards. +qcm6490-idp based off qcm6490 SoC derived from sc7280 meant for +various form factor including IoT and qcs6490-rb3gen2 based off +qcs6490 SoC derivative of qcm6490 without internal modem. + +Co-developed by: Naina Mehta <quic_nainmeht@quicinc.com> +Signed-off by: Naina Mehta <quic_nainmeht@quicinc.com> + +Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> +Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> +Link: https://lore.kernel.org/r/20231129065816.26409-2-quic_kbajaj@quicinc.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 06fd1dd1efde4a0bcc874de03558f6e0ba3817eb] +--- + Documentation/devicetree/bindings/arm/qcom.yaml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml +index adee504bffdb..e45e293457d3 100644 +--- a/Documentation/devicetree/bindings/arm/qcom.yaml ++++ b/Documentation/devicetree/bindings/arm/qcom.yaml +@@ -395,6 +395,8 @@ properties: + - items: + - enum: + - fairphone,fp5 ++ - qcom,qcm6490-idp ++ - qcom,qcs6490-rb3gen2 + - const: qcom,qcm6490 + + - description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-BACKPORT-FROMLIST-arm64-dts-qcom-qcs6490-rb3gen2-Upd.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-BACKPORT-FROMLIST-arm64-dts-qcom-qcs6490-rb3gen2-Upd.patch new file mode 100644 index 0000000..a1716fd --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-BACKPORT-FROMLIST-arm64-dts-qcom-qcs6490-rb3gen2-Upd.patch @@ -0,0 +1,41 @@ +From 85e1d98a2b1d8515d242154aef320a3900fb5030 Mon Sep 17 00:00:00 2001 +From: Taniya Das <quic_tdas@quicinc.com> +Date: Mon, 18 Mar 2024 11:05:55 +0530 +Subject: [PATCH 3/3] BACKPORT: FROMLIST: arm64: dts: qcom: qcs6490-rb3gen2: + Update the LPASS audio node + +Update the lpassaudio node to support the new compatible. + +Signed-off-by: Taniya Das <quic_tdas@quicinc.com> +Upstream-Status: Submitted [https://lore.kernel.org/r/20240318053555.20405-9-quic_tdas@quicinc.com] +--- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index b642ba9d4c00..84137086c1f6 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: BSD-3-Clause + /* +- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. ++ * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + + /dts-v1/; +@@ -427,6 +427,11 @@ &gcc { + <GCC_WPSS_RSCP_CLK>; + }; + ++&lpass_audiocc { ++ compatible = "qcom,qcm6490-lpassaudiocc"; ++ /delete-property/ power-domains; ++}; ++ + &qupv3_id_0 { + status = "okay"; + }; +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0003-FROMLIST-arm64-dts-qcom-Add-qcm6490-dts-file.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-Add-base-qcm6490-id.patch index 75e02e3..bb60422 100644 --- a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0003-FROMLIST-arm64-dts-qcom-Add-qcm6490-dts-file.patch +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-Add-base-qcm6490-id.patch @@ -1,34 +1,30 @@ -From cfb0bbdb1d965e65a090303000a87b67a774f6d4 Mon Sep 17 00:00:00 2001 +From 4c6d64ebad9067be2a5138ab202f570b0e71d3f0 Mon Sep 17 00:00:00 2001 From: Komal Bajaj <quic_kbajaj@quicinc.com> -Date: Thu, 5 Oct 2023 18:37:05 +0530 -Subject: [PATCH 3/3] FROMLIST: arm64: dts: qcom: Add qcm6490 dts file +Date: Wed, 29 Nov 2023 12:28:15 +0530 +Subject: [PATCH 3/4] UPSTREAM: arm64: dts: qcom: Add base qcm6490 + idp board dts -Add qcm6490 devicetree file for QCM6490 SoC and QCM6490 IDP -platform. QCM6490 is derived from SC7280 meant for various -form factor including IoT. - -Supported features are, as of now: -* Debug UART -* eMMC -* USB +Add DTS for Qualcomm IDP platform using QCM6490 SoC. +This adds debug uart, eMMC and usb support along with +regulators found on this board. Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> -Signed-off-by: Salendarsingh Gaud <quic_sgaud@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/20231003175456.14774-3-quic_kbajaj@quicinc.com/] +Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> +Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org> +Link: https://lore.kernel.org/r/20231129065816.26409-3-quic_kbajaj@quicinc.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 9af6a9f32ad0023b1d682af213a0c8c2aa1dce29] --- arch/arm64/boot/dts/qcom/Makefile | 1 + - arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 333 +++++++++++++++++++++++ - arch/arm64/boot/dts/qcom/qcm6490.dtsi | 94 +++++++ - 3 files changed, 428 insertions(+) + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 465 +++++++++++++++++++++++ + 2 files changed, 466 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/qcm6490-idp.dts - create mode 100644 arch/arm64/boot/dts/qcom/qcm6490.dtsi diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile -index 337abc4ceb17..f597224e3dcb 100644 +index 2cca20563a1d..3199b1b8db13 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-lilac.dtb +@@ -81,6 +81,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-lilac.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-maple.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb @@ -38,10 +34,10 @@ index 337abc4ceb17..f597224e3dcb 100644 dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts new file mode 100644 -index 000000000000..9b1bf7d1c98d +index 000000000000..2a5631b0fa40 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -@@ -0,0 +1,333 @@ +@@ -0,0 +1,465 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. @@ -49,16 +45,22 @@ index 000000000000..9b1bf7d1c98d + +/dts-v1/; + -+#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> +#include <dt-bindings/regulator/qcom,rpmh-regulator.h> -+#include "qcm6490.dtsi" ++#include "sc7280.dtsi" +#include "pm7325.dtsi" +#include "pm8350c.dtsi" +#include "pmk8350.dtsi" + ++/delete-node/ &ipa_fw_mem; ++/delete-node/ &rmtfs_mem; ++/delete-node/ &video_mem; ++/delete-node/ &wlan_ce_mem; ++/delete-node/ &xbl_mem; ++ +/ { + model = "Qualcomm Technologies, Inc. QCM6490 IDP"; + compatible = "qcom,qcm6490-idp", "qcom,qcm6490"; ++ chassis-type = "embedded"; + + aliases { + serial0 = &uart5; @@ -67,6 +69,100 @@ index 000000000000..9b1bf7d1c98d + chosen { + stdout-path = "serial0:115200n8"; + }; ++ ++ reserved-memory { ++ xbl_mem: xbl@80700000 { ++ reg = <0x0 0x80700000 0x0 0x100000>; ++ no-map; ++ }; ++ ++ cdsp_secure_heap_mem: cdsp-secure-heap@81800000 { ++ reg = <0x0 0x81800000 0x0 0x1e00000>; ++ no-map; ++ }; ++ ++ camera_mem: camera@84300000 { ++ reg = <0x0 0x84300000 0x0 0x500000>; ++ no-map; ++ }; ++ ++ wpss_mem: wpss@84800000 { ++ reg = <0x0 0x84800000 0x0 0x1900000>; ++ no-map; ++ }; ++ ++ adsp_mem: adsp@86100000 { ++ reg = <0x0 0x86100000 0x0 0x2800000>; ++ no-map; ++ }; ++ ++ cdsp_mem: cdsp@88900000 { ++ reg = <0x0 0x88900000 0x0 0x1e00000>; ++ no-map; ++ }; ++ ++ video_mem: video@8a700000 { ++ reg = <0x0 0x8a700000 0x0 0x700000>; ++ no-map; ++ }; ++ ++ cvp_mem: cvp@8ae00000 { ++ reg = <0x0 0x8ae00000 0x0 0x500000>; ++ no-map; ++ }; ++ ++ ipa_fw_mem: ipa-fw@8b300000 { ++ reg = <0x0 0x8b300000 0x0 0x10000>; ++ no-map; ++ }; ++ ++ ipa_gsi_mem: ipa-gsi@8b310000 { ++ reg = <0x0 0x8b310000 0x0 0xa000>; ++ no-map; ++ }; ++ ++ gpu_microcode_mem: gpu-microcode@8b31a000 { ++ reg = <0x0 0x8b31a000 0x0 0x2000>; ++ no-map; ++ }; ++ ++ mpss_mem: mpss@8b800000 { ++ reg = <0x0 0x8b800000 0x0 0xf600000>; ++ no-map; ++ }; ++ ++ tz_stat_mem: tz-stat@c0000000 { ++ reg = <0x0 0xc0000000 0x0 0x100000>; ++ no-map; ++ }; ++ ++ tags_mem: tags@c0100000 { ++ reg = <0x0 0xc0100000 0x0 0x1200000>; ++ no-map; ++ }; ++ ++ qtee_mem: qtee@c1300000 { ++ reg = <0x0 0xc1300000 0x0 0x500000>; ++ no-map; ++ }; ++ ++ trusted_apps_mem: trusted_apps@c1800000 { ++ reg = <0x0 0xc1800000 0x0 0x1c00000>; ++ no-map; ++ }; ++ ++ debug_vm_mem: debug-vm@d0600000 { ++ reg = <0x0 0xd0600000 0x0 0x100000>; ++ no-map; ++ }; ++ }; ++ ++ vph_pwr: vph-pwr-regulator { ++ compatible = "regulator-fixed"; ++ regulator-name = "vph_pwr"; ++ regulator-min-microvolt = <2500000>; ++ regulator-max-microvolt = <4350000>; ++ }; +}; + +&apps_rsc { @@ -74,95 +170,136 @@ index 000000000000..9b1bf7d1c98d + compatible = "qcom,pm7325-rpmh-regulators"; + qcom,pmic-id = "b"; + -+ vreg_s1b_1p8: smps1 { -+ regulator-min-microvolt = <1856000>; ++ vdd-s1-supply = <&vph_pwr>; ++ vdd-s2-supply = <&vph_pwr>; ++ vdd-s3-supply = <&vph_pwr>; ++ vdd-s4-supply = <&vph_pwr>; ++ vdd-s5-supply = <&vph_pwr>; ++ vdd-s6-supply = <&vph_pwr>; ++ vdd-s7-supply = <&vph_pwr>; ++ vdd-s8-supply = <&vph_pwr>; ++ vdd-l1-l4-l12-l15-supply = <&vreg_s7b_0p972>; ++ vdd-l2-l7-supply = <&vreg_bob_3p296>; ++ vdd-l3-supply = <&vreg_s2b_0p876>; ++ vdd-l5-supply = <&vreg_s2b_0p876>; ++ vdd-l6-l9-l10-supply = <&vreg_s8b_1p272>; ++ vdd-l8-supply = <&vreg_s7b_0p972>; ++ vdd-l11-l17-l18-l19-supply = <&vreg_s1b_1p872>; ++ vdd-l13-supply = <&vreg_s7b_0p972>; ++ vdd-l14-l16-supply = <&vreg_s8b_1p272>; ++ ++ vreg_s1b_1p872: smps1 { ++ regulator-min-microvolt = <1840000>; + regulator-max-microvolt = <2040000>; + }; + -+ vreg_s7b_0p9: smps7 { ++ vreg_s2b_0p876: smps2 { ++ regulator-min-microvolt = <570070>; ++ regulator-max-microvolt = <1050000>; ++ }; ++ ++ vreg_s7b_0p972: smps7 { + regulator-min-microvolt = <535000>; + regulator-max-microvolt = <1120000>; + }; + -+ vreg_s8b_1p2: smps8 { -+ regulator-min-microvolt = <1256000>; ++ vreg_s8b_1p272: smps8 { ++ regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1500000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_RET>; + }; + -+ vreg_l1b_0p8: ldo1 { ++ vreg_l1b_0p912: ldo1 { + regulator-min-microvolt = <825000>; + regulator-max-microvolt = <925000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l2b_3p0: ldo2 { ++ vreg_l2b_3p072: ldo2 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3544000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + ++ vreg_l3b_0p504: ldo3 { ++ regulator-min-microvolt = <312000>; ++ regulator-max-microvolt = <910000>; ++ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; ++ }; ++ ++ vreg_l4b_0p752: ldo4 { ++ regulator-min-microvolt = <752000>; ++ regulator-max-microvolt = <820000>; ++ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; ++ }; ++ ++ reg_l5b_0p752: ldo5 { ++ regulator-min-microvolt = <552000>; ++ regulator-max-microvolt = <832000>; ++ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; ++ }; ++ + vreg_l6b_1p2: ldo6 { + regulator-min-microvolt = <1140000>; + regulator-max-microvolt = <1260000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l7b_2p9: ldo7 { -+ regulator-min-microvolt = <2960000>; -+ regulator-max-microvolt = <2960000>; ++ vreg_l7b_2p952: ldo7 { ++ regulator-min-microvolt = <2400000>; ++ regulator-max-microvolt = <3544000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l8b_0p9: ldo8 { ++ vreg_l8b_0p904: ldo8 { + regulator-min-microvolt = <870000>; + regulator-max-microvolt = <970000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + + vreg_l9b_1p2: ldo9 { -+ regulator-min-microvolt = <1080000>; ++ regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1304000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l11b_1p7: ldo11 { ++ vreg_l11b_1p504: ldo11 { + regulator-min-microvolt = <1504000>; + regulator-max-microvolt = <2000000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l12b_0p8: ldo12 { ++ vreg_l12b_0p751: ldo12 { + regulator-min-microvolt = <751000>; + regulator-max-microvolt = <824000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l13b_0p8: ldo13 { ++ vreg_l13b_0p53: ldo13 { + regulator-min-microvolt = <530000>; + regulator-max-microvolt = <824000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l14b_1p2: ldo14 { ++ vreg_l14b_1p08: ldo14 { + regulator-min-microvolt = <1080000>; + regulator-max-microvolt = <1304000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l15b_0p8: ldo15 { ++ vreg_l15b_0p765: ldo15 { + regulator-min-microvolt = <765000>; + regulator-max-microvolt = <1020000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l16b_1p2: ldo16 { ++ vreg_l16b_1p1: ldo16 { + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1300000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l17b_1p8: ldo17 { ++ vreg_l17b_1p7: ldo17 { + regulator-min-microvolt = <1700000>; + regulator-max-microvolt = <1900000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; @@ -176,8 +313,11 @@ index 000000000000..9b1bf7d1c98d + + vreg_l19b_1p8: ldo19 { + regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; ++ regulator-max-microvolt = <2000000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; ++ regulator-allow-set-load; ++ regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM ++ RPMH_REGULATOR_MODE_HPM>; + }; + }; + @@ -185,16 +325,46 @@ index 000000000000..9b1bf7d1c98d + compatible = "qcom,pm8350c-rpmh-regulators"; + qcom,pmic-id = "c"; + -+ vreg_s1c_2p2: smps1 { ++ vdd-s1-supply = <&vph_pwr>; ++ vdd-s2-supply = <&vph_pwr>; ++ vdd-s3-supply = <&vph_pwr>; ++ vdd-s4-supply = <&vph_pwr>; ++ vdd-s5-supply = <&vph_pwr>; ++ vdd-s6-supply = <&vph_pwr>; ++ vdd-s7-supply = <&vph_pwr>; ++ vdd-s8-supply = <&vph_pwr>; ++ vdd-s9-supply = <&vph_pwr>; ++ vdd-s10-supply = <&vph_pwr>; ++ vdd-l1-l12-supply = <&vreg_s1b_1p872>; ++ vdd-l2-l8-supply = <&vreg_s1b_1p872>; ++ vdd-l3-l4-l5-l7-l13-supply = <&vreg_bob_3p296>; ++ vdd-l6-l9-l11-supply = <&vreg_bob_3p296>; ++ vdd-l10-supply = <&vreg_s7b_0p972>; ++ vdd-bob-supply = <&vph_pwr>; ++ ++ vreg_s1c_2p19: smps1 { + regulator-min-microvolt = <2190000>; + regulator-max-microvolt = <2210000>; -+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_s9c_1p0: smps9 { ++ vreg_s2c_0p752: smps2 { ++ regulator-min-microvolt = <750000>; ++ regulator-max-microvolt = <800000>; ++ }; ++ ++ vreg_s5c_0p752: smps5 { ++ regulator-min-microvolt = <465000>; ++ regulator-max-microvolt = <1050000>; ++ }; ++ ++ vreg_s7c_0p752: smps7 { ++ regulator-min-microvolt = <465000>; ++ regulator-max-microvolt = <800000>; ++ }; ++ ++ vreg_s9c_1p084: smps9 { + regulator-min-microvolt = <1010000>; + regulator-max-microvolt = <1170000>; -+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + + vreg_l1c_1p8: ldo1 { @@ -203,33 +373,33 @@ index 000000000000..9b1bf7d1c98d + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l2c_1p8: ldo2 { ++ vreg_l2c_1p62: ldo2 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <1980000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l3c_3p0: ldo3 { ++ vreg_l3c_2p8: ldo3 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <3540000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l4c_1p8: ldo4 { ++ vreg_l4c_1p62: ldo4 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <3300000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l5c_1p8: ldo5 { ++ vreg_l5c_1p62: ldo5 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <3300000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l6c_2p9: ldo6 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <2950000>; ++ vreg_l6c_2p96: ldo6 { ++ regulator-min-microvolt = <1650000>; ++ regulator-max-microvolt = <3544000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + @@ -239,19 +409,19 @@ index 000000000000..9b1bf7d1c98d + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l8c_1p8: ldo8 { ++ vreg_l8c_1p62: ldo8 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <2000000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l9c_2p9: ldo9 { -+ regulator-min-microvolt = <2960000>; -+ regulator-max-microvolt = <2960000>; ++ vreg_l9c_2p96: ldo9 { ++ regulator-min-microvolt = <2700000>; ++ regulator-max-microvolt = <35440000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l10c_0p8: ldo10 { ++ vreg_l10c_0p88: ldo10 { + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <1050000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; @@ -263,85 +433,45 @@ index 000000000000..9b1bf7d1c98d + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l12c_1p8: ldo12 { ++ vreg_l12c_1p65: ldo12 { + regulator-min-microvolt = <1650000>; + regulator-max-microvolt = <2000000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l13c_3p0: ldo13 { ++ vreg_l13c_2p7: ldo13 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3544000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_bob: bob { ++ vreg_bob_3p296: bob { + regulator-min-microvolt = <3008000>; + regulator-max-microvolt = <3960000>; + }; + }; +}; + -+&gpi_dma0 { -+ status = "okay"; -+}; -+ -+&gpi_dma1 { -+ status = "okay"; -+}; -+ -+&pm8350c_pwm { -+ status = "okay"; -+}; -+ -+&qup_uart5_rx { -+ drive-strength = <2>; -+ bias-pull-up; -+}; -+ -+&qup_uart5_tx { -+ drive-strength = <2>; -+ bias-disable; -+}; -+ +&qupv3_id_0 { + status = "okay"; +}; + -+&qupv3_id_1 { -+ status = "okay"; -+}; -+ -+&sdc1_clk { -+ bias-disable; -+ drive-strength = <16>; -+}; -+ -+&sdc1_cmd { -+ bias-pull-up; -+ drive-strength = <10>; -+}; -+ -+&sdc1_data { -+ bias-pull-up; -+ drive-strength = <10>; -+}; -+ -+&sdc1_rclk { -+ bias-pull-down; -+}; -+ +&sdhc_1 { + non-removable; + no-sd; + no-sdio; + -+ vmmc-supply = <&vreg_l7b_2p9>; ++ vmmc-supply = <&vreg_l7b_2p952>; + vqmmc-supply = <&vreg_l19b_1p8>; + + status = "okay"; +}; + ++&tlmm { ++ gpio-reserved-ranges = <32 2>, /* ADSP */ ++ <48 4>; /* NFC */ ++}; ++ +&uart5 { + compatible = "qcom,geni-debug-uart"; + status = "okay"; @@ -356,125 +486,23 @@ index 000000000000..9b1bf7d1c98d +}; + +&usb_1_hsphy { -+ vdda-pll-supply = <&vreg_l10c_0p8>; -+ vdda33-supply = <&vreg_l2b_3p0>; ++ vdda-pll-supply = <&vreg_l10c_0p88>; ++ vdda33-supply = <&vreg_l2b_3p072>; + vdda18-supply = <&vreg_l1c_1p8>; -+ qcom,hs-rise-fall-time-bp = <0>; -+ qcom,squelch-detector-bp = <(-2090)>; -+ qcom,hs-disconnect-bp = <1743>; -+ qcom,hs-amplitude-bp = <1780>; -+ qcom,hs-crossover-voltage-microvolt = <(-31000)>; -+ qcom,hs-output-impedance-micro-ohms = <2600000>; + + status = "okay"; +}; + +&usb_1_qmpphy { + vdda-phy-supply = <&vreg_l6b_1p2>; -+ vdda-pll-supply = <&vreg_l1b_0p8>; ++ vdda-pll-supply = <&vreg_l1b_0p912>; + + status = "okay"; +}; -diff --git a/arch/arm64/boot/dts/qcom/qcm6490.dtsi b/arch/arm64/boot/dts/qcom/qcm6490.dtsi -new file mode 100644 -index 000000000000..b93270cae9ae ---- /dev/null -+++ b/arch/arm64/boot/dts/qcom/qcm6490.dtsi -@@ -0,0 +1,94 @@ -+// SPDX-License-Identifier: BSD-3-Clause -+/* -+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. -+ */ -+ -+#include "sc7280.dtsi" -+ -+/* -+ * Delete unused sc7280 memory nodes and define the memory regions -+ * required by qcm6490 -+ */ -+/delete-node/ &rmtfs_mem; -+/delete-node/ &wlan_ce_mem; -+ -+/{ -+ reserved-memory { -+ cdsp_secure_heap_mem: cdsp-secure-heap@81800000 { -+ reg = <0x0 0x81800000 0x0 0x1e00000>; -+ no-map; -+ }; -+ -+ camera_mem: camera@84300000 { -+ reg = <0x0 0x84300000 0x0 0x500000>; -+ no-map; -+ }; -+ -+ wpss_mem: wpss@0x84800000 { -+ reg = <0x0 0x84800000 0x0 0x1900000>; -+ no-map; -+ }; -+ -+ adsp_mem: adsp@86100000 { -+ reg = <0x0 0x86100000 0x0 0x2800000>; -+ no-map; -+ }; -+ -+ cdsp_mem: cdsp@88900000 { -+ reg = <0x0 0x88900000 0x0 0x1e00000>; -+ no-map; -+ }; -+ -+ cvp_mem: cvp@8ac00000 { -+ reg = <0x0 0x8ac00000 0x0 0x500000>; -+ no-map; -+ }; -+ -+ ipa_gsi_mem: ipa-gsi@8b110000 { -+ reg = <0x0 0x8b110000 0x0 0xa000>; -+ no-map; -+ }; -+ -+ gpu_microcode_mem: gpu-microcode@8b11a000 { -+ reg = <0x0 0x8b11a000 0x0 0x2000>; -+ no-map; -+ }; -+ -+ mpss_mem: mpss@8b800000 { -+ reg = <0x0 0x8b800000 0x0 0xf600000>; -+ no-map; -+ }; -+ -+ tz_stat_mem: tz-stat@c0000000 { -+ reg = <0x0 0xc0000000 0x0 0x100000>; -+ no-map; -+ }; -+ -+ tags_mem: tags@c0100000 { -+ reg = <0x0 0xc0100000 0x0 0x1200000>; -+ no-map; -+ }; -+ -+ qtee_mem: qtee@c1300000 { -+ reg = <0x0 0xc1300000 0x0 0x500000>; -+ no-map; -+ }; -+ -+ trusted_apps_mem: trusted_apps@c1800000 { -+ reg = <0x0 0xc1800000 0x0 0x3900000>; -+ no-map; -+ }; -+ }; -+}; -+ -+&video_mem { -+ reg = <0x0 0x8a700000 0x0 0x500000>; -+}; + +&wifi { + memory-region = <&wlan_fw_mem>; +}; -+ -+&xbl_mem { -+ reg = <0x0 0x80700000 0x0 0x100000>; -+}; -- 2.25.1 diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-qcm6490-rb3-support.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0004-UPSTREAM-arm64-dts-qcom-Add-base-qcs6490-rb3gen2-boa.patch index de9982a..ce4c246 100644 --- a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-qcm6490-rb3-support.patch +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0004-UPSTREAM-arm64-dts-qcom-Add-base-qcs6490-rb3gen2-boa.patch @@ -1,37 +1,45 @@ -From 95a6f8a80e901dc1fe35793e51d761ea05eae90d Mon Sep 17 00:00:00 2001 -From: Naina Mehta <quic_nainmeht@quicinc.com> -Date: Tue, 17 Oct 2023 18:59:20 +0530 -Subject: [PATCH 2/2] PENDING: arm64: dts: qcom: Add qcm6490 rb3 support +From 35f473c0500b63f21de7f6ea144f2b5a327a180e Mon Sep 17 00:00:00 2001 +From: Komal Bajaj <quic_kbajaj@quicinc.com> +Date: Wed, 29 Nov 2023 12:28:16 +0530 +Subject: [PATCH 4/4] UPSTREAM: arm64: dts: qcom: Add base qcs6490-rb3gen2 + board dts -Add device tree file for rb3 board for qcm6490 SoC. +Add DTS for Qualcomm qcs6490-rb3gen2 board which uses +QCS6490 SoC. This adds debug uart and usb support along +with regulators found on this board. +Co-developed-by: Naina Mehta <quic_nainmeht@quicinc.com> Signed-off-by: Naina Mehta <quic_nainmeht@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending +Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> +Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> +Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org> +Link: https://lore.kernel.org/r/20231129065816.26409-4-quic_kbajaj@quicinc.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 04cf333afc757d8fd3c674c6c3f5f86c7755b4d4] --- - arch/arm64/boot/dts/qcom/Makefile | 1 + - arch/arm64/boot/dts/qcom/qcm6490-rb3.dts | 316 +++++++++++++++++++++++ - 2 files changed, 317 insertions(+) - create mode 100644 arch/arm64/boot/dts/qcom/qcm6490-rb3.dts + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 452 +++++++++++++++++++ + 2 files changed, 453 insertions(+) + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile -index f597224e3dcb..c21079c18bb4 100644 +index 3199b1b8db13..28178644834a 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -79,6 +79,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-maple.dtb - dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb - dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb +@@ -84,6 +84,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb dtb-$(CONFIG_ARCH_QCOM) += qcm6490-idp.dtb -+dtb-$(CONFIG_ARCH_QCOM) += qcm6490-rb3.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb ++dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb -diff --git a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts + dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb + dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts new file mode 100644 -index 000000000000..ddc286157b8f +index 000000000000..0beab54c051e --- /dev/null -+++ b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -@@ -0,0 +1,316 @@ ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -0,0 +1,452 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. @@ -43,17 +51,24 @@ index 000000000000..ddc286157b8f +#define PM7250B_SID 8 +#define PM7250B_SID1 9 + -+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h> +#include <dt-bindings/regulator/qcom,rpmh-regulator.h> -+#include "qcm6490.dtsi" ++#include "sc7280.dtsi" +#include "pm7250b.dtsi" +#include "pm7325.dtsi" +#include "pm8350c.dtsi" +#include "pmk8350.dtsi" + ++/delete-node/ &ipa_fw_mem; ++/delete-node/ &remoteproc_mpss; ++/delete-node/ &rmtfs_mem; ++/delete-node/ &video_mem; ++/delete-node/ &wlan_ce_mem; ++/delete-node/ &xbl_mem; ++ +/ { -+ model = "Qualcomm Robotics RB3 Gen2"; -+ compatible = "qcom,qcm6490-rb3", "qcom,qcm6490"; ++ model = "Qualcomm Technologies, Inc. Robotics RB3gen2"; ++ compatible = "qcom,qcs6490-rb3gen2", "qcom,qcm6490"; ++ chassis-type = "embedded"; + + aliases { + serial0 = &uart5; @@ -62,6 +77,95 @@ index 000000000000..ddc286157b8f + chosen { + stdout-path = "serial0:115200n8"; + }; ++ ++ reserved-memory { ++ xbl_mem: xbl@80700000 { ++ reg = <0x0 0x80700000 0x0 0x100000>; ++ no-map; ++ }; ++ ++ cdsp_secure_heap_mem: cdsp-secure-heap@81800000 { ++ reg = <0x0 0x81800000 0x0 0x1e00000>; ++ no-map; ++ }; ++ ++ camera_mem: camera@84300000 { ++ reg = <0x0 0x84300000 0x0 0x500000>; ++ no-map; ++ }; ++ ++ wpss_mem: wpss@84800000 { ++ reg = <0x0 0x84800000 0x0 0x1900000>; ++ no-map; ++ }; ++ ++ adsp_mem: adsp@86100000 { ++ reg = <0x0 0x86100000 0x0 0x2800000>; ++ no-map; ++ }; ++ ++ cdsp_mem: cdsp@88900000 { ++ reg = <0x0 0x88900000 0x0 0x1e00000>; ++ no-map; ++ }; ++ ++ video_mem: video@8a700000 { ++ reg = <0x0 0x8a700000 0x0 0x700000>; ++ no-map; ++ }; ++ ++ cvp_mem: cvp@8ae00000 { ++ reg = <0x0 0x8ae00000 0x0 0x500000>; ++ no-map; ++ }; ++ ++ ipa_fw_mem: ipa-fw@8b300000 { ++ reg = <0x0 0x8b300000 0x0 0x10000>; ++ no-map; ++ }; ++ ++ ipa_gsi_mem: ipa-gsi@8b310000 { ++ reg = <0x0 0x8b310000 0x0 0xa000>; ++ no-map; ++ }; ++ ++ gpu_microcode_mem: gpu-microcode@8b31a000 { ++ reg = <0x0 0x8b31a000 0x0 0x2000>; ++ no-map; ++ }; ++ ++ tz_stat_mem: tz-stat@c0000000 { ++ reg = <0x0 0xc0000000 0x0 0x100000>; ++ no-map; ++ }; ++ ++ tags_mem: tags@c0100000 { ++ reg = <0x0 0xc0100000 0x0 0x1200000>; ++ no-map; ++ }; ++ ++ qtee_mem: qtee@c1300000 { ++ reg = <0x0 0xc1300000 0x0 0x500000>; ++ no-map; ++ }; ++ ++ trusted_apps_mem: trusted_apps@c1800000 { ++ reg = <0x0 0xc1800000 0x0 0x1c00000>; ++ no-map; ++ }; ++ ++ debug_vm_mem: debug-vm@d0600000 { ++ reg = <0x0 0xd0600000 0x0 0x100000>; ++ no-map; ++ }; ++ }; ++ ++ vph_pwr: vph-pwr-regulator { ++ compatible = "regulator-fixed"; ++ regulator-name = "vph_pwr"; ++ regulator-min-microvolt = <2500000>; ++ regulator-max-microvolt = <4350000>; ++ }; +}; + +&apps_rsc { @@ -69,6 +173,24 @@ index 000000000000..ddc286157b8f + compatible = "qcom,pm7325-rpmh-regulators"; + qcom,pmic-id = "b"; + ++ vdd-s1-supply = <&vph_pwr>; ++ vdd-s2-supply = <&vph_pwr>; ++ vdd-s3-supply = <&vph_pwr>; ++ vdd-s4-supply = <&vph_pwr>; ++ vdd-s5-supply = <&vph_pwr>; ++ vdd-s6-supply = <&vph_pwr>; ++ vdd-s7-supply = <&vph_pwr>; ++ vdd-s8-supply = <&vph_pwr>; ++ vdd-l1-l4-l12-l15-supply = <&vreg_s7b_0p972>; ++ vdd-l2-l7-supply = <&vreg_bob_3p296>; ++ vdd-l3-supply = <&vreg_s2b_0p876>; ++ vdd-l5-supply = <&vreg_s2b_0p876>; ++ vdd-l6-l9-l10-supply = <&vreg_s8b_1p272>; ++ vdd-l8-supply = <&vreg_s7b_0p972>; ++ vdd-l11-l17-l18-l19-supply = <&vreg_s1b_1p872>; ++ vdd-l13-supply = <&vreg_s7b_0p972>; ++ vdd-l14-l16-supply = <&vreg_s8b_1p272>; ++ + vreg_s1b_1p872: smps1 { + regulator-min-microvolt = <1840000>; + regulator-max-microvolt = <2040000>; @@ -87,6 +209,7 @@ index 000000000000..ddc286157b8f + vreg_s8b_1p272: smps8 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1500000>; ++ regulator-initial-mode = <RPMH_REGULATOR_MODE_RET>; + }; + + vreg_l1b_0p912: ldo1 { @@ -113,7 +236,7 @@ index 000000000000..ddc286157b8f + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l5b_0p752: ldo5 { ++ reg_l5b_0p752: ldo5 { + regulator-min-microvolt = <552000>; + regulator-max-microvolt = <832000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; @@ -202,6 +325,23 @@ index 000000000000..ddc286157b8f + compatible = "qcom,pm8350c-rpmh-regulators"; + qcom,pmic-id = "c"; + ++ vdd-s1-supply = <&vph_pwr>; ++ vdd-s2-supply = <&vph_pwr>; ++ vdd-s3-supply = <&vph_pwr>; ++ vdd-s4-supply = <&vph_pwr>; ++ vdd-s5-supply = <&vph_pwr>; ++ vdd-s6-supply = <&vph_pwr>; ++ vdd-s7-supply = <&vph_pwr>; ++ vdd-s8-supply = <&vph_pwr>; ++ vdd-s9-supply = <&vph_pwr>; ++ vdd-s10-supply = <&vph_pwr>; ++ vdd-l1-l12-supply = <&vreg_s1b_1p872>; ++ vdd-l2-l8-supply = <&vreg_s1b_1p872>; ++ vdd-l3-l4-l5-l7-l13-supply = <&vreg_bob_3p296>; ++ vdd-l6-l9-l11-supply = <&vreg_bob_3p296>; ++ vdd-l10-supply = <&vreg_s7b_0p972>; ++ vdd-bob-supply = <&vph_pwr>; ++ + vreg_s1c_2p19: smps1 { + regulator-min-microvolt = <2190000>; + regulator-max-microvolt = <2210000>; @@ -227,11 +367,6 @@ index 000000000000..ddc286157b8f + regulator-max-microvolt = <1170000>; + }; + -+ vreg_s10c_0p752:smps10 { -+ regulator-min-microvolt = <752000>; -+ regulator-max-microvolt = <800000>; -+ }; -+ + vreg_l1c_1p8: ldo1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1980000>; @@ -282,11 +417,11 @@ index 000000000000..ddc286157b8f + + vreg_l9c_2p96: ldo9 { + regulator-min-microvolt = <2700000>; -+ regulator-max-microvolt = <3544000>; ++ regulator-max-microvolt = <35440000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; + -+ vreg_l10c_0p88:ldo10 { ++ vreg_l10c_0p88: ldo10 { + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <1050000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; @@ -321,6 +456,11 @@ index 000000000000..ddc286157b8f + status = "okay"; +}; + ++&tlmm { ++ gpio-reserved-ranges = <32 2>, /* ADSP */ ++ <48 4>; /* NFC */ ++}; ++ +&uart5 { + compatible = "qcom,geni-debug-uart"; + status = "okay"; @@ -336,8 +476,8 @@ index 000000000000..ddc286157b8f + +&usb_1_hsphy { + vdda-pll-supply = <&vreg_l10c_0p88>; -+ vdda18-supply = <&vreg_l1c_1p8>; + vdda33-supply = <&vreg_l2b_3p072>; ++ vdda18-supply = <&vreg_l1c_1p8>; + + status = "okay"; +}; @@ -348,6 +488,10 @@ index 000000000000..ddc286157b8f + + status = "okay"; +}; ++ ++&wifi { ++ memory-region = <&wlan_fw_mem>; ++}; -- 2.25.1 diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-clk-qcom-gcc-Enable-the-force-mem-core-for-U.patch b/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-clk-qcom-gcc-Enable-the-force-mem-core-for-U.patch deleted file mode 100644 index d2b87cf..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-clk-qcom-gcc-Enable-the-force-mem-core-for-U.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 5dab9b1ec029bd145a387fc02447306467d6d9d3 Mon Sep 17 00:00:00 2001 -From: Taniya Das <quic_tdas@quicinc.com> -Date: Mon, 30 Oct 2023 23:24:19 +0530 -Subject: [PATCH] PENDING: clk: qcom: gcc: Enable the force mem core for UFS - ICE clock - -Enable the force mem core for UFS ICE clock. Update the gdsc -transition delays to the recommended values for functional correctness. - -Signed-off-by: Taniya Das <quic_tdas@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - drivers/clk/qcom/camcc-sc7280.c | 19 +++++++++++++++++++ - drivers/clk/qcom/gcc-sc7280.c | 13 +++++++++++++ - drivers/clk/qcom/gpucc-sc7280.c | 7 +++++++ - drivers/clk/qcom/videocc-sc7280.c | 7 +++++++ - 4 files changed, 46 insertions(+) - -diff --git a/drivers/clk/qcom/camcc-sc7280.c b/drivers/clk/qcom/camcc-sc7280.c -index 4396fddba7a6..c1b71b4865e7 100644 ---- a/drivers/clk/qcom/camcc-sc7280.c -+++ b/drivers/clk/qcom/camcc-sc7280.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0-only - /* - * Copyright (c) 2021, The Linux Foundation. All rights reserved. -+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. - */ - - #include <linux/clk-provider.h> -@@ -2247,6 +2248,9 @@ static struct clk_branch cam_cc_sleep_clk = { - - static struct gdsc cam_cc_titan_top_gdsc = { - .gdscr = 0xc194, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "cam_cc_titan_top_gdsc", - }, -@@ -2256,6 +2260,9 @@ static struct gdsc cam_cc_titan_top_gdsc = { - - static struct gdsc cam_cc_bps_gdsc = { - .gdscr = 0x7004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "cam_cc_bps_gdsc", - }, -@@ -2265,6 +2272,9 @@ static struct gdsc cam_cc_bps_gdsc = { - - static struct gdsc cam_cc_ife_0_gdsc = { - .gdscr = 0xa004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "cam_cc_ife_0_gdsc", - }, -@@ -2274,6 +2284,9 @@ static struct gdsc cam_cc_ife_0_gdsc = { - - static struct gdsc cam_cc_ife_1_gdsc = { - .gdscr = 0xb004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "cam_cc_ife_1_gdsc", - }, -@@ -2283,6 +2296,9 @@ static struct gdsc cam_cc_ife_1_gdsc = { - - static struct gdsc cam_cc_ife_2_gdsc = { - .gdscr = 0xb070, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "cam_cc_ife_2_gdsc", - }, -@@ -2292,6 +2308,9 @@ static struct gdsc cam_cc_ife_2_gdsc = { - - static struct gdsc cam_cc_ipe_0_gdsc = { - .gdscr = 0x8004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "cam_cc_ipe_0_gdsc", - }, -diff --git a/drivers/clk/qcom/gcc-sc7280.c b/drivers/clk/qcom/gcc-sc7280.c -index 1dc804154031..dbb2fcb4e96a 100644 ---- a/drivers/clk/qcom/gcc-sc7280.c -+++ b/drivers/clk/qcom/gcc-sc7280.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0-only - /* - * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. -+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. - */ - - #include <linux/clk-provider.h> -@@ -3094,6 +3095,9 @@ static struct clk_branch gcc_wpss_rscp_clk = { - - static struct gdsc gcc_pcie_0_gdsc = { - .gdscr = 0x6b004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "gcc_pcie_0_gdsc", - }, -@@ -3112,6 +3116,9 @@ static struct gdsc gcc_pcie_1_gdsc = { - - static struct gdsc gcc_ufs_phy_gdsc = { - .gdscr = 0x77004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "gcc_ufs_phy_gdsc", - }, -@@ -3121,6 +3128,9 @@ static struct gdsc gcc_ufs_phy_gdsc = { - - static struct gdsc gcc_usb30_prim_gdsc = { - .gdscr = 0xf004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0xf, - .pd = { - .name = "gcc_usb30_prim_gdsc", - }, -@@ -3467,6 +3477,9 @@ static int gcc_sc7280_probe(struct platform_device *pdev) - regmap_update_bits(regmap, 0x71004, BIT(0), BIT(0)); - regmap_update_bits(regmap, 0x7100C, BIT(13), BIT(13)); - -+ /* FORCE_MEM_CORE_ON for ufs phy ice core clocks */ -+ qcom_branch_set_force_mem_core(regmap, gcc_ufs_phy_ice_core_clk, true); -+ - ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks, - ARRAY_SIZE(gcc_dfs_clocks)); - if (ret) -diff --git a/drivers/clk/qcom/gpucc-sc7280.c b/drivers/clk/qcom/gpucc-sc7280.c -index 1490cd45a654..a30d9941644d 100644 ---- a/drivers/clk/qcom/gpucc-sc7280.c -+++ b/drivers/clk/qcom/gpucc-sc7280.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0-only - /* - * Copyright (c) 2021, The Linux Foundation. All rights reserved. -+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. - */ - - #include <linux/clk-provider.h> -@@ -379,6 +380,9 @@ static struct clk_branch gpu_cc_sleep_clk = { - - static struct gdsc cx_gdsc = { - .gdscr = 0x106c, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0x2, - .gds_hw_ctrl = 0x1540, - .pd = { - .name = "cx_gdsc", -@@ -389,6 +393,9 @@ static struct gdsc cx_gdsc = { - - static struct gdsc gx_gdsc = { - .gdscr = 0x100c, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0x2, - .clamp_io_ctrl = 0x1508, - .pd = { - .name = "gx_gdsc", -diff --git a/drivers/clk/qcom/videocc-sc7280.c b/drivers/clk/qcom/videocc-sc7280.c -index 615695d82319..425b7d1dc3cc 100644 ---- a/drivers/clk/qcom/videocc-sc7280.c -+++ b/drivers/clk/qcom/videocc-sc7280.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0-only - /* - * Copyright (c) 2021, The Linux Foundation. All rights reserved. -+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. - */ - - #include <linux/clk-provider.h> -@@ -232,6 +233,9 @@ static struct clk_branch video_cc_venus_ahb_clk = { - - static struct gdsc mvs0_gdsc = { - .gdscr = 0x3004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0x6, - .pd = { - .name = "mvs0_gdsc", - }, -@@ -241,6 +245,9 @@ static struct gdsc mvs0_gdsc = { - - static struct gdsc mvsc_gdsc = { - .gdscr = 0x2004, -+ .en_rest_wait_val = 0x2, -+ .en_few_wait_val = 0x2, -+ .clk_dis_wait_val = 0x6, - .pd = { - .name = "mvsc_gdsc", - }, --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-dt-bindings-clock-Add-qcom-adsp-skip-pll-pro.patch b/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-dt-bindings-clock-Add-qcom-adsp-skip-pll-pro.patch deleted file mode 100644 index db0156e..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-dt-bindings-clock-Add-qcom-adsp-skip-pll-pro.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8a67d7619a576a3f95be7d27910c89bb801f6d03 Mon Sep 17 00:00:00 2001 -From: Taniya Das <quic_tdas@quicinc.com> -Date: Wed, 1 Nov 2023 10:30:17 +0530 -Subject: [PATCH 1/2] PENDING: dt-bindings: clock: Add "qcom,adsp-skip-pll" - property - -Add support for "qcom,adsp-skip-pll" so as to avoid configuring the -LPASS PLL. - -Signed-off-by: Taniya Das <quic_tdas@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - .../devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml b/Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml -index 447cdc447a0c..5587d4ca82a6 100644 ---- a/Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml -+++ b/Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml -@@ -49,6 +49,11 @@ properties: - peripheral loader. - type: boolean - -+ qcom,adsp-skip-pll: -+ description: -+ Indicates if the LPASS PLL configuration would be skipped. -+ type: boolean -+ - required: - - compatible - - reg --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0002-PENDING-clk-qcom-lpassaudiocc-Add-support-to-skip-PL.patch b/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0002-PENDING-clk-qcom-lpassaudiocc-Add-support-to-skip-PL.patch deleted file mode 100644 index 4dffe50..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-drivers/0002-PENDING-clk-qcom-lpassaudiocc-Add-support-to-skip-PL.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 96ef94902f0ce507d21cefb3ffaf841640556cff Mon Sep 17 00:00:00 2001 -From: Taniya Das <quic_tdas@quicinc.com> -Date: Tue, 31 Oct 2023 23:56:38 +0530 -Subject: [PATCH 2/2] PENDING: clk: qcom: lpassaudiocc: Add support to skip PLL - configuration - -On certain targets the PLL configuration should be skipped, thus add a -device property to support the same. - -Signed-off-by: Taniya Das <quic_tdas@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - drivers/clk/qcom/lpassaudiocc-sc7280.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/drivers/clk/qcom/lpassaudiocc-sc7280.c b/drivers/clk/qcom/lpassaudiocc-sc7280.c -index 134eb1529ede..5322ff53a3e1 100644 ---- a/drivers/clk/qcom/lpassaudiocc-sc7280.c -+++ b/drivers/clk/qcom/lpassaudiocc-sc7280.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0-only - /* - * Copyright (c) 2021, The Linux Foundation. All rights reserved. -+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved. - */ - - #include <linux/clk-provider.h> -@@ -765,11 +766,13 @@ static int lpass_audio_cc_sc7280_probe(struct platform_device *pdev) - goto exit; - } - -- clk_zonda_pll_configure(&lpass_audio_cc_pll, regmap, &lpass_audio_cc_pll_config); -+ if (!of_property_read_bool(pdev->dev.of_node, "qcom,adsp-skip-pll")) { -+ clk_zonda_pll_configure(&lpass_audio_cc_pll, regmap, &lpass_audio_cc_pll_config); - -- /* PLL settings */ -- regmap_write(regmap, 0x4, 0x3b); -- regmap_write(regmap, 0x8, 0xff05); -+ /* PLL settings */ -+ regmap_write(regmap, 0x4, 0x3b); -+ regmap_write(regmap, 0x8, 0xff05); -+ } - - ret = qcom_cc_really_probe(pdev, &lpass_audio_cc_sc7280_desc, regmap); - if (ret) { -@@ -777,6 +780,9 @@ static int lpass_audio_cc_sc7280_probe(struct platform_device *pdev) - goto exit; - } - -+ lpass_audio_cc_sc7280_regmap_config.name = "lpassaudio_cc_reset"; -+ lpass_audio_cc_sc7280_regmap_config.max_register = 0xc8; -+ - ret = qcom_cc_probe_by_index(pdev, 1, &lpass_audio_cc_reset_sc7280_desc); - if (ret) { - dev_err(&pdev->dev, "Failed to register LPASS AUDIO CC Resets\n"); --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-arm64-dts-qcm6490-Update-the-protected-clock.patch b/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-arm64-dts-qcm6490-Update-the-protected-clock.patch deleted file mode 100644 index 4dabe20..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-arm64-dts-qcm6490-Update-the-protected-clock.patch +++ /dev/null @@ -1,79 +0,0 @@ -From af40873b3994a00cc0c0afd0c35ff44c412edfd3 Mon Sep 17 00:00:00 2001 -From: Taniya Das <quic_tdas@quicinc.com> -Date: Mon, 30 Oct 2023 23:29:06 +0530 -Subject: [PATCH] PENDING: arm64: dts: qcm6490: Update the protected clocks for - QCM6490 - -Certain clocks are not accessible on QCM6490 board and thus require them -to be marked protected. -Also disable the LPASS nodes which are not to be used. - -Signed-off-by: Taniya Das <quic_tdas@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - arch/arm64/boot/dts/qcom/qcm6490.dtsi | 48 +++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) - -diff --git a/arch/arm64/boot/dts/qcom/qcm6490.dtsi b/arch/arm64/boot/dts/qcom/qcm6490.dtsi -index b93270cae9ae..cccb50ce6269 100644 ---- a/arch/arm64/boot/dts/qcom/qcm6490.dtsi -+++ b/arch/arm64/boot/dts/qcom/qcm6490.dtsi -@@ -81,6 +81,54 @@ trusted_apps_mem: trusted_apps@c1800000 { - }; - }; - -+&gcc { -+ protected-clocks = <GCC_AGGRE_NOC_PCIE_1_AXI_CLK> ,<GCC_PCIE_1_AUX_CLK>, -+ <GCC_PCIE_1_AUX_CLK_SRC>, <GCC_PCIE_1_CFG_AHB_CLK>, -+ <GCC_PCIE_1_MSTR_AXI_CLK>, <GCC_PCIE_1_PHY_RCHNG_CLK_SRC>, -+ <GCC_PCIE_1_PIPE_CLK>, <GCC_PCIE_1_PIPE_CLK_SRC>, -+ <GCC_PCIE_1_SLV_AXI_CLK>, <GCC_PCIE_1_SLV_Q2A_AXI_CLK>, -+ <GCC_QSPI_CNOC_PERIPH_AHB_CLK>, <GCC_QSPI_CORE_CLK>, -+ <GCC_QSPI_CORE_CLK_SRC>,<GCC_USB30_SEC_MASTER_CLK>, -+ <GCC_USB30_SEC_MASTER_CLK_SRC>, <GCC_USB30_SEC_MOCK_UTMI_CLK>, -+ <GCC_USB30_SEC_MOCK_UTMI_CLK_SRC>, -+ <GCC_USB30_SEC_MOCK_UTMI_POSTDIV_CLK_SRC>, <GCC_USB30_SEC_SLEEP_CLK>, -+ <GCC_USB3_SEC_PHY_AUX_CLK>, <GCC_USB3_SEC_PHY_AUX_CLK_SRC>, -+ <GCC_USB3_SEC_PHY_COM_AUX_CLK>, <GCC_USB3_SEC_PHY_PIPE_CLK>, -+ <GCC_USB3_SEC_PHY_PIPE_CLK_SRC>, <GCC_CFG_NOC_LPASS_CLK>, -+ <GCC_MSS_GPLL0_MAIN_DIV_CLK_SRC>, <GCC_MSS_CFG_AHB_CLK>, -+ <GCC_MSS_OFFLINE_AXI_CLK>, <GCC_MSS_SNOC_AXI_CLK>, -+ <GCC_MSS_Q6_MEMNOC_AXI_CLK>, <GCC_MSS_Q6SS_BOOT_CLK_SRC>, -+ <GCC_SEC_CTRL_CLK_SRC>, <GCC_WPSS_AHB_CLK>, -+ <GCC_WPSS_AHB_BDG_MST_CLK>, <GCC_WPSS_RSCP_CLK>; -+}; -+ -+&lpass_audiocc { -+ qcom,adsp-skip-pll; -+ protected-clocks = <LPASS_AUDIO_CC_CDIV_RX_MCLK_DIV_CLK_SRC>, -+ <LPASS_AUDIO_CC_CODEC_MEM0_CLK>, <LPASS_AUDIO_CC_CODEC_MEM1_CLK>, -+ <LPASS_AUDIO_CC_CODEC_MEM2_CLK>, <LPASS_AUDIO_CC_CODEC_MEM_CLK>, -+ <LPASS_AUDIO_CC_EXT_MCLK0_CLK>, <LPASS_AUDIO_CC_EXT_MCLK0_CLK_SRC>, -+ <LPASS_AUDIO_CC_EXT_MCLK1_CLK>, <LPASS_AUDIO_CC_EXT_MCLK1_CLK_SRC>, -+ <LPASS_AUDIO_CC_PLL>, <LPASS_AUDIO_CC_PLL_OUT_AUX2>, -+ <LPASS_AUDIO_CC_PLL_OUT_AUX2_DIV_CLK_SRC>, -+ <LPASS_AUDIO_CC_PLL_OUT_MAIN_DIV_CLK_SRC>, -+ <LPASS_AUDIO_CC_RX_MCLK_2X_CLK>, <LPASS_AUDIO_CC_RX_MCLK_CLK>, -+ <LPASS_AUDIO_CC_RX_MCLK_CLK_SRC>; -+ /delete-property/ power-domains; -+}; -+ -+&lpass_aon { -+ status = "disabled"; -+}; -+ -+&lpass_core { -+ status = "disabled"; -+}; -+ -+&lpass_hm { -+ status = "disabled"; -+}; -+ - &video_mem { - reg = <0x0 0x8a700000 0x0 0x500000>; - }; --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-dt-bindings-pinctrl-qcom-sc7280-pinctrl-add-.patch b/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-dt-bindings-pinctrl-qcom-sc7280-pinctrl-add-.patch deleted file mode 100644 index 05eb140..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-dt-bindings-pinctrl-qcom-sc7280-pinctrl-add-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 86cb0766a6e9ad295c9f719adc5f02fd94eb2199 Mon Sep 17 00:00:00 2001 -From: Atul Dhudase <quic_adhudase@quicinc.com> -Date: Tue, 31 Oct 2023 11:18:40 +0530 -Subject: [PATCH 1/2] PENDING: dt-bindings: pinctrl: qcom,sc7280-pinctrl: add - gpio-reserved-ranges - -Add gpio-reserved-ranges property for SC7280 (used on QCM6490 boards). - -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - .../devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml -index 368d44ff5468..c8735ab97e40 100644 ---- a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml -+++ b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml -@@ -41,6 +41,10 @@ properties: - gpio-ranges: - maxItems: 1 - -+ gpio-reserved-ranges: -+ minItems: 1 -+ maxItems: 88 -+ - gpio-line-names: - maxItems: 175 - --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0002-FROMLIST-arm64-dts-qcom-Use-QCOM_SCM_VMID-defines-fo.patch b/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-UPSTREAM-arm64-dts-qcom-Use-QCOM_SCM_VMID-defines-fo.patch index 89b2931..27c60be 100644 --- a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0002-FROMLIST-arm64-dts-qcom-Use-QCOM_SCM_VMID-defines-fo.patch +++ b/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-UPSTREAM-arm64-dts-qcom-Use-QCOM_SCM_VMID-defines-fo.patch @@ -1,19 +1,18 @@ -From e2392806ad7d9cfdbcb456cb08ba4f19f4601d2f Mon Sep 17 00:00:00 2001 +From d325de87af27d2f369fa04fa0a2367600280f322 Mon Sep 17 00:00:00 2001 From: Luca Weiss <luca.weiss@fairphone.com> -Date: Thu, 5 Oct 2023 16:47:31 +0530 -Subject: [PATCH 2/3] FROMLIST: arm64: dts: qcom: Use QCOM_SCM_VMID defines for +Date: Fri, 18 Aug 2023 10:06:09 +0200 +Subject: [PATCH] UPSTREAM: arm64: dts: qcom: Use QCOM_SCM_VMID defines for qcom,vmid Since we have those defines available in a header, let's use them everywhere where qcom,vmid property is used. Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> -Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> -Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> -Signed-off-by: Salendarsingh Gaud <quic_sgaud@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/20230818-qcom-vmid-defines-v1-1-45b610c96b13@fairphone.com/] +Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> +Link: https://lore.kernel.org/r/20230818-qcom-vmid-defines-v1-1-45b610c96b13@fairphone.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 018c949b32df9f17f52bf0e70f976719811db233] --- arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 ++- @@ -37,7 +36,7 @@ Upstream-Status: Submitted [https://lore.kernel.org/linux-arm-msm/20230818-qcom- 19 files changed, 31 insertions(+), 19 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi -index 3c5719640fab..1a55f84bbb90 100644 +index 06f8ff624181..8fda25167181 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi @@ -115,7 +115,7 @@ rmtfs@f6c00000 { @@ -50,10 +49,10 @@ index 3c5719640fab..1a55f84bbb90 100644 /delete-node/ mba@91500000; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi -index 2ea3117438c3..9478ce84d1c5 100644 +index 4d87cba47c76..fa8ec92ce490 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi -@@ -8,6 +8,7 @@ +@@ -9,6 +9,7 @@ #include <dt-bindings/clock/qcom,rpmcc.h> #include <dt-bindings/interconnect/qcom,msm8996.h> #include <dt-bindings/interconnect/qcom,msm8996-cbf.h> @@ -61,7 +60,7 @@ index 2ea3117438c3..9478ce84d1c5 100644 #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/soc/qcom,apr.h> -@@ -431,7 +432,7 @@ rmtfs_mem: rmtfs { +@@ -551,7 +552,7 @@ rmtfs_mem: rmtfs { no-map; qcom,client-id = <1>; @@ -71,7 +70,7 @@ index 2ea3117438c3..9478ce84d1c5 100644 mpss_mem: mpss@88800000 { diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi -index ed764d02819f..f3e1dc5f67e3 100644 +index f91c58c844af..c9ee2d995087 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -6,6 +6,7 @@ @@ -92,7 +91,7 @@ index ed764d02819f..f3e1dc5f67e3 100644 spss_mem: memory@8ab00000 { diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi -index 06df931d8cad..63b6300844a9 100644 +index 810e529e5f2e..65b077179acc 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -11,6 +11,7 @@ @@ -103,7 +102,7 @@ index 06df931d8cad..63b6300844a9 100644 #include <dt-bindings/interconnect/qcom,icc.h> #include <dt-bindings/interconnect/qcom,osm-l3.h> #include <dt-bindings/interconnect/qcom,sc7180.h> -@@ -620,7 +621,7 @@ rmtfs_mem: memory@94600000 { +@@ -687,7 +688,7 @@ rmtfs_mem: memory@94600000 { no-map; qcom,client-id = <1>; @@ -113,7 +112,7 @@ index 06df931d8cad..63b6300844a9 100644 }; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi -index 925428a5f6ae..042908048d09 100644 +index 9531167c498e..cbd0f4176daa 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -13,6 +13,7 @@ @@ -122,9 +121,9 @@ index 925428a5f6ae..042908048d09 100644 #include <dt-bindings/dma/qcom-gpi.h> +#include <dt-bindings/firmware/qcom,scm.h> #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/interconnect/qcom,icc.h> #include <dt-bindings/interconnect/qcom,osm-l3.h> - #include <dt-bindings/interconnect/qcom,sc7280.h> -@@ -156,7 +157,7 @@ rmtfs_mem: memory@9c900000 { +@@ -157,7 +158,7 @@ rmtfs_mem: memory@9c900000 { no-map; qcom,client-id = <1>; @@ -134,7 +133,7 @@ index 925428a5f6ae..042908048d09 100644 }; diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts -index fe3b366e1435..3f459d685f26 100644 +index abc66613ccaa..3ea07d094b60 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts +++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts @@ -6,6 +6,7 @@ @@ -145,7 +144,7 @@ index fe3b366e1435..3f459d685f26 100644 #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/gpio-keys.h> #include <dt-bindings/input/input.h> -@@ -52,7 +53,7 @@ rmtfs_mem: rmtfs-region@85500000 { +@@ -130,7 +131,7 @@ rmtfs_mem: rmtfs-region@85500000 { no-map; qcom,client-id = <1>; @@ -155,7 +154,7 @@ index fe3b366e1435..3f459d685f26 100644 wlan_mem: wlan-region@8bc00000 { diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts -index fc038474cb71..8e06df27a344 100644 +index ae008c3b0aed..a40ef23a2a4f 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts @@ -6,6 +6,7 @@ @@ -166,7 +165,7 @@ index fc038474cb71..8e06df27a344 100644 #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/gpio-keys.h> #include <dt-bindings/input/input.h> -@@ -57,7 +58,7 @@ rmtfs_mem: rmtfs-region@85500000 { +@@ -135,7 +136,7 @@ rmtfs_mem: rmtfs-region@85500000 { no-map; qcom,client-id = <1>; @@ -176,7 +175,7 @@ index fc038474cb71..8e06df27a344 100644 wlan_mem: wlan-region@8bc00000 { diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi -index 759b3a5964cc..691cddd02897 100644 +index ec6003212c4d..c17719086085 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -8,6 +8,7 @@ @@ -187,7 +186,7 @@ index 759b3a5964cc..691cddd02897 100644 #include <dt-bindings/interconnect/qcom,sdm660.h> #include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/gpio/gpio.h> -@@ -385,7 +386,7 @@ rmtfs_mem: memory@85e00000 { +@@ -453,7 +454,7 @@ rmtfs_mem: memory@85e00000 { no-map; qcom,client-id = <1>; @@ -249,7 +248,7 @@ index 6db12abaa88d..e386b504e978 100644 }; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 89520a9fe1e3..862d1cf6c63c 100644 +index 234d7875cd8e..6d4f86d92fec 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -813,7 +813,7 @@ rmtfs_mem: rmtfs@88f00000 { @@ -262,7 +261,7 @@ index 89520a9fe1e3..862d1cf6c63c 100644 qseecom_mem: qseecom@8ab00000 { diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts -index e3dc49951523..45951810fa82 100644 +index 18171c5d8a38..136e273d09a7 100644 --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts @@ -8,6 +8,7 @@ @@ -283,7 +282,7 @@ index e3dc49951523..45951810fa82 100644 }; diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi -index 06c53000bb74..ef072f0413d4 100644 +index 26b6d84548a5..7e78bf2c6a6c 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -5,6 +5,7 @@ @@ -304,7 +303,7 @@ index 06c53000bb74..ef072f0413d4 100644 camera_mem: memory@8b700000 { diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi -index c236967725c1..ff92901f587e 100644 +index 5ed464c37422..a72f3c470089 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -10,6 +10,7 @@ @@ -315,7 +314,7 @@ index c236967725c1..ff92901f587e 100644 #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interconnect/qcom,sm8350.h> #include <dt-bindings/mailbox/qcom-ipcc.h> -@@ -492,7 +493,7 @@ rmtfs_mem: memory@9b800000 { +@@ -503,7 +504,7 @@ rmtfs_mem: memory@9b800000 { no-map; qcom,client-id = <1>; @@ -338,7 +337,7 @@ index 001fb2723fbb..8b29fcf483a3 100644 ramoops@ffc00000 { diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi -index 42b23ba7a573..e1b768d6ad3b 100644 +index 91d856e5b06b..35067d441a28 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -10,6 +10,7 @@ @@ -349,7 +348,7 @@ index 42b23ba7a573..e1b768d6ad3b 100644 #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/mailbox/qcom-ipcc.h> #include <dt-bindings/phy/phy-qcom-qmp.h> -@@ -538,7 +539,7 @@ rmtfs_mem: memory@9fd00000 { +@@ -540,7 +541,7 @@ rmtfs_mem: memory@9fd00000 { no-map; qcom,client-id = <1>; @@ -359,7 +358,7 @@ index 42b23ba7a573..e1b768d6ad3b 100644 xbl_sc_mem2: memory@a6e00000 { diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi -index 6e8aba256931..681abf91e8a7 100644 +index 076715ef09d5..c0d781b30a90 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -10,6 +10,7 @@ @@ -370,7 +369,7 @@ index 6e8aba256931..681abf91e8a7 100644 #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interconnect/qcom,sm8550-rpmh.h> -@@ -569,7 +570,7 @@ rmtfs_mem: rmtfs-region@d4a80000 { +@@ -580,7 +581,7 @@ rmtfs_mem: rmtfs-region@d4a80000 { no-map; qcom,client-id = <1>; diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-UPSTREAM-arm64-dts-qcom-sc7280-Move-video-firmware-t.patch b/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-UPSTREAM-arm64-dts-qcom-sc7280-Move-video-firmware-t.patch new file mode 100644 index 0000000..966d4d1 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-UPSTREAM-arm64-dts-qcom-sc7280-Move-video-firmware-t.patch @@ -0,0 +1,82 @@ +From 65d0e0ecf6725459457162b33d02333888bfa25e Mon Sep 17 00:00:00 2001 +From: Luca Weiss <luca.weiss@fairphone.com> +Date: Fri, 1 Dec 2023 10:33:19 +0100 +Subject: [PATCH] UPSTREAM: arm64: dts: qcom: sc7280: Move video-firmware to + chrome-common + +If the video-firmware node is present, the venus driver assumes we're on +a system that doesn't use TZ for starting venus, like on ChromeOS +devices. + +Move the video-firmware node to chrome-common.dtsi so we can use venus +on a non-ChromeOS devices. We also need to move the secure SID 0x2184 +for iommu since (on some boards) we cannot touch that. + +At the same time also disable the venus node by default in the dtsi, +like it's done on other SoCs. + +Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> +Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> +Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com> +Link: https://lore.kernel.org/r/20231201-sc7280-venus-pas-v3-2-bc132dc5fc30@fairphone.com +Signed-off-by: Bjorn Andersson <andersson@kernel.org> +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 82066cdb17608abc95192632fd5c702be8e57ab5] +--- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 +++++++++++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 9 +++------ + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +index 5d462ae14ba1..459ff877df54 100644 +--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi ++++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +@@ -104,6 +104,17 @@ &scm { + dma-coherent; + }; + ++&venus { ++ iommus = <&apps_smmu 0x2180 0x20>, ++ <&apps_smmu 0x2184 0x20>; ++ ++ status = "okay"; ++ ++ video-firmware { ++ iommus = <&apps_smmu 0x21a2 0x0>; ++ }; ++}; ++ + &watchdog { + status = "okay"; + }; +diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi +index cbd0f4176daa..1c136ad878ed 100644 +--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi ++++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi +@@ -3725,10 +3725,11 @@ venus: video-codec@aa00000 { + <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>; + interconnect-names = "cpu-cfg", "video-mem"; + +- iommus = <&apps_smmu 0x2180 0x20>, +- <&apps_smmu 0x2184 0x20>; ++ iommus = <&apps_smmu 0x2180 0x20>; + memory-region = <&video_mem>; + ++ status = "disabled"; ++ + video-decoder { + compatible = "venus-decoder"; + }; +@@ -3737,10 +3738,6 @@ video-encoder { + compatible = "venus-encoder"; + }; + +- video-firmware { +- iommus = <&apps_smmu 0x21a2 0x0>; +- }; +- + venus_opp_table: opp-table { + compatible = "operating-points-v2"; + +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0002-PENDING-arm64-dts-qcom-qcm6490-Add-gpio-reserved-ran.patch b/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0002-PENDING-arm64-dts-qcom-qcm6490-Add-gpio-reserved-ran.patch deleted file mode 100644 index a2aed05..0000000 --- a/recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0002-PENDING-arm64-dts-qcom-qcm6490-Add-gpio-reserved-ran.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0d6eef8eeb4124a0598f7c109181f4fe7674484f Mon Sep 17 00:00:00 2001 -From: Atul Dhudase <quic_adhudase@quicinc.com> -Date: Tue, 31 Oct 2023 11:30:18 +0530 -Subject: [PATCH 2/2] PENDING: arm64: dts: qcom: qcm6490: Add - gpio-reserved-ranges - -Add gpio-reserved-ranges for QCM6490 boards. - -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - arch/arm64/boot/dts/qcom/qcm6490.dtsi | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm64/boot/dts/qcom/qcm6490.dtsi b/arch/arm64/boot/dts/qcom/qcm6490.dtsi -index cccb50ce6269..e05e0f3b4b12 100644 ---- a/arch/arm64/boot/dts/qcom/qcm6490.dtsi -+++ b/arch/arm64/boot/dts/qcom/qcm6490.dtsi -@@ -129,6 +129,10 @@ &lpass_hm { - status = "disabled"; - }; - -+&tlmm { -+ gpio-reserved-ranges = <32 2>, <48 4>; -+}; -+ - &video_mem { - reg = <0x0 0x8a700000 0x0 0x500000>; - }; --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcm6490-Remove-voltage-voting-for-.patch b/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcm6490-Remove-voltage-voting-for-.patch index e64edf3..7338353 100644 --- a/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcm6490-Remove-voltage-voting-for-.patch +++ b/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcm6490-Remove-voltage-voting-for-.patch @@ -1,8 +1,8 @@ -From 9939a54d773c0a42acbb20a339176ace57585e7a Mon Sep 17 00:00:00 2001 +From 5d52be9a7c56e416fe98744f025e8b4aa92fd849 Mon Sep 17 00:00:00 2001 From: Umang Chheda <quic_uchheda@quicinc.com> Date: Wed, 11 Oct 2023 20:57:16 +0530 -Subject: [PATCH 1/2] PENDING: arm64: dts: qcm6490: Remove voltage voting for - USB rails +Subject: [PATCH 1/2] PENDING: arm64: dts: qcm6490: remove voltage voting for + USB rails for idp USB driver does not vote for voltage on hsphy and ssphy rails. Due to which the initial voltage set by bootloader @@ -25,27 +25,30 @@ Upstream-Status: Pending 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -index 970dbceeea17..bd638812ade2 100644 +index 14c73f55ea52..89e653c93ae8 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -@@ -372,3 +372,17 @@ &vreg_l9b_1p2 { - regulator-allow-set-load; +@@ -519,6 +519,20 @@ &vreg_l9b_1p2 { regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; }; -+ -+&vreg_l1b_0p8 { + ++&vreg_l1b_0p912 { + /delete-property/regulator-min-microvolt; + /delete-property/regulator-max-microvolt; + regulator-allow-set-load; + regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; +}; + -+&vreg_l10c_0p8 { ++&vreg_l10c_0p88 { + /delete-property/regulator-min-microvolt; + /delete-property/regulator-max-microvolt; + regulator-allow-set-load; + regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; +}; ++ + &wifi { + memory-region = <&wlan_fw_mem>; + }; -- 2.25.1 diff --git a/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch b/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch index 9c9a8c9..a2359f6 100644 --- a/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch +++ b/recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch @@ -1,4 +1,4 @@ -From 362bfa9478feab614cde2e8c8daa47357cb5576f Mon Sep 17 00:00:00 2001 +From 328f42bd030f43574f516906fa0f25fcc5f19c30 Mon Sep 17 00:00:00 2001 From: Umang Chheda <quic_uchheda@quicinc.com> Date: Wed, 11 Oct 2023 20:32:47 +0530 Subject: [PATCH 1/2] PENDING: arm64: dts: qcom: Remove voltage vote support @@ -20,15 +20,14 @@ Upstream-Status: Pending 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -index 004fdb1ffd58..c1845ef64112 100644 +index 7f682093e954..5b96b77db0c2 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -@@ -354,3 +354,17 @@ &usb_1_qmpphy { - +@@ -505,6 +505,20 @@ &usb_1_qmpphy { status = "okay"; }; -+ -+&vreg_l7b_2p9 { + ++&vreg_l7b_2p952 { + /delete-property/regulator-min-microvolt; + /delete-property/regulator-max-microvolt; + regulator-allow-set-load; @@ -41,6 +40,10 @@ index 004fdb1ffd58..c1845ef64112 100644 + regulator-allow-set-load; + regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; +}; ++ + &wifi { + memory-region = <&wlan_fw_mem>; + }; -- 2.25.1 diff --git a/recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-Q.patch b/recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-Q.patch deleted file mode 100644 index 74dabba..0000000 --- a/recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-Q.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0ae6d4e1b904b06ceb0690e65fa267c8f21f4136 Mon Sep 17 00:00:00 2001 -From: Komal Bajaj <quic_kbajaj@quicinc.com> -Date: Wed, 11 Oct 2023 12:11:35 +0530 -Subject: [PATCH 1/2] QCLINUX: arm64: dts: qcom: Add board-id and msm-id for - QCM6490 IDP - -Add board-id and msm-id for QCM6490-idp for now. This is only a -workaround, that shall be replaced by the compatible string -check approach to pick the correct DTB. - -Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com> -Signed-off-by: Salendarsingh Gaud <quic_sgaud@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -index 7d609317af82..004fdb1ffd58 100644 ---- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -@@ -16,6 +16,10 @@ / { - model = "Qualcomm Technologies, Inc. QCM6490 IDP"; - compatible = "qcom,qcm6490-idp", "qcom,qcm6490"; - -+ /* This will be deprecated soon */ -+ qcom,msm-id = <497 0x10000>, <498 0x10000>, <475 0x10000>, <515 0x10000>; -+ qcom,board-id = <34 0>, <34 1>; -+ - aliases { - serial0 = &uart5; - }; --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch b/recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch index 4366bc4..feb48b5 100644 --- a/recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch +++ b/recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch @@ -1,4 +1,4 @@ -From 8f721d3288ce338203da845578ecd356d49a33ef Mon Sep 17 00:00:00 2001 +From d968bbe73d04fc76db30bdefc9b00fb4128d6b4e Mon Sep 17 00:00:00 2001 From: Manish Pandey <quic_mapa@quicinc.com> Date: Fri, 13 Oct 2023 19:38:59 +0530 Subject: [PATCH] QCLINUX: arm64: dts: qcom: qcm6490: disable sdhc1 for ufs @@ -13,24 +13,22 @@ Signed-off-by: Salendarsingh Gaud <quic_sgaud@quicinc.com> Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> Upstream-Status: Pending --- - arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 4 ++++ - 1 file changed, 4 insertions(+) + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -index c1845ef64112..970dbceeea17 100644 +index 424cd9c2b092..7f682093e954 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts -@@ -250,6 +250,10 @@ &gpi_dma1 { - status = "okay"; - }; +@@ -450,7 +450,7 @@ &sdhc_1 { + vmmc-supply = <&vreg_l7b_2p952>; + vqmmc-supply = <&vreg_l19b_1p8>; -+&sdhc_1 { +- status = "okay"; + status = "disabled"; -+}; -+ - &pm8350c_pwm { - status = "okay"; }; + + &tlmm { -- 2.25.1 diff --git a/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch b/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch index 570b971..9b569b3 100644 --- a/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch +++ b/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch @@ -1,4 +1,4 @@ -From 3e73434eade4bf52849539ca19a47b5731d3cd37 Mon Sep 17 00:00:00 2001 +From c0027585783c96a1ba37e8ea604af4c7c73e8154 Mon Sep 17 00:00:00 2001 From: Umang Chheda <quic_uchheda@quicinc.com> Date: Wed, 18 Oct 2023 18:12:00 +0530 Subject: [PATCH 2/2] PENDING: arm64: dts: qcom: Remove voltage vote support @@ -15,18 +15,17 @@ Signed-off-by: Umang Chheda <quic_uchheda@quicinc.com> Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> Upstream-Status: Pending --- - arch/arm64/boot/dts/qcom/qcm6490-rb3.dts | 14 ++++++++++++++ + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -diff --git a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -index ac6233452429..3a1c781c965f 100644 ---- a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -+++ b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -@@ -337,3 +337,17 @@ &usb_1_qmpphy { - +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index 6dbeb182d014..f13ab20906f8 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -488,6 +488,20 @@ &usb_1_qmpphy { status = "okay"; }; -+ + +&vreg_l7b_2p952 { + /delete-property/regulator-min-microvolt; + /delete-property/regulator-max-microvolt; @@ -40,6 +39,10 @@ index ac6233452429..3a1c781c965f 100644 + regulator-allow-set-load; + regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; +}; ++ + &wifi { + memory-region = <&wlan_fw_mem>; + }; -- 2.25.1 diff --git a/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcm6490-rb3-Remove-voltage-voting-.patch b/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcs6490-rb3-Remove-voltage-voting-.patch index f81e51a..9c0ddcd 100644 --- a/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcm6490-rb3-Remove-voltage-voting-.patch +++ b/recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcs6490-rb3-Remove-voltage-voting-.patch @@ -1,7 +1,7 @@ -From b0be64f4b3ced1702f3a4ab1629c3df974fbe705 Mon Sep 17 00:00:00 2001 +From b9b8286e4a3d72353ee90181f10507e2dfb1fd2b Mon Sep 17 00:00:00 2001 From: Umang Chheda <quic_uchheda@quicinc.com> Date: Wed, 18 Oct 2023 18:14:15 +0530 -Subject: [PATCH 2/2] PENDING: arm64: dts: qcm6490-rb3: Remove voltage voting +Subject: [PATCH 2/2] PENDING: arm64: dts: qcs6490-rb3: Remove voltage voting for USB rails USB driver does not vote for voltage on hsphy and ssphy @@ -11,7 +11,7 @@ on regulator registration. Fix this temporarily by removing voltage voting support, which will prevent regulator framework overriding the voltage set by -bootloader for QC6490 RB3 Platform. +bootloader for QCS6490 RB3 Platform. This commit will be reverted once voltage voting support is added in USB driver. @@ -20,14 +20,14 @@ Signed-off-by: Umang Chheda <quic_uchheda@quicinc.com> Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> Upstream-Status: Pending --- - arch/arm64/boot/dts/qcom/qcm6490-rb3.dts | 14 ++++++++++++++ + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -diff --git a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -index 3a1c781c965f..b244e66e9857 100644 ---- a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -+++ b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -@@ -338,6 +338,13 @@ &usb_1_qmpphy { +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index 2b30e8900991..1e20395d07ae 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -488,6 +488,13 @@ &usb_1_qmpphy { status = "okay"; }; @@ -41,17 +41,20 @@ index 3a1c781c965f..b244e66e9857 100644 &vreg_l7b_2p952 { /delete-property/regulator-min-microvolt; /delete-property/regulator-max-microvolt; -@@ -351,3 +358,10 @@ &vreg_l9b_1p2 { - regulator-allow-set-load; +@@ -502,6 +509,13 @@ &vreg_l9b_1p2 { regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; }; -+ + +&vreg_l10c_0p88 { -+ /delete-property/regulator-min-microvolt; -+ /delete-property/regulator-max-microvolt; -+ regulator-allow-set-load; -+ regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; ++ /delete-property/regulator-min-microvolt; ++ /delete-property/regulator-max-microvolt; ++ regulator-allow-set-load; ++ regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM RPMH_REGULATOR_MODE_HPM>; +}; ++ + &wifi { + memory-region = <&wlan_fw_mem>; + }; -- 2.25.1 diff --git a/recipes-kernel/linux/linux-yocto/workarounds/0002-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-q.patch b/recipes-kernel/linux/linux-yocto/workarounds/0002-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-q.patch deleted file mode 100644 index b2281ff..0000000 --- a/recipes-kernel/linux/linux-yocto/workarounds/0002-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-q.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f8f810f2a3829bb0bd4b53ab09a7fe043918cc6 Mon Sep 17 00:00:00 2001 -From: Naina Mehta <quic_nainmeht@quicinc.com> -Date: Tue, 17 Oct 2023 20:58:47 +0530 -Subject: [PATCH 2/2] QCLINUX: arm64: dts: qcom: Add board-id and msm-id for - qcm6490-rb3 - -Add board-id and msm-id for QCM6490 RB3 platform as a workaround -for picking correct DTB. - -Signed-off-by: Naina Mehta <quic_nainmeht@quicinc.com> -Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com> -Upstream-Status: Pending ---- - arch/arm64/boot/dts/qcom/qcm6490-rb3.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -index ae689fec6733..ac6233452429 100644 ---- a/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -+++ b/arch/arm64/boot/dts/qcom/qcm6490-rb3.dts -@@ -21,6 +21,10 @@ / { - model = "Qualcomm Technologies, Inc. QCM6490 RB3"; - compatible = "qcom,qcm6490-rb3", "qcom,qcm6490"; - -+ /* This will be deprecated soon */ -+ qcom,msm-id = <497 0x10000>, <498 0x10000>, <475 0x10000>, <515 0x10000>; -+ qcom,board-id = <32 1>; -+ - aliases { - serial0 = &uart5; - }; --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-yocto_6.6.bbappend b/recipes-kernel/linux/linux-yocto_6.6.bbappend index 2b38167..eeb337c 100644 --- a/recipes-kernel/linux/linux-yocto_6.6.bbappend +++ b/recipes-kernel/linux/linux-yocto_6.6.bbappend @@ -53,27 +53,24 @@ SRC_URI:append:qcom = " \ file://generic-drivers/0001-FROMLIST-dma-heap-Add-proper-kref-handling-on-dma-bu.patch \ file://generic-drivers/0002-FROMLIST-dma-heap-Provide-accessors-so-that-in-kerne.patch \ file://qcm6490-drivers/0001-FROMGIT-phy-qcom-qmp-ufs-Add-Phy-Configuration-suppo.patch \ - file://qcm6490-drivers/0001-PENDING-clk-qcom-gcc-Enable-the-force-mem-core-for-U.patch \ - file://qcm6490-drivers/0001-PENDING-dt-bindings-clock-Add-qcom-adsp-skip-pll-pro.patch \ - file://qcm6490-drivers/0002-PENDING-clk-qcom-lpassaudiocc-Add-support-to-skip-PL.patch \ - file://qcm6490-dtsi/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-Fairphone-.patch \ - file://qcm6490-dtsi/0002-FROMLIST-arm64-dts-qcom-Use-QCOM_SCM_VMID-defines-fo.patch \ - file://qcm6490-dtsi/0003-FROMLIST-arm64-dts-qcom-Add-qcm6490-dts-file.patch \ file://qcm6490-dtsi/0001-FROMLIST-arm64-dts-qcom-sc7280-Add-UFS-nodes-for-sc7.patch \ file://qcm6490-dtsi/0001-PENDING-arm64-dts-qcom-sc7280-Add-interconnect-paths.patch \ - file://qcm6490-dtsi/0001-PENDING-arm64-dts-qcm6490-Update-the-protected-clock.patch \ - file://qcm6490-dtsi/0001-PENDING-dt-bindings-pinctrl-qcom-sc7280-pinctrl-add-.patch \ - file://qcm6490-dtsi/0002-PENDING-arm64-dts-qcom-qcm6490-Add-gpio-reserved-ran.patch \ - file://qcm6490-board-dts/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-IDP-board.patch \ - file://qcm6490-board-dts/0001-PENDING-dt-bindings-arm-qcom-Add-QCM6490-RB3-board.patch \ - file://qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-qcm6490-rb3-support.patch \ + file://qcm6490-dtsi/0001-UPSTREAM-arm64-dts-qcom-sc7280-Move-video-firmware-t.patch \ + file://qcm6490-dtsi/0001-UPSTREAM-arm64-dts-qcom-Use-QCOM_SCM_VMID-defines-fo.patch \ + file://qcm6490-board-dts/0001-UPSTREAM-dt-bindings-arm-qcom-Add-QCM6490-Fairphone-.patch \ + file://qcm6490-board-dts/0002-UPSTREAM-dt-bindings-arm-qcom-Add-QCM6490-IDP-and-QC.patch \ + file://qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-Add-base-qcm6490-id.patch \ + file://qcm6490-board-dts/0004-UPSTREAM-arm64-dts-qcom-Add-base-qcs6490-rb3gen2-boa.patch \ + file://qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Correct-the-.patch \ + file://qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Correct-the-volt.patch \ + file://qcm6490-board-dts/0001-FROMLIST-arm64-dts-qcom-qcm6490-idp-Update-protected.patch \ + file://qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Declare-GCC-.patch \ + file://qcm6490-board-dts/0003-BACKPORT-FROMLIST-arm64-dts-qcom-qcs6490-rb3gen2-Upd.patch \ file://qcm6490-board-dts/0001-PENDING-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch \ - file://qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-UFS-nodes-for-qcm6490-rb3.patch \ - file://workarounds/0001-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-Q.patch \ - file://workarounds/0002-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-q.patch \ + file://qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-UFS-nodes-for-qcs6490-rb3.patch \ file://workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch \ file://workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch \ file://workarounds/0002-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch \ file://workarounds/0001-PENDING-arm64-dts-qcm6490-Remove-voltage-voting-for-.patch \ - file://workarounds/0002-PENDING-arm64-dts-qcm6490-rb3-Remove-voltage-voting-.patch \ + file://workarounds/0002-PENDING-arm64-dts-qcs6490-rb3-Remove-voltage-voting-.patch \ " |