Squashed 'dts/upstream/' changes from aaba2d45dc2a..b35b9bd1d4ee

[thirdparty/u-boot.git] / src / arm / qcom / qcom-mdm9615.dtsi

diff --git a/src/arm/qcom/qcom-mdm9615.dtsi b/src/arm/qcom/qcom-mdm9615.dtsi
index 63e21aa236429260993dfa75dde9ed7de63eb68b..34c60994d0263415718ea957cc80edb08849726e 100644 (file)
--- a/src/arm/qcom/qcom-mdm9615.dtsi
+++ b/src/arm/qcom/qcom-mdm9615.dtsi
@@ -256,57 +256,10 @@
                        };
                };
 
-               qcom,ssbi@500000 {
+               ssbi: ssbi@500000 {
                        compatible = "qcom,ssbi";
                        reg = <0x500000 0x1000>;
                        qcom,controller-type = "pmic-arbiter";
-
-                       pmicintc: pmic {
-                               compatible = "qcom,pm8018", "qcom,pm8921";
-                               interrupts = <GIC_PPI 226 IRQ_TYPE_LEVEL_HIGH>;
-                               #interrupt-cells = <2>;
-                               interrupt-controller;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               pwrkey@1c {
-                                       compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey";
-                                       reg = <0x1c>;
-                                       interrupt-parent = <&pmicintc>;
-                                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                                    <51 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15625>;
-                                       pull-up;
-                               };
-
-                               pmicmpp: mpps@50 {
-                                       compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       reg = <0x50>;
-                                       gpio-controller;
-                                       #gpio-cells = <2>;
-                                       gpio-ranges = <&pmicmpp 0 0 6>;
-                               };
-
-                               rtc@11d {
-                                       compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
-                                       interrupt-parent = <&pmicintc>;
-                                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
-                                       reg = <0x11d>;
-                                       allow-set-time;
-                               };
-
-                               pmicgpio: gpio@150 {
-                                       compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";
-                                       reg = <0x150>;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       gpio-controller;
-                                       gpio-ranges = <&pmicgpio 0 0 6>;
-                                       #gpio-cells = <2>;
-                               };
-                       };
                };
 
                sdcc1bam: dma-controller@12182000 {
@@ -383,140 +336,6 @@
                                     <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
                                     <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
                        interrupt-names = "ack", "err", "wakeup";
-
-                       regulators {
-                               compatible = "qcom,rpm-pm8018-regulators";
-
-                               vin_lvs1-supply = <&pm8018_s3>;
-
-                               vdd_l7-supply = <&pm8018_s4>;
-                               vdd_l8-supply = <&pm8018_s3>;
-                               vdd_l9_l10_l11_l12-supply = <&pm8018_s5>;
-
-                               /* Buck SMPS */
-                               pm8018_s1: s1 {
-                                       regulator-min-microvolt = <500000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_s2: s2 {
-                                       regulator-min-microvolt = <1225000>;
-                                       regulator-max-microvolt = <1300000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_s3: s3 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_s4: s4 {
-                                       regulator-min-microvolt = <2100000>;
-                                       regulator-max-microvolt = <2200000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_s5: s5 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1350000>;
-                                       regulator-max-microvolt = <1350000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               /* PMOS LDO */
-                               pm8018_l2: l2 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l3: l3 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l4: l4 {
-                                       regulator-min-microvolt = <3300000>;
-                                       regulator-max-microvolt = <3300000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l5: l5 {
-                                       regulator-min-microvolt = <2850000>;
-                                       regulator-max-microvolt = <2850000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l6: l6 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <2850000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l7: l7 {
-                                       regulator-min-microvolt = <1850000>;
-                                       regulator-max-microvolt = <1900000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l8: l8 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l9: l9 {
-                                       regulator-min-microvolt = <750000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l10: l10 {
-                                       regulator-min-microvolt = <1050000>;
-                                       regulator-max-microvolt = <1050000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l11: l11 {
-                                       regulator-min-microvolt = <1050000>;
-                                       regulator-max-microvolt = <1050000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l12: l12 {
-                                       regulator-min-microvolt = <1050000>;
-                                       regulator-max-microvolt = <1050000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l13: l13 {
-                                       regulator-min-microvolt = <1850000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               pm8018_l14: l14 {
-                                       regulator-min-microvolt = <2850000>;
-                                       regulator-max-microvolt = <2850000>;
-                                       bias-pull-down;
-                               };
-
-                               /* Low Voltage Switch */
-                               pm8018_lvs1: lvs1 {
-                                       bias-pull-down;
-                               };
-                       };
                };
        };
 };