diff --git a/packages/linux/package.mk b/packages/linux/package.mk index ebfa5e845a..b408a1fa9f 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.10.30" - PKG_SHA256="d40269b5ac5c8424ec808f4484c7f80947f8f2d549b1ef1a5149aec5b6a20640" + PKG_VERSION="5.10.35" + PKG_SHA256="ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd" 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/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index 3d2c0c5719..09de4b0df1 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.10.21 Kernel Configuration +# Linux/arm64 5.10.32 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_IS_GCC=y @@ -423,6 +423,7 @@ CONFIG_KUSER_HELPERS=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_VHE=y diff --git a/projects/Allwinner/patches/linux/0056-arm64-dts-allwinner-h6-beelink-gs1-Remove-ext.-32-kH.patch b/projects/Allwinner/patches/linux/0056-arm64-dts-allwinner-h6-beelink-gs1-Remove-ext.-32-kH.patch deleted file mode 100644 index f8e4a262b3..0000000000 --- a/projects/Allwinner/patches/linux/0056-arm64-dts-allwinner-h6-beelink-gs1-Remove-ext.-32-kH.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7d6a50657affa4cfdf4aae108147f1434a177019 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Tue, 30 Mar 2021 20:32:04 +0200 -Subject: [PATCH] arm64: dts: allwinner: h6: beelink-gs1: Remove ext. 32 kHz - osc reference - -Although every Beelink GS1 seems to have external 32768 Hz oscillator, -it works only on one from four tested. There are more reports of RTC -issues elsewhere, like Armbian forum. - -One Beelink GS1 owner read RTC osc status register on Android which -shipped with the box. Reported value indicated problems with external -oscillator. - -In order to fix RTC and related issues (HDMI-CEC and suspend/resume with -Crust) on all boards, switch to internal oscillator. - -Fixes: 32507b868119 ("arm64: dts: allwinner: h6: Move ext. oscillator to board DTs") -Signed-off-by: Jernej Skrabec ---- - arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts -index 669d39fc716a..6249e9e02928 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts -@@ -289,10 +289,6 @@ sw { - }; - }; - --&rtc { -- clocks = <&ext_osc32k>; --}; -- - &spdif { - status = "okay"; - }; --- -2.31.0 - diff --git a/projects/Allwinner/patches/linux/0061-arm64-dts-allwinner-Fix-SD-card-CD-GPIO-for-SOPine-s.patch b/projects/Allwinner/patches/linux/0061-arm64-dts-allwinner-Fix-SD-card-CD-GPIO-for-SOPine-s.patch deleted file mode 100644 index 61b7c5efef..0000000000 --- a/projects/Allwinner/patches/linux/0061-arm64-dts-allwinner-Fix-SD-card-CD-GPIO-for-SOPine-s.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 3dd4ce4185df6798dcdcc3669bddb35899d7d5e1 Mon Sep 17 00:00:00 2001 -From: Andre Przywara -Date: Tue, 16 Mar 2021 14:42:19 +0000 -Subject: [PATCH] arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems - -Commit 941432d00768 ("arm64: dts: allwinner: Drop non-removable from -SoPine/LTS SD card") enabled the card detect GPIO for the SOPine module, -along the way with the Pine64-LTS, which share the same base .dtsi. - -However while both boards indeed have a working CD GPIO on PF6, the -polarity is different: the SOPine modules uses a "push-pull" socket, -which has an active-high switch, while the Pine64-LTS use the more -traditional push-push socket and the common active-low switch. - -Fix the polarity in the sopine.dtsi, and overwrite it in the LTS -board .dts, to make the SD card work again on systems using SOPine -modules. - -Fixes: 941432d00768 ("arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card") -Reported-by: Ashley -Signed-off-by: Andre Przywara -Signed-off-by: Maxime Ripard -Link: https://lore.kernel.org/r/20210316144219.5973-1-andre.przywara@arm.com ---- - arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 4 ++++ - arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -index 437ffe3628a5..e79ce49e7e6a 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -@@ -19,3 +19,7 @@ led { - }; - }; - }; -+ -+&mmc0 { -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */ -+}; -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi -index 3402cec87035..df62044ff7a7 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi -@@ -34,7 +34,7 @@ &mmc0 { - vmmc-supply = <®_dcdc1>; - disable-wp; - bus-width = <4>; -- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */ - status = "okay"; - }; - --- -2.31.1 - diff --git a/projects/Allwinner/patches/linux/0062-arm64-dts-allwinner-Revert-SD-card-CD-GPIO-for-Pine64-LTS.patch b/projects/Allwinner/patches/linux/0062-arm64-dts-allwinner-Revert-SD-card-CD-GPIO-for-Pine64-LTS.patch deleted file mode 100644 index 2ac870e000..0000000000 --- a/projects/Allwinner/patches/linux/0062-arm64-dts-allwinner-Revert-SD-card-CD-GPIO-for-Pine64-LTS.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Andre Przywara -Subject: [PATCH v2] arm64: dts: allwinner: Revert SD card CD GPIO for - Pine64-LTS -Date: Wed, 14 Apr 2021 11:47:40 +0100 - -Commit 941432d00768 ("arm64: dts: allwinner: Drop non-removable from -SoPine/LTS SD card") enabled the card detect GPIO for the SOPine module, -along the way with the Pine64-LTS, which share the same base .dtsi. - -This was based on the observation that the Pine64-LTS has as "push-push" -SD card socket, and that the schematic mentions the card detect GPIO. - -After having received two reports about failing SD card access with that -patch, some more research and polls on that subject revealed that there -are at least two different versions of the Pine64-LTS out there: -- On some boards (including mine) the card detect pin is "stuck" at - high, regardless of an microSD card being inserted or not. -- On other boards the card-detect is working, but is active-high, by - virtue of an explicit inverter circuit, as shown in the schematic. - -To cover all versions of the board out there, and don't take any chances, -let's revert the introduction of the active-low CD GPIO, but let's use -the broken-cd property for the Pine64-LTS this time. That should avoid -regressions and should work for everyone, even allowing SD card changes -now. -The SOPine card detect has proven to be working, so let's keep that -GPIO in place. - -Fixes: 941432d00768 ("arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card") -Reported-by: Michael Weiser -Reported-by: Daniel Kulesz -Suggested-by: Chen-Yu Tsai -Signed-off-by: Andre Przywara ---- - arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -index e79ce49e7e6a..596a25907432 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -@@ -21,5 +21,5 @@ - }; - - &mmc0 { -- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */ -+ broken-cd; /* card detect is broken on *some* boards */ - }; diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index 58474194d5..195c74f1e1 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -409,6 +409,7 @@ CONFIG_ARMV8_DEPRECATED=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_AS_HAS_LDAPR=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf index 77f82ec07a..d9cc22126c 100644 --- a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf +++ b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.21 Kernel Configuration +# Linux/arm64 5.10.32 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_IS_GCC=y @@ -406,6 +406,7 @@ CONFIG_SETEND_EMULATION=y # # CONFIG_ARM64_HW_AFDBM is not set # CONFIG_ARM64_PAN is not set +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y # CONFIG_ARM64_VHE is not set diff --git a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf index a8bfe642c3..6e43edb141 100644 --- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.29 Kernel Configuration +# Linux/arm64 5.10.32 Kernel Configuration # # @@ -399,6 +399,7 @@ CONFIG_KUSER_HELPERS=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_VHE=y diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index f9e8817321..ed787c6aa5 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.30 Kernel Configuration +# Linux/arm64 5.10.32 Kernel Configuration # # @@ -398,6 +398,7 @@ CONFIG_KUSER_HELPERS=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_VHE=y