diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 15:58:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 15:58:08 +0100 |
| commit | fd896f5acd037c782f3bac8dedfb0d7e580d0b22 (patch) | |
| tree | 2b8ba73fc9c303850cfe8c3155436ab647dc5419 /arch/arm/boot/dts/sun8i-a83t.dtsi | |
| parent | 5f2f35a1ffb75669dfed0b2af9814d2ad36a285e (diff) | |
| parent | cda1ade6a25c85d0a7cc2001a96b0b20f6bfd3f0 (diff) | |
| download | talos-obmc-linux-fd896f5acd037c782f3bac8dedfb0d7e580d0b22.tar.gz talos-obmc-linux-fd896f5acd037c782f3bac8dedfb0d7e580d0b22.zip | |
Merge tag 'socfpga_dts_for_v4.11_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt
Pull "SoCFPGA DTS updates for v4.11, part 2" from Dinh Nguyen:
- Add AXI configuration for DWMAC ethernet controllers on Arria10
- Use watchdog1 instead of watchdog0 on Arria10
* tag 'socfpga_dts_for_v4.11_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: dts: Add EMAC AXI settings for Arria10
ARM: dts: watchdog0 cannot reliably trigger reset
Diffstat (limited to 'arch/arm/boot/dts/sun8i-a83t.dtsi')
0 files changed, 0 insertions, 0 deletions
