diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 576175de57..5b8268311c 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="f8e05108dbb3b5640f48b6b301296e979876836b" -PKG_SHA256="6c2b50e6e1ad4224f6b5ef0bbf69626889c010277e19dacbfb83c6609e6220bb" +PKG_VERSION="9f4983548584d4f70e6eec5270125de93a081483" +PKG_SHA256="ce426328a4697d16fc2e4c7c9a97d8d4daa8c1c457441c83e4124ea78f3b91f5" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index 5c9b322b68..71ad64a1f8 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kernel-firmware" -PKG_VERSION="20190717" -PKG_SHA256="cdb28523dc6399922b8b322af034a1de536ff9ef000a6f992bbce82489fa978a" +PKG_VERSION="c0590d8300dda251b7e9291a4c9f1693436c2793" +PKG_SHA256="aeba4973360324555bcc504bddc035c40b636eed9220bb9875c5c3b8eb3842eb" PKG_LICENSE="other" PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/" PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3aa28c235d..b1d2b88c8c 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -31,14 +31,14 @@ case "$LINUX" in PKG_BUILD_PERF="no" ;; raspberrypi) - PKG_VERSION="e24f334452d6b2f123e5e277102eba1a52d28cee" # 5.3.0 - PKG_SHA256="88ba63f4ae5ca4e47175cfe5d988b005343a2ef3854d45c1e23241b9fb9af7ff" + PKG_VERSION="2a085c9b42ea9df3a26c35577159525c99b7be87" # 5.3.5 + PKG_SHA256="04740e92fda290fc441e5c313853f24a8f6f0423a17a9fb0b90f46b5877070a1" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.3" - PKG_SHA256="78f3c397513cf4ff0f96aa7d09a921d003e08fa97c09e0bb71d88211b40567b2" + PKG_VERSION="5.3.5" + PKG_SHA256="80ed8c5cfc298fdbccbd69f8b919c12b11d8b54d8c20f08fc8c3b1840d1e53f0" 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/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index e858ea1d64..afb5e4739b 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="f8e05108dbb3b5640f48b6b301296e979876836b" -PKG_SHA256="895d15967bd78a9858b95a4ddba7494a72d8c9255cbbd30b005e4ee364074397" +PKG_VERSION="9f4983548584d4f70e6eec5270125de93a081483" +PKG_SHA256="987e3bf45d4db1fa046a6f257fa20cd82dd8ba728397ada49db4b2b49b239982" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/projects/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index dcb1a1ff44..163dea09ec 100644 --- a/projects/Allwinner/linux/linux.aarch64.conf +++ b/projects/Allwinner/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.3.0 Kernel Configuration +# Linux/arm64 5.3.5 Kernel Configuration # # @@ -4325,7 +4325,6 @@ CONFIG_RTC_DRV_RK808=m # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BD70528 is not set # CONFIG_RTC_DRV_BQ32K is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set diff --git a/projects/Allwinner/linux/linux.arm.conf b/projects/Allwinner/linux/linux.arm.conf index 5ca704dc7c..d379e18bd1 100644 --- a/projects/Allwinner/linux/linux.arm.conf +++ b/projects/Allwinner/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.3.0 Kernel Configuration +# Linux/arm 5.3.5 Kernel Configuration # # @@ -4248,7 +4248,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BD70528 is not set # CONFIG_RTC_DRV_BQ32K is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set diff --git a/projects/Allwinner/patches/linux/0001-backport-from-5.4.patch b/projects/Allwinner/patches/linux/0001-backport-from-5.4.patch index c2b41c4a50..7f9821bf01 100644 --- a/projects/Allwinner/patches/linux/0001-backport-from-5.4.patch +++ b/projects/Allwinner/patches/linux/0001-backport-from-5.4.patch @@ -2516,73 +2516,6 @@ index d97d694c48df..70608fa30bf2 100644 -- 2.23.0 -From 7df8f9a20196072162d9dc8fe99943f2d35f23d5 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -Date: Mon, 19 Aug 2019 21:25:14 +0200 -Subject: [PATCH] ASoC: sun4i-i2s: Don't use the oversample to calculate BCLK - -The BCLK divider should be calculated using the parameters that actually -make the BCLK rate: the number of channels, the sampling rate and the -sample width. - -We've been using the oversample_rate previously because in the former SoCs, -the BCLK's parent is MCLK, which in turn is being used to generate the -oversample rate, so we end up with something like this: - -oversample = mclk_rate / sampling_rate -bclk_div = oversample / word_size / channels - -So, bclk_div = mclk_rate / sampling_rate / word_size / channels. - -And this is actually better, since the oversampling ratio only plays a role -because the MCLK is its parent, not because of what BCLK is supposed to be. - -Furthermore, that assumption of MCLK being the parent has been broken on -newer SoCs, so let's use the proper formula, and have the parent rate as an -argument. - -Fixes: 7d2993811a1e ("ASoC: sun4i-i2s: Add support for H3") -Fixes: 21faaea1343f ("ASoC: sun4i-i2s: Add support for A83T") -Fixes: 66ecce332538 ("ASoC: sun4i-i2s: Add compatibility with A64 codec I2S") -Signed-off-by: Maxime Ripard -Link: https://lore.kernel.org/r/c3595e3a9788c2ef2dcc30aa3c8c4953bb5cc249.1566242458.git-series.maxime.ripard@bootlin.com -Signed-off-by: Mark Brown ---- - sound/soc/sunxi/sun4i-i2s.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c -index 70608fa30bf2..d879db581073 100644 ---- a/sound/soc/sunxi/sun4i-i2s.c -+++ b/sound/soc/sunxi/sun4i-i2s.c -@@ -222,10 +222,11 @@ static const struct sun4i_i2s_clk_div sun4i_i2s_mclk_div[] = { - }; - - static int sun4i_i2s_get_bclk_div(struct sun4i_i2s *i2s, -- unsigned int oversample_rate, -+ unsigned long parent_rate, -+ unsigned int sampling_rate, - unsigned int word_size) - { -- int div = oversample_rate / word_size / 2; -+ int div = parent_rate / sampling_rate / word_size / 2; - int i; - - for (i = 0; i < ARRAY_SIZE(sun4i_i2s_bclk_div); i++) { -@@ -315,8 +316,8 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, - return -EINVAL; - } - -- bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate, -- word_size); -+ bclk_div = sun4i_i2s_get_bclk_div(i2s, i2s->mclk_freq, -+ rate, word_size); - if (bclk_div < 0) { - dev_err(dai->dev, "Unsupported BCLK divider: %d\n", bclk_div); - return -EINVAL; --- -2.23.0 - From c7dd0828c088a71f30de8d249f63b2fa9f0d322d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 19 Aug 2019 21:25:10 +0200 diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 072c5bb3b2..a55d07fe0c 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_64 5.3.0-rc2 Kernel Configuration +# Linux/x86_64 5.3.5 Kernel Configuration # # @@ -4952,7 +4952,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BD70528 is not set # CONFIG_RTC_DRV_BQ32K is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index a2bd577536..323cf1c986 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 5.3.0 Kernel Configuration +# Linux/arm 5.3.5 Kernel Configuration # # @@ -4108,7 +4108,6 @@ CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BD70528 is not set # CONFIG_RTC_DRV_BQ32K is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 231b5d882a..04dc46ce9d 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 5.3.0 Kernel Configuration +# Linux/arm 5.3.5 Kernel Configuration # # @@ -4235,7 +4235,6 @@ CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BD70528 is not set # CONFIG_RTC_DRV_BQ32K is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index d741a79acc..6d3a157a0f 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.3.0 Kernel Configuration +# Linux/arm 5.3.5 Kernel Configuration # # @@ -4843,7 +4843,6 @@ CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BD70528 is not set # CONFIG_RTC_DRV_BQ32K is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set