Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: misc: onboard_hub: use device supply names

Browse Source 
The current implementation uses generic names for the power supplies,
which conflicts with proper name definitions in the device bindings.

Add a per-device property to include real supply names and keep generic
names for existing devices to keep backward compatibility.

Acked-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Javier Carrasco <javier.carrasco@wolfvision.net>
Link: https://lore.kernel.org/r/20240325-onboard_xvf3500-v8-1-29e3f9222922@wolfvision.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Javier Carrasco 2024-03-25 10:15:11 +01:00 committed by Greg Kroah-Hartman
parent 47870badf3
commit ec1848cd5d
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/usb/misc/onboard_usb_hub.c
View File

@ -29,17 +29,6 @@
#include "onboard_usb_hub.h"
/*
* Use generic names, as the actual names might differ between hubs. If a new
* hub requires more than the currently supported supplies, add a new one here.
*/
static const char * const supply_names[] = {
"vdd",
"vdd2",
};
#define MAX_SUPPLIES ARRAY_SIZE(supply_names)
static void onboard_hub_attach_usb_driver(struct work_struct *work);
static struct usb_device_driver onboard_hub_usbdev_driver;
@ -65,6 +54,29 @@ struct onboard_hub {
struct clk *clk;
};
static int onboard_hub_get_regulators(struct onboard_hub *hub)
{
const char * const *supply_names = hub->pdata->supply_names;
unsigned int num_supplies = hub->pdata->num_supplies;
struct device *dev = hub->dev;
unsigned int i;
int err;
if (num_supplies > MAX_SUPPLIES)
return dev_err_probe(dev, -EINVAL, "max %d supplies supported!\n",
MAX_SUPPLIES);
for (i = 0; i < num_supplies; i++)
hub->supplies[i].supply = supply_names[i];
err = devm_regulator_bulk_get(dev, num_supplies, hub->supplies);
if (err)
dev_err(dev, "Failed to get regulator supplies: %pe\n",
ERR_PTR(err));
return err;
}
static int onboard_hub_power_on(struct onboard_hub *hub)
{
int err;
@ -253,7 +265,6 @@ static int onboard_hub_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct onboard_hub *hub;
unsigned int i;
int err;
hub = devm_kzalloc(dev, sizeof(*hub), GFP_KERNEL);
@ -264,18 +275,11 @@ static int onboard_hub_probe(struct platform_device *pdev)
if (!hub->pdata)
return -EINVAL;
if (hub->pdata->num_supplies > MAX_SUPPLIES)
return dev_err_probe(dev, -EINVAL, "max %zu supplies supported!\n",
MAX_SUPPLIES);
hub->dev = dev;
for (i = 0; i < hub->pdata->num_supplies; i++)
hub->supplies[i].supply = supply_names[i];
err = devm_regulator_bulk_get(dev, hub->pdata->num_supplies, hub->supplies);
if (err) {
dev_err(dev, "Failed to get regulator supplies: %pe\n", ERR_PTR(err));
err = onboard_hub_get_regulators(hub);
if (err)
return err;
}
hub->clk = devm_clk_get_optional(dev, NULL);
if (IS_ERR(hub->clk))
@ -286,7 +290,6 @@ static int onboard_hub_probe(struct platform_device *pdev)
if (IS_ERR(hub->reset_gpio))
return dev_err_probe(dev, PTR_ERR(hub->reset_gpio), "failed to get reset GPIO\n");
hub->dev = dev;
mutex_init(&hub->lock);
INIT_LIST_HEAD(&hub->udev_list);

13
drivers/usb/misc/onboard_usb_hub.h
View File

@ -6,59 +6,72 @@
#ifndef _USB_MISC_ONBOARD_USB_HUB_H
#define _USB_MISC_ONBOARD_USB_HUB_H
#define MAX_SUPPLIES 2
struct onboard_hub_pdata {
unsigned long reset_us; /* reset pulse width in us */
unsigned int num_supplies; /* number of supplies */
const char * const supply_names[MAX_SUPPLIES];
};
static const struct onboard_hub_pdata microchip_usb424_data = {
.reset_us = 1,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct onboard_hub_pdata microchip_usb5744_data = {
.reset_us = 0,
.num_supplies = 2,
.supply_names = { "vdd", "vdd2" },
};
static const struct onboard_hub_pdata realtek_rts5411_data = {
.reset_us = 0,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct onboard_hub_pdata ti_tusb8020b_data = {
.reset_us = 3000,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct onboard_hub_pdata ti_tusb8041_data = {
.reset_us = 3000,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct onboard_hub_pdata cypress_hx3_data = {
.reset_us = 10000,
.num_supplies = 2,
.supply_names = { "vdd", "vdd2" },
};
static const struct onboard_hub_pdata cypress_hx2vl_data = {
.reset_us = 1,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct onboard_hub_pdata genesys_gl850g_data = {
.reset_us = 3,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct onboard_hub_pdata genesys_gl852g_data = {
.reset_us = 50,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct onboard_hub_pdata vialab_vl817_data = {
.reset_us = 10,
.num_supplies = 1,
.supply_names = { "vdd" },
};
static const struct of_device_id onboard_hub_match[] = {