From: Tom Rini Date: Thu, 21 Sep 2023 23:32:48 +0000 (-0400) Subject: exynos: Cleanup exynos_init X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=4f9c7a9f547785dc6028e3d737ab7c53e7851b17;p=u-boot.git 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 --- diff --git a/arch/arm/mach-exynos/include/mach/board.h b/arch/arm/mach-exynos/include/mach/board.h index 44ebdb829b..a167f96793 100644 --- 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 index 4e11f289dc..0000000000 --- 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 index c38297a05b..0000000000 --- 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 - -int exynos_init(void) -{ - return 0; -} diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 663d7ca991..5a71982775 100644 --- 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 1e88a82980..95cf6d2acc 100644 --- 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 index bb882eaa25..0000000000 --- a/board/samsung/espresso7420/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2016 Samsung Electronics -# Thomas Abraham - -obj-y += espresso7420.o diff --git a/board/samsung/espresso7420/espresso7420.c b/board/samsung/espresso7420/espresso7420.c deleted file mode 100644 index 9f6fa89747..0000000000 --- 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 - */ - -#include - -int exynos_init(void) -{ - return 0; -} diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index d237828364..99e5613ced 100644 --- 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 7a91f44896..ddf6a2b72f 100644 --- a/board/samsung/origen/origen.c +++ b/board/samsung/origen/origen.c @@ -12,11 +12,6 @@ #include #include -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 1608d60dd8..6a3e5b29b9 100644 --- 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 93c9714d33..81ccc124c8 100644 --- 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 37c9d7f452..2d61dff89c 100644 --- 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; }