Commit f53c1e64 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'vexpress-fixes-4.10' of...

Merge tag 'vexpress-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes

Pull "ARMv7 VExpress fixes for v4.10" from Sudeep Holla:

A simple fix to extend GICv2 CPU interface registers from 4K to 8K
on VExpress TC1 and TC2 platforms in order to support split priority
drop and interrupt deactivation.

* tag 'vexpress-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  ARM: dts: vexpress: Support GICC_DIR operations
parents 43a8df78 368400e2
...@@ -81,7 +81,7 @@ gic: interrupt-controller@2c001000 { ...@@ -81,7 +81,7 @@ gic: interrupt-controller@2c001000 {
#address-cells = <0>; #address-cells = <0>;
interrupt-controller; interrupt-controller;
reg = <0 0x2c001000 0 0x1000>, reg = <0 0x2c001000 0 0x1000>,
<0 0x2c002000 0 0x1000>, <0 0x2c002000 0 0x2000>,
<0 0x2c004000 0 0x2000>, <0 0x2c004000 0 0x2000>,
<0 0x2c006000 0 0x2000>; <0 0x2c006000 0 0x2000>;
interrupts = <1 9 0xf04>; interrupts = <1 9 0xf04>;
......
...@@ -131,7 +131,7 @@ gic: interrupt-controller@2c001000 { ...@@ -131,7 +131,7 @@ gic: interrupt-controller@2c001000 {
#address-cells = <0>; #address-cells = <0>;
interrupt-controller; interrupt-controller;
reg = <0 0x2c001000 0 0x1000>, reg = <0 0x2c001000 0 0x1000>,
<0 0x2c002000 0 0x1000>, <0 0x2c002000 0 0x2000>,
<0 0x2c004000 0 0x2000>, <0 0x2c004000 0 0x2000>,
<0 0x2c006000 0 0x2000>; <0 0x2c006000 0 0x2000>;
interrupts = <1 9 0xf04>; interrupts = <1 9 0xf04>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment