diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-06 14:33:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-06 14:33:52 -0800 |
| commit | 606a3e1dc09981be1ea697fe6e4596aa0efd6e73 (patch) | |
| tree | 55507ea3ae733337d14f4734ea2ba4a81c34362f /arch | |
| parent | 4aa28af5a2ba9a37431d02104b507ff58d1b8eb1 (diff) | |
| parent | 751178dfbd00bfa23ae17a133da6cea597b06ffc (diff) | |
Merge "ARM: dts: msm: Add the LCDB device node for PM2FALCON"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi | 21 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pm3falcon.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi | 17 |
3 files changed, 26 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi b/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi index 67247c956c42..366cb8974fee 100644 --- a/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi @@ -366,5 +366,26 @@ qcom,default-led-trigger = "switch1_trigger"; }; }; + + pm2falcon_lcdb: qpnp-lcdb@ec00 { + compatible = "qcom,qpnp-lcdb-regulator"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0xec00 0x100>; + + lcdb_ldo_vreg: ldo { + label = "ldo"; + regulator-name = "lcdb_ldo"; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <6000000>; + }; + + lcdb_ncp_vreg: ncp { + label = "ncp"; + regulator-name = "lcdb_ncp"; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <6000000>; + }; + }; }; }; diff --git a/arch/arm/boot/dts/qcom/msm-pm3falcon.dtsi b/arch/arm/boot/dts/qcom/msm-pm3falcon.dtsi index dcf7030a78e4..f9a33fdc3e85 100644 --- a/arch/arm/boot/dts/qcom/msm-pm3falcon.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pm3falcon.dtsi @@ -14,3 +14,8 @@ &pm2falcon_wled { status = "disabled"; }; + +/* disable LCDB */ +&pm2falcon_lcdb { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi index 1c39fe03b477..6ecda1a9548d 100644 --- a/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi @@ -252,20 +252,3 @@ #include "msm-pmfalcon-rpm-regulator.dtsi" #include "msm-pm2falcon-rpm-regulator.dtsi" #include "msmfalcon-regulator.dtsi" - -/* dummy LCDB regulator nodes */ -&soc { - lcdb_ldo_vreg: regulator-vdisp-vreg { - compatible = "qcom,stub-regulator"; - regulator-name = "lcdb_ldo"; - regulator-min-microvolt = <4000000>; - regulator-max-microvolt = <6000000>; - }; - - lcdb_ncp_vreg: regulator-vdisn-vreg { - compatible = "qcom,stub-regulator"; - regulator-name = "lcdb_ncp"; - regulator-min-microvolt = <4000000>; - regulator-max-microvolt = <6000000>; - }; -}; |