[U-Boot-Users] [PATCH] 85xx/86xx: Rename DDR init address and init extended address register

[U-Boot-Users] [PATCH] 85xx/86xx: Rename DDR init address and init extended address register

[Kumar Gala]

Rename init_addr and init_ext_addr to match the docs between
85xx and 86xx.  Both now use 'init_addr' and 'init_ext_addr'.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

Can you guys ack and decide who will actually apply this.

- k

 include/asm-ppc/immap_85xx.h |    4 ++--
 include/asm-ppc/immap_86xx.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h
index 813be5f..2d07625 100644
--- a/include/asm-ppc/immap_85xx.h
+++ b/include/asm-ppc/immap_85xx.h
@@ -106,8 +106,8 @@ typedef struct ccsr_ddr {
 	char	res6[4];
 	uint	sdram_clk_cntl;		/* 0x2130 - DDR SDRAM Clock Control */
 	char	res7[20];
-	uint	init_address;		/* 0x2148 - DDR training initialization address */
-	uint	init_ext_address;	/* 0x214C - DDR training initialization extended address */
+	uint	init_addr;		/* 0x2148 - DDR training initialization address */
+	uint	init_ext_addr;		/* 0x214C - DDR training initialization extended address */
 	char	res8_1[16];
 	uint	timing_cfg_4;		/* 0x2160 - DDR SDRAM Timing Configuration Register 4 */
 	uint	timing_cfg_5;		/* 0x2164 - DDR SDRAM Timing Configuration Register 5 */
diff --git a/include/asm-ppc/immap_86xx.h b/include/asm-ppc/immap_86xx.h
index fd4aa54..0b78c94 100644
--- a/include/asm-ppc/immap_86xx.h
+++ b/include/asm-ppc/immap_86xx.h
@@ -126,7 +126,7 @@ typedef struct ccsr_ddr {
 	uint    sdram_ocd_cntl;		/* 0x2140 - DDR SDRAM OCD Control */
 	uint    sdram_ocd_status;	/* 0x2144 - DDR SDRAM OCD Status */
 	uint    init_addr;		/* 0x2148 - DDR training initialzation address */
-	uint    init_addr_ext;		/* 0x214C - DDR training initialzation extended address */
+	uint    init_ext_addr;		/* 0x214C - DDR training initialzation extended address */
 	char    res10[2728];
 	uint    ip_rev1;		/* 0x2BF8 - DDR IP Block Revision 1 */
 	uint    ip_rev2;		/* 0x2BFC - DDR IP Block Revision 2 */
-- 
1.5.4.1

[U-Boot-Users] [PATCH] 85xx/86xx: Rename DDR init address and init extended address register

[Jon Loeliger]

Kumar Gala wrote:
> Rename init_addr and init_ext_addr to match the docs between
> 85xx and 86xx.  Both now use 'init_addr' and 'init_ext_addr'.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> 
> Can you guys ack and decide who will actually apply this.
> 
> - k
> 
>  include/asm-ppc/immap_85xx.h |    4 ++--
>  include/asm-ppc/immap_86xx.h |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

Ack.

Andy, you've got me two-to-one on this,
so if you would, please pick this up!

Thanks,
jdl