diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-18 23:44:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-18 23:44:22 -0400 |
| commit | 2372b0012925f9100980151f4a28347c82feaba8 (patch) | |
| tree | 24f0ddbc313b19201dac8e7be7cb8f7e615f6e7f /board/warp7/warp7.c | |
| parent | e677724884c175e978b463cf941ecb9310d3b900 (diff) | |
| parent | 67ef2c133f099d3d719058eb73aeec8f1574655c (diff) | |
| download | talos-obmc-uboot-2372b0012925f9100980151f4a28347c82feaba8.tar.gz talos-obmc-uboot-2372b0012925f9100980151f4a28347c82feaba8.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/warp7/warp7.c')
| -rw-r--r-- | board/warp7/warp7.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 8c5bf9a524..27e31f35d5 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -32,6 +32,10 @@ int dram_init(void) return 0; } +static iomux_v3_cfg_t const wdog_pads[] = { + MX7D_PAD_GPIO1_IO00__WDOG1_WDOG_B | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + static iomux_v3_cfg_t const uart1_pads[] = { MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), @@ -100,3 +104,20 @@ int board_usb_phy_mode(int port) { return USB_INIT_DEVICE; } + +int board_late_init(void) +{ + struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; + + imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); + + set_wdog_reset(wdog); + + /* + * Do not assert internal WDOG_RESET_B_DEB(controlled by bit 4), + * since we use PMIC_PWRON to reset the board. + */ + clrsetbits_le16(&wdog->wcr, 0, 0x10); + + return 0; +} |
