[PATCH 1/2] MSM: Add USB suport for QSD8x50

[PATCH 1/2] MSM: Add USB suport for QSD8x50

[Pavankumar Kondeti]

OTG driver takes care of putting hardware into low power mode.  Hence
make peripheral and host devices as children of OTG device and let
runtime PM takes care of notifying peripheral and host state to
OTG device.  VBUS power up and shutdown routines are implemented by
modem processor.  As RPC infrastructure is not available, configure
USB in peripheral only mode.

Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
---
This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
patch series which is under review.

 arch/arm/mach-msm/board-qsd8x50.c   |   19 +++++++++
 arch/arm/mach-msm/devices-qsd8x50.c |   71 +++++++++++++++++++++++++++++++++++
 arch/arm/mach-msm/devices.h         |    2 +
 3 files changed, 92 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index ed2af4a..2e83913 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -20,6 +20,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/usb/msm_hsusb.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -74,9 +75,24 @@ static int __init msm_init_smc91x(void)
 }
 module_init(msm_init_smc91x);
 
+static int hsusb_phy_init_seq[] = {
+	0x08, 0x31,	/* Increase HS Driver Amplitude */
+	0x20, 0x32,	/* Enable and set Pre-Emphasis Depth to 10% */
+	-1
+};
+
+static struct msm_otg_platform_data msm_otg_pdata = {
+	.phy_init_seq		= hsusb_phy_init_seq,
+	.mode                   = USB_PERIPHERAL,
+	.otg_control		= OTG_PHY_CONTROL,
+};
+
 static struct platform_device *devices[] __initdata = {
 	&msm_device_uart3,
 	&msm_device_smd,
+	&msm_device_otg,
+	&msm_device_hsusb,
+	&msm_device_hsusb_host,
 };
 
 static void __init qsd8x50_map_io(void)
