diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 14:58:59 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 14:58:59 (GMT) |
commit | 41a66072c32978ff3914fd6be88f7592ef64bef7 (patch) | |
tree | 0f38ef433f0feea3e58f61f8d5397cd9bf065559 /arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | |
parent | 5465fe0fc3316f7cdda66732a7986f4ebe76d949 (diff) | |
parent | 7597cdc066313bfd211cca2f9252dfeb41271391 (diff) | |
download | linux-41a66072c32978ff3914fd6be88f7592ef64bef7.tar.xz |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi index 21023a3..e3b6034 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -191,10 +191,10 @@ timer { compatible = "arm,armv8-timer"; - interrupts = <1 13 0x8>, /* Physical Secure PPI, active-low */ - <1 14 0x8>, /* Physical Non-Secure PPI, active-low */ - <1 11 0x8>, /* Virtual PPI, active-low */ - <1 10 0x8>; /* Hypervisor PPI, active-low */ + interrupts = <1 13 4>, /* Physical Secure PPI, active-low */ + <1 14 4>, /* Physical Non-Secure PPI, active-low */ + <1 11 4>, /* Virtual PPI, active-low */ + <1 10 4>; /* Hypervisor PPI, active-low */ }; pmu { |