CODEOWNERS

 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
+device/*/*-htc-golfu/               @Newbyte
 device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-htc-m8qlul/              @Newbyte
 device/*/*-purism-librem5/          @craftyguy @bshah
-main/osk-sdl/                       @craftyguy
-main/postmarketos-ui-plasma-mobile/ @bshah
-temp/u-boot-librem5/                @craftyguy @bshah
+device/*/device-lg-judyln/          @Newbyte
+device/*/device-samsung-m0/         @Newbyte
+device/*/linux-postmarketos-exynos4/        @Newbyte
+device/*/linux-postmarketos-msm8939/        @Newbyte
+device/*/linux-postmarketos-stericsson/     @Newbyte
 device/community/*-qcom-sdm845      @calebccff @joelselvaraj
+device/community/*-xiaomi-berrylium @joelselvaraj
 device/community/device-oneplus-enchilada   @calebccff
 device/community/device-oneplus-fajita      @calebccff
+main/osk-sdl/                       @craftyguy
+main/postmarketos-ui-plasma-mobile/ @bshah
 main/ttyescape                      @calebccff
-device/community/*-xiaomi-berrylium @joelselvaraj
+temp/u-boot-librem5/                @craftyguy @bshah
 
 # vim: ts=4 sw=4 et

cross/gcc-aarch64/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	if [ "$CBUILD" = "$CTARGET" ]; then
+		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
+		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	fi
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -435,10 +440,12 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then

cross/gcc-armhf/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	if [ "$CBUILD" = "$CTARGET" ]; then
+		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
+		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	fi
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -435,10 +440,12 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then

cross/gcc-armv7/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	if [ "$CBUILD" = "$CTARGET" ]; then
+		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
+		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	fi
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -435,10 +440,12 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then

device/community/device-asus-me176c/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=5
-pkgrel=0
+pkgrel=1
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -15,7 +15,7 @@ depends="
 	firmware-asus-me176c-acpi
 	intel-ucode
 	linux-asus-me176c
-	mesa-dri-classic
+	mesa-dri-gallium
 	postmarketos-base
 	"
 makedepends="devicepkg-dev meson eudev-dev"

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -6,9 +6,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.17.5_git20220429
+pkgver=5.18.7_git20220627
 pkgrel=0
-_tag="orange-pi-5.17-20220429-1618"
+_tag="orange-pi-5.18-20220627-1924"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -35,7 +35,7 @@ options="!strip !check !tracedeps
 	pmb:kconfigcheck-nftables
 	pmb:kconfigcheck-zram
 	"
-source="$pkgname-$_tag.tar.gz::http://github.com/megous/linux/archive/$_tag.tar.gz
+source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar.gz
 	config-$_flavor.aarch64
 	config-$_flavor.armv7
 	0001-dts-add-dontbeevil-pinephone-devkit.patch
@@ -97,9 +97,9 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 sha512sums="
-fae468b9b8bf551ea5577783fac2447ea623dcb6a8a232d05aafa5330b21e89c1dc92878d14ac53dcd7c3c807839d285192e55bd064045161ee3de310c812d01  linux-postmarketos-allwinner-orange-pi-5.17-20220429-1618.tar.gz
-5920cc5d85f6e56836c7feec461140d34ff3eaf2860316ebd47733b12b8c6d747e9314ab513d1353a2ebfe409068dd32f8c50ec6a98f028244ea161aa5d417c7  config-postmarketos-allwinner.aarch64
-d31074a3a191b7a33955a5fee46d7c7c20336cccc65ecedcc416fabf0cbec00454ff3cbce0b62db5afa66a92cdc2b9a9f86b63d0398f1890606633b674fc8f08  config-postmarketos-allwinner.armv7
+d34e3169c333dd8385c07454dd2cf9f93bc4eb632dde2f3c94c132ef7fc24dd768730c83ba6e0cc1e3f33cf03d4896058351ad8bc060dfea8f607a0f0efa2d24  linux-postmarketos-allwinner-orange-pi-5.18-20220627-1924.tar.gz
+129e57b78a36baababd63c28d7515c70323234e8a94939e0f6ceb65eca24aecdb980f2505b85ca3ae7a64f30b7cc07fc16f9e0b9ce54992398ee9f16ae4da66d  config-postmarketos-allwinner.aarch64
+a82c7419c1a5551fa6756837e81c6bf0257f1cb62f8a61ea3e443e2778d7d0ac24a0ce4e125255c71f1af20997f50a6c5afba90d808d84fc6640f1311ae19dc0  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.17.5 Kernel Configuration
+# Linux/arm 5.18.7 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
@@ -13,8 +13,10 @@ CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -149,6 +151,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 # end of Scheduler features
 
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_CGROUPS=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
@@ -238,6 +241,7 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y
 # end of General setup
 
 CONFIG_ARM=y
+CONFIG_ARM_HAS_GROUP_RELOCS=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
@@ -281,6 +285,7 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # end of Multiple platform selection
 
 # CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_AIROHA is not set
 # CONFIG_ARCH_ACTIONS is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
@@ -419,6 +424,7 @@ CONFIG_HAVE_SMP=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
+CONFIG_IRQSTACKS=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 # CONFIG_SCHED_MC is not set
 # CONFIG_SCHED_SMT is not set
@@ -454,7 +460,6 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARM_MODULE_PLTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
@@ -621,6 +626,8 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
@@ -632,6 +639,8 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -674,6 +683,7 @@ CONFIG_MODULE_COMPRESS_NONE=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
 CONFIG_BLK_DEV_INTEGRITY=y
@@ -694,6 +704,7 @@ CONFIG_EFI_PARTITION=y
 
 CONFIG_BLK_PM=y
 CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
 
 #
 # IO Schedulers
@@ -744,6 +755,7 @@ CONFIG_CONTIG_ALLOC=y
 CONFIG_BOUNCE=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
@@ -754,6 +766,7 @@ CONFIG_ZSMALLOC=y
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_KMAP_LOCAL=y
@@ -1222,6 +1235,7 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SELFTESTS=y
 CONFIG_PAGE_POOL=y
+# CONFIG_PAGE_POOL_STATS is not set
 # CONFIG_FAILOVER is not set
 CONFIG_ETHTOOL_NETLINK=y
 
@@ -1300,6 +1314,7 @@ CONFIG_SUNXI_RSB=y
 # CONFIG_FW_CFG_SYSFS is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_ARM_PSCI_FW=y
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
@@ -1371,6 +1386,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_SRAM is not set
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
+# CONFIG_OPEN_DICE is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -1549,13 +1565,16 @@ CONFIG_NET_VENDOR_CAVIUM=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_GEMINI_ETHERNET is not set
+CONFIG_NET_VENDOR_DAVICOM=y
 # CONFIG_DM9000 is not set
+# CONFIG_DM9051 is not set
 # CONFIG_DNET is not set
 CONFIG_NET_VENDOR_ENGLEDER=y
 # CONFIG_TSNEP is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
+CONFIG_NET_VENDOR_FUNGIBLE=y
 CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HIX5HD2_GMAC is not set
@@ -1840,6 +1859,7 @@ CONFIG_MT7663_USB_SDIO_COMMON=m
 CONFIG_MT7663U=m
 CONFIG_MT7663S=m
 # CONFIG_MT7921S is not set
+# CONFIG_MT7921U is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
@@ -1919,6 +1939,7 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=y
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set
+CONFIG_INPUT_VIVALDIFMAP=y
 
 #
 # Userland interfaces
@@ -2007,6 +2028,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_IMAGIS is not set
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
@@ -2134,7 +2156,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
@@ -2430,6 +2451,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
@@ -2463,6 +2485,7 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
+# CONFIG_BATTERY_UG3105 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -2580,6 +2603,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_SHT3x is not set
 # CONFIG_SENSORS_SHT4x is not set
 # CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SY7636A is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
@@ -2606,6 +2630,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83773G is not set
@@ -2729,6 +2754,7 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77714 is not set
 # CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
@@ -2751,6 +2777,7 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SIMPLE_MFD_I2C is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@@ -2850,17 +2877,20 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_PWM is not set
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 # CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT5190A is not set
 # CONFIG_REGULATOR_RT6160 is not set
 # CONFIG_REGULATOR_RT6245 is not set
 # CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
 # CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
+# CONFIG_REGULATOR_SY7636A is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS6286X is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS65132 is not set
@@ -2868,26 +2898,26 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_VCTRL is not set
 # CONFIG_REGULATOR_TP65185X is not set
 CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
 # CONFIG_LIRC is not set
+CONFIG_RC_MAP=y
 # CONFIG_RC_DECODERS is not set
 CONFIG_RC_DEVICES=y
-# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_IR_GPIO_CIR is not set
 # CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IGORPLUGUSB is not set
+# CONFIG_IR_IGUANA is not set
 # CONFIG_IR_IMON is not set
 # CONFIG_IR_IMON_RAW is not set
 # CONFIG_IR_MCEUSB is not set
 # CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_SERIAL is not set
 # CONFIG_IR_STREAMZAP is not set
-# CONFIG_IR_IGORPLUGUSB is not set
-# CONFIG_IR_IGUANA is not set
+CONFIG_IR_SUNXI=y
+# CONFIG_IR_TOY is not set
 # CONFIG_IR_TTUSBIR is not set
+# CONFIG_RC_ATI_REMOTE is not set
 # CONFIG_RC_LOOPBACK is not set
-# CONFIG_IR_GPIO_CIR is not set
-CONFIG_IR_SUNXI=y
-# CONFIG_IR_SERIAL is not set
 # CONFIG_RC_XBOX_DVD is not set
-# CONFIG_IR_TOY is not set
 CONFIG_CEC_CORE=y
 CONFIG_CEC_PIN=y
 
@@ -2921,7 +2951,6 @@ CONFIG_MEDIA_CONTROLLER=y
 #
 # Video4Linux options
 #
-CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -2944,24 +2973,114 @@ CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
 #
 # Drivers filtered as selected at 'Filter media drivers'
 #
+
+#
+# Media drivers
+#
 # CONFIG_MEDIA_USB_SUPPORT is not set
-CONFIG_VIDEOBUF2_CORE=y
-CONFIG_VIDEOBUF2_V4L2=y
-CONFIG_VIDEOBUF2_MEMOPS=y
-CONFIG_VIDEOBUF2_DMA_CONTIG=y
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
-# CONFIG_VIDEO_CADENCE is not set
-# CONFIG_VIDEO_ASPEED is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 # CONFIG_VIDEO_MUX is not set
-# CONFIG_VIDEO_XILINX is not set
+
+#
+# Allegro DVT media platform drivers
+#
+
+#
+# Amlogic media platform drivers
+#
+
+#
+# Amphion drivers
+#
+
+#
+# Aspeed media platform drivers
+#
+# CONFIG_VIDEO_ASPEED is not set
+
+#
+# Atmel media platform drivers
+#
+
+#
+# Cadence media platform drivers
+#
+# CONFIG_VIDEO_CADENCE_CSI2RX is not set
+# CONFIG_VIDEO_CADENCE_CSI2TX is not set
+
+#
+# Chips&Media media platform drivers
+#
+
+#
+# Intel media platform drivers
+#
+
+#
+# Marvell media platform drivers
+#
+
+#
+# Mediatek media platform drivers
+#
+
+#
+# NVidia media platform drivers
+#
+
+#
+# NXP media platform drivers
+#
+
+#
+# Qualcomm media platform drivers
+#
+
+#
+# Renesas media platform drivers
+#
+
+#
+# Rockchip media platform drivers
+#
+
+#
+# Samsung media platform drivers
+#
+
+#
+# STMicroelectronics media platform drivers
+#
+
+#
+# Sunxi media platform drivers
+#
 CONFIG_VIDEO_SUN4I_CSI=y
 CONFIG_VIDEO_SUN6I_CSI=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_SUN8I_DEINTERLACE=y
 CONFIG_VIDEO_SUN8I_ROTATE=y
+
+#
+# Texas Instruments drivers
+#
+
+#
+# VIA media platform drivers
+#
+
+#
+# Xilinx media platform drivers
+#
+# CONFIG_VIDEO_XILINX is not set
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_V4L2=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
 # end of Media drivers
 
 CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
@@ -2990,6 +3109,7 @@ CONFIG_VIDEO_IR_I2C=y
 #
 # Media SPI Adapters
 #
+# CONFIG_VIDEO_GS1662 is not set
 # end of Media SPI Adapters
 # end of Media ancillary drivers
 
@@ -3083,6 +3203,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
@@ -3113,7 +3234,6 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@@ -3136,6 +3256,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
@@ -3176,6 +3297,7 @@ CONFIG_DRM_DW_HDMI=y
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_GM12U320 is not set
+# CONFIG_DRM_PANEL_MIPI_DBI is not set
 # CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
@@ -3193,6 +3315,7 @@ CONFIG_DRM_LIMA=y
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
+# CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_NOMODESET=y
@@ -3390,6 +3513,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
 # CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
@@ -3474,6 +3598,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS5805M is not set
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
@@ -3618,12 +3743,14 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SEMITEK is not set
+# CONFIG_HID_SIGMAMICRO is not set
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SPEEDLINK is not set
 # CONFIG_HID_STEAM is not set
@@ -3935,8 +4062,10 @@ CONFIG_TYPEC_UCSI=m
 CONFIG_UCSI_CCG=m
 CONFIG_TYPEC_TPS6598X=m
 CONFIG_TYPEC_ANX7688=m
+# CONFIG_TYPEC_RT1719 is not set
 CONFIG_TYPEC_HD3SS3220=m
 CONFIG_TYPEC_STUSB160X=m
+# CONFIG_TYPEC_WUSB3801 is not set
 # CONFIG_TYPEC_EXTCON is not set
 
 #
@@ -4266,7 +4395,6 @@ CONFIG_R8188EU=m
 # Analog to digital converters
 #
 # CONFIG_AD7816 is not set
-# CONFIG_AD7280 is not set
 # end of Analog to digital converters
 
 #
@@ -4312,16 +4440,8 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_VIDEO_MAX96712 is not set
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=y
-
-#
-# Android
-#
-CONFIG_ASHMEM=y
-# end of Android
-
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
-# CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
@@ -4355,9 +4475,9 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_LAN966X is not set
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 # CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_CLK_SUNXI=y
@@ -4369,6 +4489,7 @@ CONFIG_SUNXI_CCU=y
 CONFIG_SUN4I_A10_CCU=y
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN6I_RTC_CCU=y
 CONFIG_SUN8I_A23_CCU=y
 CONFIG_SUN8I_A33_CCU=y
 CONFIG_SUN8I_A83T_CCU=y
@@ -4514,6 +4635,8 @@ CONFIG_IIO=y
 # CONFIG_ADXL345_SPI is not set
 # CONFIG_ADXL355_I2C is not set
 # CONFIG_ADXL355_SPI is not set
+# CONFIG_ADXL367_SPI is not set
+# CONFIG_ADXL367_I2C is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA180 is not set
@@ -4553,6 +4676,7 @@ CONFIG_MMA7660=m
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
@@ -4627,6 +4751,7 @@ CONFIG_AXP20X_ADC=y
 # Amplifiers
 #
 # CONFIG_AD8366 is not set
+# CONFIG_ADA4250 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers
 
@@ -4683,6 +4808,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_AD5755 is not set
@@ -4737,6 +4863,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADMV1013 is not set
+# CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -4948,6 +5075,8 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9310 is not set
+# CONFIG_SX9324 is not set
+# CONFIG_SX9360 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
@@ -5019,11 +5148,9 @@ CONFIG_PHY_SUN50I_USB3=y
 
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_DPHY_RX is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_LAN966X_SERDES is not set
@@ -5080,6 +5207,7 @@ CONFIG_PM_OPP=y
 # CONFIG_INTERCONNECT is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
+# CONFIG_PECI is not set
 # end of Device Drivers
 
 #
@@ -5361,6 +5489,7 @@ CONFIG_CRYPTO_ENGINE=y
 #
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
 # CONFIG_CRYPTO_ECDH is not set
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
@@ -5410,6 +5539,7 @@ CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_POLY1305 is not set
 CONFIG_CRYPTO_MD4=m
@@ -5537,9 +5667,11 @@ CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_SHA256=y
 # end of Crypto library routines
 
+CONFIG_LIB_MEMNEQ=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -5547,7 +5679,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
+CONFIG_CRC64=y
 # CONFIG_CRC4 is not set
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
@@ -5590,7 +5722,6 @@ CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
-CONFIG_DMA_REMAP=y
 CONFIG_DMA_CMA=y
 # CONFIG_DMA_PERNUMA_CMA is not set
 
@@ -5648,6 +5779,8 @@ CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
+# CONFIG_DEBUG_KERNEL is not set
+
 #
 # Compile-time checks and compiler options
 #
@@ -5671,8 +5804,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
-# CONFIG_DEBUG_KERNEL is not set
-
 #
 # Networking Debugging
 #

device/main/u-boot-pinephone/0001-sunxi-DT-H6-update-device-tree-files.patch

-From 599896bc50b4532f39105ed0c40ada838227650d Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 7 May 2020 18:50:37 -0500
-Subject: [PATCH 01/10] sunxi: DT: H6: update device tree files
-
-Import updated device trees from Linux v5.9.
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- arch/arm/dts/Makefile                       |  1 +
- arch/arm/dts/sun50i-h6-pine-h64-model-b.dts | 21 +++++++++++++++++++++
- 2 files changed, 22 insertions(+)
- create mode 100644 arch/arm/dts/sun50i-h6-pine-h64-model-b.dts
-
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index fc16a57e60..de2e4ca66b 100644
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -642,6 +642,7 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \
- 	sun50i-h6-orangepi-lite2.dtb \
- 	sun50i-h6-orangepi-one-plus.dtb \
- 	sun50i-h6-pine-h64.dtb \
-+	sun50i-h6-pine-h64-model-b.dtb \
- 	sun50i-h6-tanix-tx6.dtb
- dtb-$(CONFIG_MACH_SUN50I_H616) += \
- 	sun50i-h616-orangepi-zero2.dtb
-diff --git a/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts b/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts
-new file mode 100644
-index 0000000000..f4c8966a64
---- /dev/null
-+++ b/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts
-@@ -0,0 +1,21 @@
-+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
-+/*
-+ * Copyright (C) 2019 Corentin LABBE <clabbe@baylibre.com>
-+ */
-+
-+#include "sun50i-h6-pine-h64.dts"
-+
-+/ {
-+	model = "Pine H64 model B";
-+	compatible = "pine64,pine-h64-model-b", "allwinner,sun50i-h6";
-+
-+	/delete-node/ reg_gmac_3v3;
-+};
-+
-+&hdmi_connector {
-+	/delete-property/ ddc-en-gpios;
-+};
-+
-+&emac {
-+	phy-supply = <&reg_aldo2>;
-+};
--- 
-2.31.1
-

