diff options
| author | Andy Gross <andy.gross@linaro.org> | 2019-02-27 06:31:55 +0100 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2019-02-27 06:31:55 +0100 |
| commit | 52d2d2c0181aa7a9ca3adeac6d7ba95a15f9aecd (patch) | |
| tree | 6b201bbf863a36249e4308ee0532673cb20c0376 | |
| parent | Linux 5.0-rc1 (diff) | |
| parent | arm64: dts: add msm8996 compatible to gicv3 (diff) | |
| download | linux-52d2d2c0181aa7a9ca3adeac6d7ba95a15f9aecd.tar.xz linux-52d2d2c0181aa7a9ca3adeac6d7ba95a15f9aecd.zip | |
Merge tag 'qcom-fixes-for-5.0-rc3' into fixes-for-5.0-rc8
Qualcomm ARM64 Fixes for 5.0-rc3
* Fix irq controller compatible for the MSM8996 platforms
| -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 @@ }; intc: interrupt-controller@9bc0000 { - compatible = "arm,gic-v3"; + compatible = "qcom,msm8996-gic-v3", "arm,gic-v3"; #interrupt-cells = <3>; interrupt-controller; #redistributor-regions = <1>; |