Skip to content

Commit f54005b

Browse files
linuswstorulf
linusw
authored and
storulf
committed
mmc: pxa: Use GPIO descriptor for power
After converting the PXA driver to use GPIO descriptors for card detect and write protect it is relatively simple to convert it to also use a descriptor for getting the optional power control GPIO. The polarity inversion flag can also go away from the platform data since this is indicated in the GPIO machine descriptor table. Cc: Daniel Mack <daniel@zonque.org> Cc: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Bartosz Golaszewski <brgl@bgdev.pl> Cc: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 80a68f3 commit f54005b

37 files changed

+53
-79
lines changed

‎arch/arm/mach-pxa/balloon3.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ static unsigned long balloon3_mmc_pin_config[] __initdata = {
290290

291291
static struct pxamci_platform_data balloon3_mci_platform_data = {
292292
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
293-
.gpio_power = -1,
294293
.detect_delay_ms = 200,
295294
};
296295

‎arch/arm/mach-pxa/cm-x270.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,16 @@ static inline void cmx270_init_ohci(void) {}
289289
#if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)
290290
static struct pxamci_platform_data cmx270_mci_platform_data = {
291291
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
292-
.gpio_power = GPIO105_MMC_POWER,
293-
.gpio_power_invert = 1,
294292
};
295293

296294
static struct gpiod_lookup_table cmx270_mci_gpio_table = {
297295
.dev_id = "pxa2xx-mci.0",
298296
.table = {
299297
/* Card detect on GPIO 83 */
300298
GPIO_LOOKUP("gpio-pxa", GPIO83_MMC_IRQ, "cd", GPIO_ACTIVE_LOW),
299+
/* Power on GPIO 105 */
300+
GPIO_LOOKUP("gpio-pxa", GPIO105_MMC_POWER,
301+
"power", GPIO_ACTIVE_LOW),
301302
{ },
302303
},
303304
};

‎arch/arm/mach-pxa/cm-x300.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ static inline void cm_x300_init_nand(void) {}
459459
static struct pxamci_platform_data cm_x300_mci_platform_data = {
460460
.detect_delay_ms = 200,
461461
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
462-
.gpio_power = -1,
463462
};
464463

465464
static struct gpiod_lookup_table cm_x300_mci_gpio_table = {
@@ -491,7 +490,6 @@ static struct pxamci_platform_data cm_x300_mci2_platform_data = {
491490
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
492491
.init = cm_x300_mci2_init,
493492
.exit = cm_x300_mci2_exit,
494-
.gpio_power = -1,
495493
};
496494

497495
static void __init cm_x300_init_mmc(void)

‎arch/arm/mach-pxa/colibri-pxa270-income.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
5252
static struct pxamci_platform_data income_mci_platform_data = {
5353
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
54-
.gpio_power = -1,
5554
.detect_delay_ms = 200,
5655
};
5756

‎arch/arm/mach-pxa/corgi.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ static struct platform_device corgi_audio_device = {
494494
static struct pxamci_platform_data corgi_mci_platform_data = {
495495
.detect_delay_ms = 250,
496496
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
497-
.gpio_power = CORGI_GPIO_SD_PWR,
498497
};
499498

500499
static struct gpiod_lookup_table corgi_mci_gpio_table = {
@@ -506,6 +505,9 @@ static struct gpiod_lookup_table corgi_mci_gpio_table = {
506505
/* Write protect on GPIO 7 */
507506
GPIO_LOOKUP("gpio-pxa", CORGI_GPIO_nSD_WP,
508507
"wp", GPIO_ACTIVE_LOW),
508+
/* Power on GPIO 33 */
509+
GPIO_LOOKUP("gpio-pxa", CORGI_GPIO_SD_PWR,
510+
"power", GPIO_ACTIVE_HIGH),
509511
{ },
510512
},
511513
};

‎arch/arm/mach-pxa/csb726.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ static struct pxamci_platform_data csb726_mci = {
129129
.detect_delay_ms = 500,
130130
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
131131
/* FIXME setpower */
132-
.gpio_power = -1,
133132
};
134133

135134
static struct gpiod_lookup_table csb726_mci_gpio_table = {

‎arch/arm/mach-pxa/em-x270.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,6 @@ static struct pxamci_platform_data em_x270_mci_platform_data = {
630630
.init = em_x270_mci_init,
631631
.setpower = em_x270_mci_setpower,
632632
.exit = em_x270_mci_exit,
633-
.gpio_power = -1,
634633
};
635634

636635
static void __init em_x270_init_mmc(void)

‎arch/arm/mach-pxa/gumstix.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ static struct platform_device *devices[] __initdata = {
9090
#ifdef CONFIG_MMC_PXA
9191
static struct pxamci_platform_data gumstix_mci_platform_data = {
9292
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
93-
.gpio_power = -1,
9493
};
9594

9695
static void __init gumstix_mmc_init(void)

‎arch/arm/mach-pxa/idp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ static struct pxafb_mach_info sharp_lm8v31 = {
160160

161161
static struct pxamci_platform_data idp_mci_platform_data = {
162162
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
163-
.gpio_power = -1,
164163
};
165164

166165
static void __init idp_init(void)

‎arch/arm/mach-pxa/littleton.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ static inline void littleton_init_keypad(void) {}
276276
static struct pxamci_platform_data littleton_mci_platform_data = {
277277
.detect_delay_ms = 200,
278278
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
279-
.gpio_power = -1,
280279
};
281280

282281
static struct gpiod_lookup_table littleton_mci_gpio_table = {

‎arch/arm/mach-pxa/lubbock.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ static struct pxamci_platform_data lubbock_mci_platform_data = {
440440
.init = lubbock_mci_init,
441441
.get_ro = lubbock_mci_get_ro,
442442
.exit = lubbock_mci_exit,
443-
.gpio_power = -1,
444443
};
445444

446445
static void lubbock_irda_transceiver_mode(struct device *dev, int mode)

‎arch/arm/mach-pxa/magician.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,6 @@ static struct pxamci_platform_data magician_mci_info = {
776776
.init = magician_mci_init,
777777
.exit = magician_mci_exit,
778778
.gpio_card_ro_invert = 1,
779-
.gpio_power = EGPIO_MAGICIAN_SD_POWER,
780779
};
781780

782781
/*
@@ -785,12 +784,19 @@ static struct pxamci_platform_data magician_mci_info = {
785784
* particular chip.
786785
*/
787786
#define EGPIO_MAGICIAN_nSD_READONLY_OFFSET 12
787+
/*
788+
* Power on EGPIO register 2 index 0, so this is on the first HTC EGPIO chip
789+
* starting at register 0 so we need offset 2*8+0 = 16 on that chip.
790+
*/
791+
#define EGPIO_MAGICIAN_nSD_POWER_OFFSET 16
788792

789793
static struct gpiod_lookup_table magician_mci_gpio_table = {
790794
.dev_id = "pxa2xx-mci.0",
791795
.table = {
792796
GPIO_LOOKUP("htc-egpio-1", EGPIO_MAGICIAN_nSD_READONLY_OFFSET,
793797
"wp", GPIO_ACTIVE_HIGH),
798+
GPIO_LOOKUP("htc-egpio-0", EGPIO_MAGICIAN_nSD_POWER_OFFSET,
799+
"power", GPIO_ACTIVE_HIGH),
794800
{ },
795801
},
796802
};

‎arch/arm/mach-pxa/mainstone.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@ static struct pxamci_platform_data mainstone_mci_platform_data = {
361361
.init = mainstone_mci_init,
362362
.setpower = mainstone_mci_setpower,
363363
.exit = mainstone_mci_exit,
364-
.gpio_power = -1,
365364
};
366365

367366
static void mainstone_irda_transceiver_mode(struct device *dev, int mode)

‎arch/arm/mach-pxa/mioa701.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ struct gpio_vbus_mach_info gpio_vbus_data = {
398398
static struct pxamci_platform_data mioa701_mci_info = {
399399
.detect_delay_ms = 250,
400400
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
401-
.gpio_power = GPIO91_SDIO_EN,
402401
};
403402

404403
static struct gpiod_lookup_table mioa701_mci_gpio_table = {
@@ -410,6 +409,9 @@ static struct gpiod_lookup_table mioa701_mci_gpio_table = {
410409
/* Write protect on GPIO 78 */
411410
GPIO_LOOKUP("gpio-pxa", GPIO78_SDIO_RO,
412411
"wp", GPIO_ACTIVE_LOW),
412+
/* Power on GPIO 91 */
413+
GPIO_LOOKUP("gpio-pxa", GPIO91_SDIO_EN,
414+
"power", GPIO_ACTIVE_HIGH),
413415
{ },
414416
},
415417
};

‎arch/arm/mach-pxa/mxm8x10.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ static mfp_cfg_t mfp_cfg[] __initdata = {
326326
static struct pxamci_platform_data mxm_8x10_mci_platform_data = {
327327
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
328328
.detect_delay_ms = 10,
329-
.gpio_power = -1
330329
};
331330

332331
static struct gpiod_lookup_table mxm_8x10_mci_gpio_table = {

‎arch/arm/mach-pxa/palm27x.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,8 @@ static struct pxamci_platform_data palm27x_mci_platform_data = {
4949
.detect_delay_ms = 200,
5050
};
5151

52-
void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,
53-
int power,
54-
int power_inverted)
52+
void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable)
5553
{
56-
palm27x_mci_platform_data.gpio_power = power;
57-
palm27x_mci_platform_data.gpio_power_invert = power_inverted;
58-
5954
if (gtable)
6055
gpiod_add_lookup_table(gtable);
6156
pxa_set_mci_info(&palm27x_mci_platform_data);

‎arch/arm/mach-pxa/palm27x.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
#include <linux/gpio/machine.h>
1616

1717
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
18-
extern void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,
19-
int power,
20-
int power_inverted);
18+
extern void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable);
2119
#else
22-
static inline void palm27x_mmc_init(struct gpiod_lookup_table *gtable,
23-
int power,
24-
int power_inverted)
20+
static inline void palm27x_mmc_init(struct gpiod_lookup_table *gtable)
2521
{}
2622
#endif
2723

‎arch/arm/mach-pxa/palmld.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@ static struct gpiod_lookup_table palmld_mci_gpio_table = {
327327
"cd", GPIO_ACTIVE_LOW),
328328
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMLD_SD_READONLY,
329329
"wp", GPIO_ACTIVE_LOW),
330+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMLD_SD_POWER,
331+
"power", GPIO_ACTIVE_HIGH),
330332
{ },
331333
},
332334
};
@@ -338,8 +340,7 @@ static void __init palmld_init(void)
338340
pxa_set_btuart_info(NULL);
339341
pxa_set_stuart_info(NULL);
340342

341-
palm27x_mmc_init(&palmld_mci_gpio_table,
342-
GPIO_NR_PALMLD_SD_POWER, 0);
343+
palm27x_mmc_init(&palmld_mci_gpio_table);
343344
palm27x_pm_init(PALMLD_STR_BASE);
344345
palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
345346
palm27x_irda_init(GPIO_NR_PALMLD_IR_DISABLE);

‎arch/arm/mach-pxa/palmt5.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ static struct gpiod_lookup_table palmt5_mci_gpio_table = {
189189
"cd", GPIO_ACTIVE_LOW),
190190
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMT5_SD_READONLY,
191191
"wp", GPIO_ACTIVE_LOW),
192+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMT5_SD_POWER,
193+
"power", GPIO_ACTIVE_HIGH),
192194
{ },
193195
},
194196
};
@@ -200,8 +202,7 @@ static void __init palmt5_init(void)
200202
pxa_set_btuart_info(NULL);
201203
pxa_set_stuart_info(NULL);
202204

