testing/linux-elm: upgrade to 5.15.5

replace fix-mmc1-speed.patch with mt8173-fix-mmc1-speed.patch and add
mt8173-higher-temps.patch, both from:
https://github.com/hexdump0815/linux-mainline-mediatek-mt81xx-kernel/tree/master/misc.cbm/patches/5.15.0
remove fix-spi-nor-max-frequency.patch, not needed anymore

6 files changed, 47 insertions, 33 deletions

diff --git a/testing/linux-elm/APKBUILD b/testing/linux-elm/APKBUILD
index 06bfdcde29..864a410641 100644
--- a/testing/linux-elm/APKBUILD
+++ b/testing/linux-elm/APKBUILD
@@ -4,7 +4,7 @@ _flavor=elm
 pkgname=linux-${_flavor}
 # NOTE: this kernel is intended for testing
 # please resist urge to upgrade it blindly
-pkgver=5.15.1
+pkgver=5.15.5
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -30,9 +30,9 @@ esac
 	source="$source
 	config-elm.aarch64
 	kernel.its.elm
-	fix-mmc1-speed.patch
-	fix-spi-nor-max-frequency.patch
 	fix-mmc-order.patch
+	mt8173-fix-mmc1-speed.patch
+	mt8173-higher-temps.patch
 	"
 
 arch="aarch64"
