From 70961ba41477a709870a01c86af2950124bb64fe Mon Sep 17 00:00:00 2001
From: Becky Bruce <beckyb@kernel.crashing.org>
Date: Fri, 17 Dec 2010 17:17:57 -0600
Subject: [PATCH] mpc85xx: rename sdram_init() lbc_sdram_init()
sdram_init() is used to initialize sdram on the lbc. Rename it
accordingly.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
arch/powerpc/cpu/mpc85xx/cpu.c | 2 +-
arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 4 ++--
arch/powerpc/include/asm/fsl_lbc.h | 2 +-
board/freescale/mpc8540ads/mpc8540ads.c | 4 +---
board/freescale/mpc8541cds/mpc8541cds.c | 3 +--
board/freescale/mpc8548cds/mpc8548cds.c | 3 +--
board/freescale/mpc8555cds/mpc8555cds.c | 3 +--
board/freescale/mpc8560ads/mpc8560ads.c | 4 +---
board/freescale/mpc8568mds/mpc8568mds.c | 3 +--
board/sbc8548/sbc8548.c | 3 +--
10 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index bea8e10af7e..afa9ca978b6 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -331,7 +331,7 @@ phys_size_t initdram(int board_type)
#endif
/* Some boards also have sdram on the lbc */
- sdram_init();
+ lbc_sdram_init();
puts("DDR: ");
return dram_size;
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 10fcd243f71..6f401e7509d 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -11,11 +11,11 @@
#ifdef CONFIG_MPC85xx
/* Boards should provide their own version of this if they use lbc sdram */
-void __sdram_init(void)
+void __lbc_sdram_init(void)
{
/* Do nothing */
}
-void sdram_init(void) __attribute__((weak, alias("__sdram_init")));
+void lbc_sdram_init(void) __attribute__((weak, alias("__lbc_sdram_init")));
#endif
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index fcf3371f590..c5047326ae4 100644
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -17,7 +17,7 @@
#include <common.h>
#ifdef CONFIG_MPC85xx
-void sdram_init(void);
+void lbc_sdram_init(void);
#endif
/* BR - Base Registers
diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c
index deab811bdd2..9eeb1349213 100644
--- a/board/freescale/mpc8540ads/mpc8540ads.c
+++ b/board/freescale/mpc8540ads/mpc8540ads.c
@@ -122,9 +122,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 59df2bdb393..3ee666f422b 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -291,8 +291,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
#if defined(CONFIG_SYS_OR2_PRELIM) && defined(CONFIG_SYS_BR2_PRELIM)
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index a4a35fa3bfe..8ad6b22b19e 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -111,8 +111,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
#if defined(CONFIG_SYS_OR2_PRELIM) && defined(CONFIG_SYS_BR2_PRELIM)
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index 5fe7f13981a..02df6ae22ef 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -289,8 +289,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
#if defined(CONFIG_SYS_OR2_PRELIM) && defined(CONFIG_SYS_BR2_PRELIM)
diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c
index 49701efda8f..26a64a3da5f 100644
--- a/board/freescale/mpc8560ads/mpc8560ads.c
+++ b/board/freescale/mpc8560ads/mpc8560ads.c
@@ -327,9 +327,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 85885fc4fe8..07f8e515937 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -171,8 +171,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
#if defined(CONFIG_SYS_OR2_PRELIM) && defined(CONFIG_SYS_BR2_PRELIM)
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index 1bce6fa3f31..ff3920bc9ee 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -104,8 +104,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
#if defined(CONFIG_SYS_LBC_SDRAM_SIZE)
--
GitLab