Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit fd896f5a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_for_v4.11_part_2' of...

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
parents 5f2f35a1 cda1ade6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment