diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c99376f35b..cd3b5ef045 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -28,8 +28,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="5.15.8" - PKG_SHA256="d756527313ee09c8b0376975fb7890e2eddce9714967504093b2c0fab5c0f3bd" + PKG_VERSION="5.15.14" + PKG_SHA256="2df2b4e71b5b2f25b201ba5a3d42bdf676b1deaae2fb44c14a1d8a33c9f76a4d" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index bfd3c81c11..82e9be1906 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1639,7 +1639,7 @@ CONFIG_VIRTIO_BLK=y CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y -# CONFIG_NVME_HWMON is not set +CONFIG_NVME_HWMON=y # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set diff --git a/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch b/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch index 3da53d8bc8..26a7ae18c1 100644 --- a/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch +++ b/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch @@ -406,43 +406,6 @@ index 9db9484ca38f..44def886b391 100644 iommus = <&vpu_mmu>; From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee -Date: Wed, 27 Oct 2021 16:17:26 +0200 -Subject: [PATCH] arm64: dts: rockchip: fix audio-supply for Rock Pi 4 - -As stated in the schematics [1] and [2] P5 the APIO5 domain is supplied -by RK808-D Buck4, which in our case vcc1v8_codec - i.e. a 1.8 V regulator. - -Currently only white noise comes from the ES8316's output, which - for -whatever reason - came up only after the the correct switch from i2s0_8ch_bus -to i2s0_2ch_bus for i2s0's pinctrl was done. - -Fix this by setting the correct regulator for audio-supply. - -[1] https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi4_v13_sch_20181112.pdf -[2] https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi_4c_v12_sch_20200620.pdf - -Fixes: 1b5715c602fd ("arm64: dts: rockchip: add ROCK Pi 4 DTS support") -Signed-off-by: Alex Bee ---- - arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi -index 98136c88fa49..6a434be62819 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi -@@ -502,7 +502,7 @@ &io_domains { - status = "okay"; - - bt656-supply = <&vcc_3v0>; -- audio-supply = <&vcc_3v0>; -+ audio-supply = <&vcc1v8_codec>; - sdmmc-supply = <&vcc_sdio>; - gpio1830-supply = <&vcc_3v0>; - }; - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alex Bee Date: Wed, 27 Oct 2021 14:43:40 +0200 Subject: [PATCH] arm64: dts: rockchip: add interrupt and headphone-detection for Rock Pi4's audio codec