From eda150d3a8754f43317b9c088998b7eb8a9dd6e3 Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Sat, 16 Nov 2024 11:43:17 -0500 Subject: [PATCH] linux-postmarketos-mediatek-mt8183: upgrade to 6.6.61 (MR 5797) --- .../APKBUILD | 10 +- ...atek-mt8183-da7219-max98357-Map-miss.patch | 103 ------------------ ...onfig-postmarketos-mediatek-mt8183.aarch64 | 28 +++-- 3 files changed, 25 insertions(+), 116 deletions(-) delete mode 100644 device/community/linux-postmarketos-mediatek-mt8183/Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch diff --git a/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD b/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD index 32a86f78a..8d9f00dc8 100644 --- a/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD +++ b/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: WeirdTreeThing # Co-Maintainer: Jenneron pkgname=linux-postmarketos-mediatek-mt8183 -pkgver=6.6.36 -pkgrel=1 +pkgver=6.6.61 +pkgrel=0 pkgdesc="Mainline kernel for mediatek mt8183" arch="aarch64" _flavor="${pkgname#linux-}" @@ -53,7 +53,6 @@ source=" mt8183-kukui-jacuzzi-fix-display-resume.patch mt8183-kukui-jacuzzi-hack-dpms-resume.patch mt8183-fix-bluetooth.patch - Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch config-$_flavor.aarch64 " @@ -87,7 +86,7 @@ package() { sha512sums=" -7dc497868b5b134eb2aa06e3e33aaae3c8026701ebea5b2183a35c0396576eda20f1d5af2d8468086fe0f9cf6691f2e3f3b3d6d03c5546bf734a8559cde5eabe linux-6.6.36.tar.xz +df3635ffdf68a2547eb3e992f4510bb5080bbeaea98731225f4d5e3c9afb532bc1f35f38321db49fb70ea0baec55b14f48b2251480c10432e8c428b2cc0a2028 linux-6.6.61.tar.xz 669a1bbf8707ec9294da83336673fbb55061a2eed0c6ddb2613da3ae4fa9b0e2bdbdd91ad166694173e3540ea934b2f3bf27d5f9659a6952de806765eed9b824 arm64-dts-mediatek-mt8183-Add-missing-GPU-clocks.patch 40246a8da036dc6c21592efd6625a4be22d6f524b067854f17f5671f5f3b134ed1c63a8c03a15a55e9b45b7d8d1a9b63833b86f38a6f5863e02cc8ddbf70fa57 arm64-dts-mediatek-mt8183-Add-video-encoder-decoder.patch aee85972804ab4a254f007805e25d30a82bb87e48144a05805ccefd49f8530f588e2c50b6550f302895a675003ffbe8e7986c2214d76763474b88804fe7f1519 arm64-dts-mediatek-mt8183-Drop-VDEC_SYS-register.patch @@ -99,7 +98,6 @@ a95ce4a71d249ef401ca04cf8faf85b9022114d35fef5a0ce18929f734a0ac80ed0332648cc97686 519b6468bca78d0e315c826592ae40dddca9daeba7c2b451a20ca996494cca45721833b9138fefbb543f53e0b9257c78ec4fec54de2a160aa8df730daf3ac996 mt8183-kukui-jacuzzi-fix-display-resume.patch e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456bfe7dce793517f27ad63efa220bc933e3407f6362da6d7b2a mt8183-kukui-jacuzzi-hack-dpms-resume.patch d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2 mt8183-fix-bluetooth.patch -9e64ef057ecd9bb23b0b0e830007c50ea9c481f64f460d063e9f64735d70d5a4bcf87d9148aa5cc90963ccd5860fe4a9e6f25556a902332b95ef48537d6ee045 Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch 9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch -383aae874341d974231af8cf19e34cb2ec593200c6d4a7e6588bb9e7c0c569c5e0b2ec7ec8f3d7c7a59ce4a946824b5242ac634009adcf3460181113da779f00 config-postmarketos-mediatek-mt8183.aarch64 +9d8cc2951f358cd6f0e4b1e96895362ffeeff15981992676b0b0d05d2f580359ea61c2948e0440eeb9c09e476ac2306364e64795261497d9e2dbfe70c19b3c86 config-postmarketos-mediatek-mt8183.aarch64 " diff --git a/device/community/linux-postmarketos-mediatek-mt8183/Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch b/device/community/linux-postmarketos-mediatek-mt8183/Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch deleted file mode 100644 index ecf00ab9e..000000000 --- a/device/community/linux-postmarketos-mediatek-mt8183/Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 7e23f30143f2f44b859aa424d27115a966f785bc Mon Sep 17 00:00:00 2001 -From: Anton Bambura -Date: Sat, 10 Feb 2024 03:35:48 +0200 -Subject: [PATCH] Revert "ASoC: mediatek: mt8183-da7219-max98357: Map missing - jack kcontrols" - -This reverts commit 9c7388baa2053f333dc524814be4d95f0c2c8ae7. ---- - .../mediatek/mt8183/mt8183-da7219-max98357.c | 43 +++---------------- - 1 file changed, 7 insertions(+), 36 deletions(-) - -diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c -index acaf81fd6c9b..195962f02471 100644 ---- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c -+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c -@@ -29,21 +29,6 @@ struct mt8183_da7219_max98357_priv { - struct snd_soc_jack headset_jack, hdmi_jack; - }; - --static struct snd_soc_jack_pin mt8183_da7219_max98357_jack_pins[] = { -- { -- .pin = "Headphone", -- .mask = SND_JACK_HEADPHONE, -- }, -- { -- .pin = "Headset Mic", -- .mask = SND_JACK_MICROPHONE, -- }, -- { -- .pin = "Line Out", -- .mask = SND_JACK_LINEOUT, -- }, --}; -- - static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) - { -@@ -587,15 +572,13 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component) - snd_soc_card_get_drvdata(component->card); - - /* Enable Headset and 4 Buttons Jack detection */ -- ret = snd_soc_card_jack_new_pins(component->card, -- "Headset Jack", -- SND_JACK_HEADSET | -- SND_JACK_BTN_0 | SND_JACK_BTN_1 | -- SND_JACK_BTN_2 | SND_JACK_BTN_3 | -- SND_JACK_LINEOUT, -- &priv->headset_jack, -- mt8183_da7219_max98357_jack_pins, -- ARRAY_SIZE(mt8183_da7219_max98357_jack_pins)); -+ ret = snd_soc_card_jack_new(component->card, -+ "Headset Jack", -+ SND_JACK_HEADSET | -+ SND_JACK_BTN_0 | SND_JACK_BTN_1 | -+ SND_JACK_BTN_2 | SND_JACK_BTN_3 | -+ SND_JACK_LINEOUT, -+ &priv->headset_jack); - if (ret) - return ret; - -@@ -626,18 +609,12 @@ static struct snd_soc_codec_conf mt6358_codec_conf[] = { - }; - - static const struct snd_kcontrol_new mt8183_da7219_max98357_snd_controls[] = { -- SOC_DAPM_PIN_SWITCH("Headphone"), -- SOC_DAPM_PIN_SWITCH("Headset Mic"), - SOC_DAPM_PIN_SWITCH("Speakers"), -- SOC_DAPM_PIN_SWITCH("Line Out"), - }; - - static const - struct snd_soc_dapm_widget mt8183_da7219_max98357_dapm_widgets[] = { -- SND_SOC_DAPM_HP("Headphone", NULL), -- SND_SOC_DAPM_MIC("Headset Mic", NULL), - SND_SOC_DAPM_SPK("Speakers", NULL), -- SND_SOC_DAPM_SPK("Line Out", NULL), - SND_SOC_DAPM_PINCTRL("TDM_OUT_PINCTRL", - "aud_tdm_out_on", "aud_tdm_out_off"), - }; -@@ -680,20 +657,14 @@ static struct snd_soc_codec_conf mt8183_da7219_rt1015_codec_conf[] = { - }; - - static const struct snd_kcontrol_new mt8183_da7219_rt1015_snd_controls[] = { -- SOC_DAPM_PIN_SWITCH("Headphone"), -- SOC_DAPM_PIN_SWITCH("Headset Mic"), - SOC_DAPM_PIN_SWITCH("Left Spk"), - SOC_DAPM_PIN_SWITCH("Right Spk"), -- SOC_DAPM_PIN_SWITCH("Line Out"), - }; - - static const - struct snd_soc_dapm_widget mt8183_da7219_rt1015_dapm_widgets[] = { -- SND_SOC_DAPM_HP("Headphone", NULL), -- SND_SOC_DAPM_MIC("Headset Mic", NULL), - SND_SOC_DAPM_SPK("Left Spk", NULL), - SND_SOC_DAPM_SPK("Right Spk", NULL), -- SND_SOC_DAPM_LINE("Line Out", NULL), - SND_SOC_DAPM_PINCTRL("TDM_OUT_PINCTRL", - "aud_tdm_out_on", "aud_tdm_out_off"), - }; --- -2.43.0 - diff --git a/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64 b/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64 index 1ea147141..2d8138246 100644 --- a/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64 +++ b/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64 @@ -1,18 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.25 Kernel Configuration +# Linux/arm64 6.6.61 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0" +CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -388,6 +391,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_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -512,7 +516,6 @@ CONFIG_ARM64_EPAN=y # end of ARMv8.7 architectural features CONFIG_ARM64_SVE=y -CONFIG_ARM64_SME=y # CONFIG_ARM64_PSEUDO_NMI is not set CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -638,6 +641,7 @@ CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y # CONFIG_NVHE_EL2_DEBUG is not set +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -741,6 +745,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -869,11 +874,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" CONFIG_ZBUD=y -CONFIG_Z3FOLD=y +# CONFIG_Z3FOLD_DEPRECATED is not set CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSMALLOC_CHAIN_SIZE=8 @@ -916,6 +921,7 @@ CONFIG_MIGRATION=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -4671,6 +4677,7 @@ CONFIG_MEDIA_TUNER_XC5000=m # Graphics support # CONFIG_APERTURE_HELPERS=y +CONFIG_SCREEN_INFO=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y # CONFIG_AUXDISPLAY is not set @@ -4970,6 +4977,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_FOPS=y CONFIG_FB_IOMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y @@ -5573,6 +5581,7 @@ CONFIG_HID_RMI=m # CONFIG_HID_ZYDACRON is not set # CONFIG_HID_SENSOR_HUB is not set # CONFIG_HID_ALPS is not set +# CONFIG_HID_MCP2200 is not set # CONFIG_HID_MCP2221 is not set # end of Special HID drivers @@ -6919,6 +6928,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set +# CONFIG_AD9467 is not set # CONFIG_ADI_AXI_ADC is not set # CONFIG_AXP20X_ADC is not set # CONFIG_AXP288_ADC is not set @@ -7868,6 +7878,9 @@ CONFIG_KEYS=y # CONFIG_ENCRYPTED_KEYS is not set CONFIG_KEY_DH_OPERATIONS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set @@ -7937,6 +7950,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y