device/main/u-boot-pinephone/0009-disable-bootdelay.patch → device/main/u-boot-pinephone/0002-disable-bootdelay.patch

@@ -8,14 +8,17 @@ Subject: [PATCH 09/10] disable bootdelay
  1 file changed, 1 insertion(+)
 
 diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig
-index 149772749a..1683c1f032 100644
+index 9d39204a43..1f0ce680f9 100644
 --- a/configs/pinephone_defconfig
 +++ b/configs/pinephone_defconfig
-@@ -11,3 +11,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+@@ -11,6 +11,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
  CONFIG_PINEPHONE_DT_SELECTION=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2"
 +CONFIG_BOOTDELAY=0
--- 
+ CONFIG_LED_STATUS=y
+ CONFIG_LED_STATUS_GPIO=y
+ CONFIG_LED_STATUS0=y
+--
 2.31.1
 

device/main/u-boot-pinephone/0003-sunxi-Support-both-SPL-image-types.patch

-From 67097556d368d16917be3590384d8e988266aa59 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 20 Jun 2021 14:23:11 -0500
-Subject: [PATCH 03/10] sunxi: Support both SPL image types
-
-SPL uses the image header to detect the boot device and to find the
-offset of U-Boot proper. Since this information is stored differently in
-eGON and TOC0 image headers, add code to find the correct value based on
-the image type currently in use.
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- arch/arm/include/asm/arch-sunxi/spl.h |  2 --
- arch/arm/mach-sunxi/board.c           | 20 ++++++++++++++------
- include/sunxi_image.h                 | 14 ++++++++++++++
- 3 files changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h
-index 58cdf806d9..157b11e489 100644
---- a/arch/arm/include/asm/arch-sunxi/spl.h
-+++ b/arch/arm/include/asm/arch-sunxi/spl.h
-@@ -19,8 +19,6 @@
- #define SUNXI_BOOTED_FROM_MMC0_HIGH	0x10
- #define SUNXI_BOOTED_FROM_MMC2_HIGH	0x12
- 
--#define is_boot0_magic(addr)	(memcmp((void *)(addr), BOOT0_MAGIC, 8) == 0)
--
- uint32_t sunxi_get_boot_device(void);
- 
- #endif
-diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
-index d9b04f75fc..bbed5838c1 100644
---- a/arch/arm/mach-sunxi/board.c
-+++ b/arch/arm/mach-sunxi/board.c
-@@ -246,10 +246,13 @@ void s_init(void)
- 
- static int sunxi_get_boot_source(void)
- {
--	if (!is_boot0_magic(SPL_ADDR + 4)) /* eGON.BT0 */
--		return SUNXI_INVALID_BOOT_SOURCE;
-+	if (is_egon_image((void *)SPL_ADDR))
-+		return ((struct boot_file_head *)SPL_ADDR)->boot_media;
-+	if (is_toc0_image((void *)SPL_ADDR))
-+		return ((struct toc0_main_info *)SPL_ADDR)->platform[0];
- 
--	return readb(SPL_ADDR + 0x28);
-+	/* Not a valid BROM image, so we must have been booted via FEL. */
-+	return SUNXI_INVALID_BOOT_SOURCE;
- }
- 
- /* The sunxi internal brom will try to loader external bootloader
-@@ -294,13 +297,18 @@ uint32_t sunxi_get_boot_device(void)
- 	return -1;		/* Never reached */
- }
- 
-+#define is_toc0_magic(foo) true
-+
- #ifdef CONFIG_SPL_BUILD
- static u32 sunxi_get_spl_size(void)
- {
--	if (!is_boot0_magic(SPL_ADDR + 4)) /* eGON.BT0 */
--		return 0;
-+	if (is_egon_image((void *)SPL_ADDR))
-+		return ((struct boot_file_head *)SPL_ADDR)->length;
-+	if (is_toc0_image((void *)SPL_ADDR))
-+		return ((struct toc0_main_info *)SPL_ADDR)->length;
- 
--	return readl(SPL_ADDR + 0x10);
-+	/* Unknown size, so fall back to the default offset. */
-+	return 0;
- }
- 
- /*
-diff --git a/include/sunxi_image.h b/include/sunxi_image.h
-index bdf80ec0e0..b0424b6b7f 100644
---- a/include/sunxi_image.h
-+++ b/include/sunxi_image.h
-@@ -270,4 +270,18 @@ struct toc0_key_item {
- 		sizeof(struct toc0_key_item),				  \
- 	32)
- 
-+static inline bool is_egon_image(void *addr)
-+{
-+	struct boot_file_head *head = addr;
-+
-+	return memcmp(head->magic, BOOT0_MAGIC, 8) == 0;
-+}
-+
-+static inline bool is_toc0_image(void *addr)
-+{
-+	struct toc0_main_info *main = addr;
-+
-+	return memcmp(main->name, TOC0_MAIN_INFO_NAME, 8) == 0;
-+}
-+
- #endif
--- 
-2.31.1
-

device/main/u-boot-pinephone/0004-sunxi-Support-building-a-SPL-as-a-TOC0-image.patch

-From 02794d97426245146aaec889583e3eea11e80c02 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 20 Jun 2021 14:24:29 -0500
-Subject: [PATCH 04/10] sunxi: Support building a SPL as a TOC0 image
-
-Now that mkimage can generate TOC0 images, and the SPL can interpret
-them, hook up the build infrastructure so the user can choose which
-image type to build.
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- arch/arm/mach-sunxi/Kconfig |  2 ++
- board/sunxi/Kconfig         | 24 ++++++++++++++++++++++++
- scripts/Makefile.spl        |  3 ++-
- 3 files changed, 28 insertions(+), 1 deletion(-)
- create mode 100644 board/sunxi/Kconfig
-
-diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
-index 49f94f095c..b0191d0080 100644
---- a/arch/arm/mach-sunxi/Kconfig
-+++ b/arch/arm/mach-sunxi/Kconfig
-@@ -1091,6 +1091,8 @@ config BLUETOOTH_DT_DEVICE_FIXUP
- 	  The used address is "bdaddr" if set, and "ethaddr" with the LSB
- 	  flipped elsewise.
- 
-+source "board/sunxi/Kconfig"
-+
- endif
- 
- config CHIP_DIP_SCAN
-diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
-new file mode 100644
-index 0000000000..c5c0929db5
---- /dev/null
-+++ b/board/sunxi/Kconfig
-@@ -0,0 +1,24 @@
-+choice
-+	prompt "SPL Image Type"
-+	default SUNXI_SPL_IMAGE_EGON
-+
-+config SUNXI_SPL_IMAGE_EGON
-+	bool "eGON (non-secure)"
-+	help
-+	  Select this option to embed the SPL binary in an eGON.BT0 image,
-+	  which is compatible with the non-secure boot ROM (NBROM).
-+
-+	  This is usually the correct option to choose.
-+
-+config SUNXI_SPL_IMAGE_TOC0
-+	bool "TOC0 (secure)"
-+	help
-+	  Select this option to embed the SPL binary in a TOC0 image,
-+	  which is compatible with the secure boot ROM (SBROM).
-+
-+endchoice
-+
-+config SUNXI_SPL_IMAGE_TYPE
-+	string
-+	default "sunxi_egon" if SUNXI_SPL_IMAGE_EGON
-+	default "sunxi_toc0" if SUNXI_SPL_IMAGE_TOC0
-diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
-index 25a3e7fa52..52ead28487 100644
---- a/scripts/Makefile.spl
-+++ b/scripts/Makefile.spl
-@@ -414,7 +414,8 @@ endif
- $(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
- 	$(call if_changed,mkimage)
- 
--MKIMAGEFLAGS_sunxi-spl.bin = -T sunxi_egon \
-+MKIMAGEFLAGS_sunxi-spl.bin = -T $(CONFIG_SUNXI_SPL_IMAGE_TYPE) \
-+	-a $(CONFIG_SPL_TEXT_BASE) \
- 	-n $(CONFIG_DEFAULT_DEVICE_TREE)
- 
- OBJCOPYFLAGS_u-boot-spl-dtb.hex := -I binary -O ihex --change-address=$(CONFIG_SPL_TEXT_BASE)
--- 
-2.31.1
-

device/main/u-boot-pinephone/0005-sunxi-DT-H6-Add-USB3-to-Pine-H64-DTS.patch

-From 2ebd6418254742499ab6150877879536486b47b3 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 17 Apr 2021 14:21:45 -0500
-Subject: [PATCH 05/10] sunxi: DT: H6: Add USB3 to Pine H64 DTS
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- arch/arm/dts/sun50i-h6-pine-h64.dts | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts
-index b868ad17af..73d011dc69 100644
---- a/arch/arm/dts/sun50i-h6-pine-h64.dts
-+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts
-@@ -89,6 +89,10 @@
- 	status = "okay";
- };
- 
-+&dwc3 {
-+	status = "okay";
-+};
-+
- &ehci0 {
- 	status = "okay";
- };
-@@ -332,3 +336,7 @@
- 	usb3_vbus-supply = <&reg_usb_vbus>;
- 	status = "okay";
- };
-+
-+&usb3phy {
-+	status = "okay";
-+};
--- 
-2.31.1
-

device/main/u-boot-pinephone/0006-sunxi-Load-sun8i-secure-monitor-to-SRAM-A2.patch

-From 40b65e95cfebc9d9af61d3c47562cdeb6b2a1302 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 17 Apr 2021 10:43:58 -0500
-Subject: [PATCH 06/10] sunxi: Load sun8i secure monitor to SRAM A2
-
-Most sun6i-derived SoCs contain SRAM A2, a secure SRAM area for ARISC
-SCP firmware. H3 has a smaller SRAM than other SoCs (A31/A33/A23/A83T).
-
-On sun8i SoCs which do not have SRAM B, we can use part of this SRAM for
-the secure monitor. Follow the design of 64-bit SoCs and use the first
-part for the monitor, and the last 16 KiB for the SCP firmware. With
-this change, the monitor no longer needs to reserve a region in DRAM.
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- include/configs/sun8i.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
-index 27c9808a49..3466c75e28 100644
---- a/include/configs/sun8i.h
-+++ b/include/configs/sun8i.h
-@@ -22,6 +22,13 @@
- #define CONFIG_ARMV7_SECURE_MAX_SIZE	(SUNXI_SRAM_A2_SIZE - 33 * 1024)
- #endif
- 
-+/*
-+ * Skip the first 16 KiB of SRAM A2, which is not usable, as only certain bytes
-+ * are writable. Reserve the last 17 KiB for the resume shim and SCP firmware.
-+ */
-+#define CONFIG_ARMV7_SECURE_BASE	(SUNXI_SRAM_A2_BASE + 16 * 1024)
-+#define CONFIG_ARMV7_SECURE_MAX_SIZE	(SUNXI_SRAM_A2_SIZE - 33 * 1024)
-+
- /*
-  * Include common sunxi configuration where most the settings are
-  */
--- 
-2.31.1
-

