diff options
Diffstat (limited to 'arch/arm/mach-msm/devices-msm7x30.c')
| -rw-r--r-- | arch/arm/mach-msm/devices-msm7x30.c | 129 | 
1 files changed, 121 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c index 7fcf2e3b769..c15ea8ab20a 100644 --- a/arch/arm/mach-msm/devices-msm7x30.c +++ b/arch/arm/mach-msm/devices-msm7x30.c @@ -1,6 +1,6 @@  /*   * Copyright (C) 2008 Google, Inc. - * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. + * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.   *   * This software is licensed under the terms of the GNU General Public   * License version 2, as published by the Free Software Foundation, and @@ -17,19 +17,52 @@  #include <linux/platform_device.h>  #include <linux/dma-mapping.h> +#include <linux/clkdev.h>  #include <mach/irqs.h>  #include <mach/msm_iomap.h>  #include <mach/dma.h> -#include <mach/board.h>  #include "devices.h"  #include "smd_private.h" +#include "common.h"  #include <asm/mach/flash.h> +#include "clock.h"  #include "clock-pcom.h" -#include <mach/mmc.h> +#include <linux/platform_data/mmc-msm_sdcc.h> + +static struct resource msm_gpio_resources[] = { +	{ +		.start	= 32 + 18, +		.end	= 32 + 18, +		.flags	= IORESOURCE_IRQ, +	}, +	{ +		.start	= 32 + 19, +		.end	= 32 + 19, +		.flags	= IORESOURCE_IRQ, +	}, +	{ +		.start	= 0xac001000, +		.end	= 0xac001000 + SZ_4K - 1, +		.flags	= IORESOURCE_MEM, +		.name  = "gpio1" +	}, +	{ +		.start	= 0xac101400, +		.end	= 0xac101400 + SZ_4K - 1, +		.flags	= IORESOURCE_MEM, +		.name  = "gpio2" +	}, +}; + +struct platform_device msm_device_gpio_7x30 = { +	.name	= "gpio-msm-7x30", +	.num_resources	= ARRAY_SIZE(msm_gpio_resources), +	.resource	= msm_gpio_resources, +};  static struct resource resources_uart2[] = {  	{ @@ -41,6 +74,7 @@ static struct resource resources_uart2[] = {  		.start	= MSM_UART2_PHYS,  		.end	= MSM_UART2_PHYS + MSM_UART2_SIZE - 1,  		.flags	= IORESOURCE_MEM, +		.name  = "uart_resource"  	},  }; @@ -56,11 +90,84 @@ struct platform_device msm_device_smd = {  	.id     = -1,  }; -struct clk msm_clocks_7x30[] = { +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, +	}, +}; + +static struct clk_pcom_desc msm_clocks_7x30[] = {  	CLK_PCOM("adm_clk",	ADM_CLK,	NULL, 0),  	CLK_PCOM("adsp_clk",	ADSP_CLK,	NULL, 0),  	CLK_PCOM("cam_m_clk",	CAM_M_CLK,	NULL, 0),  	CLK_PCOM("camif_pad_pclk",	CAMIF_PAD_P_CLK,	NULL, OFF), +	CLK_PCOM("ce_clk",	CE_CLK,	NULL, 0), +	CLK_PCOM("codec_ssbi_clk",	CODEC_SSBI_CLK,	NULL, 0),  	CLK_PCOM("ebi1_clk",	EBI1_CLK,	NULL, CLK_MIN),  	CLK_PCOM("ecodec_clk",	ECODEC_CLK,	NULL, 0),  	CLK_PCOM("emdh_clk",	EMDH_CLK,	NULL, OFF | CLK_MINMAX), @@ -70,7 +177,6 @@ struct clk msm_clocks_7x30[] = {  	CLK_PCOM("grp_2d_pclk",	GRP_2D_P_CLK,	NULL, 0),  	CLK_PCOM("grp_clk",	GRP_3D_CLK,	NULL, 0),  	CLK_PCOM("grp_pclk",	GRP_3D_P_CLK,	NULL, 0), -	CLK_7X30S("grp_src_clk", GRP_3D_SRC_CLK, GRP_3D_CLK,	NULL, 0),  	CLK_PCOM("hdmi_clk",	HDMI_CLK,	NULL, 0),  	CLK_PCOM("imem_clk",	IMEM_CLK,	NULL, OFF),  	CLK_PCOM("jpeg_clk",	JPEG_CLK,	NULL, OFF), @@ -103,10 +209,10 @@ struct clk msm_clocks_7x30[] = {  	CLK_PCOM("sdac_clk",	SDAC_CLK,	NULL, OFF),  	CLK_PCOM("spi_clk",	SPI_CLK,	NULL, 0),  	CLK_PCOM("spi_pclk",	SPI_P_CLK,	NULL, 0), -	CLK_7X30S("tv_src_clk",	TV_CLK, 	TV_ENC_CLK,	NULL, 0),  	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("core",	UART2_CLK,	"msm_serial.1", 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), @@ -129,5 +235,12 @@ struct clk msm_clocks_7x30[] = {  	CLK_PCOM("csi_vfe_clk",	CSI0_VFE_CLK,	NULL, 0),  }; -unsigned msm_num_clocks_7x30 = ARRAY_SIZE(msm_clocks_7x30); +static struct pcom_clk_pdata msm_clock_7x30_pdata = { +	.lookup = msm_clocks_7x30, +	.num_lookups = ARRAY_SIZE(msm_clocks_7x30), +}; +struct platform_device msm_clock_7x30 = { +	.name = "msm-clock-pcom", +	.dev.platform_data = &msm_clock_7x30_pdata, +};  | 
