59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 22f2f6dd2a0e835f329f87b5349130300fc46e42 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Fri, 4 Mar 2016 10:57:34 +0100
|
|
Subject: [PATCH 1/2] sunxi: A23: Fix some revisions needing a different magic
|
|
sram poke
|
|
|
|
I've had this one a23 tablet which would not boot and I've finally
|
|
figured out what the problem is by looking at the released boot0 code,
|
|
it seems the magic sram controller poke which we need to do in s_init()
|
|
depends on the revision of the a23.
|
|
|
|
Specifically this change is needed to get the A23 SoC I have with the
|
|
following serial to boot: "E6071AB 26Y7".
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Acked-by: Ian Campbell <ijc@hellion.org.uk>
|
|
---
|
|
arch/arm/cpu/armv7/sunxi/board.c | 22 +++++++++++++++++++---
|
|
1 file changed, 19 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
|
|
index eb5f4b6..e80785b 100644
|
|
--- a/arch/arm/cpu/armv7/sunxi/board.c
|
|
+++ b/arch/arm/cpu/armv7/sunxi/board.c
|
|
@@ -113,11 +113,27 @@ int spl_board_load_image(void)
|
|
|
|
void s_init(void)
|
|
{
|
|
-#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_A23
|
|
- /* Magic (undocmented) value taken from boot0, without this DRAM
|
|
- * access gets messed up (seems cache related) */
|
|
+ /*
|
|
+ * Undocumented magic taken from boot0, without this DRAM
|
|
+ * access gets messed up (seems cache related).
|
|
+ * The boot0 sources describe this as: "config ema for cache sram"
|
|
+ */
|
|
+#if defined CONFIG_MACH_SUN6I
|
|
setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0x1800);
|
|
+#elif defined CONFIG_MACH_SUN8I_A23
|
|
+ uint version;
|
|
+
|
|
+ /* Unlock sram version info reg, read it, relock */
|
|
+ setbits_le32(SUNXI_SRAMC_BASE + 0x24, (1 << 15));
|
|
+ version = readl(SUNXI_SRAMC_BASE + 0x24);
|
|
+ clrbits_le32(SUNXI_SRAMC_BASE + 0x24, (1 << 15));
|
|
+
|
|
+ if ((version & 0xffff0000) == 0x16500000)
|
|
+ setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0x1800);
|
|
+ else /* 0x1661 ? */
|
|
+ setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0xc0);
|
|
#endif
|
|
+
|
|
#if defined CONFIG_MACH_SUN6I || \
|
|
defined CONFIG_MACH_SUN7I || \
|
|
defined CONFIG_MACH_SUN8I
|
|
--
|
|
2.7.3
|
|
|