From: Greg Kroah-Hartman Date: Fri, 15 Oct 2021 11:31:34 +0000 (+0200) Subject: drop interconnect-qcom-sdm660-add-missing-a2noc-qos-clock.patch from 5.14 X-Git-Tag: v4.4.289~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5b3db82ddc790159c3b44bbc46e93d5baff5044;p=thirdparty%2Fkernel%2Fstable-queue.git drop interconnect-qcom-sdm660-add-missing-a2noc-qos-clock.patch from 5.14 --- diff --git a/queue-5.14/interconnect-qcom-sdm660-add-missing-a2noc-qos-clock.patch b/queue-5.14/interconnect-qcom-sdm660-add-missing-a2noc-qos-clock.patch deleted file mode 100644 index 92a6430bc03..00000000000 --- a/queue-5.14/interconnect-qcom-sdm660-add-missing-a2noc-qos-clock.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 46b7837933b0ed99d10be58b48ffc159a4614aaa Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 13 Sep 2021 15:49:55 +0300 -Subject: interconnect: qcom: sdm660: Add missing a2noc qos clocks - -From: Shawn Guo - -[ Upstream commit 13404ac8882f5225af07545215f4975a564c3740 ] - -It adds the missing a2noc clocks required for QoS registers programming -per downstream kernel[1]. Otherwise, qcom_icc_noc_set_qos_priority() -call on mas_ufs or mas_usb_hs node will simply result in a hardware hang -on SDM660 SoC. - -[1] https://source.codeaurora.org/quic/la/kernel/msm-4.4/tree/arch/arm/boot/dts/qcom/sdm660-bus.dtsi?h=LA.UM.8.2.r1-04800-sdm660.0#n43 - -Signed-off-by: Shawn Guo -Tested-by: Bjorn Andersson -Reviewed-by: AngeloGioacchino Del Regno -Link: https://lore.kernel.org/r/20210824043435.23190-3-shawn.guo@linaro.org -Signed-off-by: Georgi Djakov -Signed-off-by: Sasha Levin ---- - drivers/interconnect/qcom/sdm660.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c -index 99eef7e2d326..fb23a5b780a4 100644 ---- a/drivers/interconnect/qcom/sdm660.c -+++ b/drivers/interconnect/qcom/sdm660.c -@@ -173,6 +173,16 @@ static const struct clk_bulk_data bus_mm_clocks[] = { - { .id = "iface" }, - }; - -+static const struct clk_bulk_data bus_a2noc_clocks[] = { -+ { .id = "bus" }, -+ { .id = "bus_a" }, -+ { .id = "ipa" }, -+ { .id = "ufs_axi" }, -+ { .id = "aggre2_ufs_axi" }, -+ { .id = "aggre2_usb3_axi" }, -+ { .id = "cfg_noc_usb2_axi" }, -+}; -+ - /** - * struct qcom_icc_provider - Qualcomm specific interconnect provider - * @provider: generic interconnect provider -@@ -809,6 +819,10 @@ static int qnoc_probe(struct platform_device *pdev) - qp->bus_clks = devm_kmemdup(dev, bus_mm_clocks, - sizeof(bus_mm_clocks), GFP_KERNEL); - qp->num_clks = ARRAY_SIZE(bus_mm_clocks); -+ } else if (of_device_is_compatible(dev->of_node, "qcom,sdm660-a2noc")) { -+ qp->bus_clks = devm_kmemdup(dev, bus_a2noc_clocks, -+ sizeof(bus_a2noc_clocks), GFP_KERNEL); -+ qp->num_clks = ARRAY_SIZE(bus_a2noc_clocks); - } else { - if (of_device_is_compatible(dev->of_node, "qcom,sdm660-bimc")) - qp->is_bimc_node = true; --- -2.33.0 - diff --git a/queue-5.14/series b/queue-5.14/series index cb7fcc5f204..1de7e961871 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -2,7 +2,6 @@ ext4-check-and-update-i_disksize-properly.patch ext4-correct-the-error-path-of-ext4_write_inline_dat.patch asoc-intel-sof_sdw-tag-soundwire-bes-as-non-atomic.patch alsa-oxfw-fix-transmission-method-for-loud-models-ba.patch -interconnect-qcom-sdm660-add-missing-a2noc-qos-clock.patch alsa-usb-audio-unify-mixer-resume-and-reset_resume-p.patch hid-apple-fix-logical-maximum-and-usage-maximum-of-m.patch netfilter-ip6_tables-zero-initialize-fragment-offset.patch