diff options
7 files changed, 302 insertions, 0 deletions
diff --git a/queue-6.1/arm-dts-am335x-bone-common-add-gpio-phy-reset-on-revision-c3-board.patch b/queue-6.1/arm-dts-am335x-bone-common-add-gpio-phy-reset-on-revision-c3-board.patch new file mode 100644 index 0000000000..a38f802abc --- /dev/null +++ b/queue-6.1/arm-dts-am335x-bone-common-add-gpio-phy-reset-on-revision-c3-board.patch @@ -0,0 +1,59 @@ +From 623cef652768860bd5f205fb7b741be278585fba Mon Sep 17 00:00:00 2001 +From: Shengyu Qu <wiagn233@outlook.com> +Date: Sun, 6 Aug 2023 16:50:44 +0800 +Subject: ARM: dts: am335x-bone-common: Add GPIO PHY reset on revision C3 board + +From: Shengyu Qu <wiagn233@outlook.com> + +commit 623cef652768860bd5f205fb7b741be278585fba upstream. + +This patch adds ethernet PHY reset GPIO config for Beaglebone Black +series boards with revision C3. This fixes a random phy startup failure +bug discussed at [1]. The GPIO pin used for reset is not used on older +revisions, so it is ok to apply to all board revisions. The reset timing +was discussed and tested at [2]. + +[1] https://forum.digikey.com/t/ethernet-device-is-not-detecting-on-ubuntu-20-04-lts-on-bbg/19948 +[2] https://forum.beagleboard.org/t/recognizing-a-beaglebone-black-rev-c3-board/31249/ + +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> +Signed-off-by: Shengyu Qu <wiagn233@outlook.com> +Message-ID: <TY3P286MB26113797A3B2EC7E0348BBB2980FA@TY3P286MB2611.JPNP286.PROD.OUTLOOK.COM> +Signed-off-by: Tony Lindgren <tony@atomide.com> +Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/arm/boot/dts/am335x-bone-common.dtsi | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/arm/boot/dts/am335x-bone-common.dtsi ++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi +@@ -145,6 +145,8 @@ + /* MDIO */ + AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0) ++ /* Added to support GPIO controlled PHY reset */ ++ AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE7) + >; + }; + +@@ -153,6 +155,8 @@ + /* MDIO reset value */ + AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7) + AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7) ++ /* Added to support GPIO controlled PHY reset */ ++ AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7) + >; + }; + +@@ -377,6 +381,10 @@ + + ethphy0: ethernet-phy@0 { + reg = <0>; ++ /* Support GPIO reset on revision C3 boards */ ++ reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; ++ reset-assert-us = <300>; ++ reset-deassert-us = <6500>; + }; + }; + diff --git a/queue-6.1/arm-dts-am335x-bone-common-increase-mdio-reset-deassert-delay-to-50ms.patch b/queue-6.1/arm-dts-am335x-bone-common-increase-mdio-reset-deassert-delay-to-50ms.patch new file mode 100644 index 0000000000..7a1419a7c0 --- /dev/null +++ b/queue-6.1/arm-dts-am335x-bone-common-increase-mdio-reset-deassert-delay-to-50ms.patch @@ -0,0 +1,47 @@ +From 929d8490f8790164f5f63671c1c58d6c50411cb2 Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven <geert+renesas@glider.be> +Date: Thu, 31 Oct 2024 10:29:51 +0100 +Subject: ARM: dts: am335x-bone-common: Increase MDIO reset deassert delay to 50ms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Geert Uytterhoeven <geert+renesas@glider.be> + +commit 929d8490f8790164f5f63671c1c58d6c50411cb2 upstream. + +Commit b9bf5612610aa7e3 ("ARM: dts: am335x-bone-common: Increase MDIO +reset deassert time") already increased the MDIO reset deassert delay +from 6.5 to 13 ms, but this may still cause Ethernet PHY probe failures: + + SMSC LAN8710/LAN8720 4a101000.mdio:00: probe with driver SMSC LAN8710/LAN8720 failed with error -5 + +On BeagleBone Black Rev. C3, ETH_RESETn is controlled by an open-drain +AND gate. It is pulled high by a 10K resistor, and has a 4.7µF +capacitor to ground, giving an RC time constant of 47ms. As it takes +0.7RC to charge the capacitor above the threshold voltage of a CMOS +input (VDD/2), the delay should be at least 33ms. Considering the +typical tolerance of 20% on capacitors, 40ms would be safer. Add an +additional safety margin and settle for 50ms. + +Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> +Reviewed-by: Roger Quadros <rogerq@kernel.org> +Link: https://lore.kernel.org/r/9002a58daa1b2983f39815b748ee9d2f8dcc4829.1730366936.git.geert+renesas@glider.be +Signed-off-by: Kevin Hilman <khilman@baylibre.com> +Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/am335x-bone-common.dtsi ++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi +@@ -384,7 +384,7 @@ + /* Support GPIO reset on revision C3 boards */ + reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + reset-assert-us = <300>; +- reset-deassert-us = <13000>; ++ reset-deassert-us = <50000>; + }; + }; + diff --git a/queue-6.1/arm-dts-am335x-bone-common-increase-mdio-reset-deassert-time.patch b/queue-6.1/arm-dts-am335x-bone-common-increase-mdio-reset-deassert-time.patch new file mode 100644 index 0000000000..78a6b05f4c --- /dev/null +++ b/queue-6.1/arm-dts-am335x-bone-common-increase-mdio-reset-deassert-time.patch @@ -0,0 +1,40 @@ +From b9bf5612610aa7e38d58fee16f489814db251c01 Mon Sep 17 00:00:00 2001 +From: Colin Foster <colin.foster@in-advantage.com> +Date: Fri, 31 May 2024 13:38:17 -0500 +Subject: ARM: dts: am335x-bone-common: Increase MDIO reset deassert time + +From: Colin Foster <colin.foster@in-advantage.com> + +commit b9bf5612610aa7e38d58fee16f489814db251c01 upstream. + +Prior to commit df16c1c51d81 ("net: phy: mdio_device: Reset device only +when necessary") MDIO reset deasserts were performed twice during boot. +Now that the second deassert is no longer performed, device probe +failures happen due to the change in timing with the following error +message: + +SMSC LAN8710/LAN8720: probe of 4a101000.mdio:00 failed with error -5 + +Restore the original effective timing, which resolves the probe +failures. + +Signed-off-by: Colin Foster <colin.foster@in-advantage.com> +Link: https://lore.kernel.org/r/20240531183817.2698445-1-colin.foster@in-advantage.com +Signed-off-by: Kevin Hilman <khilman@baylibre.com> +Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/am335x-bone-common.dtsi ++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi +@@ -384,7 +384,7 @@ + /* Support GPIO reset on revision C3 boards */ + reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + reset-assert-us = <300>; +- reset-deassert-us = <6500>; ++ reset-deassert-us = <13000>; + }; + }; + diff --git a/queue-6.1/arm64-dts-imx8mm-drop-sd-vsel-gpios-from-i.mx8m-mini-verdin-som.patch b/queue-6.1/arm64-dts-imx8mm-drop-sd-vsel-gpios-from-i.mx8m-mini-verdin-som.patch new file mode 100644 index 0000000000..2146b1f164 --- /dev/null +++ b/queue-6.1/arm64-dts-imx8mm-drop-sd-vsel-gpios-from-i.mx8m-mini-verdin-som.patch @@ -0,0 +1,32 @@ +From 8bad8c923f217d238ba4f1a6d19d761e53bfbd26 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Wed, 18 Jan 2023 04:07:55 +0100 +Subject: arm64: dts: imx8mm: Drop sd-vsel-gpios from i.MX8M Mini Verdin SoM + +From: Marek Vasut <marex@denx.de> + +commit 8bad8c923f217d238ba4f1a6d19d761e53bfbd26 upstream. + +The VSELECT pin is configured as MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT +and not as a GPIO, drop the bogus sd-vsel-gpios property as the eSDHC +block handles the VSELECT pin on its own. + +Signed-off-by: Marek Vasut <marex@denx.de> +Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de> +Signed-off-by: Shawn Guo <shawnguo@kernel.org> +Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi ++++ b/arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi +@@ -372,7 +372,6 @@ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pmic>; + reg = <0x25>; +- sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + + /* + * The bootloader is expected to switch on the I2C level shifter for the TLA2024 ADC diff --git a/queue-6.1/arm64-dts-ti-k3-j721e-sk-add-dt-nodes-for-power-regulators.patch b/queue-6.1/arm64-dts-ti-k3-j721e-sk-add-dt-nodes-for-power-regulators.patch new file mode 100644 index 0000000000..1fb367816c --- /dev/null +++ b/queue-6.1/arm64-dts-ti-k3-j721e-sk-add-dt-nodes-for-power-regulators.patch @@ -0,0 +1,80 @@ +From 97b67cc102dc2cc8aa39a569c22a196e21af5a21 Mon Sep 17 00:00:00 2001 +From: Yemike Abhilash Chandra <y-abhilashchandra@ti.com> +Date: Tue, 15 Apr 2025 16:43:22 +0530 +Subject: arm64: dts: ti: k3-j721e-sk: Add DT nodes for power regulators + +From: Yemike Abhilash Chandra <y-abhilashchandra@ti.com> + +commit 97b67cc102dc2cc8aa39a569c22a196e21af5a21 upstream. + +Add device tree nodes for two power regulators on the J721E SK board. +vsys_5v0: A fixed regulator representing the 5V supply output from the +LM61460 and vdd_sd_dv: A GPIO-controlled TLV71033 regulator. + +J721E-SK schematics: https://www.ti.com/lit/zip/sprr438 + +Fixes: 1bfda92a3a36 ("arm64: dts: ti: Add support for J721E SK") +Cc: stable@vger.kernel.org +Signed-off-by: Yemike Abhilash Chandra <y-abhilashchandra@ti.com> +Reviewed-by: Udit Kumar <u-kumar1@ti.com> +Link: https://lore.kernel.org/r/20250415111328.3847502-2-y-abhilashchandra@ti.com +Signed-off-by: Nishanth Menon <nm@ti.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts ++++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts +@@ -175,6 +175,17 @@ + regulator-boot-on; + }; + ++ vsys_5v0: fixedregulator-vsys5v0 { ++ /* Output of LM61460 */ ++ compatible = "regulator-fixed"; ++ regulator-name = "vsys_5v0"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vusb_main>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ + vdd_mmc1: fixedregulator-sd { + compatible = "regulator-fixed"; + pinctrl-names = "default"; +@@ -202,6 +213,20 @@ + <3300000 0x1>; + }; + ++ vdd_sd_dv: gpio-regulator-TLV71033 { ++ compatible = "regulator-gpio"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&vdd_sd_dv_pins_default>; ++ regulator-name = "tlv71033"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-boot-on; ++ vin-supply = <&vsys_5v0>; ++ gpios = <&main_gpio0 118 GPIO_ACTIVE_HIGH>; ++ states = <1800000 0x0>, ++ <3300000 0x1>; ++ }; ++ + dp_pwr_3v3: fixedregulator-dp-prw { + compatible = "regulator-fixed"; + regulator-name = "dp-pwr"; +@@ -455,6 +480,12 @@ + >; + }; + ++ vdd_sd_dv_pins_default: vdd-sd-dv-default-pins { ++ pinctrl-single,pins = < ++ J721E_IOPAD(0x1dc, PIN_OUTPUT, 7) /* (Y1) SPI1_CLK.GPIO0_118 */ ++ >; ++ }; ++ + wkup_i2c0_pins_default: wkup-i2c0-pins-default { + pinctrl-single,pins = < + J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */ diff --git a/queue-6.1/platform-x86-ideapad-laptop-add-missing-ideapad-pro-5-fn-keys.patch b/queue-6.1/platform-x86-ideapad-laptop-add-missing-ideapad-pro-5-fn-keys.patch new file mode 100644 index 0000000000..ae7a0e279e --- /dev/null +++ b/queue-6.1/platform-x86-ideapad-laptop-add-missing-ideapad-pro-5-fn-keys.patch @@ -0,0 +1,38 @@ +From 36e66be874a7ea9d28fb9757629899a8449b8748 Mon Sep 17 00:00:00 2001 +From: Renato Caldas <renato@calgera.com> +Date: Sat, 2 Nov 2024 18:31:16 +0000 +Subject: platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys + +From: Renato Caldas <renato@calgera.com> + +commit 36e66be874a7ea9d28fb9757629899a8449b8748 upstream. + +The scancodes for the Mic Mute and Airplane keys on the Ideapad Pro 5 +(14AHP9 at least, probably the other variants too) are different and +were not being picked up by the driver. This adds them to the keymap. + +Apart from what is already supported, the remaining fn keys are +unfortunately producing windows-specific key-combos. + +Signed-off-by: Renato Caldas <renato@calgera.com> +Link: https://lore.kernel.org/r/20241102183116.30142-1-renato@calgera.com +Reviewed-by: Hans de Goede <hdegoede@redhat.com> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +Signed-off-by: WangYuli <wangyuli@uniontech.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/platform/x86/ideapad-laptop.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/platform/x86/ideapad-laptop.c ++++ b/drivers/platform/x86/ideapad-laptop.c +@@ -1191,6 +1191,9 @@ static const struct key_entry ideapad_ke + { KE_KEY, 0x27 | IDEAPAD_WMI_KEY, { KEY_HELP } }, + /* Refresh Rate Toggle */ + { KE_KEY, 0x0a | IDEAPAD_WMI_KEY, { KEY_DISPLAYTOGGLE } }, ++ /* Specific to some newer models */ ++ { KE_KEY, 0x3e | IDEAPAD_WMI_KEY, { KEY_MICMUTE } }, ++ { KE_KEY, 0x3f | IDEAPAD_WMI_KEY, { KEY_RFKILL } }, + + { KE_END }, + }; diff --git a/queue-6.1/series b/queue-6.1/series index 7d6432f529..6e4cdbd218 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -492,3 +492,9 @@ calipso-fix-null-ptr-deref-in-calipso_req_-set-del-a.patch net-atm-add-lec_mutex.patch net-atm-fix-proc-net-atm-lec-handling.patch dt-bindings-i2c-nvidia-tegra20-i2c-specify-the-required-properties.patch +platform-x86-ideapad-laptop-add-missing-ideapad-pro-5-fn-keys.patch +arm-dts-am335x-bone-common-add-gpio-phy-reset-on-revision-c3-board.patch +arm-dts-am335x-bone-common-increase-mdio-reset-deassert-time.patch +arm-dts-am335x-bone-common-increase-mdio-reset-deassert-delay-to-50ms.patch +arm64-dts-ti-k3-j721e-sk-add-dt-nodes-for-power-regulators.patch +arm64-dts-imx8mm-drop-sd-vsel-gpios-from-i.mx8m-mini-verdin-som.patch |