Merge branch 'master' of git://git.denx.de/u-boot-mmc

[platform/kernel/u-boot.git] / board / ti / omap5_uevm / evm.c

diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 3eaa5ac..b6cc417 100644 (file)
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -8,13 +8,19 @@
  */
 #include <common.h>
 #include <palmas.h>
+#include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <tca642x.h>
+#include <usb.h>
+#include <linux/usb/gadget.h>
+#include <dwc3-uboot.h>
+#include <dwc3-omap-uboot.h>
+#include <ti-usb-phy-uboot.h>
 
 #include "mux_data.h"
 
-#if defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_XHCI_OMAP)
+#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP)
 #include <sata.h>
 #include <usb.h>
 #include <asm/gpio.h>
@@ -53,6 +59,77 @@ struct tca642x_bank_info tca642x_init[] = {
          .configuration_reg = 0x40 },
 };
 
+#ifdef CONFIG_USB_DWC3
+static struct dwc3_device usb_otg_ss = {
+       .maximum_speed = USB_SPEED_SUPER,
+       .base = OMAP5XX_USB_OTG_SS_BASE,
+       .tx_fifo_resize = false,
+       .index = 0,
+};
+
+static struct dwc3_omap_device usb_otg_ss_glue = {
+       .base = (void *)OMAP5XX_USB_OTG_SS_GLUE_BASE,
+       .utmi_mode = DWC3_OMAP_UTMI_MODE_SW,
+       .index = 0,
+};
+
+static struct ti_usb_phy_device usb_phy_device = {
+       .pll_ctrl_base = (void *)OMAP5XX_USB3_PHY_PLL_CTRL,
+       .usb2_phy_power = (void *)OMAP5XX_USB2_PHY_POWER,
+       .usb3_phy_power = (void *)OMAP5XX_USB3_PHY_POWER,
+       .index = 0,
+};
+
+int board_usb_init(int index, enum usb_init_type init)
+{
+       if (index) {
+               printf("Invalid Controller Index\n");
+               return -EINVAL;
+       }
+
+       if (init == USB_INIT_DEVICE) {
+               usb_otg_ss.dr_mode = USB_DR_MODE_PERIPHERAL;
+               usb_otg_ss_glue.vbus_id_status = OMAP_DWC3_VBUS_VALID;
+       } else {
+               usb_otg_ss.dr_mode = USB_DR_MODE_HOST;
+               usb_otg_ss_glue.vbus_id_status = OMAP_DWC3_ID_GROUND;
+       }
+
+       enable_usb_clocks(index);
+       ti_usb_phy_uboot_init(&usb_phy_device);
+       dwc3_omap_uboot_init(&usb_otg_ss_glue);
+       dwc3_uboot_init(&usb_otg_ss);
+
+       return 0;
+}
+
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+       if (index) {
+               printf("Invalid Controller Index\n");
+               return -EINVAL;
+       }
+
+       ti_usb_phy_uboot_exit(index);
+       dwc3_uboot_exit(index);
+       dwc3_omap_uboot_exit(index);
+       disable_usb_clocks(index);
+
+       return 0;
+}
+
+int usb_gadget_handle_interrupts(int index)
+{
+       u32 status;
+
+       status = dwc3_omap_uboot_interrupt_status(index);
+       if (status)
+               dwc3_uboot_handle_interrupt(index);
+
+       return 0;
+}
+#endif
+
 /**
  * @brief board_init
  *
@@ -69,18 +146,12 @@ int board_init(void)
        return 0;
 }
 
-int board_late_init(void)
-{
-       init_sata(0);
-       return 0;
-}
-
 int board_eth_init(bd_t *bis)
 {
        return 0;
 }
 
-#if defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_XHCI_OMAP)
+#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP)
 static void enable_host_clocks(void)
 {
        int auxclk;
@@ -118,34 +189,16 @@ static void enable_host_clocks(void)
  */
 int misc_init_r(void)
 {
-       int reg;
-       uint8_t device_mac[6];
-
 #ifdef CONFIG_PALMAS_POWER
        palmas_init_settings();
 #endif
 
-       if (!getenv("usbethaddr")) {
-               reg = DIE_ID_REG_BASE + DIE_ID_REG_OFFSET;
-
-               /*
-                * create a fake MAC address from the processor ID code.
-                * first byte is 0x02 to signify locally administered.
-                */
-               device_mac[0] = 0x02;
-               device_mac[1] = readl(reg + 0x10) & 0xff;
-               device_mac[2] = readl(reg + 0xC) & 0xff;
-               device_mac[3] = readl(reg + 0x8) & 0xff;
-               device_mac[4] = readl(reg) & 0xff;
-               device_mac[5] = (readl(reg) >> 8) & 0xff;
-
-               eth_setenv_enetaddr("usbethaddr", device_mac);
-       }
+       omap_die_id_usbethaddr();
 
        return 0;
 }
 
-void set_muxconf_regs_essential(void)
+void set_muxconf_regs(void)
 {
        do_set_mux((*ctrl)->control_padconf_core_base,
                   core_padconf_array_essential,
@@ -158,7 +211,7 @@ void set_muxconf_regs_essential(void)
                   sizeof(struct pad_conf_entry));
 }
 
-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
+#if defined(CONFIG_MMC)
 int board_mmc_init(bd_t *bis)
 {
        omap_mmc_init(0, 0, 0, -1, -1);
@@ -167,7 +220,7 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 static struct omap_usbhs_board_data usbhs_bdata = {
        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
        .port_mode[1] = OMAP_EHCI_PORT_MODE_HSIC,
@@ -192,10 +245,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 
 int ehci_hcd_stop(void)
 {
-       int ret;
-
-       ret = omap_ehci_hcd_stop();
-       return ret;
+       return omap_ehci_hcd_stop();
 }
 
 void usb_hub_reset_devices(int port)