summaryrefslogtreecommitdiffstats
path: root/arch/arm64
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/arm64
parent5078f77e14431efbfacd541c563b101bd6a99d75 (diff)
parent04edde250c3753798475f0a4dc0275dd52f707bd (diff)
downloadtalos-obmc-linux-d819e7a7524fe0f43591b7c274685f6e66e48342.tar.gz
talos-obmc-linux-d819e7a7524fe0f43591b7c274685f6e66e48342.zip
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/arm64')
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 5911de008dd5..ac006e895e08 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -99,6 +99,7 @@
compatible = "qcom,gcc-msm8916";
#clock-cells = <1>;
#reset-cells = <1>;
+ #power-domain-cells = <1>;
reg = <0x1800000 0x80000>;
};
OpenPOWER on IntegriCloud