exynos: Cleanup exynos_init

- None of the callers perform error checking and based on the non-empty
  versions of this function, there's no checking to be done, so make
  this a void.
- Add a default weak version of the function.
- Remove the empty versions of exynos_init now that we have a weak
  version.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-exynos/include/mach/board.h b/arch/arm/mach-exynos/include/mach/board.h
index 44ebdb829b2087d3cc9ccc05b4dcbcdb30ccd6a4..a167f967933f305c8e9cbeebc33237d2bad14e31 100644 (file)
--- a/arch/arm/mach-exynos/include/mach/board.h
+++ b/arch/arm/mach-exynos/include/mach/board.h
@@ -11,7 +11,7 @@
  * Exynos baord specific changes for
  * board_init
  */
-int exynos_init(void);
+void exynos_init(void);
 
 /*
  * Exynos board specific changes for

diff --git a/board/samsung/axy17lte/Makefile b/board/samsung/axy17lte/Makefile
deleted file mode 100644 (file)
index 4e11f28..0000000
--- a/board/samsung/axy17lte/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-obj-y  += axy17lte.o

diff --git a/board/samsung/axy17lte/axy17lte.c b/board/samsung/axy17lte/axy17lte.c
deleted file mode 100644 (file)
index c38297a..0000000
--- a/board/samsung/axy17lte/axy17lte.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Samsung A5Y17 and A3Y17 LTE boards based on Exynos 7880 and Exynos 7870 SoCs
- */
-
-#include <common.h>
-
-int exynos_init(void)
-{
-       return 0;
-}

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 663d7ca991bce5b753739f92b686cff6a0fc03ad..5a71982775d05aed89962d7fd92ea19fb00e0986 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -43,6 +43,10 @@ __weak int exynos_early_init_f(void)
        return 0;
 }
 
+__weak void exynos_init(void)
+{
+}
+
 __weak int exynos_power_init(void)
 {
        return 0;
@@ -113,7 +117,9 @@ int board_init(void)
        gd->ram_size -= size;
        gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= size;
 #endif
-       return exynos_init();
+       exynos_init();
+
+       return 0;
 }
 
 int dram_init(void)

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 1e88a82980e1f92789873e62ee98911f27250d62..95cf6d2acc20387037bf1ba7151a5f02e2369e05 100644 (file)
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -38,11 +38,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int exynos_init(void)
-{
-       return 0;
-}
-
 static int exynos_set_regulator(const char *name, uint uv)
 {
        struct udevice *dev;

diff --git a/board/samsung/espresso7420/Makefile b/board/samsung/espresso7420/Makefile
deleted file mode 100644 (file)
index bb882ea..0000000
--- a/board/samsung/espresso7420/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2016 Samsung Electronics
-# Thomas Abraham <thomas.ab@samsung.com>
-
-obj-y  += espresso7420.o

diff --git a/board/samsung/espresso7420/espresso7420.c b/board/samsung/espresso7420/espresso7420.c
deleted file mode 100644 (file)
index 9f6fa89..0000000
--- a/board/samsung/espresso7420/espresso7420.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Espresso7420 board file
- * Copyright (C) 2016 Samsung Electronics
- * Thomas Abraham <thomas.ab@samsung.com>
- */
-
-#include <common.h>
-
-int exynos_init(void)
-{
-       return 0;
-}

diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index d237828364c63298003e72ae5560c67fd9f4df3b..99e5613ced928e8e75b13b31d6e332840685e95f 100644 (file)
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -423,11 +423,9 @@ int exynos_early_init_f(void)
        return 0;
 }
 
-int exynos_init(void)
+void exynos_init(void)
 {
        board_gpio_init();
-
-       return 0;
 }
 
 int exynos_power_init(void)

diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c
index 7a91f448969b2dc4ba0a4aa59e9c3321913ba15a..ddf6a2b72fa5465ce270adff96673ab8bfea3da0 100644 (file)
--- a/board/samsung/origen/origen.c
+++ b/board/samsung/origen/origen.c
@@ -12,11 +12,6 @@
 #include <asm/arch/pinmux.h>
 #include <usb.h>
 
-int exynos_init(void)
-{
-       return 0;
-}
-
 int board_usb_init(int index, enum usb_init_type init)
 {
        return 0;

diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 1608d60dd8db2f4614dded0b9eb80cfa4b2adc97..6a3e5b29b9894c0f292ad3a44e6f845751106857 100644 (file)
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -40,17 +40,8 @@ u32 get_board_rev(void)
 }
 #endif
 
-static void check_hw_revision(void);
 struct dwc2_plat_otg_data s5pc210_otg_data;
 
-int exynos_init(void)
-{
-       check_hw_revision();
-       printf("HW Revision:\t0x%x\n", board_rev);
-
-       return 0;
-}
-
 #if !CONFIG_IS_ENABLED(DM_I2C) /* TODO(maintainer): Convert to driver model */
 static void trats_low_power_mode(void)
 {
@@ -215,6 +206,11 @@ static void check_hw_revision(void)
        board_rev |= hwrev;
 }
 
+void exynos_init(void)
+{
+       check_hw_revision();
+       printf("HW Revision:\t0x%x\n", board_rev);
+}
 
 #ifdef CONFIG_USB_GADGET
 static int s5pc210_phy_control(int on)

diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index 93c9714d33f015bb462b5126fd956a9b75039f59..81ccc124c809578a384276cb78b1f65f941a2978 100644 (file)
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -107,7 +107,7 @@ int exynos_early_init_f(void)
        return 0;
 }
 
-int exynos_init(void)
+void exynos_init(void)
 {
        struct exynos4_power *pwr =
                (struct exynos4_power *)samsung_get_base_power();
@@ -124,8 +124,6 @@ int exynos_init(void)
         */
        writel(0, &pwr->inform4);
        writel(0, &pwr->inform5);
-
-       return 0;
 }
 
 int exynos_power_init(void)

diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 37c9d7f452f12c2db63e1bf6cf168987ae6dc32c..2d61dff89c2c03083927472164217b7a448a2915 100644 (file)
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -265,7 +265,7 @@ static int init_pmic_lcd(void)
        return 0;
 }
 
-int exynos_init(void)
+void exynos_init(void)
 {
        gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
 
@@ -293,6 +293,4 @@ int exynos_init(void)
 
        check_hw_revision();
        printf("HW Revision:\t0x%x\n", board_rev);
-
-       return 0;
 }