RT #72064. Renamed register name: wtr -> bwtr. Ditto in defines

(BWR - > BWTR).

board/stm/stm3220g-eval/board.c

@@ -170,8 +170,8 @@ int misc_init_r(void)
 
 	STM32_FSMC->cs[i].bcr = CONFIG_SYS_FSMC_FLASH_BCR;
 	STM32_FSMC->cs[i].btr = CONFIG_SYS_FSMC_FLASH_BTR;
-# if defined(CONFIG_SYS_FSMC_FLASH_BWR)
-	STM32_FSMC->wt[i].wtr = CONFIG_SYS_FSMC_FLASH_BWR;
+# if defined(CONFIG_SYS_FSMC_FLASH_BWTR)
+	STM32_FSMC->wt[i].bwtr = CONFIG_SYS_FSMC_FLASH_BWTR;
 # endif
 #endif /* CONFIG_SYS_NO_FLASH */
 
@@ -204,8 +204,8 @@ int dram_init(void)
 	/* Step.1 */
 	STM32_FSMC->cs[i].bcr = CONFIG_SYS_FSMC_PSRAM_BCR;
 	STM32_FSMC->cs[i].btr = CONFIG_SYS_FSMC_PSRAM_BTR;
-# if defined(CONFIG_SYS_FSMC_PSRAM_BWR)
-	STM32_FSMC->wt[i].wtr = CONFIG_SYS_FSMC_PSRAM_BWR;
+# if defined(CONFIG_SYS_FSMC_PSRAM_BWTR)
+	STM32_FSMC->wt[i].bwtr = CONFIG_SYS_FSMC_PSRAM_BWTR;
 # endif
 
 	rv = stm32f2_gpio_config(&ctrl_gpio, STM32F2_GPIO_ROLE_GPOUT);
@@ -236,7 +236,7 @@ int dram_init(void)
 	/* Step.8 */
 	STM32_FSMC->cs[i].bcr = 0x00005059;
 	STM32_FSMC->cs[i].btr = 0x100106F2;
-	STM32_FSMC->wt[i].wtr = 0x100107F2;
+	STM32_FSMC->wt[i].bwtr = 0x100107F2;
 
 	/* Step.9 */
 	stm32f2_gpout_set(&ctrl_gpio, 1);

include/asm-arm/arch-stm32/stm32.h

@@ -107,7 +107,7 @@ struct stm32_fsmc_regs {
 	} cs[4];
 	u32	rsv0[57];
 	struct {
-		u32	wtr;		/* Write timing			      */
+		u32	bwtr;		/* Write timing			      */
 		u32	rsv1;
 	} wt[4];
 };

include/configs/stm3220g-eval.h

@@ -120,7 +120,7 @@
 #undef CONFIG_SYS_RAM_BURST
 #define CONFIG_SYS_FSMC_PSRAM_BCR	0x00005059
 #define CONFIG_SYS_FSMC_PSRAM_BTR	0x10000702
-#define CONFIG_SYS_FSMC_PSRAM_BWR	0x10000602
+#define CONFIG_SYS_FSMC_PSRAM_BWTR	0x10000602
 
 #define CONFIG_SYS_RAM_BASE		(0x60000000 +			\
 					 ((CONFIG_SYS_RAM_CS - 1) * 0x4000000))
@@ -132,7 +132,7 @@
 
 #define CONFIG_SYS_FSMC_FLASH_BCR	0x00005015
 #define CONFIG_SYS_FSMC_FLASH_BTR	0x00010903
-#define CONFIG_SYS_FSMC_FLASH_BWR	0x00010803
+#define CONFIG_SYS_FSMC_FLASH_BWTR	0x00010803
 
 #define CONFIG_SYS_FLASH_BANK1_BASE	(0x60000000 +			\
 					 ((CONFIG_SYS_FLASH_CS - 1) *	\