Commit ee9eb4b3 authored by Andy Gross's avatar Andy Gross
Browse files

Merge tag 'qcom-fixes-for-5.0-rc3' into arm64-for-5.1-2 

Qualcomm ARM64 Fixes for 5.0-rc3

* Fix irq controller compatible for the MSM8996 platforms
parents bfeffd15 2a81efb0

arch/arm64/boot/dts/qcom/msm8996.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ tcsr: syscon@7a0000 { 
		};



		intc: interrupt-controller@9bc0000 {

			compatible = "arm,gic-v3";

			compatible = "qcom,msm8996-gic-v3", "arm,gic-v3";

			#interrupt-cells = <3>;

			interrupt-controller;

			#redistributor-regions = <1>;