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

Commit 530518af authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt64-4.9' of... 

Merge tag 'samsung-dt64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt64

Pull "Samsung DeviceTree ARM64 update for v4.9" from Krzysztof Kozlowski:
1. Use human-friendly symbols for interrupt flags.

* tag 'samsung-dt64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: Use human-friendly symbols for timer interrupt flags
parents 9b2a8b8b 36d1c9cd

arch/arm64/boot/dts/exynos/exynos7.dtsi

+9 −4
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <dt-bindings/clock/exynos7-clk.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	compatible = "samsung,exynos7";
@@ -473,10 +474,14 @@ 


		timer {

			compatible = "arm,armv8-timer";

			interrupts = <1 13 0xff01>,

				     <1 14 0xff01>,

				     <1 11 0xff01>,

				     <1 10 0xff01>;

			interrupts = <GIC_PPI 13

					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,

				     <GIC_PPI 14

					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,

				     <GIC_PPI 11

					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,

				     <GIC_PPI 10

					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>;

		};



		pmu_system_controller: system-controller@105c0000 {