diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-01 12:27:18 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-01 12:27:18 -0800 |
| commit | aa5306a370a9384788d923e4eae15649f1f82671 (patch) | |
| tree | 321c2a1fb7e95e867e6b9dcf47a945786c4b2f79 /arch/arm64 | |
| parent | 6c388927a7db95c20a29ff6c26da29cb9a5555aa (diff) | |
| parent | aeb2ee5683e51305aff274d8b0a50af69b3ab310 (diff) | |
| download | linux-aa5306a370a9384788d923e4eae15649f1f82671.tar.gz linux-aa5306a370a9384788d923e4eae15649f1f82671.tar.bz2 linux-aa5306a370a9384788d923e4eae15649f1f82671.zip | |
Merge tag 'vexpress-for-v4.5/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
vexpress fixes for v4.5
Couple of minor fixes for vexpress platforms:
1. Add missing of_node_put in vexpress config bus
2. Add missing DMA-330 abort interrupt on Juno platforms
* tag 'vexpress-for-v4.5/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
arm64: dts: Add missing DMA Abort interrupt to Juno
bus: vexpress-config: Add missing of_node_put
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index dd5158eb5872..e5b59ca9debb 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -115,6 +115,7 @@ <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>, |