History

ARM: pxa: Delete platform data for CD/WP

This deletes the platform data passed for card detect and write protect from various PXA machines. Make sure to keep .gpio_card_ro_invert as this is still in use by some machines and needed to set the right flag to the MMC core (will be cleaned up later).

Linus Walleij committed 7 years ago

Commit e114cd31 parent c914a2736 files · +6 −117Browse files

Unified · Split

36 files
  1. arch/arm/mach-pxa/balloon3.c +0 −2
  2. arch/arm/mach-pxa/cm-x270.c +0 −2
  3. arch/arm/mach-pxa/cm-x300.c +0 −4
  4. arch/arm/mach-pxa/colibri-evalboard.c +3 −14
  5. arch/arm/mach-pxa/colibri-pxa270-income.c +0 −2
  6. arch/arm/mach-pxa/corgi.c +0 −2
  7. arch/arm/mach-pxa/csb726.c +0 −2
  8. arch/arm/mach-pxa/em-x270.c +3 −22
  9. arch/arm/mach-pxa/gumstix.c +0 −2
  10. arch/arm/mach-pxa/idp.c +0 −2
  11. arch/arm/mach-pxa/littleton.c +0 −4
  12. arch/arm/mach-pxa/lubbock.c +0 −2
  13. arch/arm/mach-pxa/magician.c +0 −2
  14. arch/arm/mach-pxa/mainstone.c +0 −2
  15. arch/arm/mach-pxa/mioa701.c +0 −2
  16. arch/arm/mach-pxa/mxm8x10.c +0 −2
  17. arch/arm/mach-pxa/palm27x.c +0 −4
  18. arch/arm/mach-pxa/palm27x.h +0 −4
  19. arch/arm/mach-pxa/palmld.c +0 −2
  20. arch/arm/mach-pxa/palmt5.c +0 −2
  21. arch/arm/mach-pxa/palmtc.c +0 −2
  22. arch/arm/mach-pxa/palmte2.c +0 −2
  23. arch/arm/mach-pxa/palmtreo.c +0 −3
  24. arch/arm/mach-pxa/palmtx.c +0 −2
  25. arch/arm/mach-pxa/palmz72.c +0 −2
  26. arch/arm/mach-pxa/pcm990-baseboard.c +0 −2
  27. arch/arm/mach-pxa/poodle.c +0 −2
  28. arch/arm/mach-pxa/raumfeld.c +0 −2
  29. arch/arm/mach-pxa/spitz.c +0 −2
  30. arch/arm/mach-pxa/stargate2.c +0 −2
  31. arch/arm/mach-pxa/tosa.c +0 −2
  32. arch/arm/mach-pxa/trizeps4.c +0 −2
  33. arch/arm/mach-pxa/vpac270.c +0 −2
  34. arch/arm/mach-pxa/z2.c +0 −2
  35. arch/arm/mach-pxa/zeus.c +0 −2
  36. arch/arm/mach-pxa/zylonite.c +0 −6