device/main/u-boot-pinephone/0007-pinephone-Add-volume_key-environment-variable.patch

-From d0af5f5a4fc81e4dcd0b51ad46d8faf01b9ae168 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Tue, 11 Feb 2020 14:10:05 +0100
-Subject: [PATCH 07/10] pinephone: Add volume_key environment variable
-
-When the user has a volume key pressed volume_key variable will
-contain either value 'down' or 'up', otherwise it will be empty.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- board/sunxi/Makefile |  1 +
- board/sunxi/board.c  | 18 ++++++++++
- board/sunxi/lradc.c  | 81 ++++++++++++++++++++++++++++++++++++++++++++
- board/sunxi/lradc.h  | 11 ++++++
- 4 files changed, 111 insertions(+)
- create mode 100644 board/sunxi/lradc.c
- create mode 100644 board/sunxi/lradc.h
-
-diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
-index d96b7897b6..a096a5c771 100644
---- a/board/sunxi/Makefile
-+++ b/board/sunxi/Makefile
-@@ -12,3 +12,4 @@ obj-$(CONFIG_MACH_SUN4I)	+= dram_sun4i_auto.o
- obj-$(CONFIG_MACH_SUN5I)	+= dram_sun5i_auto.o
- obj-$(CONFIG_MACH_SUN7I)	+= dram_sun5i_auto.o
- obj-$(CONFIG_CHIP_DIP_SCAN)	+= chip.o
-+obj-$(CONFIG_MACH_SUN50I)	+= lradc.o
-diff --git a/board/sunxi/board.c b/board/sunxi/board.c
-index 1a46100e40..400cc938dd 100644
---- a/board/sunxi/board.c
-+++ b/board/sunxi/board.c
-@@ -46,6 +46,7 @@
- #include <spl.h>
- #include <sy8106a.h>
- #include <asm/setup.h>
-+#include "lradc.h"
- 
- #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
- /* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */
-@@ -672,6 +673,12 @@ void sunxi_board_init(void)
- {
- 	int power_failed = 0;
- 
-+#ifdef CONFIG_MACH_SUN50I
-+	// we init the lradc in SPL to get the ADC started early to have
-+	// a valid sample when U-Boot main binary gets executed.
-+	lradc_enable();
-+#endif
-+
- #ifdef CONFIG_SY8106A_POWER
- 	power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT);
- #endif
-@@ -946,6 +953,17 @@ int misc_init_r(void)
- 		env_set("fdtfile", str);
- 	}
- 
-+#ifdef CONFIG_MACH_SUN50I
-+	int key = lradc_get_pressed_key();
-+	if (key == KEY_VOLUMEDOWN)
-+		env_set("volume_key", "down");
-+	else if (key == KEY_VOLUMEUP)
-+		env_set("volume_key", "up");
-+
-+	// no longer needed
-+	lradc_disable();
-+#endif
-+
- 	setup_environment(gd->fdt_blob);
- 
- 	return 0;
-diff --git a/board/sunxi/lradc.c b/board/sunxi/lradc.c
-new file mode 100644
-index 0000000000..693b198e25
---- /dev/null
-+++ b/board/sunxi/lradc.c
-@@ -0,0 +1,81 @@
-+#include <common.h>
-+#include <asm/io.h>
-+#include "lradc.h"
-+
-+#define LRADC_BASE		0x1c21800
-+
-+#define LRADC_CTRL		(LRADC_BASE + 0x00)
-+#define LRADC_INTC		(LRADC_BASE + 0x04)
-+#define LRADC_INTS		(LRADC_BASE + 0x08)
-+#define LRADC_DATA0		(LRADC_BASE + 0x0c)
-+#define LRADC_DATA1		(LRADC_BASE + 0x10)
-+
-+/* LRADC_CTRL bits */
-+#define FIRST_CONVERT_DLY(x)	((x) << 24) /* 8 bits */
-+#define CHAN_SELECT(x)		((x) << 22) /* 2 bits */
-+#define CONTINUE_TIME_SEL(x)	((x) << 16) /* 4 bits */
-+#define KEY_MODE_SEL(x)		((x) << 12) /* 2 bits */
-+#define LEVELA_B_CNT(x)		((x) << 8)  /* 4 bits */
-+#define HOLD_KEY_EN(x)		((x) << 7)
-+#define HOLD_EN(x)		((x) << 6)
-+#define LEVELB_VOL(x)		((x) << 4)  /* 2 bits */
-+#define SAMPLE_RATE(x)		((x) << 2)  /* 2 bits */
-+#define ENABLE(x)		((x) << 0)
-+
-+/* LRADC_INTC and LRADC_INTS bits */
-+#define CHAN1_KEYUP_IRQ		BIT(12)
-+#define CHAN1_ALRDY_HOLD_IRQ	BIT(11)
-+#define CHAN1_HOLD_IRQ		BIT(10)
-+#define	CHAN1_KEYDOWN_IRQ	BIT(9)
-+#define CHAN1_DATA_IRQ		BIT(8)
-+#define CHAN0_KEYUP_IRQ		BIT(4)
-+#define CHAN0_ALRDY_HOLD_IRQ	BIT(3)
-+#define CHAN0_HOLD_IRQ		BIT(2)
-+#define	CHAN0_KEYDOWN_IRQ	BIT(1)
-+#define CHAN0_DATA_IRQ		BIT(0)
-+
-+// this is for PinePhone only
-+
-+int lradc_get_pressed_key(void)
-+{
-+	uint32_t val;
-+	uint32_t vref = 3000000 * 2 / 3;
-+
-+	val = readl(LRADC_DATA0) & 0x3f;
-+	val = val * vref / 63;
-+
-+//	printf("lradc=%u\n", val);
-+
-+	if (val < 200000) // 158730
-+		return KEY_VOLUMEUP;
-+	else if (val < 400000) // 349206
-+		return KEY_VOLUMEDOWN;
-+
-+	return 0;
-+}
-+
-+void lradc_enable(void)
-+{
-+	// aldo3 is always on and defaults to 3V
-+
-+	writel(0xffffffff, LRADC_INTS);
-+	writel(0, LRADC_INTC);
-+
-+	/*
-+	 * Set sample time to 4 ms / 250 Hz. Wait 2 * 4 ms for key to
-+	 * stabilize on press, wait (1 + 1) * 4 ms for key release
-+	 */
-+	writel(FIRST_CONVERT_DLY(0) | LEVELA_B_CNT(0) | HOLD_EN(0) |
-+		SAMPLE_RATE(0) | ENABLE(1), LRADC_CTRL);
-+
-+}
-+
-+void lradc_disable(void)
-+{
-+	writel(0xffffffff, LRADC_INTS);
-+	writel(0, LRADC_INTC);
-+
-+	/* Disable lradc, leave other settings unchanged */
-+	writel(FIRST_CONVERT_DLY(2) | LEVELA_B_CNT(1) | HOLD_EN(1) |
-+		SAMPLE_RATE(2), LRADC_CTRL);
-+}
-diff --git a/board/sunxi/lradc.h b/board/sunxi/lradc.h
-new file mode 100644
-index 0000000000..c908401b5b
---- /dev/null
-+++ b/board/sunxi/lradc.h
-@@ -0,0 +1,11 @@
-+#pragma once
-+
-+enum {
-+	KEY_NONE = 0,
-+	KEY_VOLUMEDOWN = 1,
-+	KEY_VOLUMEUP = 2,
-+};
-+
-+int lradc_get_pressed_key(void);
-+void lradc_enable(void);
-+void lradc_disable(void);
--- 
-2.31.1
-

