]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
musb: Add host support for DM365 EVM
authorPrathap Srinivas <msprathap@ti.com>
Mon, 11 Jan 2010 10:06:46 +0000 (15:36 +0530)
committerRemy Bohmer <linux@bohmer.net>
Wed, 3 Feb 2010 21:06:59 +0000 (22:06 +0100)
Add support for musb host on DM365 EVM.

Signed-off-by: Prathap Srinivas <msprathap@ti.com>
drivers/usb/musb/davinci.c
drivers/usb/musb/davinci.h
include/configs/davinci_dm365evm.h

index a7648fc452be64f80867636f4214c7b7fa4f9e55..8fbadc962f41dec51ce7fb97b062fc80b47ba887 100644 (file)
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include "davinci.h"
+#include <asm/arch/hardware.h>
 
 /* MUSB platform configuration */
 struct musb_config musb_cfg = {
@@ -41,10 +42,25 @@ struct davinci_usb_regs *dregs;
 static u8 phy_on(void)
 {
        u32 timeout;
-
+#ifdef DAVINCI_DM365EVM
+       u32 val;
+#endif
        /* Wait until the USB phy is turned on */
+#ifdef DAVINCI_DM365EVM
+       writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN |
+                       USBPHY_VBDTCTEN, USBPHY_CTL_PADDR);
+#else
        writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR);
+#endif
        timeout = musb_cfg.timeout;
+
+#ifdef DAVINCI_DM365EVM
+       /* Set the ownership of GIO33 to USB */
+       val = readl(PINMUX4);
+       val &= ~(PINMUX4_USBDRVBUS_BITCLEAR);
+       val |= PINMUX4_USBDRVBUS_BITSET;
+       writel(val, PINMUX4);
+#endif
        while (timeout--)
                if (readl(USBPHY_CTL_PADDR) & USBPHY_PHYCLKGD)
                        return 1;
@@ -70,8 +86,9 @@ int musb_platform_init(void)
        u32  revision;
 
        /* enable USB VBUS */
+#ifndef DAVINCI_DM365EVM
        enable_vbus();
-
+#endif
        /* start the on-chip USB phy and its pll */
        if (!phy_on())
                return -1;
index f6751bf66c98ab266e6898132f320d831602939a..e0829d60df51b295be3155ca776012b34c885d29 100644 (file)
@@ -63,6 +63,7 @@ struct davinci_usb_regs {
 
 /* Integrated highspeed/otg PHY */
 #define USBPHY_CTL_PADDR       (DAVINCI_SYSTEM_MODULE_BASE + 0x34)
+#define USBPHY_PHY24MHZ        (1 << 13)
 #define USBPHY_PHYCLKGD        (1 << 8)
 #define USBPHY_SESNDEN         (1 << 7)        /* v(sess_end) comparator */
 #define USBPHY_VBDTCTEN        (1 << 6)        /* v(bus) comparator */
index c6e1d107fdf56f6fc9357908f9164d979f0e6f4d..6f99ae087dc4a5db6f2e57a7c915ad4924d3c0f7 100644 (file)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_MAX_CHIPS      2
 
+#define PINMUX4_USBDRVBUS_BITCLEAR       0x3000
+#define PINMUX4_USBDRVBUS_BITSET         0x2000
+
+/* USB Configuration */
+#define CONFIG_USB_DAVINCI
+#define CONFIG_MUSB_HCD
+
+#ifdef CONFIG_USB_DAVINCI
+#define CONFIG_CMD_USB         /* include support for usb      */
+#define CONFIG_CMD_STORAGE     /* include support for usb      */
+#define CONFIG_CMD_FAT         /* include support for FAT/storage*/
+#define CONFIG_DOS_PARTITION   /* include support for FAT/storage*/
+#endif
+
+#ifdef CONFIG_MUSB_HCD         /* include support for usb host */
+#define CONFIG_CMD_USB         /* include support for usb cmd */
+#define CONFIG_USB_STORAGE     /* MSC class support */
+#define CONFIG_CMD_STORAGE     /* inclue support for usb-storage cmd */
+#define CONFIG_CMD_FAT         /* inclue support for FAT/storage */
+#define CONFIG_DOS_PARTITION   /* inclue support for FAT/storage */
+
+#ifdef CONFIG_USB_KEYBOARD     /* HID class support */
+#define CONFIG_SYS_USB_EVENT_POLL
+
+#define CONFIG_PREBOOT "usb start"
+#endif /* CONFIG_USB_KEYBOARD */
+#endif /* CONFIG_MUSB_HCD */
+
+#ifdef CONFIG_MUSB_UDC
+#define CONFIG_USB_DEVICE              1
+#define CONFIG_USB_TTY                 1
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
+#define CONFIG_USBD_VENDORID           0x0451
+#define CONFIG_USBD_PRODUCTID          0x5678
+#define CONFIG_USBD_MANUFACTURER       "Texas Instruments"
+#define CONFIG_USBD_PRODUCT_NAME       "DM365VM"
+#endif /* CONFIG_MUSB_UDC */
+
 /* U-Boot command configuration */
 #include <config_cmd_default.h>