BCM2709: Use upstream interrupt driver

Author: popcornmix

arch/arm/Kconfig

@@ -351,6 +351,9 @@ config ARCH_BCM2709
 	select ARCH_HAS_CPUFREQ
 	select GENERIC_CLOCKEVENTS
 	select MACH_BCM2709
+	select MULTI_IRQ_HANDLER
+	select SPARSE_IRQ
+	select MFD_SYSCON
 	select VC4
 	select FIQ
 	select USE_OF

arch/arm/boot/dts/bcm2709.dtsi

@@ -10,28 +10,44 @@
 	};
 
 	soc {
-		ranges = <0x7e000000 0x3f000000 0x01000000>;
+		ranges = <0x7e000000 0x3f000000 0x01000000>,
+		         <0x40000000 0x40000000 0x00040000>;
+
+		local_intc: local_intc {
+			compatible = "brcm,bcm2836-l1-intc";
+			reg = <0x40000000 0x100>;
+			interrupt-controller;
+			#interrupt-cells = <1>;
+			interrupt-parent = <&local_intc>;
+		};
 
 		arm-pmu {
 			compatible = "arm,cortex-a7-pmu";
-			interrupts = <3 9>;
+			interrupt-parent = <&local_intc>;
+			interrupts = <9>;
 		};
 
 		gpiomem {
 			compatible = "brcm,bcm2835-gpiomem";
 			reg = <0x7e200000 0x1000>;
 			status = "okay";
 		};
-	};
 
-	timer {
-		compatible = "arm,armv7-timer";
-		clock-frequency = <19200000>;
-		interrupts = <3 0>, // PHYS_SECURE_PPI
-			     <3 1>, // PHYS_NONSECURE_PPI
-			     <3 3>, // VIRT_PPI
-			     <3 2>; // HYP_PPI
-		always-on;
+		timer {
+			compatible = "arm,armv7-timer";
+			clock-frequency = <19200000>;
+			interrupt-parent = <&local_intc>;
+			interrupts = <0>, // PHYS_SECURE_PPI
+				     <1>, // PHYS_NONSECURE_PPI
+				     <3>, // VIRT_PPI
+				     <2>; // HYP_PPI
+			always-on;
+		};
+
+		syscon@40000000 {
+			compatible = "brcm,bcm2836-arm-local", "syscon";
+			reg = <0x40000000 0x100>;
+		};
 	};
 
 	cpus: cpus {
@@ -78,3 +94,9 @@
 &watchdog {
 	status = "okay";
 };
+
+&intc {
+        compatible = "brcm,bcm2836-armctrl-ic";
+        interrupt-parent = <&local_intc>;
+        interrupts = <8>;
+};

arch/arm/mach-bcm2709/Makefile

@@ -2,4 +2,4 @@
 # Makefile for the linux kernel.
 #
 
-obj-$(CONFIG_MACH_BCM2709) 	+= bcm2709.o armctrl.o
+obj-$(CONFIG_MACH_BCM2709) 	+= bcm2709.o