public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Michael Kurz <michi.kurz@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 4/9] ARM: stm32: fix stm32f7 sdram fmc base address
Date: Sun, 22 Jan 2017 16:04:25 +0100	[thread overview]
Message-ID: <1485097470-71245-5-git-send-email-michi.kurz@gmail.com> (raw)
In-Reply-To: <1485097470-71245-1-git-send-email-michi.kurz@gmail.com>

The fmc base address is defined twice, once in fmc.h and once in stm32.h.
Fix wrong definition in stm32.h.
Remove the definiton in fmc.h.

Signed-off-by: Michael Kurz <michi.kurz@gmail.com>
Acked-by: Vikas Manocha <vikas.manocha@st.com>

---

Changes in v4:
- Reword commit message
- Add Acked-by tag to 'fix stm32f7 sdram fmc base address'

Changes in v3:
- Split cleanup patch

Changes in v2: None

 arch/arm/include/asm/arch-stm32f7/fmc.h   | 3 +--
 arch/arm/include/asm/arch-stm32f7/stm32.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/arch-stm32f7/fmc.h b/arch/arm/include/asm/arch-stm32f7/fmc.h
index d61a86f..4741e5a 100644
--- a/arch/arm/include/asm/arch-stm32f7/fmc.h
+++ b/arch/arm/include/asm/arch-stm32f7/fmc.h
@@ -24,8 +24,7 @@ struct stm32_fmc_regs {
 /*
  * FMC registers base
  */
-#define STM32_SDRAM_FMC_BASE	0xA0000140
-#define STM32_SDRAM_FMC		((struct stm32_fmc_regs *)STM32_SDRAM_FMC_BASE)
+#define STM32_SDRAM_FMC		((struct stm32_fmc_regs *)SDRAM_FMC_BASE)
 
 /* Control register SDCR */
 #define FMC_SDCR_RPIPE_SHIFT	13	/* RPIPE bit shift */
diff --git a/arch/arm/include/asm/arch-stm32f7/stm32.h b/arch/arm/include/asm/arch-stm32f7/stm32.h
index a425178..14e3398 100644
--- a/arch/arm/include/asm/arch-stm32f7/stm32.h
+++ b/arch/arm/include/asm/arch-stm32f7/stm32.h
@@ -49,7 +49,7 @@
 #define FLASH_CNTL_BASE		(AHB1_PERIPH_BASE + 0x3C00)
 
 
-#define SDRAM_FMC_BASE		(AHB3_PERIPH_BASE + 0x4A0000140)
+#define SDRAM_FMC_BASE		(AHB3_PERIPH_BASE + 0x40000140)
 
 static const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = {
 	[0 ... 3] =	32 * 1024,
-- 
2.1.4

  parent reply	other threads:[~2017-01-22 15:04 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-22 15:04 [U-Boot] [PATCH v4 0/9] ARM: stm32: add network and qspi driver support to stm32f746-disco board Michael Kurz
2017-01-22 15:04 ` [U-Boot] [PATCH v4 1/9] ARM: DTS: stm32: add stm32f746 device tree pin control files Michael Kurz
2017-01-28 22:44   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-01-22 15:04 ` [U-Boot] [PATCH v4 2/9] ARM: DTS: stm32: add stm32f746-disco device tree files Michael Kurz
2017-01-28 22:44   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-01-22 15:04 ` [U-Boot] [PATCH v4 3/9] ARM: stm32: cleanup stm32f7 files Michael Kurz
2017-01-24 19:35   ` Vikas MANOCHA
2017-01-28 22:45   ` [U-Boot] [U-Boot,v4,3/9] " Tom Rini
2017-01-22 15:04 ` Michael Kurz [this message]
2017-01-28 22:45   ` [U-Boot] [U-Boot, v4, 4/9] ARM: stm32: fix stm32f7 sdram fmc base address Tom Rini
2017-01-22 15:04 ` [U-Boot] [PATCH v4 5/9] ARM: stm32: use clock setup function defined in clock.c Michael Kurz
2017-01-28 22:45   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-01-22 15:04 ` [U-Boot] [PATCH v4 6/9] net: stm32: add designware mac glue code for stm32 Michael Kurz
2017-01-28 22:45   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-01-22 15:04 ` [U-Boot] [PATCH v4 7/9] net: phy: add SMSC LAN8742 phy Michael Kurz
2017-01-28 22:45   ` [U-Boot] [U-Boot,v4,7/9] " Tom Rini
2017-01-22 15:04 ` [U-Boot] [PATCH v4 8/9] ARM: stm32: enable support for smsc phy on stm32f746-disco board Michael Kurz
2017-01-28 22:45   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-01-22 15:04 ` [U-Boot] [PATCH v4 9/9] ARM: SPI: stm32: add stm32f746 qspi driver Michael Kurz
2017-01-28 22:45   ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-01-24 19:39 ` [U-Boot] [PATCH v4 0/9] ARM: stm32: add network and qspi driver support to stm32f746-disco board Vikas MANOCHA

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=1485097470-71245-5-git-send-email-michi.kurz@gmail.com \
    --to=michi.kurz@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox