diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-10 12:56:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-10 12:56:01 -0700 |
| commit | 4cd8dfc38f7eb1fa13ac7b5d6db1609a263f65f3 (patch) | |
| tree | c36a857a86208f079a34d31ee0fab26ecf3df723 | |
| parent | 8819c4f24558602acf31c05a774e716da21df62f (diff) | |
| parent | 21d3a216982fce880a04fcdeee8e1247c5c179e0 (diff) | |
Merge "ARM: dts: msm: Enable DP DM pulsing support on MSM8996"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-cdp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-mtp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996.dtsi | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi index 3988953f6963..968d5190a8d3 100644 --- a/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi @@ -790,6 +790,10 @@ qcom,check-for-float; }; +&qusb_phy0 { + qcom,enable-dpdm-pulsing; +}; + &usb2s { status = "disabled"; dwc3@7600000 { diff --git a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi index 38f3715973cd..f923d70848ce 100644 --- a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi @@ -514,6 +514,10 @@ qcom,check-for-float; }; +&qusb_phy0 { + qcom,enable-dpdm-pulsing; +}; + &i2c_7 { smb1351-charger@1d { compatible = "qcom,smb1351-charger"; diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi index fd49714e2a5c..62abceb7b5b1 100644 --- a/arch/arm/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996.dtsi @@ -2177,7 +2177,6 @@ phy_type= "utmi"; qcom,phy-clk-scheme = "cmos"; qcom,major-rev = <1>; - qcom,enable-dpdm-pulsing; clocks = <&clock_gcc clk_gcc_usb_phy_cfg_ahb2phy_clk>, <&clock_gcc clk_ln_bb_clk>; |