diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2023-12-26 21:46:18 +0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-11 11:24:58 -0500 |
| commit | 6c84e71258935e1491fd95c9f8151f43b0676fa2 (patch) | |
| tree | 03ffaa2888129803403bd15dccb8ce796d28bb9f | |
| parent | 0c6d645d3fd23055d2af1ef9e5e0d838a74cd9d6 (diff) | |
| download | u-boot-6c84e71258935e1491fd95c9f8151f43b0676fa2.zip u-boot-6c84e71258935e1491fd95c9f8151f43b0676fa2.tar.gz u-boot-6c84e71258935e1491fd95c9f8151f43b0676fa2.tar.bz2 | |
omap3: use device specific naming for mem_init
Use device specific naming for functions so as to not overlap
with common function names.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/arm/include/asm/arch-omap3/mem.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap3/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap3/emif4.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap3/sdrc.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/include/asm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h index 569779c..fce3568 100644 --- a/arch/arm/include/asm/arch-omap3/mem.h +++ b/arch/arm/include/asm/arch-omap3/mem.h @@ -475,7 +475,7 @@ enum { #ifndef __ASSEMBLY__ /* Function prototypes */ -void mem_init(void); +void omap3_mem_init(void); u32 is_mem_sdr(void); u32 mem_ok(u32 cs); diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index 8b70251..c76a95d 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -216,7 +216,7 @@ void s_init(void) void board_init_f(ulong dummy) { early_system_init(); - mem_init(); + omap3_mem_init(); /* * Save the boot parameters passed from romcode. * We cannot delay the saving further than this, diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c index 7e5a281..4fbfb38 100644 --- a/arch/arm/mach-omap2/omap3/emif4.c +++ b/arch/arm/mach-omap2/omap3/emif4.c @@ -159,10 +159,10 @@ int dram_init_banksize(void) } /* - * mem_init() - + * omap3_mem_init() - * - Initialize memory subsystem */ -void mem_init(void) +void omap3_mem_init(void) { do_emif4_init(); } diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c index 5d43e7c..4d27d82 100644 --- a/arch/arm/mach-omap2/omap3/sdrc.c +++ b/arch/arm/mach-omap2/omap3/sdrc.c @@ -4,7 +4,7 @@ * * This file has been created after exctracting and consolidating * the SDRC related content from mem.c and board.c, also created - * generic init function (mem_init). + * generic init function (omap3_mem_init). * * Copyright (C) 2004-2010 * Texas Instruments Incorporated - https://www.ti.com/ @@ -232,11 +232,11 @@ int dram_init_banksize(void) } /* - * mem_init - + * omap3_mem_init - * - Init the sdrc chip, * - Selects CS0 and CS1, */ -void mem_init(void) +void omap3_mem_init(void) { /* only init up first bank here */ do_sdrc_init(CS0, EARLY_INIT); |