@@ -93,6 +109,9 @@ static void __init qsd8x50_init_irq(void)
 
 static void __init qsd8x50_init(void)
 {
+	msm_device_otg.dev.platform_data = &msm_otg_pdata;
+	msm_device_hsusb.dev.parent = &msm_device_otg.dev;
+	msm_device_hsusb_host.dev.parent = &msm_device_otg.dev;
 	platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index 6fe67c5..a4b798f 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -53,6 +53,77 @@ struct platform_device msm_device_smd = {
 	.id     = -1,
 };
 
+static struct resource resources_otg[] = {
+	{
+		.start	= MSM_HSUSB_PHYS,
+		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= INT_USB_HS,
+		.end	= INT_USB_HS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device msm_device_otg = {
+	.name		= "msm_otg",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(resources_otg),
+	.resource	= resources_otg,
+	.dev		= {
+		.coherent_dma_mask	= 0xffffffff,
+	},
+};
+
+static struct resource resources_hsusb[] = {
+	{
+		.start	= MSM_HSUSB_PHYS,
+		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= INT_USB_HS,
+		.end	= INT_USB_HS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device msm_device_hsusb = {
+	.name		= "msm_hsusb",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(resources_hsusb),
+	.resource	= resources_hsusb,
+	.dev		= {
+		.coherent_dma_mask	= 0xffffffff,
+	},
+};
+
+static u64 dma_mask = 0xffffffffULL;
+static struct resource resources_hsusb_host[] = {
+	{
+		.start	= MSM_HSUSB_PHYS,
+		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= INT_USB_HS,
+		.end	= INT_USB_HS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device msm_device_hsusb_host = {
+	.name		= "msm_hsusb_host",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(resources_hsusb_host),
+	.resource	= resources_hsusb_host,
+	.dev		= {
+		.dma_mask               = &dma_mask,
+		.coherent_dma_mask      = 0xffffffffULL,
+	},
+};
+
 struct clk msm_clocks_8x50[] = {
 	CLK_PCOM("adm_clk",	ADM_CLK,	NULL, 0),
 	CLK_PCOM("ebi1_clk",	EBI1_CLK,	NULL, CLK_MIN),
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index 568443e..72500a2 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -28,6 +28,8 @@ extern struct platform_device msm_device_sdc3;
 extern struct platform_device msm_device_sdc4;
 
 extern struct platform_device msm_device_hsusb;
+extern struct platform_device msm_device_otg;
+extern struct platform_device msm_device_hsusb_host;
 
 extern struct platform_device msm_device_i2c;
 
-- 
1.7.1

--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

[PATCH 2/2] MSM: Add USB support for MSM7x30

[Pavankumar Kondeti]

Add USB OTG, peripheral and host devices.  This patch also adds
usb_phy_clk which is required for resetting the PHY.  VBUS power up
and shutdown routines depends on PMIC module.  As PMIC driver is
unavailable, configure USB in peripheral only mode.

Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
---
This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
patch series which is under review.

 arch/arm/mach-msm/board-msm7x30.c               |   20 ++++++
 arch/arm/mach-msm/devices-msm7x30.c             |   72 +++++++++++++++++++++++
 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    3 +
 3 files changed, 95 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 05241df..6f3b973 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/smsc911x.h>
+#include <linux/usb/msm_hsusb.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -39,11 +40,26 @@
 
 extern struct sys_timer msm_timer;
 
+static int hsusb_phy_init_seq[] = {
+	0x30, 0x32,	/* Enable and set Pre-Emphasis Depth to 20% */
+	0x02, 0x36,	/* Disable CDR Auto Reset feature */
+	-1
+};
+
+static struct msm_otg_platform_data msm_otg_pdata = {
+	.phy_init_seq		= hsusb_phy_init_seq,
+	.mode                   = USB_PERIPHERAL,
+	.otg_control		= OTG_PHY_CONTROL,
+};
+
 static struct platform_device *devices[] __initdata = {
 #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)
         &msm_device_uart2,
 #endif
 	&msm_device_smd,
+	&msm_device_otg,
+	&msm_device_hsusb,
+	&msm_device_hsusb_host,
 };
 
 static void __init msm7x30_init_irq(void)
@@ -53,6 +69,10 @@ static void __init msm7x30_init_irq(void)
 
 static void __init msm7x30_init(void)
 {
+	msm_device_otg.dev.platform_data = &msm_otg_pdata;
+	msm_device_hsusb.dev.parent = &msm_device_otg.dev;
+	msm_device_hsusb_host.dev.parent = &msm_device_otg.dev;
+
 	platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 7fcf2e3..4e9a0ab 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -56,6 +56,77 @@ struct platform_device msm_device_smd = {
 	.id     = -1,
 };
 
+static struct resource resources_otg[] = {
+	{
+		.start	= MSM_HSUSB_PHYS,
+		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= INT_USB_HS,
+		.end	= INT_USB_HS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device msm_device_otg = {
+	.name		= "msm_otg",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(resources_otg),
+	.resource	= resources_otg,
+	.dev		= {
+		.coherent_dma_mask	= 0xffffffff,
+	},
+};
+
+static struct resource resources_hsusb[] = {
+	{
+		.start	= MSM_HSUSB_PHYS,
+		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= INT_USB_HS,
+		.end	= INT_USB_HS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device msm_device_hsusb = {
+	.name		= "msm_hsusb",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(resources_hsusb),
+	.resource	= resources_hsusb,
+	.dev		= {
+		.coherent_dma_mask	= 0xffffffff,
+	},
+};
+
+static u64 dma_mask = 0xffffffffULL;
+static struct resource resources_hsusb_host[] = {
+	{
+		.start	= MSM_HSUSB_PHYS,
+		.end	= MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= INT_USB_HS,
+		.end	= INT_USB_HS,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device msm_device_hsusb_host = {
+	.name		= "msm_hsusb_host",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(resources_hsusb_host),
+	.resource	= resources_hsusb_host,
+	.dev		= {
+		.dma_mask               = &dma_mask,
+		.coherent_dma_mask      = 0xffffffffULL,
+	},
+};
+
 struct clk msm_clocks_7x30[] = {
 	CLK_PCOM("adm_clk",	ADM_CLK,	NULL, 0),
 	CLK_PCOM("adsp_clk",	ADSP_CLK,	NULL, 0),
@@ -107,6 +178,7 @@ struct clk msm_clocks_7x30[] = {
 	CLK_PCOM("tv_dac_clk",	TV_DAC_CLK,	NULL, 0),
 	CLK_PCOM("tv_enc_clk",	TV_ENC_CLK,	NULL, 0),
 	CLK_PCOM("uart_clk",	UART2_CLK,	&msm_device_uart2.dev, 0),
+	CLK_PCOM("usb_phy_clk",	USB_PHY_CLK,	NULL, 0),
 	CLK_PCOM("usb_hs_clk",		USB_HS_CLK,		NULL, OFF),
 	CLK_PCOM("usb_hs_pclk",		USB_HS_P_CLK,		NULL, OFF),
 	CLK_PCOM("usb_hs_core_clk",	USB_HS_CORE_CLK,	NULL, OFF),
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
index 8a00c2d..0fd7b68 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
@@ -119,4 +119,7 @@
 #define MSM_AD5_PHYS          0xA7000000
 #define MSM_AD5_SIZE          (SZ_1M*13)
 
+#define MSM_HSUSB_PHYS        0xA3600000
+#define MSM_HSUSB_SIZE        SZ_1K
+
 #endif
-- 
1.7.1

--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH 1/2] MSM: Add USB suport for QSD8x50

[Pavan Kondeti]

Hi Daniel,

On 12/8/2010 1:37 PM, Pavankumar Kondeti wrote:
> OTG driver takes care of putting hardware into low power mode.  Hence
> make peripheral and host devices as children of OTG device and let
> runtime PM takes care of notifying peripheral and host state to
> OTG device.  VBUS power up and shutdown routines are implemented by
> modem processor.  As RPC infrastructure is not available, configure
> USB in peripheral only mode.
> 
> Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
> ---
> This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
> patch series which is under review.

USB driver patches are taken into Greg KH usb-next tree. Is it possible
to include this patch for 2.6.38?

Thanks,
Pavan

-- 
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH 1/2] MSM: Add USB suport for QSD8x50

[Daniel Walker]

On Tue, 2010-12-14 at 09:10 +0530, Pavan Kondeti wrote:
> Hi Daniel,

Are you talking to me? read below,

> On 12/8/2010 1:37 PM, Pavankumar Kondeti wrote:
> > OTG driver takes care of putting hardware into low power mode.  Hence
> > make peripheral and host devices as children of OTG device and let
> > runtime PM takes care of notifying peripheral and host state to
> > OTG device.  VBUS power up and shutdown routines are implemented by
> > modem processor.  As RPC infrastructure is not available, configure
> > USB in peripheral only mode.
> > 
> > Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
> > ---
> > This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
> > patch series which is under review.
> 
> USB driver patches are taken into Greg KH usb-next tree. Is it possible
> to include this patch for 2.6.38?

I don't control Greg's tree, so I don't know what his policies are
regarding patch acceptance ..

Daniel

-- 
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum.

Re: [PATCH 1/2] MSM: Add USB suport for QSD8x50

[pkondeti]

> On Tue, 2010-12-14 at 09:10 +0530, Pavan Kondeti wrote:
>> Hi Daniel,
>
> Are you talking to me? read below,
>
>> On 12/8/2010 1:37 PM, Pavankumar Kondeti wrote:
>> > OTG driver takes care of putting hardware into low power mode.  Hence
>> > make peripheral and host devices as children of OTG device and let
>> > runtime PM takes care of notifying peripheral and host state to
>> > OTG device.  VBUS power up and shutdown routines are implemented by
>> > modem processor.  As RPC infrastructure is not available, configure
>> > USB in peripheral only mode.
>> >
>> > Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
>> > ---
>> > This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
>> > patch series which is under review.
>>
>> USB driver patches are taken into Greg KH usb-next tree. Is it possible
>> to include this patch for 2.6.38?
>
> I don't control Greg's tree, so I don't know what his policies are
> regarding patch acceptance ..
>
I am asking about board file changes. i.e this patch and the follow up
patch not
USB driver patches.

Thanks,
Pavan

--
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH 1/2] MSM: Add USB suport for QSD8x50

[Greg KH]

On Wed, Dec 15, 2010 at 06:41:37AM -0800, Daniel Walker wrote:
> On Tue, 2010-12-14 at 09:10 +0530, Pavan Kondeti wrote:
> > Hi Daniel,
> 
> Are you talking to me? read below,
> 
> > On 12/8/2010 1:37 PM, Pavankumar Kondeti wrote:
> > > OTG driver takes care of putting hardware into low power mode.  Hence
> > > make peripheral and host devices as children of OTG device and let
> > > runtime PM takes care of notifying peripheral and host state to
> > > OTG device.  VBUS power up and shutdown routines are implemented by
> > > modem processor.  As RPC infrastructure is not available, configure
> > > USB in peripheral only mode.
> > > 
> > > Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
> > > ---
> > > This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
> > > patch series which is under review.
> > 
> > USB driver patches are taken into Greg KH usb-next tree. Is it possible
> > to include this patch for 2.6.38?
> 
> I don't control Greg's tree, so I don't know what his policies are
> regarding patch acceptance ..

They are like any other patch acceptance rules, what specifically is the
issue here?

thanks,

greg k-h

Re: [PATCH 1/2] MSM: Add USB suport for QSD8x50

[Pavan Kondeti]

Hi Greg,

On 12/15/2010 10:47 PM, Greg KH wrote:
>>> On 12/8/2010 1:37 PM, Pavankumar Kondeti wrote:
>>>> > > > OTG driver takes care of putting hardware into low power mode.  Hence
>>>> > > > make peripheral and host devices as children of OTG device and let
>>>> > > > runtime PM takes care of notifying peripheral and host state to
>>>> > > > OTG device.  VBUS power up and shutdown routines are implemented by
>>>> > > > modem processor.  As RPC infrastructure is not available, configure
>>>> > > > USB in peripheral only mode.
>>>> > > > 
>>>> > > > Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
>>>> > > > ---
>>>> > > > This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
>>>> > > > patch series which is under review.
>>> > > 
>>> > > USB driver patches are taken into Greg KH usb-next tree. Is it possible
>>> > > to include this patch for 2.6.38?
>> > 
>> > I don't control Greg's tree, so I don't know what his policies are
>> > regarding patch acceptance ..
> They are like any other patch acceptance rules, what specifically is the
> issue here?

The board support patches ( [PATCH 1/2] MSM: Add USB suport for QSD8x50)
are dependent on USB OTG driver patches ([PATCH V3 00/11] Add MSM USB
controller driver). The USB OTG driver patches are in your
usb-next tree. Where should board support patches go? MSM tree/ USB tree?

Thanks in advance,
Pavan

-- 
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH 1/2] MSM: Add USB suport for QSD8x50

[Greg KH]

On Thu, Dec 16, 2010 at 09:11:42AM +0530, Pavan Kondeti wrote:
> Hi Greg,
> 
> On 12/15/2010 10:47 PM, Greg KH wrote:
> >>> On 12/8/2010 1:37 PM, Pavankumar Kondeti wrote:
> >>>> > > > OTG driver takes care of putting hardware into low power mode.  Hence
> >>>> > > > make peripheral and host devices as children of OTG device and let
> >>>> > > > runtime PM takes care of notifying peripheral and host state to
> >>>> > > > OTG device.  VBUS power up and shutdown routines are implemented by
> >>>> > > > modem processor.  As RPC infrastructure is not available, configure
> >>>> > > > USB in peripheral only mode.
> >>>> > > > 
> >>>> > > > Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
> >>>> > > > ---
> >>>> > > > This patch depends on [PATCH V3 00/11] Add MSM USB controller driver
> >>>> > > > patch series which is under review.
> >>> > > 
> >>> > > USB driver patches are taken into Greg KH usb-next tree. Is it possible
> >>> > > to include this patch for 2.6.38?
> >> > 
> >> > I don't control Greg's tree, so I don't know what his policies are
> >> > regarding patch acceptance ..
> > They are like any other patch acceptance rules, what specifically is the
> > issue here?
> 
> The board support patches ( [PATCH 1/2] MSM: Add USB suport for QSD8x50)
> are dependent on USB OTG driver patches ([PATCH V3 00/11] Add MSM USB
> controller driver). The USB OTG driver patches are in your
> usb-next tree. Where should board support patches go? MSM tree/ USB tree?

MSM tree would make sense, right?

thanks,

greg k-h

Re: [PATCH 1/2] MSM: Add USB suport for QSD8x50

[David Brown]

On Thu, Dec 16, 2010 at 01:37:28PM -0800, Greg KH wrote:

> > The board support patches ( [PATCH 1/2] MSM: Add USB suport for QSD8x50)
> > are dependent on USB OTG driver patches ([PATCH V3 00/11] Add MSM USB
> > controller driver). The USB OTG driver patches are in your
> > usb-next tree. Where should board support patches go? MSM tree/ USB tree?
> 
> MSM tree would make sense, right?

I'll include this in MSM.

David

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.