Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a92fe80 authored by Sahitya Tummala's avatar Sahitya Tummala Committed by Chris Ball
Browse files

msm: mmc: Remove "pio_irq" resource 



On some targets, MCI_IRQ_MASK1 is not routed to the MSM in which
case only "cmd_irq" must be used even for PIO. With this change,
all the targets will use only "cmd_irq" for both CMD and PIO.

Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 514d9eda

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

+0 −24
Original line number Diff line number Diff line
@@ -175,12 +175,6 @@ static struct resource resources_sdc1[] = { 
		.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"
@@ -203,12 +197,6 @@ static struct resource resources_sdc2[] = { 
		.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,
@@ -232,12 +220,6 @@ static struct resource resources_sdc3[] = { 
		.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,
@@ -261,12 +243,6 @@ static struct resource resources_sdc4[] = { 
		.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,

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

+0 −24
Original line number Diff line number Diff line
@@ -139,12 +139,6 @@ static struct resource resources_sdc1[] = { 
		.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"
@@ -167,12 +161,6 @@ static struct resource resources_sdc2[] = { 
		.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,
@@ -196,12 +184,6 @@ static struct resource resources_sdc3[] = { 
		.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,
@@ -225,12 +207,6 @@ static struct resource resources_sdc4[] = { 
		.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,

drivers/mmc/host/msm_sdcc.c

+2 −6
Original line number Diff line number Diff line
@@ -1159,7 +1159,6 @@ msmsdcc_probe(struct platform_device *pdev) 
	struct msmsdcc_host *host;

	struct mmc_host *mmc;

	struct resource *cmd_irqres = NULL;

	struct resource *pio_irqres = NULL;

	struct resource *stat_irqres = NULL;

	struct resource *memres = NULL;

	struct resource *dmares = NULL;
@@ -1184,12 +1183,10 @@ msmsdcc_probe(struct platform_device *pdev) 
	dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);

	cmd_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ,

						  "cmd_irq");

	pio_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ,

						  "pio_irq");

	stat_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ,

						   "status_irq");



	if (!cmd_irqres || !pio_irqres || !memres) {

	if (!cmd_irqres || !memres) {

		pr_err("%s: Invalid resource\n", __func__);

		return -ENXIO;

	}
@@ -1219,7 +1216,6 @@ msmsdcc_probe(struct platform_device *pdev) 
	}



	host->cmd_irqres = cmd_irqres;

	host->pio_irqres = pio_irqres;

	host->memres = memres;

	host->dmares = dmares;

	spin_lock_init(&host->lock);
@@ -1336,7 +1332,7 @@ msmsdcc_probe(struct platform_device *pdev) 
	if (ret)

		goto stat_irq_free;



	ret = request_irq(pio_irqres->start, msmsdcc_pio_irq, IRQF_SHARED,

	ret = request_irq(cmd_irqres->start, msmsdcc_pio_irq, IRQF_SHARED,

			  DRIVER_NAME " (pio)", host);

	if (ret)

		goto cmd_irq_free;

drivers/mmc/host/msm_sdcc.h

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ struct msmsdcc_stats { 


struct msmsdcc_host {

	struct resource		*cmd_irqres;

	struct resource		*pio_irqres;

	struct resource		*memres;

	struct resource		*dmares;

	void __iomem		*base;