openstlinux/uboot-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: host: ehci-generic: Make usage of clock/reset bulk() API

Browse Source 
Make usage of clock and reset bulk API in order to simplify the code

[Backport of ba96176ab7 ("usb: host: ehci-generic: Make usage of
 clock/reset bulk() API")]

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Change-Id: Ia5711b14a17cf1d042bdab9d3f28437d5c53272c
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/u-boot/+/246747
Reviewed-by: CITOOLS <MDG-smet-aci-reviews@list.st.com>
Reviewed-by: Patrick DELAUNAY <patrick.delaunay@foss.st.com>
Tested-by: Patrick DELAUNAY <patrick.delaunay@foss.st.com>
This commit is contained in:
Patrice Chotard
2022-04-01 15:17:53 +02:00
committed by Patrick Delaunay
parent 7a250cc251
commit ab40d97399
1 changed files with 27 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
drivers/usb/host/ehci-generic.c
View File

@ -23,14 +23,12 @@
*/
struct generic_ehci {
struct ehci_ctrl ctrl;
struct clk *clocks;
struct reset_ctl *resets;
struct clk_bulk clocks;
struct reset_ctl_bulk resets;
struct phy phy;
#ifdef CONFIG_DM_REGULATOR
struct udevice *vbus_supply;
#endif
int clock_count;
int reset_count;
};
#ifdef CONFIG_DM_REGULATOR
@ -81,68 +79,31 @@ static int ehci_usb_probe(struct udevice *dev)
struct generic_ehci *priv = dev_get_priv(dev);
struct ehci_hccr *hccr;
struct ehci_hcor *hcor;
int i, err, ret, clock_nb, reset_nb;
int err, ret;
err = 0;
priv->clock_count = 0;
clock_nb = ofnode_count_phandle_with_args(dev_ofnode(dev), "clocks",
"#clock-cells", 0);
if (clock_nb > 0) {
priv->clocks = devm_kcalloc(dev, clock_nb, sizeof(struct clk),
GFP_KERNEL);
if (!priv->clocks)
return -ENOMEM;
for (i = 0; i < clock_nb; i++) {
err = clk_get_by_index(dev, i, &priv->clocks[i]);
if (err < 0)
break;
err = clk_enable(&priv->clocks[i]);
if (err && err != -ENOSYS) {
dev_err(dev, "failed to enable clock %d\n", i);
clk_free(&priv->clocks[i]);
goto clk_err;
}
priv->clock_count++;
}
} else {
if (clock_nb != -ENOENT) {
dev_err(dev, "failed to get clock phandle(%d)\n",
clock_nb);
return clock_nb;
}
ret = clk_get_bulk(dev, &priv->clocks);
if (ret) {
dev_err(dev, "Failed to get clocks\n");
return ret;
}
priv->reset_count = 0;
reset_nb = ofnode_count_phandle_with_args(dev_ofnode(dev), "resets",
"#reset-cells", 0);
if (reset_nb > 0) {
priv->resets = devm_kcalloc(dev, reset_nb,
sizeof(struct reset_ctl),
GFP_KERNEL);
if (!priv->resets)
return -ENOMEM;
err = clk_enable_bulk(&priv->clocks);
if (err) {
dev_err(dev, "Failed to enable clocks\n");
goto clk_err;
}
for (i = 0; i < reset_nb; i++) {
err = reset_get_by_index(dev, i, &priv->resets[i]);
if (err < 0)
break;
err = reset_get_bulk(dev, &priv->resets);
if (err) {
dev_err(dev, "Failed to get resets\n");
goto clk_err;
}
if (reset_deassert(&priv->resets[i])) {
dev_err(dev, "failed to deassert reset %d\n",
i);
reset_free(&priv->resets[i]);
goto reset_err;
}
priv->reset_count++;
}
} else {
if (reset_nb != -ENOENT) {
dev_err(dev, "failed to get reset phandle(%d)\n",
reset_nb);
goto clk_err;
}
err = reset_deassert_bulk(&priv->resets);
if (err) {
dev_err(dev, "Failed to get deassert resets\n");
goto reset_err;
}
err = ehci_enable_vbus_supply(dev);
@ -174,13 +135,13 @@ regulator_err:
dev_err(dev, "failed to disable VBUS supply\n");
reset_err:
ret = reset_release_all(priv->resets, priv->reset_count);
ret = reset_release_bulk(&priv->resets);
if (ret)
dev_err(dev, "failed to assert all resets\n");
dev_err(dev, "failed to release resets\n");
clk_err:
ret = clk_release_all(priv->clocks, priv->clock_count);
ret = clk_release_bulk(&priv->clocks);
if (ret)
dev_err(dev, "failed to disable all clocks\n");
dev_err(dev, "failed to release clocks\n");
return err;
}
@ -202,11 +163,11 @@ static int ehci_usb_remove(struct udevice *dev)
if (ret)
return ret;
ret = reset_release_all(priv->resets, priv->reset_count);
ret = reset_release_bulk(&priv->resets);
if (ret)
return ret;
return clk_release_all(priv->clocks, priv->clock_count);
return clk_release_bulk(&priv->clocks);
}
static const struct udevice_id ehci_usb_ids[] = {