Merge "ARM: dts: msm: replace cobalt with 8998 for msmskunk" into msm-4.8
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-regulator.dtsi b/arch/arm64/boot/dts/qcom/msmskunk-regulator.dtsi
index 6851992..3bcf6c0 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-regulator.dtsi
+++ b/arch/arm64/boot/dts/qcom/msmskunk-regulator.dtsi
@@ -14,327 +14,327 @@
/* Stub regulators */
/ {
- pmcobalt_s1: regulator-pmcobalt-s1 {
+ pm8998_s1: regulator-pm8998-s1 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s1";
+ regulator-name = "pm8998_s1";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
};
- pmcobalt_s2: regulator-pmcobalt-s2 {
+ pm8998_s2: regulator-pm8998-s2 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s2";
+ regulator-name = "pm8998_s2";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
};
- pmcobalt_s3: regulator-pmcobalt-s3 {
+ pm8998_s3: regulator-pm8998-s3 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s3";
+ regulator-name = "pm8998_s3";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <1352000>;
regulator-max-microvolt = <1352000>;
};
- pmcobalt_s4: regulator-pmcobalt-s4 {
+ pm8998_s4: regulator-pm8998-s4 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s4";
+ regulator-name = "pm8998_s4";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- pmcobalt_s5: regulator-pmcobalt-s5 {
+ pm8998_s5: regulator-pm8998-s5 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s5";
+ regulator-name = "pm8998_s5";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <1904000>;
regulator-max-microvolt = <2040000>;
};
- /* PMCOBALT S6 = VDD_MX supply */
- pmcobalt_s6_level: regulator-pmcobalt-s6-level {
+ /* PM8998 S6 = VDD_MX supply */
+ pm8998_s6_level: regulator-pm8998-s6-level {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s6_level";
+ regulator-name = "pm8998_s6_level";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;
regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;
};
- pmcobalt_s6_level_ao: regulator-pmcobalt-s6-level-ao {
+ pm8998_s6_level_ao: regulator-pm8998-s6-level-ao {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s6_level_ao";
+ regulator-name = "pm8998_s6_level_ao";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;
regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;
};
- pmcobalt_s7: regulator-pmcobalt-s7 {
+ pm8998_s7: regulator-pm8998-s7 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s7";
+ regulator-name = "pm8998_s7";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1028000>;
};
- /* PMCOBALT S9 + S8 = VDD_CX supply */
- pmcobalt_s9_level: regulator-pmcobalt-s9-level {
+ /* PM8998 S9 + S8 = VDD_CX supply */
+ pm8998_s9_level: regulator-pm8998-s9-level {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s9_level";
+ regulator-name = "pm8998_s9_level";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;
regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;
};
- pmcobalt_s9_level_ao: regulator-pmcobalt-s9-level-ao {
+ pm8998_s9_level_ao: regulator-pm8998-s9-level-ao {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_s9_level_ao";
+ regulator-name = "pm8998_s9_level_ao";
qcom,hpm-min-load = <100000>;
regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;
regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;
};
- pmcobalt_l1: regulator-pmcobalt-l1 {
+ pm8998_l1: regulator-pm8998-l1 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l1";
+ regulator-name = "pm8998_l1";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
};
- pmcobalt_l2: regulator-pmcobalt-l2 {
+ pm8998_l2: regulator-pm8998-l2 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l2";
+ regulator-name = "pm8998_l2";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
- pmcobalt_l3: regulator-pmcobalt-l3 {
+ pm8998_l3: regulator-pm8998-l3 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l3";
+ regulator-name = "pm8998_l3";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
};
- /* PMCOBALT L4 = VDD_SSC_MX supply */
- pmcobalt_l4_level: regulator-pmcobalt-l4-level {
+ /* PM8998 L4 = VDD_SSC_MX supply */
+ pm8998_l4_level: regulator-pm8998-l4-level {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l4_level";
+ regulator-name = "pm8998_l4_level";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;
regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;
};
- pmcobalt_l5: regulator-pmcobalt-l5 {
+ pm8998_l5: regulator-pm8998-l5 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l5";
+ regulator-name = "pm8998_l5";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <800000>;
};
- pmcobalt_l6: regulator-pmcobalt-l6 {
+ pm8998_l6: regulator-pm8998-l6 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l6";
+ regulator-name = "pm8998_l6";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1856000>;
regulator-max-microvolt = <1856000>;
};
- pmcobalt_l7: regulator-pmcobalt-l7 {
+ pm8998_l7: regulator-pm8998-l7 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l7";
+ regulator-name = "pm8998_l7";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- pmcobalt_l8: regulator-pmcobalt-l8 {
+ pm8998_l8: regulator-pm8998-l8 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l8";
+ regulator-name = "pm8998_l8";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
- pmcobalt_l9: regulator-pmcobalt-l9 {
+ pm8998_l9: regulator-pm8998-l9 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l9";
+ regulator-name = "pm8998_l9";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1808000>;
regulator-max-microvolt = <2960000>;
};
- pmcobalt_l10: regulator-pmcobalt-l10 {
+ pm8998_l10: regulator-pm8998-l10 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l10";
+ regulator-name = "pm8998_l10";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1808000>;
regulator-max-microvolt = <2960000>;
};
- pmcobalt_l11: regulator-pmcobalt-l11 {
+ pm8998_l11: regulator-pm8998-l11 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l11";
+ regulator-name = "pm8998_l11";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
};
- pmcobalt_l12: regulator-pmcobalt-l12 {
+ pm8998_l12: regulator-pm8998-l12 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l12";
+ regulator-name = "pm8998_l12";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- pmcobalt_l13: regulator-pmcobalt-l13 {
+ pm8998_l13: regulator-pm8998-l13 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l13";
+ regulator-name = "pm8998_l13";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1808000>;
regulator-max-microvolt = <2960000>;
};
- pmcobalt_l14: regulator-pmcobalt-l14 {
+ pm8998_l14: regulator-pm8998-l14 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l14";
+ regulator-name = "pm8998_l14";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- pmcobalt_l15: regulator-pmcobalt-l15 {
+ pm8998_l15: regulator-pm8998-l15 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l15";
+ regulator-name = "pm8998_l15";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- pmcobalt_l16: regulator-pmcobalt-l16 {
+ pm8998_l16: regulator-pm8998-l16 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l16";
+ regulator-name = "pm8998_l16";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <2704000>;
regulator-max-microvolt = <2704000>;
};
- pmcobalt_l17: regulator-pmcobalt-l17 {
+ pm8998_l17: regulator-pm8998-l17 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l17";
+ regulator-name = "pm8998_l17";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1304000>;
regulator-max-microvolt = <1304000>;
};
- pmcobalt_l18: regulator-pmcobalt-l18 {
+ pm8998_l18: regulator-pm8998-l18 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l18";
+ regulator-name = "pm8998_l18";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <2704000>;
regulator-max-microvolt = <2704000>;
};
- pmcobalt_l19: regulator-pmcobalt-l19 {
+ pm8998_l19: regulator-pm8998-l19 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l19";
+ regulator-name = "pm8998_l19";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <3008000>;
regulator-max-microvolt = <3008000>;
};
- pmcobalt_l20: regulator-pmcobalt-l20 {
+ pm8998_l20: regulator-pm8998-l20 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l20";
+ regulator-name = "pm8998_l20";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <2960000>;
regulator-max-microvolt = <2960000>;
};
- pmcobalt_l21: regulator-pmcobalt-l21 {
+ pm8998_l21: regulator-pm8998-l21 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l21";
+ regulator-name = "pm8998_l21";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <2960000>;
regulator-max-microvolt = <2960000>;
};
- pmcobalt_l22: regulator-pmcobalt-l22 {
+ pm8998_l22: regulator-pm8998-l22 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l22";
+ regulator-name = "pm8998_l22";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <2864000>;
regulator-max-microvolt = <2864000>;
};
- pmcobalt_l23: regulator-pmcobalt-l23 {
+ pm8998_l23: regulator-pm8998-l23 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l23";
+ regulator-name = "pm8998_l23";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <3312000>;
regulator-max-microvolt = <3312000>;
};
- pmcobalt_l24: regulator-pmcobalt-l24 {
+ pm8998_l24: regulator-pm8998-l24 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l24";
+ regulator-name = "pm8998_l24";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <3088000>;
regulator-max-microvolt = <3088000>;
};
- pmcobalt_l25: regulator-pmcobalt-l25 {
+ pm8998_l25: regulator-pm8998-l25 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l25";
+ regulator-name = "pm8998_l25";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <3104000>;
regulator-max-microvolt = <3104000>;
};
- pmcobalt_l26: regulator-pmcobalt-l26 {
+ pm8998_l26: regulator-pm8998-l26 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l26";
+ regulator-name = "pm8998_l26";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
- /* PMCOBALT L27 = VDD_SSC_CX supply */
- pmcobalt_l27_level: regulator-pmcobalt-l27-level {
+ /* PM8998 L27 = VDD_SSC_CX supply */
+ pm8998_l27_level: regulator-pm8998-l27-level {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l27_level";
+ regulator-name = "pm8998_l27_level";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;
regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;
};
- pmcobalt_l28: regulator-pmcobalt-l28 {
+ pm8998_l28: regulator-pm8998-l28 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_l28";
+ regulator-name = "pm8998_l28";
qcom,hpm-min-load = <10000>;
regulator-min-microvolt = <3008000>;
regulator-max-microvolt = <3008000>;
};
- pmcobalt_lvs1: regulator-pmcobalt-lvs1 {
+ pm8998_lvs1: regulator-pm8998-lvs1 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_lvs1";
+ regulator-name = "pm8998_lvs1";
};
- pmcobalt_lvs2: regulator-pmcobalt-lvs2 {
+ pm8998_lvs2: regulator-pm8998-lvs2 {
compatible = "qcom,stub-regulator";
- regulator-name = "pmcobalt_lvs2";
+ regulator-name = "pm8998_lvs2";
};
- pmicobalt_bob: regulator-pmicobalt-bob {
+ pmi8998_bob: regulator-pmi8998-bob {
compatible = "qcom,stub-regulator";
- regulator-name = "pmicobalt_bob";
+ regulator-name = "pmi8998_bob";
regulator-min-microvolt = <3312000>;
regulator-max-microvolt = <3600000>;
};
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-rumi.dtsi b/arch/arm64/boot/dts/qcom/msmskunk-rumi.dtsi
index 67953df..971bc4c 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-rumi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msmskunk-rumi.dtsi
@@ -13,9 +13,9 @@
&ufsphy_mem {
compatible = "qcom,ufs-phy-qrbtc-msmskunk";
- vdda-phy-supply = <&pmcobalt_l1>;
- vdda-pll-supply = <&pmcobalt_l2>;
- vddp-ref-clk-supply = <&pmcobalt_l26>;
+ vdda-phy-supply = <&pm8998_l1>;
+ vdda-pll-supply = <&pm8998_l2>;
+ vddp-ref-clk-supply = <&pm8998_l26>;
vdda-phy-max-microamp = <44000>;
vdda-pll-max-microamp = <14600>;
vddp-ref-clk-max-microamp = <100>;
@@ -31,8 +31,8 @@
vdd-hba-supply = <&ufs_phy_gdsc>;
vdd-hba-fixed-regulator;
- vcc-supply = <&pmcobalt_l20>;
- vccq2-supply = <&pmcobalt_s4>;
+ vcc-supply = <&pm8998_l20>;
+ vccq2-supply = <&pm8998_s4>;
vcc-max-microamp = <600000>;
vccq2-max-microamp = <600000>;
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-usb.dtsi b/arch/arm64/boot/dts/qcom/msmskunk-usb.dtsi
index 8bb398e..317deae 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-usb.dtsi
+++ b/arch/arm64/boot/dts/qcom/msmskunk-usb.dtsi
@@ -61,9 +61,9 @@
reg = <0x088e2000 0x400>;
reg-names = "qusb_phy_base";
- vdd-supply = <&pmcobalt_l1>;
- vdda18-supply = <&pmcobalt_l12>;
- vdda33-supply = <&pmcobalt_l24>;
+ vdd-supply = <&pm8998_l1>;
+ vdda18-supply = <&pm8998_l12>;
+ vdda33-supply = <&pm8998_l24>;
qcom,vdd-voltage-level = <0 880000 880000>;
qcom,qusb-phy-init-seq =
/* <value reg_offset> */
diff --git a/arch/arm64/boot/dts/qcom/msmskunk.dtsi b/arch/arm64/boot/dts/qcom/msmskunk.dtsi
index e651202..c80c8b8 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk.dtsi
+++ b/arch/arm64/boot/dts/qcom/msmskunk.dtsi
@@ -392,8 +392,8 @@
compatible = "qcom,gcc-msmskunk";
reg = <0x100000 0x1f0000>;
reg-names = "cc_base";
- vdd_cx-supply = <&pmcobalt_s9_level>;
- vdd_cx_ao-supply = <&pmcobalt_s9_level_ao>;
+ vdd_cx-supply = <&pm8998_s9_level>;
+ vdd_cx_ao-supply = <&pm8998_s9_level_ao>;
#clock-cells = <1>;
#reset-cells = <1>;
};
@@ -402,7 +402,7 @@
compatible = "qcom,video_cc-msmskunk";
reg = <0xab00000 0x10000>;
reg-names = "cc_base";
- vdd_cx-supply = <&pmcobalt_s9_level>;
+ vdd_cx-supply = <&pm8998_s9_level>;
#clock-cells = <1>;
#reset-cells = <1>;
};
@@ -545,9 +545,9 @@
"mnoc_axi_clk";
interrupts = <0 266 1>;
- vdd_cx-supply = <&pmcobalt_s9_level>;
+ vdd_cx-supply = <&pm8998_s9_level>;
vdd_cx-voltage = <RPMH_REGULATOR_LEVEL_MAX>;
- vdd_mx-supply = <&pmcobalt_s6_level>;
+ vdd_mx-supply = <&pm8998_s6_level>;
vdd_mx-uV = <RPMH_REGULATOR_LEVEL_MAX>;
qcom,firmware-name = "modem";
qcom,pil-self-auth;
@@ -575,7 +575,7 @@
reg = <0x17300000 0x00100>;
interrupts = <0 162 1>;
- vdd_cx-supply = <&pmcobalt_s9_level>;
+ vdd_cx-supply = <&pm8998_s9_level>;
qcom,proxy-reg-names = "vdd_cx";
qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_MAX 100000>;
@@ -607,8 +607,8 @@
reg = <0x5c00000 0x4000>;
interrupts = <0 494 1>;
- vdd_cx-supply = <&pmcobalt_l27_level>;
- vdd_px-supply = <&pmcobalt_lvs2>;
+ vdd_cx-supply = <&pm8998_l27_level>;
+ vdd_px-supply = <&pm8998_lvs2>;
qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_MAX 0>;
qcom,proxy-reg-names = "vdd_cx", "vdd_px";
qcom,keep-proxy-regs-on;
@@ -656,10 +656,10 @@
"sp2soc_irq_mask", "rmb_err", "rmb_err_spare2";
interrupts = <0 352 1>;
- vdd_cx-supply = <&pmcobalt_s9_level>;
+ vdd_cx-supply = <&pm8998_s9_level>;
qcom,proxy-reg-names = "vdd_cx";
qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_MAX 100000>;
- vdd_mx-supply = <&pmcobalt_s6_level>;
+ vdd_mx-supply = <&pm8998_s6_level>;
vdd_mx-uV = <RPMH_REGULATOR_LEVEL_MAX 100000>;
clocks = <&clock_gcc RPMH_CXO_CLK>;
@@ -691,7 +691,7 @@
reg = <0x8300000 0x100000>;
interrupts = <0 578 1>;
- vdd_cx-supply = <&pmcobalt_s9_level>;
+ vdd_cx-supply = <&pm8998_s9_level>;
qcom,proxy-reg-names = "vdd_cx";
qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_MAX 100000>;