@@ -234,10 +234,10 @@ _dev() {
 
 sha512sums="
 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
-8f7faca2e0e5c755b052b65b2aa46fee0317c915ec2475e97371d5da5e3adfa943397108fa40ebbac581254933f4ffdc6875306120c8c208561556fdd8bfb4ff  patch-5.15.1.xz
-62e2ef98a6c67d3b10c98aee5f118989e1cec6259a21bde8a0761b9a36d0fcee595681037184c4d97d729a683f3ab7bcca3b1ec4e221b4869d67a29dd2f34a05  config-elm.aarch64
+995d19fc4a98844ffcc3d6cfaabedc2151efecac2904a7a12befa98a2ff0c6adcfbc3916496cc2a139ddeddcd74bd49995501e53f2b906a8c2c390d4a6e26b80  patch-5.15.5.xz
+f1ded89855fc3487cb29fa259fdf8234281ce3ae68d6df2caeba8d910f258775d550a06a61bf70a2a2deca1ec9a9d3a9cf763454560f8ea8fdfcd0ee8d0981f1  config-elm.aarch64
 112af92af4a3f61867ffc20076d057845aa8c9139e58153d0c88f4d7185d9a9628fa79d4edfa8855f095fb70d257bfbd7c4573a7431d4b17706415b411a50775  kernel.its.elm
-65c57a6d9a5bd5b6ec8798d1c46091bb72377ed1349b66e9a0a1a50ffa077f044f2bfdd30eab974c9c9774fc62d8dd5020a38432d108fce7f4fc1ed6648ea703  fix-mmc1-speed.patch
-9e17fb96b81590da0f9b0917ddd2b9d195bab5cde2a4e7feb19991c50a8ac8e4502445715153ced8666e5b6575137c1d49899bb0ae9ab4505ed8f1ff7e569269  fix-spi-nor-max-frequency.patch
 00e7afdab1dc89a6e0426829685d85cebb98fb95cb13a253d01326fd22f78ddf792bbe3b5be4c9bc93784f1fa93f87f604a4b6c6710660319db6f2e35dd09835  fix-mmc-order.patch
+da4e235b06173df3f37abd9a4f040befe5273ac21091ba321992d83f1ef3f806cc1e2329b2d3086dd9b78f7b7d622c45f92df37fd9b337aa58dc4d165752a4c3  mt8173-fix-mmc1-speed.patch
+a0adfc599111814e2dfce5aff7c7212af7f68b7339597f553176efc25e6590281cad6bb08cc654e47eb56c84ecb71f7bc5af0ec776d883d46392869ff2cd08d2  mt8173-higher-temps.patch
 "
diff --git a/testing/linux-elm/config-elm.aarch64 b/testing/linux-elm/config-elm.aarch64
index 4c25d679dd..f401482e39 100644
--- a/testing/linux-elm/config-elm.aarch64
+++ b/testing/linux-elm/config-elm.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.1 Kernel Configuration
+# Linux/arm64 5.15.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027"
 CONFIG_CC_IS_GCC=y
@@ -5790,6 +5790,7 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_CONSOLE is not set
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_RAM is not set
+# CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EROFS_FS is not set
@@ -5949,7 +5950,7 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
diff --git a/testing/linux-elm/fix-mmc1-speed.patch b/testing/linux-elm/fix-mmc1-speed.patch
deleted file mode 100644
index 35e6829ed7..0000000000
--- a/testing/linux-elm/fix-mmc1-speed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-cut max-frequency to half because at full speed mmc is buggy
-
---- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2020-12-28 21:22:16.614538427 +0000
-+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2020-12-28 21:23:59.702157398 +0000
-@@ -381,7 +381,7 @@
- 	pinctrl-0 = <&mmc1_pins_default>;
- 	pinctrl-1 = <&mmc1_pins_uhs>;
- 	bus-width = <4>;
--	max-frequency = <200000000>;
-+	max-frequency = <100000000>;
- 	cap-sd-highspeed;
- 	sd-uhs-sdr50;
- 	sd-uhs-sdr104;
diff --git a/testing/linux-elm/fix-spi-nor-max-frequency.patch b/testing/linux-elm/fix-spi-nor-max-frequency.patch
deleted file mode 100644
index 59af4985e6..0000000000
--- a/testing/linux-elm/fix-spi-nor-max-frequency.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2021-01-03 10:20:26.482347785 +0000
-+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2021-01-03 11:36:43.321775391 +0000
-@@ -437,7 +437,7 @@
- 	flash@0 {
- 		compatible = "jedec,spi-nor";
- 		reg = <0>;
--		spi-max-frequency = <50000000>;
-+		spi-max-frequency = <109200000>;
- 	};
- };
- 
diff --git a/testing/linux-elm/mt8173-fix-mmc1-speed.patch b/testing/linux-elm/mt8173-fix-mmc1-speed.patch
new file mode 100644
index 0000000000..9653047007
--- /dev/null
+++ b/testing/linux-elm/mt8173-fix-mmc1-speed.patch
@@ -0,0 +1,19 @@
+remove even more high speed mmc stuff to get it working stable
+
+diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+index 44a0346133cd..06a99953b804 100644
+@@ -381,10 +381,10 @@
+ 	pinctrl-0 = <&mmc1_pins_default>;
+ 	pinctrl-1 = <&mmc1_pins_uhs>;
+ 	bus-width = <4>;
+-	max-frequency = <200000000>;
++	max-frequency = <50000000>;
+ 	cap-sd-highspeed;
+-	sd-uhs-sdr50;
+-	sd-uhs-sdr104;
++//	sd-uhs-sdr50;
++//	sd-uhs-sdr104;
+ 	cd-gpios = <&pio 1 GPIO_ACTIVE_LOW>;
+ 	vmmc-supply = <&mt6397_vmch_reg>;
+ 	vqmmc-supply = <&mt6397_vmc_reg>;
+ 
diff --git a/testing/linux-elm/mt8173-higher-temps.patch b/testing/linux-elm/mt8173-higher-temps.patch
new file mode 100644
index 0000000000..461eb2132d
--- /dev/null
+++ b/testing/linux-elm/mt8173-higher-temps.patch
@@ -0,0 +1,18 @@
+diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+index 44a0346133cd..33e3b7f64b3f 100644
+--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+@@ -184,11 +184,11 @@
+ 	sustainable-power = <4500>; /* milliwatts */
+ 	trips {
+ 		threshold: trip-point0 {
+-			temperature = <60000>;
++			temperature = <70000>;
+ 		};
+ 
+ 		target: trip-point1 {
+-			temperature = <65000>;
++			temperature = <75000>;
+ 		};
+ 	};
+ };