From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 17 Dec 2015 08:47:42 +0000 (+0900)
Subject: ARM: uniphier: call uniphier_get_board_param() without FDT blob
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=6ba60fafdabc88f45088881d36cb776484394117;p=u-boot.git

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>
---

diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
index 812c58ff96..f3281433c2 100644
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@@ -4,10 +4,13 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <common.h>
 #include <libfdt.h>
 #include <linux/kernel.h>
 #include <mach/init.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
 static const struct uniphier_board_data ph1_sld3_data = {
 	.dram_ch0_base	= 0x80000000,
@@ -116,12 +119,12 @@ static const struct uniphier_board_id uniphier_boards[] = {
 #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;
 
 	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))
 			return uniphier_boards[i].param;
 	}
diff --git a/arch/arm/mach-uniphier/include/mach/init.h b/arch/arm/mach-uniphier/include/mach/init.h
index 5108eddfc4..27ae27dc9f 100644
--- a/arch/arm/mach-uniphier/include/mach/init.h
+++ b/arch/arm/mach-uniphier/include/mach/init.h
@@ -20,7 +20,7 @@ struct uniphier_board_data {
 	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_ld4_init(const struct uniphier_board_data *bd);
diff --git a/arch/arm/mach-uniphier/init/init.c b/arch/arm/mach-uniphier/init/init.c
index bbfc8e5e08..eda169e374 100644
--- a/arch/arm/mach-uniphier/init/init.c
+++ b/arch/arm/mach-uniphier/init/init.c
@@ -9,13 +9,11 @@
 #include <mach/init.h>
 #include <mach/soc_info.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 void spl_board_init(void)
 {
 	const struct uniphier_board_data *param;
 
-	param = uniphier_get_board_param(gd->fdt_blob);
+	param = uniphier_get_board_param();
 	if (!param)
 		hang();