From f2a800195406d7889109121ad7c7335d374d62f3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 21 Oct 2022 16:58:05 +0200 Subject: [PATCH] drop some 5.19 patches --- .../af_unix-use-debug_net_warn_on_once.patch | 49 -- ...os-add-panel-and-backlight-to-p4note.patch | 166 ------ ...dm660-add-initial-inforce-ifc6560-bo.patch | 511 ------------------ .../wan-fix-syntax-errors-in-comments.patch | 36 -- 4 files changed, 762 deletions(-) delete mode 100644 queue-5.19/af_unix-use-debug_net_warn_on_once.patch delete mode 100644 queue-5.19/arm-dts-exynos-add-panel-and-backlight-to-p4note.patch delete mode 100644 queue-5.19/arm64-dts-qcom-sdm660-add-initial-inforce-ifc6560-bo.patch delete mode 100644 queue-5.19/wan-fix-syntax-errors-in-comments.patch diff --git a/queue-5.19/af_unix-use-debug_net_warn_on_once.patch b/queue-5.19/af_unix-use-debug_net_warn_on_once.patch deleted file mode 100644 index d164c49ec20..00000000000 --- a/queue-5.19/af_unix-use-debug_net_warn_on_once.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f06efd8a325a77b7f9fd863d7d8031d59abacd5d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 8 Jun 2022 09:04:35 -0700 -Subject: af_unix: use DEBUG_NET_WARN_ON_ONCE() - -From: Eric Dumazet - -[ Upstream commit dd29c67dbbbf97c8aa786a502977856d8eb9a73d ] - -Replace four WARN_ON() that have not triggered recently -with DEBUG_NET_WARN_ON_ONCE(). - -Signed-off-by: Eric Dumazet -Signed-off-by: Jakub Kicinski -Stable-dep-of: 7a62ed61367b ("af_unix: Fix memory leaks of the whole sk due to OOB skb.") -Signed-off-by: Sasha Levin ---- - net/unix/af_unix.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c -index 2206e6f8902d..3453e0053f76 100644 ---- a/net/unix/af_unix.c -+++ b/net/unix/af_unix.c -@@ -302,7 +302,7 @@ static void __unix_remove_socket(struct sock *sk) - - static void __unix_insert_socket(struct sock *sk) - { -- WARN_ON(!sk_unhashed(sk)); -+ DEBUG_NET_WARN_ON_ONCE(!sk_unhashed(sk)); - sk_add_node(sk, &unix_socket_table[sk->sk_hash]); - } - -@@ -554,9 +554,9 @@ static void unix_sock_destructor(struct sock *sk) - u->oob_skb = NULL; - } - #endif -- WARN_ON(refcount_read(&sk->sk_wmem_alloc)); -- WARN_ON(!sk_unhashed(sk)); -- WARN_ON(sk->sk_socket); -+ DEBUG_NET_WARN_ON_ONCE(refcount_read(&sk->sk_wmem_alloc)); -+ DEBUG_NET_WARN_ON_ONCE(!sk_unhashed(sk)); -+ DEBUG_NET_WARN_ON_ONCE(sk->sk_socket); - if (!sock_flag(sk, SOCK_DEAD)) { - pr_info("Attempt to release alive unix socket: %p\n", sk); - return; --- -2.35.1 - diff --git a/queue-5.19/arm-dts-exynos-add-panel-and-backlight-to-p4note.patch b/queue-5.19/arm-dts-exynos-add-panel-and-backlight-to-p4note.patch deleted file mode 100644 index c2931d0231b..00000000000 --- a/queue-5.19/arm-dts-exynos-add-panel-and-backlight-to-p4note.patch +++ /dev/null @@ -1,166 +0,0 @@ -From d7d5751b85040ecb50c47907be2f19295159d4e8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 16 May 2022 21:37:09 +0200 -Subject: ARM: dts: exynos: add panel and backlight to p4note -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Martin Jücker - -[ Upstream commit 6c52573bf4c3a0f6e7142264fb36b31ae2c3707a ] - -Add configuration for the LTL101AL01 panel and a pwm backlight to drive -the display in the p4note devices. - -Signed-off-by: Martin Jücker -Link: https://lore.kernel.org/r/20220516193709.10037-3-martin.juecker@gmail.com -Signed-off-by: Krzysztof Kozlowski -Stable-dep-of: a26aa1238415 ("ntfs3: rework xattr handlers and switch to POSIX ACL VFS helpers") -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos4412-p4note.dtsi | 84 ++++++++++++++++++++---- - 1 file changed, 71 insertions(+), 13 deletions(-) - -diff --git a/arch/arm/boot/dts/exynos4412-p4note.dtsi b/arch/arm/boot/dts/exynos4412-p4note.dtsi -index 97f131b1014b..1fd051b52387 100644 ---- a/arch/arm/boot/dts/exynos4412-p4note.dtsi -+++ b/arch/arm/boot/dts/exynos4412-p4note.dtsi -@@ -106,6 +106,16 @@ - regulator-always-on; - }; - -+ panel_vdd: voltage-regulator-4 { -+ compatible = "regulator-fixed"; -+ regulator-name = "LCD_ENABLE"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lcd_enable>; -+ gpios = <&gpc0 1 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ regulator-boot-on; -+ }; -+ - wlan_pwrseq: sdhci3-pwrseq { - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&gpm3 5 GPIO_ACTIVE_LOW>; -@@ -216,6 +226,32 @@ - monitored-battery = <&battery_cell>; - }; - }; -+ -+ panel { -+ compatible = "samsung,ltl101al01"; -+ pinctrl-0 = <&lvds_nshdn>; -+ pinctrl-names = "default"; -+ power-supply = <&panel_vdd>; -+ enable-gpios = <&gpm0 5 GPIO_ACTIVE_HIGH>; -+ backlight = <&backlight>; -+ -+ port { -+ lcd_ep: endpoint { -+ remote-endpoint = <&fimd_ep>; -+ }; -+ }; -+ }; -+ -+ backlight: backlight { -+ compatible = "pwm-backlight"; -+ pinctrl-0 = <&led_bl_reset>; -+ pinctrl-names = "default"; -+ enable-gpios = <&gpm0 1 GPIO_ACTIVE_HIGH>; -+ pwms = <&pwm 1 78770 0>; -+ brightness-levels = <0 48 128 255>; -+ num-interpolated-steps = <8>; -+ default-brightness-level = <12>; -+ }; - }; - - &adc { -@@ -295,22 +331,19 @@ - }; - - &fimd { -- pinctrl-0 = <&lcd_clk &lcd_data24 &pwm1_out>; -+ pinctrl-0 = <&lcd_clk &lcd_data24>; - pinctrl-names = "default"; -+ #address-cells = <1>; -+ #size-cells = <0>; - status = "okay"; - -- display-timings { -- timing0 { -- clock-frequency = <66666666>; -- hactive = <1280>; -- vactive = <800>; -- hfront-porch = <18>; -- hback-porch = <36>; -- hsync-len = <16>; -- vback-porch = <16>; -- vfront-porch = <4>; -- vsync-len = <3>; -- hsync-active = <1>; -+ samsung,invert-vclk; -+ -+ port@3 { -+ reg = <3>; -+ -+ fimd_ep: endpoint { -+ remote-endpoint = <&lcd_ep>; - }; - }; - }; -@@ -687,6 +720,12 @@ - samsung,pin-pud = ; - }; - -+ lcd_enable: lcd-enable-pins { -+ samsung,pins = "gpc0-1"; -+ samsung,pin-function = ; -+ samsung,pin-pud = ; -+ }; -+ - sleep0: sleep-state { - PIN_SLP(gpa0-0, INPUT, NONE); - PIN_SLP(gpa0-1, OUT0, NONE); -@@ -809,12 +848,24 @@ - /* 0 = CP, 1 = AP (serial output) */ - }; - -+ led_bl_reset: led-bl-reset-pins { -+ samsung,pins = "gpm0-1"; -+ samsung,pin-function = ; -+ samsung,pin-pud = ; -+ }; -+ - tsp_rst: tsp-rst-pins { - samsung,pins = "gpm0-4"; - samsung,pin-function = ; - samsung,pin-pud = ; - }; - -+ lvds_nshdn: lvds-nshdn-pins { -+ samsung,pins = "gpm0-5"; -+ samsung,pin-function = ; -+ samsung,pin-pud = ; -+ }; -+ - tsp_irq: tsp-irq-pins { - samsung,pins = "gpm2-3"; - samsung,pin-function = ; -@@ -1100,6 +1151,13 @@ - assigned-clock-parents = <&clock CLK_XUSBXTI>; - }; - -+&pwm { -+ pinctrl-0 = <&pwm1_out>; -+ pinctrl-names = "default"; -+ samsung,pwm-outputs = <1>; -+ status = "okay"; -+}; -+ - &rtc { - clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; - clock-names = "rtc", "rtc_src"; --- -2.35.1 - diff --git a/queue-5.19/arm64-dts-qcom-sdm660-add-initial-inforce-ifc6560-bo.patch b/queue-5.19/arm64-dts-qcom-sdm660-add-initial-inforce-ifc6560-bo.patch deleted file mode 100644 index 780ce19018a..00000000000 --- a/queue-5.19/arm64-dts-qcom-sdm660-add-initial-inforce-ifc6560-bo.patch +++ /dev/null @@ -1,511 +0,0 @@ -From de9e83143066ba84b91fcfb99f5d9dbf45daa627 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 21 May 2022 23:27:08 +0300 -Subject: arm64: dts: qcom: sdm660: Add initial Inforce IFC6560 board support - -From: Dmitry Baryshkov - -[ Upstream commit 34279d6e3f32c7b2dd1192d8ba3e1d28b6ac775e ] - -The IFC6560 is a board from Inforce Computing, built around the SDA660 -SoC. This patch describes core clocks, some regulators from the two -PMICs, debug uart, storage, bluetooth and audio DSP remoteproc. - -The regulator settings are inherited from prior work by Konrad Dybcio -and AngeloGioacchino Del Regno. - -Reviewed-by: Marijn Suijten -Signed-off-by: Dmitry Baryshkov -Co-developed-by: Bjorn Andersson -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220521202708.1509308-12-dmitry.baryshkov@linaro.org -Stable-dep-of: 7dac7991408f ("arm64: dts: qcom: sc8280xp-pmics: Remove reg entry & use correct node name for pmc8280c_lpg node") -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/Makefile | 1 + - .../boot/dts/qcom/sda660-inforce-ifc6560.dts | 461 ++++++++++++++++++ - 2 files changed, 462 insertions(+) - create mode 100644 arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts - -diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile -index 2f8aec2cc6db..12bb2f8bdac2 100644 ---- a/arch/arm64/boot/dts/qcom/Makefile -+++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -89,6 +89,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb - dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb - dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb - dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb -+dtb-$(CONFIG_ARCH_QCOM) += sda660-inforce-ifc6560.dtb - dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb - dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-discovery.dtb - dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-pioneer.dtb -diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts -new file mode 100644 -index 000000000000..28050bc5f081 ---- /dev/null -+++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts -@@ -0,0 +1,461 @@ -+// SPDX-License-Identifier: BSD-3-Clause -+/* -+ * Copyright (c) 2021, Linaro Ltd. -+ * Copyright (c) 2020, Konrad Dybcio -+ * Copyright (c) 2020, AngeloGioacchino Del Regno -+ * -+ */ -+ -+/dts-v1/; -+ -+#include "sdm660.dtsi" -+#include "pm660.dtsi" -+#include "pm660l.dtsi" -+ -+/ { -+ model = "Inforce 6560 Single Board Computer"; -+ compatible = "inforce,ifc6560", "qcom,sda660"; -+ chassis-type = "embedded"; /* SBC */ -+ -+ aliases { -+ serial0 = &blsp1_uart2; -+ serial1 = &blsp2_uart1; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ gpio-keys { -+ compatible = "gpio-keys"; -+ -+ volup { -+ label = "Volume Up"; -+ gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ debounce-interval = <15>; -+ }; -+ }; -+ -+ /* -+ * Until we hook up type-c detection, we -+ * have to stick with this. But it works. -+ */ -+ extcon_usb: extcon-usb { -+ compatible = "linux,extcon-usb-gpio"; -+ id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ hdmi-out { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_con: endpoint { -+ remote-endpoint = <&adv7533_out>; -+ }; -+ }; -+ }; -+ -+ vph_pwr: vph-pwr-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "vph_pwr"; -+ regulator-min-microvolt = <3800000>; -+ regulator-max-microvolt = <3800000>; -+ -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ v3p3_bck_bst: v3p3-bck-bst-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "v3p3_bck_bst"; -+ -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ -+ vin-supply = <&vph_pwr>; -+ }; -+ -+ v1p2_ldo: v1p2-ldo-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "v1p2_ldo"; -+ -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; -+ -+ vin-supply = <&vph_pwr>; -+ }; -+ -+ v5p0_boost: v5p0-boost-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "v5p0_boost"; -+ -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ -+ vin-supply = <&vph_pwr>; -+ }; -+}; -+ -+&adsp_pil { -+ firmware-name = "qcom/ifc6560/adsp.mbn"; -+}; -+ -+&blsp_i2c6 { -+ status = "okay"; -+ -+ adv7533: hdmi@39 { -+ compatible = "adi,adv7535"; -+ reg = <0x39>, <0x66>; -+ reg-names = "main", "edid"; -+ -+ interrupt-parent = <&pm660l_gpios>; -+ interrupts = <11 IRQ_TYPE_EDGE_FALLING>; -+ -+ clocks = <&rpmcc RPM_SMD_BB_CLK2>; -+ clock-names = "cec"; -+ /* -+ * Limit to 3 lanes to prevent the bridge from changing amount -+ * of lanes in the fly. MSM DSI host doesn't like that. -+ */ -+ adi,dsi-lanes = <3>; -+ avdd-supply = <&vreg_l13a_1p8>; -+ dvdd-supply = <&vreg_l13a_1p8>; -+ pvdd-supply = <&vreg_l13a_1p8>; -+ a2vdd-supply = <&vreg_l13a_1p8>; -+ v3p3-supply = <&v3p3_bck_bst>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ -+ adv7533_in: endpoint { -+ remote-endpoint = <&dsi0_out>; -+ }; -+ }; -+ -+ port@1 { -+ reg = <1>; -+ -+ adv7533_out: endpoint { -+ remote-endpoint = <&hdmi_con>; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&blsp1_dma { -+ /* -+ * The board will lock up if we toggle the BLSP clock, unless the -+ * BAM DMA interconnects support is in place. -+ */ -+ /delete-property/ clocks; -+}; -+ -+&blsp1_uart2 { -+ status = "okay"; -+}; -+ -+&blsp2_dma { -+ /* -+ * The board will lock up if we toggle the BLSP clock, unless the -+ * BAM DMA interconnects support is in place. -+ */ -+ /delete-property/ clocks; -+}; -+ -+&blsp2_uart1 { -+ status = "okay"; -+ -+ bluetooth { -+ compatible = "qcom,wcn3990-bt"; -+ -+ vddio-supply = <&vreg_l13a_1p8>; -+ vddxo-supply = <&vreg_l9a_1p8>; -+ vddrf-supply = <&vreg_l6a_1p3>; -+ vddch0-supply = <&vreg_l19a_3p3>; -+ max-speed = <3200000>; -+ }; -+}; -+ -+&dsi0 { -+ status = "okay"; -+ vdda-supply = <&vreg_l1a_1p225>; -+}; -+ -+&dsi0_out { -+ remote-endpoint = <&adv7533_in>; -+ data-lanes = <0 1 2 3>; -+}; -+ -+&dsi0_phy { -+ status = "okay"; -+ vcca-supply = <&vreg_l1b_0p925>; -+}; -+ -+&mdss { -+ status = "okay"; -+}; -+ -+&mmss_smmu { -+ status = "okay"; -+}; -+ -+&pon_pwrkey { -+ status = "okay"; -+}; -+ -+&pon_resin { -+ status = "okay"; -+ -+ linux,code = ; -+}; -+ -+&qusb2phy0 { -+ status = "okay"; -+ -+ vdd-supply = <&vreg_l1b_0p925>; -+ vdda-phy-dpdm-supply = <&vreg_l7b_3p125>; -+}; -+ -+&qusb2phy1 { -+ status = "okay"; -+ -+ vdd-supply = <&vreg_l1b_0p925>; -+ vdda-phy-dpdm-supply = <&vreg_l7b_3p125>; -+}; -+ -+&rpm_requests { -+ pm660-regulators { -+ compatible = "qcom,rpm-pm660-regulators"; -+ -+ 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_l1_l6_l7-supply = <&vreg_s5a_1p35>; -+ vdd_l2_l3-supply = <&vreg_s2b_1p05>; -+ vdd_l5-supply = <&vreg_s2b_1p05>; -+ vdd_l8_l9_l10_l11_l12_l13_l14-supply = <&vreg_s4a_2p04>; -+ vdd_l15_l16_l17_l18_l19-supply = <&vreg_bob>; -+ -+ vreg_s4a_2p04: s4 { -+ regulator-min-microvolt = <1805000>; -+ regulator-max-microvolt = <2040000>; -+ regulator-enable-ramp-delay = <200>; -+ regulator-ramp-delay = <0>; -+ regulator-always-on; -+ }; -+ -+ vreg_s5a_1p35: s5 { -+ regulator-min-microvolt = <1224000>; -+ regulator-max-microvolt = <1350000>; -+ regulator-enable-ramp-delay = <200>; -+ regulator-ramp-delay = <0>; -+ }; -+ -+ vreg_l1a_1p225: l1 { -+ regulator-min-microvolt = <1150000>; -+ regulator-max-microvolt = <1250000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-allow-set-load; -+ }; -+ -+ vreg_l6a_1p3: l6 { -+ regulator-min-microvolt = <1304000>; -+ regulator-max-microvolt = <1368000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ regulator-allow-set-load; -+ }; -+ -+ vreg_l8a_1p8: l8 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ regulator-system-load = <325000>; -+ regulator-allow-set-load; -+ }; -+ -+ vreg_l9a_1p8: l9 { -+ regulator-min-microvolt = <1804000>; -+ regulator-max-microvolt = <1896000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ regulator-allow-set-load; -+ }; -+ -+ vreg_l13a_1p8: l13 { -+ /* This gives power to the LPDDR4: never turn it off! */ -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1944000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vreg_l19a_3p3: l19 { -+ regulator-min-microvolt = <3312000>; -+ regulator-max-microvolt = <3400000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ regulator-allow-set-load; -+ }; -+ }; -+ -+ pm660l-regulators { -+ compatible = "qcom,rpm-pm660l-regulators"; -+ -+ vdd_s1-supply = <&vph_pwr>; -+ vdd_s2-supply = <&vph_pwr>; -+ vdd_s3_s4-supply = <&vph_pwr>; -+ vdd_s5-supply = <&vph_pwr>; -+ vdd_s6-supply = <&vph_pwr>; -+ -+ vdd_l1_l9_l10-supply = <&vreg_s2b_1p05>; -+ vdd_l2-supply = <&vreg_bob>; -+ vdd_l3_l5_l7_l8-supply = <&vreg_bob>; -+ vdd_l4_l6-supply = <&vreg_bob>; -+ vdd_bob-supply = <&vph_pwr>; -+ -+ vreg_s2b_1p05: s2 { -+ regulator-min-microvolt = <1050000>; -+ regulator-max-microvolt = <1050000>; -+ regulator-enable-ramp-delay = <200>; -+ regulator-ramp-delay = <0>; -+ }; -+ -+ vreg_l1b_0p925: l1 { -+ regulator-min-microvolt = <800000>; -+ regulator-max-microvolt = <925000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-allow-set-load; -+ }; -+ -+ vreg_l2b_2p95: l2 { -+ regulator-min-microvolt = <1648000>; -+ regulator-max-microvolt = <3100000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ regulator-allow-set-load; -+ }; -+ -+ vreg_l4b_2p95: l4 { -+ regulator-min-microvolt = <2944000>; -+ regulator-max-microvolt = <2952000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ -+ regulator-min-microamp = <200>; -+ regulator-max-microamp = <600000>; -+ regulator-system-load = <570000>; -+ regulator-allow-set-load; -+ }; -+ -+ /* -+ * Downstream specifies a range of 1721-3600mV, -+ * but the only assigned consumers are SDHCI2 VMMC -+ * and Coresight QPDI that both request pinned 2.95V. -+ * Tighten the range to 1.8-3.328 (closest to 3.3) to -+ * make the mmc driver happy. -+ */ -+ vreg_l5b_2p95: l5 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3328000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-system-load = <800000>; -+ regulator-ramp-delay = <0>; -+ regulator-allow-set-load; -+ }; -+ -+ vreg_l7b_3p125: l7 { -+ regulator-min-microvolt = <2700000>; -+ regulator-max-microvolt = <3125000>; -+ regulator-enable-ramp-delay = <250>; -+ }; -+ -+ vreg_l8b_3p3: l8 { -+ regulator-min-microvolt = <2800000>; -+ regulator-max-microvolt = <3400000>; -+ regulator-enable-ramp-delay = <250>; -+ regulator-ramp-delay = <0>; -+ }; -+ -+ vreg_bob: bob { -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3624000>; -+ regulator-enable-ramp-delay = <500>; -+ regulator-ramp-delay = <0>; -+ }; -+ }; -+}; -+ -+&sdc2_state_on { -+ sd-cd { -+ pins = "gpio54"; -+ bias-pull-up; -+ drive-strength = <2>; -+ }; -+}; -+ -+&sdc2_state_off { -+ sd-cd { -+ pins = "gpio54"; -+ bias-disable; -+ drive-strength = <2>; -+ }; -+}; -+ -+&sdhc_1 { -+ status = "okay"; -+ supports-cqe; -+ -+ vmmc-supply = <&vreg_l4b_2p95>; -+ vqmmc-supply = <&vreg_l8a_1p8>; -+ -+ mmc-ddr-1_8v; -+ mmc-hs400-1_8v; -+ mmc-hs400-enhanced-strobe; -+}; -+ -+&sdhc_2 { -+ status = "okay"; -+ -+ vmmc-supply = <&vreg_l5b_2p95>; -+ vqmmc-supply = <&vreg_l2b_2p95>; -+ -+ cd-gpios = <&tlmm 54 GPIO_ACTIVE_LOW>; -+ no-sdio; -+ no-emmc; -+}; -+ -+&tlmm { -+ gpio-reserved-ranges = <0 4>, <8 4>; -+}; -+ -+&usb2 { -+ status = "okay"; -+}; -+ -+&usb2_dwc3 { -+ dr_mode = "host"; -+}; -+ -+&usb3 { -+ status = "okay"; -+}; -+ -+&usb3_dwc3 { -+ dr_mode = "peripheral"; -+ extcon = <&extcon_usb>; -+}; --- -2.35.1 - diff --git a/queue-5.19/wan-fix-syntax-errors-in-comments.patch b/queue-5.19/wan-fix-syntax-errors-in-comments.patch deleted file mode 100644 index 92944bd27a1..00000000000 --- a/queue-5.19/wan-fix-syntax-errors-in-comments.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d892f48c82226f8775171ee6c23ebb6a81a977bf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Jun 2022 12:09:17 +0800 -Subject: WAN: Fix syntax errors in comments - -From: Xiang wangx - -[ Upstream commit 6fa4a6d20c168fa83810f03b1c43e0cec69bbdbc ] - -Delete the redundant word 'the'. - -Signed-off-by: Xiang wangx -Link: https://lore.kernel.org/r/20220604040917.8926-1-wangxiang@cdjrlc.com -Signed-off-by: Paolo Abeni -Stable-dep-of: 93fbc1ebd978 ("wifi: rtlwifi: 8192de: correct checking of IQK reload") -Signed-off-by: Sasha Levin ---- - drivers/net/wan/farsync.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wan/farsync.h b/drivers/net/wan/farsync.h -index 5f43568a9715..63908dbbb02d 100644 ---- a/drivers/net/wan/farsync.h -+++ b/drivers/net/wan/farsync.h -@@ -43,7 +43,7 @@ - * This version number is incremented with each official release of the - * package and is a simplified number for normal user reference. - * Individual files are tracked by the version control system and may -- * have individual versions (or IDs) that move much faster than the -+ * have individual versions (or IDs) that move much faster than - * the release version as individual updates are tracked. - */ - #define FST_USER_VERSION "1.04" --- -2.35.1 - -- 2.47.3