All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wens@csie.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 10/12] sunxi: Fix CPUCFG address for R40
Date: Wed,  1 Mar 2017 15:04:45 +0800	[thread overview]
Message-ID: <20170301070447.20255-11-wens@csie.org> (raw)
In-Reply-To: <20170301070447.20255-1-wens@csie.org>

The R40 has the CPUCFG block at the same address as the A20.
Fix it.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
index ea672fe8449a..88c3f138173f 100644
--- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
@@ -108,7 +108,7 @@ defined(CONFIG_MACH_SUN50I)
 #define SUNXI_TP_BASE			0x01c25000
 #define SUNXI_PMU_BASE			0x01c25400
 
-#ifdef CONFIG_MACH_SUN7I
+#if defined CONFIG_MACH_SUN7I || defined CONFIG_MACH_SUN8I_R40
 #define SUNXI_CPUCFG_BASE		0x01c25c00
 #endif
 
@@ -167,7 +167,9 @@ defined(CONFIG_MACH_SUN50I)
 #define SUNXI_RTC_BASE			0x01f00000
 #define SUNXI_PRCM_BASE			0x01f01400
 
-#if defined CONFIG_SUNXI_GEN_SUN6I && !defined CONFIG_MACH_SUN8I_A83T
+#if defined CONFIG_SUNXI_GEN_SUN6I && \
+    !defined CONFIG_MACH_SUN8I_A83T && \
+    !defined CONFIG_MACH_SUN8I_R40
 #define SUNXI_CPUCFG_BASE		0x01f01c00
 #endif
 
-- 
2.11.0

  parent reply	other threads:[~2017-03-01  7:04 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-01  7:04 [U-Boot] [PATCH 00/12] sunxi: Add support for R40 SoC Chen-Yu Tsai
2017-03-01  7:04 ` [U-Boot] [PATCH 01/12] sunxi: Add initial support for R40 Chen-Yu Tsai
2017-03-01 10:55   ` Maxime Ripard
2017-03-01 12:10     ` Chen-Yu Tsai
2017-03-01 14:57       ` Maxime Ripard
2017-03-01 15:22         ` [U-Boot] [linux-sunxi] " Icenowy Zheng
2017-03-01  7:04 ` [U-Boot] [PATCH 02/12] sunxi: Enable AXP221s in I2C mode with the R40 SoC Chen-Yu Tsai
2017-03-01 10:55   ` Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 03/12] sunxi: Fix watchdog reset function for R40 Chen-Yu Tsai
2017-03-01 10:56   ` Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 04/12] sunxi: Add mmc[1-3] pinmux settings " Chen-Yu Tsai
2017-03-01 10:56   ` Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 05/12] sunxi: Set PLL lock enable bits " Chen-Yu Tsai
2017-03-01 14:53   ` Maxime Ripard
2017-03-01 18:16   ` [U-Boot] [linux-sunxi] " Jernej Škrabec
2017-03-01  7:04 ` [U-Boot] [PATCH 06/12] sunxi: Provide defaults for R40 DRAM settings Chen-Yu Tsai
2017-03-01 14:53   ` Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 07/12] gpio: sunxi: Add compatible string for R40 PIO Chen-Yu Tsai
2017-03-01 14:54   ` Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 08/12] sunxi: Use H3/A64 DRAM initialization code for R40 Chen-Yu Tsai
2017-03-01 14:54   ` Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 09/12] sunxi: Enable SPL " Chen-Yu Tsai
2017-03-01 14:54   ` Maxime Ripard
2017-03-01  7:04 ` Chen-Yu Tsai [this message]
2017-03-01 14:55   ` [U-Boot] [PATCH 10/12] sunxi: Fix CPUCFG address " Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 11/12] sunxi: Add PSCI support " Chen-Yu Tsai
2017-03-01 14:55   ` Maxime Ripard
2017-03-01  7:04 ` [U-Boot] [PATCH 12/12] sunxi: Add support for Bananapi M2 Ultra Chen-Yu Tsai
2017-03-01 14:56   ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170301070447.20255-11-wens@csie.org \
    --to=wens@csie.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.