diff mbox

MUSB: Add support for DM646x USB.

Message ID 1251281881-13554-1-git-send-email-swami.iyer@ti.com (mailing list archive)
State Rejected
Headers show

Commit Message

Subbrathnam, Swaminathan Aug. 26, 2009, 10:18 a.m. UTC 
DM646x USB controller is based on Mentor USB Controller (MUSB).  This patch
adds support for DM646x USB controller to the MUSB driver. DM646x USB controller
doest not support OTG and hence the roles(Host/Device) need to be specified
as part of Kernel compile and the same needs to be set up when DM646x boots up.
The VBUS is controlled through a CPLD on the DM646x EVM.  This patch implements
the VBUS control accordingly.

Signed-off-by: Swaminathan S <swami.iyer@ti.com>

---
---
 drivers/usb/musb/davinci.c |   32 ++++++++++++++++++++++++--------
 drivers/usb/musb/davinci.h |    6 ++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

Comments

Sergei Shtylyov Aug. 26, 2009, 9:56 a.m. UTC | #1 
Hello.

Swaminathan S wrote:

> DM646x USB controller is based on Mentor USB Controller (MUSB).  This patch
> adds support for DM646x USB controller to the MUSB driver. DM646x USB controller
> doest not support OTG and hence the roles(Host/Device) need to be specified
> as part of Kernel compile and the same needs to be set up when DM646x boots up.
> The VBUS is controlled through a CPLD on the DM646x EVM.  This patch implements
> the VBUS control accordingly.
>
> Signed-off-by: Swaminathan S <swami.iyer@ti.com>

  Again, Kevin has already told you to rework the way VBUS is handled to 
avoid using machine_is_*()...

WBR, Sergei
Subbrathnam, Swaminathan Aug. 26, 2009, 10 a.m. UTC | #2 
My mistake that I did not read through his comments at the end of his response.  Thanks for pointing it out.

-----Original Message-----
From: Sergei Shtylyov [mailto:sshtylyov@ru.mvista.com] 
Sent: Wednesday, August 26, 2009 3:26 PM
To: Subbrathnam, Swaminathan
Cc: linux-usb@vger.kernel.org; davinci-linux-open-source@linux.davincidsp.com
Subject: Re: [PATCH] MUSB: Add support for DM646x USB.

Hello.

Swaminathan S wrote:

> DM646x USB controller is based on Mentor USB Controller (MUSB).  This patch
> adds support for DM646x USB controller to the MUSB driver. DM646x USB controller
> doest not support OTG and hence the roles(Host/Device) need to be specified
> as part of Kernel compile and the same needs to be set up when DM646x boots up.
> The VBUS is controlled through a CPLD on the DM646x EVM.  This patch implements
> the VBUS control accordingly.
>
> Signed-off-by: Swaminathan S <swami.iyer@ti.com>

  Again, Kevin has already told you to rework the way VBUS is handled to 
avoid using machine_is_*()...

WBR, Sergei
diff mbox

Patch

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 6691381..87bbd7c 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -41,7 +41,7 @@ 
 
 #include "musb_core.h"
 
-#ifdef CONFIG_MACH_DAVINCI_EVM
+#if defined(CONFIG_MACH_DAVINCI_EVM) || defined(CONFIG_MACH_DAVINCI_DM6467_EVM)
 #define GPIO_nVBUS_DRV		160
 #endif
 
@@ -65,6 +65,13 @@  static inline void phy_on(void)
 	/* power everything up; start the on-chip PHY and its PLL */
 	phy_ctrl &= ~(USBPHY_OSCPDWN | USBPHY_OTGPDWN | USBPHY_PHYPDWN);
 	phy_ctrl |= USBPHY_SESNDEN | USBPHY_VBDTCTEN | USBPHY_PHYPLLON;
