Merge "ARM: dts: Change minimum voltage for LDO25"

Documentation/devicetree/bindings/cnss/icnss.txt

@@ -18,12 +18,13 @@ Required properties:
   - qcom,wlan-smmu-iova-address: I/O virtual address range as <start length>
     format to be used for allocations associated between WLAN and SMMU
   - <supply-name>-supply: phandle to the regulator device tree node
-                          Required "supply-name" is "vdd-io".
-  - qcom,<supply>-voltage-level - specifies voltage levels for supply. Should be
-                                  specified in pairs (min, max), units uV.
+                          Required "supply-name" is "vdd-0.8-cx-mx".
+  - qcom,<supply>-config - specifies voltage levels for supply. Should be
+                           specified in pairs (min, max), units uV.  There can
+                           be optional load in uA and Regulator settle delay in
+                           uS.
 
 Optional properties:
-  - qcom,skip-qmi: Boolean property to decide whether to use QMI or not
 
 Example:
 
@@ -50,7 +51,6 @@ Example:
 		   <0 140 0 /* CE10 */ >,
 		   <0 141 0 /* CE11 */ >;
         qcom,wlan-msa-memory = <0x200000>;
-        qcom,skip-qmi;
-	vdd-io-supply = <&pmcobalt_l5>;
-	qcom,vdd-io-voltage-level = <800000 800000>;
+	vdd-0.8-cx-mx-supply = <&pmcobalt_l5>;
+	qcom,vdd-0.8-cx-mx-config = <800000 800000 2400 1000>;
     };

arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi

@@ -415,7 +415,7 @@
 	rpm-regulator-ldoa25 {
 		status = "okay";
 		pmcobalt_l25: regulator-l25 {
-			regulator-min-microvolt = <3312000>;
+			regulator-min-microvolt = <3104000>;
 			regulator-max-microvolt = <3312000>;
 			status = "okay";
 		};
@@ -424,7 +424,7 @@
 			compatible = "qcom,rpm-smd-regulator";
 			regulator-name = "pmcobalt_l25_pin_ctrl";
 			qcom,set = <3>;
-			regulator-min-microvolt = <3312000>;
+			regulator-min-microvolt = <3104000>;
 			regulator-max-microvolt = <3312000>;
 			/* Force NPM follows HW_EN2 */
 			qcom,init-pin-ctrl-mode = <4>;

arch/arm/boot/dts/qcom/msmcobalt.dtsi

@@ -2782,6 +2782,8 @@
 		      <0xb0000000 0x10000>;
 		reg-names = "membase", "mpm_config",
 			    "smmu_iova_base", "smmu_iova_ipa";
+		clocks = <&clock_gcc clk_rf_clk2_pin>;
+		clock-names = "cxo_ref_clk_pin";
 		iommus = <&anoc2_smmu 0x1900>,
 			 <&anoc2_smmu 0x1901>;
 		interrupts = <0 413 0 /* CE0 */ >,
@@ -2797,8 +2799,12 @@
 			     <0 424 0 /* CE10 */ >,
 			     <0 425 0 /* CE11 */ >;
 		qcom,wlan-msa-memory = <0x100000>;
-		vdd-io-supply = <&pmcobalt_l5>;
-		qcom,vdd-io-voltage-level = <800000 800000>;
+		vdd-0.8-cx-mx-supply = <&pmcobalt_l5>;
+		vdd-1.8-xo-supply = <&pmcobalt_l7_pin_ctrl>;
+		vdd-1.3-rfa-supply = <&pmcobalt_l17_pin_ctrl>;
+		vdd-3.3-ch0-supply = <&pmcobalt_l25_pin_ctrl>;
+		qcom,vdd-0.8-cx-mx-config = <800000 800000>;
+		qcom,vdd-3.3-ch0-config = <3104000 3312000>;
 		qcom,msm-bus,name = "msm-icnss";
 		qcom,msm-bus,num-cases = <2>;
 		qcom,msm-bus,num-paths = <1>;