From: David Brown <davidb@codeaurora.org>
Date: Fri, 28 Jan 2011 19:31:53 +0000 (-0800)
Subject: Merge branch 'msm-core' into for-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ecca8194c16bdf6cde99a2b29c23a77901cd61a6;p=deliverable%2Flinux.git

Merge branch 'msm-core' into for-next

* msm-core:
  msm: Clean up useless ifdefs
  msm: clock: Add support for more proc_comm clocks
  msm: clock: Invert debugfs directory layout
  msm: clock: Move debugfs code from clock.c to clock-debug.c
  msm: clock: Remove 7x30 and pcom includes from clock.h
  msm: clock: Remove unused code and definitions
  msm: Warning fix in trout gpio board file
  msm: Remove broken register definition from trout
---

ecca8194c16bdf6cde99a2b29c23a77901cd61a6
diff --cc arch/arm/mach-msm/devices-qsd8x50.c
index c9fa6552ff7d,4cbf89dda733..bd545f9e8c29
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@@ -125,196 -125,9 +126,197 @@@ struct platform_device msm_device_hsusb
  	},
  };
  
 +static struct resource resources_sdc1[] = {
 +	{
 +		.start	= MSM_SDC1_PHYS,
 +		.end	= MSM_SDC1_PHYS + MSM_SDC1_SIZE - 1,
 +		.flags	= IORESOURCE_MEM,
 +	},
 +	{
 +		.start	= INT_SDC1_0,
 +		.end	= INT_SDC1_0,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "cmd_irq",
 +	},
 +	{
 +		.start	= INT_SDC1_1,
 +		.end	= INT_SDC1_1,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "pio_irq",
 +	},
 +	{
 +		.flags	= IORESOURCE_IRQ | IORESOURCE_DISABLED,
 +		.name	= "status_irq"
 +	},
 +	{
 +		.start	= 8,
 +		.end	= 8,
 +		.flags	= IORESOURCE_DMA,
 +	},
 +};
 +
 +static struct resource resources_sdc2[] = {
 +	{
 +		.start	= MSM_SDC2_PHYS,
 +		.end	= MSM_SDC2_PHYS + MSM_SDC2_SIZE - 1,
 +		.flags	= IORESOURCE_MEM,
 +	},
 +	{
 +		.start	= INT_SDC2_0,
 +		.end	= INT_SDC2_0,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "cmd_irq",
 +	},
 +		{
 +		.start	= INT_SDC2_1,
 +		.end	= INT_SDC2_1,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "pio_irq",
 +	},
 +	{
 +		.flags	= IORESOURCE_IRQ | IORESOURCE_DISABLED,
 +		.name	= "status_irq"
 +	},
 +	{
 +		.start	= 8,
 +		.end	= 8,
 +		.flags	= IORESOURCE_DMA,
 +	},
 +};
 +
 +static struct resource resources_sdc3[] = {
 +	{
 +		.start	= MSM_SDC3_PHYS,
 +		.end	= MSM_SDC3_PHYS + MSM_SDC3_SIZE - 1,
 +		.flags	= IORESOURCE_MEM,
 +	},
 +	{
 +		.start	= INT_SDC3_0,
 +		.end	= INT_SDC3_0,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "cmd_irq",
 +	},
 +		{
 +		.start	= INT_SDC3_1,
 +		.end	= INT_SDC3_1,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "pio_irq",
 +	},
 +	{
 +		.flags	= IORESOURCE_IRQ | IORESOURCE_DISABLED,
 +		.name	= "status_irq"
 +	},
 +	{
 +		.start	= 8,
 +		.end	= 8,
 +		.flags	= IORESOURCE_DMA,
 +	},
 +};
 +
 +static struct resource resources_sdc4[] = {
 +	{
 +		.start	= MSM_SDC4_PHYS,
 +		.end	= MSM_SDC4_PHYS + MSM_SDC4_SIZE - 1,
 +		.flags	= IORESOURCE_MEM,
 +	},
 +	{
 +		.start	= INT_SDC4_0,
 +		.end	= INT_SDC4_0,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "cmd_irq",
 +	},
 +		{
 +		.start	= INT_SDC4_1,
 +		.end	= INT_SDC4_1,
 +		.flags	= IORESOURCE_IRQ,
 +		.name	= "pio_irq",
 +	},
 +	{
 +		.flags	= IORESOURCE_IRQ | IORESOURCE_DISABLED,
 +		.name	= "status_irq"
 +	},
 +	{
 +		.start	= 8,
 +		.end	= 8,
 +		.flags	= IORESOURCE_DMA,
 +	},
 +};
 +
 +struct platform_device msm_device_sdc1 = {
 +	.name		= "msm_sdcc",
 +	.id		= 1,
 +	.num_resources	= ARRAY_SIZE(resources_sdc1),
 +	.resource	= resources_sdc1,
 +	.dev		= {
 +		.coherent_dma_mask	= 0xffffffff,
 +	},
 +};
 +
 +struct platform_device msm_device_sdc2 = {
 +	.name		= "msm_sdcc",
 +	.id		= 2,
 +	.num_resources	= ARRAY_SIZE(resources_sdc2),
 +	.resource	= resources_sdc2,
 +	.dev		= {
 +		.coherent_dma_mask	= 0xffffffff,
 +	},
 +};
 +
 +struct platform_device msm_device_sdc3 = {
 +	.name		= "msm_sdcc",
 +	.id		= 3,
 +	.num_resources	= ARRAY_SIZE(resources_sdc3),
 +	.resource	= resources_sdc3,
 +	.dev		= {
 +		.coherent_dma_mask	= 0xffffffff,
 +	},
 +};
 +
 +struct platform_device msm_device_sdc4 = {
 +	.name		= "msm_sdcc",
 +	.id		= 4,
 +	.num_resources	= ARRAY_SIZE(resources_sdc4),
 +	.resource	= resources_sdc4,
 +	.dev		= {
 +		.coherent_dma_mask	= 0xffffffff,
 +	},
 +};
 +
 +static struct platform_device *msm_sdcc_devices[] __initdata = {
 +	&msm_device_sdc1,
 +	&msm_device_sdc2,
 +	&msm_device_sdc3,
 +	&msm_device_sdc4,
 +};
 +
 +int __init msm_add_sdcc(unsigned int controller,
 +			struct msm_mmc_platform_data *plat,
 +			unsigned int stat_irq, unsigned long stat_irq_flags)
 +{
 +	struct platform_device	*pdev;
 +	struct resource *res;
 +
 +	if (controller < 1 || controller > 4)
 +		return -EINVAL;
 +
 +	pdev = msm_sdcc_devices[controller-1];
 +	pdev->dev.platform_data = plat;
 +
 +	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "status_irq");
 +	if (!res)
 +		return -EINVAL;
 +	else if (stat_irq) {
 +		res->start = res->end = stat_irq;
 +		res->flags &= ~IORESOURCE_DISABLED;
 +		res->flags |= stat_irq_flags;
 +	}
 +
 +	return platform_device_register(pdev);
 +}
 +
  struct clk msm_clocks_8x50[] = {
  	CLK_PCOM("adm_clk",	ADM_CLK,	NULL, 0),
+ 	CLK_PCOM("ce_clk",	CE_CLK,		NULL, 0),
  	CLK_PCOM("ebi1_clk",	EBI1_CLK,	NULL, CLK_MIN),
  	CLK_PCOM("ebi2_clk",	EBI2_CLK,	NULL, 0),
  	CLK_PCOM("ecodec_clk",	ECODEC_CLK,	NULL, 0),