summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-21 07:30:27 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-21 07:30:26 -0800
commitf3a71c4dd028b0d960ef27eb53d4a248c8a5c469 (patch)
tree25c0777e7956d91529f966d441b46061a60c8313
parentbd15db7a9b003f2f66e7b92d5c657585fc07428c (diff)
parent6ee131307e2ac1ceb2e7b01d772bf1b62e73e6be (diff)
Merge "ARM: dts: msm: add bus vote for mmss smmu on msmfalcon"
-rw-r--r--arch/arm/boot/dts/qcom/msm-arm-smmu-falcon.dtsi2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-arm-smmu-falcon.dtsi b/arch/arm/boot/dts/qcom/msm-arm-smmu-falcon.dtsi
index a610bee8969a..713e1b1bc66a 100644
--- a/arch/arm/boot/dts/qcom/msm-arm-smmu-falcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-arm-smmu-falcon.dtsi
@@ -12,6 +12,7 @@
#include <dt-bindings/clock/qcom,gcc-msmfalcon.h>
#include <dt-bindings/clock/qcom,mmcc-msmfalcon.h>
+#include <dt-bindings/msm/msm-bus-ids.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -135,6 +136,7 @@
"mmss_bimc_smmu_ahb_clk",
"mmss_bimc_smmu_axi_clk";
#clock-cells = <1>;
+ qcom,bus-master-id = <MSM_BUS_MNOC_BIMC_MAS>;
};
kgsl_smmu: arm,smmu-kgsl@5040000 {