diff options
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/msm-pm8916.dtsi | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msm8916-regulator.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msm8916.dtsi | 5 |
3 files changed, 17 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/msm-pm8916.dtsi b/arch/arm/boot/dts/msm-pm8916.dtsi index 1a738de55bb4..2128e65619bd 100644 --- a/arch/arm/boot/dts/msm-pm8916.dtsi +++ b/arch/arm/boot/dts/msm-pm8916.dtsi @@ -12,11 +12,14 @@ &spmi_bus { - qcom,pm8916@0 { - spmi-slave-container; - reg = <0x0>; - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <0>; + + + qcom,pm8916@0 { + reg = <0x0 0>; + #address-cells = <1>; + #size-cells = <1>; pm8916_revid: qcom,revid@100 { compatible = "qcom,qpnp-revid"; @@ -320,10 +323,9 @@ }; qcom,pm8916@1 { - spmi-slave-container; - reg = <0x1>; - #address-cells = <1>; - #size-cells = <1>; + reg = <1 0>; + #address-cells = <1>; + #size-cells = <1>; regulator@1400 { compatible = "qcom,qpnp-regulator"; diff --git a/arch/arm/boot/dts/msm8916-regulator.dtsi b/arch/arm/boot/dts/msm8916-regulator.dtsi index 749c55261a3b..26eda8bb85bf 100644 --- a/arch/arm/boot/dts/msm8916-regulator.dtsi +++ b/arch/arm/boot/dts/msm8916-regulator.dtsi @@ -14,6 +14,9 @@ &spmi_bus { qcom,pm8916@1 { status = "okay"; + #address-cells = <1>; + #size-cells = <1>; + pm8916_s2: spm-regulator@1700 { compatible = "qcom,spm-regulator"; regulator-name = "8916_s2"; diff --git a/arch/arm/boot/dts/msm8916.dtsi b/arch/arm/boot/dts/msm8916.dtsi index df9dbc92ca72..8a66d3b0d6b4 100644 --- a/arch/arm/boot/dts/msm8916.dtsi +++ b/arch/arm/boot/dts/msm8916.dtsi @@ -902,8 +902,9 @@ <0x200a000 0x2100>; reg-names = "core", "chnls", "obsrvr", "intr", "cnfg"; interrupts = <0 190 0>; - qcom,pmic-arb-channel = <0>; - qcom,pmic-arb-ee = <0>; + interrupt-names = "periph_irq"; + qcom,channel = <0>; + qcom,ee = <0>; #interrupt-cells = <3>; interrupt-controller; #address-cells = <1>; |