device/main/u-boot-pinephone/0008-Enable-led-on-boot-to-notify-user-of-boot-status.patch

-From e7a3da0093b96d89c9d65fe8d5f1dd32f299afa1 Mon Sep 17 00:00:00 2001
-From: Marius Gripsgard <marius@ubports.com>
-Date: Tue, 5 May 2020 16:51:13 +0200
-Subject: [PATCH 08/10] Enable led on boot to notify user of boot status
-
----
- arch/arm/mach-sunxi/Kconfig | 5 +++++
- board/sunxi/board.c         | 6 ++++++
- configs/pinephone_defconfig | 1 +
- 3 files changed, 12 insertions(+)
-
-diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
-index b0191d0080..7a46bb4481 100644
---- a/arch/arm/mach-sunxi/Kconfig
-+++ b/arch/arm/mach-sunxi/Kconfig
-@@ -1,5 +1,10 @@
- if ARCH_SUNXI
- 
-+config PINEPHONE_LEDS
-+	bool "Notify boot status via LEDs on PinePhone"
-+	---help---
-+	LED boot notification.
-+
- config SPL_LDSCRIPT
- 	default "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" if !ARM64
- 
-diff --git a/board/sunxi/board.c b/board/sunxi/board.c
-index 400cc938dd..0abfa78880 100644
---- a/board/sunxi/board.c
-+++ b/board/sunxi/board.c
-@@ -679,6 +679,12 @@ void sunxi_board_init(void)
- 	lradc_enable();
- #endif
- 
-+#ifdef CONFIG_PINEPHONE_LEDS
-+	/* PD18:G PD19:R PD20:B */
-+	gpio_request(SUNXI_GPD(19), "led:red");
-+	gpio_direction_output(SUNXI_GPD(19), 1);
-+#endif
-+
- #ifdef CONFIG_SY8106A_POWER
- 	power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT);
- #endif
-diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig
-index 64e13d3132..149772749a 100644
---- a/configs/pinephone_defconfig
-+++ b/configs/pinephone_defconfig
-@@ -2,6 +2,7 @@ CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinephone-1.2"
- CONFIG_SPL=y
-+CONFIG_PINEPHONE_LEDS=y
- CONFIG_MACH_SUN50I=y
- CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
- CONFIG_DRAM_CLK=552
--- 
-2.31.1
-

