From 159b03139b54e9831784b2ca14f7c29152b6291a Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 13 Aug 2022 22:26:35 -0400 Subject: [PATCH] Drop broken patches from 5.10 Signed-off-by: Sasha Levin --- ...8939-add-missing-system_mm_noc_bfdcd.patch | 42 ------- ...add-missing-system_mm_noc_bfdcd.patch-4005 | 61 ---------- ...8939-fix-bimc_ddr_clk_src-rcgr-base-.patch | 37 ------ ...8939-fix-weird-field-spacing-in-ftbl.patch | 39 ------- ...8939-point-mm-peripherals-to-system_.patch | 107 ------------------ queue-5.10/series | 5 - 6 files changed, 291 deletions(-) delete mode 100644 queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch delete mode 100644 queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch-4005 delete mode 100644 queue-5.10/clk-qcom-gcc-msm8939-fix-bimc_ddr_clk_src-rcgr-base-.patch delete mode 100644 queue-5.10/clk-qcom-gcc-msm8939-fix-weird-field-spacing-in-ftbl.patch delete mode 100644 queue-5.10/clk-qcom-gcc-msm8939-point-mm-peripherals-to-system_.patch diff --git a/queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch b/queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch deleted file mode 100644 index 03aa34b34a9..00000000000 --- a/queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 65cf2355e440f7257fd0ffbb8e7b054eedaf348e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 May 2022 17:38:32 +0100 -Subject: clk: qcom: gcc-msm8939: Add missing SYSTEM_MM_NOC_BFDCD_CLK_SRC - -From: Bryan O'Donoghue - -[ Upstream commit 07e7fcf1714c5f9930ad27613fea940aedba68da ] - -When adding in the indexes for this clock-controller we missed -SYSTEM_MM_NOC_BFDCD_CLK_SRC. - -Add it in now. - -Fixes: 4c71d6abc4fc ("clk: qcom: Add DT bindings for MSM8939 GCC") -Cc: Rob Herring -Cc: Krzysztof Kozlowski -Cc: devicetree@vger.kernel.org -Signed-off-by: Bryan O'Donoghue -Acked-by: Krzysztof Kozlowski -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220504163835.40130-2-bryan.odonoghue@linaro.org -Signed-off-by: Sasha Levin ---- - include/dt-bindings/clock/qcom,gcc-msm8939.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dt-bindings/clock/qcom,gcc-msm8939.h b/include/dt-bindings/clock/qcom,gcc-msm8939.h -index 0634467c4ce5..2d545ed0d35a 100644 ---- a/include/dt-bindings/clock/qcom,gcc-msm8939.h -+++ b/include/dt-bindings/clock/qcom,gcc-msm8939.h -@@ -192,6 +192,7 @@ - #define GCC_VENUS0_CORE0_VCODEC0_CLK 183 - #define GCC_VENUS0_CORE1_VCODEC0_CLK 184 - #define GCC_OXILI_TIMER_CLK 185 -+#define SYSTEM_MM_NOC_BFDCD_CLK_SRC 186 - - /* Indexes for GDSCs */ - #define BIMC_GDSC 0 --- -2.35.1 - diff --git a/queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch-4005 b/queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch-4005 deleted file mode 100644 index 466740b3f03..00000000000 --- a/queue-5.10/clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch-4005 +++ /dev/null @@ -1,61 +0,0 @@ -From 4be4cb7df713f26247be0136c20287eb52f8a2ee Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 May 2022 17:38:34 +0100 -Subject: clk: qcom: gcc-msm8939: Add missing system_mm_noc_bfdcd_clk_src - -From: Bryan O'Donoghue - -[ Upstream commit dd363e2f7196278e7a30f509a0e8a841cb763b14 ] - -The msm8939 has an additional higher operating point for the multi-media -peripherals. The higher throughput MM componets operate off of the -system-mm noc not the system noc. - -system_mm_noc_bfdcd_clk_src is the source clock for the higher frequency -capable system noc mm. - -Maximum frequency for the MM SNOC is 400 MHz. - -Fixes: 1664014e4679 ("clk: qcom: gcc-msm8939: Add MSM8939 Generic Clock Controller") -Signed-off-by: Bryan O'Donoghue -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220504163835.40130-4-bryan.odonoghue@linaro.org -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/gcc-msm8939.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/drivers/clk/qcom/gcc-msm8939.c b/drivers/clk/qcom/gcc-msm8939.c -index 31568658d23d..12bab9067ea8 100644 ---- a/drivers/clk/qcom/gcc-msm8939.c -+++ b/drivers/clk/qcom/gcc-msm8939.c -@@ -644,6 +644,18 @@ static struct clk_rcg2 bimc_ddr_clk_src = { - }, - }; - -+static struct clk_rcg2 system_mm_noc_bfdcd_clk_src = { -+ .cmd_rcgr = 0x2600c, -+ .hid_width = 5, -+ .parent_map = gcc_xo_gpll0_gpll6a_map, -+ .clkr.hw.init = &(struct clk_init_data){ -+ .name = "system_mm_noc_bfdcd_clk_src", -+ .parent_data = gcc_xo_gpll0_gpll6a_parent_data, -+ .num_parents = 3, -+ .ops = &clk_rcg2_ops, -+ }, -+}; -+ - static const struct freq_tbl ftbl_gcc_camss_ahb_clk[] = { - F(40000000, P_GPLL0, 10, 1, 2), - F(80000000, P_GPLL0, 10, 0, 0), -@@ -3623,6 +3635,7 @@ static struct clk_regmap *gcc_msm8939_clocks[] = { - [GPLL2_VOTE] = &gpll2_vote, - [PCNOC_BFDCD_CLK_SRC] = &pcnoc_bfdcd_clk_src.clkr, - [SYSTEM_NOC_BFDCD_CLK_SRC] = &system_noc_bfdcd_clk_src.clkr, -+ [SYSTEM_MM_NOC_BFDCD_CLK_SRC] = &system_mm_noc_bfdcd_clk_src.clkr, - [CAMSS_AHB_CLK_SRC] = &camss_ahb_clk_src.clkr, - [APSS_AHB_CLK_SRC] = &apss_ahb_clk_src.clkr, - [CSI0_CLK_SRC] = &csi0_clk_src.clkr, --- -2.35.1 - diff --git a/queue-5.10/clk-qcom-gcc-msm8939-fix-bimc_ddr_clk_src-rcgr-base-.patch b/queue-5.10/clk-qcom-gcc-msm8939-fix-bimc_ddr_clk_src-rcgr-base-.patch deleted file mode 100644 index b86c3257996..00000000000 --- a/queue-5.10/clk-qcom-gcc-msm8939-fix-bimc_ddr_clk_src-rcgr-base-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 52dcd10dcd4eb5864d3e950092dafc5b44023f24 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 May 2022 17:38:33 +0100 -Subject: clk: qcom: gcc-msm8939: Fix bimc_ddr_clk_src rcgr base address - -From: Bryan O'Donoghue - -[ Upstream commit 63d42708320d6d2ca9ed505123d50ff4a542c36f ] - -Reviewing qcom docs for the 8939 we can see the command rcgr is pointing to -the wrong address. bimc_ddr_clk_src_rcgr is @ 0x01832024 not 0x01832004. - -Fixes: 1664014e4679 ("clk: qcom: gcc-msm8939: Add MSM8939 Generic Clock Controller") -Signed-off-by: Bryan O'Donoghue -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220504163835.40130-3-bryan.odonoghue@linaro.org -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/gcc-msm8939.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/clk/qcom/gcc-msm8939.c b/drivers/clk/qcom/gcc-msm8939.c -index 39ebb443ae3d..31568658d23d 100644 ---- a/drivers/clk/qcom/gcc-msm8939.c -+++ b/drivers/clk/qcom/gcc-msm8939.c -@@ -632,7 +632,7 @@ static struct clk_rcg2 system_noc_bfdcd_clk_src = { - }; - - static struct clk_rcg2 bimc_ddr_clk_src = { -- .cmd_rcgr = 0x32004, -+ .cmd_rcgr = 0x32024, - .hid_width = 5, - .parent_map = gcc_xo_gpll0_bimc_map, - .clkr.hw.init = &(struct clk_init_data){ --- -2.35.1 - diff --git a/queue-5.10/clk-qcom-gcc-msm8939-fix-weird-field-spacing-in-ftbl.patch b/queue-5.10/clk-qcom-gcc-msm8939-fix-weird-field-spacing-in-ftbl.patch deleted file mode 100644 index d875e95aafd..00000000000 --- a/queue-5.10/clk-qcom-gcc-msm8939-fix-weird-field-spacing-in-ftbl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8977a56562943cea2d507d14206b6d9654c3e3e0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 12 Jul 2022 13:59:17 +0100 -Subject: clk: qcom: gcc-msm8939: Fix weird field spacing in - ftbl_gcc_camss_cci_clk - -From: Bryan O'Donoghue - -[ Upstream commit 2bc308ebc453ba22f3f120f777b9ac48f973ee80 ] - -Adding a new item to this frequency table I see the existing indentation is -incorrect. - -Fixes: 1664014e4679 ("clk: qcom: gcc-msm8939: Add MSM8939 Generic Clock Controller") -Signed-off-by: Bryan O'Donoghue -Reviewed-by: Konrad Dybcio -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220712125922.3461675-2-bryan.odonoghue@linaro.org -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/gcc-msm8939.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/clk/qcom/gcc-msm8939.c b/drivers/clk/qcom/gcc-msm8939.c -index c7377ec0f423..de0022e5450d 100644 ---- a/drivers/clk/qcom/gcc-msm8939.c -+++ b/drivers/clk/qcom/gcc-msm8939.c -@@ -1014,7 +1014,7 @@ static struct clk_rcg2 blsp1_uart2_apps_clk_src = { - }; - - static const struct freq_tbl ftbl_gcc_camss_cci_clk[] = { -- F(19200000, P_XO, 1, 0, 0), -+ F(19200000, P_XO, 1, 0, 0), - { } - }; - --- -2.35.1 - diff --git a/queue-5.10/clk-qcom-gcc-msm8939-point-mm-peripherals-to-system_.patch b/queue-5.10/clk-qcom-gcc-msm8939-point-mm-peripherals-to-system_.patch deleted file mode 100644 index 144c4ee85ba..00000000000 --- a/queue-5.10/clk-qcom-gcc-msm8939-point-mm-peripherals-to-system_.patch +++ /dev/null @@ -1,107 +0,0 @@ -From d90f43abbc04e6c7ebf565c3d50fde422e260e5f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 May 2022 17:38:35 +0100 -Subject: clk: qcom: gcc-msm8939: Point MM peripherals to system_mm_noc clock - -From: Bryan O'Donoghue - -[ Upstream commit 05eed0990927aa9634682fec58660e30f7b7ae30 ] - -Qcom docs indciate the following peripherals operating from System NOC -MM not from System NOC clocks. - -- MDP -- VFE -- JPEGe -- Venus - -Switch over the relevant parent pointers. - -Fixes: 1664014e4679 ("clk: qcom: gcc-msm8939: Add MSM8939 Generic Clock Controller") -Signed-off-by: Bryan O'Donoghue -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220504163835.40130-5-bryan.odonoghue@linaro.org -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/gcc-msm8939.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/drivers/clk/qcom/gcc-msm8939.c b/drivers/clk/qcom/gcc-msm8939.c -index 12bab9067ea8..c7377ec0f423 100644 ---- a/drivers/clk/qcom/gcc-msm8939.c -+++ b/drivers/clk/qcom/gcc-msm8939.c -@@ -2453,7 +2453,7 @@ static struct clk_branch gcc_camss_jpeg_axi_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_camss_jpeg_axi_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, -@@ -2657,7 +2657,7 @@ static struct clk_branch gcc_camss_vfe_axi_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_camss_vfe_axi_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, -@@ -2813,7 +2813,7 @@ static struct clk_branch gcc_mdss_axi_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_mdss_axi_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, -@@ -3205,7 +3205,7 @@ static struct clk_branch gcc_mdp_tbu_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_mdp_tbu_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, -@@ -3223,7 +3223,7 @@ static struct clk_branch gcc_venus_tbu_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_venus_tbu_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, -@@ -3241,7 +3241,7 @@ static struct clk_branch gcc_vfe_tbu_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_vfe_tbu_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, -@@ -3259,7 +3259,7 @@ static struct clk_branch gcc_jpeg_tbu_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_jpeg_tbu_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, -@@ -3496,7 +3496,7 @@ static struct clk_branch gcc_venus0_axi_clk = { - .hw.init = &(struct clk_init_data){ - .name = "gcc_venus0_axi_clk", - .parent_data = &(const struct clk_parent_data){ -- .hw = &system_noc_bfdcd_clk_src.clkr.hw, -+ .hw = &system_mm_noc_bfdcd_clk_src.clkr.hw, - }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 794d47fae71..7234e22008d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -300,10 +300,6 @@ dmaengine-dw-edma-fix-edma-rd-wr-channels-and-dma-di.patch misc-rtsx-fix-an-error-handling-path-in-rtsx_pci_pro.patch driver-core-fix-potential-deadlock-in-__driver_attac.patch clk-qcom-clk-krait-unlock-spin-after-mux-completion.patch -clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch -clk-qcom-gcc-msm8939-fix-bimc_ddr_clk_src-rcgr-base-.patch -clk-qcom-gcc-msm8939-add-missing-system_mm_noc_bfdcd.patch-4005 -clk-qcom-gcc-msm8939-point-mm-peripherals-to-system_.patch usb-host-xhci-use-snprintf-in-xhci_decode_trb.patch clk-qcom-ipq8074-fix-nss-core-pll-s.patch clk-qcom-ipq8074-sw-workaround-for-ubi32-pll-lock.patch @@ -348,7 +344,6 @@ rdma-qedr-improve-error-logs-for-rdma_alloc_tid-erro.patch rdma-qedr-fix-potential-memory-leak-in-__qedr_alloc_.patch rdma-hns-fix-incorrect-clearing-of-interrupt-status-.patch rdma-siw-fix-duplicated-reported-iw_cm_event_connect.patch -clk-qcom-gcc-msm8939-fix-weird-field-spacing-in-ftbl.patch rdma-hfi1-fix-potential-memory-leak-in-setup_base_ct.patch gpio-gpiolib-of-fix-refcount-bugs-in-of_mm_gpiochip_.patch hid-mcp2221-prevent-a-buffer-overflow-in-mcp_smbus_w.patch -- 2.47.3