diff options
author | Olof Johansson <olof@lixom.net> | 2015-08-13 13:19:38 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-08-13 13:19:38 +0300 |
commit | 93621d7037084676b1fe7c1a8d59a98754f846ec (patch) | |
tree | 830c2a8c1610418f344f45952c27456f856726eb /arch/um/Makefile-skas | |
parent | 6d511a26ce45fc05600f12f02200a65578d67a63 (diff) | |
parent | 6855e5b7090330add9521d8947017875d5f4f88e (diff) | |
download | linux-93621d7037084676b1fe7c1a8d59a98754f846ec.tar.xz |
Merge tag 'socfpga_dts_for_v4.3_part_2' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/um/Makefile-skas')
0 files changed, 0 insertions, 0 deletions