summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2018-07-11 08:35:22 +0200
committerMichal Simek <michal.simek@xilinx.com>2018-07-19 10:49:55 +0200
commit501fc50a2964210412cb39679d0ac8e994c40ef8 (patch)
treeac0aa45ab09ee1a75fdfb6b8e0341ed05f98e58a
parent1fbca0db5d4785eb1e3e4e914bcd4a9864df3e53 (diff)
downloadu-boot-501fc50a2964210412cb39679d0ac8e994c40ef8.tar.gz
u-boot-501fc50a2964210412cb39679d0ac8e994c40ef8.tar.bz2
u-boot-501fc50a2964210412cb39679d0ac8e994c40ef8.zip
arm: zynq: Try to enable the first watchdog via aliases
The same change as was done for zynqmp with this description: Add support for enabling the first watchdog pointed via aliases. DT fragment: aliases { ... watchdog0= &watchdog0; watchdog1 = &watchdog_lpd; ... }; <zynqmp example removed> Till this patch the first watchdog found in DT was used and started which is not enabling all possible configuration based on user request. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--board/xilinx/zynq/board.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 1106f5c2a8..9c005e40e8 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -36,12 +36,16 @@ int board_early_init_f(void)
int board_init(void)
{
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT)
- if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) {
- puts("Watchdog: Not found!\n");
- } else {
- wdt_start(watchdog_dev, 0, 0);
- puts("Watchdog: Started\n");
+ if (uclass_get_device_by_seq(UCLASS_WDT, 0, &watchdog_dev)) {
+ debug("Watchdog: Not found by seq!\n");
+ if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) {
+ puts("Watchdog: Not found!\n");
+ return 0;
+ }
}
+
+ wdt_start(watchdog_dev, 0, 0);
+ puts("Watchdog: Started\n");
# endif
return 0;