Merge tag 'socfpga_dts_for_v4.3_part_2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Thu, 13 Aug 2015 10:19:38 +0000 (12:19 +0200)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Aug 2015 10:19:38 +0000 (12:19 +0200)
commit93621d7037084676b1fe7c1a8d59a98754f846ec
tree830c2a8c1610418f344f45952c27456f856726eb
parent6d511a26ce45fc05600f12f02200a65578d67a63
parent6855e5b7090330add9521d8947017875d5f4f88e
Merge tag 'socfpga_dts_for_v4.3_part_2' of git://git./linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS updates for v4.3, take 2
- Add DTS property "altr,modrst-offset" for reset driver to
  use
- Add updated reset defines for the reset driver
- Add reset property for EMACs on Arria10

* tag 'socfpga_dts_for_v4.3_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: Add resets for EMACs on Arria10
  ARM: socfpga: dts: add "altr,modrst-offset" property
  dt-bindings: Add reset manager offsets for Arria10

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/socfpga.dtsi
arch/arm/boot/dts/socfpga_arria10.dtsi