testing/linux-next: drop

The package doesn't build right now and is blocking package publishing. Re-introduce it once we get it building again. drivers/tty/vt/conmakehash.c:15:10: fatal error: linux/limits.h: No such file or directory 15 | #include <linux/limits.h> | ^~~~~~~~~~~~~~~~ compilation terminated.
linux-next: upgrade to next-20240808
2024-08-08 08:58:13 +02:00 · 2024-08-08 04:31:49 +00:00 · 2024-08-07 18:31:51 +00:00 · 2024-08-07 10:46:19 -07:00 · 2024-08-06 18:31:51 +00:00 · 2024-08-06 11:05:02 -07:00
37 changed files with 401 additions and 3923 deletions
@@ -94,7 +94,6 @@ device/*/kobo-epdc-extractor/			@akemnade
 device/*/linux-google-nyan/			@jenneron
 device/*/linux-google-veyron/			@jenneron
 device/*/linux-huawei-plank/			@gtrxAC
-device/*/linux-next/				@calebccff
 device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
 device/*/linux-postmarketos-amlogic/		@funderscore @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @Grimler @knuxify
@@ -116,6 +115,7 @@ device/*/linux-samsung-j5y17lte/	@andrisas
 device/*/linux-samsung-klimtlte/		@Grimler
 device/*/oem-amd/				@craftyguy
 device/*/oem-intel/				@craftyguy
+device/*/oem-nvidia/				@craftyguy
 device/*/soc-mediatek-mt8183/			@jenneron
 device/*/soc-qcom-msm8953/			@barni2000
 device/*/soc-qcom-msm8996/			@Tooniis
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=5
+pkgrel=6

 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }

 sha512sums="
-3cc14376ad5dc2a4d8488d49199d1257c5024c8c4afcbcdf67a0cd7a66e75962191850cca4248ce13abf060b4d9e2fd0966ef6adeb38a00d58c9e4054eec1e9d  grub-efi-2.12-r5-x86-edge.apk
+bad54187b4fbb9f78f2d619ff9a652a4927c557070c2c39334fd9900ae5aeb956144055602ca56295d7966c2d10090ef142a073dd67eb14f7b41ba0d54c78d4d  grub-efi-2.12-r6-x86-edge.apk
 "
@@ -29,6 +29,7 @@ _pmb_recommends="
 	linux-firmware
 	oem-amd
 	oem-intel
+	oem-nvidia
 "
 provides="device-tablet-x64uefi=$pkgver-r$pkgrel device-tablet-x86uefi=$pkgver-r$pkgrel"
 replaces="device-tablet-x64uefi device-tablet-x86uefi"
