]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm64: zynqmp: Try to enable the first watchdog via aliases
authorMichal Simek <michal.simek@xilinx.com>
Wed, 11 Jul 2018 06:30:07 +0000 (08:30 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 19 Jul 2018 08:49:55 +0000 (10:49 +0200)
Add support for enabling the first watchdog pointed via aliases.

DT fragment:
aliases {
...
watchdog0 = &watchdog0;
watchdog1 = &watchdog_lpd;
...
};

dm tree fragment for above configuration with patch applied:
ZynqMP> dm tree
 Class    index  Probed  Driver      Name
-----------------------------------------
...
 watchdog    0  [   ]   cdns_wdt    |   |-- watchdog@ff150000
 watchdog    1  [ + ]   cdns_wdt    |   `-- watchdog@fd4d0000
...

dm uclass fragment:
ZynqMP> dm uclass
...
uclass 75: watchdog
0   watchdog@ff150000 @ 7df02f40, seq -1, (req 1)
1 * watchdog@fd4d0000 @ 7df02ff0, seq 0, (req 0)
...

It is visible that index 1 is IP with seq 0 which means that FPD
watchdog (@fd4d0000) is in DT below LPD watchdog (@ff150000).

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>
board/xilinx/zynqmp/zynqmp.c

index 81c10fcf8a00c6a227f1967e5d934a2cb2d58f7e..06cdcbdba6b9fa029d28306a19961ff12bda9741 100644 (file)
@@ -312,12 +312,16 @@ int board_init(void)
 #endif
 
 #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;