diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 83e2ee6159..830ac02b5b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="209e8a3e6646f25abb352fd5a8a4c2e855b1e952" # 6.6.45 - PKG_SHA256="76fa23eda2d1690ac73e783fd11cabebe1f1f8ec8693f3491cda7d155df1b6d4" + PKG_VERSION="d6a3a3f106010d9576a700148220842cac4c5739" # 6.6.50 + PKG_SHA256="1e13003eb447c1b33e26708b0f073dd108f93e43423000253bb9d303dc1e6b6d" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; diff --git a/packages/linux/patches/raspberrypi/linux-010-pr6309-fix-no-signal-after-modeswitch.patch b/packages/linux/patches/raspberrypi/linux-010-pr6309-fix-no-signal-after-modeswitch.patch deleted file mode 100644 index 33982389fa..0000000000 --- a/packages/linux/patches/raspberrypi/linux-010-pr6309-fix-no-signal-after-modeswitch.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 733e7a51a128e950d210ef3652f5427e4179e17a Mon Sep 17 00:00:00 2001 -From: Dom Cobley -Date: Mon, 12 Aug 2024 13:31:58 +0100 -Subject: [PATCH 1/3] drm/vc4: Add a delay after disabling hdmi phy output - -There appears to be a requirement for some devices -(I'm testing with a 8K VRROOM 40Gbps HDMI switch) -for a measable delay between removing the hdmi phy output from -the old mode, to enabling the hdmi phy output for the new mode. - -Without the delay, a mode switch has a small change of getting a permanent -'no signal', which requires a subsequent mode switch or a unplug/replug -to redetect. - -Switching between 4kp24/25/30 modes fails about 5% of time in my testing. - -Add a delay to make it impossible to switch faster than this. - -Signed-off-by: Dom Cobley ---- - drivers/gpu/drm/vc4/vc4_crtc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 859ac51d06f3a..c85737f2b7f73 100644 ---- a/drivers/gpu/drm/vc4/vc4_crtc.c -+++ b/drivers/gpu/drm/vc4/vc4_crtc.c -@@ -668,6 +668,7 @@ static void vc4_crtc_atomic_disable(struct drm_crtc *crtc, - * someone was waiting it. - */ - vc4_crtc_send_vblank(crtc); -+ msleep(20); - } - - static void vc4_crtc_atomic_enable(struct drm_crtc *crtc, - -From 75c37d08890881c02a5db5ef763ef7e97f4253d3 Mon Sep 17 00:00:00 2001 -From: Dom Cobley -Date: Tue, 13 Aug 2024 16:13:16 +0100 -Subject: [PATCH 2/3] drm/vc4: Implement vc6_hdmi_phy_disable - -The body of this function was missing so we don't reset the phy -when disabling it. - -Signed-off-by: Dom Cobley ---- - drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -index 0d55627148327..f36558932f083 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -@@ -1197,4 +1197,9 @@ void vc6_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi, - - void vc6_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi) - { -+ unsigned long flags; -+ -+ spin_lock_irqsave(&vc4_hdmi->hw_lock, flags); -+ vc6_hdmi_reset_phy(vc4_hdmi); -+ spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags); - } - -From 1360bf475f7a12392e041bb80b20e21b677dcd4c Mon Sep 17 00:00:00 2001 -From: Dom Cobley -Date: Tue, 13 Aug 2024 17:18:51 +0100 -Subject: [PATCH 3/3] drm/vc4: Also power down the PLL core when resetting PHY - -The current reset code doesn't actually stop the hdmi output. -That makes it difficult for displays to handle a mode set. - -Powering down the PLL does actually remove the hdmi signal -and makes mode sets more reliable - -Signed-off-by: Dom Cobley ---- - drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -index f36558932f083..83801c2684250 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -@@ -137,6 +137,7 @@ - #define VC6_HDMI_TX_PHY_PLL_REFCLK_REFCLK_SEL_CMOS BIT(13) - #define VC6_HDMI_TX_PHY_PLL_REFCLK_REFFRQ_MASK VC4_MASK(9, 0) - -+#define VC6_HDMI_TX_PHY_PLL_POST_KDIV_BYPASS_EN BIT(4) - #define VC6_HDMI_TX_PHY_PLL_POST_KDIV_CLK0_SEL_MASK VC4_MASK(3, 2) - #define VC6_HDMI_TX_PHY_PLL_POST_KDIV_KDIV_MASK VC4_MASK(1, 0) - -@@ -947,6 +948,7 @@ static void vc6_hdmi_reset_phy(struct vc4_hdmi *vc4_hdmi) - - HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0); - HDMI_WRITE(HDMI_TX_PHY_POWERUP_CTL, 0); -+ HDMI_WRITE(HDMI_TX_PHY_PLL_POST_KDIV, VC6_HDMI_TX_PHY_PLL_POST_KDIV_BYPASS_EN); - } - - void vc6_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi, diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index e3147ce40c..01d24c521a 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="571e78a2129578784e81a4312468bb92cc8d623d" -PKG_SHA256="0cc053360d57482e128f31743d447947f14bf20af0b6eb61da89be99f129dc05" +PKG_VERSION="bf122227344fe9d7ecc5db6c0bf4bb0bd8ca9844" +PKG_SHA256="566b773ab18de3fdbccb31fcac6910ea38871fdc11bf12663663c030561e79cb" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 57ae063764..e605b66676 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="ef2fc67d235d037b2b468813e646e20890fcea07" -PKG_SHA256="c982ba891fcc63a9df711ae0c840e1a9cba083848658cd1f29a5f98d95d20dda" +PKG_VERSION="d53e3dd4b1b278010562220fcab341cccec81d75" +PKG_SHA256="cec7c991fdd35092c066c9cb0e527ef16b5b9e25cb005eef5422bda629accbce" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 556de83d14..95534b2f0a 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 6.6.45 Kernel Configuration +# Linux/arm 6.6.50 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -3251,6 +3251,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_IMX412 is not set # CONFIG_VIDEO_IMX415 is not set # CONFIG_VIDEO_IMX477 is not set +# CONFIG_VIDEO_IMX500 is not set # CONFIG_VIDEO_IMX519 is not set # CONFIG_VIDEO_IMX708 is not set # CONFIG_VIDEO_MT9M001 is not set @@ -4024,6 +4025,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_ADC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 63d2d634a2..c5ce2c77a4 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 6.6.45 Kernel Configuration +# Linux/arm 6.6.50 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -3485,6 +3485,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_IMX412 is not set # CONFIG_VIDEO_IMX415 is not set # CONFIG_VIDEO_IMX477 is not set +# CONFIG_VIDEO_IMX500 is not set # CONFIG_VIDEO_IMX519 is not set # CONFIG_VIDEO_IMX708 is not set # CONFIG_VIDEO_MT9M001 is not set @@ -4259,6 +4260,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_ADC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 04998d6e3e..6707abbda3 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.45 Kernel Configuration +# Linux/arm64 6.6.50 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -373,6 +373,7 @@ CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y +CONFIG_ARM64_ERRATUM_3194386=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -4109,6 +4110,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_IMX412 is not set # CONFIG_VIDEO_IMX415 is not set # CONFIG_VIDEO_IMX477 is not set +# CONFIG_VIDEO_IMX500 is not set # CONFIG_VIDEO_IMX519 is not set # CONFIG_VIDEO_IMX708 is not set # CONFIG_VIDEO_MT9M001 is not set @@ -4981,6 +4983,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_ADC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m diff --git a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf index 5b8d006eea..8ab72a8234 100644 --- a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.45 Kernel Configuration +# Linux/arm64 6.6.50 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -374,6 +374,7 @@ CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y +CONFIG_ARM64_ERRATUM_3194386=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -4128,6 +4129,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_IMX412 is not set # CONFIG_VIDEO_IMX415 is not set # CONFIG_VIDEO_IMX477 is not set +# CONFIG_VIDEO_IMX500 is not set # CONFIG_VIDEO_IMX519 is not set # CONFIG_VIDEO_IMX708 is not set # CONFIG_VIDEO_MT9M001 is not set @@ -5006,6 +5008,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_ADC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m