diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-26 21:29:16 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-26 21:29:16 -0700 |
| commit | d9979fa51096a37ceb65348296fe6645d69e9708 (patch) | |
| tree | 9fe6b40bf5af72aa97ad7e8923afce6d6877abd9 | |
| parent | a48006c52f1832e72bbb81020ba63e15b4f5c6ca (diff) | |
| parent | 3bcbc2716afa4c83ab45b993a6150917f4436db1 (diff) | |
Merge "ARM: dts: msm: Set min-microvolt of pmxpoorwills_s1_level to RETENTION"LE.UM.3.4.1-03600-8x09.0
| -rw-r--r-- | arch/arm/boot/dts/qcom/sa415m-cdp.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sa415m-mtp-256.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sa415m-ttp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi | 2 |
6 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/sa415m-cdp.dts b/arch/arm/boot/dts/qcom/sa415m-cdp.dts index b9e7d4947c6e..908eb8797ac7 100644 --- a/arch/arm/boot/dts/qcom/sa415m-cdp.dts +++ b/arch/arm/boot/dts/qcom/sa415m-cdp.dts @@ -30,3 +30,7 @@ &mss_mem { reg = <0x86400000 0x9300000>; }; + +&smb138x { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts b/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts index 09a8ea0a3b5c..39ed5c6f75fe 100644 --- a/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts +++ b/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts @@ -28,3 +28,7 @@ &mss_mem { reg = <0x86400000 0x9300000>; }; + +&smb138x { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi b/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi index 60283878a026..f91893508155 100644 --- a/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi +++ b/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi @@ -91,6 +91,10 @@ }; }; +&smb138x { + status = "disabled"; +}; + &i2c_4 { status = "okay"; diff --git a/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts b/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts index c8b78915dac0..3a7b0722932b 100644 --- a/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts +++ b/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts @@ -31,3 +31,7 @@ &mss_mem { reg = <0x86400000 0x9300000>; }; + +&smb138x { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts b/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts index c7cbbd1ba1f5..fe59e058bde9 100644 --- a/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts +++ b/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts @@ -33,3 +33,7 @@ &mss_mem { reg = <0x86400000 0x9300000>; }; + +&smb138x { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi b/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi index c1bf40455d2b..f09e63d31d2a 100644 --- a/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi +++ b/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi @@ -25,7 +25,7 @@ regulator-name = "pmxpoorwills_s1_level"; qcom,set = <RPMH_REGULATOR_SET_ALL>; regulator-min-microvolt = - <RPMH_REGULATOR_LEVEL_MIN_SVS>; + <RPMH_REGULATOR_LEVEL_RETENTION>; regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>; }; }; |