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

Revert "usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS"

Browse Source 
This reverts commit 4953207927 which is
commit 4d27afbf256028a1f54363367f30efc8854433c3 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I6b743cfeb8ce98af2f957100d6a32ab4ea4bf515
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-03-07 09:49:56 +00:00
parent 66c6868930
commit 44b6a8ed8f
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/typec/tcpm/tcpci.c
View File

@@ -341,8 +341,7 @@ static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable)
}
static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
bool pps_active, u32 requested_vbus_voltage_mv,
u32 apdo_min_voltage_mv)
bool pps_active, u32 requested_vbus_voltage_mv)
{
struct tcpci *tcpci = tcpc_to_tcpci(dev);
unsigned int pwr_ctrl, threshold = 0;

3
drivers/usb/typec/tcpm/tcpm.c
View File

@@ -2353,8 +2353,7 @@ static int tcpm_set_auto_vbus_discharge_threshold(struct tcpm_port *port,
else
voltage = requested_vbus_voltage;
ret = port->tcpc->set_auto_vbus_discharge_threshold(port->tcpc, mode, pps_active, voltage,
port->pps_data.min_volt);
ret = port->tcpc->set_auto_vbus_discharge_threshold(port->tcpc, mode, pps_active, voltage);
tcpm_log_force(port,
"set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u pps_apdo_min_volt:%u ret:%d",
mode, pps_active ? 'y' : 'n', requested_vbus_voltage,

3
include/linux/usb/tcpm.h
View File

@@ -150,8 +150,7 @@ struct tcpc_dev {
void (*frs_sourcing_vbus)(struct tcpc_dev *dev);
int (*enable_auto_vbus_discharge)(struct tcpc_dev *dev, bool enable);
int (*set_auto_vbus_discharge_threshold)(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
bool pps_active, u32 requested_vbus_voltage,
u32 pps_apdo_min_voltage);
bool pps_active, u32 requested_vbus_voltage);
bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);
void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);
void (*check_contaminant)(struct tcpc_dev *dev);