diff options
| author |   Olof Johansson <olof@lixom.net> | 2015-08-13 12:19:38 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-13 12:19:38 +0200 |
| commit | 93621d7037084676b1fe7c1a8d59a98754f846ec (patch) | |
| tree | 830c2a8c1610418f344f45952c27456f856726eb /arch/arm/boot/dts/socfpga.dtsi | |
| parent | Merge tag 'v4.3-rockchip32-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt (diff) | |
| parent | ARM: socfpga: dts: Add resets for EMACs on Arria10 (diff) | |
| download | linux-dev-93621d7037084676b1fe7c1a8d59a98754f846ec.tar.xz linux-dev-93621d7037084676b1fe7c1a8d59a98754f846ec.zip | |
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/arm/boot/dts/socfpga.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 01bdaaa50854..314e589cfa00 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -783,6 +783,7 @@ #reset-cells = <1>; compatible = "altr,rst-mgr"; reg = <0xffd05000 0x1000>; + altr,modrst-offset = <0x10>; }; usbphy0: usbphy@0 { |