diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-21 05:33:28 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-21 05:33:27 -0800 |
| commit | a49e87ee73a133ce1e46759d77a085203446eadc (patch) | |
| tree | 95ae71fc5567933ec26846441541b6c055dc1a1e /arch | |
| parent | 6cf18cf0027ecbd080c4eca23fe94f4c5af97560 (diff) | |
| parent | ad819206fdbba352f85dcb6e4718e77af48bf060 (diff) | |
Merge "ARM: dts: msm: add connector temp iio channel for SMB138X"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-smb138x.dtsi | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-smb138x.dtsi b/arch/arm/boot/dts/qcom/msm-smb138x.dtsi index 8edc1fc61830..ea4f05069aab 100644 --- a/arch/arm/boot/dts/qcom/msm-smb138x.dtsi +++ b/arch/arm/boot/dts/qcom/msm-smb138x.dtsi @@ -95,18 +95,22 @@ #address-cells = <1>; #size-cells = <1>; interrupt-parent = <&smb138x>; - io-channels = <&smb138x_tadc 2>, - <&smb138x_tadc 3>, - <&smb138x_tadc 14>, - <&smb138x_tadc 15>, - <&smb138x_tadc 16>, - <&smb138x_tadc 17>; - io-channel-names = "charger_temp", - "batt_i", - "connector_temp_thr1", - "connector_temp_thr2", - "connector_temp_thr3", - "charger_temp_max"; + io-channels = + <&smb138x_tadc 1>, + <&smb138x_tadc 2>, + <&smb138x_tadc 3>, + <&smb138x_tadc 14>, + <&smb138x_tadc 15>, + <&smb138x_tadc 16>, + <&smb138x_tadc 17>; + io-channel-names = + "connector_temp", + "charger_temp", + "batt_i", + "connector_temp_thr1", + "connector_temp_thr2", + "connector_temp_thr3", + "charger_temp_max"; qcom,chgr@1000 { reg = <0x1000 0x100>; |