diff options
| author | redick_lin <redick_lin@htc.com> | 2016-07-26 12:32:14 +0800 |
|---|---|---|
| committer | Pat Tjin <pattjin@google.com> | 2016-08-03 16:32:10 +0000 |
| commit | bb42f6ef5295efce2a01038e1eae5aeeda2f95b7 (patch) | |
| tree | 44d6a4528fdb2b7f4789e7c12516d7a005f348a0 /arch | |
| parent | 913f2a58c8971a0755ff1fa87a11388fea5c85e1 (diff) | |
arm64/dt: marlin/sailfish: Correct MPP pin setting for SMB-OUT-ISEN.
Bug: 30247318
Change-Id: I99c363d9f4e35064a16572ed8fd9e9ad120b3891
Signed-off-by: redick_lin <redick_lin@htc.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi | 25 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi | 26 |
2 files changed, 50 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi b/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi index 04a67305144d..394012b14b15 100644 --- a/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi +++ b/arch/arm64/boot/dts/htc/msm8996-htc_marlin.dtsi @@ -224,6 +224,7 @@ qcom,parallel-main-chg-icl-percent = <50>; qcom,batt-eoc-current-ma = <100>; qcom,usb_pwr_temp-vadc = <&pm8994_vadc>; + qcom,smb_out_isen-vadc = <&pmi8994_vadc>; }; &pmi8994_fg { @@ -288,7 +289,16 @@ }; }; -&pmi8994_mpps { /* FLASH_STROBE */ +&pmi8994_mpps { + /* MPP 1 - SMB_OUT_ISEN */ + mpp@a000 { + qcom,pin-num = <1>; + qcom,mode = <4>; /* QPNP_PIN_MODE_AIN */ + qcom,src-sel = <0>; /* QPNP_PIN_SEL_FUNC_CONSTANT */ + qcom,ain-route = <0>; /* QPNP_PIN_AIN_AMUX_CH5 */ + qcom,master-en = <1>; /* Enable */ + status = "okay"; + }; mpp@a100 { qcom,mode = <0>; /* QPNP_PIN_MODE_DIG_IN */ qcom,pull = <2>; /* QPNP_PIN_MPP_PULL_UP_10KOHM */ @@ -299,6 +309,19 @@ }; }; +&pmi8994_vadc { + chan@10 { + label = "smb_out_isen"; + reg = <0x10>; + qcom,decimation = <0>; + qcom,pre-div-channel-scaling = <0>; + qcom,calibration-type = "absolute"; + qcom,scale-function = <0>; + qcom,hw-settle-time = <1>; + qcom,fast-avg-setup = <2>; + }; +}; + &spmi_bus { /* FLASH_STROBE */ qcom,pmi8994@3 { qcom,leds@d300 { diff --git a/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi b/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi index 3f6a90239ea3..ecc5fa3fbd85 100644 --- a/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi +++ b/arch/arm64/boot/dts/htc/msm8996-htc_sailfish.dtsi @@ -40,6 +40,7 @@ qcom,batt-eoc-current-ma = <50>; qcom,usb_pwr_temp-vadc = <&pm8994_vadc>; qcom,pd-is-limited-5v; + qcom,smb_out_isen-vadc = <&pmi8994_vadc>; }; &pmi8994_fg { @@ -72,6 +73,31 @@ }; }; +&pmi8994_mpps { + /* MPP 1 - SMB_OUT_ISEN */ + mpp@a000 { + qcom,pin-num = <1>; + qcom,mode = <4>; /* QPNP_PIN_MODE_AIN */ + qcom,src-sel = <0>; /* QPNP_PIN_SEL_FUNC_CONSTANT */ + qcom,ain-route = <0>; /* QPNP_PIN_AIN_AMUX_CH5 */ + qcom,master-en = <1>; /* Enable */ + status = "okay"; + }; +}; + +&pmi8994_vadc { + chan@10 { + label = "smb_out_isen"; + reg = <0x10>; + qcom,decimation = <0>; + qcom,pre-div-channel-scaling = <0>; + qcom,calibration-type = "absolute"; + qcom,scale-function = <0>; + qcom,hw-settle-time = <1>; + qcom,fast-avg-setup = <2>; + }; +}; + &pm8994_mpps { mpp@a600 { /* MPP 7 - USB_PWR_TEMP */ qcom,mode = <4>; /* QPNP_PIN_MODE_AIN */ |