diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
index 2097a1f13b..12e6f46f77 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="f293685f683c48b1872beeb38c2f7da1f46141a0"
-PKG_SHA256="42e9f59785e55c4234352b60e775281add15997c6cb706b6ec5b603978d92c19"
+PKG_VERSION="a34f263ce6a9e35f3c1d62f6195f9f45f4f547e7"
+PKG_SHA256="063374702cfc4cb3056160c9a793d001ae152e7ea5ee72bf0bfe230cb8bf31d2"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index d4d9168d75..70af76f5fa 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX"
 
 case "$LINUX" in
   raspberrypi)
-    PKG_VERSION="cc069e10e5617515ccf9bcdf9d71e7bd11a94de2" # 5.4.58
-    PKG_SHA256="1b9091f9b6ac0f1d5cff3df5c760bebd6eb7edb89c14128f754f4c1f34ae07a9"
+    PKG_VERSION="2ce8c3ab0f9d1ffb67310ffd200be82d80a8d13d" # 5.4.61
+    PKG_SHA256="4e008bdb25d8d49223a1cd01cd5d5d882f511a7c6635a14f0a5100dd4a5e25ea"
     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/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index caf286ebae..be66536642 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="f293685f683c48b1872beeb38c2f7da1f46141a0"
-PKG_SHA256="cf72421d38c65317a49f1f0387df86e78b0b83e8738ac4a58651c3fb8cac86ca"
+PKG_VERSION="a34f263ce6a9e35f3c1d62f6195f9f45f4f547e7"
+PKG_SHA256="db698fb520c122a408330253d3720c8c3111108d47c4f82e097c718c4a98fdf7"
 PKG_ARCH="arm"
 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 63fb8f5a23..190c770d01 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="0e7da7ecd84cdf7b65d6fc8d43446aee665187dc"
-PKG_SHA256="d33d29f377217909f3fd4e41a8bdeeed0c2c5ce828947aaf21f593dbab2c9521"
+PKG_VERSION="b887a0bfa9f334a53bf1c66bbea5725b7a5f3846"
+PKG_SHA256="400d64066c5ad31cbfd6f3fc146961a930060c2b97ef89ad48cd998aead2d7a3"
 PKG_ARCH="arm"
 PKG_LICENSE="BSD-3/custom"
 PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"
diff --git a/projects/RPi/devices/RPi/config/distroconfig.txt b/projects/RPi/devices/RPi/config/distroconfig.txt
new file mode 100644
index 0000000000..9a3247a396
--- /dev/null
+++ b/projects/RPi/devices/RPi/config/distroconfig.txt
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+# WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
+dtoverlay=vc4-kms-v3d,cma-128
+disable_overscan=1
diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf
index 5bffec2d6e..2d8ad2a06c 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.4.58 Kernel Configuration
+# Linux/arm 5.4.61 Kernel Configuration
 #
 
 #
@@ -410,9 +410,10 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 #
 # CPU frequency scaling drivers
 #
-# CONFIG_CPUFREQ_DT is not set
-# CONFIG_ARM_RASPBERRYPI_CPUFREQ is not set
-CONFIG_ARM_BCM2835_CPUFREQ=y
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
+# CONFIG_ARM_BCM2835_CPUFREQ is not set
 # CONFIG_QORIQ_CPUFREQ is not set
 # end of CPU Frequency scaling
 
@@ -2085,6 +2086,7 @@ CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 # CONFIG_PPS is not set
@@ -2402,6 +2404,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_CPU_THERMAL is not set
+# CONFIG_CLOCK_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_THERMAL_MMIO is not set
 # CONFIG_QORIQ_THERMAL is not set
@@ -4521,6 +4524,7 @@ CONFIG_NVMEM_SYSFS=y
 
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
+CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 # CONFIG_INTERCONNECT is not set
diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf
index 64aca7b00b..f61a5d5e6b 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.4.58 Kernel Configuration
+# Linux/arm 5.4.61 Kernel Configuration
 #
 
 #
@@ -2208,6 +2208,7 @@ CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 # CONFIG_PPS is not set
diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf
index 2220d81b17..92cc21710f 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.4.58 Kernel Configuration
+# Linux/arm 5.4.61 Kernel Configuration
 #
 
 #
@@ -2619,6 +2619,7 @@ CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 # CONFIG_PPS is not set
diff --git a/projects/RPi/devices/Slice/config/distroconfig.txt b/projects/RPi/devices/Slice/config/distroconfig.txt
index 5913877b8d..158cc08144 100644
--- a/projects/RPi/devices/Slice/config/distroconfig.txt
+++ b/projects/RPi/devices/Slice/config/distroconfig.txt
@@ -2,7 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 # WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
-
+dtoverlay=vc4-kms-v3d,cma-128
+disable_overscan=1
 dtoverlay=slice
 dtoverlay=ws2812
 
diff --git a/projects/RPi/devices/Slice3/config/distroconfig.txt b/projects/RPi/devices/Slice3/config/distroconfig.txt
index 242e4861e5..db7f342933 100644
--- a/projects/RPi/devices/Slice3/config/distroconfig.txt
+++ b/projects/RPi/devices/Slice3/config/distroconfig.txt
@@ -3,6 +3,8 @@
 
 # WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
 
+dtoverlay=vc4-kms-v3d
+disable_overscan=1
 dtoverlay=slice
 dtoverlay=ws2812
 dtoverlay=mmc