From 9caaa1febf728bb9834ca7fc7eafe5275e4d79db Mon Sep 17 00:00:00 2001
From: Bulbul Dabi <bdabi@codeaurora.org>
Date: Wed, 30 Mar 2016 19:03:48 +0530
Subject: [PATCH] ARM: dts: msm: Enable type-c charging with floating chargers
This change also enables type-c charging with regular SDPs, hence
don't use faulty type-c to stdA cables that report high current
capability.
Change-Id: Ic8094edb7a2fa95db6c0a65303d25a2c3558195e
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
---
arch/arm/boot/dts/qcom/msm-pmi8950.dtsi | 1 +
arch/arm/boot/dts/qcom/msm8952.dtsi | 2 +-
drivers/usb/phy/phy-msm-usb.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi b/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi
index 0b240eb96382..3572f720fb80 100644
--- a/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pmi8950.dtsi
@@ -192,6 +192,7 @@
#address-cells = <1>;
#size-cells = <1>;
+ qcom,override-usb-current;
qcom,iterm-ma = <100>;
qcom,float-voltage-mv = <4200>;
qcom,resume-delta-mv = <200>;
diff --git a/arch/arm/boot/dts/qcom/msm8952.dtsi b/arch/arm/boot/dts/qcom/msm8952.dtsi
index 696b12a6b9f3..b92791d02607 100644
--- a/arch/arm/boot/dts/qcom/msm8952.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8952.dtsi
@@ -1175,7 +1175,7 @@
qcom,phy-dvdd-always-on;
qcom,boost-sysclk-with-streaming;
qcom,axi-prefetch-enable;
- qcom,enable-sdp-typec-current-limit;
+ qcom,floated-charger-enable = <1>;
qcom,msm-bus,name = "usb2";
qcom,msm-bus,num-cases = <3>;
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 16f237be0130..b4e49f229667 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -4353,6 +4353,7 @@ static void msm_otg_set_vbus_state(int online)
return;
} else {
pr_debug("PMIC: BSV clear\n");
+ motg->typec_current_max = 0;
msm_otg_dbg_log_event(&motg->phy, "PMIC: BSV CLEAR",
init, motg->inputs);
motg->is_ext_chg_detected = false;
--
GitLab