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

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

diff --git a/src/arm/qcom/qcom-msm8960.dtsi b/src/arm/qcom/qcom-msm8960.dtsi
index d13080fcbeea222c149f6fdafc253a258668593d..f420740e068e825d6195d3a85512097449b272d8 100644 (file)
--- a/src/arm/qcom/qcom-msm8960.dtsi
+++ b/src/arm/qcom/qcom-msm8960.dtsi
@@ -200,10 +200,6 @@
                                     <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
                                     <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
                        interrupt-names = "ack", "err", "wakeup";
-
-                       regulators {
-                               compatible = "qcom,rpm-pm8921-regulators";
-                       };
                };
 
                acc0: clock-controller@2088000 {
@@ -259,49 +255,10 @@
                        };
                };
 
-               ssbi@500000 {
+               ssbi: ssbi@500000 {
                        compatible = "qcom,ssbi";
                        reg = <0x500000 0x1000>;
                        qcom,controller-type = "pmic-arbiter";
-
-                       pmicintc: pmic {
-                               compatible = "qcom,pm8921";
-                               interrupt-parent = <&msmgpio>;
-                               interrupts = <104 IRQ_TYPE_LEVEL_LOW>;
-                               #interrupt-cells = <2>;
-                               interrupt-controller;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               pwrkey@1c {
-                                       compatible = "qcom,pm8921-pwrkey";
-                                       reg = <0x1c>;
-                                       interrupt-parent = <&pmicintc>;
-                                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                                    <51 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15625>;
-                                       pull-up;
-                               };
-
-                               keypad@148 {
-                                       compatible = "qcom,pm8921-keypad";
-                                       reg = <0x148>;
-                                       interrupt-parent = <&pmicintc>;
-                                       interrupts = <74 IRQ_TYPE_EDGE_RISING>,
-                                                    <75 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15>;
-                                       scan-delay = <32>;
-                                       row-hold = <91500>;
-                               };
-
-                               rtc@11d {
-                                       compatible = "qcom,pm8921-rtc";
-                                       interrupt-parent = <&pmicintc>;
-                                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
-                                       reg = <0x11d>;
-                                       allow-set-time;
-                               };
-                       };
                };
 
                rng@1a500000 {