USB: musb: partial DaVinci dm355 support

Partial support for DaVinci DM355, on the EVM board; peripheral
mode should work, once mainline merges DM355 support.  Missing:

  (a) renumbering the GPIO for DRVVBUS on the DM6446 EVM,
      when DAVINCI_N_GPIO increases;

  (b) disabling DM355_DEEPSLEEP.DRVVBUS_OVERRIDE so VBUS is
      driven according to the ID signal, if cpu_is_..._dm355()

The new PHY control bits are ignored on DM6446.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 15 insertions, 8 deletions

diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h
index 7fb6238e270f..046c84433cad 100644
--- a/drivers/usb/musb/davinci.h
+++ b/drivers/usb/musb/davinci.h
@@ -15,14 +15,21 @@
  */
 
 /* Integrated highspeed/otg PHY */
-#define USBPHY_CTL_PADDR        (DAVINCI_SYSTEM_MODULE_BASE + 0x34)
-#define USBPHY_PHYCLKGD         (1 << 8)
-#define USBPHY_SESNDEN          (1 << 7)        /* v(sess_end) comparator */
-#define USBPHY_VBDTCTEN         (1 << 6)        /* v(bus) comparator */
-#define USBPHY_PHYPLLON         (1 << 4)        /* override pll suspend */
-#define USBPHY_CLKO1SEL         (1 << 3)
-#define USBPHY_OSCPDWN          (1 << 2)
-#define USBPHY_PHYPDWN          (1 << 0)
+#define USBPHY_CTL_PADDR        (DAVINCI_SYSTEM_MODULE_BASE + 0x34)
+#define USBPHY_DATAPOL          BIT(11) /* (dm355) switch D+/D- */
+#define USBPHY_PHYCLKGD         BIT(8)
+#define USBPHY_SESNDEN          BIT(7)  /* v(sess_end) comparator */
+#define USBPHY_VBDTCTEN         BIT(6)  /* v(bus) comparator */
+#define USBPHY_VBUSSENS         BIT(5)  /* (dm355,ro) is vbus > 0.5V */
+#define USBPHY_PHYPLLON         BIT(4)  /* override pll suspend */
+#define USBPHY_CLKO1SEL         BIT(3)
+#define USBPHY_OSCPDWN          BIT(2)
+#define USBPHY_OTGPDWN          BIT(1)
+#define USBPHY_PHYPDWN          BIT(0)
+
+#define DM355_DEEPSLEEP_PADDR   (DAVINCI_SYSTEM_MODULE_BASE + 0x48)
+#define DRVVBUS_FORCE           BIT(2)
+#define DRVVBUS_OVERRIDE        BIT(1)
 
 /* For now include usb OTG module registers here */
 #define DAVINCI_USB_VERSION_REG         0x00