From 8980d5114881ba4daa963f96014c16bac2c8c891 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Fri, 17 Dec 2021 23:00:41 +0000
Subject: [PATCH] add a patch to enable emmc phy in rk3399 spl from Yifeng Zhao
 on U-Boot list, not yet upstream fixes regression booting on pinebook pro
 since 2021.10, specifically ac804143cf ("mmc: rockchip_sdhci: add phy and
 clock config for rk3399") problem reported and fix tested by patrick@ drop
 maintainer

---
 sysutils/u-boot/Makefile                      |  5 ++---
 .../patch-arch_arm_dts_rk3399-u-boot_dtsi     | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi

diff --git a/sysutils/u-boot/Makefile b/sysutils/u-boot/Makefile
index 5b1edbb8bb6..9f9a9b45eb4 100644
--- a/sysutils/u-boot/Makefile
+++ b/sysutils/u-boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.88 2021/10/29 11:14:46 patrick Exp $
+#	$OpenBSD: Makefile,v 1.89 2021/12/17 23:00:41 jsg Exp $
 
 BROKEN-sparc64=	Error: the specified option is not accepted in ISB at operand 1 -- isb sy
 BROKEN-arm=	lib/time.c:187:1: internal compiler error: Bus error
@@ -8,13 +8,12 @@ FLAVOR?=	arm
 
 COMMENT=	U-Boot firmware
 VERSION=	2021.10
-REVISION=	1
+REVISION=	2
 DISTNAME=	u-boot-${VERSION}
 PKGNAME=	u-boot-${FLAVOR}-${VERSION:S/-//}
 FULLPKGNAME=	${PKGNAME}
 CATEGORIES=	sysutils
 HOMEPAGE=	https://www.denx.de/wiki/U-Boot
-MAINTAINER=	Jonathan Gray <jsg@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE=	Yes
diff --git a/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi b/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi
new file mode 100644
index 00000000000..1d2498cc2da
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-u-boot_dtsi
@@ -0,0 +1,21 @@
+$OpenBSD: patch-arch_arm_dts_rk3399-u-boot_dtsi,v 1.1 2021/12/17 23:00:41 jsg Exp $
+
+dts: rockchip: rk3399: enable emmc phy for spl
+http://patchwork.ozlabs.org/project/uboot/patch/20211101044347.17822-1-yifeng.zhao@rock-chips.com/
+
+fixes emmc boot on pinebook pro
+
+Index: arch/arm/dts/rk3399-u-boot.dtsi
+--- arch/arm/dts/rk3399-u-boot.dtsi.orig
++++ arch/arm/dts/rk3399-u-boot.dtsi
+@@ -88,6 +88,10 @@
+ 	u-boot,dm-pre-reloc;
+ };
+ 
++&emmc_phy {
++	u-boot,dm-pre-reloc;
++};
++
+ &grf {
+ 	u-boot,dm-pre-reloc;
+ };