shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

usb: typec: tcpm: husb311: fix resume reset condition

Browse Source 
Since the BMCIO_OSC_EN bit is enabled automatically when the interrupt
occur whether the power is off or on, replace to TCPC_FILTER reg that
amended by software in husb311_init.

Fixes: f414167ae0 ("usb: typec: husb311: pm process support")

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I5bd0ffa395aae1e007705a791ff03a77ec85034a
This commit is contained in:
Frank Wang
2024-03-14 09:55:16 +08:00
committed by Tao Huang
parent 29eeb19604
commit 4075caf8b5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/typec/tcpm/tcpci_husb311.c
View File

@@ -237,15 +237,18 @@ static int husb311_pm_resume(struct device *dev)
{
struct husb311_chip *chip = dev->driver_data;
int ret = 0;
u8 pwr;
u8 filter;
/*
* When the power of husb311 is lost or i2c read failed in PM S/R
* process, we must reset the tcpm port first to ensure the devices
* can attach again.
*
* The TCPC_FILTER we amended its value to 0x0F in husb311_init, so if
* husb311 powered off in suspend, the value would reset to default.
*/
ret = husb311_read8(chip, HUSB311_TCPC_POWER, &pwr);
if (pwr & BIT(0) || ret < 0) {
ret = husb311_read8(chip, HUSB311_TCPC_FILTER, &filter);
if (filter != 0x0F || ret < 0) {
ret = husb311_sw_reset(chip);
if (ret < 0) {
dev_err(chip->dev, "fail to soft reset, ret = %d\n", ret);