203-
palm27x_mmc_init(&palmt5_mci_gpio_table,
204-
GPIO_NR_PALMT5_SD_POWER, 0);
205+
palm27x_mmc_init(&palmt5_mci_gpio_table);
205206
palm27x_pm_init(PALMT5_STR_BASE);
206207
palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
207208
palm27x_udc_init(GPIO_NR_PALMT5_USB_DETECT_N,

‎arch/arm/mach-pxa/palmtc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ static unsigned long palmtc_pin_config[] __initdata = {
120120
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
121121
static struct pxamci_platform_data palmtc_mci_platform_data = {
122122
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
123-
.gpio_power = GPIO_NR_PALMTC_SD_POWER,
124123
.detect_delay_ms = 200,
125124
};
126125

@@ -131,6 +130,8 @@ static struct gpiod_lookup_table palmtc_mci_gpio_table = {
131130
"cd", GPIO_ACTIVE_LOW),
132131
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTC_SD_READONLY,
133132
"wp", GPIO_ACTIVE_LOW),
133+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTC_SD_POWER,
134+
"power", GPIO_ACTIVE_HIGH),
134135
{ },
135136
},
136137
};

‎arch/arm/mach-pxa/palmte2.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ static unsigned long palmte2_pin_config[] __initdata = {
102102
******************************************************************************/
103103
static struct pxamci_platform_data palmte2_mci_platform_data = {
104104
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
105-
.gpio_power = GPIO_NR_PALMTE2_SD_POWER,
106105
};
107106

108107
static struct gpiod_lookup_table palmte2_mci_gpio_table = {
@@ -112,6 +111,8 @@ static struct gpiod_lookup_table palmte2_mci_gpio_table = {
112111
"cd", GPIO_ACTIVE_LOW),
113112
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTE2_SD_READONLY,
114113
"wp", GPIO_ACTIVE_LOW),
114+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTE2_SD_POWER,
115+
"power", GPIO_ACTIVE_HIGH),
115116
{ },
116117
},
117118
};

