From 383a31e3e756a1f1bdcb2c28afa32ea598c361a3 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 4 Oct 2016 14:36:18 -0700 Subject: [PATCH] ARM: dts: msm: Configure bimc-bwmon4 only for msmcobaltv2 The bimc-bwmon4 hardware module is only available on msmcobalt-v2. Therefore move the bimc-bwmon4 setting to msmcobalt-v2 DT so that msmcobalt-v1 can continue to use bimc-bwmon3 to measure DDR bandwidth. Change-Id: If6a44d83a4088e34eda3604ffa770b46653989f5 Signed-off-by: Rohit Gupta --- arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi | 5 +++++ arch/arm/boot/dts/qcom/msmcobalt.dtsi | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi index cac11da9a962..b098805ff6e2 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi @@ -171,6 +171,11 @@ < 2496000 >; }; +&bwmon { + compatible = "qcom,bimc-bwmon4"; + qcom,hw-timer-hz = <19200000>; +}; + &devfreq_cpufreq { mincpubw-cpufreq { cpu-to-dev-map-0 = diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index 33830aefcf36..f2d434324a8f 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -541,14 +541,13 @@ < 13763 /* 1804 MHz */ >; }; - qcom,cpu-bwmon { - compatible = "qcom,bimc-bwmon4"; + bwmon: qcom,cpu-bwmon { + compatible = "qcom,bimc-bwmon3"; reg = <0x01008000 0x300>, <0x01001000 0x200>; reg-names = "base", "global_base"; interrupts = <0 183 4>; qcom,mport = <0>; qcom,target-dev = <&cpubw>; - qcom,hw-timer-hz = <19200000>; }; mincpubw: qcom,mincpubw {