Merge tag 'socfpga_updates_for_v4.20_part2' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 20:48:25 +0000 (13:48 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 20:48:25 +0000 (13:48 -0700)
SoCFPGA DTS updates for v4.20, part 2
- Fix I2C bus unit-address warning with new DTC checks
- Add reset properties for timers

* tag 'socfpga_updates_for_v4.20_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: socfpga: add timer resets for SoCFPGA platform
  ARM: dts: socfpga: Fix I2C bus unit-address error

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge