summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-01-04 16:37:45 +0100
committerArnd Bergmann <arnd@arndb.de>2017-01-04 16:37:45 +0100
commit46db9914c3bf9d7aa292bc03eb2061a553a057d7 (patch)
tree2530978d0d5b1c280a0eea8e027a1ba712a8eddf /arch
parentf53c1e6464d3c24583be4f1c1668c54813695da3 (diff)
parent1dff32d7df7ff5d80194ebce7ab5755b32564e13 (diff)
downloadlinux-0-day-46db9914c3bf9d7aa292bc03eb2061a553a057d7.tar.gz
linux-0-day-46db9914c3bf9d7aa292bc03eb2061a553a057d7.tar.xz
Merge tag 'juno-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
Pull "ARMv8 Juno/VExpress fixes for v4.10" from Sudeep Holla: A simple fix to extend GICv2 CPU interface registers from 4K to 8K on AEMv8 FVP/RTSM models in order to support split priority drop and interrupt deactivation. * tag 'juno-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: vexpress: Support GICC_DIR operations
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index a852e28a40e17..a83ed2c6bbf79 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -81,7 +81,7 @@
#address-cells = <0>;
interrupt-controller;
reg = <0x0 0x2c001000 0 0x1000>,
- <0x0 0x2c002000 0 0x1000>,
+ <0x0 0x2c002000 0 0x2000>,
<0x0 0x2c004000 0 0x2000>,
<0x0 0x2c006000 0 0x2000>;
interrupts = <1 9 0xf04>;