Skip to contentSkip to conversation

DA8xx: Add MUSB host support

PATCH New Ajay Kumar Gupta 4 participants 7 messages Nov 13, 2009 – Nov 16, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 DA8xx: Add MUSB host support

Tested USB host functionality on DA830 EVM.

---
Patch has updated licensing header.Other patch in series has no update so not reposting them untill I get any rework comment.

 drivers/usb/musb/Makefile |    1 +
 drivers/usb/musb/da8xx.c  |  143 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/musb/da8xx.h  |   84 ++++++++++++++++++++++++++
 include/usb.h             |    3 +-
 4 files changed, 230 insertions(+), 1 deletions(-)
 create mode 100644 drivers/usb/musb/da8xx.c
 create mode 100644 drivers/usb/musb/da8xx.h
drivers/usb/musb/Makefile +1 -0
index 09e0a5f..eb4d8fd 100644
@@ -27,6 +27,7 @@ LIB	:= $(obj)libusb_musb.a
 
 COBJS-$(CONFIG_MUSB_HCD) += musb_hcd.o musb_core.o
 COBJS-$(CONFIG_USB_DAVINCI) += davinci.o
+COBJS-$(CONFIG_USB_DA8XX) += da8xx.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
drivers/usb/musb/da8xx.c new file +143 -0

143 lines not on this page · raw message

drivers/usb/musb/da8xx.h new file +84 -0

84 lines not on this page · raw message

include/usb.h +2 -1
index 7c47098..7c56ace 100644
@@ -183,7 +183,8 @@ struct usb_device {
 #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
 	defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \
 	defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \
-	defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI)
+	defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \
+	defined(CONFIG_USB_DA8XX)
 
 int usb_lowlevel_init(void);
 int usb_lowlevel_stop(void);
Signature · 1 line
1.6.2.4
#1 lore raw

PATCH v3 1/1 DA8xx: Add MUSB host support

Quoted 40 lines · Ajay Kumar Gupta

Tested USB host functionality on DA830 EVM.

---
Patch has updated licensing header.Other patch in series has no update so not reposting them untill I get any rework comment.

 drivers/usb/musb/Makefile |    1 +
 drivers/usb/musb/da8xx.c  |  143 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/musb/da8xx.h  |   84 ++++++++++++++++++++++++++
 include/usb.h             |    3 +-
 4 files changed, 230 insertions(+), 1 deletions(-)
 create mode 100644 drivers/usb/musb/da8xx.c
 create mode 100644 drivers/usb/musb/da8xx.h
drivers/usb/musb/da8xx.c new file +17 -0
new file mode 100644
index 0000000..3e4694f
 
+int musb_platform_init(void)
+{
+	u32  revision;
+
+	/* enable psc for usb2.0 */
+	lpsc_on(33);
+
+	/* enable usb vbus */
+	enable_vbus();
+
+	/* reset the controller */
+	writel(0x1, (DA8XX_USB_OTG_BASE + DA8XX_USB_CTRL_REG));
+	udelay(5000);
+
+	/* start the on-chip usb phy and its pll */
+	if (phy_on() == 0)
+		return -1;

drivers/usb/musb/da8xx.c line 126

Quoted 10 lines
drivers/usb/musb/da8xx.c new file +10 -0
+
+	/* Returns zero if e.g. not clocked */
+	revision = readl(DA8XX_USB_OTG_BASE + DA8XX_USB_VERSION_REG);
+	if (revision == 0)
+		return -1;
+
+	/* Disable all interrupts */
+	writel((DA8XX_USB_USBINT_MASK | DA8XX_USB_TXINT_MASK |
+		DA8XX_USB_RXINT_MASK),
+		(DA8XX_USB_OTG_BASE + DA8XX_USB_INT_MASK_SET_REG));

This last line should have one less alignment space.

You still have a good collection of OTG + offset #defines here and below. Could you please add a C struct and pointer instead.

Quoted 22 lines
drivers/usb/musb/da8xx.c new file +17 -0
+	return 0;
+}
+
+/*
+ * This function performs DA8xx platform specific deinitialization for usb0.
+ */
+void musb_platform_deinit(void)
+{
+	/* Turn of the phy */
+	phy_off();
+
+	/* flush any interrupts */
+	writel((DA8XX_USB_USBINT_MASK | DA8XX_USB_TXINT_MASK |
+		DA8XX_USB_RXINT_MASK),
+		(DA8XX_USB_OTG_BASE + DA8XX_USB_INT_MASK_CLR_REG));
+	writel(0, (DA8XX_USB_OTG_BASE + DA8XX_USB_EOI_REG));
+}
drivers/usb/musb/da8xx.h new file +0 -0
new file mode 100644
index 0000000..c3e9c77

drivers/usb/musb/da8xx.h line 30