arch/arm/mach-pxa/balloon3.c+0−2
@@ -290,8 +290,6 @@ static unsigned long balloon3_mmc_pin_config[] __initdata = { · 289 unmodified lines
290 290
291static struct pxamci_platform_data balloon3_mci_platform_data = {291static struct pxamci_platform_data balloon3_mci_platform_data = {
292 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,292 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
293 .gpio_card_detect = -1,
294 .gpio_card_ro = -1,
295 .gpio_power = -1,293 .gpio_power = -1,
296 .detect_delay_ms = 200,294 .detect_delay_ms = 200,
297};295};
arch/arm/mach-pxa/cm-x270.c+0−2
@@ -289,8 +289,6 @@ static inline void cmx270_init_ohci(void) {} · 288 unmodified lines
289#if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)289#if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE)
290static struct pxamci_platform_data cmx270_mci_platform_data = {290static struct pxamci_platform_data cmx270_mci_platform_data = {
291 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,291 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
292 .gpio_card_detect = GPIO83_MMC_IRQ,
293 .gpio_card_ro = -1,
294 .gpio_power = GPIO105_MMC_POWER,292 .gpio_power = GPIO105_MMC_POWER,
295 .gpio_power_invert = 1,293 .gpio_power_invert = 1,
296};294};
arch/arm/mach-pxa/cm-x300.c+0−4
@@ -459,8 +459,6 @@ static inline void cm_x300_init_nand(void) {} · 458 unmodified lines
459static struct pxamci_platform_data cm_x300_mci_platform_data = {459static struct pxamci_platform_data cm_x300_mci_platform_data = {
460 .detect_delay_ms = 200,460 .detect_delay_ms = 200,
461 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,461 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
462 .gpio_card_detect = GPIO82_MMC_IRQ,
463 .gpio_card_ro = GPIO85_MMC_WP,
464 .gpio_power = -1,462 .gpio_power = -1,
465};463};
466 464
@@ -493,8 +491,6 @@ static struct pxamci_platform_data cm_x300_mci2_platform_data = { · 26 unmodified lines
493 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,491 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
494 .init = cm_x300_mci2_init,492 .init = cm_x300_mci2_init,
495 .exit = cm_x300_mci2_exit,493 .exit = cm_x300_mci2_exit,
496 .gpio_card_detect = -1,
497 .gpio_card_ro = -1,
498 .gpio_power = -1,494 .gpio_power = -1,
499};495};
500 496
arch/arm/mach-pxa/colibri-evalboard.c+3−14
@@ -37,8 +37,6 @@ · 36 unmodified lines
37#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)37#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
38static struct pxamci_platform_data colibri_mci_platform_data = {38static struct pxamci_platform_data colibri_mci_platform_data = {
39 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,39 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
40 .gpio_power = -1,
41 .gpio_card_ro = -1,
42 .detect_delay_ms = 200,40 .detect_delay_ms = 200,
43};41};
44 42
@@ -71,21 +69,12 @@ static struct gpiod_lookup_table colibri_pxa320_mci_gpio_table = { · 26 unmodified lines
71 69
72static void __init colibri_mmc_init(void)70static void __init colibri_mmc_init(void)
73{71{
74 if (machine_is_colibri()) { /* PXA270 Colibri */72 if (machine_is_colibri()) /* PXA270 Colibri */
75 colibri_mci_platform_data.gpio_card_detect =
76 GPIO0_COLIBRI_PXA270_SD_DETECT;
77 gpiod_add_lookup_table(&colibri_pxa270_mci_gpio_table);73 gpiod_add_lookup_table(&colibri_pxa270_mci_gpio_table);
78 }74 if (machine_is_colibri300()) /* PXA300 Colibri */
79 if (machine_is_colibri300()) { /* PXA300 Colibri */
80 colibri_mci_platform_data.gpio_card_detect =
81 GPIO13_COLIBRI_PXA300_SD_DETECT;
82 gpiod_add_lookup_table(&colibri_pxa300_mci_gpio_table);75 gpiod_add_lookup_table(&colibri_pxa300_mci_gpio_table);
83 }76 else /* PXA320 Colibri */
84 else { /* PXA320 Colibri */
85 colibri_mci_platform_data.gpio_card_detect =
86 GPIO28_COLIBRI_PXA320_SD_DETECT;
87 gpiod_add_lookup_table(&colibri_pxa320_mci_gpio_table);77 gpiod_add_lookup_table(&colibri_pxa320_mci_gpio_table);
88 }
89 78
90 pxa_set_mci_info(&colibri_mci_platform_data);79 pxa_set_mci_info(&colibri_mci_platform_data);
91}80}
arch/arm/mach-pxa/colibri-pxa270-income.c+0−2
@@ -52,8 +52,6 @@ · 51 unmodified lines
52static struct pxamci_platform_data income_mci_platform_data = {52static struct pxamci_platform_data income_mci_platform_data = {
53 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,53 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
54 .gpio_power = -1,54 .gpio_power = -1,
55 .gpio_card_detect = GPIO0_INCOME_SD_DETECT,
56 .gpio_card_ro = GPIO0_INCOME_SD_RO,
57 .detect_delay_ms = 200,55 .detect_delay_ms = 200,
58};56};
59 57
arch/arm/mach-pxa/corgi.c+0−2
@@ -494,8 +494,6 @@ static struct platform_device corgi_audio_device = { · 493 unmodified lines
494static struct pxamci_platform_data corgi_mci_platform_data = {494static struct pxamci_platform_data corgi_mci_platform_data = {
495 .detect_delay_ms = 250,495 .detect_delay_ms = 250,
496 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,496 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
497 .gpio_card_detect = CORGI_GPIO_nSD_DETECT,
498 .gpio_card_ro = CORGI_GPIO_nSD_WP,
499 .gpio_power = CORGI_GPIO_SD_PWR,497 .gpio_power = CORGI_GPIO_SD_PWR,
500};498};
501 499
arch/arm/mach-pxa/csb726.c+0−2
@@ -129,8 +129,6 @@ static struct pxamci_platform_data csb726_mci = { · 128 unmodified lines
129 .detect_delay_ms = 500,129 .detect_delay_ms = 500,
130 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,130 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
131 /* FIXME setpower */131 /* FIXME setpower */
132 .gpio_card_detect = CSB726_GPIO_MMC_DETECT,
133 .gpio_card_ro = CSB726_GPIO_MMC_RO,
134 .gpio_power = -1,132 .gpio_power = -1,
135};133};
136 134
arch/arm/mach-pxa/em-x270.c+3−22
@@ -577,15 +577,7 @@ static int em_x270_mci_init(struct device *dev, · 576 unmodified lines
577 goto err_irq;577 goto err_irq;
578 }578 }
579 579
580 if (machine_is_em_x270()) {580 if (!machine_is_em_x270()) {
581 err = gpio_request(GPIO95_MMC_WP, "MMC WP");
582 if (err) {
583 dev_err(dev, "can't request MMC write protect: %d\n",
584 err);
585 goto err_gpio_wp;
586 }
587 gpio_direction_input(GPIO95_MMC_WP);
588 } else {
589 err = gpio_request(GPIO38_SD_PWEN, "sdio power");581 err = gpio_request(GPIO38_SD_PWEN, "sdio power");
590 if (err) {582 if (err) {
591 dev_err(dev, "can't request MMC power control : %d\n",583 dev_err(dev, "can't request MMC power control : %d\n",
@@ -625,17 +617,10 @@ static void em_x270_mci_exit(struct device *dev, void *data) · 33 unmodified lines
625 free_irq(gpio_to_irq(mmc_cd), data);617 free_irq(gpio_to_irq(mmc_cd), data);
626 regulator_put(em_x270_sdio_ldo);618 regulator_put(em_x270_sdio_ldo);
627 619
628 if (machine_is_em_x270())620 if (!machine_is_em_x270())
629 gpio_free(GPIO95_MMC_WP);
630 else
631 gpio_free(GPIO38_SD_PWEN);621 gpio_free(GPIO38_SD_PWEN);
632}622}
633 623
634static int em_x270_mci_get_ro(struct device *dev)
635{
636 return gpio_get_value(GPIO95_MMC_WP);
637}
638
639static struct pxamci_platform_data em_x270_mci_platform_data = {624static struct pxamci_platform_data em_x270_mci_platform_data = {
640 .detect_delay_ms = 250,625 .detect_delay_ms = 250,
641 .ocr_mask = MMC_VDD_20_21|MMC_VDD_21_22|MMC_VDD_22_23|626 .ocr_mask = MMC_VDD_20_21|MMC_VDD_21_22|MMC_VDD_22_23|
@@ -645,17 +630,13 @@ static struct pxamci_platform_data em_x270_mci_platform_data = { · 3 unmodified lines
645 .init = em_x270_mci_init,630 .init = em_x270_mci_init,
646 .setpower = em_x270_mci_setpower,631 .setpower = em_x270_mci_setpower,
647 .exit = em_x270_mci_exit,632 .exit = em_x270_mci_exit,
648 .gpio_card_detect = -1,
649 .gpio_card_ro = -1,
650 .gpio_power = -1,633 .gpio_power = -1,
651};634};
652 635
653static void __init em_x270_init_mmc(void)636static void __init em_x270_init_mmc(void)
654{637{
655 if (machine_is_em_x270()) {638 if (machine_is_em_x270())
656 em_x270_mci_platform_data.get_ro = em_x270_mci_get_ro;
657 gpiod_add_lookup_table(&em_x270_mci_wp_gpio_table);639 gpiod_add_lookup_table(&em_x270_mci_wp_gpio_table);
658 }
659 640
660 pxa_set_mci_info(&em_x270_mci_platform_data);641 pxa_set_mci_info(&em_x270_mci_platform_data);
661}642}
arch/arm/mach-pxa/gumstix.c+0−2
@@ -90,8 +90,6 @@ static struct platform_device *devices[] __initdata = { · 89 unmodified lines
90#ifdef CONFIG_MMC_PXA90#ifdef CONFIG_MMC_PXA
91static struct pxamci_platform_data gumstix_mci_platform_data = {91static struct pxamci_platform_data gumstix_mci_platform_data = {
92 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,92 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
93 .gpio_card_detect = -1,
94 .gpio_card_ro = -1,
95 .gpio_power = -1,93 .gpio_power = -1,
96};94};
97 95
arch/arm/mach-pxa/idp.c+0−2
@@ -160,8 +160,6 @@ static struct pxafb_mach_info sharp_lm8v31 = { · 159 unmodified lines
160 160
161static struct pxamci_platform_data idp_mci_platform_data = {161static struct pxamci_platform_data idp_mci_platform_data = {
162 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,162 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
163 .gpio_card_detect = -1,
164 .gpio_card_ro = -1,
165 .gpio_power = -1,163 .gpio_power = -1,
166};164};
167 165
arch/arm/mach-pxa/littleton.c+0−4
@@ -51,8 +51,6 @@ · 50 unmodified lines
51 51
52#include "generic.h"52#include "generic.h"
53 53
54#define GPIO_MMC1_CARD_DETECT mfp_to_gpio(MFP_PIN_GPIO15)
55
56/* Littleton MFP configurations */54/* Littleton MFP configurations */
57static mfp_cfg_t littleton_mfp_cfg[] __initdata = {55static mfp_cfg_t littleton_mfp_cfg[] __initdata = {
58 /* LCD */56 /* LCD */
@@ -278,8 +276,6 @@ static inline void littleton_init_keypad(void) {} · 219 unmodified lines
278static struct pxamci_platform_data littleton_mci_platform_data = {276static struct pxamci_platform_data littleton_mci_platform_data = {
279 .detect_delay_ms = 200,277 .detect_delay_ms = 200,
280 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,278 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
281 .gpio_card_detect = GPIO_MMC1_CARD_DETECT,
282 .gpio_card_ro = -1,
283 .gpio_power = -1,279 .gpio_power = -1,
284};280};
285 281
arch/arm/mach-pxa/lubbock.c+0−2
@@ -440,8 +440,6 @@ static struct pxamci_platform_data lubbock_mci_platform_data = { · 439 unmodified lines
440 .init = lubbock_mci_init,440 .init = lubbock_mci_init,
441 .get_ro = lubbock_mci_get_ro,441 .get_ro = lubbock_mci_get_ro,
442 .exit = lubbock_mci_exit,442 .exit = lubbock_mci_exit,
443 .gpio_card_detect = -1,
444 .gpio_card_ro = -1,
445 .gpio_power = -1,443 .gpio_power = -1,
446};444};
447 445
arch/arm/mach-pxa/magician.c+0−2
@@ -775,8 +775,6 @@ static struct pxamci_platform_data magician_mci_info = { · 774 unmodified lines
775 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,775 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
776 .init = magician_mci_init,776 .init = magician_mci_init,
777 .exit = magician_mci_exit,777 .exit = magician_mci_exit,
778 .gpio_card_detect = -1,
779 .gpio_card_ro = EGPIO_MAGICIAN_nSD_READONLY,
780 .gpio_card_ro_invert = 1,778 .gpio_card_ro_invert = 1,
781 .gpio_power = EGPIO_MAGICIAN_SD_POWER,779 .gpio_power = EGPIO_MAGICIAN_SD_POWER,
782};780};
arch/arm/mach-pxa/mainstone.c+0−2
@@ -361,8 +361,6 @@ static struct pxamci_platform_data mainstone_mci_platform_data = { · 360 unmodified lines
361 .init = mainstone_mci_init,361 .init = mainstone_mci_init,
362 .setpower = mainstone_mci_setpower,362 .setpower = mainstone_mci_setpower,
363 .exit = mainstone_mci_exit,363 .exit = mainstone_mci_exit,
364 .gpio_card_detect = -1,
365 .gpio_card_ro = -1,
366 .gpio_power = -1,364 .gpio_power = -1,
367};365};
368 366
arch/arm/mach-pxa/mioa701.c+0−2
@@ -398,8 +398,6 @@ struct gpio_vbus_mach_info gpio_vbus_data = { · 397 unmodified lines
398static struct pxamci_platform_data mioa701_mci_info = {398static struct pxamci_platform_data mioa701_mci_info = {
399 .detect_delay_ms = 250,399 .detect_delay_ms = 250,
400 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,400 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
401 .gpio_card_detect = GPIO15_SDIO_INSERT,
402 .gpio_card_ro = GPIO78_SDIO_RO,
403 .gpio_power = GPIO91_SDIO_EN,401 .gpio_power = GPIO91_SDIO_EN,
404};402};
405 403
arch/arm/mach-pxa/mxm8x10.c+0−2
@@ -326,8 +326,6 @@ static mfp_cfg_t mfp_cfg[] __initdata = { · 325 unmodified lines
326static struct pxamci_platform_data mxm_8x10_mci_platform_data = {326static struct pxamci_platform_data mxm_8x10_mci_platform_data = {
327 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,327 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
328 .detect_delay_ms = 10,328 .detect_delay_ms = 10,
329 .gpio_card_detect = MXM_8X10_SD_nCD,
330 .gpio_card_ro = MXM_8X10_SD_WP,
331 .gpio_power = -1329 .gpio_power = -1
332};330};
333 331
arch/arm/mach-pxa/palm27x.c+0−4
@@ -50,13 +50,9 @@ static struct pxamci_platform_data palm27x_mci_platform_data = { · 49 unmodified lines
50};50};
51 51
52void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,52void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,
53 int detect,
54 int ro,
55 int power,53 int power,
56 int power_inverted)54 int power_inverted)
57{55{
58 palm27x_mci_platform_data.gpio_card_detect = detect;
59 palm27x_mci_platform_data.gpio_card_ro = ro;
60 palm27x_mci_platform_data.gpio_power = power;56 palm27x_mci_platform_data.gpio_power = power;
61 palm27x_mci_platform_data.gpio_power_invert = power_inverted;57 palm27x_mci_platform_data.gpio_power_invert = power_inverted;
62 58
arch/arm/mach-pxa/palm27x.h+0−4
@@ -16,14 +16,10 @@ · 15 unmodified lines
16 16
17#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)17#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
18extern void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,18extern void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,
19 int detect,
20 int ro,
21 int power,19 int power,
22 int power_inverted);20 int power_inverted);
23#else21#else
24static inline void palm27x_mmc_init(struct gpiod_lookup_table *gtable,22static inline void palm27x_mmc_init(struct gpiod_lookup_table *gtable,
25 int detect,
26 int ro,
27 int power,23 int power,
28 int power_inverted)24 int power_inverted)
29{}25{}
arch/arm/mach-pxa/palmld.c+0−2
@@ -339,8 +339,6 @@ static void __init palmld_init(void) · 338 unmodified lines
339 pxa_set_stuart_info(NULL);339 pxa_set_stuart_info(NULL);
340 340
341 palm27x_mmc_init(&palmld_mci_gpio_table,341 palm27x_mmc_init(&palmld_mci_gpio_table,
342 GPIO_NR_PALMLD_SD_DETECT_N,
343 GPIO_NR_PALMLD_SD_READONLY,
344 GPIO_NR_PALMLD_SD_POWER, 0);342 GPIO_NR_PALMLD_SD_POWER, 0);
345 palm27x_pm_init(PALMLD_STR_BASE);343 palm27x_pm_init(PALMLD_STR_BASE);
346 palm27x_lcd_init(-1, &palm_320x480_lcd_mode);344 palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
arch/arm/mach-pxa/palmt5.c+0−2
@@ -201,8 +201,6 @@ static void __init palmt5_init(void) · 200 unmodified lines
201 pxa_set_stuart_info(NULL);201 pxa_set_stuart_info(NULL);
202 202
203 palm27x_mmc_init(&palmt5_mci_gpio_table,203 palm27x_mmc_init(&palmt5_mci_gpio_table,
204 GPIO_NR_PALMT5_SD_DETECT_N,
205 GPIO_NR_PALMT5_SD_READONLY,
206 GPIO_NR_PALMT5_SD_POWER, 0);204 GPIO_NR_PALMT5_SD_POWER, 0);
207 palm27x_pm_init(PALMT5_STR_BASE);205 palm27x_pm_init(PALMT5_STR_BASE);
208 palm27x_lcd_init(-1, &palm_320x480_lcd_mode);206 palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
arch/arm/mach-pxa/palmtc.c+0−2
@@ -121,8 +121,6 @@ static unsigned long palmtc_pin_config[] __initdata = { · 120 unmodified lines
121static struct pxamci_platform_data palmtc_mci_platform_data = {121static struct pxamci_platform_data palmtc_mci_platform_data = {
122 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,122 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
123 .gpio_power = GPIO_NR_PALMTC_SD_POWER,123 .gpio_power = GPIO_NR_PALMTC_SD_POWER,
124 .gpio_card_ro = GPIO_NR_PALMTC_SD_READONLY,
125 .gpio_card_detect = GPIO_NR_PALMTC_SD_DETECT_N,
126 .detect_delay_ms = 200,124 .detect_delay_ms = 200,
127};125};
128 126
arch/arm/mach-pxa/palmte2.c+0−2
@@ -102,8 +102,6 @@ static unsigned long palmte2_pin_config[] __initdata = { · 101 unmodified lines
102 ******************************************************************************/102 ******************************************************************************/
103static struct pxamci_platform_data palmte2_mci_platform_data = {103static struct pxamci_platform_data palmte2_mci_platform_data = {
104 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,104 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
105 .gpio_card_detect = GPIO_NR_PALMTE2_SD_DETECT_N,
106 .gpio_card_ro = GPIO_NR_PALMTE2_SD_READONLY,
107 .gpio_power = GPIO_NR_PALMTE2_SD_POWER,105 .gpio_power = GPIO_NR_PALMTE2_SD_POWER,
108};106};
109 107
arch/arm/mach-pxa/palmtreo.c+0−3
@@ -497,8 +497,6 @@ static void __init treo680_init(void) · 496 unmodified lines
497 palmphone_common_init();497 palmphone_common_init();
498 treo680_gpio_init();498 treo680_gpio_init();
499 palm27x_mmc_init(&treo680_mci_gpio_table,499 palm27x_mmc_init(&treo680_mci_gpio_table,
500 GPIO_NR_TREO_SD_DETECT_N,
501 GPIO_NR_TREO680_SD_READONLY,
502 GPIO_NR_TREO680_SD_POWER, 0);500 GPIO_NR_TREO680_SD_POWER, 0);
503}501}
504#endif502#endif
@@ -519,7 +517,6 @@ static void __init centro_init(void) · 14 unmodified lines
519 pxa2xx_mfp_config(ARRAY_AND_SIZE(centro685_pin_config));517 pxa2xx_mfp_config(ARRAY_AND_SIZE(centro685_pin_config));
520 palmphone_common_init();518 palmphone_common_init();
521 palm27x_mmc_init(&centro685_mci_gpio_table,519 palm27x_mmc_init(&centro685_mci_gpio_table,
522 GPIO_NR_TREO_SD_DETECT_N, -1,
523 GPIO_NR_CENTRO_SD_POWER, 1);520 GPIO_NR_CENTRO_SD_POWER, 1);
524}521}
525#endif522#endif
arch/arm/mach-pxa/palmtx.c+0−2
@@ -356,8 +356,6 @@ static void __init palmtx_init(void) · 355 unmodified lines
356 pxa_set_stuart_info(NULL);356 pxa_set_stuart_info(NULL);
357 357
358 palm27x_mmc_init(&palmtx_mci_gpio_table,358 palm27x_mmc_init(&palmtx_mci_gpio_table,
359 GPIO_NR_PALMTX_SD_DETECT_N,
360 GPIO_NR_PALMTX_SD_READONLY,
361 GPIO_NR_PALMTX_SD_POWER, 0);359 GPIO_NR_PALMTX_SD_POWER, 0);
362 palm27x_pm_init(PALMTX_STR_BASE);360 palm27x_pm_init(PALMTX_STR_BASE);
363 palm27x_lcd_init(-1, &palm_320x480_lcd_mode);361 palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
arch/arm/mach-pxa/palmz72.c+0−2
@@ -408,8 +408,6 @@ static void __init palmz72_init(void) · 407 unmodified lines
408 pxa_set_stuart_info(NULL);408 pxa_set_stuart_info(NULL);
409 409
410 palm27x_mmc_init(&palmz72_mci_gpio_table,410 palm27x_mmc_init(&palmz72_mci_gpio_table,
411 GPIO_NR_PALMZ72_SD_DETECT_N,
412 GPIO_NR_PALMZ72_SD_RO,
413 GPIO_NR_PALMZ72_SD_POWER_N, 1);411 GPIO_NR_PALMZ72_SD_POWER_N, 1);
414 palm27x_lcd_init(-1, &palm_320x320_lcd_mode);412 palm27x_lcd_init(-1, &palm_320x320_lcd_mode);
415 palm27x_udc_init(GPIO_NR_PALMZ72_USB_DETECT_N,413 palm27x_udc_init(GPIO_NR_PALMZ72_USB_DETECT_N,
arch/arm/mach-pxa/pcm990-baseboard.c+0−2
@@ -370,8 +370,6 @@ static struct pxamci_platform_data pcm990_mci_platform_data = { · 369 unmodified lines
370 .init = pcm990_mci_init,370 .init = pcm990_mci_init,
371 .setpower = pcm990_mci_setpower,371 .setpower = pcm990_mci_setpower,
372 .exit = pcm990_mci_exit,372 .exit = pcm990_mci_exit,
373 .gpio_card_detect = -1,
374 .gpio_card_ro = -1,
375 .gpio_power = -1,373 .gpio_power = -1,
376};374};
377 375
arch/arm/mach-pxa/poodle.c+0−2
@@ -289,8 +289,6 @@ static struct pxamci_platform_data poodle_mci_platform_data = { · 288 unmodified lines
289 .init = poodle_mci_init,289 .init = poodle_mci_init,
290 .setpower = poodle_mci_setpower,290 .setpower = poodle_mci_setpower,
291 .exit = poodle_mci_exit,291 .exit = poodle_mci_exit,
292 .gpio_card_detect = POODLE_GPIO_nSD_DETECT,
293 .gpio_card_ro = POODLE_GPIO_nSD_WP,
294 .gpio_power = -1,292 .gpio_power = -1,
295};293};
296 294
arch/arm/mach-pxa/raumfeld.c+0−2
@@ -749,8 +749,6 @@ static struct pxamci_platform_data raumfeld_mci_platform_data = { · 748 unmodified lines
749 .init = raumfeld_mci_init,749 .init = raumfeld_mci_init,
750 .exit = raumfeld_mci_exit,750 .exit = raumfeld_mci_exit,
751 .detect_delay_ms = 200,751 .detect_delay_ms = 200,
752 .gpio_card_detect = -1,
753 .gpio_card_ro = -1,
754 .gpio_power = -1,752 .gpio_power = -1,
755};753};
756 754
arch/arm/mach-pxa/spitz.c+0−2
@@ -616,8 +616,6 @@ static struct pxamci_platform_data spitz_mci_platform_data = { · 615 unmodified lines
616 .detect_delay_ms = 250,616 .detect_delay_ms = 250,
617 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,617 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
618 .setpower = spitz_mci_setpower,618 .setpower = spitz_mci_setpower,
619 .gpio_card_detect = SPITZ_GPIO_nSD_DETECT,
620 .gpio_card_ro = SPITZ_GPIO_nSD_WP,
621 .gpio_power = -1,619 .gpio_power = -1,
622};620};
623 621
arch/arm/mach-pxa/stargate2.c+0−2
@@ -436,8 +436,6 @@ static int imote2_mci_get_ro(struct device *dev) · 435 unmodified lines
436static struct pxamci_platform_data imote2_mci_platform_data = {436static struct pxamci_platform_data imote2_mci_platform_data = {
437 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, /* default anyway */437 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, /* default anyway */
438 .get_ro = imote2_mci_get_ro,438 .get_ro = imote2_mci_get_ro,
439 .gpio_card_detect = -1,
440 .gpio_card_ro = -1,
441 .gpio_power = -1,439 .gpio_power = -1,
442};440};
443 441
arch/arm/mach-pxa/tosa.c+0−2
@@ -292,8 +292,6 @@ static struct pxamci_platform_data tosa_mci_platform_data = { · 291 unmodified lines
292 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,292 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
293 .init = tosa_mci_init,293 .init = tosa_mci_init,
294 .exit = tosa_mci_exit,294 .exit = tosa_mci_exit,
295 .gpio_card_detect = TOSA_GPIO_nSD_DETECT,
296 .gpio_card_ro = TOSA_GPIO_SD_WP,
297 .gpio_power = TOSA_GPIO_PWR_ON,295 .gpio_power = TOSA_GPIO_PWR_ON,
298};296};
299 297
arch/arm/mach-pxa/trizeps4.c+0−2
@@ -355,8 +355,6 @@ static struct pxamci_platform_data trizeps4_mci_platform_data = { · 354 unmodified lines
355 .exit = trizeps4_mci_exit,355 .exit = trizeps4_mci_exit,
356 .get_ro = NULL, /* write-protection not supported */356 .get_ro = NULL, /* write-protection not supported */
357 .setpower = NULL, /* power-switching not supported */357 .setpower = NULL, /* power-switching not supported */
358 .gpio_card_detect = -1,
359 .gpio_card_ro = -1,
360 .gpio_power = -1,358 .gpio_power = -1,
361};359};
362 360
arch/arm/mach-pxa/vpac270.c+0−2
@@ -242,8 +242,6 @@ static void __init vpac270_onenand_init(void) {} · 241 unmodified lines
242static struct pxamci_platform_data vpac270_mci_platform_data = {242static struct pxamci_platform_data vpac270_mci_platform_data = {
243 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,243 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
244 .gpio_power = -1,244 .gpio_power = -1,
245 .gpio_card_detect = GPIO53_VPAC270_SD_DETECT_N,
246 .gpio_card_ro = GPIO52_VPAC270_SD_READONLY,
247 .detect_delay_ms = 200,245 .detect_delay_ms = 200,
248};246};
249 247
arch/arm/mach-pxa/z2.c+0−2
@@ -291,9 +291,7 @@ static inline void z2_lcd_init(void) {} · 290 unmodified lines
291#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)291#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
292static struct pxamci_platform_data z2_mci_platform_data = {292static struct pxamci_platform_data z2_mci_platform_data = {
293 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,293 .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
294 .gpio_card_detect = GPIO96_ZIPITZ2_SD_DETECT,
295 .gpio_power = -1,294 .gpio_power = -1,
296 .gpio_card_ro = -1,
297 .detect_delay_ms = 200,295 .detect_delay_ms = 200,
298};296};
299 297
arch/arm/mach-pxa/zeus.c+0−2
@@ -663,8 +663,6 @@ static struct pxafb_mach_info zeus_fb_info = { · 662 unmodified lines
663static struct pxamci_platform_data zeus_mci_platform_data = {663static struct pxamci_platform_data zeus_mci_platform_data = {
664 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,664 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
665 .detect_delay_ms = 250,665 .detect_delay_ms = 250,
666 .gpio_card_detect = ZEUS_MMC_CD_GPIO,
667 .gpio_card_ro = ZEUS_MMC_WP_GPIO,
668 .gpio_card_ro_invert = 1,666 .gpio_card_ro_invert = 1,
669 .gpio_power = -1667 .gpio_power = -1
670};668};
arch/arm/mach-pxa/zylonite.c+0−6
@@ -227,8 +227,6 @@ static inline void zylonite_init_lcd(void) {} · 226 unmodified lines
227static struct pxamci_platform_data zylonite_mci_platform_data = {227static struct pxamci_platform_data zylonite_mci_platform_data = {
228 .detect_delay_ms= 200,228 .detect_delay_ms= 200,
229 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,229 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
230 .gpio_card_detect = EXT_GPIO(0),
231 .gpio_card_ro = EXT_GPIO(2),
232 .gpio_power = -1,230 .gpio_power = -1,
233};231};
234 232
@@ -253,8 +251,6 @@ static struct gpiod_lookup_table zylonite_mci_gpio_table = { · 18 unmodified lines
253static struct pxamci_platform_data zylonite_mci2_platform_data = {251static struct pxamci_platform_data zylonite_mci2_platform_data = {
254 .detect_delay_ms= 200,252 .detect_delay_ms= 200,
255 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,253 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
256 .gpio_card_detect = EXT_GPIO(1),
257 .gpio_card_ro = EXT_GPIO(3),
258 .gpio_power = -1,254 .gpio_power = -1,
259};255};
260 256
@@ -272,8 +268,6 @@ static struct gpiod_lookup_table zylonite_mci2_gpio_table = { · 11 unmodified lines
272static struct pxamci_platform_data zylonite_mci3_platform_data = {268static struct pxamci_platform_data zylonite_mci3_platform_data = {
273 .detect_delay_ms= 200,269 .detect_delay_ms= 200,
274 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,270 .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
275 .gpio_card_detect = EXT_GPIO(30),
276 .gpio_card_ro = EXT_GPIO(31),
277 .gpio_power = -1,271 .gpio_power = -1,
278};272};
279 273

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t