Commit c6d92e9b authored by David Brown's avatar David Brown
Browse files

Merge branch 'msm-usb' into for-next 

* msm-usb:
  MSM: Add USB support for MSM7x30
  MSM: Add USB suport for QSD8x50
parents ba119204 5155e2c7

arch/arm/mach-msm/board-msm7x30.c

+20 −0
Original line number Diff line number Diff line
@@ -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));

}

arch/arm/mach-msm/board-qsd8x50.c

+19 −0
Original line number Diff line number Diff line
@@ -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));

}

arch/arm/mach-msm/devices-msm7x30.c

+72 −0
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-msm/devices-qsd8x50.c

+71 −0
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-msm/devices.h

+2 −0
Original line number Diff line number Diff line
@@ -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;