diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-21 15:48:14 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-21 15:48:13 -0800 |
| commit | 51f142cac20d9130703d616cfe88499a95d072e1 (patch) | |
| tree | 788ac0860ce09d2c06421db778925558f4c8e103 | |
| parent | c91ab72258805a352247bf653148319eeabf8c87 (diff) | |
| parent | f10c05e9759f492af371156e1e88c58c34bfdce0 (diff) | |
Merge "ARM: dts: msm: Update Venus PIL clock voting for MSMFALCON/TRITON"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmfalcon.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmtriton.dtsi | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/qcom/msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmfalcon.dtsi index aa1d0470c96e..edea1eea6752 100644 --- a/arch/arm/boot/dts/qcom/msmfalcon.dtsi +++ b/arch/arm/boot/dts/qcom/msmfalcon.dtsi @@ -1361,12 +1361,14 @@ qcom,proxy-reg-names = "vdd"; clocks = <&clock_mmss MMSS_VIDEO_CORE_CLK>, + <&clock_mmss MMSS_MNOC_AHB_CLK>, <&clock_mmss MMSS_VIDEO_AHB_CLK>, + <&clock_rpmcc MMSSNOC_AXI_CLK>, <&clock_mmss MMSS_VIDEO_AXI_CLK>; - clock-names = "core_clk","iface_clk", - "bus_clk"; - qcom,proxy-clock-names = "core_clk", - "iface_clk","bus_clk"; + clock-names = "core_clk", "mnoc_ahb_clk", "iface_clk", + "noc_axi_clk", "bus_clk"; + qcom,proxy-clock-names = "core_clk", "mnoc_ahb_clk", + "iface_clk", "noc_axi_clk", "bus_clk"; qcom,msm-bus,name = "pil-venus"; qcom,msm-bus,num-cases = <2>; diff --git a/arch/arm/boot/dts/qcom/msmtriton.dtsi b/arch/arm/boot/dts/qcom/msmtriton.dtsi index 50a172ba2eb1..ed58d5d3c683 100644 --- a/arch/arm/boot/dts/qcom/msmtriton.dtsi +++ b/arch/arm/boot/dts/qcom/msmtriton.dtsi @@ -874,12 +874,14 @@ qcom,proxy-reg-names = "vdd"; clocks = <&clock_mmss MMSS_VIDEO_CORE_CLK>, + <&clock_mmss MMSS_MNOC_AHB_CLK>, <&clock_mmss MMSS_VIDEO_AHB_CLK>, + <&clock_rpmcc MMSSNOC_AXI_CLK>, <&clock_mmss MMSS_VIDEO_AXI_CLK>; - clock-names = "core_clk","iface_clk", - "bus_clk"; - qcom,proxy-clock-names = "core_clk", - "iface_clk","bus_clk"; + clock-names = "core_clk", "mnoc_ahb_clk", "iface_clk", + "noc_axi_clk", "bus_clk"; + qcom,proxy-clock-names = "core_clk", "mnoc_ahb_clk", + "iface_clk", "noc_axi_clk", "bus_clk"; qcom,msm-bus,name = "pil-venus"; qcom,msm-bus,num-cases = <2>; |