From 8642b7fcc259b26ac35dad950daee71cbf7d9e65 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 16 May 2019 11:19:21 +0200 Subject: [PATCH 1/7] linux (RPi, Generic): update to 4.19.42 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index e404566fe3e..2b0556d4deb 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,14 +38,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="f70d3cee7ea9e6411559cc75e3882d4703752dfe" # 4.19.36 - PKG_SHA256="37c97f4b21d813569f33b2190e7c28be5053ea080b792b504b77ddf8f9f4a67c" + PKG_VERSION="3f647927237babee492cbb6ce0ab29417af55ea0" # 4.19.42 + PKG_SHA256="7a5f817a6f17bf43606d5be186eff84119dedba2828e5b6f570179a9d94a8d0b" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="4.19.36" - PKG_SHA256="b808b508177f9d288d94a3b9df7b01d5eac9fcc1804a794c913b2144de63f2bc" + PKG_VERSION="4.19.42" + PKG_SHA256="f809d76010d575979362551fda3190569502973d5e2a972e78b9093a3526da26" PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; From 9f933183cb2962679a36545aa49707661667634a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 16 May 2019 11:29:39 +0200 Subject: [PATCH 2/7] linux (RPi): config options for 4.19.42 enable IQaudIO Pi-Codec driver Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 4 +++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 13a14c33c8f..a7bde2ba758 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.36 Kernel Configuration +# Linux/arm 4.19.42 Kernel Configuration # # @@ -3137,6 +3137,7 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m +CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m @@ -3224,6 +3225,7 @@ CONFIG_SND_SOC_CS42XX8_I2C=m # CONFIG_SND_SOC_CS43130 is not set # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set +CONFIG_SND_SOC_DA7213=m CONFIG_SND_SOC_DMIC=m # CONFIG_SND_SOC_ES7134 is not set # CONFIG_SND_SOC_ES7241 is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index acd06515db1..d68969fe528 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.36 Kernel Configuration +# Linux/arm 4.19.42 Kernel Configuration # # @@ -3252,6 +3252,7 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m +CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m @@ -3339,6 +3340,7 @@ CONFIG_SND_SOC_CS42XX8_I2C=m # CONFIG_SND_SOC_CS43130 is not set # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set +CONFIG_SND_SOC_DA7213=m CONFIG_SND_SOC_DMIC=m # CONFIG_SND_SOC_ES7134 is not set # CONFIG_SND_SOC_ES7241 is not set From e1ce0856cdcf93304def05ba1a09ba67bca26155 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 28 May 2019 20:30:01 +0200 Subject: [PATCH 3/7] linux (RPi, Generic): update to 4.19.46 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2b0556d4deb..edf3ef9d6d9 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,14 +38,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="3f647927237babee492cbb6ce0ab29417af55ea0" # 4.19.42 - PKG_SHA256="7a5f817a6f17bf43606d5be186eff84119dedba2828e5b6f570179a9d94a8d0b" + PKG_VERSION="0ab888996b8ac53a673e1350ce704772aed76e50" # 4.19.46 + PKG_SHA256="95e00db234829a1c8e62b00933d020c80ecfa887b55414d20666ae9d0f951433" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="4.19.42" - PKG_SHA256="f809d76010d575979362551fda3190569502973d5e2a972e78b9093a3526da26" + PKG_VERSION="4.19.46" + PKG_SHA256="097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a" PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; From e945b1d3bc060f4efad6c0db2c28cb481e59965c Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 28 May 2019 20:41:54 +0200 Subject: [PATCH 4/7] linux (RPi, Generic): config options for 4.19.46 Signed-off-by: Matthias Reichl --- projects/Generic/linux/linux.x86_64.conf | 3 +-- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 80d0b0f7a21..b243b0ad60c 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.36 Kernel Configuration +# Linux/x86 4.19.46 Kernel Configuration # # @@ -4733,7 +4733,6 @@ CONFIG_STAGING_MEDIA=y # Gasket devices # # CONFIG_STAGING_GASKET_FRAMEWORK is not set -# CONFIG_XIL_AXIS_FIFO is not set # CONFIG_EROFS_FS is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WMI is not set diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index a7bde2ba758..88b7525bbf4 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.42 Kernel Configuration +# Linux/arm 4.19.46 Kernel Configuration # # @@ -3125,7 +3125,6 @@ CONFIG_SND_SOC_COMPRESS=y # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_ATMEL_SOC is not set CONFIG_SND_BCM2835_SOC_I2S=m -CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index d68969fe528..f70672250ba 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.42 Kernel Configuration +# Linux/arm 4.19.46 Kernel Configuration # # @@ -3240,7 +3240,6 @@ CONFIG_SND_SOC_COMPRESS=y # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_ATMEL_SOC is not set CONFIG_SND_BCM2835_SOC_I2S=m -CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m From bf2b8b55443c63270040f3d8b9489c968e0f2645 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 12 Jun 2019 18:34:05 +0200 Subject: [PATCH 5/7] linux (RPi, Generic): update to 4.19.49 The DVBSky960 patch has landed in the stable kernel so the local backport patch can be dropped. Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 8 ++-- .../default/linux-999.03-dvbskys960-fix.patch | 39 ------------------- 2 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 packages/linux/patches/default/linux-999.03-dvbskys960-fix.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index edf3ef9d6d9..a519926aee1 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,14 +38,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="0ab888996b8ac53a673e1350ce704772aed76e50" # 4.19.46 - PKG_SHA256="95e00db234829a1c8e62b00933d020c80ecfa887b55414d20666ae9d0f951433" + PKG_VERSION="16a9ad722bd6dce2e90db11b3cc4d8306d698706" # 4.19.49 + PKG_SHA256="87a6f0a9559bf252eb408be765139114b9e7341a60d109075df55b3609ac29dc" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="4.19.46" - PKG_SHA256="097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a" + PKG_VERSION="4.19.49" + PKG_SHA256="92d920b3973c0dbca5516271afa405be6e5822a9b831df8c085f9c9eb838bbcd" PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.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 bc610f86429..00000000000 --- 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 - From d65a0a9b0b431b98c0080929a8db3cf8f90593d3 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 12 Jun 2019 18:52:11 +0200 Subject: [PATCH 6/7] linux (RPi, Generic): config options for 4.19.49 Signed-off-by: Matthias Reichl --- projects/Generic/linux/linux.x86_64.conf | 3 ++- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index b243b0ad60c..fa2faacf72e 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.46 Kernel Configuration +# Linux/x86 4.19.49 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=70200 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 88b7525bbf4..3953b1897ae 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.46 Kernel Configuration +# Linux/arm 4.19.49 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=70200 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index f70672250ba..f7e363d1c2c 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.46 Kernel Configuration +# Linux/arm 4.19.49 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=70200 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y From ab41e99d2e17b237e5b06445d3e62dff48e15cdb Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 12 Jun 2019 23:05:13 +0200 Subject: [PATCH 7/7] linux (RPi, Generic): update to 4.19.50 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index a519926aee1..dab53cc4c7b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,14 +38,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="16a9ad722bd6dce2e90db11b3cc4d8306d698706" # 4.19.49 - PKG_SHA256="87a6f0a9559bf252eb408be765139114b9e7341a60d109075df55b3609ac29dc" + PKG_VERSION="5040b4b78e4cb74a6364d9a7c6cca0385e2dffd8" # 4.19.50 + PKG_SHA256="134a9821db00c3c826dfeb86be9439a4d0c5b10796f7173a2e5d5728ef2fc979" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="4.19.49" - PKG_SHA256="92d920b3973c0dbca5516271afa405be6e5822a9b831df8c085f9c9eb838bbcd" + PKG_VERSION="4.19.50" + PKG_SHA256="a9987423918abd20ee68d6e9b14b7225eaca8a586bf75fb56c49f6e1e47ce01e" PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;;