device/main/u-boot-pinephone/0010-Reduce-DRAM-speed-to-528-for-better-compatibility-wi.patch

-From 679af1e60220bdb31c42beb41a3a405b23f8ffee Mon Sep 17 00:00:00 2001
-From: Dalton Durst <dalton@ubports.com>
-Date: Wed, 10 Mar 2021 11:44:07 -0600
-Subject: [PATCH 10/10] Reduce DRAM speed to 528 for better compatibility with
- all PinePhones
-
----
- configs/pinephone_defconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig
-index 1683c1f032..4dde6fec87 100644
---- a/configs/pinephone_defconfig
-+++ b/configs/pinephone_defconfig
-@@ -5,7 +5,7 @@ CONFIG_SPL=y
- CONFIG_PINEPHONE_LEDS=y
- CONFIG_MACH_SUN50I=y
- CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
--CONFIG_DRAM_CLK=552
-+CONFIG_DRAM_CLK=528
- CONFIG_DRAM_ZQ=3881949
- CONFIG_MMC_SUNXI_SLOT_EXTRA=2
- CONFIG_PINEPHONE_DT_SELECTION=y
--- 
-2.31.1
-

device/main/u-boot-pinephone/0011-mmc-sunxi-Add-support-for-DMA-transfers.patch