‎arch/arm/mach-pxa/palmtreo.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ static struct gpiod_lookup_table treo680_mci_gpio_table = {
487487
"cd", GPIO_ACTIVE_LOW),
488488
GPIO_LOOKUP("gpio-pxa", GPIO_NR_TREO680_SD_READONLY,
489489
"wp", GPIO_ACTIVE_LOW),
490+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_TREO680_SD_POWER,
491+
"power", GPIO_ACTIVE_HIGH),
490492
{ },
491493
},
492494
};
@@ -496,8 +498,7 @@ static void __init treo680_init(void)
496498
pxa2xx_mfp_config(ARRAY_AND_SIZE(treo680_pin_config));
497499
palmphone_common_init();
498500
treo680_gpio_init();
499-
palm27x_mmc_init(&treo680_mci_gpio_table,
500-
GPIO_NR_TREO680_SD_POWER, 0);
501+
palm27x_mmc_init(&treo680_mci_gpio_table);
501502
}
502503
#endif
503504

@@ -508,6 +509,8 @@ static struct gpiod_lookup_table centro685_mci_gpio_table = {
508509
.table = {
509510
GPIO_LOOKUP("gpio-pxa", GPIO_NR_TREO_SD_DETECT_N,
510511
"cd", GPIO_ACTIVE_LOW),
512+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_CENTRO_SD_POWER,
513+
"power", GPIO_ACTIVE_LOW),
511514
{ },
512515
},
513516
};
@@ -516,8 +519,7 @@ static void __init centro_init(void)
516519
{
517520
pxa2xx_mfp_config(ARRAY_AND_SIZE(centro685_pin_config));
518521
palmphone_common_init();
519-
palm27x_mmc_init(&centro685_mci_gpio_table,
520-
GPIO_NR_CENTRO_SD_POWER, 1);
522+
palm27x_mmc_init(&centro685_mci_gpio_table);
521523
}
522524
#endif
523525

‎arch/arm/mach-pxa/palmtx.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,8 @@ static struct gpiod_lookup_table palmtx_mci_gpio_table = {
344344
"cd", GPIO_ACTIVE_LOW),
345345
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTX_SD_READONLY,
346346
"wp", GPIO_ACTIVE_LOW),
347+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTX_SD_POWER,
348+
"power", GPIO_ACTIVE_HIGH),
347349
{ },
348350
},
349351
};
@@ -355,8 +357,7 @@ static void __init palmtx_init(void)
355357
pxa_set_btuart_info(NULL);
356358
pxa_set_stuart_info(NULL);
357359

358-
palm27x_mmc_init(&palmtx_mci_gpio_table,
359-
GPIO_NR_PALMTX_SD_POWER, 0);
360+
palm27x_mmc_init(&palmtx_mci_gpio_table);
360361
palm27x_pm_init(PALMTX_STR_BASE);
361362
palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
362363
palm27x_udc_init(GPIO_NR_PALMTX_USB_DETECT_N,

‎arch/arm/mach-pxa/palmz72.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,8 @@ static struct gpiod_lookup_table palmz72_mci_gpio_table = {
393393
"cd", GPIO_ACTIVE_LOW),
394394
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMZ72_SD_RO,
395395
"wp", GPIO_ACTIVE_LOW),
396+
GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMZ72_SD_POWER_N,
397+
"power", GPIO_ACTIVE_LOW),
396398
{ },
397399
},
398400
};
@@ -407,8 +409,7 @@ static void __init palmz72_init(void)
407409
pxa_set_btuart_info(NULL);
408410
pxa_set_stuart_info(NULL);
409411

