diff --git a/packages/linux/package.mk b/packages/linux/package.mk index cd6ab687e8..4bdea7da95 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.1.5" - PKG_SHA256="d79f90f5ca97befbfee4e247204b2ac4f45e7bb03d63a79184bc748cf3cf6ddb" + PKG_VERSION="5.1.6" + PKG_SHA256="9d68a206b0808d81ce582c861d0bda0d1095bcbd0f181db063665b68fc9cf478" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; diff --git a/packages/linux/patches/default/linux-999.03-dvbskys960-fix.patch b/packages/linux/patches/default/linux-999.03-dvbskys960-fix.patch deleted file mode 100644 index bc610f8642..0000000000 --- a/packages/linux/patches/default/linux-999.03-dvbskys960-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: jahutchi -Date: Fri, 11 Jan 2019 13:35:00 +0000 -Subject: [PATCH] media: m88ds3103: serialize reset messages in m88ds3103_set_frontend - -Ref: -https://bugzilla.kernel.org/show_bug.cgi?id=199323 -https://forum.libreelec.tv/thread/12452-problems-with-dvbsky-technotrend-usb-dvb-s2-tuners-since-le8/ - -DVBSky S960/S960C are partly broken since linux kernel commit (4.10rc1) -https://github.com/torvalds/linux/commit/9d659ae14b545c4296e812c70493bfdc999b5c1c - -diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c -index dffd2d4bf1..e495a26e6e 100644 ---- a/drivers/media/dvb-frontends/m88ds3103.c -+++ b/drivers/media/dvb-frontends/m88ds3103.c -@@ -309,6 +309,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) - u16 u16tmp; - u32 tuner_frequency_khz, target_mclk; - s32 s32tmp; -+ static const struct reg_sequence reset_buf[] = {{0x07, 0x80}, {0x07, 0x00}}; - - dev_dbg(&client->dev, - "delivery_system=%d modulation=%d frequency=%u symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n", -@@ -321,11 +322,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) - } - - /* reset */ -- ret = regmap_write(dev->regmap, 0x07, 0x80); -- if (ret) -- goto err; -- -- ret = regmap_write(dev->regmap, 0x07, 0x00); -+ ret = regmap_multi_reg_write(dev->regmap, reset_buf, 2); - if (ret) - goto err; - --- -2.7.4 -