V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: uniphier: call uniphier_get_board_param() without FDT blob 

Move "gd->fdt_blob" from the caller to the callee so that this
function can be used more easily.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2015-12-17 17:47:42 +09:00
parent 2071f149e5
commit 6ba60fafda
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-uniphier/boards.c
View File

@ -4,10 +4,13 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h>
#include <libfdt.h> #include <libfdt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <mach/init.h> #include <mach/init.h>
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
static const struct uniphier_board_data ph1_sld3_data = { static const struct uniphier_board_data ph1_sld3_data = {
.dram_ch0_base = 0x80000000, .dram_ch0_base = 0x80000000,
@ -116,12 +119,12 @@ static const struct uniphier_board_id uniphier_boards[] = {
#endif #endif
}; };
const struct uniphier_board_data *uniphier_get_board_param(const void *fdt) const struct uniphier_board_data *uniphier_get_board_param(void)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(uniphier_boards); i++) { for (i = 0; i < ARRAY_SIZE(uniphier_boards); i++) {
if (!fdt_node_check_compatible(fdt, 0, if (!fdt_node_check_compatible(gd->fdt_blob, 0,
uniphier_boards[i].compatible)) uniphier_boards[i].compatible))
return uniphier_boards[i].param; return uniphier_boards[i].param;
} }

2
arch/arm/mach-uniphier/include/mach/init.h
View File

@ -20,7 +20,7 @@ struct uniphier_board_data {
unsigned int dram_freq; unsigned int dram_freq;
}; };
const struct uniphier_board_data *uniphier_get_board_param(const void *fdt); const struct uniphier_board_data *uniphier_get_board_param(void);
int ph1_sld3_init(const struct uniphier_board_data *bd); int ph1_sld3_init(const struct uniphier_board_data *bd);
int ph1_ld4_init(const struct uniphier_board_data *bd); int ph1_ld4_init(const struct uniphier_board_data *bd);

4
arch/arm/mach-uniphier/init/init.c
View File

@ -9,13 +9,11 @@
#include <mach/init.h> #include <mach/init.h>
#include <mach/soc_info.h> #include <mach/soc_info.h>
DECLARE_GLOBAL_DATA_PTR;
void spl_board_init(void) void spl_board_init(void)
{ {
const struct uniphier_board_data *param; const struct uniphier_board_data *param;
param = uniphier_get_board_param(gd->fdt_blob); param = uniphier_get_board_param();
if (!param) if (!param)
hang(); hang();