diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-14 01:03:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-14 01:03:01 -0700 |
| commit | 51dff16576b377f6cde47a6b4dd33ec02a7d3b84 (patch) | |
| tree | 0a28ddd82b421e423f49fef85fd81bbcf28cad94 /arch | |
| parent | c1c6fe6c66c193023865a312af06df5216b82ac8 (diff) | |
| parent | 675c7215aacf54242b2e8bc64bab698abbe764db (diff) | |
| download | linux-51dff16576b377f6cde47a6b4dd33ec02a7d3b84.tar.bz2 | |
Merge tag 'arm-soc/for-4.17/devicetree-fixes' of https://github.com/Broadcom/stblinux into fixes
This pull request contains Broadcom ARM-basec SoCs Device Tree fixes for
4.17, please pull the following:
- Clement fixes in an incorrect trigger type for the ARM global timers
on the Cygnus platforms
* tag 'arm-soc/for-4.17/devicetree-fixes' of https://github.com/Broadcom/stblinux:
ARM: dts: cygnus: fix irq type for arm global timer
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/bcm-cygnus.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 699fdf94d139..9fe4f5a6379e 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -69,7 +69,7 @@ timer@20200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x20200 0x100>; - interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>; clocks = <&periph_clk>; }; |