diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-06 14:33:16 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-06 14:33:16 -0800 |
| commit | 52e3de8183cc686e629c0dcac4692e71cb6e0886 (patch) | |
| tree | 10e6b1ac6aa83409dc92a0ef90e92b6fe0d5df43 /arch | |
| parent | 0d2f3573dcbff2424f692019e3749bfe71ac2dd6 (diff) | |
| parent | 0daf7767a625678381bdc95aa5d2fe5db2858aa6 (diff) | |
Merge "ARM: dts: msm: Enable CX Ipeak Mitigation for MSMFALCON"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmfalcon.dtsi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmfalcon.dtsi index 1f357b2e807a..4c11b0283b52 100644 --- a/arch/arm/boot/dts/qcom/msmfalcon.dtsi +++ b/arch/arm/boot/dts/qcom/msmfalcon.dtsi @@ -1319,9 +1319,11 @@ <0x1f65000 0x008>, <0x1f64000 0x008>, <0x4180000 0x040>, - <0x00179000 0x004>; + <0x00179000 0x004>, + <0x01fe5048 0x004>; reg-names = "qdsp6_base", "halt_q6", "halt_modem", - "halt_nc", "rmb_base", "restart_reg"; + "halt_nc", "rmb_base", "restart_reg", + "cxip_lm_vote_clear"; clocks = <&clock_rpmcc RPM_XO_CLK_SRC>, <&clock_gcc GCC_MSS_CFG_AHB_CLK>, @@ -1352,6 +1354,7 @@ qcom,qdsp6v62-1-5; memory-region = <&modem_fw_mem>; qcom,mem-protect-id = <0xF>; + qcom,cx-ipeak-vote; /* GPIO inputs from mss */ qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_1_in 0 0>; |