diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-18 14:47:59 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-18 14:47:58 -0800 |
| commit | 4639e34368d7894d22a76e5dfe6ce3f453f7b12d (patch) | |
| tree | d4a5bf45020fd5043299d8d217d490d7ac2b84ee /arch/arm | |
| parent | 4eadfaf5f8e9396e4a4fde0267e130cb4533fa09 (diff) | |
| parent | 02871aa94733cfe29d02bb36788b123a8c595535 (diff) | |
Merge "ARM: dts: msm: Move boot_rom_ahb_clk to proxy voted for msm8998"
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998.dtsi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998.dtsi b/arch/arm/boot/dts/qcom/msm8998.dtsi index c265eafcdd30..8b4198b625b9 100644 --- a/arch/arm/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998.dtsi @@ -2037,10 +2037,9 @@ clock-names = "xo", "iface_clk", "bus_clk", "mem_clk", "gpll0_mss_clk", "snoc_axi_clk", "mnoc_axi_clk", "qdss_clk"; - qcom,proxy-clock-names = "xo", "qdss_clk"; - qcom,active-clock-names = "iface_clk", "bus_clk", "mem_clk", - "gpll0_mss_clk", "snoc_axi_clk", - "mnoc_axi_clk"; + qcom,proxy-clock-names = "xo", "qdss_clk", "mem_clk"; + qcom,active-clock-names = "iface_clk", "bus_clk", + "gpll0_mss_clk", "snoc_axi_clk", "mnoc_axi_clk"; interrupts = <0 448 1>; vdd_cx-supply = <&pm8998_s1_level>; |