Merge "ARM: dts: qcom: add pmd802x amoled device for Sun"

qcom/pmd802x.dtsi

@@ -47,6 +47,50 @@
 				     <0x0 0x7d 0x1 IRQ_TYPE_EDGE_RISING>,
 				     <0x0 0x98 0x1 IRQ_TYPE_EDGE_RISING>;
 		};
+
+		qcom-amoled {
+			compatible = "qcom,amoled-regulator";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			/*
+			 * Following ibb_spur_sqm_timer nvmem cell is specified
+			 * only to show its use. But it won't be used by
+			 * amoled-regulator until qcom,ibb-spur-mitigation-level
+			 * and other related properties are specified under
+			 * ibb subnode.
+			 */
+			nvmem-cells = <&ibb_spur_sqm_timer>;
+			nvmem-cell-names = "ibb_spur_sqm_timer";
+			status = "disabled";
+
+			ibb_vreg: ibb@f800 {
+				reg = <0xf800>;
+				reg-names = "ibb_base";
+				regulator-name = "ibb";
+				regulator-min-microvolt = <800000>;
+				regulator-max-microvolt = <9000000>;
+				regulator-allow-set-load;
+				qcom,swire-control;
+			};
+
+			ab_vreg: elvdd@f900 {
+				reg = <0xf900>;
+				reg-names = "ab_base";
+				regulator-name = "ab";
+				regulator-min-microvolt = <2500000>;
+				regulator-max-microvolt = <5500000>;
+				qcom,swire-control;
+			};
+
+			oledb_vreg: oledb@fa00 {
+				reg = <0xfa00>;
+				reg-names = "oledb_base";
+				regulator-name = "oledb";
+				regulator-min-microvolt = <5000000>;
+				regulator-max-microvolt = <8000000>;
+				qcom,swire-control;
+			};
+		};
 	};
 };
 

qcom/pmk8550.dtsi

@@ -90,6 +90,17 @@
 			reg = <0x9800>;
 		};
 
+		pmk8550_sdam_43: sdam@9a00 {
+			compatible = "qcom,spmi-sdam";
+			reg = <0x9a00>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ibb_spur_sqm_timer: sqm-timer@b8 {
+				reg = <0xb8 0x2>;
+			};
+		};
+
 		pmk8550_sdam_46: sdam@9d00 {
 			compatible = "qcom,spmi-sdam";
 			reg = <0x9d00>;