From 8fcb99926c37e3d81b2ec06cb8ac773e55231c90 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 31 Dec 2022 14:28:56 +0100 Subject: linux-toradex-mainline: move to 6.2-rc1 Set the fixed hash to 6.2-rc1 and remove the patches now in upstream. Signed-off-by: Max Krummenacher --- ...-dts-colibri-imx6-usb-dual-role-switching.patch | 61 ---- ...colibri-imx6ull-keep-peripherals-disabled.patch | 70 ---- ...ibri-imx6-move-vbus-supply-to-module-leve.patch | 92 ------ ...olibri-imx6ull-enable-default-peripherals.patch | 359 --------------------- ...ibri-imx6-specify-usbh_pen-gpio-being-act.patch | 37 --- recipes-kernel/linux/linux-toradex-mainline_git.bb | 9 +- 6 files changed, 2 insertions(+), 626 deletions(-) delete mode 100644 recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6-usb-dual-role-switching.patch delete mode 100644 recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6ull-keep-peripherals-disabled.patch delete mode 100644 recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6-move-vbus-supply-to-module-leve.patch delete mode 100644 recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6ull-enable-default-peripherals.patch delete mode 100644 recipes-kernel/linux/linux-toradex-mainline-git/0003-arm-dts-colibri-imx6-specify-usbh_pen-gpio-being-act.patch (limited to 'recipes-kernel/linux') diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6-usb-dual-role-switching.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6-usb-dual-role-switching.patch deleted file mode 100644 index 15a5bec..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6-usb-dual-role-switching.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 03c2e411827777a8c64b55ad9ee35d69e17c84ca Mon Sep 17 00:00:00 2001 -From: Philippe Schenker -Date: Fri, 8 Jul 2022 14:03:32 +0200 -Subject: [PATCH v1 1/4] arm: dts: colibri-imx6: usb dual-role switching - -Introduce USBC_DET GPIO based USB dual-role aka device/host switching. - -While at it re-work pinmux comment adding SODIMM number to the USBC_DET -entry. - -Signed-off-by: Philippe Schenker -Signed-off-by: Marcel Ziswiler -Upstream-status: Submitted [https://lore.kernel.org/all/20220920092227.286306-1-marcel@ziswiler.com/] ---- - - arch/arm/boot/dts/imx6qdl-colibri.dtsi | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -index 023e76215064..3e98b5da0cc6 100644 ---- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -@@ -24,6 +24,13 @@ backlight: backlight { - status = "disabled"; - }; - -+ extcon_usbc_det: usbc-det { -+ compatible = "linux,extcon-usb-gpio"; -+ id-gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; /* SODIMM 137 / USBC_DET */ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usbc_det>; -+ }; -+ - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; -@@ -670,9 +677,11 @@ &uart3 { - status = "disabled"; - }; - -+/* Colibri USBC */ - &usbotg { - disable-over-current; -- dr_mode = "peripheral"; -+ dr_mode = "otg"; -+ extcon = <0>, <&extcon_usbc_det>; - status = "disabled"; - }; - -@@ -1055,7 +1064,7 @@ MX6QDL_PAD_SD4_CMD__UART3_RX_DATA 0x1b0b1 - - pinctrl_usbc_det: usbcdetgrp { - fsl,pins = < -- /* USBC_DET */ -+ /* SODIMM 137 / USBC_DET */ - MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0 - /* USBC_DET_OVERWRITE */ - MX6QDL_PAD_RGMII_RXC__GPIO6_IO30 0x0f058 --- -2.36.1 - diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6ull-keep-peripherals-disabled.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6ull-keep-peripherals-disabled.patch deleted file mode 100644 index 409b768..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-git/0001-arm-dts-colibri-imx6ull-keep-peripherals-disabled.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f1f97a6ad5ecf8bae7e84bee4641f0d91dc9d074 Mon Sep 17 00:00:00 2001 -From: Philippe Schenker -Date: Tue, 4 Oct 2022 16:29:34 +0200 -Subject: [PATCH 1/4] arm: dts: colibri-imx6ull: keep peripherals disabled - -Toradex does provide device-tree overlays to enable certain evaluation -hardware. Keep the buses disabled by default to be enabled again with -overlays. - -For customers including this device-tree this has also the advantage -that the hardware we want by default running does not automatically -enable signals on their end. - -Upstream-Status: Submitted [https://lore.kernel.org/all/20221005133929.1243443-1-dev@pschenker.ch/] -Signed-off-by: Philippe Schenker ---- - - arch/arm/boot/dts/imx6ull-colibri.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi -index 577a424b0e1d..a4429ba1f2ae 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri.dtsi -+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi -@@ -21,7 +21,7 @@ backlight: backlight { - pinctrl-0 = <&pinctrl_gpio_bl_on>; - power-supply = <®_3v3>; - pwms = <&pwm4 0 5000000 1>; -- status = "okay"; -+ status = "disabled"; - }; - - gpio-keys { -@@ -42,7 +42,7 @@ panel_dpi: panel-dpi { - compatible = "edt,et057090dhu"; - backlight = <&backlight>; - power-supply = <®_3v3>; -- status = "okay"; -+ status = "disabled"; - - port { - lcd_panel_in: endpoint { -@@ -159,7 +159,7 @@ &i2c1 { - pinctrl-1 = <&pinctrl_i2c1_gpio>; - sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; -- status = "okay"; -+ status = "disabled"; - - /* Atmel maxtouch controller */ - atmel_mxt_ts: touchscreen@4a { -@@ -202,6 +202,7 @@ ad7879_ts: touchscreen@2c { - adi,median-filter-size = /bits/ 8 <2>; - adi,averaging = /bits/ 8 <1>; - adi,conversion-interval = /bits/ 8 <255>; -+ status = "disabled"; - }; - }; - -@@ -209,6 +210,7 @@ &lcdif { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcdif_dat - &pinctrl_lcdif_ctrl>; -+ status = "disabled"; - - port { - lcdif_out: endpoint { --- -2.37.3 - diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6-move-vbus-supply-to-module-leve.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6-move-vbus-supply-to-module-leve.patch deleted file mode 100644 index 2684c80..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6-move-vbus-supply-to-module-leve.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 63e858052e78bae522f9cc674a863aa5781133a3 Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler -Date: Mon, 19 Sep 2022 12:40:24 +0200 -Subject: [PATCH v1 2/4] arm: dts: colibri-imx6: move vbus-supply to module - level device tree - -Move USB VBUS supply from single carrier board to module level device -tree. This pin is as per Colibri module family standard. - -Signed-off-by: Marcel Ziswiler -Upstream-status: Submitted [https://lore.kernel.org/all/20220920092227.286306-1-marcel@ziswiler.com/] ---- - - arch/arm/boot/dts/imx6dl-colibri-aster.dts | 1 - - arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 1 - - arch/arm/boot/dts/imx6dl-colibri-iris.dts | 1 - - arch/arm/boot/dts/imx6qdl-colibri.dtsi | 9 +++++++-- - 4 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts -index 74e8a6cd8bed..a28e083f29d5 100644 ---- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts -+++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts -@@ -99,7 +99,6 @@ &uart3 { - }; - - &usbh1 { -- vbus-supply = <®_usb_host_vbus>; - status = "okay"; - }; - -diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts -index 7272edd85a49..a02981d4a3fc 100644 ---- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts -+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts -@@ -111,7 +111,6 @@ &uart3 { - }; - - &usbh1 { -- vbus-supply = <®_usb_host_vbus>; - status = "okay"; - }; - -diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris.dts b/arch/arm/boot/dts/imx6dl-colibri-iris.dts -index cf77d894f6d7..c5797ff35b71 100644 ---- a/arch/arm/boot/dts/imx6dl-colibri-iris.dts -+++ b/arch/arm/boot/dts/imx6dl-colibri-iris.dts -@@ -138,7 +138,6 @@ &uart3 { - }; - - &usbh1 { -- vbus-supply = <®_usb_host_vbus>; - status = "okay"; - }; - -diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -index 3e98b5da0cc6..21c5049bda4e 100644 ---- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -@@ -112,7 +112,7 @@ reg_module_3v3_audio: regulator-module-3v3-audio { - - reg_usb_host_vbus: regulator-usb-host-vbus { - compatible = "regulator-fixed"; -- gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; /* USBH_PEN */ -+ gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; /* SODIMM 129 / USBH_PEN */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_regulator_usbh_pwr>; - regulator-max-microvolt = <5000000>; -@@ -677,6 +677,11 @@ &uart3 { - status = "disabled"; - }; - -+/* Colibri USBH */ -+&usbh1 { -+ vbus-supply = <®_usb_host_vbus>; -+}; -+ - /* Colibri USBC */ - &usbotg { - disable-over-current; -@@ -995,7 +1000,7 @@ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1 - - pinctrl_regulator_usbh_pwr: gpioregusbhpwrgrp { - fsl,pins = < -- /* USBH_EN */ -+ /* SODIMM 129 / USBH_PEN */ - MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x0f058 - >; - }; --- -2.36.1 - diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6ull-enable-default-peripherals.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6ull-enable-default-peripherals.patch deleted file mode 100644 index dda0d03..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-git/0002-arm-dts-colibri-imx6ull-enable-default-peripherals.patch +++ /dev/null @@ -1,359 +0,0 @@ -From 6bc6d39f79b3e2a0cfaf3eb9e6abf432cc09666e Mon Sep 17 00:00:00 2001 -From: Philippe Schenker -Date: Mon, 3 Oct 2022 18:07:37 +0200 -Subject: [PATCH 2/4] arm: dts: colibri-imx6ull: enable default peripherals - -For NAND modules Toradex does not provide any device-tree overlays. But -we always had a default display output enabled on NAND modules as well -as touchscreens that are placed on displays which can easily be plugged -into those carrier boards. Do reenable these displays and touchscreen -output on all device-trees that are used on NAND modules. - -Upstream-Status: Submitted [https://lore.kernel.org/all/20221005133929.1243443-2-dev@pschenker.ch/] -Signed-off-by: Philippe Schenker ---- - - arch/arm/boot/dts/imx6ull-colibri-aster.dts | 40 +++++++++++++++++++ - arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 24 +++++++++++ - arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts | 40 +++++++++++++++++++ - arch/arm/boot/dts/imx6ull-colibri-iris.dts | 22 +++++++++- - .../boot/dts/imx6ull-colibri-wifi-aster.dts | 40 +++++++++++++++++++ - .../boot/dts/imx6ull-colibri-wifi-eval-v3.dts | 24 +++++++++++ - .../boot/dts/imx6ull-colibri-wifi-iris-v2.dts | 24 +++++++++++ - .../boot/dts/imx6ull-colibri-wifi-iris.dts | 20 ++++++++++ - 8 files changed, 233 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dts b/arch/arm/boot/dts/imx6ull-colibri-aster.dts -index d3f2fb7c6c1e..3e0897c3a296 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-aster.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dts -@@ -15,6 +15,46 @@ / { - "fsl,imx6ull"; - }; - -+&ad7879_ts { -+ status = "okay"; -+}; -+ - &atmel_mxt_ts { - status = "okay"; - }; -+ -+&backlight { -+ status = "okay"; -+}; -+ -+&i2c1 { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; -+ -+&pwm4 { -+ status = "okay"; -+}; -+ -+/* PWM */ -+&pwm5 { -+ /* Pin already used by atmel_mxt_ts touchscreen */ -+ status = "disabled"; -+}; -+ -+/* PWM */ -+&pwm6 { -+ /* Pin already used by atmel_mxt_ts touchscreen */ -+ status = "disabled"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts -index 9bf7111d7b00..d6da984e518d 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts -@@ -12,3 +12,27 @@ / { - model = "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board V3"; - compatible = "toradex,colibri-imx6ull-eval", "fsl,imx6ull"; - }; -+ -+&ad7879_ts { -+ status = "okay"; -+}; -+ -+&backlight { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; -+ -+&pwm4 { -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts -index afc1e0119783..fac7428685b4 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts -@@ -15,10 +15,18 @@ / { - "fsl,imx6ull"; - }; - -+&ad7879_ts { -+ status = "okay"; -+}; -+ - &atmel_mxt_ts { - status = "okay"; - }; - -+&backlight { -+ status = "okay"; -+}; -+ - &gpio1 { - /* This turns the LVDS transceiver on */ - lvds-power-on { -@@ -63,3 +71,35 @@ lvds-color-map { - output-low; - }; - }; -+ -+&i2c1 { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; -+ -+&pwm4 { -+ status = "okay"; -+}; -+ -+/* PWM */ -+&pwm5 { -+ /* Pin already used by atmel_mxt_ts touchscreen */ -+ status = "disabled"; -+}; -+ -+/* PWM */ -+&pwm6 { -+ /* Pin already used by atmel_mxt_ts touchscreen */ -+ status = "disabled"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dts b/arch/arm/boot/dts/imx6ull-colibri-iris.dts -index 4fb97b0fe30b..2a0d0fc3b9d6 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-iris.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dts -@@ -15,6 +15,26 @@ / { - "fsl,imx6ull"; - }; - --&atmel_mxt_ts { -+&ad7879_ts { -+ status = "okay"; -+}; -+ -+&backlight { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; -+ -+&pwm4 { - status = "okay"; - }; -diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts -index b4f65e8c5857..c7da5b41966f 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts -@@ -15,6 +15,46 @@ / { - "fsl,imx6ull"; - }; - -+&ad7879_ts { -+ status = "okay"; -+}; -+ - &atmel_mxt_ts { - status = "okay"; - }; -+ -+&backlight { -+ status = "okay"; -+}; -+ -+&i2c1 { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; -+ -+&pwm4 { -+ status = "okay"; -+}; -+ -+/* PWM */ -+&pwm5 { -+ /* Pin already used by atmel_mxt_ts touchscreen */ -+ status = "disabled"; -+}; -+ -+/* PWM */ -+&pwm6 { -+ /* Pin already used by atmel_mxt_ts touchscreen */ -+ status = "disabled"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts -index 1d64d1a5d8a7..917f5dbe64ba 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts -@@ -12,3 +12,27 @@ / { - model = "Toradex Colibri iMX6ULL 512MB on Colibri Evaluation Board V3"; - compatible = "toradex,colibri-imx6ull-wifi-eval", "fsl,imx6ull"; - }; -+ -+&ad7879_ts { -+ status = "okay"; -+}; -+ -+&backlight { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; -+ -+&pwm4 { -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts -index ce02f8a9ddd3..ed89d07beae5 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts -@@ -15,10 +15,18 @@ / { - "fsl,imx6ull"; - }; - -+&ad7879_ts { -+ status = "okay"; -+}; -+ - &atmel_mxt_ts { - status = "okay"; - }; - -+&backlight { -+ status = "okay"; -+}; -+ - &gpio1 { - /* This turns the LVDS transceiver on */ - lvds-power-on { -@@ -63,3 +71,19 @@ lvds-color-map { - output-low; - }; - }; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; -+ -+&pwm4 { -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts -index 5ac1aa298ce7..e63253254754 100644 ---- a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts -+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts -@@ -15,6 +15,26 @@ / { - "fsl,imx6ull"; - }; - -+&ad7879_ts { -+ status = "okay"; -+}; -+ - &atmel_mxt_ts { - status = "okay"; - }; -+ -+&backlight { -+ status = "okay"; -+}; -+ -+&i2c2 { -+ status = "okay"; -+}; -+ -+&lcdif { -+ status = "okay"; -+}; -+ -+&panel_dpi { -+ status = "okay"; -+}; --- -2.37.3 - diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0003-arm-dts-colibri-imx6-specify-usbh_pen-gpio-being-act.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0003-arm-dts-colibri-imx6-specify-usbh_pen-gpio-being-act.patch deleted file mode 100644 index 63a8c26..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-git/0003-arm-dts-colibri-imx6-specify-usbh_pen-gpio-being-act.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 60f86ce9192274e08c176da024650b8a3233b6b7 Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler -Date: Mon, 19 Sep 2022 12:43:25 +0200 -Subject: [PATCH v1 3/4] arm: dts: colibri-imx6: specify usbh_pen gpio being - active-low - -Specify USBH_PEN GPIO being active-low rather than active-high. - -Note that this should not have any functional impact as for fixed -regulators the regular GPIO polarity is ignored and a true active-high -enable GPIO would need an additional enable-active-high property which -is/was not the case here. However, this may be rather confusing which -this patch fixes. - -Signed-off-by: Marcel Ziswiler -Upstream-status: Submitted [https://lore.kernel.org/all/20220920092227.286306-1-marcel@ziswiler.com/] ---- - - arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -index 21c5049bda4e..d8f985f297e4 100644 ---- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -@@ -112,7 +112,7 @@ reg_module_3v3_audio: regulator-module-3v3-audio { - - reg_usb_host_vbus: regulator-usb-host-vbus { - compatible = "regulator-fixed"; -- gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; /* SODIMM 129 / USBH_PEN */ -+ gpio = <&gpio3 31 GPIO_ACTIVE_LOW>; /* SODIMM 129 / USBH_PEN */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_regulator_usbh_pwr>; - regulator-max-microvolt = <5000000>; --- -2.36.1 - diff --git a/recipes-kernel/linux/linux-toradex-mainline_git.bb b/recipes-kernel/linux/linux-toradex-mainline_git.bb index de01fb8..7180eef 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_git.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_git.bb @@ -28,18 +28,13 @@ SRC_URI = " \ SRC_URI:append = " \ file://0001-thermal-imx-Update-critical-temp-threshold.patch \ file://0001-Revert-drm-panel-simple-drop-use-of-data-mapping-pro.patch \ - file://0001-arm-dts-colibri-imx6-usb-dual-role-switching.patch \ - file://0002-arm-dts-colibri-imx6-move-vbus-supply-to-module-leve.patch \ - file://0003-arm-dts-colibri-imx6-specify-usbh_pen-gpio-being-act.patch \ - file://0001-arm-dts-colibri-imx6ull-keep-peripherals-disabled.patch \ - file://0002-arm-dts-colibri-imx6ull-enable-default-peripherals.patch \ file://0002-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch \ " -LINUX_VERSION ?= "6.1-rc" +LINUX_VERSION ?= "6.2-rc" KBRANCH = "master" KERNEL_VERSION_SANITY_SKIP = "1" -SRCREV_machine = "094226ad94f471a9f19e8f8e7140a09c2625abaa" +SRCREV_machine = "1b929c02afd37871d5afb9d498426f83432e71c2" SRCREV_machine:use-head-next = "${AUTOREV}" S = "${WORKDIR}/git" -- cgit v1.2.3