summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-12-18 02:51:49 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-12-18 02:51:48 -0800
commit9c95fa921521fefafbe3a7f87d42c04e65e1b1a8 (patch)
tree9ef8b737962b27b12171cc77739bc9535b55753d
parent06345e29b3483a4933ba7c0b36c2664ed7b610db (diff)
parentc027a4684119c57042a9d7a1b3ab81f48977ee08 (diff)
Merge "Revert "ARM: dts: msm: Disable runtime PM in host mode for automotive""
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi1
3 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index b2f9becfff35..20b5103496c5 100644
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -1465,7 +1465,6 @@
&usb2s {
status = "ok";
qcom,no-wakeup-src-in-hostmode;
- qcom,disable-host-mode-pm;
};
&usb3 {
@@ -1474,7 +1473,6 @@
vdda33-supply = <&pm8994_l24>;
vdda18-supply = <&pm8994_l12>;
qcom,no-wakeup-src-in-hostmode;
- qcom,disable-host-mode-pm;
};
&blsp1_uart2 {
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index 859bbfd6012f..0500ce178b23 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -1296,7 +1296,6 @@
status = "ok";
vbus_dwc3-supply = <&usb2_otg_switch>;
qcom,no-wakeup-src-in-hostmode;
- qcom,disable-host-mode-pm;
dwc3@7600000 {
dr_mode = "host";
};
@@ -1308,7 +1307,6 @@
vdda33-supply = <&pm8994_l24>;
vdda18-supply = <&pm8994_l12>;
qcom,no-wakeup-src-in-hostmode;
- qcom,disable-host-mode-pm;
};
&blsp1_uart2 {
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi
index faaf00b6ac25..b7505743986e 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi
@@ -88,7 +88,6 @@
resets = <&clock_virt USB_30_BCR>;
reset-names = "core_reset";
- qcom,disable-host-mode-pm;
dwc3@6a00000 {
compatible = "snps,dwc3";