Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f53c1e64 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
		#address-cells = <0>;

		interrupt-controller;

		reg = <0 0x2c001000 0 0x1000>,

		      <0 0x2c002000 0 0x1000>,

		      <0 0x2c002000 0 0x2000>,

		      <0 0x2c004000 0 0x2000>,

		      <0 0x2c006000 0 0x2000>;

		interrupts = <1 9 0xf04>;

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
		#address-cells = <0>;

		interrupt-controller;

		reg = <0 0x2c001000 0 0x1000>,

		      <0 0x2c002000 0 0x1000>,

		      <0 0x2c002000 0 0x2000>,

		      <0 0x2c004000 0 0x2000>,

		      <0 0x2c006000 0 0x2000>;

		interrupts = <1 9 0xf04>;