commit ea8e42153ec76f8fa3ec4158c57384902989f2d6
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 13 07:59:56 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 13 07:59:56 2018 -0700
tree 07b9bbf163c7fd8babe40463e853c3338357d8c3
parent 6657c2cf20506a29264cc3cae625071850484b98
parent 4c9890f80ed97d460635582670aa9ff93ede1965

Merge "ARM: dts: msm: Add include for necessary msm-arm-smmu-8909 dtsi"

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

diff --git a/arch/arm64/boot/dts/qcom/msm8909.dtsi b/arch/arm64/boot/dts/qcom/msm8909.dtsi
index f1ed44b..ec16e60e 100644
--- a/arch/arm64/boot/dts/qcom/msm8909.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8909.dtsi
@@ -227,6 +227,7 @@
 #include "msm8909-smp2p.dtsi"
 #include "msm8909-ipcrouter.dtsi"
 #include "msm-gdsc-8916.dtsi"
+#include "msm-arm-smmu-8909.dtsi"
 #include "msm8909-gpu.dtsi"
 #include "msm8909-coresight.dtsi"
 #include "msm8909-bus.dtsi"

arch/arm64/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

diff --git a/arch/arm64/boot/dts/qcom/msm8909w-bg-wtp-v2.dts b/arch/arm64/boot/dts/qcom/msm8909w-bg-wtp-v2.dts
index 74cd075..8f2eac0 100644
--- a/arch/arm64/boot/dts/qcom/msm8909w-bg-wtp-v2.dts
+++ b/arch/arm64/boot/dts/qcom/msm8909w-bg-wtp-v2.dts
@@ -19,7 +19,6 @@
 #include "msm8909w-bg-memory.dtsi"
 #include "8909w-pm660.dtsi"
 #include "msm8909-audio-bg_codec.dtsi"
-#include "msm-arm-smmu-8909.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM8909W-PM660 BLACKGHOST WTP";