summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-03-06 20:57:53 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-06 20:57:53 -0800
commit83efda84fc680d6ca3cafff28901191171a0dc59 (patch)
treecf265cf1af4825f6634223fb8dabf760f234d8ad
parent2ad3d8cb644fb172dc4c2ceb18824cb4647fd5b7 (diff)
parenta1ef93ac8d891032a7b2a3ceec4795e2deb45d7a (diff)
Merge "ARM: dts: msm: Disable usb phy by default on msm8996 vplatform"
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts8
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts12
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts8
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi3
4 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts
index fd04dcf41c73..30a45a5899b0 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts
@@ -105,3 +105,11 @@
status = "okay";
qcom,no-wakeup-src-in-hostmode;
};
+
+&qusb_phy0 {
+ status = "okay";
+};
+
+&ssphy {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts
index 908054911313..e2b4ae1310bc 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts
@@ -85,3 +85,15 @@
&usb2s {
status = "okay";
};
+
+&qusb_phy0 {
+ status = "okay";
+};
+
+&qusb_phy1 {
+ status = "okay";
+};
+
+&ssphy {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts
index d52275e5a244..0fc629e960c4 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts
@@ -190,3 +190,11 @@
status = "okay";
qcom,no-wakeup-src-in-hostmode;
};
+
+&qusb_phy0 {
+ status = "okay";
+};
+
+&ssphy {
+ status = "okay";
+};
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 764a79ec4a73..b7ede0adbf19 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi
@@ -243,6 +243,7 @@
resets = <&clock_virt QUSB2PHY_PRIM_BCR>;
reset-names = "phy_reset";
+ status = "disabled";
};
qusb_phy1: qusb@7412000 {
@@ -280,6 +281,7 @@
resets = <&clock_virt QUSB2PHY_SEC_BCR>;
reset-names = "phy_reset";
+ status = "disabled";
};
ssphy: ssphy@7410000 {
@@ -369,6 +371,7 @@
<&clock_virt USB3PHY_PHY_BCR>;
reset-names = "phy_reset", "phy_phy_reset";
qcom,disable-autonomous-mode;
+ status = "disabled";
};
usb_nop_phy: usb_nop_phy {