diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-01-30 05:22:15 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-01-30 05:34:40 -0500 |
| commit | 91c577ef1eac03be257fbc206f8f0fd64caee3df (patch) | |
| tree | b436e61d794d5c7530b5432fffd74c34c96b0a87 | |
| parent | 1229c729bb944c239f70927e983b5cd185418a43 (diff) | |
| parent | 2a81efb0de0e33f2d2c83154af0bd3ce389b3269 (diff) | |
Merge tag 'qcom-fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/fixes
Qualcomm ARM64 Fixes for 5.0-rc3
* Fix irq controller compatible for the MSM8996 platforms
* tag 'qcom-fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: dts: add msm8996 compatible to gicv3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 99b7495455a6..838e32cc14c9 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi | |||
| @@ -404,7 +404,7 @@ | |||
| 404 | }; | 404 | }; |
| 405 | 405 | ||
| 406 | intc: interrupt-controller@9bc0000 { | 406 | intc: interrupt-controller@9bc0000 { |
| 407 | compatible = "arm,gic-v3"; | 407 | compatible = "qcom,msm8996-gic-v3", "arm,gic-v3"; |
| 408 | #interrupt-cells = <3>; | 408 | #interrupt-cells = <3>; |
| 409 | interrupt-controller; | 409 | interrupt-controller; |
| 410 | #redistributor-regions = <1>; | 410 | #redistributor-regions = <1>; |