+	if (cpu_is_davinci_dm646x()) {
+		phy_ctrl |= USBPHY_NDATAPOL | USBPHY_SESSION_VBUS;
+		phy_ctrl |= is_peripheral_enabled() ? USBPHY_PERI_USBID :
+						phy_ctrl;
+		phy_ctrl &= ~USBPHY_VBDTCTEN;
+	}
+
 	__raw_writel(phy_ctrl, USB_PHY_CTRL);
 
 	/* wait for PLL to lock before proceeding */
@@ -152,7 +159,7 @@  void musb_platform_disable(struct musb *musb)
  * when J10 is out, and TI documents it as handling OTG.
  */
 
-#ifdef CONFIG_MACH_DAVINCI_EVM
+#if defined(CONFIG_MACH_DAVINCI_EVM) || defined(CONFIG_MACH_DAVINCI_DM6467_EVM)
 
 static int vbus_state = -1;
 
@@ -162,7 +169,12 @@  static int vbus_state = -1;
  */
 static void evm_deferred_drvvbus(struct work_struct *ignored)
 {
-	gpio_set_value_cansleep(GPIO_nVBUS_DRV, vbus_state);
+	if (machine_is_davinci_evm())
+		gpio_set_value_cansleep(GPIO_nVBUS_DRV, vbus_state);
+
+	if (machine_is_davinci_dm6467_evm())
+		usb_vbus_control(vbus_state);
+
 	vbus_state = !vbus_state;
 }
 
@@ -170,7 +182,7 @@  static void evm_deferred_drvvbus(struct work_struct *ignored)
 
 static void davinci_source_power(struct musb *musb, int is_on, int immediate)
 {
-#ifdef CONFIG_MACH_DAVINCI_EVM
+#if defined(CONFIG_MACH_DAVINCI_EVM) || defined(CONFIG_MACH_DAVINCI_DM6467_EVM)
 	if (is_on)
 		is_on = 1;
 
@@ -178,12 +190,16 @@  static void davinci_source_power(struct musb *musb, int is_on, int immediate)
 		return;
 	vbus_state = !is_on;		/* 0/1 vs "-1 == unknown/init" */
 
-	if (machine_is_davinci_evm()) {
+	if (machine_is_davinci_evm() || machine_is_davinci_dm6467_evm()) {
 		static DECLARE_WORK(evm_vbus_work, evm_deferred_drvvbus);
 
-		if (immediate)
-			gpio_set_value_cansleep(GPIO_nVBUS_DRV, vbus_state);
-		else
+		if (immediate) {
+			if (machine_is_davinci_evm())
+				gpio_set_value_cansleep(GPIO_nVBUS_DRV,
+							vbus_state);
+			if (machine_is_davinci_dm6467_evm())
+				usb_vbus_control(vbus_state);
+		} else
 			schedule_work(&evm_vbus_work);
 	}
 	if (immediate)
diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h
index 046c844..b802b83 100644
--- a/drivers/usb/musb/davinci.h
+++ b/drivers/usb/musb/davinci.h
@@ -16,6 +16,9 @@ 
 
 /* Integrated highspeed/otg PHY */
 #define USBPHY_CTL_PADDR	(DAVINCI_SYSTEM_MODULE_BASE + 0x34)
+#define USBPHY_NDATAPOL		BIT(18)
+#define USBPHY_SESSION_VBUS	BIT(17)
+#define USBPHY_PERI_USBID	BIT(16)
 #define USBPHY_DATAPOL		BIT(11)	/* (dm355) switch D+/D- */
 #define USBPHY_PHYCLKGD		BIT(8)
 #define USBPHY_SESNDEN		BIT(7)	/* v(sess_end) comparator */
@@ -104,4 +107,7 @@ 
 
 #define DAVINCI_BASE_OFFSET		0x400
 
+#ifdef CONFIG_MACH_DAVINCI_DM6467_EVM
+extern void usb_vbus_control(u8 on);
+#endif
 #endif	/* __MUSB_HDRDF_H__ */