-From b0950e4696b391578f7428337e41fa8ca14b225d Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Wed, 11 Sep 2019 20:45:28 +0200
-Subject: [PATCH 27/29] mmc: sunxi: Add support for DMA transfers
-
-Allwinner MMC controller supports DMA via internal DMA controller,
-use it.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- arch/arm/include/asm/arch-sunxi/mmc.h |   7 +
- drivers/mmc/sunxi_mmc.c               | 204 +++++++++++++++++++++++---
- 2 files changed, 192 insertions(+), 19 deletions(-)
-
-diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h
-index 5daacf10eb..dc8ea6f43a 100644
---- a/arch/arm/include/asm/arch-sunxi/mmc.h
-+++ b/arch/arm/include/asm/arch-sunxi/mmc.h
-@@ -112,6 +112,10 @@ struct sunxi_mmc {
- 	 SUNXI_MMC_RINT_COMMAND_DONE |		\
- 	 SUNXI_MMC_RINT_VOLTAGE_CHANGE_DONE)
- 
-+#define SUNXI_MMC_FTRGLEVEL_BURST_SIZE(v)	(((v) & 0x7) << 28)
-+#define SUNXI_MMC_FTRGLEVEL_RX_TL(v)		(((v) & 0xfff) << 16)
-+#define SUNXI_MMC_FTRGLEVEL_TX_TL(v)		(((v) & 0xffff) << 0)
-+
- #define SUNXI_MMC_STATUS_RXWL_FLAG		(0x1 << 0)
- #define SUNXI_MMC_STATUS_TXWL_FLAG		(0x1 << 1)
- #define SUNXI_MMC_STATUS_FIFO_EMPTY		(0x1 << 2)
-@@ -130,6 +134,9 @@ struct sunxi_mmc {
- #define SUNXI_MMC_IDIE_TXIRQ		(0x1 << 0)
- #define SUNXI_MMC_IDIE_RXIRQ		(0x1 << 1)
- 
-+#define SUNXI_MMC_IDST_TXIRQ		(0x1 << 0)
-+#define SUNXI_MMC_IDST_RXIRQ		(0x1 << 1)
-+
- #define SUNXI_MMC_COMMON_CLK_GATE		(1 << 16)
- #define SUNXI_MMC_COMMON_RESET			(1 << 18)
- 
-diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
-index 28af8e6ac5..47c947cdb8 100644
---- a/drivers/mmc/sunxi_mmc.c
-+++ b/drivers/mmc/sunxi_mmc.c
-@@ -9,6 +9,7 @@
- 
- #include <common.h>
- #include <dm.h>
-+#include <cpu_func.h>
- #include <errno.h>
- #include <log.h>
- #include <malloc.h>
-@@ -27,6 +28,27 @@
- #define CCM_MMC_CTRL_MODE_SEL_NEW	0
- #endif
- 
-+#define DMA_CONFIG_DIC BIT(1)  // flag: disable interrupt after this descriptor's buffer is processed
-+#define DMA_CONFIG_LAST BIT(2) // flag: last descriptor
-+#define DMA_CONFIG_FIRST BIT(3) // flag: first descriptor
-+#define DMA_CONFIG_CHAIN BIT(4) // flag: buf_addr_ptr2 points to next descriptor
-+#define DMA_CONFIG_ERROR BIT(30) // flag: out: error happened
-+#define DMA_CONFIG_HOLD BIT(31) // flag: desc owned by IDMAC (set to 1)
-+
-+#if defined(CONFIG_MACH_SUN50I)
-+// mmc2 on A64 only allows for 8k
-+#define DMA_BUF_MAX_SIZE (1 << 13)
-+#else
-+#define DMA_BUF_MAX_SIZE (1 << 16)
-+#endif
-+
-+struct sunxi_idma_desc {
-+        u32 config;
-+        u32 buf_size;
-+        u32 buf_addr_ptr1;
-+        u32 buf_addr_ptr2;
-+};
-+
- struct sunxi_mmc_plat {
- 	struct mmc_config cfg;
- 	struct mmc mmc;
-@@ -39,6 +61,8 @@ struct sunxi_mmc_priv {
- 	struct gpio_desc cd_gpio;	/* Change Detect GPIO */
- 	struct sunxi_mmc *reg;
- 	struct mmc_config cfg;
-+	unsigned n_dma_descs;
-+	struct sunxi_idma_desc* dma_descs;
- };
- 
- #if !CONFIG_IS_ENABLED(DM_MMC)
-@@ -318,7 +342,7 @@ static int mmc_trans_data_by_cpu(struct sunxi_mmc_priv *priv, struct mmc *mmc,
- 	if (timeout_msecs < 2000)
- 		timeout_msecs = 2000;
- 
--	/* Always read / write data through the CPU */
-+	/* Read / write data through the CPU */
- 	setbits_le32(&priv->reg->gctrl, SUNXI_MMC_GCTRL_ACCESS_BY_AHB);
- 
- 	start = get_timer(0);
-@@ -328,7 +352,7 @@ static int mmc_trans_data_by_cpu(struct sunxi_mmc_priv *priv, struct mmc *mmc,
- 
- 		while ((status = readl(&priv->reg->status)) & status_bit) {
- 			if (get_timer(start) > timeout_msecs)
--				return -1;
-+				return -ETIMEDOUT;
- 		}
- 
- 		/*
-@@ -360,21 +384,142 @@ static int mmc_trans_data_by_cpu(struct sunxi_mmc_priv *priv, struct mmc *mmc,
- 	return 0;
- }
- 
-+static void flush_cache_auto_align(void* buf, size_t len)
-+{
-+	uintptr_t mask = ~((uintptr_t)CONFIG_SYS_CACHELINE_SIZE - 1);
-+	uintptr_t start = (uintptr_t)buf & mask;
-+
-+	len = (len + 2 * CONFIG_SYS_CACHELINE_SIZE) & mask;
-+
-+	flush_cache(start, len);
-+}
-+
-+static int mmc_trans_data_by_dma(struct sunxi_mmc_priv *priv, struct mmc *mmc,
-+				 struct mmc_data *data)
-+{
-+	const int reading = !!(data->flags & MMC_DATA_READ);
-+	uint8_t *buff = (uint8_t*)(reading ? data->dest : data->src);
-+	unsigned byte_cnt = data->blocksize * data->blocks;
-+	unsigned i, n_desc, last_block_size;
-+	u32 rval;
-+
-+	/* data pointer and transfer size needs to be aligned to 4 bytes */
-+
-+	/* Read / write data through IDMAC */
-+	clrbits_le32(&priv->reg->gctrl, SUNXI_MMC_GCTRL_ACCESS_BY_AHB);
-+
-+	n_desc = byte_cnt / DMA_BUF_MAX_SIZE;
-+	last_block_size = byte_cnt % DMA_BUF_MAX_SIZE;
-+	if (last_block_size)
-+		n_desc++;
-+
-+	if (n_desc > priv->n_dma_descs)
-+		return -ENOMEM;
-+
-+	memset(priv->dma_descs, 0, sizeof(struct sunxi_idma_desc) * n_desc);
-+
-+	for (i = 0; i < n_desc; i++) {
-+		struct sunxi_idma_desc* desc = &priv->dma_descs[i];
-+		bool is_last = i == n_desc - 1;
-+		bool is_first = i == 0;
-+
-+		desc->config = DMA_CONFIG_CHAIN | DMA_CONFIG_HOLD
-+			| (is_last ? DMA_CONFIG_LAST : DMA_CONFIG_DIC)
-+			| (is_first ? DMA_CONFIG_FIRST : 0);
-+
-+		if (is_last && last_block_size)
-+			desc->buf_size = last_block_size;
-+		else
-+			desc->buf_size = DMA_BUF_MAX_SIZE;
-+
-+		desc->buf_addr_ptr1 = (uintptr_t)buff + i * DMA_BUF_MAX_SIZE;
-+		if (!is_last)
-+			desc->buf_addr_ptr2 = (uintptr_t)(desc + 1);
-+	}
-+
-+	/*
-+	 * Make sure everyhting needed for a transfer is in DRAM.
-+	 */
-+
-+	flush_cache_auto_align(buff, byte_cnt);
-+	flush_cache_auto_align(priv->dma_descs,
-+			       sizeof(struct sunxi_idma_desc) * n_desc);
-+
-+	dsb();
-+	isb();
-+
-+	/* dma enable */
-+	setbits_le32(&priv->reg->gctrl, SUNXI_MMC_GCTRL_DMA_RESET
-+		     | SUNXI_MMC_GCTRL_DMA_ENABLE);
-+
-+	/* idma reset */
-+	writel(SUNXI_MMC_IDMAC_RESET, &priv->reg->dmac);
-+
-+	/* wait idma reset done */
-+	while (readl(&priv->reg->dmac) & SUNXI_MMC_IDMAC_RESET);
-+
-+	/* idma on */
-+	writel(SUNXI_MMC_IDMAC_ENABLE | SUNXI_MMC_IDMAC_FIXBURST,
-+	       &priv->reg->dmac);
-+
-+	/* enable interrupt flags */
-+	rval = readl(&priv->reg->idie)
-+		& ~(SUNXI_MMC_IDIE_RXIRQ | SUNXI_MMC_IDIE_TXIRQ);
-+	rval |= reading ? SUNXI_MMC_IDIE_RXIRQ : SUNXI_MMC_IDIE_TXIRQ;
-+	writel(rval, &priv->reg->idie);
-+
-+	/* set address of the first descriptor */
-+	writel((uintptr_t)priv->dma_descs, &priv->reg->dlba);
-+
-+	/* set fifo fill tresholds for issuing dma */
-+
-+#if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN50I_H6)
-+	if (priv->mmc_no == 2) {
-+		// for mmc 2 we need to set this differently
-+		writel(SUNXI_MMC_FTRGLEVEL_BURST_SIZE(3) // burst-16
-+		       | SUNXI_MMC_FTRGLEVEL_RX_TL(15)
-+		       | SUNXI_MMC_FTRGLEVEL_TX_TL(240),
-+		       &priv->reg->ftrglevel);
-+	} else {
-+		writel(SUNXI_MMC_FTRGLEVEL_BURST_SIZE(2) // burst-8
-+		       | SUNXI_MMC_FTRGLEVEL_RX_TL(7)
-+		       | SUNXI_MMC_FTRGLEVEL_TX_TL(248),
-+		       &priv->reg->ftrglevel);
-+	}
-+#else
-+	writel(SUNXI_MMC_FTRGLEVEL_BURST_SIZE(2) // burst-8
-+	       | SUNXI_MMC_FTRGLEVEL_RX_TL(7)
-+	       | SUNXI_MMC_FTRGLEVEL_TX_TL(8),
-+	       &priv->reg->ftrglevel);
-+#endif
-+
-+	writel(0xffffffff, &priv->reg->idst);
-+
-+	return 0;
-+}
-+
- static int mmc_rint_wait(struct sunxi_mmc_priv *priv, struct mmc *mmc,
--			 uint timeout_msecs, uint done_bit, const char *what)
-+			 uint timeout_msecs, uint done_bit, bool wait_dma,
-+			 const char *what)
- {
- 	unsigned int status;
- 	unsigned long start = get_timer(0);
-+	bool dma_done = true;
- 
- 	do {
- 		status = readl(&priv->reg->rint);
-+
- 		if ((get_timer(start) > timeout_msecs) ||
- 		    (status & SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT)) {
- 			debug("%s timeout %x\n", what,
- 			      status & SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT);
- 			return -ETIMEDOUT;
- 		}
--	} while (!(status & done_bit));
-+
-+		if (wait_dma)
-+			dma_done = readl(&priv->reg->idst)
-+				& (SUNXI_MMC_IDST_TXIRQ | SUNXI_MMC_IDST_RXIRQ);
-+	} while (!(status & done_bit) || !dma_done);
- 
- 	return 0;
- }
-@@ -388,6 +533,7 @@ static int sunxi_mmc_send_cmd_common(struct sunxi_mmc_priv *priv,
- 	int error = 0;
- 	unsigned int status = 0;
- 	unsigned int bytecnt = 0;
-+	bool usedma = false;
- 
- 	if (priv->fatal_err)
- 		return -1;
-@@ -424,42 +570,45 @@ static int sunxi_mmc_send_cmd_common(struct sunxi_mmc_priv *priv,
- 	      cmd->cmdidx, cmdval | cmd->cmdidx, cmd->cmdarg);
- 	writel(cmd->cmdarg, &priv->reg->arg);
- 
--	if (!data)
--		writel(cmdval | cmd->cmdidx, &priv->reg->cmd);
--
- 	/*
- 	 * transfer data and check status
- 	 * STATREG[2] : FIFO empty
- 	 * STATREG[3] : FIFO full
- 	 */
- 	if (data) {
--		int ret = 0;
--
- 		bytecnt = data->blocksize * data->blocks;
- 		debug("trans data %d bytes\n", bytecnt);
--		writel(cmdval | cmd->cmdidx, &priv->reg->cmd);
--		ret = mmc_trans_data_by_cpu(priv, mmc, data);
--		if (ret) {
--			error = readl(&priv->reg->rint) &
--				SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT;
--			error = -ETIMEDOUT;
--			goto out;
-+
-+		if (bytecnt > 64 && !IS_ENABLED(SPL_BUILD)) {
-+			debug("  using dma %d\n", bytecnt);
-+			error = mmc_trans_data_by_dma(priv, mmc, data);
-+			writel(cmdval | cmd->cmdidx, &priv->reg->cmd);
-+			usedma = true;
-+		} else {
-+			debug("  using pio\n");
-+			writel(cmdval | cmd->cmdidx, &priv->reg->cmd);
-+			error = mmc_trans_data_by_cpu(priv, mmc, data);
- 		}
-+
-+		if (error)
-+			goto out;
-+	} else {
-+		writel(cmdval | cmd->cmdidx, &priv->reg->cmd);
- 	}
- 
- 	error = mmc_rint_wait(priv, mmc, 1000, SUNXI_MMC_RINT_COMMAND_DONE,
--			      "cmd");
-+			      false, "cmd");
- 	if (error)
- 		goto out;
- 
- 	if (data) {
--		timeout_msecs = 120;
-+		timeout_msecs = 10000;
- 		debug("cacl timeout %x msec\n", timeout_msecs);
- 		error = mmc_rint_wait(priv, mmc, timeout_msecs,
- 				      data->blocks > 1 ?
- 				      SUNXI_MMC_RINT_AUTO_COMMAND_DONE :
- 				      SUNXI_MMC_RINT_DATA_OVER,
--				      "data");
-+				      usedma, "data");
- 		if (error)
- 			goto out;
- 	}
-@@ -491,6 +640,14 @@ static int sunxi_mmc_send_cmd_common(struct sunxi_mmc_priv *priv,
- 		debug("mmc resp 0x%08x\n", cmd->response[0]);
- 	}
- out:
-+	if (data && usedma) {
-+		//status = readl(&reg->idst);
-+		writel(0, &priv->reg->idie);
-+		writel(0xffffffff, &priv->reg->idst);
-+		writel(0, &priv->reg->dmac);
-+		clrbits_le32(&priv->reg->gctrl, SUNXI_MMC_GCTRL_DMA_ENABLE);
-+	}
-+
- 	if (error < 0) {
- 		writel(SUNXI_MMC_GCTRL_RESET, &priv->reg->gctrl);
- 		mmc_update_clk(priv);
-@@ -674,6 +831,15 @@ static int sunxi_mmc_probe(struct udevice *dev)
- 
- 	priv->reg = dev_read_addr_ptr(dev);
- 
-+	// make sure we have enough space for descritors for BLK_SIZE * b_max
-+	priv->n_dma_descs = 512 * 65536 / DMA_BUF_MAX_SIZE;
-+	priv->dma_descs = malloc(sizeof(struct sunxi_idma_desc)
-+				 * priv->n_dma_descs);
-+	if (priv->dma_descs == NULL) {
-+		debug("init mmc alloc failed\n");
-+		return -ENOMEM;
-+	}
-+
- 	/* We don't have a sunxi clock driver so find the clock address here */
- 	ret = dev_read_phandle_with_args(dev, "clocks", "#clock-cells", 0,
- 					  1, &args);
--- 
-2.31.1
-