diff options
| author | Joao Paulo Goncalves <joao.goncalves@toradex.com> | 2024-02-23 16:03:46 -0300 |
|---|---|---|
| committer | Joao Paulo Goncalves <joao.goncalves@toradex.com> | 2024-02-23 16:40:17 -0300 |
| commit | 81bd4aeea001b6d948d5ca1b381778224dba6a0e (patch) | |
| tree | 9db672c68c523a5752db414cffacbd158b3a9d92 | |
| parent | 3ddd2e1d975f405390e4a5a56d43b92dfc790e53 (diff) | |
linux-toradex-mainline: remove apalis-imx6 ixora can patch
Patch was applied to 6.1 stable kernel, remove it from the patches list
since it's not required anymore and to fix a build failure.
Recipe version is also updated to v6.1.79 that includes this patch.
Signed-off-by: Joao Paulo Goncalves <joao.goncalves@toradex.com>
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-mainline-git/0001-ARM-dts-imx6q-apalis-add-can-power-up-delay-on-ixora.patch | 39 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-mainline_git.bb | 5 |
2 files changed, 2 insertions, 42 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0001-ARM-dts-imx6q-apalis-add-can-power-up-delay-on-ixora.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0001-ARM-dts-imx6q-apalis-add-can-power-up-delay-on-ixora.patch deleted file mode 100644 index 36a1211..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-git/0001-ARM-dts-imx6q-apalis-add-can-power-up-delay-on-ixora.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3a600c255abd328c69559f3756eafc824777676b Mon Sep 17 00:00:00 2001 -From: Andrejs Cainikovs <andrejs.cainikovs@toradex.com> -Date: Thu, 19 Oct 2023 17:30:02 +0200 -Subject: [PATCH] ARM: dts: imx6q-apalis: add can power-up delay on ixora board - -Newer variants of Ixora boards require a power-up delay when powering up -the CAN transceiver of up to 1ms. - -Upstream-Status: Submitted [https://lore.kernel.org/all/20231020153022.57858-3-andrejs.cainikovs@gmail.com/] - -Cc: stable@vger.kernel.org -Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com> ---- - arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts -index 717decda0ceb..3ac7a4501620 100644 ---- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts -+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts -@@ -76,6 +76,7 @@ reg_can1_supply: regulator-can1-supply { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enable_can1_power>; - regulator-name = "can1_supply"; -+ startup-delay-us = <1000>; - }; - - reg_can2_supply: regulator-can2-supply { -@@ -85,6 +86,7 @@ reg_can2_supply: regulator-can2-supply { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enable_can2_power>; - regulator-name = "can2_supply"; -+ startup-delay-us = <1000>; - }; - }; - --- -2.34.1 - diff --git a/recipes-kernel/linux/linux-toradex-mainline_git.bb b/recipes-kernel/linux/linux-toradex-mainline_git.bb index 0dbbbcd..c8514c2 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_git.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_git.bb @@ -48,7 +48,6 @@ SRC_URI:append = " \ file://0002-power-reset-gpio-poweroff-use-sys-off-handler-API.patch \ file://0003-dt-bindings-power-reset-gpio-poweroff-Add-priority-p.patch \ file://0004-power-reset-gpio-poweroff-make-sys-handler-priority-.patch \ - file://0001-ARM-dts-imx6q-apalis-add-can-power-up-delay-on-ixora.patch \ file://0003-arm64-dts-freescale-verdin-imx8mp-add-support-to-mal.patch \ file://0003-arm64-dts-freescale-verdin-imx8mm-add-support-to-mal.patch \ file://0001-usb-gadget-f_ncm-Apply-workaround-for-packet-cloggin.patch \ @@ -56,10 +55,10 @@ SRC_URI:append = " \ file://0002-arm-dts-nxp-imx-Add-support-for-Apalis-Evaluation-Bo.patch \ " -LINUX_VERSION ?= "6.1.76" +LINUX_VERSION ?= "6.1.79" KBRANCH = "linux-6.1.y" KERNEL_VERSION_SANITY_SKIP = "1" -SRCREV_machine = "e5c3b988b827c76f52d0f62343e863b9133a0cd2" +SRCREV_machine = "81e1dc2f70014b9523dd02ca763788e4f81e5bac" SRCREV_machine:use-head-next = "${AUTOREV}" S = "${WORKDIR}/git" |