From: Benjamin Bara <benjamin.bara@xxxxxxxxxxx>
As some of the onboard hubs require multiple power supplies, provide the
environment to support them.
Signed-off-by: Benjamin Bara <benjamin.bara@xxxxxxxxxxx>
---
drivers/usb/misc/onboard_usb_hub.c | 40 ++++++++++++++++++++++++++++----------
drivers/usb/misc/onboard_usb_hub.h | 1 +
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c
index 94006714c273..79ba9d8a8fef 100644
--- a/drivers/usb/misc/onboard_usb_hub.c
+++ b/drivers/usb/misc/onboard_usb_hub.c
@@ -27,6 +27,12 @@
#include "onboard_usb_hub.h"
+#define SUPPLIES_NUM_MAX 2
+static const char * const supply_names[] = {
+ "vdd",
+ "vdd2",
+};
+
static void onboard_hub_attach_usb_driver(struct work_struct *work);
static struct usb_device_driver onboard_hub_usbdev_driver;
@@ -40,7 +46,8 @@ struct usbdev_node {
};
struct onboard_hub {
- struct regulator *vdd;
+ struct regulator_bulk_data supplies[SUPPLIES_NUM_MAX];
+ unsigned int supplies_num;
struct device *dev;
const struct onboard_hub_pdata *pdata;
struct gpio_desc *reset_gpio;
@@ -55,9 +62,9 @@ static int onboard_hub_power_on(struct onboard_hub *hub)
{
int err;
- err = regulator_enable(hub->vdd);
- if (err) {
- dev_err(hub->dev, "failed to enable regulator: %d\n", err);
+ err = regulator_bulk_enable(hub->supplies_num, hub->supplies);
+ if (err != 0) {
+ dev_err(hub->dev, "failed to enable supplies: %d\n", err);
return err;
}
@@ -75,9 +82,9 @@ static int onboard_hub_power_off(struct onboard_hub *hub)
gpiod_set_value_cansleep(hub->reset_gpio, 1);
- err = regulator_disable(hub->vdd);
- if (err) {
- dev_err(hub->dev, "failed to disable regulator: %d\n", err);
+ err = regulator_bulk_disable(hub->supplies_num, hub->supplies);
+ if (err != 0) {
+ dev_err(hub->dev, "failed to disable supplies: %d\n", err);
return err;
}
@@ -232,6 +239,7 @@ static int onboard_hub_probe(struct platform_device *pdev)
const struct of_device_id *of_id;
struct device *dev = &pdev->dev;
struct onboard_hub *hub;
+ unsigned int i;
int err;
hub = devm_kzalloc(dev, sizeof(*hub), GFP_KERNEL);
@@ -246,9 +254,21 @@ static int onboard_hub_probe(struct platform_device *pdev)
if (!hub->pdata)
return -EINVAL;
- hub->vdd = devm_regulator_get(dev, "vdd");
- if (IS_ERR(hub->vdd))
- return PTR_ERR(hub->vdd);
+ if (hub->pdata->supplies_num > SUPPLIES_NUM_MAX)
+ return dev_err_probe(dev, -EINVAL, "max %d supplies supported!\n",
+ SUPPLIES_NUM_MAX);
+ hub->supplies_num = 1;
+ if (hub->pdata->supplies_num > 1)
+ hub->supplies_num = hub->pdata->supplies_num;
+
+ for (i = 0; i < SUPPLIES_NUM_MAX; i++)
+ hub->supplies[i].supply = supply_names[i];
+
+ err = devm_regulator_bulk_get(dev, hub->supplies_num, hub->supplies);
+ if (err) {
+ dev_err(dev, "Failed to get regulator supplies: %d\n", err);
+ return err;
+ }
hub->reset_gpio = devm_gpiod_get_optional(dev, "reset",
GPIOD_OUT_HIGH);
diff --git a/drivers/usb/misc/onboard_usb_hub.h b/drivers/usb/misc/onboard_usb_hub.h
index ff8925aa6d3a..955aaaf1c31c 100644
--- a/drivers/usb/misc/onboard_usb_hub.h
+++ b/drivers/usb/misc/onboard_usb_hub.h
@@ -8,6 +8,7 @@
struct onboard_hub_pdata {
unsigned long reset_us; /* reset pulse width in us */
+ unsigned int supplies_num; /* num of supplies: 0 considered as 1 */
};
static const struct onboard_hub_pdata microchip_usb424_data = {
--
2.34.1
