From 4d3cf7f88465879f508a09190fdace13166b7455 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 1 Jul 2023 09:38:00 +0000 Subject: [PATCH] linux (Amlogic): update to 6.1.36 --- packages/linux/package.mk | 4 +-- ...v1-mmc-meson-gx-fix-deferred-probing.patch | 36 ------------------- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index e850dd62f4..71dc6b5136 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="316071de521e96bc0f7e928e3d20508891961fa4" # 6.1.28 - PKG_SHA256="3b5968c3603f19dfd4201c5f2ce60a98fb2294c1845f44826218006c86788923" + PKG_VERSION="7163dc197f14f1360506d97814fef17a51673293" # 6.1.36 + PKG_SHA256="18f6a5e57cb2ca021e500680784e757c9985a63f6301f2bea32ea5ebee8edaf0" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="default" diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch deleted file mode 100644 index f934783d1c..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch +++ /dev/null @@ -1,36 +0,0 @@ -From df65d487bb29ae0489c9794428ce57383471c6d7 Mon Sep 17 00:00:00 2001 -From: Sergey Shtylyov -Date: Fri, 24 Dec 2021 06:09:57 +0000 -Subject: [PATCH 050/120] FROMLIST(v1): mmc: meson-gx: fix deferred probing - -The driver overrides the error codes and IRQ0 returned by platform_get_irq() -to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe -permanently instead of the deferred probing. Switch to propagating the error -codes upstream. IRQ0 is no longer returned by platform_get_irq(), so we now -can safely ignore it... - -Fixes: cbcaac6d7dd2 ("mmc: meson-gx-mmc: Fix platform_get_irq's error checking") -Signed-off-by: Sergey Shtylyov -Reviewed-by: Martin Blumenstingl ---- - drivers/mmc/host/meson-gx-mmc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index a1051a853f91..ab504c938448 100644 ---- a/drivers/mmc/host/meson-gx-mmc.c -+++ b/drivers/mmc/host/meson-gx-mmc.c -@@ -1219,8 +1219,8 @@ static int meson_mmc_probe(struct platform_device *pdev) - } - - host->irq = platform_get_irq(pdev, 0); -- if (host->irq <= 0) { -- ret = -EINVAL; -+ if (host->irq < 0) { -+ ret = host->irq; - goto free_host; - } - --- -2.34.1 -