@@ -4,7 +4,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -67,7 +67,7 @@ usbguard() {
 sha512sums="
 c3570f44cd0134fd7400a5467cfddb3c1877a771fda8006228d1b0fd81536171ece53bf7562fc0e11dcc1fd3c6830e324e0d5ad9fdc4e16b53107fa3a04004fb  deviceinfo
 82f7719285434d8c7a5268ddc21d513bb3f3788eb3dd2df099e1c245add9d19719047b003a47edb077e095ebe09d9601b1312c001578e7dfa4ed61d72098ef74  firmware.files
-654c4e931cfd86bcfd833d5e3ac03fabad5f3d77195ce12509cfce9c1e089822f3cde791ca088ee6611c010a9354efaac488740281c2f5c2ea03b6d7af479935  modules-initfs
+27705e998db262602b50004083fe160dbcde88e9fdcaeb43e3d1d79be0b7af371f84855bb93ba16ada3cf5fa8ff8da6ca159cda4b1de08fb54ac451c57169c57  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
 0d0412eb1f01af39000c39391f622640461305d83dae1a53aa7eef640cc17fd265cabca4e4e57dea053c47a4e50f9feb90f12ee5310d5b6425783e83efc5f9d8  usbguard.conf
 "
@@ -29,6 +29,9 @@ msm
 # USB boot
 phy_qcom_qmp_usb
 phy_qcom_snps_femto_v2
+dwc3
+dwc3_qcom
+extcon_core
 ## Need to load remoteproc modules in the initramfs, if they are loaded later
 ## then it can cause a power cycle that breaks USB
 qcom_common
@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.10
-pkgrel=2
+pkgver=6.10.3
+pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -68,8 +68,8 @@ package() {
 }

 sha512sums="
-baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2  linux-6.10.tar.xz
-55fbda0652a58fafec64b9a7f1c8ee212052f3c553de9fd29264631d19e63a7aecae483a32f0583b3ea4f4a0851e8e65b077827e100388052edd8b666e0a0400  config-postmarketos-mediatek-mt8173.aarch64
+dd6061c5871d7b313e1b0eec791444b911f9d9d5e28b1d7a81a265708688808c157adfba92459511e9b786d09e3f96f5bc3c03980360061344ad8e225e165f6a  linux-6.10.3.tar.xz
+4389a117008b0f27ed7dc00aac69ae50c7f30f5684861e9e1ede6658b00c7a16720fe8ffe1621c1a3c80cde5cfdc05301bdb2e029234808a289c7c4890149983  config-postmarketos-mediatek-mt8173.aarch64
 4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.0 Kernel Configuration
+# Linux/arm64 6.10.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130201
+CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,7 +13,6 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -776,6 +775,8 @@ CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT=4
+CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
+CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -2,8 +2,8 @@

 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.9.7
-pkgrel=3
+pkgver=6.10.3
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -13,7 +13,7 @@ options="!strip !check !tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
 	"
-makedepends="bash bison findutils flex installkernel openssl-dev perl"
+makedepends="bash bison findutils flex installkernel openssl-dev perl python3"

 _repo="linux"
 _config="config-$_flavor.$arch"
@@ -54,6 +54,6 @@ package() {
 }

 sha512sums="
-2d432d2e9cf681c55a8406d1c9122ebdde8fdd0dee12815b785bfc9446527bec25a812b297e88d893685fa32b45afd752ae13ae2c28bf6e53f9699e4f7021dae  linux-v6.9.7-sm6350.tar.gz
-06f71580b32172ffe6e46b6b7032ea03bd6deeece7a1f1ad777e4de7bf3d31588b4d75062ccb0c2cb3330124f3d49423bab79e73c1637ceedf44d10e104e3572  config-postmarketos-qcom-sm6350.aarch64
+a67427982aa13e89c0daea0da9780ce348e8b81e698089e7dfdf3d0710232eb7ea56bf1259d2090f2989282d5d9c6eabc458ffccb9b0b2d865ed428dfc886b32  linux-v6.10.3-sm6350.tar.gz
+cdf07e9f12605a7728223e794556916e0c89b2e8d9782b764b397b87c8aa59d570ece44d48fab26c394f1d701838da0796e2ee5be62455d169fc4f07eaae5ba2  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.7 Kernel Configuration
+# Linux/arm64 6.10.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130201
+CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,7 +13,6 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -111,7 +110,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_SCHED_HW_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
@@ -128,6 +127,7 @@ CONFIG_TREE_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -159,6 +159,7 @@ CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -222,7 +223,6 @@ CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -298,6 +298,7 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_AIROHA is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
@@ -378,6 +379,9 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 CONFIG_CAVIUM_ERRATUM_23144=y
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
@@ -681,6 +685,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_PMD_MKWRITE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_WANTS_EXECMEM_LATE=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -719,6 +724,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
 CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y

 #
 # GCOV-based kernel profiling
@@ -732,10 +738,11 @@ CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT=4
+CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
+CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -764,7 +771,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -903,7 +909,7 @@ CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
+CONFIG_HAVE_GUP_FAST=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -934,6 +940,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -965,6 +972,7 @@ CONFIG_SECRETMEM=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_EXECMEM=y

 #
 # Data Access Monitoring
@@ -1858,6 +1866,7 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
+# CONFIG_PFCP is not set
 # CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
@@ -1964,6 +1973,7 @@ CONFIG_FIXED_PHY=y
 #
 # MII PHY device drivers
 #
+# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -2551,6 +2561,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_SCMI is not set
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
@@ -2964,6 +2975,7 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_CORE=y
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_SMPRO is not set
@@ -3120,8 +3132,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
-# CONFIG_REGULATOR_QCOM_REFGEN is not set
 CONFIG_REGULATOR_QCOM_PM8008=y
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
 CONFIG_REGULATOR_QCOM_RPMH=y
 # CONFIG_REGULATOR_QCOM_SPMI is not set
 CONFIG_REGULATOR_QCOM_USB_VBUS=y
@@ -3176,11 +3188,11 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_AUX_BUS=m
 CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
+# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
+# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_EXEC=m
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=m
@@ -3251,6 +3263,7 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=m
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
+# CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
@@ -3267,9 +3280,11 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
@@ -3354,6 +3369,7 @@ CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_PL111 is not set
 # CONFIG_DRM_LIMA is not set
 # CONFIG_DRM_PANFROST is not set
+# CONFIG_DRM_PANTHOR is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
@@ -3590,6 +3606,7 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_HID_U2FZERO is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -3755,7 +3772,7 @@ CONFIG_USB_DWC3_QCOM=y
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
-# CONFIG_USB_ONBOARD_HUB is not set
+# CONFIG_USB_ONBOARD_DEV is not set

 #
 # USB Physical Layer drivers
@@ -3991,7 +4008,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set

 #
@@ -4047,6 +4063,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -4172,6 +4189,8 @@ CONFIG_VIRTIO=y
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
+CONFIG_ARM64_PLATFORM_DEVICES=y
+# CONFIG_EC_ACER_ASPIRE1 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4329,6 +4348,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_MAILBOX=y
 # CONFIG_ARM_MHU is not set
 # CONFIG_ARM_MHU_V2 is not set
+# CONFIG_ARM_MHU_V3 is not set
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
@@ -4685,6 +4705,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_AD5380 is not set
 # CONFIG_AD5446 is not set
 # CONFIG_AD5593R is not set
+# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -4783,6 +4804,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
+# CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
@@ -5580,7 +5602,6 @@ CONFIG_CRYPTO_USER_API_RNG=y
 # CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-CONFIG_CRYPTO_STATS=y
 # end of Userspace interface

 CONFIG_CRYPTO_HASH_INFO=y
@@ -5748,13 +5769,13 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
+CONFIG_DMA_NEED_SYNC=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
@@ -5904,6 +5925,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
@@ -5993,6 +6015,7 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
@@ -6063,6 +6086,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
+# CONFIG_TEST_FPU is not set
 # CONFIG_TEST_OBJPOOL is not set
 CONFIG_ARCH_USE_MEMTEST=y
 CONFIG_MEMTEST=y
@@ -0,0 +1 @@
+nouveau
@@ -0,0 +1,37 @@
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
+pkgname=oem-nvidia
+pkgdesc="NVIDIA device support"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="x86_64"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf
+	linux-firmware-nvidia
+"
+subpackages="
+	$pkgname-libva
+"
+source="
+	00-oem-nvidia.modules
+"
+
+package() {
+	mkdir -p "$pkgdir"
+	install -Dm644 00-oem-nvidia.modules \
+		-t "$pkgdir"/usr/share/mkinitfs/modules
+}
+
+libva() {
+	pkgdesc="libva support for NVIDIA gpus"
+	install_if="$pkgname=$pkgver-r$pkgrel libva"
+	depends="mesa-va-gallium"
+
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+75517c7de27376f65973d36196c2635103c5806cb6fcf3d4aea08183ae3b037b5c861216ae341a731c395841da5d675365de7e850c2c5af917b3fae7ea4c4d92  00-oem-nvidia.modules
+"
@@ -2,8 +2,8 @@
 # Maintainer: Arnav Singh <me@arnavion.dev>
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
-pkgver=3
-pkgrel=4
+pkgver=4
+pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -137,13 +137,10 @@ package() {
 	install -Dm644 "$srcdir"/60-flashlight.rules -t "$pkgdir"/usr/lib/udev/rules.d/

 	# Alsa usecase manager config
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/PinePhone \
+	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/Allwinner/A64/PinePhone \
 		"$srcdir"/HiFi.conf \
 		"$srcdir"/PinePhone.conf \
 		"$srcdir"/VoiceCall.conf
-	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card
-	ln -s /usr/share/alsa/ucm2/PinePhone/PinePhone.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/PinePhone.conf

 	# Pulseaudio config
 	install -Dm644 "$srcdir"/pulse-pinephone.conf \
@@ -273,9 +270,9 @@ d66ecef1fa5481ff138fe4e12b194903ceacab9d0649e716049f32e56ec6d9be09b97e2ff769ebc5
 1f573b4a6686dac30b6e20507ec6590764a9e9e60c5373bda3838b1f25370b447a3220670710c43a64eb518a4aa54d4ab3beb942513ef269e596a73653c6528e  sun50i-a64-psci.dts
 c509254a94bef7ecf51ecba2f54cd4a3058dede820f9501750005ae43c026b1737a3b7bb30089e3a6f08c64e4e85250887e892dff51884c3159afeaa6e0b4105  uboot-script.cmd
 f28902517bebe16f7ddbdbf9f4c52d5c97319e3b5ba7326ba96ed0e094d3d2a39c87061326893cdc34336bbfd56de084b2f217918ebba7ca6a080088cd0bd409  uboot-user.cmd
-f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd  HiFi.conf
-4b0c51ab169aebe8177c5c43eba41afa90370098a5a54e710d17e97ec1651869a20cb5d780a6132028c864916609e3b4f4a13158835310d0441bdb4915872372  PinePhone.conf
-e093f71c37370927468de35a987150a3db3e1cc1c76c144bf58918a09c688c3da84303b5533241e691a6aa0758589e2a6498b1097974117782e909f0bbc6bf71  VoiceCall.conf
+efab4887136826089f2b7aa676bff751d68e56010d5a38e74a007a1c587fb23c899c4090b4543ab4e4b6793e545401afab33078193f9f731e6d2a0884d0cd70b  HiFi.conf
+6e54def33c91121ead0121a05ca7eb003155cd50a70833765ce4322d901ec05fef26057396732ce01f715178bfb21118ef2a7d21c5d4fd3fe119c53f3d05c3b3  PinePhone.conf
+f85c1c60ddcb8f302ae254888b955bcf0b174603595689ce963163e376f23e855bac437b331345ec00595ba1b36240f0400301743e49d3de17843769d7bd77bd  VoiceCall.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 bb11151e246d16e071761ebb35ca7f8b8cedbad8366e9bac6aed30554a795877cc9dccbe69ecca4b19b6f72bd87e613705f3ae4f2f40d2f9c2d09cc179999d59  sway-pinephone-keyboard.conf
 a7b49a638f664f7682ce6b00eb4d1ae26a429e89354056de05fb49d25fc9555d7f80e6d8f4b0a250878a4e7823860fd156068ed6604ce6cf58badef45c545161  x11-pinephone-keyboard.conf
@@ -1,47 +1,18 @@
 SectionVerb {
 	EnableSequence [
-		cset "name='Headphone Playback Switch' off"
-		cset "name='Headphone Source Playback Route' DAC"
-		cset "name='Line In Playback Switch' off"
-		cset "name='Line Out Playback Switch' off"
-		cset "name='Line Out Source Playback Route' Mono Differential"
-		cset "name='Mic1 Playback Switch' off"
-		cset "name='Mic2 Playback Switch' off"
-		cset "name='AIF1 DA0 Playback Volume' 160"
-		cset "name='AIF3 ADC Source Capture Route' None"
 		cset "name='AIF2 DAC Source Playback Route' None"
-		cset "name='DAC Playback Switch' on"
-		cset "name='DAC Playback Volume' 160"
-		cset "name='ADC Digital DAC Playback Switch' off"
-		cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on"
 		cset "name='AIF2 Digital DAC Playback Switch' off"
 		cset "name='DAC Reversed Playback Switch' off"
-		cset "name='Earpiece Playback Switch' off"
 		cset "name='Earpiece Source Playback Route' DACL"
-
-		cset "name='Line In Capture Switch' off"
-		cset "name='Mic1 Capture Switch' off"
 		cset "name='Mic1 Boost Volume' 7"
-		cset "name='Mic2 Capture Switch' off"
 		cset "name='Mic2 Boost Volume' 7"
-		cset "name='Mixer Capture Switch' off"
-		cset "name='Mixer Reversed Capture Switch' off"
-		cset "name='ADC Capture Volume' 160"
 		cset "name='ADC Gain Capture Volume' 7"
-		cset "name='AIF1 AD0 Capture Volume' 160"
-		cset "name='AIF1 Data Digital ADC Capture Switch' on"
 		cset "name='AIF2 ADC Mixer ADC Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 	]
-
-        DisableSequence [
-        ]
-
-	Value {
-	}
 }

 SectionDevice."Speaker" {
@@ -57,15 +28,16 @@ SectionDevice."Speaker" {
 	]

 	Value {
-		PlaybackVolume "Line Out Playback Volume"
-		PlaybackSwitch "Line Out Playback Switch"
+		PlaybackMixerElem "Line Out"
 		PlaybackChannels 2
 		PlaybackPriority 300
 		PlaybackPCM "hw:${CardId},0"
 	}
 }
+
 SectionDevice."Earpiece" {
 	Comment "Internal Earpiece"
+
 	EnableSequence [
 		cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
 		cset "name='Earpiece Playback Switch' on"
@@ -77,41 +49,50 @@ SectionDevice."Earpiece" {
 	]

 	Value {
-		PlaybackVolume "Earpiece Playback Volume"
-		PlaybackSwitch "Earpiece Playback Switch"
+		PlaybackMixerElem "Earpiece"
 		PlaybackChannels 2
 		PlaybackPriority 200
 		PlaybackPCM "hw:${CardId},0"
 	}
 }
+
 SectionDevice."Mic" {
 	Comment "Internal Microphone"
+
 	ConflictingDevice [
 		"Headset"
 	]
+
 	EnableSequence [
 		cset "name='Mic1 Capture Switch' on"
 	]
+
 	DisableSequence [
 		cset "name='Mic1 Capture Switch' off"
 	]
+
 	Value {
 		CapturePriority 100
 		CapturePCM "hw:${CardId},0"
 		CaptureChannels 2
 	}
 }
+
 SectionDevice."Headset" {
 	Comment "Headset Microphone"
+
 	ConflictingDevice [
 		"Mic"
 	]
+
 	EnableSequence [
 		cset "name='Mic2 Capture Switch' on"
 	]
+
 	DisableSequence [
 		cset "name='Mic2 Capture Switch' off"
 	]
+
 	Value {
 		CapturePriority 500
 		CapturePCM "hw:${CardId},0"
@@ -119,8 +100,10 @@ SectionDevice."Headset" {
 		JackControl "Headset Microphone Jack"
 	}
 }
+
 SectionDevice."Headphones" {
-	Comment "Headset"
+	Comment "Headphones"
+
 	EnableSequence [
 		cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
 		cset "name='Headphone Playback Switch' on"
@@ -132,8 +115,7 @@ SectionDevice."Headphones" {
 	]

 	Value {
-		PlaybackVolume "Headphone Playback Volume"
-		PlaybackSwitch "Headphone Playback Switch"
+		PlaybackMixerElem "Headphone"
 		PlaybackChannels 2
 		PlaybackPriority 500
 		PlaybackPCM "hw:${CardId},0"
@@ -1,11 +1,74 @@
 Syntax 2

+# To understand (or propose bug reports) for the different
+# parts of these configuration files, see:
+# https://www.alsa-project.org/alsa-doc/alsa-lib/group__ucm__conf.html
+
+# PinePhone-specific audio card structure help:
+# https://files.pine64.org/doc/PinePhone/PinePhone%20v1.2%20Released%20Schematic.pdf
+# https://xnux.eu/devices/feature/audio-pp.html
+
+# General PinePhone help:
+# https://wiki.pine64.org/index.php/PinePhone
+
 SectionUseCase."HiFi" {
-	File "/PinePhone/HiFi.conf"
+	File "/Allwinner/A64/PinePhone/HiFi.conf"
 	Comment "Play HiFi quality music"
 }

 SectionUseCase."Voice Call" {
-	File "/PinePhone/VoiceCall.conf"
+	File "/Allwinner/A64/PinePhone/VoiceCall.conf"
 	Comment "Make a phone call"
 }
+
+FixedBootSequence [
+	# Routing.
+	cset "name='ADC Digital DAC Playback Switch' off"
+	cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
+	cset "name='AIF1 Data Digital ADC Capture Switch' on"
+	cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on"
+	cset "name='AIF2 DAC Source Playback Route' AIF2"
+	# AIF2 (Modem) is mono.
+	cset "name='AIF2 DAC Stereo Playback Route' Mix Mono"
+	cset "name='AIF3 ADC Source Capture Route' None"
+	cset "name='DAC Playback Switch' on"
+	# Routes DACR->MIXL and DACL->MIXR => MIXL are MIXR are identical mono-mix of the DAC.
+	cset "name='DAC Reversed Playback Switch' on"
+	cset "name='Earpiece Source Playback Route' Left Mixer"
+	cset "name='Headphone Source Playback Route' DAC"
+	# The Pinephone speaker is mono.
+	cset "name='Line Out Source Playback Route' Mono Differential"
+]
+
+BootSequence [
+	# Playback volumes.
+	cset "name='AIF1 DA0 Playback Volume' 160"
+	cset "name='AIF2 DAC Playback Volume' 160"
+	cset "name='DAC Playback Volume' 160"
+	cset "name='Earpiece Playback Volume' 100%"
+	cset "name='Headphone Playback Volume' 70%"
+	cset "name='Line Out Playback Volume' 100%"
+	cset "name='Mic2 Boost Volume' 1"
+
+	# Capture volumes.
+	cset "name='ADC Capture Volume' 160"
+	cset "name='AIF1 AD0 Capture Volume' 160"
+	cset "name='AIF2 ADC Capture Volume' 160"
+]
+
+SectionDefaults [
+	# Switch playback off.
+	cset "name='Earpiece Playback Switch' off"
+	cset "name='Headphone Playback Switch' off"
+	cset "name='Line In Playback Switch' off"
+	cset "name='Line Out Playback Switch' off"
+	cset "name='Mic1 Playback Switch' off"
+	cset "name='Mic2 Playback Switch' off"
+
+	# Switch capture off.
+	cset "name='Line In Capture Switch' off"
+	cset "name='Mic1 Capture Switch' off"
+	cset "name='Mic2 Capture Switch' off"
+	cset "name='Mixer Capture Switch' off"
+	cset "name='Mixer Reversed Capture Switch' off"
+]
@@ -1,39 +1,14 @@
 SectionVerb {
 	EnableSequence [
-		cset "name='Headphone Playback Switch' off"
-		cset "name='Headphone Source Playback Route' DAC"
-		cset "name='Line In Playback Switch' off"
-		cset "name='Line Out Playback Switch' off"
-		cset "name='Line Out Source Playback Route' Mono Differential"
-		cset "name='Mic1 Playback Switch' off"
-		cset "name='Mic2 Playback Switch' off"
-		cset "name='AIF1 DA0 Playback Volume' 160"
-		cset "name='AIF2 DAC Playback Volume' 160"
-		cset "name='AIF3 ADC Source Capture Route' None"
 		cset "name='AIF2 DAC Source Playback Route' None"
-		cset "name='DAC Playback Switch' on"
-		cset "name='DAC Playback Volume' 160"
-		cset "name='ADC Digital DAC Playback Switch' off"
-		cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on"
 		cset "name='AIF2 Digital DAC Playback Switch' on"
 		cset "name='DAC Reversed Playback Switch' off"
-		cset "name='Earpiece Playback Switch' off"
 		cset "name='Earpiece Source Playback Route' DACL"
-
-		cset "name='Line In Capture Switch' off"
-		cset "name='Mic1 Capture Switch' off"
 		cset "name='Mic1 Boost Volume' 0"
 		cset "name='Mic1 Playback Volume' 7"
-		cset "name='Mic2 Capture Switch' off"
 		cset "name='Mic2 Boost Volume' 0"
 		cset "name='Mic2 Playback Volume' 7"
-		cset "name='Mixer Capture Switch' off"
-		cset "name='Mixer Reversed Capture Switch' off"
-		cset "name='ADC Capture Volume' 160"
 		cset "name='ADC Gain Capture Volume' 7"
-		cset "name='AIF1 AD0 Capture Volume' 160"
-		cset "name='AIF1 Data Digital ADC Capture Switch' on"
-		cset "name='AIF2 ADC Capture Volume' 160"
 		cset "name='AIF2 ADC Mixer ADC Capture Switch' on"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off"
@@ -41,9 +16,6 @@ SectionVerb {
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 	]

-        DisableSequence [
-        ]
-
 	Value {
 		PlaybackRate 8000
 	}
@@ -51,6 +23,7 @@ SectionVerb {

 SectionDevice."Speaker" {
 	Comment "Internal speaker"
+
 	EnableSequence [
 		cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
 		cset "name='Line Out Playback Switch' on"
@@ -62,15 +35,16 @@ SectionDevice."Speaker" {
 	]

 	Value {
-		PlaybackVolume "Line Out Playback Volume"
-		PlaybackSwitch "Line Out Playback Switch"
+		PlaybackMixerElem "Line Out"
 		PlaybackChannels 2
 		PlaybackPriority 300
 		PlaybackPCM "hw:${CardId},0"
 	}
 }
+
 SectionDevice."Earpiece" {
 	Comment "Internal Earpiece"
+
 	EnableSequence [
 		cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
 		cset "name='Earpiece Playback Switch' on"
@@ -82,41 +56,50 @@ SectionDevice."Earpiece" {
 	]

 	Value {
-		PlaybackVolume "Earpiece Playback Volume"
-		PlaybackSwitch "Earpiece Playback Switch"
+		PlaybackMixerElem "Earpiece"
 		PlaybackChannels 2
 		PlaybackPriority 500
 		PlaybackPCM "hw:${CardId},0"
 	}
 }
+
 SectionDevice."Mic" {
 	Comment "Internal Microphone"
+
 	ConflictingDevice [
 		"Headset"
 	]
+
 	EnableSequence [
 		cset "name='Mic1 Capture Switch' on"
 	]
+
 	DisableSequence [
 		cset "name='Mic1 Capture Switch' off"
 	]
+
 	Value {
 		CapturePriority 200
 		CapturePCM "hw:${CardId},0"
 		CaptureChannels 2
 	}
 }
+
 SectionDevice."Headset" {
 	Comment "Headset Microphone"
+
 	ConflictingDevice [
 		"Mic"
 	]
+
 	EnableSequence [
 		cset "name='Mic2 Capture Switch' on"
 	]
+
 	DisableSequence [
 		cset "name='Mic2 Capture Switch' off"
 	]
+
 	Value {
 		CapturePriority 500
 		CapturePCM "hw:${CardId},0"
@@ -124,8 +107,10 @@ SectionDevice."Headset" {
 		JackControl "Headset Microphone Jack"
 	}
 }
+
 SectionDevice."Headphones" {
-	Comment "Headset"
+	Comment "Headphones"
+
 	EnableSequence [
 		cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
 		cset "name='Headphone Playback Switch' on"
@@ -137,8 +122,7 @@ SectionDevice."Headphones" {
 	]

 	Value {
-		PlaybackVolume "Headphone Playback Volume"
-		PlaybackSwitch "Headphone Playback Switch"
+		PlaybackMixerElem "Headphone"
 		PlaybackChannels 2
 		PlaybackPriority 500
 		PlaybackPCM "hw:${CardId},0"
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-corsola
 pkgdesc="Google Corsola Chromebooks"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,7 +17,11 @@ depends="
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+_ucm_commit="b728563a07ebcd05545c60989412ae023b1dd06d"
+source="deviceinfo
+	modules-initfs
+	alsa-ucm-conf-$_ucm_commit.tar.gz::https://github.com/alsa-project/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
+"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

 build() {
@@ -30,11 +34,31 @@ package() {

 nonfree_firmware() {
 	pkgdesc="WiFi/BT firmware"
-	depends="linux-firmware-mediatek"
-	mkdir "$subpkgdir"
+		depends="linux-firmware-mediatek alsa-ucm-conf"
+
+	# Symlink for SOF firmware
+	_dir="$subpkgdir/lib/firmware/mediatek/sof-tplg"
+	mkdir -p "$_dir"
+
+	ln -s sof-mt8186.tplg "$_dir"/sof-mt8186-google-steelix.tplg
+
+	# Alsa UCM configs
+	_ucm_files="
+		ucm2/MediaTek/mt8186-sof/init.conf
+		ucm2/MediaTek/mt8186-sof/mt6366-rt1019-rt5682s/HiFi.conf
+		ucm2/MediaTek/mt8186-sof/mt6366-rt1019-rt5682s/init.conf
+		ucm2/MediaTek/mt8186-sof/mt6366-rt1019-rt5682s/sof-mt8186-mt6366-rt1019-rt5682s.conf
+		ucm2/conf.d/sof-mt8186_rt10/sof-mt8186_rt1019_rt5682s.conf
+	"
+	for file in $_ucm_files
+	do
+		install -Dm644 "$srcdir/alsa-ucm-conf-$_ucm_commit/$file" \
+			"$subpkgdir/usr/share/alsa/$file"
+	done
 }

 sha512sums="
 924d60f2d921a9e22a34c945f55cb45c6c19245aeaec4993ae03fcafc91c1533632c61178f1836cbd11b581a26fa2bed5445e12f2ecccb4096a0ee33f7cb2772  deviceinfo
 56fdcaa7a610497ed1bddbbfc0850f895bcfd79173b2e7de4bcf196f69120e1b62680da2a0b74543f153cb3d2b84055e71e258e7df938913aff66dca47061d7a  modules-initfs
+d33545d435755c2cca3b916d920464f3f711c6f09f48b68622f740f389c4faf95544467d9e3b418e562fadb8141ae37f2311166f228d5149434183736710567d  alsa-ucm-conf-b728563a07ebcd05545c60989412ae023b1dd06d.tar.gz
 "
@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-i9105p
-pkgdesc="Samsung Galaxy S2 Plus"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	linux-samsung-i9105p
-	mkbootimg
-	postmarketos-base
-	postmarketos-initramfs-minimal
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-initfs
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-52ce2a588e8daacb148b03da350c55a9afb26f54fbe925930d4153430efff53ecf7371dc7b9547a102d190205adbe5994288cc04a7113a5894c355072e62abcf  deviceinfo
-e70bae17df23dcaaaea0e2d3616556f04baa23f8ee1357785c0f539bf97282d8ddff53953e155b72689bb73beb38c2da3d08de2a61e866684edfa10a6593885d  modules-initfs
-"
@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy S2 Plus"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-i9105p"
-deviceinfo_year="2013"
-deviceinfo_dtb=""
-deviceinfo_arch="armv7"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-
-# Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="console=ttyS0,115200n8 mem=832M@0xA2000000 androidboot.console=ttyS0 vc-cma-mem=0/176M@0xCB000000 buildvariant=userdebug"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="4096"
-deviceinfo_header_version="0"
-deviceinfo_flash_offset_base="0xa2000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_heimdall_partition_kernel="KERNEL"
-deviceinfo_flash_heimdall_partition_rootfs="system"
-deviceinfo_flash_sparse="true"
@@ -1,9 +0,0 @@
-# Remove this file if unnecessary (CHANGEME!)
-# This file shall contain a list of modules to be included in the initramfs,
-# so that they are available in early boot stages. In general, it should
-# include modules to support unlocking FDE (touchscreen, panel, etc),
-# USB networking, and telnet in the debug-shell.
-# The format is one module name per line. Lines starting with the character
-# '#', and empty lines are ignored. If there are multiple kernel variants
-# with different initramfs module requirements, one modules-initfs.$variant
-# file should be created for each of them.
@@ -1,75 +0,0 @@
-# Maintainer: Caleb Connolly <caleb@postmarketos.org>
-# Kernel config based on: arch/arm64/configs/defconfig
-
-pkgname=linux-next
-pkgver=6.11_git20240802
-pkgrel=2
-_nextver="${pkgver#*_git}"
-pkgdesc="Linux next kernel"
-arch="aarch64"
-_carch="arm64"
-_flavor="generic-trailblazer"
-url="https://kernel.org"
-license="GPL-2.0-only"
-# FIXME: kconfigcheck isn't supported since we use fragments
-options="!strip !check !tracedeps pmb:cross-native"
-source="
-	https://gitlab.com/linux-kernel/linux-next/-/archive/next-$_nextver/linux-next-next-$_nextver.tar.gz
-	devices.config
-	pmos.config
-"
-makedepends="
-	bash
-	bc
-	bison
-	devicepkg-dev
-	findutils
-	flex
-	openssl-dev
-	perl
-	zstd
-	git
-	python3
-"
-builddir="$srcdir/linux-next-next-$_nextver"
-
-prepare() {
-	default_prepare
-	cp "$srcdir/pmos.config" "$builddir"/arch/"$_carch"/configs/
-	cp "$srcdir/devices.config" "$builddir"/arch/"$_carch"/configs/
-
-	# Generate .config
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-next-$_nextver" \
-		defconfig pmos.config devices.config
-}
-
-build() {
-	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	install -Dm644 "$builddir/arch/$_carch/boot/vmlinuz.efi" \
-			"$pkgdir/boot/linux.efi"
-
-	make modules_install dtbs_install \
-		ARCH="$_carch" \
-		INSTALL_PATH="$pkgdir"/boot/ \
-		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_MOD_STRIP=1 \
-		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
-
-	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
-
-	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir"/usr/share/kernel/next-"$_nextver"/kernel.release
-}
-
-sha512sums="
-d988886c3a191c3df1d19c9132c7ea563a55d638e2abdc44697f232ad6e87eee918b7e126d5a43c6359dfaf012c23b9c266d044b0e877313e18c2ca1a985cfab  linux-next-next-20240802.tar.gz
-e5b8530b8410d41d60c6c3a5cb4f73cdcdbcf432a8453ddb0b8901bf20083df4ae8c44ff2771aaa17c4a78afddfd604f929f05839bb513ad60809fbd7adb7056  devices.config
-d52f692935675b5b9300c7983848a26149914687a8b3aef3b90f50da3f6534de9b490c6778d490bb5a4202f1a45cc4d9178a1e1b8270a8d612d4181721629c02  pmos.config
-"
@@ -1,26 +0,0 @@
-# Config fragment for device features which aren't enabled in the upstream
-# defconfig. Use of =y heavily discouraged.
-
-# OnePlus 6/6T
-CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=m
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-# SHIFT6mq
-CONFIG_DRM_PANEL_VISIONOX_RM69299=m
-
-# msm8916
-CONFIG_ARM64_ERRATUM_834220=y
-CONFIG_EXTCON_QCOM_SPMI_MISC=m
-# gt58/gt510
-CONFIG_TOUCHSCREEN_ZINITIX=m
-CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0=m
-CONFIG_PWM_CLK=m
-CONFIG_SND_SOC_TFA989X=m
-CONFIG_CM3323=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-
@@ -1,228 +0,0 @@
-# general
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CGROUPS=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_DEVTMPFS=y
-CONFIG_DM_CRYPT=m
-CONFIG_INPUT_EVDEV=y
-CONFIG_SYSVIPC=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_VT=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_CGROUP_BPF=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_UEVENT_HELPER=y
-CONFIG_USER_NS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_SAMSUNG_TUI=n
-CONFIG_TZDEV=n
-
-# filesystems
-CONFIG_BTRFS_FS=m
-CONFIG_EXFAT_FS=m
-CONFIG_EXT4_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_NLS_ASCII=y
-
-# FDE
-CONFIG_MD=y
-CONFIG_CRYPTO_SHA256=y # TODO: make this module
-CONFIG_CRYPTO_AES=y # TODO: make this module
-
-# nftables
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NFT_CT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_REJECT=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_NAT=m
-
-# wireguard
-CONFIG_WIREGUARD=m
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CT=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_CONNTRACK_MARK=y
-
-# waydroid
-CONFIG_ANDROID_BINDERFS=n
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDER_IPC_SELFTEST=n
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BPF_SYSCALL=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_CGROUP_BPF=y
-CONFIG_FUSE_FS=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VLAN_8021Q=m # prerequisite for bridge
-
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=n
-
-# iwd
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_CRYPTO_AES=y # TODO: make this module
-CONFIG_CRYPTO_CBC=y # TODO: make this module
-CONFIG_CRYPTO_CMAC=y # TODO: make this module
-CONFIG_CRYPTO_DES=y # TODO: make this module
-CONFIG_CRYPTO_ECB=y # TODO: make this module
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y # TODO: make this module
-CONFIG_CRYPTO_SHA1=y # TODO: make this module
-CONFIG_CRYPTO_SHA256=y # TODO: make this module
-CONFIG_CRYPTO_SHA512=y # TODO: make this module
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_KEYS=y
-CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_PKCS7_MESSAGE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_RFKILL=m
-
-# containers (lxc, Docker)
-CONFIG_NAMESPACES=y
-CONFIG_NET_NS=y
-CONFIG_PID_NS=y
-CONFIG_IPC_NS=y
-CONFIG_UTS_NS=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CPUSETS=y
-CONFIG_KEYS=y
-CONFIG_VETH=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m # needed for lxc
-CONFIG_IP_NF_NAT=m
-CONFIG_NF_NAT=m
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BLK_DEV_DM=m # Storage Drivers
-CONFIG_DUMMY=m # Network Drivers
-CONFIG_USER_NS=y
-CONFIG_BLK_CGROUP=y # Optional section
-CONFIG_BLK_DEV_THROTTLING=y # Optional section
-CONFIG_CGROUP_PERF=y # Optional section
-CONFIG_NET_CLS_CGROUP=m # Optional section
-CONFIG_NET_SCHED=y # Optional section
-CONFIG_FAIR_GROUP_SCHED=y # Optional section
-CONFIG_RT_GROUP_SCHED=y # Optional section
-CONFIG_IP_NF_TARGET_REDIRECT=m # Optional section
-CONFIG_IP_VS=m # Optional section
-CONFIG_IP_VS_NFCT=y # Optional section
-CONFIG_IP_VS_PROTO_TCP=y # Optional section
-CONFIG_IP_VS_PROTO_UDP=y # Optional section
-CONFIG_IP_VS_RR=m # Optional section
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y # Optional section
-CONFIG_EXT4_FS_SECURITY=y # Optional section
-CONFIG_CFS_BANDWIDTH=y # Optional section
-CONFIG_CHECKPOINT_RESTORE=y # Needed for lxc
-CONFIG_MEMCG=y
-CONFIG_DM_THIN_PROVISIONING=m # Storage Drivers
-CONFIG_SWAP=y
-CONFIG_VXLAN=m # Network Drivers
-CONFIG_IP6_NF_TARGET_MASQUERADE=m # Needed for lxc
-CONFIG_BRIDGE_VLAN_FILTERING=y # This is already enabled
-CONFIG_MACVLAN=m # Network Drivers
-CONFIG_CGROUP_NET_PRIO=y # Optional section
-CONFIG_OVERLAY_FS=m # Storage Drivers
-CONFIG_IPVLAN=m # Network Drivers
-CONFIG_SECCOMP=y # Optional section
-CONFIG_CGROUP_PIDS=y # Optional section
-
-# zram
-CONFIG_ZRAM=m
-CONFIG_ZSMALLOC=m
-CONFIG_ZSMALLOC_STAT=y
-CONFIG_ZRAM_MEMORY_TRACKING=y
-CONFIG_CRYPTO_LZ4=m
-CONFIG_LZ4_COMPRESS=m
-CONFIG_SWAP=y
-
-# usb gadgets
-# disable legacy gadgets
-CONFIG_USB_ETH=n
-CONFIG_USB_FUNCTIONFS=n
-CONFIG_USB_MASS_STORAGE=n
-CONFIG_USB_G_SERIAL=n
-# enable configfs gadgets
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-
-# other
-CONFIG_BLK_DEV_NBD=y # netboot
-CONFIG_INPUT_UINPUT=m # fbkeyboard, buffyboard
-CONFIG_LEDS_TRIGGER_TIMER=m # hfd-service
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m # change MTU, e.g. for Wireguard
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m # change MTU, e.g. for Wireguard
-
-# EFI
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
-CONFIG_EFI_ESRT=y
-CONFIG_PSTORE=y # dependency of CONFIG_EFI_VARS_PSTORE
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-
-CONFIG_EFI_ZBOOT=y
-
-# Compress modules
-CONFIG_HAVE_KERNEL_ZSTD=y
-# Doesn't seem to be working correctly
-#CONFIG_MODULE_COMPRESS_ZSTD=y
-CONFIG_ZSTD_COMMON=y
-CONFIG_ZSTD_COMPRESS=y
-CONFIG_ZSTD_DECOMPRESS=y
-CONFIG_DECOMPRESS_ZSTD=y
-
-# Enable dynamic debug
-CONFIG_DYNAMIC_DEBUG=y
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt81xx
 pkgver=6.10.0_rc4_git20240624
-pkgrel=1
+pkgrel=2
 pkgdesc="Mediatek MT8186/8192/8195 kernel package"
 arch="aarch64"
 url="https://kernel.org"
@@ -37,6 +37,7 @@ source="
 	$pkgname-$_commit.tar.gz::https://gitlab.collabora.com/google/$_repository/-/archive/$_commit/chromeos-kernel-$_commit.tar.gz
 	0001-arm64-dts-mediatek-Add-dts-for-hayato-rev5-sku0.patch
 	remove-audio-routing.patch
+	update-ADSP-reserved-memory-region.patch
 	$_config
 "
 builddir="$srcdir/$_repository-$_commit"
@@ -73,4 +74,5 @@ sha512sums="
 bf39ed6646a869a7a99dc7f0ccc7bbaca0c50776e87848cb1a9e55bef317a73c08549a9acb8cce5c394ab3bf90667e4d1cf8a3671bb9de15d2a470d5e8be0261  0001-arm64-dts-mediatek-Add-dts-for-hayato-rev5-sku0.patch
 f10464bf131ba44686a36a35aaf16492915413893d1b3faa43959d5f853b5ed66419f835565836a17480cd3458de0943cee72e700713e00125c8ecd184f3b677  remove-audio-routing.patch
 ca5107ab3f9954a88431231243acf5b60da61aa377ce024fc3b30a9f6ca115ef55a3cdb14efc6d6e4ee4c28fd8cfa87ed01f2089e7683d7076b8d59abb12d896  config-postmarketos-mediatek-mt81xx.aarch64
+614ebc613902c088afc32ced6e612f3bb04405a36431a53ace96516a41e7c776e0353db55356ae9fc125b376049064720d4ad17cd7f1da2b3d2503fb0fa812a1  update-ADSP-reserved-memory-region.patch
 "
@@ -0,0 +1,104 @@
+From mboxrd@z Thu Jan  1 00:00:00 1970
+Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
+	(No client certificate requested)
+	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E7012A1C9
+	for <linux-kernel@vger.kernel.org>; Fri, 19 Jul 2024 04:58:35 +0000 (UTC)
+Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.170
+ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+	t=1721365116; cv=none; b=GxeYNhUZ4DniUpiJ9KNtJz68Oks+oOrHAqm4lM8Z3yiPRwb1h+uglS6msPMITykq+wGl4e5Gl8YCohl/4y8+4PsbfjCC94Sw0OZRM4jzXf5unGEyJies10KusNdA24+C0QyeNFc+OM88jr8Cgx5I5v8E58Zy0r1pyur7PmobLP0=
+ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
+	s=arc-20240116; t=1721365116; c=relaxed/simple;
+	bh=5grUOfL+eh719ngtKJNkvdJNeKiogylOPeMvpQawcDY=;
+	h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VmdUjENG8q/i6/4v54oivl1MGOnSJHPlPXrCK5xVsfqB2r/No11oEHgeUJ5mLrvof920wUpebSloNI9nF0N5BRptLr6k4zpEg5Nw2GE7APbNpkfz+hAYPVJZHWz+OrEmZolPiudsFLPxkKAk+3SfPsLHT5zFU5EmZoPdr/0CRc0=
+ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=cUMJnpS/; arc=none smtp.client-ip=209.85.167.170
+Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org
+Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org
+Authentication-Results: smtp.subspace.kernel.org;
+	dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="cUMJnpS/"
+Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3c9cc681e4fso855917b6e.0
+        for <linux-kernel@vger.kernel.org>; Thu, 18 Jul 2024 21:58:35 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=chromium.org; s=google; t=1721365114; x=1721969914; darn=vger.kernel.org;
+        h=content-transfer-encoding:mime-version:message-id:date:subject:cc
+         :to:from:from:to:cc:subject:date:message-id:reply-to;
+        bh=HvPAyIWQtNqLx7WUlcX5/vDSF7IPzDdVVmoFWrTiQJU=;
+        b=cUMJnpS/0gWmzD4Q3+mcgCwiOGe9Dc1OtOhIjXRYovVCCUY7I3VYCn+gnm7Xno/JV9
+         1wu7acjXYpSCJIUDO+2nf91MHKhP7xhX9wET0uzUXQDejeGWMENYsV8HkIcpL91msBdO
+         NkEvDrI2guvRGI6sFod2e/+1kAGYYBB2fdvkc=
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=1e100.net; s=20230601; t=1721365114; x=1721969914;
+        h=content-transfer-encoding:mime-version:message-id:date:subject:cc
+         :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
+         :reply-to;
+        bh=HvPAyIWQtNqLx7WUlcX5/vDSF7IPzDdVVmoFWrTiQJU=;
+        b=JEk90mKs3Z3GAGZ/S4RDIzMSGaPJUm/KL2AIcQ4PV3OGeeRgZEw01cc1Du7moSkh80
+         CdzFVRgdVQxjbVcAO2J3lLj0snvoCvSiVh3iut8yUUKYVnVQrjxM1F6LS6xN8CoNIPqn
+         SvKtSueygewwjo/JsNArO4iK/3Co3OKxFp1g57fIhnkHgExATIN956ygUenmZd/7BPXL
+         e6MBNeQmsWujhhrTzEra/HSkR+geQRYdihCVCxevg+QGS9pSqdabw0D8pxGXqhRyfF0H
+         I7U7oDHrCTlsm6/2ma0pHi/VTKMoOy7cUv35+JQpUb2UZJnfY/pL/fmgQUTr+PwPGBBc
+         0fGA==
+X-Forwarded-Encrypted: i=1; AJvYcCWOC4Dd/teVtJXabkXtKiCa5KLqq01g9zJdJiqvcXxpda1FU6iQ/Ni/hJt9gyHF4Z1gRUyrQ46xL8WKovfsaqvUoUmXOwzAtyGIzWjJ
+X-Gm-Message-State: AOJu0YzL5CkEp1n33V7NDHWHbCULfqJZfC00S/pE8oWE+JpiDrKqAwme
+	40Bt4nrjz30A/twqRxuuqS3kR5Hdj/CyQrWjxEg2fNXvdxyjytFdCoRzamBwCg==
+X-Google-Smtp-Source: AGHT+IGpiUr+CwP2dyLNoFMb2Gyi+iGSCs3Az6ihXhSH1HtJoGXSvzeVXRwA6MyZOfyivrJ/f6qmBA==
+X-Received: by 2002:a05:6808:300f:b0:3d9:dd2c:f1e3 with SMTP id 5614622812f47-3dad521abd7mr7316927b6e.25.1721365114323;
+        Thu, 18 Jul 2024 21:58:34 -0700 (PDT)
+Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:4760:1d59:4f13:7c6f])
+        by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-79db9fc1dd8sm422310a12.84.2024.07.18.21.58.32
+        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
+        Thu, 18 Jul 2024 21:58:33 -0700 (PDT)
+From: Fei Shao <fshao@chromium.org>
+To: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
+	Chen-Yu Tsai <wenst@chromium.org>
+Cc: Fei Shao <fshao@chromium.org>,
+	Conor Dooley <conor+dt@kernel.org>,
+	Krzysztof Kozlowski <krzk+dt@kernel.org>,
+	Matthias Brugger <matthias.bgg@gmail.com>,
+	Rob Herring <robh@kernel.org>,
+	devicetree@vger.kernel.org,
+	linux-arm-kernel@lists.infradead.org,
+	linux-kernel@vger.kernel.org,
+	linux-mediatek@lists.infradead.org
+Subject: [PATCH] arm64: dts: mediatek: mt8186-corsola: Update ADSP reserved memory region
+Date: Fri, 19 Jul 2024 12:58:04 +0800
+Message-ID: <20240719045823.3264974-1-fshao@chromium.org>
+X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog
+Precedence: bulk
+X-Mailing-List: linux-kernel@vger.kernel.org
+List-Id: <linux-kernel.vger.kernel.org>
+List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
+List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Corsola firmware reserves the memory region of [0x60000000, 0x61100000)
+exclusively for ADSP usage.
+But in fact, a 6 MB "hole" of [0x60A00000, 0x61000000) didn't get
+assigned to the ADSP node in the Corsola device tree, meaning no audio
+tasks can access and utilize that memory section.
+
+Update the reserved ADSP memory region to fill the gap.
+
+Fixes: 8855d01fb81f ("arm64: dts: mediatek: Add MT8186 Krabby platform based Tentacruel / Tentacool")
+Signed-off-by: Fei Shao <fshao@chromium.org>
+---
+
+ arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
+index afdab5724eaa..0c4a26117428 100644
+--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
+@@ -169,7 +169,7 @@ adsp_dma_mem: memory@61000000 {
+ 
+ 		adsp_mem: memory@60000000 {
+ 			compatible = "shared-dma-pool";
+-			reg = <0 0x60000000 0 0xA00000>;
+			reg = <0 0x60000000 0 0x1000000>;
+ 			no-map;
+ 		};
+ 
+-- 
+2.45.2.1089.g2a221341d9-goog
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8998"
 pkgname=linux-$_flavor
 pkgver=6.0
-pkgrel=1
+pkgrel=2
 _commit="90169e6e9fee29fae14aeac0a905246be5ce6304"
 pkgdesc="Mainline Kernel fork for MSM8998 devices"
 arch="aarch64"
@@ -41,8 +41,9 @@ prepare() {

 build() {
 	unset LDFLAGS
+	# V=1: workaround for pma#1990, remove after upgrading to >= 6.2
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1))-$_flavor"
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-$_flavor" V=1
 }

 package() {
@@ -2,8 +2,8 @@

 _flavor="postmarketos-qcom-sc7280"
 pkgname=linux-$_flavor
-pkgver=6.9.0
-pkgrel=3
+pkgver=6.10.3
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SC7280/SM7325/QCM6490 devices"
 arch="aarch64"
 _carch="arm64"
@@ -13,7 +13,7 @@ options="!strip !check !tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
 	"
-makedepends="bash bison findutils flex installkernel openssl-dev perl"
+makedepends="bash bison findutils flex installkernel openssl-dev perl python3"

 _repo="linux"
 _config="config-$_flavor.$arch"
@@ -54,6 +54,6 @@ package() {
 }

 sha512sums="
-c0c1cddf6dc13b8b8657ebbfec822169ee877f78f5955ad9c050e4e854e18f805a18ce0740b5fdf9051541ee4136ac9fb488a0ed76d5585759c281af4d317cf5  linux-v6.9.0-sc7280.tar.gz
-c3b20cdd2977af5174bc8628f08ae9423711540d92b366f0bf6d1f3cccf8d736e37ebacc63d79a6f1b8e7f2bc13cb9526613a282db349f552e3ea47c532cc48c  config-postmarketos-qcom-sc7280.aarch64
+56f49dc8e4ac60f7c86b55fc5eee98655f11f66fa7d6a4176b75407977f06d5fa65595a68565d6a17947d90b9806d040a58b749ade4ff40608a169d970800d9b  linux-v6.10.3-sc7280.tar.gz
+4033dff36b1e85fbd975a0fbd1f8bba580b95a3d257bbc2eacdd04a9aae342e7940ae6118bdeaf66c3db1a4e2264fd8300f3d2bc2832dccf1145178e06918643  config-postmarketos-qcom-sc7280.aarch64
 "
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.0 Kernel Configuration
+# Linux/arm64 6.10.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130201
+CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,7 +13,6 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -111,7 +110,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_SCHED_HW_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
@@ -128,6 +127,7 @@ CONFIG_TREE_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -159,6 +159,7 @@ CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -222,7 +223,6 @@ CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -298,6 +298,7 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_AIROHA is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
@@ -378,6 +379,9 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 CONFIG_CAVIUM_ERRATUM_23144=y
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
@@ -681,6 +685,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_PMD_MKWRITE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_WANTS_EXECMEM_LATE=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -719,6 +724,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
 CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y

 #
 # GCOV-based kernel profiling
@@ -732,10 +738,11 @@ CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT=4
+CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
+CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -764,7 +771,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -903,7 +909,7 @@ CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
+CONFIG_HAVE_GUP_FAST=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -934,6 +940,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -965,6 +972,7 @@ CONFIG_SECRETMEM=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_EXECMEM=y

 #
 # Data Access Monitoring
@@ -1863,6 +1871,7 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
+# CONFIG_PFCP is not set
 # CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
@@ -1978,6 +1987,7 @@ CONFIG_FIXED_PHY=y
 #
 # MII PHY device drivers
 #
+# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -2598,6 +2608,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_SCMI is not set
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
@@ -3039,6 +3050,7 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_CORE=y
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_SMPRO is not set
@@ -3889,11 +3901,11 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_AUX_BUS=y
 CONFIG_DRM_DISPLAY_HELPER=y
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
+# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
+# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_EXEC=y
 CONFIG_DRM_SCHED=y

@@ -3970,6 +3982,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
@@ -3991,11 +4004,13 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 CONFIG_DRM_PANEL_RAYDIUM_RM692E5=m
+# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
@@ -4097,6 +4112,7 @@ CONFIG_DRM_AUX_HPD_BRIDGE=y
 # CONFIG_DRM_PL111 is not set
 # CONFIG_DRM_LIMA is not set
 # CONFIG_DRM_PANFROST is not set
+# CONFIG_DRM_PANTHOR is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
@@ -4374,7 +4390,6 @@ CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_IDT821034 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98090 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
@@ -4404,8 +4419,8 @@ CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_PCM6240 is not set
 # CONFIG_SND_SOC_PEB2466 is not set
-# CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
 # CONFIG_SND_SOC_RT1308_SDW is not set
 # CONFIG_SND_SOC_RT1316_SDW is not set
@@ -4631,6 +4646,7 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_HID_U2FZERO is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -4797,7 +4813,7 @@ CONFIG_USB_DWC3_QCOM=y
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
-# CONFIG_USB_ONBOARD_HUB is not set
+# CONFIG_USB_ONBOARD_DEV is not set

 #
 # USB Physical Layer drivers
@@ -5040,7 +5056,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set

 #
@@ -5096,6 +5111,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -5235,6 +5251,8 @@ CONFIG_VIRTIO=y
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
+CONFIG_ARM64_PLATFORM_DEVICES=y
+# CONFIG_EC_ACER_ASPIRE1 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5392,6 +5410,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_MAILBOX=y
 # CONFIG_ARM_MHU is not set
 # CONFIG_ARM_MHU_V2 is not set
+# CONFIG_ARM_MHU_V3 is not set
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
@@ -5670,6 +5689,7 @@ CONFIG_IIO=y
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
+# CONFIG_AD7173 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
@@ -5686,6 +5706,7 @@ CONFIG_IIO=y
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
+# CONFIG_AD7944 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
@@ -5824,6 +5845,8 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
+# CONFIG_AD9739A is not set
+# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -5967,6 +5990,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
+# CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
@@ -6620,6 +6644,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
@@ -6780,7 +6805,6 @@ CONFIG_CRYPTO_USER_API_RNG=y
 # CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-CONFIG_CRYPTO_STATS=y
 # end of Userspace interface

 CONFIG_CRYPTO_HASH_INFO=y
@@ -6948,13 +6972,13 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
+CONFIG_DMA_NEED_SYNC=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
@@ -7104,6 +7128,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
@@ -7193,6 +7218,7 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
@@ -7263,6 +7289,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
+# CONFIG_TEST_FPU is not set
 # CONFIG_TEST_OBJPOOL is not set
 CONFIG_ARCH_USE_MEMTEST=y
 CONFIG_MEMTEST=y
@@ -3,7 +3,7 @@
 # Maintainer: Lux Aliaga <they@mint.lgbt>
 pkgname=linux-postmarketos-qcom-sm6125
 pkgver=6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline Kernel fork for SM6125 devices"
 arch="aarch64"
 _carch="arm64"
@@ -39,8 +39,9 @@ prepare() {

 build() {
 	unset LDFLAGS
+	# V=1: workaround for pma#1990, remove after upgrading to >= 6.2
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" V=1
 }

 package() {
@@ -1,51 +0,0 @@
-This fixes compilation with ANDROID_PARANOID_NETWORK disabled. Without this
-patch, compilation breaks with:
-
-/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:
-In function 'cap_capable':
-/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:91:40:
-error: 'AID_NET_RAW' undeclared (first use in this function)
-  if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW))
-                                        ^~~~~~~~~~~
-/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:91:40:
-note: each undeclared identifier is reported only once for each function it
-appears in
-/home/pmos/build/src/android_kernel_samsung_latona-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78/security/commoncap.c:93:42:
-error: 'AID_NET_ADMIN' undeclared (first use in this function)
-  if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN))
---
-From e9a85c71afa38ee304e71c86ca7d74ed4658318c Mon Sep 17 00:00:00 2001
-From: Tushar Behera <tushar.behera@linaro.org>
-Date: Mon, 26 Mar 2012 16:54:15 +0530
-Subject: [PATCH] security: Add proper checks for Android specific capability
- checks
-
-Commit b641072 ("security: Add AID_NET_RAW and AID_NET_ADMIN capability
-check in cap_capable().") introduces additional checks for AID_NET_xxx
-macros. Since the header file including those macros are conditionally
-included, the checks should also be conditionally executed.
-
-Change-Id: Iaec5208d5b95a46b1ac3f2db8449c661e803fa5b
-Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
---
- security/commoncap.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/security/commoncap.c b/security/commoncap.c
-index 897af00e477..0051ac2d058 100644
--- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -80,10 +80,12 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
- 		int cap, int audit)
- {
-+#ifdef CONFIG_ANDROID_PARANOID_NETWORK
- 	if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW))
- 		return 0;
- 	if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN))
- 		return 0;
-+#endif
- 
- 	for (;;) {
- 		/* The creator of the user namespace has all caps. */
@@ -1,69 +0,0 @@
-From patchwork Sun Nov 18 20:05:13 2012
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Peter Foley <pefoley2@verizon.net>
-X-Patchwork-Id: 1761511
-Return-Path: <linux-kbuild-owner@vger.kernel.org>
-X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org
-Delivered-To: patchwork-process-083081@patchwork1.kernel.org
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
-	by patchwork1.kernel.org (Postfix) with ESMTP id 78BDF3FCDE
-	for <patchwork-linux-kbuild@patchwork.kernel.org>;
-	Sun, 18 Nov 2012 21:04:50 +0000 (UTC)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1752505Ab2KRVEt (ORCPT
-	<rfc822;patchwork-linux-kbuild@patchwork.kernel.org>);
-	Sun, 18 Nov 2012 16:04:49 -0500
-Received: from vms173019pub.verizon.net ([206.46.173.19]:63407 "EHLO
-	vms173019pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752411Ab2KRVEt (ORCPT
-	<rfc822;linux-kbuild@vger.kernel.org>);
-	Sun, 18 Nov 2012 16:04:49 -0500
-X-Greylist: delayed 3600 seconds by postgrey-1.27 at vger.kernel.org;
-	Sun, 18 Nov 2012 16:04:49 EST
-Received: from linux.foleyremote.com ([unknown] [96.241.26.26])
-	by vms173019.mailsrvcs.net
-	(Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16
-	2009))
-	with ESMTPA id <0MDP00A8H93H2UG1@vms173019.mailsrvcs.net>; Sun,
-	18 Nov 2012 14:04:30 -0600 (CST)
-From: pefoley2@verizon.net
-To: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
-	mmarek@suse.cz
-Cc: Peter Foley <pefoley2@verizon.net>
-Subject: [PATCH 1/5] kbuild: remove deprecated use of defined in timeconst.pl
-Date: Sun, 18 Nov 2012 15:05:13 -0500
-Message-id: <1353269117-39917-1-git-send-email-pefoley2@verizon.net>
-X-Mailer: git-send-email 1.8.0
-Sender: linux-kbuild-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kbuild.vger.kernel.org>
-X-Mailing-List: linux-kbuild@vger.kernel.org
-
-From: Peter Foley <pefoley2@verizon.net>
-
-Fix this warning by removing a unneeded use of defined
-
-TIMEC   kernel/timeconst.h
-defined(@array) is deprecated at kernel/timeconst.pl line 373.
-  	(Maybe you should just omit the defined()?)
-
-Signed-off-by: Peter Foley <pefoley2@verizon.net>
---
- kernel/timeconst.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
-index eb51d76..0461239 100644
--- a/kernel/timeconst.pl
-+++ b/kernel/timeconst.pl
-@@ -370,7 +370,7 @@ if ($hz eq '--can') {
- 	}
- 
- 	@val = @{$canned_values{$hz}};
-	if (!defined(@val)) {
-+	if (!@val) {
- 		@val = compute_values($hz);
- 	}
- 	output($hz, @val);
@@ -1,78 +0,0 @@
-# Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm/configs/(CHANGEME!)
-
-pkgname=linux-samsung-i9105p
-pkgver=3.0.31
-pkgrel=0
-pkgdesc="Samsung Galaxy S2 Plus kernel fork"
-arch="armv7"
-_carch="arm"
-_flavor="samsung-i9105p"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="
-	bash
-	bc
-	bison
-	devicepkg-dev
-	findutils
-	flex
-	openssl-dev
-	perl
-	gcc4
-	msm-fb-refresher
-"
-
-# Compiler: GCC 4 (doesn't boot when compiled with newer versions)
-if [ "${CC:0:5}" != "gcc4-" ]; then
-	CC="gcc4-$CC"
-	HOSTCC="gcc4-gcc"
-	CROSS_COMPILE="gcc4-$CROSS_COMPILE"
-fi
-
-
-# Source
-_repository="android-kernel-samsung-i9105p"
-_commit="f2fd2e7d9bc81b99f97c3e70d990e1f29c4d0f82"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/VaporGame/$_repository/archive/$_commit.tar.gz
-	$_config
-	kernel-use-the-gnu89-standard-explicitly.patch
-	gcc10-extern_YYLOC_global_declaration.patch
-	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-	1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
-	03_fix_paranoid_network_disabled.patch
-	linux3.4-fix-piggy.gzip.S.patch
-"
-builddir="$srcdir/$_repository-$_commit"
-_outdir="out"
-
-prepare() {
-	make ARCH="$_carch" mrproper
-	default_prepare
-	. downstreamkernel_prepare
-}
-
-build() {
-	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" \
-		"$_flavor" "$_outdir"
-}
-
-sha512sums="
-7e909a2950c0c68ba1dc6bfe34f9516b02a529663c2c20b3b40b6316e9b2450137b07bfcd65c6d7b3d8c0b8aca7e2d1276a05859f952602df2a305b78f584f41  linux-samsung-i9105p-f2fd2e7d9bc81b99f97c3e70d990e1f29c4d0f82.tar.gz
-1314261766fc93998281d4192b30fb00dec494ec845155d3565ba46970335f66b18c0dc3ad1e400c11de38fd738695b04663f4ca81206e27745f4d5e0d990912  config-samsung-i9105p.armv7
-ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
-b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-191746d2f7338a6afc3fe0f07a6be9164883c8ef78753727a4dcb4374e950243f27318eee17171c1fba2d86c5bcc2293568c9dad2293129ea703292b69389b25  1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
-df62e03666313bb03d9a455eac875f170a55d378b6e56b847c1c6ff1ce5cfafcfdf1d7605754ca3c684840ea00357f9ec4c6621f6ff77377132a484b9258f6f7  03_fix_paranoid_network_disabled.patch
-080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188  linux3.4-fix-piggy.gzip.S.patch
-"
@@ -1,77 +0,0 @@
-# Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm/configs/(CHANGEME!)
-
-pkgname=linux-samsung-i9105p
-pkgver=3.0.31
-pkgrel=0
-pkgdesc="Samsung Galaxy S2 Plus kernel fork"
-arch="armv7"
-_carch="arm"
-_flavor="samsung-i9105p"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="
-	bash
-	bc
-	bison
-	devicepkg-dev
-	findutils
-	flex
-	openssl-dev
-	perl
-	gcc4
-"
-
-# Compiler: GCC 4 (doesn't boot when compiled with newer versions)
-if [ "${CC:0:5}" != "gcc4-" ]; then
-	CC="gcc4-$CC"
-	HOSTCC="gcc4-gcc"
-	CROSS_COMPILE="gcc4-$CROSS_COMPILE"
-fi
-
-
-# Source
-_repository="android_kernel_samsung_i9105p"
-_commit="26a6d7902605f1983afe41c724f22969db21c2fd"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/VaporGame/$_repository/archive/$_commit.tar.gz
-	$_config
-	kernel-use-the-gnu89-standard-explicitly.patch
-	gcc10-extern_YYLOC_global_declaration.patch
-	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-	1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
-	03_fix_paranoid_network_disabled.patch
-	linux3.4-fix-piggy.gzip.S.patch
-"
-builddir="$srcdir/$_repository-$_commit"
-_outdir="out"
-
-prepare() {
-	make ARCH="$_carch" mrproper
-	default_prepare
-	. downstreamkernel_prepare
-}
-
-build() {
-	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" \
-		"$_flavor" "$_outdir"
-}
-
-sha512sums="
-4715b5765261b217e0e5677cde6561ab7a33204e343cb1062a53a03e2c4cd77d52cee571bc04901a344c84ab70ca047f7c162953fec3aa07b1bbd5a5e1db03d5  linux-samsung-i9105p-26a6d7902605f1983afe41c724f22969db21c2fd.tar.gz
-f9dd69d0eb64340c4cc6ab11864ca3c1ec75d3cce76baa38394f05429798b7e993a96962faaa2a028870fcf3a05d8b0f85e286d9ef54f2745c888f209c3afbea  config-samsung-i9105p.armv7
-ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
-b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-191746d2f7338a6afc3fe0f07a6be9164883c8ef78753727a4dcb4374e950243f27318eee17171c1fba2d86c5bcc2293568c9dad2293129ea703292b69389b25  1-5-kbuild-remove-deprecated-use-of-defined-in-timeconst.pl.patch
-df62e03666313bb03d9a455eac875f170a55d378b6e56b847c1c6ff1ce5cfafcfdf1d7605754ca3c684840ea00357f9ec4c6621f6ff77377132a484b9258f6f7  03_fix_paranoid_network_disabled.patch
-080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188  linux3.4-fix-piggy.gzip.S.patch
-"
@@ -1 +0,0 @@
-../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch
@@ -1,67 +0,0 @@
-From 51b97e354ba9fce1890cf38ecc754aa49677fc89 Mon Sep 17 00:00:00 2001
-From: "Kirill A. Shutemov" <kirill@shutemov.name>
-Date: Mon, 20 Oct 2014 12:23:12 +0300
-Subject: kernel: use the gnu89 standard explicitly
-
-From: "Kirill A. Shutemov" <kirill@shutemov.name>
-
-commit 51b97e354ba9fce1890cf38ecc754aa49677fc89 upstream.
-
-Sasha Levin reports:
- "gcc5 changes the default standard to c11, which makes kernel build
-  unhappy
-
-  Explicitly define the kernel standard to be gnu89 which should keep
-  everything working exactly like it was before gcc5"
-
-There are multiple small issues with the new default, but the biggest
-issue seems to be that the old - and very useful - GNU extension to
-allow a cast in front of an initializer has gone away.
-
-Patch updated by Kirill:
- "I'm pretty sure all gcc versions you can build kernel with supports
-  -std=gnu89.  cc-option is redunrant.
-
-  We also need to adjust HOSTCFLAGS otherwise allmodconfig fails for me"
-
-Note by Andrew Pinski:
- "Yes it was reported and both problems relating to this extension has
-  been added to gnu99 and gnu11.  Though there are other issues with the
-  kernel dealing with extern inline have different semantics between
-  gnu89 and gnu99/11"
-
-End result: we may be able to move up to a newer stdc model eventually,
-but right now the newer models have some annoying deficiencies, so the
-traditional "gnu89" model ends up being the preferred one.
-
-Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-Singed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
---
- Makefile |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
--- a/Makefile
-+++ b/Makefile
-@@ -241,7 +241,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
- 
- HOSTCC       = gcc
- HOSTCXX      = g++
-HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
- HOSTCXXFLAGS = -O2
- 
- # Decide whether to build built-in, modular, or both.
-@@ -373,7 +373,9 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstric
- 		   -fno-strict-aliasing -fno-common \
- 		   -Werror-implicit-function-declaration \
- 		   -Wno-format-security \
-		   -fno-delete-null-pointer-checks
-+		   -fno-delete-null-pointer-checks \
-+		   -std=gnu89
-+
- KBUILD_AFLAGS_KERNEL :=
- KBUILD_CFLAGS_KERNEL :=
- KBUILD_AFLAGS   := -D__ASSEMBLY__
@@ -1,100 +0,0 @@
-From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
-From: Nick Desaulniers <ndesaulniers@google.com>
-Date: Mon, 4 Nov 2019 19:31:45 +0100
-Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
- directive
-
-It looks like a section directive was using "Solaris style" to declare
-the section flags. Replace this with the GNU style so that Clang's
-integrated assembler can assemble this directive.
-
-The modified instances were identified via:
-$ ag \.section | grep #
-
-Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
-Link: https://github.com/ClangBuiltLinux/linux/issues/744
-Link: https://bugs.llvm.org/show_bug.cgi?id=43759
-Link: https://reviews.llvm.org/D69296
-
-Acked-by: Nicolas Pitre <nico@fluxnic.net>
-Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
-Reviewed-by: Stefan Agner <stefan@agner.ch>
-Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
-Suggested-by: Fangrui Song <maskray@google.com>
-Suggested-by: Jian Cai <jiancai@google.com>
-Suggested-by: Peter Smith <peter.smith@linaro.org>
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-[ partial backport to 3.4 ]
---
- arch/arm/boot/bootp/init.S            | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S       | 2 +-
- arch/arm/boot/compressed/piggy.lzma.S | 2 +-
- arch/arm/mm/proc-v7.S                 | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
-index 78b508075161..868eeeaaa46e 100644
--- a/arch/arm/boot/bootp/init.S
-+++ b/arch/arm/boot/bootp/init.S
-@@ -16,7 +16,7 @@
-  *  size immediately following the kernel, we could build this into
-  *  a binary blob, and concatenate the zImage using the cat command.
-  */
-		.section .start,#alloc,#execinstr
-+		.section .start, "ax"
- 		.type	_start, #function
- 		.globl	_start
- 
-diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
-index 25ab26f1c6f0..f22428e275f8 100644
--- a/arch/arm/boot/compressed/big-endian.S
-+++ b/arch/arm/boot/compressed/big-endian.S
-@@ -5,7 +5,7 @@
-  *  Author: Nicolas Pitre
-  */
- 
-	.section ".start", #alloc, #execinstr
-+	.section ".start", "ax"
- 
- 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
- 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 77a716bdf4d3..b70606652d21 100644
--- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -113,7 +113,7 @@
- #endif
- 		.endm
- 
-		.section ".start", #alloc, #execinstr
-+		.section ".start", "ax"
- /*
-  * sort out different calling conventions
-  */
-diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
-index d7e69cffbc0a..cfea81ae8f4b 100644
--- a/arch/arm/boot/compressed/piggy.lzma.S
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -1,4 +1,4 @@
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index 69363be2f241..321cb1c6a091 100644
--- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -422,7 +422,7 @@ __v7_setup_stack:
- 	string	cpu_elf_name, "v7"
- 	.align
- 
-	.section ".proc.info.init", #alloc, #execinstr
-+	.section ".proc.info.init", "ax"
- 
- 	/*
- 	 * Standard v7 proc info content
-- 
-2.30.2
-
@@ -1,10 +0,0 @@
-diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.gzip.S
-index a68adf91a16..175ed02a6ac 100644
--- a/arch/arm/boot/compressed/piggy.gzip.S
-+++ b/arch/arm/boot/compressed/piggy.gzip.S
-@@ -1,4 +1,4 @@
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.gzip"
Author	SHA1	Message	Date
Luca Weiss	a58e8dc160	testing/linux-next: drop The package doesn't build right now and is blocking package publishing. Re-introduce it once we get it building again. drivers/tty/vt/conmakehash.c:15:10: fatal error: linux/limits.h: No such file or directory 15 \| #include <linux/limits.h> \| ^~~~~~~~~~~~~~~~ compilation terminated.	2024-08-08 08:58:13 +02:00
postmarketOS CI	55ce906b5e	linux-next: upgrade to next-20240808	2024-08-08 04:31:49 +00:00
postmarketOS CI	97518d09ce	linux-next: upgrade to next-20240807	2024-08-07 18:31:51 +00:00
Arnav Singh	553deb6c91	device-pine64-pinephone: reduce diff between upstream alsa ucm conf and ours (MR 5462) Upstream ALSA UCM conf still does not work exactly for us, but parts of it do. This commit incorporates those parts to reduce the diff between the two. One of the changes is to move /usr/share/alsa/ucm2/PinePhone/* to .../ucm2/Allwinner/A64/PinePhone/* to match upstream, and to stop creating the symlink .../ucm2/conf.d/simple-card/PinePhone.conf since upstream already provides it. However this means that just upgrading device-pine64-pinephone will remove the symlink and not replace the symlink from upstream package. Users will need to run `apk fix --reinstall alsa-ucm-conf` to recreate it, and will not have sound until they do. Ref: #2115	2024-08-07 10:46:19 -07:00
postmarketOS CI	1f36962369	linux-next: upgrade to next-20240806	2024-08-06 18:31:51 +00:00
adamthiede	bcf95d86de	linux-postmarketos-mediatek-mt8173: upgrade to 6.10.3 (MR 5460) [ci:skip-build]: already built successfully in CI	2024-08-06 11:05:02 -07:00
Luca Weiss	206a5715af	linux-postmarketos-qcom-sc7280: upgrade to 6.10.3 (MR 5464) [ci:skip-build]: already built successfully in CI	2024-08-06 10:49:19 -07:00
Luca Weiss	602b105468	linux-postmarketos-qcom-sm6350: upgrade to 6.10.3 (MR 5463) [ci:skip-build]: already built successfully in CI	2024-08-06 10:46:00 -07:00
Clayton Craft	488ed10dac	device-lenovo-21bx: add modules to fix booting from usb (MR 5465) fixes #3069 [ci:skip-build] already built successfully in CI	2024-08-06 09:56:59 -07:00
Clayton Craft	5c4e80a5fa	device-generic-x86_64: add oem-nvidia to pmb_recommends (MR 5332) [ci:skip-vercheck] [ci:skip-build] already built successfully in CI	2024-08-06 09:53:43 -07:00
Clayton Craft	18a367600e	device/oem-nvidia: new aport (MR 5332) For adding nvidia gpu support to images, using nouveau.	2024-08-06 09:53:26 -07:00
postmarketOS CI	0cd24d14e4	linux-next: revert to next-20240730	2024-08-06 14:54:04 +02:00
postmarketOS CI	351a1fc50a	linux-next: upgrade to next-20240805	2024-08-05 18:31:50 +00:00
Oliver Smith	42fefe87a3	linux-postmarketos-qcom-sm6125: V=1 workaround (MR 5461) Until this kernel is upgraded to >= 6.2, we need V=1 to work around silent make output leading to failing builds. [ci:skip-build]: already built successfully in CI	2024-08-04 17:05:56 +02:00
Oliver Smith	36b3942c47	linux-postmarketos-qcom-msm8998: V=1 workaround (MR 5461) Until this kernel is upgraded to >= 6.2, we need V=1 to work around silent make output leading to failing builds.	2024-08-04 17:05:51 +02:00
Anton Bambura	ede578e8bf	device-google-corsola: add audio support (MR 5456) Add ucm configs and symlink for SOF firmware. Doing it in the firmware subpackage because it doesn't work without linux-firmware-mediatek. [ci:skip-build]: already built successfully in CI	2024-08-04 16:56:06 +02:00
Øyvind Kolås	6454355227	linux-postmarketos-mediatek-mt81xx: update ADSP reserved memory region (MR 5456) Together with MR !4834 and audio playback is working on corsola.	2024-08-04 16:56:01 +02:00
Oliver Smith	5d1d7214a7	cross/grub-efi-x86: upgrade to 2.12-r6	2024-08-04 16:39:22 +02:00
				`@@ -1 +0,0 @@`
				`../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch`