aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/qcom-msm8974.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-10-15 17:21:01 +0200
committerArnd Bergmann <arnd@arndb.de>2015-10-15 17:21:01 +0200
commitd819e7a7524fe0f43591b7c274685f6e66e48342 (patch)
tree90854c6f53a241a6b781a627c32982f25bf7d3ba /arch/arm/boot/dts/qcom-msm8974.dtsi
parent5078f77e14431efbfacd541c563b101bd6a99d75 (diff)
parent04edde250c3753798475f0a4dc0275dd52f707bd (diff)
Merge tag 'qcom-dt-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm into next/dt
Pull "Qualcomm ARM Based Device Tree Updates for v4.4" from Andy Gross: * Add DT binding document for SMEM * Add SMD, RPM, and Regulator nodes on MSM8974 * Remove extra reg element from iadc device * Remove redunandant i2c pinctrl properties on APQ8064 * Remove unnecessary eeprom label on IFC6410 * Remove unnecessary eeprom label from QS600 * Add PM8921 RTC support on APQ8064 * Add PM8921 pwrkey support on APQ8064 * Prefix GSBI6 uart pins on APQ8064 correctly * Add missing GSBI7 uart pinctrl on APQ8064 * Add missing GSBI7 uart pinctrl on IFC6410 * Add missing GSBI7 pinctrl uart property on QS600 * Add pwrseq support for WLAN on IFC6410 * Add pwrseq support for WLAN on QS600 * Add notify led support on IFC6410 * Add SD card detect support onQS600 * Add #power-domain-cells property to documentation * Add Qualcomm SMBB binding document * Add PM8941 charge node * Fix typo in disabled property on MSM8974 * tag 'qcom-dt-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm: ARM: dts: msm8974: fix typo in "disabled" property ARM: dts: qcom-pm8941: Add charger node dt-binding: power: Add Qualcomm SMBB binding arm: dts: qcom: Add #power-domain-cells property ARM: dts: qs600: Add SD card detect support. ARM: dts: apq8064-ifc6410: add notify led support. ARM: dts: qs600: add pwrseq support to WLAN ARM: dts: ifc6410: Add pwrseq support for WLAN ARM: dts: qs600: Add missing pinctrl property for gsbi7 uart ARM: dts: ifc6410: Add missing pinctrl to gsbi7 uart ARM: dts: apq8064: add missing gsbi7 uart pinctrl ARM: dts: apq8064: Prefix the gsbi6 uart pins correctly ARM: dts: apq8064: add pm8921 pwrkey support ARM: dts: apq8064: add pm8921 rtc ARM: dts: qs600: remove unnecessary eeprom label ARM: dts: ifc6410: remove unnecessary eeprom label ARM: dts: apq8064: remove redundant i2c pinctrl properties ARM: dts: qcom: Remove extra reg element from iadc device ARM: dts: msm8974: Add smd, rpm and regulator nodes soc: qcom: Add device tree binding for SMEM
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8974.dtsi')
-rw-r--r--arch/arm/boot/dts/qcom-msm8974.dtsi78
1 files changed, 77 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index ab8e57250468..57e6fcab4089 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -114,6 +114,11 @@
<0xf9002000 0x1000>;
};
+ apcs: syscon@f9011000 {
+ compatible = "syscon";
+ reg = <0xf9011000 0x1000>;
+ };
+
timer@f9020000 {
#address-cells = <1>;
#size-cells = <1>;
@@ -228,6 +233,7 @@
compatible = "qcom,gcc-msm8974";
#clock-cells = <1>;
#reset-cells = <1>;
+ #power-domain-cells = <1>;
reg = <0xfc400000 0x4000>;
};
@@ -240,6 +246,7 @@
compatible = "qcom,mmcc-msm8974";
#clock-cells = <1>;
#reset-cells = <1>;
+ #power-domain-cells = <1>;
reg = <0xfd8c0000 0x6000>;
};
@@ -308,7 +315,7 @@
};
blsp_i2c11: i2c@f9967000 {
- status = "disable";
+ status = "disabled";
compatible = "qcom,i2c-qup-v2.1.1";
reg = <0xf9967000 0x1000>;
interrupts = <0 105 IRQ_TYPE_NONE>;
@@ -334,4 +341,73 @@
#interrupt-cells = <4>;
};
};
+
+ smd {
+ compatible = "qcom,smd";
+
+ rpm {
+ interrupts = <0 168 1>;
+ qcom,ipc = <&apcs 8 0>;
+ qcom,smd-edge = <15>;
+
+ rpm_requests {
+ compatible = "qcom,rpm-msm8974";
+ qcom,smd-channels = "rpm_requests";
+
+ pm8841-regulators {
+ compatible = "qcom,rpm-pm8841-regulators";
+
+ pm8841_s1: s1 {};
+ pm8841_s2: s2 {};
+ pm8841_s3: s3 {};
+ pm8841_s4: s4 {};
+ pm8841_s5: s5 {};
+ pm8841_s6: s6 {};
+ pm8841_s7: s7 {};
+ pm8841_s8: s8 {};
+ };
+
+ pm8941-regulators {
+ compatible = "qcom,rpm-pm8941-regulators";
+
+ pm8941_s1: s1 {};
+ pm8941_s2: s2 {};
+ pm8941_s3: s3 {};
+ pm8941_5v: s4 {};
+
+ pm8941_l1: l1 {};
+ pm8941_l2: l2 {};
+ pm8941_l3: l3 {};
+ pm8941_l4: l4 {};
+ pm8941_l5: l5 {};
+ pm8941_l6: l6 {};
+ pm8941_l7: l7 {};
+ pm8941_l8: l8 {};
+ pm8941_l9: l9 {};
+ pm8941_l10: l10 {};
+ pm8941_l11: l11 {};
+ pm8941_l12: l12 {};
+ pm8941_l13: l13 {};
+ pm8941_l14: l14 {};
+ pm8941_l15: l15 {};
+ pm8941_l16: l16 {};
+ pm8941_l17: l17 {};
+ pm8941_l18: l18 {};
+ pm8941_l19: l19 {};
+ pm8941_l20: l20 {};
+ pm8941_l21: l21 {};
+ pm8941_l22: l22 {};
+ pm8941_l23: l23 {};
+ pm8941_l24: l24 {};
+
+ pm8941_lvs1: lvs1 {};
+ pm8941_lvs2: lvs2 {};
+ pm8941_lvs3: lvs3 {};
+
+ pm8941_5vs1: 5vs1 {};
+ pm8941_5vs2: 5vs2 {};
+ };
+ };
+ };
+ };
};

Privacy Policy