diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-23 12:46:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-23 12:46:57 +0200 |
| commit | d6989d4bbe6c4d1c2a76696833a07f044e85694d (patch) | |
| tree | 2d9a70d0feee4d4a20568be1b39a961fa0d27d81 /arch/arm64/boot/dts/apm | |
| parent | xen-netback: switch to threaded irq for control ring (diff) | |
| parent | Merge tag 'media/v4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| download | linux-d6989d4bbe6c4d1c2a76696833a07f044e85694d.tar.xz linux-d6989d4bbe6c4d1c2a76696833a07f044e85694d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm64/boot/dts/apm')
| -rw-r--r-- | arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index d5c3435324e8..31ea70a5a3ff 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -110,10 +110,10 @@ timer { compatible = "arm,armv8-timer"; - interrupts = <1 0 0xff01>, /* Secure Phys IRQ */ - <1 13 0xff01>, /* Non-secure Phys IRQ */ - <1 14 0xff01>, /* Virt IRQ */ - <1 15 0xff01>; /* Hyp IRQ */ + interrupts = <1 0 0xff08>, /* Secure Phys IRQ */ + <1 13 0xff08>, /* Non-secure Phys IRQ */ + <1 14 0xff08>, /* Virt IRQ */ + <1 15 0xff08>; /* Hyp IRQ */ clock-frequency = <50000000>; }; |