diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-30 15:31:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-30 15:31:22 -0700 |
| commit | 8208716117d6ec62b423ea8c55e50ee672948ab6 (patch) | |
| tree | 7f90a398c1e539d83824d64e3e13e1db8e21c60b | |
| parent | 0afbd651a77f00ac59e1b8a9af5b95d34cc706cc (diff) | |
| parent | 4469fe08a7a5f7d16db16d7c531b001d28e14ade (diff) | |
Merge "ARM: dts: msm: Specify smb138x vbus regulator for USBIN-USBIN"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-smb138x.dtsi | 7 | ||||
| -rw-r--r-- | drivers/power/supply/qcom/pmic-voter.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-smb138x.dtsi b/arch/arm/boot/dts/qcom/msm-smb138x.dtsi index ea4f05069aab..df7d30210c19 100644 --- a/arch/arm/boot/dts/qcom/msm-smb138x.dtsi +++ b/arch/arm/boot/dts/qcom/msm-smb138x.dtsi @@ -128,3 +128,10 @@ }; }; }; + +&smb138x_parallel_slave { + smb138x_vbus: qcom,smb138x-vbus { + status = "disabled"; + regulator-name = "smb138x-vbus"; + }; +}; diff --git a/drivers/power/supply/qcom/pmic-voter.c b/drivers/power/supply/qcom/pmic-voter.c index 3652cc7802eb..b99558ed2100 100644 --- a/drivers/power/supply/qcom/pmic-voter.c +++ b/drivers/power/supply/qcom/pmic-voter.c @@ -20,7 +20,7 @@ #include <linux/pmic-voter.h> -#define NUM_MAX_CLIENTS 8 +#define NUM_MAX_CLIENTS 16 #define DEBUG_FORCE_CLIENT "DEBUG_FORCE_CLIENT" static DEFINE_SPINLOCK(votable_list_slock); |