diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 14:51:15 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 14:51:15 (GMT) |
| commit | 530518af84c07a070072ead98bd5c0d4ed64bebf (patch) | |
| tree | cd81e19a8e0e316f9c478b74e6659d84b1056147 | |
| parent | 9b2a8b8bdbe5d5d2b0d325eb88e478398ca3552f (diff) | |
| parent | 36d1c9cd07cd6a065f1dde3cbbfe3a9867d693a4 (diff) | |
| download | linux-530518af84c07a070072ead98bd5c0d4ed64bebf.tar.xz | |
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
| -rw-r--r-- | arch/arm64/boot/dts/exynos/exynos7.dtsi | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/exynos/exynos7.dtsi b/arch/arm64/boot/dts/exynos/exynos7.dtsi index ca663df..8d7ce97 100644 --- a/arch/arm64/boot/dts/exynos/exynos7.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos7.dtsi @@ -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 { |