mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 15:37:49 +00:00
Merge pull request #5097 from HiassofT/le10-kernel-5.10.9+
linux (RPi): update to 5.10.13
This commit is contained in:
CvH
GitHub
commit
dc904cde28
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="051e5e1be85fa7119aebf20adf8e61b9fe37c459"
|
||||
PKG_SHA256="5818db4fd2e2e01eb520783da0db21965e8f6b542c34eeed393292edc3016228"
|
||||
PKG_VERSION="3523a7035fa9630799070091c077c610fafcc070"
|
||||
PKG_SHA256="46ba1a175824530613d6e6137a5341bd8ea5fb43ccf2cce1c0439f0313a95059"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
||||
@ -22,8 +22,8 @@ case "${LINUX}" in
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
raspberrypi)
|
||||
PKG_VERSION="3f9ab74a54cf02e4810027f71e897ce48303ebc7" # 5.10.9
|
||||
PKG_SHA256="01ddf05e7a24c6fcf01c1471430e8602de15d0d9ba8f36e307f1e028ce3618a0"
|
||||
PKG_VERSION="431ac1d21b5e842c5a564bc0bab31d7dc11611f5" # 5.10.13
|
||||
PKG_SHA256="f2b8a1e70f1031bc81d4e120d127d9c63e669033b5ee1589a33efd358e7fe4e3"
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 1f363deec843ed4e75aa11e466f91e9224376c04 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Tue, 5 Jan 2021 09:57:29 +0100
|
||||
Subject: [PATCH] media: rc: fix timeout handling after switch to microsecond
|
||||
durations
|
||||
|
||||
Commit 528222d853f92 ("media: rc: harmonize infrared durations to
|
||||
microseconds") missed to switch some timeout calculations from
|
||||
nanoseconds to microseconds. This resulted in spurious key_up+key_down
|
||||
events at the last scancode if the rc device uses a long timeout
|
||||
(eg 100ms on nuvoton-cir) as the device timeout wasn't properly
|
||||
accounted for in the keyup timeout calculation.
|
||||
|
||||
Fix this by applying the proper conversion functions.
|
||||
|
||||
Fixes: 528222d853f92 ("media: rc: harmonize infrared durations to microseconds")
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/ir-mce_kbd-decoder.c | 2 +-
|
||||
drivers/media/rc/rc-main.c | 4 ++--
|
||||
drivers/media/rc/serial_ir.c | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
index be8f2756a444..1524dc0fc566 100644
|
||||
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
@@ -320,7 +320,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||
data->body);
|
||||
spin_lock(&data->keylock);
|
||||
if (scancode) {
|
||||
- delay = nsecs_to_jiffies(dev->timeout) +
|
||||
+ delay = usecs_to_jiffies(dev->timeout) +
|
||||
msecs_to_jiffies(100);
|
||||
mod_timer(&data->rx_timeout, jiffies + delay);
|
||||
} else {
|
||||
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
|
||||
index 29d4d01896ff..1fd62c1dac76 100644
|
||||
--- a/drivers/media/rc/rc-main.c
|
||||
+++ b/drivers/media/rc/rc-main.c
|
||||
@@ -737,7 +737,7 @@ static unsigned int repeat_period(int protocol)
|
||||
void rc_repeat(struct rc_dev *dev)
|
||||
{
|
||||
unsigned long flags;
|
||||
- unsigned int timeout = nsecs_to_jiffies(dev->timeout) +
|
||||
+ unsigned int timeout = usecs_to_jiffies(dev->timeout) +
|
||||
msecs_to_jiffies(repeat_period(dev->last_protocol));
|
||||
struct lirc_scancode sc = {
|
||||
.scancode = dev->last_scancode, .rc_proto = dev->last_protocol,
|
||||
@@ -855,7 +855,7 @@ void rc_keydown(struct rc_dev *dev, enum rc_proto protocol, u64 scancode,
|
||||
ir_do_keydown(dev, protocol, scancode, keycode, toggle);
|
||||
|
||||
if (dev->keypressed) {
|
||||
- dev->keyup_jiffies = jiffies + nsecs_to_jiffies(dev->timeout) +
|
||||
+ dev->keyup_jiffies = jiffies + usecs_to_jiffies(dev->timeout) +
|
||||
msecs_to_jiffies(repeat_period(protocol));
|
||||
mod_timer(&dev->timer_keyup, dev->keyup_jiffies);
|
||||
}
|
||||
diff --git a/drivers/media/rc/serial_ir.c b/drivers/media/rc/serial_ir.c
|
||||
index 8cc28c92d05d..96ae0294ac10 100644
|
||||
--- a/drivers/media/rc/serial_ir.c
|
||||
+++ b/drivers/media/rc/serial_ir.c
|
||||
@@ -385,7 +385,7 @@ static irqreturn_t serial_ir_irq_handler(int i, void *blah)
|
||||
} while (!(sinp(UART_IIR) & UART_IIR_NO_INT)); /* still pending ? */
|
||||
|
||||
mod_timer(&serial_ir.timeout_timer,
|
||||
- jiffies + nsecs_to_jiffies(serial_ir.rcdev->timeout));
|
||||
+ jiffies + usecs_to_jiffies(serial_ir.rcdev->timeout));
|
||||
|
||||
ir_raw_event_handle(serial_ir.rcdev);
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="051e5e1be85fa7119aebf20adf8e61b9fe37c459"
|
||||
PKG_SHA256="602eca16dbe7aeef4a80d134c63634bda7ae651d24c48f3a130847a96f0af383"
|
||||
PKG_VERSION="3523a7035fa9630799070091c077c610fafcc070"
|
||||
PKG_SHA256="e702acc4161f26e0813d2d2e238a7f1a4a5103b4eeb75ea7fca7f94d8931dea6"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="rpi-eeprom"
|
||||
PKG_VERSION="7cb9d4162f330c5ca578376b1a3d5e748843e81c"
|
||||
PKG_SHA256="896e13ec43d1e264601f2c5cbe13a1e3cefdbddf2ec9dc0bcf833e2a714258a2"
|
||||
PKG_VERSION="b9c255df582b2c33a9af58d1973e83b3e8998f8f"
|
||||
PKG_SHA256="04beaf3a5ef86641a04bcd0c3f92a81d7cd5057ae2b756c026bc4a9a6fc193d5"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="BSD-3/custom"
|
||||
PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.10.9 Kernel Configuration
|
||||
# Linux/arm 5.10.11 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -365,7 +365,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
|
||||
# CONFIG_CPU_SW_DOMAIN_PAN is not set
|
||||
CONFIG_HW_PERF_EVENTS=y
|
||||
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
|
||||
# CONFIG_ARM_MODULE_PLTS is not set
|
||||
CONFIG_ARM_MODULE_PLTS=y
|
||||
CONFIG_FORCE_MAX_ZONEORDER=11
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
@ -2159,6 +2159,7 @@ CONFIG_GPIO_BCM_VIRT=y
|
||||
# CONFIG_GPIO_MB86S7X is not set
|
||||
# CONFIG_GPIO_MPC8XXX is not set
|
||||
# CONFIG_GPIO_PL061 is not set
|
||||
# CONFIG_GPIO_SIFIVE is not set
|
||||
# CONFIG_GPIO_XILINX is not set
|
||||
# CONFIG_GPIO_ZEVIO is not set
|
||||
# CONFIG_GPIO_AMD_FCH is not set
|
||||
@ -4694,6 +4695,7 @@ CONFIG_RPI_AXIPERF=m
|
||||
# CONFIG_DAX is not set
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_NVMEM_SYSFS=y
|
||||
# CONFIG_NVMEM_RMEM is not set
|
||||
|
||||
#
|
||||
# HW tracing support
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.10.9 Kernel Configuration
|
||||
# Linux/arm 5.10.11 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -465,7 +465,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
|
||||
# CONFIG_CPU_SW_DOMAIN_PAN is not set
|
||||
CONFIG_HW_PERF_EVENTS=y
|
||||
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
|
||||
# CONFIG_ARM_MODULE_PLTS is not set
|
||||
CONFIG_ARM_MODULE_PLTS=y
|
||||
CONFIG_FORCE_MAX_ZONEORDER=11
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
@ -4839,6 +4839,7 @@ CONFIG_RPI_AXIPERF=m
|
||||
# CONFIG_DAX is not set
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_NVMEM_SYSFS=y
|
||||
# CONFIG_NVMEM_RMEM is not set
|
||||
|
||||
#
|
||||
# HW tracing support
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.10.9 Kernel Configuration
|
||||
# Linux/arm 5.10.11 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -469,7 +469,7 @@ CONFIG_HW_PERF_EVENTS=y
|
||||
CONFIG_SYS_SUPPORTS_HUGETLBFS=y
|
||||
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
|
||||
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
|
||||
# CONFIG_ARM_MODULE_PLTS is not set
|
||||
CONFIG_ARM_MODULE_PLTS=y
|
||||
CONFIG_FORCE_MAX_ZONEORDER=11
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
@ -5437,6 +5437,7 @@ CONFIG_RAS=y
|
||||
# CONFIG_DAX is not set
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_NVMEM_SYSFS=y
|
||||
CONFIG_NVMEM_RMEM=m
|
||||
|
||||
#
|
||||
# HW tracing support
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user