48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From: Ondrej Jirman <megous@megous.com>
|
|
Date: Sun, 7 Nov 2021 19:28:27 +0100
|
|
Subject: [PATCH 26/36] usb: typec: fusb302: Set the current before enabling
|
|
pullups
|
|
|
|
This seems more reasonable and should avoid short period of incorrect
|
|
current setting being applied to CC pin.
|
|
|
|
Signed-off-by: Ondrej Jirman <megous@megous.com>
|
|
---
|
|
drivers/usb/typec/tcpm/fusb302.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
|
|
index 72f9001..776a949 100644
|
|
--- a/drivers/usb/typec/tcpm/fusb302.c
|
|
+++ b/drivers/usb/typec/tcpm/fusb302.c
|
|
@@ -635,6 +635,14 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
|
|
goto done;
|
|
}
|
|
|
|
+ /* adjust current for SRC */
|
|
+ ret = fusb302_set_src_current(chip, cc_src_current[cc]);
|
|
+ if (ret < 0) {
|
|
+ fusb302_log(chip, "cannot set src current %s, ret=%d",
|
|
+ typec_cc_status_name[cc], ret);
|
|
+ goto done;
|
|
+ }
|
|
+
|
|
ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
|
|
switches0_mask, switches0_data);
|
|
if (ret < 0) {
|
|
@@ -645,14 +653,6 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
|
|
chip->cc1 = TYPEC_CC_OPEN;
|
|
chip->cc2 = TYPEC_CC_OPEN;
|
|
|
|
- /* adjust current for SRC */
|
|
- ret = fusb302_set_src_current(chip, cc_src_current[cc]);
|
|
- if (ret < 0) {
|
|
- fusb302_log(chip, "cannot set src current %s, ret=%d",
|
|
- typec_cc_status_name[cc], ret);
|
|
- goto done;
|
|
- }
|
|
-
|
|
/* enable/disable interrupts, BC_LVL for SNK and COMP_CHNG for SRC */
|
|
switch (cc) {
|
|
case TYPEC_CC_RP_DEF:
|