mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-03 16:07:51 +00:00
Merge pull request #6141 from heitbaum/kernel11
linux: update to 5.16.y
This commit is contained in:
commit
a85bb815e4
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="iwlwifi-firmware"
|
PKG_NAME="iwlwifi-firmware"
|
||||||
PKG_VERSION="97df2badf8a4308f5b55ae0cf4d6b3ebe2fa564d"
|
PKG_VERSION="fbe2571d45b43ae84abd4841ef50735b59a287c9"
|
||||||
PKG_SHA256="a14dad55a00aff022d4792d03dc904b929c4d32d07860f4db69d400c70ab5d46"
|
PKG_SHA256="f2ff60e3b9309292c74c72154a1da4c3c94bbeaea0cc595fd33edc74e5845be4"
|
||||||
PKG_LICENSE="Free-to-use"
|
PKG_LICENSE="Free-to-use"
|
||||||
PKG_SITE="https://github.com/LibreELEC/iwlwifi-firmware"
|
PKG_SITE="https://github.com/LibreELEC/iwlwifi-firmware"
|
||||||
PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/${PKG_VERSION}.tar.gz"
|
PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/${PKG_VERSION}.tar.gz"
|
||||||
|
@ -28,8 +28,8 @@ case "${LINUX}" in
|
|||||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="5.16"
|
PKG_VERSION="5.16.5"
|
||||||
PKG_SHA256="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb"
|
PKG_SHA256="ecaeedd9d289934f97c572aa965b6959d4d47f9789220e4fc3fbb525d8f1c7ab"
|
||||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||||
PKG_PATCH_DIRS="default"
|
PKG_PATCH_DIRS="default"
|
||||||
;;
|
;;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 5.16.0-rc8 Kernel Configuration
|
# Linux/arm64 5.16.2 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.3-2021.07 (arm-10.29)) 10.3.1 20210621"
|
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.3-2021.07 (arm-10.29)) 10.3.1 20210621"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@ -59,7 +59,6 @@ CONFIG_GENERIC_IRQ_IPI=y
|
|||||||
CONFIG_GENERIC_MSI_IRQ=y
|
CONFIG_GENERIC_MSI_IRQ=y
|
||||||
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
||||||
CONFIG_IRQ_MSI_IOMMU=y
|
CONFIG_IRQ_MSI_IOMMU=y
|
||||||
CONFIG_HANDLE_DOMAIN_IRQ=y
|
|
||||||
CONFIG_IRQ_FORCED_THREADING=y
|
CONFIG_IRQ_FORCED_THREADING=y
|
||||||
CONFIG_SPARSE_IRQ=y
|
CONFIG_SPARSE_IRQ=y
|
||||||
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
|
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
|
||||||
@ -159,8 +158,6 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
|
|||||||
CONFIG_CC_HAS_INT128=y
|
CONFIG_CC_HAS_INT128=y
|
||||||
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
|
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
|
||||||
CONFIG_ARCH_SUPPORTS_INT128=y
|
CONFIG_ARCH_SUPPORTS_INT128=y
|
||||||
CONFIG_NUMA_BALANCING=y
|
|
||||||
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
|
|
||||||
CONFIG_CGROUPS=y
|
CONFIG_CGROUPS=y
|
||||||
CONFIG_PAGE_COUNTER=y
|
CONFIG_PAGE_COUNTER=y
|
||||||
CONFIG_MEMCG=y
|
CONFIG_MEMCG=y
|
||||||
@ -221,7 +218,7 @@ CONFIG_EXPERT=y
|
|||||||
CONFIG_UID16=y
|
CONFIG_UID16=y
|
||||||
CONFIG_MULTIUSER=y
|
CONFIG_MULTIUSER=y
|
||||||
# CONFIG_SGETMASK_SYSCALL is not set
|
# CONFIG_SGETMASK_SYSCALL is not set
|
||||||
CONFIG_SYSFS_SYSCALL=y
|
# CONFIG_SYSFS_SYSCALL is not set
|
||||||
CONFIG_FHANDLE=y
|
CONFIG_FHANDLE=y
|
||||||
CONFIG_POSIX_TIMERS=y
|
CONFIG_POSIX_TIMERS=y
|
||||||
CONFIG_PRINTK=y
|
CONFIG_PRINTK=y
|
||||||
@ -372,7 +369,6 @@ CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
|
|||||||
# CONFIG_ARM64_ERRATUM_2054223 is not set
|
# CONFIG_ARM64_ERRATUM_2054223 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_23144 is not set
|
|
||||||
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_30115 is not set
|
# CONFIG_CAVIUM_ERRATUM_30115 is not set
|
||||||
@ -400,14 +396,9 @@ CONFIG_CPU_LITTLE_ENDIAN=y
|
|||||||
CONFIG_SCHED_MC=y
|
CONFIG_SCHED_MC=y
|
||||||
# CONFIG_SCHED_CLUSTER is not set
|
# CONFIG_SCHED_CLUSTER is not set
|
||||||
# CONFIG_SCHED_SMT is not set
|
# CONFIG_SCHED_SMT is not set
|
||||||
CONFIG_NR_CPUS=64
|
CONFIG_NR_CPUS=8
|
||||||
CONFIG_HOTPLUG_CPU=y
|
CONFIG_HOTPLUG_CPU=y
|
||||||
CONFIG_NUMA=y
|
# CONFIG_NUMA is not set
|
||||||
CONFIG_NODES_SHIFT=2
|
|
||||||
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
|
|
||||||
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
|
|
||||||
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
|
|
||||||
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
|
|
||||||
# CONFIG_HZ_100 is not set
|
# CONFIG_HZ_100 is not set
|
||||||
CONFIG_HZ_250=y
|
CONFIG_HZ_250=y
|
||||||
# CONFIG_HZ_300 is not set
|
# CONFIG_HZ_300 is not set
|
||||||
@ -549,7 +540,8 @@ CONFIG_DT_IDLE_STATES=y
|
|||||||
# ARM CPU Idle Drivers
|
# ARM CPU Idle Drivers
|
||||||
#
|
#
|
||||||
CONFIG_ARM_CPUIDLE=y
|
CONFIG_ARM_CPUIDLE=y
|
||||||
# CONFIG_ARM_PSCI_CPUIDLE is not set
|
CONFIG_ARM_PSCI_CPUIDLE=y
|
||||||
|
CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
|
||||||
# end of ARM CPU Idle Drivers
|
# end of ARM CPU Idle Drivers
|
||||||
# end of CPU Idle
|
# end of CPU Idle
|
||||||
|
|
||||||
@ -694,7 +686,6 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
|
|||||||
# CONFIG_LOCK_EVENT_COUNTS is not set
|
# CONFIG_LOCK_EVENT_COUNTS is not set
|
||||||
CONFIG_ARCH_HAS_RELR=y
|
CONFIG_ARCH_HAS_RELR=y
|
||||||
CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
|
CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
|
||||||
CONFIG_HAVE_ARCH_PFN_VALID=y
|
|
||||||
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
|
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1447,7 +1438,6 @@ CONFIG_REGMAP_IRQ=y
|
|||||||
CONFIG_DMA_SHARED_BUFFER=y
|
CONFIG_DMA_SHARED_BUFFER=y
|
||||||
# CONFIG_DMA_FENCE_TRACE is not set
|
# CONFIG_DMA_FENCE_TRACE is not set
|
||||||
CONFIG_GENERIC_ARCH_TOPOLOGY=y
|
CONFIG_GENERIC_ARCH_TOPOLOGY=y
|
||||||
CONFIG_GENERIC_ARCH_NUMA=y
|
|
||||||
# end of Generic Driver Options
|
# end of Generic Driver Options
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1455,7 +1445,6 @@ CONFIG_GENERIC_ARCH_NUMA=y
|
|||||||
#
|
#
|
||||||
CONFIG_BRCMSTB_GISB_ARB=y
|
CONFIG_BRCMSTB_GISB_ARB=y
|
||||||
# CONFIG_MOXTET is not set
|
# CONFIG_MOXTET is not set
|
||||||
CONFIG_SIMPLE_PM_BUS=y
|
|
||||||
CONFIG_SUN50I_DE2_BUS=y
|
CONFIG_SUN50I_DE2_BUS=y
|
||||||
CONFIG_SUNXI_RSB=y
|
CONFIG_SUNXI_RSB=y
|
||||||
CONFIG_VEXPRESS_CONFIG=y
|
CONFIG_VEXPRESS_CONFIG=y
|
||||||
@ -1605,7 +1594,6 @@ CONFIG_OF_IRQ=y
|
|||||||
CONFIG_OF_RESERVED_MEM=y
|
CONFIG_OF_RESERVED_MEM=y
|
||||||
CONFIG_OF_RESOLVE=y
|
CONFIG_OF_RESOLVE=y
|
||||||
CONFIG_OF_OVERLAY=y
|
CONFIG_OF_OVERLAY=y
|
||||||
CONFIG_OF_NUMA=y
|
|
||||||
# CONFIG_PARPORT is not set
|
# CONFIG_PARPORT is not set
|
||||||
CONFIG_BLK_DEV=y
|
CONFIG_BLK_DEV=y
|
||||||
# CONFIG_BLK_DEV_NULL_BLK is not set
|
# CONFIG_BLK_DEV_NULL_BLK is not set
|
||||||
@ -6341,7 +6329,6 @@ CONFIG_CRYPTO_NULL2=y
|
|||||||
CONFIG_CRYPTO_CRYPTD=y
|
CONFIG_CRYPTO_CRYPTD=y
|
||||||
CONFIG_CRYPTO_AUTHENC=y
|
CONFIG_CRYPTO_AUTHENC=y
|
||||||
# CONFIG_CRYPTO_TEST is not set
|
# CONFIG_CRYPTO_TEST is not set
|
||||||
CONFIG_CRYPTO_SIMD=y
|
|
||||||
CONFIG_CRYPTO_ENGINE=y
|
CONFIG_CRYPTO_ENGINE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm 5.16.0-rc8 Kernel Configuration
|
# Linux/arm 5.16.5 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.3.0 (GCC) 10.3.0"
|
CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.3.0 (GCC) 10.3.0"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@ -66,7 +66,6 @@ CONFIG_IRQ_DOMAIN=y
|
|||||||
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
||||||
CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
|
CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
|
||||||
CONFIG_GENERIC_IRQ_IPI=y
|
CONFIG_GENERIC_IRQ_IPI=y
|
||||||
CONFIG_HANDLE_DOMAIN_IRQ=y
|
|
||||||
CONFIG_IRQ_FORCED_THREADING=y
|
CONFIG_IRQ_FORCED_THREADING=y
|
||||||
CONFIG_SPARSE_IRQ=y
|
CONFIG_SPARSE_IRQ=y
|
||||||
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
|
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
|
||||||
@ -4817,6 +4816,7 @@ CONFIG_R8188EU=m
|
|||||||
# end of IIO staging drivers
|
# end of IIO staging drivers
|
||||||
|
|
||||||
CONFIG_STAGING_MEDIA=y
|
CONFIG_STAGING_MEDIA=y
|
||||||
|
# CONFIG_VIDEO_HANTRO is not set
|
||||||
CONFIG_VIDEO_SUNXI=y
|
CONFIG_VIDEO_SUNXI=y
|
||||||
CONFIG_VIDEO_SUNXI_CEDRUS=y
|
CONFIG_VIDEO_SUNXI_CEDRUS=y
|
||||||
|
|
||||||
|
@ -0,0 +1,28 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vyacheslav Bocharov <adeep@lexina.in>
|
||||||
|
Subject: [PATCH v3 2/2] Bluetooth: hci_h5: Add power reset via gpio in h5_btrtl_open
|
||||||
|
Date: Wed, 27 Oct 2021 12:14:16 +0300
|
||||||
|
|
||||||
|
Add power reset via enable-gpios in h5_btrtl_open function.
|
||||||
|
|
||||||
|
Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
|
||||||
|
---
|
||||||
|
drivers/bluetooth/hci_h5.c | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
|
||||||
|
index 34286ffe0568..fdf504b0d265 100644
|
||||||
|
--- a/drivers/bluetooth/hci_h5.c
|
||||||
|
+++ b/drivers/bluetooth/hci_h5.c
|
||||||
|
@@ -966,6 +966,11 @@ static void h5_btrtl_open(struct h5 *h5)
|
||||||
|
pm_runtime_enable(&h5->hu->serdev->dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* The controller needs reset to startup */
|
||||||
|
+ gpiod_set_value_cansleep(h5->enable_gpio, 0);
|
||||||
|
+ gpiod_set_value_cansleep(h5->device_wake_gpio, 0);
|
||||||
|
+ msleep(100);
|
||||||
|
+
|
||||||
|
/* The controller needs up to 500ms to wakeup */
|
||||||
|
gpiod_set_value_cansleep(h5->enable_gpio, 1);
|
||||||
|
gpiod_set_value_cansleep(h5->device_wake_gpio, 1);
|
@ -1,39 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
||||||
Date: Mon, 29 Nov 2021 18:31:35 +0100
|
|
||||||
Subject: [PATCH] media: hantro: Fix probe func error path
|
|
||||||
|
|
||||||
If clocks for some reason couldn't be enabled, probe function returns
|
|
||||||
immediately, without disabling PM. This obviously leaves PM ref counters
|
|
||||||
unbalanced.
|
|
||||||
|
|
||||||
Fix that by jumping to appropriate error path, so effects of PM functions
|
|
||||||
are reversed.
|
|
||||||
|
|
||||||
Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver")
|
|
||||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/staging/media/hantro/hantro_drv.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
|
|
||||||
index ab2467998d29..3d3107a39dae 100644
|
|
||||||
--- a/drivers/staging/media/hantro/hantro_drv.c
|
|
||||||
+++ b/drivers/staging/media/hantro/hantro_drv.c
|
|
||||||
@@ -981,7 +981,7 @@ static int hantro_probe(struct platform_device *pdev)
|
|
||||||
ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks);
|
|
||||||
if (ret) {
|
|
||||||
dev_err(&pdev->dev, "Failed to prepare clocks\n");
|
|
||||||
- return ret;
|
|
||||||
+ goto err_pm_disable;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev);
|
|
||||||
@@ -1037,6 +1037,7 @@ static int hantro_probe(struct platform_device *pdev)
|
|
||||||
v4l2_device_unregister(&vpu->v4l2_dev);
|
|
||||||
err_clk_unprepare:
|
|
||||||
clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
|
|
||||||
+err_pm_disable:
|
|
||||||
pm_runtime_dont_use_autosuspend(vpu->dev);
|
|
||||||
pm_runtime_disable(vpu->dev);
|
|
||||||
return ret;
|
|
@ -1,39 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
||||||
Date: Mon, 29 Nov 2021 18:31:35 +0100
|
|
||||||
Subject: [PATCH] media: hantro: Fix probe func error path
|
|
||||||
|
|
||||||
If clocks for some reason couldn't be enabled, probe function returns
|
|
||||||
immediately, without disabling PM. This obviously leaves PM ref counters
|
|
||||||
unbalanced.
|
|
||||||
|
|
||||||
Fix that by jumping to appropriate error path, so effects of PM functions
|
|
||||||
are reversed.
|
|
||||||
|
|
||||||
Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver")
|
|
||||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/staging/media/hantro/hantro_drv.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
|
|
||||||
index ab2467998d29..3d3107a39dae 100644
|
|
||||||
--- a/drivers/staging/media/hantro/hantro_drv.c
|
|
||||||
+++ b/drivers/staging/media/hantro/hantro_drv.c
|
|
||||||
@@ -981,7 +981,7 @@ static int hantro_probe(struct platform_device *pdev)
|
|
||||||
ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks);
|
|
||||||
if (ret) {
|
|
||||||
dev_err(&pdev->dev, "Failed to prepare clocks\n");
|
|
||||||
- return ret;
|
|
||||||
+ goto err_pm_disable;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev);
|
|
||||||
@@ -1037,6 +1037,7 @@ static int hantro_probe(struct platform_device *pdev)
|
|
||||||
v4l2_device_unregister(&vpu->v4l2_dev);
|
|
||||||
err_clk_unprepare:
|
|
||||||
clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
|
|
||||||
+err_pm_disable:
|
|
||||||
pm_runtime_dont_use_autosuspend(vpu->dev);
|
|
||||||
pm_runtime_disable(vpu->dev);
|
|
||||||
return ret;
|
|
Loading…
x
Reference in New Issue
Block a user