From: Greg Kroah-Hartman Date: Fri, 21 Oct 2022 15:17:57 +0000 (+0200) Subject: drop a bunch of 5.19 patches that are not needed X-Git-Tag: v5.19.17~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6950988e75620a840d1ee2c2342d8b2982c0609;p=thirdparty%2Fkernel%2Fstable-queue.git drop a bunch of 5.19 patches that are not needed --- diff --git a/queue-5.19/arm64-dts-qcom-ipq8074-fix-pcie-phy-serdes-size.patch b/queue-5.19/arm64-dts-qcom-ipq8074-fix-pcie-phy-serdes-size.patch deleted file mode 100644 index 7295b5ad4be..00000000000 --- a/queue-5.19/arm64-dts-qcom-ipq8074-fix-pcie-phy-serdes-size.patch +++ /dev/null @@ -1,47 +0,0 @@ -From df410b8212489bdbf4fe65ba0d49d436b5873644 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Sep 2022 16:34:30 +0200 -Subject: arm64: dts: qcom: ipq8074: fix PCIe PHY serdes size - -From: Johan Hovold - -[ Upstream commit ed22cc93abae68f9d3fc4957c20a1d902cf28882 ] - -The size of the PCIe PHY serdes register region is 0x1c4 and the -corresponding 'reg' property should specifically not include the -adjacent regions that are defined in the child node (e.g. tx and rx). - -Fixes: 33057e1672fe ("ARM: dts: ipq8074: Add pcie nodes") -Signed-off-by: Johan Hovold -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220915143431.19842-1-johan+linaro@kernel.org -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi -index 697f46e17903..0088323827d0 100644 ---- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi -+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi -@@ -195,7 +195,7 @@ - - pcie_qmp0: phy@86000 { - compatible = "qcom,ipq8074-qmp-pcie-phy"; -- reg = <0x00086000 0x1000>; -+ reg = <0x00086000 0x1c4>; - #address-cells = <1>; - #size-cells = <1>; - ranges; -@@ -223,7 +223,7 @@ - - pcie_qmp1: phy@8e000 { - compatible = "qcom,ipq8074-qmp-pcie-phy"; -- reg = <0x0008e000 0x1000>; -+ reg = <0x0008e000 0x1c4>; - #address-cells = <1>; - #size-cells = <1>; - ranges; --- -2.35.1 - diff --git a/queue-5.19/arm64-dts-qcom-sc7180-trogdor-keep-pm6150_adc-enable.patch b/queue-5.19/arm64-dts-qcom-sc7180-trogdor-keep-pm6150_adc-enable.patch deleted file mode 100644 index a448aaca52a..00000000000 --- a/queue-5.19/arm64-dts-qcom-sc7180-trogdor-keep-pm6150_adc-enable.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ae5012f97a96ce56a81f41088a2b157bd6d214e3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 26 Aug 2022 17:49:00 -0700 -Subject: arm64: dts: qcom: sc7180-trogdor: Keep pm6150_adc enabled for TZ - -From: Stephen Boyd - -[ Upstream commit 144fbd028fdec2deeb3b99d5e60dbf3167950ebe ] - -There's still a thermal zone using pm6150_adc in the pm6150.dtsi file, -pm6150_thermal. It's not super obvious because it indirectly uses the -adc through an iio channel in pm6150_temp. Let's keep this enabled on -lazor and coachz so that reading the temperature of the pm6150_thermal -zone continues to work. Otherwise we get -EINVAL when reading the zone, -and I suspect the PMIC temperature trip doesn't work properly so we -don't shutdown when the PMIC overheats. - -Cc: Matthias Kaehlcke -Fixes: b8d1e3d33487 ("arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors") -Signed-off-by: Stephen Boyd -Reviewed-by: Matthias Kaehlcke -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220827004901.511543-1-swboyd@chromium.org -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 2 -- - arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts -index 8290d036044a..edfcd47e1a00 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts -@@ -24,8 +24,6 @@ - }; - - &pm6150_adc { -- status = "disabled"; -- - /delete-node/ skin-temp-thermistor@4e; - /delete-node/ charger-thermistor@4f; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi -index 88f6a7d4d020..711f9361aa3e 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi -@@ -54,8 +54,6 @@ ap_ts_pen_1v8: &i2c4 { - }; - - &pm6150_adc { -- status = "disabled"; -- - /delete-node/ charger-thermistor@4f; - }; - --- -2.35.1 - diff --git a/queue-5.19/arm64-dts-qcom-sc7280-cleanup-the-lpasscc-node.patch b/queue-5.19/arm64-dts-qcom-sc7280-cleanup-the-lpasscc-node.patch deleted file mode 100644 index ddbacd54458..00000000000 --- a/queue-5.19/arm64-dts-qcom-sc7280-cleanup-the-lpasscc-node.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 74d22b8eea56e796eaea8b0f606afde3b01d1b77 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Aug 2022 10:35:07 +0530 -Subject: arm64: dts: qcom: sc7280: Cleanup the lpasscc node - -From: Satya Priya - -[ Upstream commit 8c7ebabd2e3f33ef24378d3cac00d3e59886cecb ] - -Remove "cc" regmap from lpasscc node which is overlapping -with the lpass_aon regmap. - -Fixes: 422a295221bb ("arm64: dts: qcom: sc7280: Add clock controller nodes") -Signed-off-by: Satya Priya -Signed-off-by: Taniya Das -Reviewed-by: Stephen Boyd -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/1660107909-27947-2-git-send-email-quic_c_skakit@quicinc.com -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc7280.dtsi | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi -index 75e174316d00..0a4c58f95439 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi -@@ -2168,9 +2168,8 @@ - lpasscc: lpasscc@3000000 { - compatible = "qcom,sc7280-lpasscc"; - reg = <0 0x03000000 0 0x40>, -- <0 0x03c04000 0 0x4>, -- <0 0x03389000 0 0x24>; -- reg-names = "qdsp6ss", "top_cc", "cc"; -+ <0 0x03c04000 0 0x4>; -+ reg-names = "qdsp6ss", "top_cc"; - clocks = <&gcc GCC_CFG_NOC_LPASS_CLK>; - clock-names = "iface"; - #clock-cells = <1>; --- -2.35.1 - diff --git a/queue-5.19/arm64-dts-qcom-sc7280-idp-correct-adc-channel-node-n.patch b/queue-5.19/arm64-dts-qcom-sc7280-idp-correct-adc-channel-node-n.patch deleted file mode 100644 index bdaec385444..00000000000 --- a/queue-5.19/arm64-dts-qcom-sc7280-idp-correct-adc-channel-node-n.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 510c9438396e03d760d49f33c330a892dfdd1602 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 28 Aug 2022 11:43:38 +0300 -Subject: arm64: dts: qcom: sc7280-idp: correct ADC channel node name and unit - address - -From: Krzysztof Kozlowski - -[ Upstream commit 5589ffb2da2a66988ab3a68334dad3e68b42e3a9 ] - -Correct SPMI PMIC VADC channel node name: -1. Use hyphens instead of underscores, -2. Add missing unit address. - -This fixes `make dtbs_check` warnings like: - - qcom/sc7280-idp.dtb: pmic@0: adc@3100: 'pmk8350_die_temp', 'pmr735a_die_temp' do not match any of the regexes: '^.*@[0-9a-f]+$', 'pinctrl-[0-9]+' - -Signed-off-by: Krzysztof Kozlowski -Reviewed-by: Stephen Boyd -Reviewed-by: Vinod Koul -Reviewed-by: David Heidelberg -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220828084341.112146-12-krzysztof.kozlowski@linaro.org -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- - arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts -index 6d3ff80582ae..e2e37a0292ad 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts -+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts -@@ -78,7 +78,7 @@ - }; - - &pmk8350_vadc { -- pmr735a_die_temp { -+ pmr735a-die-temp@403 { - reg = ; - label = "pmr735a_die_temp"; - qcom,pre-scaling = <1 1>; -diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi -index 5eb668991e24..893d3031cfd5 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi -@@ -264,7 +264,7 @@ - }; - - &pmk8350_vadc { -- pmk8350_die_temp { -+ pmk8350-die-temp@3 { - reg = ; - label = "pmk8350_die_temp"; - qcom,pre-scaling = <1 1>; --- -2.35.1 - diff --git a/queue-5.19/arm64-dts-qcom-sc7280-update-lpasscore-node.patch b/queue-5.19/arm64-dts-qcom-sc7280-update-lpasscore-node.patch deleted file mode 100644 index 092086ba12c..00000000000 --- a/queue-5.19/arm64-dts-qcom-sc7280-update-lpasscore-node.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a0085ecb6253fe696f8c2c179038bcb3c2eb585f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Aug 2022 10:35:09 +0530 -Subject: arm64: dts: qcom: sc7280: Update lpasscore node - -From: Satya Priya - -[ Upstream commit d9a1e922730389afc425f2250de361b7f07acdbc ] - -To maintain consistency with other lpass nodes(lpass_audiocc, -lpass_aon and lpass_hm), update lpasscore to lpass_core. - -Fixes: 9499240d15f2 ("arm64: dts: qcom: sc7280: Add lpasscore & lpassaudio clock controllers") -Signed-off-by: Taniya Das -Signed-off-by: Satya Priya -Reviewed-by: Stephen Boyd -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/1660107909-27947-4-git-send-email-quic_c_skakit@quicinc.com -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc7280.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi -index 0a4c58f95439..694cdf88af38 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi -@@ -2191,13 +2191,13 @@ - reg = <0 0x03380000 0 0x30000>; - clocks = <&rpmhcc RPMH_CXO_CLK>, - <&rpmhcc RPMH_CXO_CLK_A>, -- <&lpasscore LPASS_CORE_CC_CORE_CLK>; -+ <&lpass_core LPASS_CORE_CC_CORE_CLK>; - clock-names = "bi_tcxo", "bi_tcxo_ao", "iface"; - #clock-cells = <1>; - #power-domain-cells = <1>; - }; - -- lpasscore: clock-controller@3900000 { -+ lpass_core: clock-controller@3900000 { - compatible = "qcom,sc7280-lpasscorecc"; - reg = <0 0x03900000 0 0x50000>; - clocks = <&rpmhcc RPMH_CXO_CLK>; --- -2.35.1 - diff --git a/queue-5.19/arm64-dts-qcom-sm8350-sagami-correct-ts-pin-property.patch b/queue-5.19/arm64-dts-qcom-sm8350-sagami-correct-ts-pin-property.patch deleted file mode 100644 index 0cee99c09ce..00000000000 --- a/queue-5.19/arm64-dts-qcom-sm8350-sagami-correct-ts-pin-property.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b1e13343844756a408bb2c7b357b0e780b991bda Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 08:17:42 +0200 -Subject: arm64: dts: qcom: sm8350-sagami: correct TS pin property - -From: Krzysztof Kozlowski - -[ Upstream commit c9c53d1f4329564f98ed0decfe3c377c6639ec5d ] - -The pin configuration is selected with "pins", not "pin" property. - -Fixes: 1209e9246632 ("arm64: dts: qcom: sm8350-sagami: Enable and populate I2C/SPI nodes") -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220912061746.6311-37-krzysztof.kozlowski@linaro.org -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi -index 90b13cbe2fa6..9224a06f5469 100644 ---- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi -@@ -223,7 +223,7 @@ - gpio-reserved-ranges = <44 4>; - - ts_int_default: ts-int-default { -- pin = "gpio23"; -+ pins = "gpio23"; - function = "gpio"; - drive-strength = <2>; - bias-disable; --- -2.35.1 - diff --git a/queue-5.19/arm64-dts-qcom-sm8450-fix-ufs-phy-serdes-size.patch b/queue-5.19/arm64-dts-qcom-sm8450-fix-ufs-phy-serdes-size.patch deleted file mode 100644 index 6b1759d0d03..00000000000 --- a/queue-5.19/arm64-dts-qcom-sm8450-fix-ufs-phy-serdes-size.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d443b6b82209d5cbca576e137b5737b77dc3d551 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Sep 2022 16:34:31 +0200 -Subject: arm64: dts: qcom: sm8450: fix UFS PHY serdes size - -From: Johan Hovold - -[ Upstream commit 677920072e9d757ae158d66b8fdb695992bb3f1a ] - -The size of the UFS PHY serdes register region is 0x1c4 and the -corresponding 'reg' property should specifically not include the -adjacent regions that are defined in the child node (e.g. tx and rx). - -Fixes: 07fa917a335e ("arm64: dts: qcom: sm8450: add ufs nodes") -Signed-off-by: Johan Hovold -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220915143431.19842-2-johan+linaro@kernel.org -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi -index c958f5d4adc2..45fc1de2fd29 100644 ---- a/arch/arm64/boot/dts/qcom/sm8450.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi -@@ -3082,7 +3082,7 @@ - - ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sm8450-qmp-ufs-phy"; -- reg = <0 0x01d87000 0 0xe10>; -+ reg = <0 0x01d87000 0 0x1c4>; - #address-cells = <2>; - #size-cells = <2>; - ranges; --- -2.35.1 - diff --git a/queue-5.19/clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch b/queue-5.19/clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch deleted file mode 100644 index 43ae9574efe..00000000000 --- a/queue-5.19/clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 698a6b241ed60ebbc0192cfd0f33ebc4ea7efe04 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 19 Aug 2022 00:06:21 +0200 -Subject: clk: qcom: apss-ipq6018: fix apcs_alias0_clk_src - -From: Robert Marko - -[ Upstream commit 43a56cbf2a38170b02db29654607575b1b4b5bc0 ] - -While working on IPQ8074 APSS driver it was discovered that IPQ6018 and -IPQ8074 use almost the same PLL and APSS clocks, however APSS driver is -currently broken. - -More precisely apcs_alias0_clk_src is broken, it was added as regmap_mux -clock. -However after debugging why it was always stuck at 800Mhz, it was figured -out that its not regmap_mux compatible at all. -It is a simple mux but it uses RCG2 register layout and control bits, so -utilize the new clk_rcg2_mux_closest_ops to correctly drive it while not -having to provide a dummy frequency table. - -While we are here, use ARRAY_SIZE for number of parents. - -Tested on IPQ6018-CP01-C1 reference board and multiple IPQ8074 boards. - -Fixes: 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller") -Signed-off-by: Robert Marko -Reviewed-by: Dmitry Baryshkov -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220818220628.339366-2-robimarko@gmail.com -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/apss-ipq6018.c | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/drivers/clk/qcom/apss-ipq6018.c b/drivers/clk/qcom/apss-ipq6018.c -index d78ff2f310bf..be952d417ded 100644 ---- a/drivers/clk/qcom/apss-ipq6018.c -+++ b/drivers/clk/qcom/apss-ipq6018.c -@@ -16,7 +16,7 @@ - #include "clk-regmap.h" - #include "clk-branch.h" - #include "clk-alpha-pll.h" --#include "clk-regmap-mux.h" -+#include "clk-rcg.h" - - enum { - P_XO, -@@ -33,16 +33,15 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = { - { P_APSS_PLL_EARLY, 5 }, - }; - --static struct clk_regmap_mux apcs_alias0_clk_src = { -- .reg = 0x0050, -- .width = 3, -- .shift = 7, -+static struct clk_rcg2 apcs_alias0_clk_src = { -+ .cmd_rcgr = 0x0050, -+ .hid_width = 5, - .parent_map = parents_apcs_alias0_clk_src_map, - .clkr.hw.init = &(struct clk_init_data){ - .name = "apcs_alias0_clk_src", - .parent_data = parents_apcs_alias0_clk_src, -- .num_parents = 2, -- .ops = &clk_regmap_mux_closest_ops, -+ .num_parents = ARRAY_SIZE(parents_apcs_alias0_clk_src), -+ .ops = &clk_rcg2_mux_closest_ops, - .flags = CLK_SET_RATE_PARENT, - }, - }; --- -2.35.1 - diff --git a/queue-5.19/clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch b/queue-5.19/clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch index 8ea952a5ac4..e5b3ec4c2ce 100644 --- a/queue-5.19/clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch +++ b/queue-5.19/clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch @@ -21,14 +21,12 @@ Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220818220628.339366-3-robimarko@gmail.com Signed-off-by: Sasha Levin --- - drivers/clk/qcom/apss-ipq6018.c | 2 +- + drivers/clk/qcom/apss-ipq6018.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/apss-ipq6018.c b/drivers/clk/qcom/apss-ipq6018.c -index be952d417ded..f2f502e2d5a4 100644 --- a/drivers/clk/qcom/apss-ipq6018.c +++ b/drivers/clk/qcom/apss-ipq6018.c -@@ -56,7 +56,7 @@ static struct clk_branch apcs_alias0_core_clk = { +@@ -57,7 +57,7 @@ static struct clk_branch apcs_alias0_cor .parent_hws = (const struct clk_hw *[]){ &apcs_alias0_clk_src.clkr.hw }, .num_parents = 1, @@ -37,6 +35,3 @@ index be952d417ded..f2f502e2d5a4 100644 .ops = &clk_branch2_ops, }, }, --- -2.35.1 - diff --git a/queue-5.19/clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch b/queue-5.19/clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch deleted file mode 100644 index b2af5db0b31..00000000000 --- a/queue-5.19/clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a907b2b91eacbccb605c9a6286e9b128b70f814e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 19 Aug 2022 00:06:20 +0200 -Subject: clk: qcom: clk-rcg2: add rcg2 mux ops - -From: Christian Marangi - -[ Upstream commit c5d2c96b3a7bd8987fad9957510034130037fccf ] - -An RCG may act as a mux that switch between 2 parents. -This is the case on IPQ6018 and IPQ8074 where the APCS core clk that feeds -the CPU cluster clock just switches between XO and the PLL that feeds it. - -Add the required ops to add support for this special configuration and use -the generic mux function to determine the rate. - -This way we dont have to keep a essentially dummy frequency table to use -RCG2 as a mux. - -Signed-off-by: Christian Marangi -Signed-off-by: Robert Marko -Reviewed-by: Dmitry Baryshkov -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220818220628.339366-1-robimarko@gmail.com -Stable-dep-of: 43a56cbf2a38 ("clk: qcom: apss-ipq6018: fix apcs_alias0_clk_src") -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/clk-rcg.h | 1 + - drivers/clk/qcom/clk-rcg2.c | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h -index 012e745794fd..01581f4d2c39 100644 ---- a/drivers/clk/qcom/clk-rcg.h -+++ b/drivers/clk/qcom/clk-rcg.h -@@ -167,6 +167,7 @@ struct clk_rcg2_gfx3d { - - extern const struct clk_ops clk_rcg2_ops; - extern const struct clk_ops clk_rcg2_floor_ops; -+extern const struct clk_ops clk_rcg2_mux_closest_ops; - extern const struct clk_ops clk_edp_pixel_ops; - extern const struct clk_ops clk_byte_ops; - extern const struct clk_ops clk_byte2_ops; -diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c -index 28019edd2a50..609c10f8d0d9 100644 ---- a/drivers/clk/qcom/clk-rcg2.c -+++ b/drivers/clk/qcom/clk-rcg2.c -@@ -509,6 +509,13 @@ const struct clk_ops clk_rcg2_floor_ops = { - }; - EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops); - -+const struct clk_ops clk_rcg2_mux_closest_ops = { -+ .determine_rate = __clk_mux_determine_rate_closest, -+ .get_parent = clk_rcg2_get_parent, -+ .set_parent = clk_rcg2_set_parent, -+}; -+EXPORT_SYMBOL_GPL(clk_rcg2_mux_closest_ops); -+ - struct frac_entry { - int num; - int den; --- -2.35.1 - diff --git a/queue-5.19/hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch b/queue-5.19/hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch deleted file mode 100644 index dc4da14146b..00000000000 --- a/queue-5.19/hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0734d00e6249659bfdc657de1e5b4b4d2d29a95a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 15 Aug 2022 16:27:06 +0200 -Subject: HID: uclogic: Fix warning in uclogic_rdesc_template_apply -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: José Expósito - -[ Upstream commit 609174edeb758d1e2d713e7ab4e09ea8d45aa4f7 ] - -Building with Sparse enabled prints this warning: - - warning: incorrect type in assignment (different base types) - expected signed int x - got restricted __le32 [usertype] - -Cast the return value of cpu_to_le32() to fix the warning. - -Fixes: 08177f4 ("HID: uclogic: merge hid-huion driver in hid-uclogic") -Signed-off-by: José Expósito -Signed-off-by: Jiri Kosina -Signed-off-by: Sasha Levin ---- - drivers/hid/hid-uclogic-rdesc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c -index 7126fba80968..b6aeff442982 100644 ---- a/drivers/hid/hid-uclogic-rdesc.c -+++ b/drivers/hid/hid-uclogic-rdesc.c -@@ -1009,7 +1009,7 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, - if (memcmp(p, pen_head, sizeof(pen_head)) == 0 && - p[sizeof(pen_head)] < param_num) { - v = param_list[p[sizeof(pen_head)]]; -- put_unaligned(cpu_to_le32(v), (s32 *)p); -+ put_unaligned((__force u32)cpu_to_le32(v), (s32 *)p); - p += sizeof(pen_head) + 1; - } else { - p++; --- -2.35.1 - diff --git a/queue-5.19/hid-uclogic-make-template-placeholder-ids-generic.patch b/queue-5.19/hid-uclogic-make-template-placeholder-ids-generic.patch deleted file mode 100644 index 34d49c6df65..00000000000 --- a/queue-5.19/hid-uclogic-make-template-placeholder-ids-generic.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 8b9e9150f602e98a2d4cedd7d58f7539f8139939 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 11 Jun 2022 13:39:11 +0200 -Subject: HID: uclogic: Make template placeholder IDs generic -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: José Expósito - -[ Upstream commit 76e645be7ebecbf39ab2edd949ea7f1757f58900 ] - -Up until now, the report descriptor template parameter IDs were only -used with pen report descriptors and they were named accordingly. - -Rename the enum and the total number of IDs to make them interface -agnostic. - -Refactor, no functional changes. - -Signed-off-by: José Expósito -Signed-off-by: Jiri Kosina -Stable-dep-of: 609174edeb75 ("HID: uclogic: Fix warning in uclogic_rdesc_template_apply") -Signed-off-by: Sasha Levin ---- - drivers/hid/hid-uclogic-params.c | 4 ++-- - drivers/hid/hid-uclogic-rdesc.c | 14 +++++++------- - drivers/hid/hid-uclogic-rdesc.h | 10 +++++----- - 3 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c -index db838f16282d..b43142f98a8b 100644 ---- a/drivers/hid/hid-uclogic-params.c -+++ b/drivers/hid/hid-uclogic-params.c -@@ -234,7 +234,7 @@ static int uclogic_params_pen_init_v1(struct uclogic_params_pen *pen, - const int len = 12; - s32 resolution; - /* Pen report descriptor template parameters */ -- s32 desc_params[UCLOGIC_RDESC_PEN_PH_ID_NUM]; -+ s32 desc_params[UCLOGIC_RDESC_PH_ID_NUM]; - __u8 *desc_ptr = NULL; - - /* Check arguments */ -@@ -379,7 +379,7 @@ static int uclogic_params_pen_init_v2(struct uclogic_params_pen *pen, - size_t i; - s32 resolution; - /* Pen report descriptor template parameters */ -- s32 desc_params[UCLOGIC_RDESC_PEN_PH_ID_NUM]; -+ s32 desc_params[UCLOGIC_RDESC_PH_ID_NUM]; - __u8 *desc_ptr = NULL; - - /* Check arguments */ -diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c -index 13f9ce73f1b1..7126fba80968 100644 ---- a/drivers/hid/hid-uclogic-rdesc.c -+++ b/drivers/hid/hid-uclogic-rdesc.c -@@ -979,7 +979,7 @@ const size_t uclogic_rdesc_xppen_deco01_frame_size = - * uclogic_rdesc_template_apply() - apply report descriptor parameters to a - * report descriptor template, creating a report descriptor. Copies the - * template over to the new report descriptor and replaces every occurrence of -- * UCLOGIC_RDESC_PH_HEAD, followed by an index byte, with the value from the -+ * UCLOGIC_RDESC_PEN_PH_HEAD, followed by an index byte, with the value from the - * parameter list at that index. - * - * @template_ptr: Pointer to the template buffer. -@@ -996,7 +996,7 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, - const s32 *param_list, - size_t param_num) - { -- static const __u8 head[] = {UCLOGIC_RDESC_PH_HEAD}; -+ static const __u8 pen_head[] = {UCLOGIC_RDESC_PEN_PH_HEAD}; - __u8 *rdesc_ptr; - __u8 *p; - s32 v; -@@ -1005,12 +1005,12 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, - if (rdesc_ptr == NULL) - return NULL; - -- for (p = rdesc_ptr; p + sizeof(head) < rdesc_ptr + template_size;) { -- if (memcmp(p, head, sizeof(head)) == 0 && -- p[sizeof(head)] < param_num) { -- v = param_list[p[sizeof(head)]]; -+ for (p = rdesc_ptr; p + sizeof(pen_head) < rdesc_ptr + template_size;) { -+ if (memcmp(p, pen_head, sizeof(pen_head)) == 0 && -+ p[sizeof(pen_head)] < param_num) { -+ v = param_list[p[sizeof(pen_head)]]; - put_unaligned(cpu_to_le32(v), (s32 *)p); -- p += sizeof(head) + 1; -+ p += sizeof(pen_head) + 1; - } else { - p++; - } -diff --git a/drivers/hid/hid-uclogic-rdesc.h b/drivers/hid/hid-uclogic-rdesc.h -index 0c6e95e8bde7..9d37090c39d1 100644 ---- a/drivers/hid/hid-uclogic-rdesc.h -+++ b/drivers/hid/hid-uclogic-rdesc.h -@@ -81,7 +81,7 @@ extern __u8 uclogic_rdesc_twha60_fixed1_arr[]; - extern const size_t uclogic_rdesc_twha60_fixed1_size; - - /* Report descriptor template placeholder head */ --#define UCLOGIC_RDESC_PH_HEAD 0xFE, 0xED, 0x1D -+#define UCLOGIC_RDESC_PEN_PH_HEAD 0xFE, 0xED, 0x1D - - /* Apply report descriptor parameters to a report descriptor template */ - extern __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, -@@ -89,19 +89,19 @@ extern __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, - const s32 *param_list, - size_t param_num); - --/* Pen report descriptor template placeholder IDs */ --enum uclogic_rdesc_pen_ph_id { -+/* Report descriptor template placeholder IDs */ -+enum uclogic_rdesc_ph_id { - UCLOGIC_RDESC_PEN_PH_ID_X_LM, - UCLOGIC_RDESC_PEN_PH_ID_X_PM, - UCLOGIC_RDESC_PEN_PH_ID_Y_LM, - UCLOGIC_RDESC_PEN_PH_ID_Y_PM, - UCLOGIC_RDESC_PEN_PH_ID_PRESSURE_LM, -- UCLOGIC_RDESC_PEN_PH_ID_NUM -+ UCLOGIC_RDESC_PH_ID_NUM - }; - - /* Report descriptor pen template placeholder */ - #define UCLOGIC_RDESC_PEN_PH(_ID) \ -- UCLOGIC_RDESC_PH_HEAD, UCLOGIC_RDESC_PEN_PH_ID_##_ID -+ UCLOGIC_RDESC_PEN_PH_HEAD, UCLOGIC_RDESC_PEN_PH_ID_##_ID - - /* Report ID for v1 pen reports */ - #define UCLOGIC_RDESC_V1_PEN_ID 0x07 --- -2.35.1 - diff --git a/queue-5.19/net-ftmac100-fix-endianness-related-issues-from-spar.patch b/queue-5.19/net-ftmac100-fix-endianness-related-issues-from-spar.patch deleted file mode 100644 index cf1b4a2aa04..00000000000 --- a/queue-5.19/net-ftmac100-fix-endianness-related-issues-from-spar.patch +++ /dev/null @@ -1,67 +0,0 @@ -From fd780c91840165db69c765de4c5f67105a89d460 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Sep 2022 14:37:49 +0300 -Subject: net: ftmac100: fix endianness-related issues from 'sparse' - -From: Sergei Antonov - -[ Upstream commit 9df696b3b3a4c96c3219eb87c7bf03fb50e490b8 ] - -Sparse found a number of endianness-related issues of these kinds: - -.../ftmac100.c:192:32: warning: restricted __le32 degrades to integer - -.../ftmac100.c:208:23: warning: incorrect type in assignment (different base types) -.../ftmac100.c:208:23: expected unsigned int rxdes0 -.../ftmac100.c:208:23: got restricted __le32 [usertype] - -.../ftmac100.c:249:23: warning: invalid assignment: &= -.../ftmac100.c:249:23: left side has type unsigned int -.../ftmac100.c:249:23: right side has type restricted __le32 - -.../ftmac100.c:527:16: warning: cast to restricted __le32 - -Change type of some fields from 'unsigned int' to '__le32' to fix it. - -Signed-off-by: Sergei Antonov -Reviewed-by: Andrew Lunn -Link: https://lore.kernel.org/r/20220902113749.1408562-1-saproj@gmail.com -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/faraday/ftmac100.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/drivers/net/ethernet/faraday/ftmac100.h b/drivers/net/ethernet/faraday/ftmac100.h -index fe986f1673fc..8af32f9070f4 100644 ---- a/drivers/net/ethernet/faraday/ftmac100.h -+++ b/drivers/net/ethernet/faraday/ftmac100.h -@@ -122,9 +122,9 @@ - * Transmit descriptor, aligned to 16 bytes - */ - struct ftmac100_txdes { -- unsigned int txdes0; -- unsigned int txdes1; -- unsigned int txdes2; /* TXBUF_BADR */ -+ __le32 txdes0; -+ __le32 txdes1; -+ __le32 txdes2; /* TXBUF_BADR */ - unsigned int txdes3; /* not used by HW */ - } __attribute__ ((aligned(16))); - -@@ -143,9 +143,9 @@ struct ftmac100_txdes { - * Receive descriptor, aligned to 16 bytes - */ - struct ftmac100_rxdes { -- unsigned int rxdes0; -- unsigned int rxdes1; -- unsigned int rxdes2; /* RXBUF_BADR */ -+ __le32 rxdes0; -+ __le32 rxdes1; -+ __le32 rxdes2; /* RXBUF_BADR */ - unsigned int rxdes3; /* not used by HW */ - } __attribute__ ((aligned(16))); - --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index 69db64ba957..620b4106803 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -359,17 +359,11 @@ arm64-dts-renesas-r9a07g044-fix-sci-rx-tx-interrupt-.patch arm64-dts-renesas-r9a07g054-fix-sci-rx-tx-interrupt-.patch arm64-dts-renesas-r9a07g043-fix-sci-rx-tx-interrupt-.patch dt-bindings-clock-exynosautov9-correct-clock-numberi.patch -arm64-dts-qcom-sc7280-cleanup-the-lpasscc-node.patch -arm64-dts-qcom-sc7280-update-lpasscore-node.patch -arm64-dts-qcom-sc7180-trogdor-keep-pm6150_adc-enable.patch arm-dts-turris-omnia-fix-mpp26-pin-name-and-comment.patch arm-dts-kirkwood-lsxl-fix-serial-line.patch arm-dts-kirkwood-lsxl-remove-first-ethernet-port.patch ia64-export-memory_add_physaddr_to_nid-to-fix-cxl-bu.patch -arm64-dts-qcom-sm8350-sagami-correct-ts-pin-property.patch soc-tegra-fuse-drop-kconfig-dependency-on-tegra20_ap.patch -arm64-dts-qcom-ipq8074-fix-pcie-phy-serdes-size.patch -arm64-dts-qcom-sm8450-fix-ufs-phy-serdes-size.patch arm64-dts-ti-k3-j7200-fix-main-pinmux-range.patch arm-dts-exynos-correct-s5k6a3-reset-polarity-on-mida.patch arm-drop-cmdline_-dependency-on-atags.patch @@ -400,8 +394,6 @@ clk-tegra-fix-refcount-leak-in-tegra210_clock_init.patch clk-tegra-fix-refcount-leak-in-tegra114_clock_init.patch clk-tegra20-fix-refcount-leak-in-tegra20_clock_init.patch clk-samsung-exynosautov9-correct-register-offsets-of.patch -hid-uclogic-make-template-placeholder-ids-generic.patch -hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch clk-qcom-gcc-sdm660-use-floor-ops-for-sdcc1-clock.patch @@ -477,8 +469,6 @@ scsi-iscsi-rename-iscsi_conn_queue_work.patch scsi-iscsi-add-recv-workqueue-helpers.patch scsi-iscsi-run-recv-path-from-workqueue.patch scsi-iscsi-iscsi_tcp-fix-null-ptr-deref-while-callin.patch -clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch -clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch clk-qcom-gcc-sm6115-override-default-alpha-pll-regs.patch rdma-rxe-stop-lookup-of-partially-built-objects.patch @@ -616,7 +606,6 @@ net-next-fix-ip_unicast_if-option-behavior-for-conne.patch xfrm-update-ipcomp_scratches-with-null-when-freed.patch wifi-ath11k-register-shutdown-handler-for-wcn6750.patch rtw89-ser-leave-lps-with-mutex.patch -net-ftmac100-fix-endianness-related-issues-from-spar.patch iavf-fix-race-between-iavf_close-and-iavf_reset_task.patch wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch bluetooth-btintel-mark-intel-controller-to-support-l.patch @@ -678,7 +667,6 @@ drm-amd-display-polling-vid-stream-status-in-hpo-dp-.patch drm-amdkfd-fix-ubsan-shift-out-of-bounds-warning.patch arm-dts-imx6-delete-interrupts-property-if-interrupt.patch arm-dts-imx7d-sdb-config-the-max-pressure-for-tsc204.patch -arm64-dts-qcom-sc7280-idp-correct-adc-channel-node-n.patch arm-dts-imx6q-add-missing-properties-for-sram.patch arm-dts-imx6dl-add-missing-properties-for-sram.patch arm-dts-imx6qp-add-missing-properties-for-sram.patch