diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
| commit | 89a650e0ffb89faaea1b9e6ad8cf2b38203435f2 (patch) | |
| tree | 4827f512e3c1e6f2887133bbb9cb3ee9497ba603 /arch/arm/dts/zynq-zc706.dts | |
| parent | 423effc04a195ce6a464eadadfa7f765bf786889 (diff) | |
| parent | 8ae3d0b50cd22aebcd87022dc357d1cf0f3a879b (diff) | |
Merge tag 'xilinx-for-v2018.05' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.05
- Fix mkimage recognition
- Update all my fragments
ZynqMP:
- Use clk driver
- Support loading elfs in el1
- Various DTS and defconfig changes
- Enable newer pmufw versions
- Support more clocks
- Remove ep108
- Secure image support
- Fix memtest setup
Zynq:
- Enabling watchdog driver
- Support more clocks
- defconfig changes
fpga:
- Simplify error path
net:
- GMII case update
Diffstat (limited to 'arch/arm/dts/zynq-zc706.dts')
| -rw-r--r-- | arch/arm/dts/zynq-zc706.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index d342306293..a88a83c166 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -333,3 +333,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; }; + +&watchdog0 { + reset-on-timeout; +}; |