Quoted 7 lines
drivers/usb/musb/da8xx.h new file +7 -0
+#ifndef __DA8XX_MUSB_H__
+#define __DA8XX_MUSB_H__
+
+#include "musb_core.h"
+
+/* extern functions */
+extern void lpsc_on(unsigned int id);

Already defined in hardware.h (inherited here from davinci.h)

Quoted 6 lines
drivers/usb/musb/da8xx.h new file +6 -0
+
+/* Base address of da8xx usb0 wrapper */
+#define DA8XX_USB_OTG_BASE  0x01E00000
+
+/* Base address of da8xx musb core */
+#define DA8XX_USB_OTG_CORE_BASE (DA8XX_USB_OTG_BASE + 0x400)

drivers/usb/musb/da8xx.h line 46

Quoted 10 lines
drivers/usb/musb/da8xx.h new file +10 -0
+
+/* Timeout for DA8xx usb module */
+#define DA8XX_USB_OTG_TIMEOUT 0x3FFFFFF
+
+/* For now include usb OTG module registers here */
+#define DA8XX_USB_VERSION_REG			0x00
+#define DA8XX_USB_CTRL_REG			0x04
+#define DA8XX_USB_INT_MASK_SET_REG		0x30
+#define DA8XX_USB_INT_MASK_CLR_REG		0x34
+#define DA8XX_USB_EOI_REG			0x3c

These should be removed in favour of struct members.

Quoted 43 lines
drivers/usb/musb/da8xx.h new file +38 -0
+
+#define DA8XX_USB_TX_ENDPTS_MASK  0x1f		  /* ep0 + 4 tx */
+#define DA8XX_USB_RX_ENDPTS_MASK  0x1e		  /* 4 rx */
+#define DA8XX_USB_TXINT_SHIFT	  0
+#define DA8XX_USB_RXINT_SHIFT	  8
+
+#define DA8XX_USB_USBINT_MASK	  0x01ff0000  /* 8 Mentor, DRVVBUS */
+#define DA8XX_USB_TXINT_MASK \
+		(DA8XX_USB_TX_ENDPTS_MASK << DA8XX_USB_TXINT_SHIFT)
+#define DA8XX_USB_RXINT_MASK \
+		(DA8XX_USB_RX_ENDPTS_MASK << DA8XX_USB_RXINT_SHIFT)
+
+/* DA8xx CFGCHIP2 (USB 2.0 PHY Control) register bits */
+#define CFGCHIP2_PHYCLKGD	(1 << 17)
+#define CFGCHIP2_VBUSSENSE	(1 << 16)
+#define CFGCHIP2_RESET		(1 << 15)
+#define CFGCHIP2_OTGMODE	(3 << 13)
+#define CFGCHIP2_NO_OVERRIDE	(0 << 13)
+#define CFGCHIP2_FORCE_HOST	(1 << 13)
+#define CFGCHIP2_FORCE_DEVICE 	(2 << 13)
+#define CFGCHIP2_FORCE_HOST_VBUS_LOW (3 << 13)
+#define CFGCHIP2_USB1PHYCLKMUX	(1 << 12)
+#define CFGCHIP2_USB2PHYCLKMUX	(1 << 11)
+#define CFGCHIP2_PHYPWRDN	(1 << 10)
+#define CFGCHIP2_OTGPWRDN	(1 << 9)
+#define CFGCHIP2_DATPOL 	(1 << 8)
+#define CFGCHIP2_USB1SUSPENDM	(1 << 7)
+#define CFGCHIP2_PHY_PLLON	(1 << 6)	/* override PLL suspend */
+#define CFGCHIP2_SESENDEN	(1 << 5)	/* Vsess_end comparator */
+#define CFGCHIP2_VBDTCTEN	(1 << 4)	/* Vbus comparator */
+#define CFGCHIP2_REFFREQ	(0xf << 0)
+#define CFGCHIP2_REFFREQ_12MHZ	(1 << 0)
+#define CFGCHIP2_REFFREQ_24MHZ	(2 << 0)
+#define CFGCHIP2_REFFREQ_48MHZ	(3 << 0)
+
+#define DA8XX_USB_VBUS_GPIO	(1 << 15)
+#endif	/* __DA8XX_MUSB_H__ */
+
include/usb.h +0 -0
index 7c47098..7c56ace 100644

