|
@@ -20,22 +20,33 @@
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
|
#if CONFIG_IS_ENABLED(DM_USB)
|
|
|
-
|
|
|
/* USB 2.0 PHY Control */
|
|
|
#define CM_PHY_PWRDN (1 << 0)
|
|
|
#define CM_PHY_OTG_PWRDN (1 << 1)
|
|
|
#define OTGVDET_EN (1 << 19)
|
|
|
#define OTGSESSENDEN (1 << 20)
|
|
|
|
|
|
+#define AM335X_USB0_CTRL 0x0
|
|
|
#define AM335X_USB1_CTRL 0x8
|
|
|
|
|
|
-struct ti_musb_platdata {
|
|
|
- void *base;
|
|
|
- void *ctrl_mod_base;
|
|
|
- struct musb_hdrc_platform_data plat;
|
|
|
- struct musb_hdrc_config musb_config;
|
|
|
- struct omap_musb_board_data otg_board_data;
|
|
|
-};
|
|
|
+static void ti_musb_set_phy_power(struct udevice *dev, u8 on)
|
|
|
+{
|
|
|
+ struct ti_musb_platdata *platdata = dev_get_platdata(dev);
|
|
|
+
|
|
|
+ if (!platdata->ctrl_mod_base)
|
|
|
+ return;
|
|
|
+
|
|
|
+ if (on) {
|
|
|
+ clrsetbits_le32(platdata->ctrl_mod_base,
|
|
|
+ CM_PHY_PWRDN | CM_PHY_OTG_PWRDN,
|
|
|
+ OTGVDET_EN | OTGSESSENDEN);
|
|
|
+ } else {
|
|
|
+ clrsetbits_le32(platdata->ctrl_mod_base, 0,
|
|
|
+ CM_PHY_PWRDN | CM_PHY_OTG_PWRDN);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
|
|
|
static int ti_musb_get_usb_index(int node)
|
|
|
{
|
|
@@ -64,20 +75,6 @@ static int ti_musb_get_usb_index(int node)
|
|
|
return -ENOENT;
|
|
|
}
|
|
|
|
|
|
-static void ti_musb_set_phy_power(struct udevice *dev, u8 on)
|
|
|
-{
|
|
|
- struct ti_musb_platdata *platdata = dev_get_platdata(dev);
|
|
|
-
|
|
|
- if (on) {
|
|
|
- clrsetbits_le32(platdata->ctrl_mod_base,
|
|
|
- CM_PHY_PWRDN | CM_PHY_OTG_PWRDN,
|
|
|
- OTGVDET_EN | OTGSESSENDEN);
|
|
|
- } else {
|
|
|
- clrsetbits_le32(platdata->ctrl_mod_base, 0,
|
|
|
- CM_PHY_PWRDN | CM_PHY_OTG_PWRDN);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
static int ti_musb_ofdata_to_platdata(struct udevice *dev)
|
|
|
{
|
|
|
struct ti_musb_platdata *platdata = dev_get_platdata(dev);
|
|
@@ -86,6 +83,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
|
|
|
int phys;
|
|
|
int ctrl_mod;
|
|
|
int usb_index;
|
|
|
+ struct musb_hdrc_config *musb_config;
|
|
|
|
|
|
platdata->base = (void *)devfdt_get_addr_index(dev, 1);
|
|
|
|
|
@@ -96,38 +94,41 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
|
|
|
switch (usb_index) {
|
|
|
case 1:
|
|
|
platdata->ctrl_mod_base += AM335X_USB1_CTRL;
|
|
|
+ break;
|
|
|
case 0:
|
|
|
+ platdata->ctrl_mod_base += AM335X_USB0_CTRL;
|
|
|
+ break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- platdata->musb_config.multipoint = fdtdec_get_int(fdt, node,
|
|
|
- "mentor,multipoint",
|
|
|
- -1);
|
|
|
- if (platdata->musb_config.multipoint < 0) {
|
|
|
+ musb_config = malloc(sizeof(struct musb_hdrc_config));
|
|
|
+ memset(musb_config, 0, sizeof(struct musb_hdrc_config));
|
|
|
+
|
|
|
+ musb_config->multipoint = fdtdec_get_int(fdt, node,
|
|
|
+ "mentor,multipoint", -1);
|
|
|
+ if (musb_config->multipoint < 0) {
|
|
|
pr_err("MUSB multipoint DT entry missing\n");
|
|
|
return -ENOENT;
|
|
|
}
|
|
|
|
|
|
- platdata->musb_config.dyn_fifo = 1;
|
|
|
+ musb_config->dyn_fifo = 1;
|
|
|
|
|
|
- platdata->musb_config.num_eps = fdtdec_get_int(fdt, node,
|
|
|
- "mentor,num-eps", -1);
|
|
|
- if (platdata->musb_config.num_eps < 0) {
|
|
|
+ musb_config->num_eps = fdtdec_get_int(fdt, node, "mentor,num-eps",
|
|
|
+ -1);
|
|
|
+ if (musb_config->num_eps < 0) {
|
|
|
pr_err("MUSB num-eps DT entry missing\n");
|
|
|
return -ENOENT;
|
|
|
}
|
|
|
|
|
|
- platdata->musb_config.ram_bits = fdtdec_get_int(fdt, node,
|
|
|
- "mentor,ram-bits", -1);
|
|
|
- if (platdata->musb_config.ram_bits < 0) {
|
|
|
+ musb_config->ram_bits = fdtdec_get_int(fdt, node, "mentor,ram-bits",
|
|
|
+ -1);
|
|
|
+ if (musb_config->ram_bits < 0) {
|
|
|
pr_err("MUSB ram-bits DT entry missing\n");
|
|
|
return -ENOENT;
|
|
|
}
|
|
|
|
|
|
- platdata->otg_board_data.set_phy_power = ti_musb_set_phy_power;
|
|
|
- platdata->otg_board_data.dev = dev;
|
|
|
- platdata->plat.config = &platdata->musb_config;
|
|
|
+ platdata->plat.config = musb_config;
|
|
|
|
|
|
platdata->plat.power = fdtdec_get_int(fdt, node, "mentor,power", -1);
|
|
|
if (platdata->plat.power < 0) {
|
|
@@ -136,29 +137,27 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
|
|
|
}
|
|
|
|
|
|
platdata->plat.platform_ops = &musb_dsps_ops;
|
|
|
- platdata->plat.board_data = &platdata->otg_board_data;
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
static int ti_musb_host_probe(struct udevice *dev)
|
|
|
{
|
|
|
struct musb_host_data *host = dev_get_priv(dev);
|
|
|
struct ti_musb_platdata *platdata = dev_get_platdata(dev);
|
|
|
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
|
|
|
- struct omap_musb_board_data *otg_board_data;
|
|
|
int ret;
|
|
|
|
|
|
priv->desc_before_addr = true;
|
|
|
|
|
|
- otg_board_data = &platdata->otg_board_data;
|
|
|
-
|
|
|
host->host = musb_init_controller(&platdata->plat,
|
|
|
- (struct device *)otg_board_data,
|
|
|
+ NULL,
|
|
|
platdata->base);
|
|
|
if (!host->host)
|
|
|
return -EIO;
|
|
|
|
|
|
+ ti_musb_set_phy_power(dev, 1);
|
|
|
ret = musb_lowlevel_init(host);
|
|
|
|
|
|
return ret;
|
|
@@ -169,10 +168,12 @@ static int ti_musb_host_remove(struct udevice *dev)
|
|
|
struct musb_host_data *host = dev_get_priv(dev);
|
|
|
|
|
|
musb_stop(host->host);
|
|
|
+ ti_musb_set_phy_power(dev, 0);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
static int ti_musb_host_ofdata_to_platdata(struct udevice *dev)
|
|
|
{
|
|
|
struct ti_musb_platdata *platdata = dev_get_platdata(dev);
|
|
@@ -190,11 +191,14 @@ static int ti_musb_host_ofdata_to_platdata(struct udevice *dev)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
U_BOOT_DRIVER(ti_musb_host) = {
|
|
|
.name = "ti-musb-host",
|
|
|
.id = UCLASS_USB,
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
.ofdata_to_platdata = ti_musb_host_ofdata_to_platdata,
|
|
|
+#endif
|
|
|
.probe = ti_musb_host_probe,
|
|
|
.remove = ti_musb_host_remove,
|
|
|
.ops = &musb_usb_ops,
|
|
@@ -202,6 +206,82 @@ U_BOOT_DRIVER(ti_musb_host) = {
|
|
|
.priv_auto_alloc_size = sizeof(struct musb_host_data),
|
|
|
};
|
|
|
|
|
|
+#if CONFIG_IS_ENABLED(DM_USB_GADGET)
|
|
|
+struct ti_musb_peripheral {
|
|
|
+ struct musb *periph;
|
|
|
+};
|
|
|
+
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
+static int ti_musb_peripheral_ofdata_to_platdata(struct udevice *dev)
|
|
|
+{
|
|
|
+ struct ti_musb_platdata *platdata = dev_get_platdata(dev);
|
|
|
+ const void *fdt = gd->fdt_blob;
|
|
|
+ int node = dev_of_offset(dev);
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ ret = ti_musb_ofdata_to_platdata(dev);
|
|
|
+ if (ret) {
|
|
|
+ pr_err("platdata dt parse error\n");
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+ platdata->plat.mode = MUSB_PERIPHERAL;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+#endif
|
|
|
+
|
|
|
+int dm_usb_gadget_handle_interrupts(struct udevice *dev)
|
|
|
+{
|
|
|
+ struct ti_musb_peripheral *priv = dev_get_priv(dev);
|
|
|
+
|
|
|
+ priv->periph->isr(0, priv->periph);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static int ti_musb_peripheral_probe(struct udevice *dev)
|
|
|
+{
|
|
|
+ struct ti_musb_peripheral *priv = dev_get_priv(dev);
|
|
|
+ struct ti_musb_platdata *platdata = dev_get_platdata(dev);
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ priv->periph = musb_init_controller(&platdata->plat,
|
|
|
+ NULL,
|
|
|
+ platdata->base);
|
|
|
+ if (!priv->periph)
|
|
|
+ return -EIO;
|
|
|
+
|
|
|
+ ti_musb_set_phy_power(dev, 1);
|
|
|
+ musb_gadget_setup(priv->periph);
|
|
|
+ return usb_add_gadget_udc((struct device *)dev, &priv->periph->g);
|
|
|
+}
|
|
|
+
|
|
|
+static int ti_musb_peripheral_remove(struct udevice *dev)
|
|
|
+{
|
|
|
+ struct ti_musb_peripheral *priv = dev_get_priv(dev);
|
|
|
+
|
|
|
+ usb_del_gadget_udc(&priv->periph->g);
|
|
|
+ ti_musb_set_phy_power(dev, 0);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+U_BOOT_DRIVER(ti_musb_peripheral) = {
|
|
|
+ .name = "ti-musb-peripheral",
|
|
|
+ .id = UCLASS_USB_GADGET_GENERIC,
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
+ .ofdata_to_platdata = ti_musb_peripheral_ofdata_to_platdata,
|
|
|
+#endif
|
|
|
+ .probe = ti_musb_peripheral_probe,
|
|
|
+ .remove = ti_musb_peripheral_remove,
|
|
|
+ .ops = &musb_usb_ops,
|
|
|
+ .platdata_auto_alloc_size = sizeof(struct ti_musb_platdata),
|
|
|
+ .priv_auto_alloc_size = sizeof(struct ti_musb_peripheral),
|
|
|
+ .flags = DM_FLAG_PRE_RELOC,
|
|
|
+};
|
|
|
+#endif
|
|
|
+
|
|
|
+#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
|
static int ti_musb_wrapper_bind(struct udevice *parent)
|
|
|
{
|
|
|
const void *fdt = gd->fdt_blob;
|
|
@@ -222,15 +302,23 @@ static int ti_musb_wrapper_bind(struct udevice *parent)
|
|
|
switch (dr_mode) {
|
|
|
case USB_DR_MODE_PERIPHERAL:
|
|
|
/* Bind MUSB device */
|
|
|
+ ret = device_bind_driver_to_node(parent,
|
|
|
+ "ti-musb-peripheral",
|
|
|
+ name,
|
|
|
+ offset_to_ofnode(node),
|
|
|
+ &dev);
|
|
|
+ if (ret)
|
|
|
+ pr_err("musb - not able to bind usb peripheral node\n");
|
|
|
break;
|
|
|
case USB_DR_MODE_HOST:
|
|
|
/* Bind MUSB host */
|
|
|
- ret = device_bind_driver_to_node(parent, "ti-musb-host",
|
|
|
- name, offset_to_ofnode(node), &dev);
|
|
|
- if (ret) {
|
|
|
+ ret = device_bind_driver_to_node(parent,
|
|
|
+ "ti-musb-host",
|
|
|
+ name,
|
|
|
+ offset_to_ofnode(node),
|
|
|
+ &dev);
|
|
|
+ if (ret)
|
|
|
pr_err("musb - not able to bind usb host node\n");
|
|
|
- return ret;
|
|
|
- }
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -250,5 +338,6 @@ U_BOOT_DRIVER(ti_musb_wrapper) = {
|
|
|
.of_match = ti_musb_ids,
|
|
|
.bind = ti_musb_wrapper_bind,
|
|
|
};
|
|
|
+#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */
|
|
|
|
|
|
#endif /* CONFIG_IS_ENABLED(DM_USB) */
|