Patchwork [U-Boot,2/2] powerpc/85xx: Declare fsl_ddr_set_memctl_regs in <asm/fsl_ddr_sdram.h>

login
register
mail settings
Submitter Kumar Gala
Date Jan. 26, 2011, 6:22 a.m.
Message ID <1296022931-19684-2-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/80447/
State Accepted
Commit f0f899432e8e901844c3d98483d89d4612f13d98
Delegated to: Kumar Gala
Headers show

Comments

Kumar Gala - Jan. 26, 2011, 6:22 a.m.
Remove declerations of fsl_ddr_set_memctl_regs in board files with and
place it into a common header.

Based on patch from Poonam Aggrwal.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/include/asm/fsl_ddr_sdram.h |    2 ++
 board/freescale/corenet_ds/ddr.c         |    3 ---
 board/freescale/p1_p2_rdb/ddr.c          |    3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)
Kumar Gala - Feb. 1, 2011, 4:43 a.m.
On Jan 26, 2011, at 12:22 AM, Kumar Gala wrote:

> Remove declerations of fsl_ddr_set_memctl_regs in board files with and
> place it into a common header.
> 
> Based on patch from Poonam Aggrwal.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/include/asm/fsl_ddr_sdram.h |    2 ++
> board/freescale/corenet_ds/ddr.c         |    3 ---
> board/freescale/p1_p2_rdb/ddr.c          |    3 ---
> 3 files changed, 2 insertions(+), 6 deletions(-)

applied to 85xx next

- k

Patch

diff --git a/arch/powerpc/include/asm/fsl_ddr_sdram.h b/arch/powerpc/include/asm/fsl_ddr_sdram.h
index 852e5c3..73bc023 100644
--- a/arch/powerpc/include/asm/fsl_ddr_sdram.h
+++ b/arch/powerpc/include/asm/fsl_ddr_sdram.h
@@ -266,6 +266,8 @@  typedef struct memctl_options_s {
 
 extern phys_size_t fsl_ddr_sdram(void);
 extern int fsl_use_spd(void);
+extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
+					unsigned int ctrl_num);
 
 /*
  * The 85xx boards have a common prototype for fixed_sdram so put the
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 4c30657..fb53946 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -16,9 +16,6 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
-				   unsigned int ctrl_num);
-
 
 /*
  * Fixed sdram init -- doesn't use serial presence detect.
diff --git a/board/freescale/p1_p2_rdb/ddr.c b/board/freescale/p1_p2_rdb/ddr.c
index fbc46b1..44faec3 100644
--- a/board/freescale/p1_p2_rdb/ddr.c
+++ b/board/freescale/p1_p2_rdb/ddr.c
@@ -30,9 +30,6 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
-				   unsigned int ctrl_num);
-
 #define CONFIG_SYS_DDR_CS0_BNDS		0x0000003F
 #define CONFIG_SYS_DDR_CS0_CONFIG	0x80014202
 #define CONFIG_SYS_DDR_CS0_CONFIG_2	0x00000000