From e91957e70d2aea529ff2055b8fbd575f2d7b8c3b Mon Sep 17 00:00:00 2001 From: Alexander Tarasikov Date: Sun, 21 Aug 2011 15:52:44 +0400 Subject: msm: Implement init_card operation for MSM SDCC This allows boards with non-standard sdio cards to fill the CIS/CCCR data. It is particularly important for old msm72k boards using wl1251. Also drop the obsolete embedded_sdio_data structure from the header as it was intended to surve a similiar purpose but was not implemented. Signed-off-by: Alexander Tarasikov Acked-by: Sahitya Tummala [davidb: minor formatting cleanup] Signed-off-by: David Brown Signed-off-by: Chris Ball --- arch/arm/mach-msm/include/mach/mmc.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'arch/arm/mach-msm') diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h index 5631b51cec4..ffcd9e3a6a7 100644 --- a/arch/arm/mach-msm/include/mach/mmc.h +++ b/arch/arm/mach-msm/include/mach/mmc.h @@ -8,13 +8,6 @@ #include #include -struct embedded_sdio_data { - struct sdio_cis cis; - struct sdio_cccr cccr; - struct sdio_embedded_func *funcs; - int num_funcs; -}; - struct msm_mmc_gpio { unsigned no; const char *name; @@ -29,9 +22,9 @@ struct msm_mmc_platform_data { unsigned int ocr_mask; /* available voltages */ u32 (*translate_vdd)(struct device *, unsigned int); unsigned int (*status)(struct device *); - struct embedded_sdio_data *embedded_sdio; int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id); struct msm_mmc_gpio_data *gpio_data; + void (*init_card)(struct mmc_card *card); }; #endif -- cgit v1.2.2 From 4a92fe80becbbee650cfad8457ad0e5cd97ed974 Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Mon, 2 May 2011 18:07:43 +0530 Subject: 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: Sahitya Tummala Signed-off-by: David Brown Signed-off-by: Chris Ball --- arch/arm/mach-msm/devices-msm7x00.c | 24 ------------------------ arch/arm/mach-msm/devices-qsd8x50.c | 24 ------------------------ 2 files changed, 48 deletions(-) (limited to 'arch/arm/mach-msm') diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c index c4f5e26feb4..993780f490a 100644 --- a/arch/arm/mach-msm/devices-msm7x00.c +++ b/arch/arm/mach-msm/devices-msm7x00.c @@ -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, diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c index 12d8deb78d9..131633b12a3 100644 --- a/arch/arm/mach-msm/devices-qsd8x50.c +++ b/arch/arm/mach-msm/devices-qsd8x50.c @@ -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, -- cgit v1.2.2