include/usb.h struct usb_device { · line 187

Quoted 6 lines
include/usb.h +2 -1
@@ -183,7 +183,8 @@ struct usb_device {
 #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
 	defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \
 	defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \
-	defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI)
+	defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \
+	defined(CONFIG_USB_DA8XX)

These are aligned incorrectly (should be 4 spaces rather than a tab)

#2 lore raw

PATCH v3 1/1 DA8xx: Add MUSB host support

Hi,

Quoted 5 lines

Tested USB host functionality on DA830 EVM.

---

<snip..>

include/usb.h struct usb_device { · line 189

Quoted 11 lines
include/usb.h +2 -1
@@ -183,7 +183,8 @@ struct usb_device {
 #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
      defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \
      defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \
-     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI)
+     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \
+     defined(CONFIG_USB_DA8XX)
 
 These are aligned incorrectly (should be 4 spaces rather than a tab)

It was originally with tabs only. Are you suggesting to change all 5 lines to match the alignment ?

Tom,
What do you think on this one?

-Ajay

#3 lore raw

PATCH v3 1/1 DA8xx: Add MUSB host support

Quoted 19 lines · Ajay Kumar

Hi,

Quoted 5 lines

Tested USB host functionality on DA830 EVM.

---

<snip..>

Quoted 9 lines
include/usb.h +2 -1
@@ -183,7 +183,8 @@ struct usb_device {
 #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
      defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \
      defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \
-     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI)
+     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \
+     defined(CONFIG_USB_DA8XX)
Quoted 5 lines

include/usb.h struct usb_device { · line 188

Quoted 1 line
include/usb.h +0 -0
 These are aligned incorrectly (should be 4 spaces rather than a tab)

It was originally with tabs only. Are you suggesting to change all 5 lines to match the alignment ?

Tom,
What do you think on this one?

In general tabs are preferred but I would like to review the entire patchset. When you make changes to a subset of the patches, you must repost the entire patchset.

Please repost the entire patchset.

Tom

Quoted 2 lines

-Ajay

#4 lore raw

PATCH v3 1/1 DA8xx: Add MUSB host support

Hi,

Quoted 22 lines

Hi,

Quoted 5 lines

Tested USB host functionality on DA830 EVM.

---

<snip..>

include/usb.h struct usb_device { · line 189

Quoted 11 lines
include/usb.h +2 -1
@@ -183,7 +183,8 @@ struct usb_device {
 #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
      defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \
      defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \
-     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI)
+     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \
+     defined(CONFIG_USB_DA8XX)
 
 These are aligned incorrectly (should be 4 spaces rather than a tab)

It was originally with tabs only. Are you suggesting to change all 5 lines to match the alignment ?

Quoted 8 lines

Tom,
What do you think on this one?

In general tabs are preferred but I would like to review the entire patchset. When you make changes to a subset of the patches, you must repost the entire patchset.

Please repost the entire patchset.

Ok sure. Shall I post this patch with tabs or with 4-spaces as Nick suggested ?

Regards,
Ajay

Quoted 5 lines

Tom

-Ajay

#5 lore raw

PATCH v3 1/1 DA8xx: Add MUSB host support

Quoted 24 lines · Ajay Kumar

Hi,

Quoted 22 lines

Hi,

Quoted 5 lines

Tested USB host functionality on DA830 EVM.

---

<snip..>

include/usb.h struct usb_device { · line 188

Quoted 10 lines
include/usb.h +2 -1
@@ -183,7 +183,8 @@ struct usb_device {
 #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
      defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \
      defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \
-     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI)
+     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \
+     defined(CONFIG_USB_DA8XX)
 These are aligned incorrectly (should be 4 spaces rather than a tab)

It was originally with tabs only. Are you suggesting to change all 5 lines to match the alignment ?

Tom,
What do you think on this one?

Quoted 8 lines
Quoted 5 lines

In general tabs are preferred but I would like to review the entire patchset. When you make changes to a subset of the patches, you must repost the entire patchset.

Please repost the entire patchset.

Ok sure. Shall I post this patch with tabs or with 4-spaces as Nick suggested ?

Just repost it as-is.

Please be aware that this is a USB change.
And though I can provide some input the ack/nak decision is Remy's.

Tom

Quoted 9 lines

Regards,
Ajay

Quoted 4 lines

Tom

-Ajay

#6 lore raw

PATCH v3 1/1 DA8xx: Add MUSB host support

In reply to Gupta
Quoted 19 lines · Ajay Kumar

Hi,

Quoted 5 lines

Tested USB host functionality on DA830 EVM.

---

<snip..>

Quoted 9 lines
include/usb.h +2 -1
@@ -183,7 +183,8 @@ struct usb_device {
 #if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
      defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \
      defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \
-     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI)
+     defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \
+     defined(CONFIG_USB_DA8XX)
Quoted 2 lines

include/usb.h struct usb_device { · line 188

Quoted 1 line
include/usb.h +0 -0
 These are aligned incorrectly (should be 4 spaces rather than a tab)

It was originally with tabs only. Are you suggesting to change all 5 lines to match the alignment ?

I originally thought this was a da8xx specific file. It is not, so no, I don't expect you the change the indentation - what you have looks fine.

Nick.