From 9835084f5a2ed06968c351303abf6dc140bd1167 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 2 Sep 2020 11:15:46 +0200
Subject: [PATCH] temp/u-boot-pinephone: set RAM block back to 552 (MR 1527)

We were using a frequency of 624 which froze my device and in the past
other units too. Set it back to 552 as before so this doesn't happen
anymore

This is being upstreamed, https://gitlab.com/pine64-org/u-boot/-/merge_requests/3

(cherry picked from commit 88b48dee152686a887809ddb296cfd96e0c89f55)
---
 .../0001-Set-RAM-clock-back-to-552.patch      | 30 +++++++++++++++++++
 temp/u-boot-pinephone/APKBUILD                |  6 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 temp/u-boot-pinephone/0001-Set-RAM-clock-back-to-552.patch

diff --git a/temp/u-boot-pinephone/0001-Set-RAM-clock-back-to-552.patch b/temp/u-boot-pinephone/0001-Set-RAM-clock-back-to-552.patch
new file mode 100644
index 000000000..4d572b1fa
--- /dev/null
+++ b/temp/u-boot-pinephone/0001-Set-RAM-clock-back-to-552.patch
@@ -0,0 +1,30 @@
+This is being upstreamed, https://gitlab.com/pine64-org/u-boot/-/merge_requests/3
+
+From 74ec7d4ab140e88158212f4e565dc7ab22d5d4f0 Mon Sep 17 00:00:00 2001
+From: Bart Ribbers <bribbers@disroot.org>
+Date: Wed, 2 Sep 2020 11:13:50 +0200
+Subject: [PATCH] Set RAM clock back to 552
+
+Any higher will cause random freezes. We've experienced this in the past
+and now I've been experiencing it with a 1.2a device. Decreasing it back
+to 552 fixed the issue for me.
+---
+ configs/pinephone_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig
+index 1ffd495d79..9268a861bf 100644
+--- a/configs/pinephone_defconfig
++++ b/configs/pinephone_defconfig
+@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
+ CONFIG_SPL=y
+ CONFIG_MACH_SUN50I=y
+ CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
+-CONFIG_DRAM_CLK=624
++CONFIG_DRAM_CLK=552
+ CONFIG_DRAM_ZQ=3881949
+ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+ # CONFIG_VIDEO_DE2 is not set
+-- 
+2.28.0
+
diff --git a/temp/u-boot-pinephone/APKBUILD b/temp/u-boot-pinephone/APKBUILD
index 3063685c7..fa9872c03 100644
--- a/temp/u-boot-pinephone/APKBUILD
+++ b/temp/u-boot-pinephone/APKBUILD
@@ -1,7 +1,7 @@
 # U-boot with patches to make the PinePhone boot faster and have control over the ddr clock speed
 pkgname=u-boot-pinephone
 pkgver=2020.07_git20200803
-pkgrel=0
+pkgrel=1
 # Last commit from "crust" branch, as used in "crust-meta":
 # https://gitlab.com/pine64-org/crust-meta/-/blob/8886bcc829179bf77216fade71f0ede9bd014e67/Makefile#L78
 _commit="5433de221199bd5458f3ef71a8366f8031b61cb1"
@@ -15,6 +15,7 @@ options="!check"
 source="https://gitlab.com/pine64-org/u-boot/-/archive/$_commit/u-boot-$_commit.tar.gz
 	update-u-boot
 	0001-sunxi-support-asymmetric-dual-rank-DRAM-on-A64-R40.patch
+	0001-Set-RAM-clock-back-to-552.patch
 	"
 builddir="$srcdir/u-boot-$_commit"
 
@@ -40,4 +41,5 @@ package() {
 
 sha512sums="89cf93893e5cd9a3ecebdcc1e6dc28e6c2bb58aef7d18371e06e85d197d0d4fbdced5856349fdca35b97ad2d55a87d5fe2eaec8d5d2019f29e6a3af62d737ab0  u-boot-5433de221199bd5458f3ef71a8366f8031b61cb1.tar.gz
 4a3a1772a7309d44e7977dee4aca499d5c79675d99cda1395d8765abb415b8456260c7a989650f0bd2dfda0377af2346917fbcbf3e356a36265ed07e161ddc3b  update-u-boot
-7369f4d1f28d1ec2adf9640636940b3672eb5d4573160f2906451778369b67a02d4a684fb81246b3e2b9983acf0c9632b1c880f7d77c850a00a41080fca65481  0001-sunxi-support-asymmetric-dual-rank-DRAM-on-A64-R40.patch"
+7369f4d1f28d1ec2adf9640636940b3672eb5d4573160f2906451778369b67a02d4a684fb81246b3e2b9983acf0c9632b1c880f7d77c850a00a41080fca65481  0001-sunxi-support-asymmetric-dual-rank-DRAM-on-A64-R40.patch
+e412f968e9107b5d2c7282135fe343fd27c2ae9830344e367c2ee9ee4b0ba7be8b305356468011a4f04cf0d81e908827d7d3ddfd23f9c107ba5c91170503601c  0001-Set-RAM-clock-back-to-552.patch"