renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

usb: common: usb-conn-gpio: Make VBUS supply completely optional

Browse Source 
It makes sense that if the USB connector is a child of an USB port
providing VBUS supply, there is no need to do it again.
But this does not handle the case where VBUS is controlled by PWR from
USB host controller, without any regulator at all.
Support this by making VBUS pure optional.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20220309093842.113260-1-alexander.stein@ew.tq-group.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Stein 2022-03-09 10:38:42 +01:00 committed by Greg Kroah-Hartman
parent b07cabb836
commit d790a9db91
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/usb/common/usb-conn-gpio.c
View File

@ -175,7 +175,6 @@ static int usb_conn_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct usb_conn_info *info;
bool need_vbus = true;
int ret = 0;
info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL);
@ -205,22 +204,9 @@ static int usb_conn_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&info->dw_det, usb_conn_detect_cable);
/*
* If the USB connector is a child of a USB port and that port already provides the VBUS
* supply, there's no need for the USB connector to provide it again.
*/
if (dev->parent && dev->parent->of_node) {
if (of_find_property(dev->parent->of_node, "vbus-supply", NULL))
need_vbus = false;
}
if (!need_vbus) {
info->vbus = devm_regulator_get_optional(dev, "vbus");
if (PTR_ERR(info->vbus) == -ENODEV)
info->vbus = NULL;
} else {
info->vbus = devm_regulator_get(dev, "vbus");
}
info->vbus = devm_regulator_get_optional(dev, "vbus");
if (PTR_ERR(info->vbus) == -ENODEV)
info->vbus = NULL;
if (IS_ERR(info->vbus)) {
ret = PTR_ERR(info->vbus);