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

Commit 51dff165 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents c1c6fe6c 675c7215

arch/arm/boot/dts/bcm-cygnus.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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>;

		};