Add support to power the port VBUS via host controlled regulators since
some embedded hub PCB designs don't connect the dedicated USB hub port
power GPIO accordingly.
To support the above use-case the USB_PORT_FEAT_POWER port feature
handling must be added. At the moment this feature is limited to the
following hubs:
- usb424,2412
- usb424,2414
- usb424,2417.
Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
---
drivers/usb/misc/onboard_usb_dev.c | 63 ++++++++++++++++++++++++++++++++++++++
drivers/usb/misc/onboard_usb_dev.h | 2 ++
2 files changed, 65 insertions(+)
diff --git a/drivers/usb/misc/onboard_usb_dev.c b/drivers/usb/misc/onboard_usb_dev.c
index f61de2c353d0..f8ca6ef9956b 100644
--- a/drivers/usb/misc/onboard_usb_dev.c
+++ b/drivers/usb/misc/onboard_usb_dev.c
@@ -36,6 +36,8 @@ static DECLARE_WORK(attach_usb_driver_work, onboard_dev_attach_usb_driver);
/************************** Platform driver **************************/
+#define MAX_DOWNSTREAM_PORTS 7
+
struct usbdev_node {
struct usb_device *udev;
struct list_head list;
@@ -52,6 +54,7 @@ struct onboard_dev {
struct list_head udev_list;
struct mutex lock;
struct clk *clk;
+ struct regulator *ext_vbus_supplies[MAX_DOWNSTREAM_PORTS];
};
static int onboard_dev_get_regulators(struct onboard_dev *onboard_dev)
@@ -212,6 +215,48 @@ static int onboard_dev_add_usbdev(struct onboard_dev *onboard_dev,
return err;
}
+static int onboard_dev_port_power(struct onboard_dev *onboard_dev, int port1,
+ bool enable)
+{
+ struct regulator *vbus_supply;
+
+ vbus_supply = onboard_dev->ext_vbus_supplies[port1 - 1];
+
+ /* External supplies are optional */
+ if (!vbus_supply)
+ return 0;
+
+ if (enable)
+ return regulator_enable(vbus_supply);
+
+ return regulator_disable(vbus_supply);
+}
+
+static int onboard_dev_add_ext_vbus_supplies(struct onboard_dev *onboard_dev)
+{
+ struct device *dev = onboard_dev->dev;
+ unsigned int i;
+
+ if (!onboard_dev->pdata->support_ext_vbus_supplies)
+ return 0;
+
+ for (i = 0; i < MAX_DOWNSTREAM_PORTS; i++) {
+ char *supply_name = "portX-vbus";
+ struct regulator *reg;
+
+ sprintf(supply_name, "port%u-vbus", i + 1);
+ reg = devm_regulator_get_optional(dev, supply_name);
+ if (!IS_ERR(reg)) {
+ onboard_dev->ext_vbus_supplies[i] = reg;
+ } else {
+ if (PTR_ERR(reg) != -ENODEV)
+ return PTR_ERR(reg);
+ }
+ }
+
+ return 0;
+}
+
static void onboard_dev_remove_usbdev(struct onboard_dev *onboard_dev,
const struct usb_device *udev)
{
@@ -339,6 +384,10 @@ static int onboard_dev_probe(struct platform_device *pdev)
if (err)
return err;
+ err = onboard_dev_add_ext_vbus_supplies(onboard_dev);
+ if (err)
+ return err;
+
/*
* The USB driver might have been detached from the USB devices by
* onboard_dev_remove() (e.g. through an 'unbind' by userspace),
@@ -525,7 +574,21 @@ static struct usb_device_driver onboard_dev_usbdev_driver = {
int onboard_dev_port_feature(struct usb_device *udev, bool set,
int feature, int port1)
{
+ struct device *dev = &udev->dev;
+ struct onboard_dev *onboard_dev;
+
+ if (!dev->of_node)
+ return 0;
+
+ onboard_dev = _find_onboard_dev(dev);
+ if (IS_ERR(onboard_dev))
+ return 0;
+
switch (feature) {
+ case USB_PORT_FEAT_POWER:
+ if (!onboard_dev->pdata->is_hub)
+ return -EINVAL;
+ return onboard_dev_port_power(onboard_dev, port1, set);
default:
return 0;
}
diff --git a/drivers/usb/misc/onboard_usb_dev.h b/drivers/usb/misc/onboard_usb_dev.h
index fbba549c0f47..e828bfe006ba 100644
--- a/drivers/usb/misc/onboard_usb_dev.h
+++ b/drivers/usb/misc/onboard_usb_dev.h
@@ -13,6 +13,7 @@ struct onboard_dev_pdata {
unsigned int num_supplies; /* number of supplies */
const char * const supply_names[MAX_SUPPLIES];
bool is_hub;
+ bool support_ext_vbus_supplies;
};
static const struct onboard_dev_pdata microchip_usb424_data = {
@@ -20,6 +21,7 @@ static const struct onboard_dev_pdata microchip_usb424_data = {
.num_supplies = 1,
.supply_names = { "vdd" },
.is_hub = true,
+ .support_ext_vbus_supplies = true,
};
static const struct onboard_dev_pdata microchip_usb5744_data = {
--
2.39.2