410-
palm27x_mmc_init(&palmz72_mci_gpio_table,
411-
GPIO_NR_PALMZ72_SD_POWER_N, 1);
412+
palm27x_mmc_init(&palmz72_mci_gpio_table);
412413
palm27x_lcd_init(-1, &palm_320x320_lcd_mode);
413414
palm27x_udc_init(GPIO_NR_PALMZ72_USB_DETECT_N,
414415
GPIO_NR_PALMZ72_USB_PULLUP, 0);

‎arch/arm/mach-pxa/pcm990-baseboard.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ static struct pxamci_platform_data pcm990_mci_platform_data = {
370370
.init = pcm990_mci_init,
371371
.setpower = pcm990_mci_setpower,
372372
.exit = pcm990_mci_exit,
373-
.gpio_power = -1,
374373
};
375374

376375
static struct pxaohci_platform_data pcm990_ohci_platform_data = {

‎arch/arm/mach-pxa/poodle.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ static struct pxamci_platform_data poodle_mci_platform_data = {
289289
.init = poodle_mci_init,
290290
.setpower = poodle_mci_setpower,
291291
.exit = poodle_mci_exit,
292-
.gpio_power = -1,
293292
};
294293

295294
static struct gpiod_lookup_table poodle_mci_gpio_table = {

‎arch/arm/mach-pxa/raumfeld.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,6 @@ static struct pxamci_platform_data raumfeld_mci_platform_data = {
749749
.init = raumfeld_mci_init,
750750
.exit = raumfeld_mci_exit,
751751
.detect_delay_ms = 200,
752-
.gpio_power = -1,
753752
};
754753

755754
/*

‎arch/arm/mach-pxa/spitz.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@ static struct pxamci_platform_data spitz_mci_platform_data = {
616616
.detect_delay_ms = 250,
617617
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
618618
.setpower = spitz_mci_setpower,
619-
.gpio_power = -1,
620619
};
621620

622621
static struct gpiod_lookup_table spitz_mci_gpio_table = {

‎arch/arm/mach-pxa/stargate2.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ static int imote2_mci_get_ro(struct device *dev)
436436
static struct pxamci_platform_data imote2_mci_platform_data = {
437437
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, /* default anyway */
438438
.get_ro = imote2_mci_get_ro,
439-
.gpio_power = -1,
440439
};
441440

442441
static struct gpio_led imote2_led_pins[] = {

0 commit comments

Comments
 (0)