소스 검색

ARM: stm32: fix stm32f7 sdram fmc base address

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>
Michael Kurz 8 년 전
부모
커밋
dd3f0ebfb7
2개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 2
      arch/arm/include/asm/arch-stm32f7/fmc.h
  2. 1 1
      arch/arm/include/asm/arch-stm32f7/stm32.h

+ 1 - 2
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 */

+ 1 - 1
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,