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>
This commit is contained in:
Tom Rini 2023-09-21 19:32:48 -04:00
parent db7516b635
commit 4f9c7a9f54
12 changed files with 16 additions and 63 deletions

View file

@ -11,7 +11,7 @@
* Exynos baord specific changes for * Exynos baord specific changes for
* board_init * board_init
*/ */
int exynos_init(void); void exynos_init(void);
/* /*
* Exynos board specific changes for * Exynos board specific changes for

View file

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += axy17lte.o

View file

@ -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;
}

View file

@ -43,6 +43,10 @@ __weak int exynos_early_init_f(void)
return 0; return 0;
} }
__weak void exynos_init(void)
{
}
__weak int exynos_power_init(void) __weak int exynos_power_init(void)
{ {
return 0; return 0;
@ -113,7 +117,9 @@ int board_init(void)
gd->ram_size -= size; gd->ram_size -= size;
gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= size; gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= size;
#endif #endif
return exynos_init(); exynos_init();
return 0;
} }
int dram_init(void) int dram_init(void)

View file

@ -38,11 +38,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
int exynos_init(void)
{
return 0;
}
static int exynos_set_regulator(const char *name, uint uv) static int exynos_set_regulator(const char *name, uint uv)
{ {
struct udevice *dev; struct udevice *dev;

View file

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

View file

@ -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;
}

View file

@ -423,11 +423,9 @@ int exynos_early_init_f(void)
return 0; return 0;
} }
int exynos_init(void) void exynos_init(void)
{ {
board_gpio_init(); board_gpio_init();
return 0;
} }
int exynos_power_init(void) int exynos_power_init(void)

View file

@ -12,11 +12,6 @@
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <usb.h> #include <usb.h>
int exynos_init(void)
{
return 0;
}
int board_usb_init(int index, enum usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
return 0; return 0;

View file

@ -40,17 +40,8 @@ u32 get_board_rev(void)
} }
#endif #endif
static void check_hw_revision(void);
struct dwc2_plat_otg_data s5pc210_otg_data; 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 */ #if !CONFIG_IS_ENABLED(DM_I2C) /* TODO(maintainer): Convert to driver model */
static void trats_low_power_mode(void) static void trats_low_power_mode(void)
{ {
@ -215,6 +206,11 @@ static void check_hw_revision(void)
board_rev |= hwrev; board_rev |= hwrev;
} }
void exynos_init(void)
{
check_hw_revision();
printf("HW Revision:\t0x%x\n", board_rev);
}
#ifdef CONFIG_USB_GADGET #ifdef CONFIG_USB_GADGET
static int s5pc210_phy_control(int on) static int s5pc210_phy_control(int on)

View file

@ -107,7 +107,7 @@ int exynos_early_init_f(void)
return 0; return 0;
} }
int exynos_init(void) void exynos_init(void)
{ {
struct exynos4_power *pwr = struct exynos4_power *pwr =
(struct exynos4_power *)samsung_get_base_power(); (struct exynos4_power *)samsung_get_base_power();
@ -124,8 +124,6 @@ int exynos_init(void)
*/ */
writel(0, &pwr->inform4); writel(0, &pwr->inform4);
writel(0, &pwr->inform5); writel(0, &pwr->inform5);
return 0;
} }
int exynos_power_init(void) int exynos_power_init(void)

View file

@ -265,7 +265,7 @@ static int init_pmic_lcd(void)
return 0; return 0;
} }
int exynos_init(void) void exynos_init(void)
{ {
gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210; gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
@ -293,6 +293,4 @@ int exynos_init(void)
check_hw_revision(); check_hw_revision();
printf("HW Revision:\t0x%x\n", board_rev); printf("HW Revision:\t0x%x\n", board_rev);
return 0;
} }