diff options
| author | Olof Johansson <olof@lixom.net> | 2016-06-25 21:19:37 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-25 21:19:37 -0700 |
| commit | ed749a53b2d7b9287ee57c17dc29385c89104744 (patch) | |
| tree | 4d40714c295a9fe5015062a10f025481247df2ce /arch/arm/boot | |
| parent | 33688abb2802ff3a230bd2441f765477b94cc89e (diff) | |
| parent | 929e604efa3dc0522214e0dc18984be23993e9f0 (diff) | |
| download | talos-obmc-linux-ed749a53b2d7b9287ee57c17dc29385c89104744.tar.gz talos-obmc-linux-ed749a53b2d7b9287ee57c17dc29385c89104744.zip | |
Merge tag 'mvebu-fixes-4.7-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.7 (part 1)
Various I/O memory fix for Cortex A9 based SoCs
* tag 'mvebu-fixes-4.7-1' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada-38x: fix MBUS_ID for crypto SRAM on Armada 385 Linksys
ARM: mvebu: map PCI I/O regions strongly ordered
ARM: mvebu: fix HW I/O coherency related deadlocks
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-linksys.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index 8450944b28e6..22f7a13e20b4 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -58,8 +58,8 @@ soc { ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000 - MBUS_ID(0x09, 0x09) 0 0xf1100000 0x10000 - MBUS_ID(0x09, 0x05) 0 0xf1110000 0x10000>; + MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000 + MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>; internal-regs { |
