uboot-sunxi: add T113-S3 support

[openwrt/staging/wigyori.git] / package / boot / uboot-sunxi / patches / 4038-HACK-sunxi-psci-be-compatible-with-v1-of-R528-patchs.patch

diff --git a/package/boot/uboot-sunxi/patches/4038-HACK-sunxi-psci-be-compatible-with-v1-of-R528-patchs.patch b/package/boot/uboot-sunxi/patches/4038-HACK-sunxi-psci-be-compatible-with-v1-of-R528-patchs.patch
new file mode 100644 (file)
index 0000000..ddb13c5
--- /dev/null
+++ b/package/boot/uboot-sunxi/patches/4038-HACK-sunxi-psci-be-compatible-with-v1-of-R528-patchs.patch
@@ -0,0 +1,38 @@
+From 1ae024a941fcbb196a02cf78c710a2120e86f52c Mon Sep 17 00:00:00 2001
+From: Sam Edwards <cfsworks@gmail.com>
+Date: Wed, 16 Aug 2023 10:34:20 -0700
+Subject: [PATCH 4038/4052] HACK: sunxi: psci: be compatible with v1 of R528
+ patchset
+
+This is a hack for reviewer QoL. It is not being submitted for mainline
+inclusion.
+---
+ arch/arm/cpu/armv7/sunxi/psci.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
+index b4ce4f6def..27bac291d5 100644
+--- a/arch/arm/cpu/armv7/sunxi/psci.c
++++ b/arch/arm/cpu/armv7/sunxi/psci.c
+@@ -60,6 +60,18 @@
+ 
+ #define SUN8I_R528_C0_STATUS_STANDBYWFI               (16)
+ 
++/* 3 hacks for compatibility across v1/v2 of Andre's R528 support series */
++#ifndef SUNXI_R_CPUCFG_BASE
++#define SUNXI_R_CPUCFG_BASE                   0
++#endif
++#ifndef SUNXI_PRCM_BASE
++#define SUNXI_PRCM_BASE                               0
++#endif
++#if defined(SUNXI_CPUX_BASE) && defined(SUNXI_CPUCFG_BASE)
++#undef SUNXI_CPUCFG_BASE
++#define SUNXI_CPUCFG_BASE SUNXI_CPUX_BASE
++#endif
++
+ static void __secure cp15_write_cntp_tval(u32 tval)
+ {
+       asm volatile ("mcr p15, 0, %0, c14, c2, 0" : : "r" (tval));
+-- 
+2.20.1
+