@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <clk.h>
#include <dm.h>
#include "ohci.h"
@@ -14,18 +15,66 @@
struct generic_ohci {
ohci_t ohci;
+ struct clk *clocks;
+ int clock_count;
};
static int ohci_usb_probe(struct udevice *dev)
{
struct ohci_regs *regs = (struct ohci_regs *)devfdt_get_addr(dev);
+ struct generic_ohci *priv = dev_get_priv(dev);
+ int i, err, ret, clock_nb;
- return ohci_register(dev, regs);
+ err = 0;
+ priv->clock_count = 0;
+ clock_nb = clk_count(dev);
+
+ if (clock_nb) {
+ priv->clocks = devm_kmalloc(dev, sizeof(struct clk) * clock_nb,
+ GFP_KERNEL);
+ if (!priv->clocks) {
+ error("Can't allocate resource\n");
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < clock_nb; i++) {
+ err = clk_get_by_index(dev, i, &priv->clocks[i]);
+ if (err < 0)
+ break;
+
+ priv->clock_count++;
+
+ if (clk_enable(&priv->clocks[i])) {
+ error("failed to enable clock %d\n", i);
+ clk_free(&priv->clocks[i]);
+ goto clk_err;
+ }
+ clk_free(&priv->clocks[i]);
+ }
+ }
+
+ err = ohci_register(dev, regs);
+ if (!err)
+ return err;
+
+clk_err:
+ ret = clk_disable_all(priv->clocks, priv->clock_count);
+ if (ret)
+ return ret;
+
+ return err;
}
static int ohci_usb_remove(struct udevice *dev)
{
- return ohci_deregister(dev);
+ struct generic_ohci *priv = dev_get_priv(dev);
+ int ret;
+
+ ret = ohci_deregister(dev);
+ if (ret)
+ return ret;
+
+ return clk_disable_all(priv->clocks, priv->clock_count);
}
static const struct udevice_id ohci_usb_ids[] = {