NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "usb: common: usb-conn-gpio: Set last role to unknown before initial detection"

Browse source 
[ Upstream commit df49f2a0ac4a34c0cb4b5c233fcfa0add644c43c ]

This reverts commit edd60d24bd858cef165274e4cd6cab43bdc58d15.

Heikki reports that this should not be a global flag just to work around
one broken driver and should be fixed differently, so revert it.

Reported-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Fixes: edd60d24bd85 ("usb: common: usb-conn-gpio: Set last role to unknown before initial detection")
Link: https://lore.kernel.org/r/ZImE4L3YgABnCIsP@kuha.fi.intel.com
Cc: Prashanth K <quic_prashk@quicinc.com>
Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Greg Kroah-Hartman 2023-06-15 11:30:35 +02:00
parent 22b1e2af69
commit e348173400
5 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/usb/cdns3/core.c
View file

@ -252,8 +252,6 @@ static enum usb_role cdns_hw_role_state_machine(struct cdns *cdns)
if (!vbus) if (!vbus)
role = USB_ROLE_NONE; role = USB_ROLE_NONE;
break; break;
default:
break;
} }
dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role); dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role);

3
drivers/usb/common/usb-conn-gpio.c
View file

@ -257,9 +257,6 @@ static int usb_conn_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
device_set_wakeup_capable(&pdev->dev, true); device_set_wakeup_capable(&pdev->dev, true);
/* Set last role to unknown before performing the initial detection */
info->last_role = USB_ROLE_UNKNOWN;
/* Perform initial detection */ /* Perform initial detection */
usb_conn_queue_dwork(info, 0); usb_conn_queue_dwork(info, 0);

2
drivers/usb/musb/jz4740.c
View file

@ -91,8 +91,6 @@ static int jz4740_musb_role_switch_set(struct usb_role_switch *sw,
case USB_ROLE_HOST: case USB_ROLE_HOST:
atomic_notifier_call_chain(&phy->notifier, USB_EVENT_ID, phy); atomic_notifier_call_chain(&phy->notifier, USB_EVENT_ID, phy);
break; break;
default:
break;
} }
return 0; return 0;

2
drivers/usb/roles/intel-xhci-usb-role-switch.c
View file

@ -97,8 +97,6 @@ static int intel_xhci_usb_set_role(struct usb_role_switch *sw,
val |= SW_VBUS_VALID; val |= SW_VBUS_VALID;
drd_config = DRD_CONFIG_STATIC_DEVICE; drd_config = DRD_CONFIG_STATIC_DEVICE;
break; break;
default:
break;
} }
val |= SW_IDPIN_EN; val |= SW_IDPIN_EN;
if (data->enable_sw_switch) { if (data->enable_sw_switch) {

1
include/linux/usb/role.h
View file

@ -11,7 +11,6 @@ enum usb_role {
USB_ROLE_NONE, USB_ROLE_NONE,
USB_ROLE_HOST, USB_ROLE_HOST,
USB_ROLE_DEVICE, USB_ROLE_DEVICE,
USB_ROLE_UNKNOWN,
}; };
typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw, typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw,