From e61d42f8437edc11b2f86a821e72a8b140d7c81f Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 14 Aug 2022 23:23:20 -0400 Subject: [PATCH] Drop two broken msm8916 patches from 5.10 --- ...sm8916-fix-typo-in-pronto-remoteproc.patch | 42 ---------- ...sm8916-use-power-domains-for-mss-wcn.patch | 82 ------------------- queue-5.10/series | 2 - 3 files changed, 126 deletions(-) delete mode 100644 queue-5.10/arm64-dts-qcom-msm8916-fix-typo-in-pronto-remoteproc.patch delete mode 100644 queue-5.10/arm64-dts-qcom-msm8916-use-power-domains-for-mss-wcn.patch diff --git a/queue-5.10/arm64-dts-qcom-msm8916-fix-typo-in-pronto-remoteproc.patch b/queue-5.10/arm64-dts-qcom-msm8916-fix-typo-in-pronto-remoteproc.patch deleted file mode 100644 index 9c3eb29a2cb..00000000000 --- a/queue-5.10/arm64-dts-qcom-msm8916-fix-typo-in-pronto-remoteproc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 42eeda577be6ac22a01af6156f112e38f0adda79 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 26 May 2022 19:47:40 +0530 -Subject: arm64: dts: qcom: msm8916: Fix typo in pronto remoteproc node - -From: Sireesh Kodali - -[ Upstream commit 5458d6f2827cd30218570f266b8d238417461f2f ] - -The smem-state properties for the pronto node were incorrectly labelled, -reading `qcom,state*` rather than `qcom,smem-state*`. Fix that, allowing -the stop state to be used. - -Fixes: 88106096cbf8 ("ARM: dts: msm8916: Add and enable wcnss node") -Signed-off-by: Sireesh Kodali -Reviewed-by: Krzysztof Kozlowski -Reviewed-by: Stephan Gerhold -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220526141740.15834-3-sireeshkodali1@gmail.com -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi -index 72bc01ad9166..ab86971e8e6e 100644 ---- a/arch/arm64/boot/dts/qcom/msm8916.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi -@@ -1675,8 +1675,8 @@ pronto: remoteproc@a21b000 { - <&rpmpd MSM8916_VDDMX>; - power-domain-names = "cx", "mx"; - -- qcom,state = <&wcnss_smp2p_out 0>; -- qcom,state-names = "stop"; -+ qcom,smem-states = <&wcnss_smp2p_out 0>; -+ qcom,smem-state-names = "stop"; - - pinctrl-names = "default"; - pinctrl-0 = <&wcnss_pin_a>; --- -2.35.1 - diff --git a/queue-5.10/arm64-dts-qcom-msm8916-use-power-domains-for-mss-wcn.patch b/queue-5.10/arm64-dts-qcom-msm8916-use-power-domains-for-mss-wcn.patch deleted file mode 100644 index f6d9b12e72b..00000000000 --- a/queue-5.10/arm64-dts-qcom-msm8916-use-power-domains-for-mss-wcn.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 7780ae3f3651db602c3bd5f04a456d7c7ba995fe Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Sep 2020 12:41:34 +0200 -Subject: arm64: dts: qcom: msm8916: Use power domains for MSS/WCNSS - remoteprocs - -From: Stephan Gerhold - -[ Upstream commit 809f299a969873581c832bbcb1b8cccaf8af2eeb ] - -So far we have been making proxy votes for the remote processors -through the regulator interface. Now that we have rpmpd it's better -to vote for performance states through the power domain interface. - -This also allows us to move these supplies back to msm8916.dtsi -because the device tree binding for RPMPD is independent of the -underlying regulator/PMIC. - -Signed-off-by: Stephan Gerhold -Link: https://lore.kernel.org/r/20200916104135.25085-10-stephan@gerhold.net -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 3 --- - arch/arm64/boot/dts/qcom/msm8916.dtsi | 9 +++++++++ - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi -index cd626e7db599..513e433aa5f3 100644 ---- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi -@@ -17,13 +17,10 @@ &dsi_phy0 { - }; - - &mpss { -- cx-supply = <&pm8916_s1>; -- mx-supply = <&pm8916_l3>; - pll-supply = <&pm8916_l7>; - }; - - &pronto { -- vddmx-supply = <&pm8916_l3>; - vddpx-supply = <&pm8916_l7>; - - iris { -diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi -index 291276a38d7c..72bc01ad9166 100644 ---- a/arch/arm64/boot/dts/qcom/msm8916.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -1263,6 +1264,10 @@ mpss: remoteproc@4080000 { - interrupt-names = "wdog", "fatal", "ready", - "handover", "stop-ack"; - -+ power-domains = <&rpmpd MSM8916_VDDCX>, -+ <&rpmpd MSM8916_VDDMX>; -+ power-domain-names = "cx", "mx"; -+ - clocks = <&gcc GCC_MSS_CFG_AHB_CLK>, - <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>, - <&gcc GCC_BOOT_ROM_AHB_CLK>, -@@ -1666,6 +1671,10 @@ pronto: remoteproc@a21b000 { - <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack"; - -+ power-domains = <&rpmpd MSM8916_VDDCX>, -+ <&rpmpd MSM8916_VDDMX>; -+ power-domain-names = "cx", "mx"; -+ - qcom,state = <&wcnss_smp2p_out 0>; - qcom,state-names = "stop"; - --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 61c63f50800..cdf01d36e5c 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -136,8 +136,6 @@ soc-qcom-ocmem-fix-refcount-leak-in-of_get_ocmem.patch soc-qcom-aoss-fix-refcount-leak-in-qmp_cooling_devic.patch arm-dts-qcom-pm8841-add-required-thermal-sensor-cell.patch bus-hisi_lpc-fix-missing-platform_device_put-in-hisi.patch -arm64-dts-qcom-msm8916-use-power-domains-for-mss-wcn.patch -arm64-dts-qcom-msm8916-fix-typo-in-pronto-remoteproc.patch arm64-dts-mt7622-fix-bpi-r64-wps-button.patch arm64-tegra-fix-sdmmc1-cd-on-p2888.patch erofs-avoid-consecutive-detection-for-highmem-memory.patch -- 2.47.3