diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-10 23:06:37 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-10 23:06:37 -0800 |
| commit | 5332a6cfcb610cfc0ea3500b5f920a6868fbeabd (patch) | |
| tree | 1b838c436e6a333da2635ee616e463fab76c992b /arch | |
| parent | 6daf3a8c26974eb08e797dd419b5ed09b2863624 (diff) | |
| parent | 5b55bcfa96852bd4c8b160d139b4b47334e1e990 (diff) | |
Merge "ARM: dts: msm: enable the watchdog bark interrupt for smb138x"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-smb138x.dtsi | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-smb138x.dtsi b/arch/arm/boot/dts/qcom/msm-smb138x.dtsi index b8c721e64ca7..e6e04f19d7ea 100644 --- a/arch/arm/boot/dts/qcom/msm-smb138x.dtsi +++ b/arch/arm/boot/dts/qcom/msm-smb138x.dtsi @@ -14,11 +14,11 @@ &i2c_7 { status = "okay"; - qcom,smb138x@8 { + smb138x: qcom,smb138x@8 { compatible = "qcom,i2c-pmic"; reg = <0x8>; - #address-cells = <2>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <1>; interrupt-parent = <&spmi_bus>; interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>; interrupt_names = "smb138x"; @@ -37,6 +37,7 @@ #address-cells = <1>; #size-cells = <0>; #io-channel-cells = <1>; + interrupt-parent = <&smb138x>; interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "eoc"; @@ -91,13 +92,21 @@ compatible = "qcom,smb138x-parallel-slave"; qcom,pmic-revid = <&smb138x_revid>; reg = <0x1000 0x700>; - + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&smb138x>; io-channels = <&smb138x_tadc 2>, <&smb138x_tadc 12>, <&smb138x_tadc 3>; io-channel-names = "charger_temp", "charger_temp_max", "batt_i"; + + qcom,chgr-misc@1600 { + reg = <0x1600 0x100>; + interrupts = <0x16 0x1 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog-bark"; + }; }; }; }; |