projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
board
/
samsung
/
common
/
board.c
diff --git
a/board/samsung/common/board.c
b/board/samsung/common/board.c
index
0eb066c
..
6fd26a3
100644
(file)
--- a/
board/samsung/common/board.c
+++ b/
board/samsung/common/board.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2013 SAMSUNG Electronics
* Rajeshwari Shinde <rajeshwari.s@samsung.com>
/*
* (C) Copyright 2013 SAMSUNG Electronics
* Rajeshwari Shinde <rajeshwari.s@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-108,7
+107,7
@@
int dram_init(void)
return 0;
}
return 0;
}
-
void
dram_init_banksize(void)
+
int
dram_init_banksize(void)
{
unsigned int i;
unsigned long addr, size;
{
unsigned int i;
unsigned long addr, size;
@@
-120,6
+119,8
@@
void dram_init_banksize(void)
gd->bd->bi_dram[i].start = addr;
gd->bd->bi_dram[i].size = size;
}
gd->bd->bi_dram[i].start = addr;
gd->bd->bi_dram[i].size = size;
}
+
+ return 0;
}
static int board_uart_init(void)
}
static int board_uart_init(void)
@@
-248,10
+249,10
@@
int board_eth_init(bd_t *bis)
return 0;
}
return 0;
}
-#ifdef CONFIG_
GENERIC_
MMC
+#ifdef CONFIG_MMC
static int init_mmc(void)
{
static int init_mmc(void)
{
-#ifdef CONFIG_SDHCI
+#ifdef CONFIG_
MMC_
SDHCI
return exynos_mmc_init(gd->fdt_blob);
#else
return 0;
return exynos_mmc_init(gd->fdt_blob);
#else
return 0;
@@
-260,7
+261,7
@@
static int init_mmc(void)
static int init_dwmmc(void)
{
static int init_dwmmc(void)
{
-#ifdef CONFIG_
DWMMC
+#ifdef CONFIG_
MMC_DW
return exynos_dwmmc_init(gd->fdt_blob);
#else
return 0;
return exynos_dwmmc_init(gd->fdt_blob);
#else
return 0;
@@
-305,14
+306,16
@@
int checkboard(void)
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
- stdio_print_current_devices();
+ struct udevice *dev;
+ int ret;
- if (cros_ec_get_error()) {
+ stdio_print_current_devices();
+ ret = uclass_first_device_err(UCLASS_CROS_EC, &dev);
+ if (ret && ret != -ENODEV) {
/* Force console on */
gd->flags &= ~GD_FLG_SILENT;
/* Force console on */
gd->flags &= ~GD_FLG_SILENT;
- printf("cros-ec communications failure %d\n",
- cros_ec_get_error());
+ printf("cros-ec communications failure %d\n", ret);
puts("\nPlease reset with Power+Refresh\n\n");
panic("Cannot init cros-ec device");
return -1;
puts("\nPlease reset with Power+Refresh\n\n");
panic("Cannot init cros-ec device");
return -1;
@@
-349,8
+352,8
@@
void reset_misc(void)
if (node < 0)
return;
if (node < 0)
return;
- gpio_request_by_name_nodev(
gd->fdt_blob, node, "reset-gpio", 0, &gpio
,
- GPIOD_IS_OUT);
+ gpio_request_by_name_nodev(
offset_to_ofnode(node), "reset-gpio", 0
,
+
&gpio,
GPIOD_IS_OUT);
if (dm_gpio_is_valid(&gpio)) {
/*
if (dm_gpio_is_valid(&gpio)) {
/*