diff options
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/mmc-esdhc-imx.h | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/mmc-pxamci.h | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/mmc-s3cmci.h | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h index 640dec8b5b0c..b606ca4197df 100644 --- a/include/linux/platform_data/mmc-esdhc-imx.h +++ b/include/linux/platform_data/mmc-esdhc-imx.h | |||
| @@ -30,15 +30,11 @@ enum cd_types { | |||
| 30 | * | 30 | * |
| 31 | * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35. | 31 | * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35. |
| 32 | * | 32 | * |
| 33 | * @wp_gpio: gpio for write_protect | ||
| 34 | * @cd_gpio: gpio for card_detect interrupt | ||
| 35 | * @wp_type: type of write_protect method (see wp_types enum above) | 33 | * @wp_type: type of write_protect method (see wp_types enum above) |
| 36 | * @cd_type: type of card_detect method (see cd_types enum above) | 34 | * @cd_type: type of card_detect method (see cd_types enum above) |
| 37 | */ | 35 | */ |
| 38 | 36 | ||
| 39 | struct esdhc_platform_data { | 37 | struct esdhc_platform_data { |
| 40 | unsigned int wp_gpio; | ||
| 41 | unsigned int cd_gpio; | ||
| 42 | enum wp_types wp_type; | 38 | enum wp_types wp_type; |
| 43 | enum cd_types cd_type; | 39 | enum cd_types cd_type; |
| 44 | int max_bus_width; | 40 | int max_bus_width; |
diff --git a/include/linux/platform_data/mmc-pxamci.h b/include/linux/platform_data/mmc-pxamci.h index 752f97c62ef2..7e44e84e7150 100644 --- a/include/linux/platform_data/mmc-pxamci.h +++ b/include/linux/platform_data/mmc-pxamci.h | |||
| @@ -15,11 +15,7 @@ struct pxamci_platform_data { | |||
| 15 | int (*get_ro)(struct device *); | 15 | int (*get_ro)(struct device *); |
| 16 | int (*setpower)(struct device *, unsigned int); | 16 | int (*setpower)(struct device *, unsigned int); |
| 17 | void (*exit)(struct device *, void *); | 17 | void (*exit)(struct device *, void *); |
| 18 | int gpio_card_detect; /* gpio detecting card insertion */ | ||
| 19 | int gpio_card_ro; /* gpio detecting read only toggle */ | ||
| 20 | bool gpio_card_ro_invert; /* gpio ro is inverted */ | 18 | bool gpio_card_ro_invert; /* gpio ro is inverted */ |
| 21 | int gpio_power; /* gpio powering up MMC bus */ | ||
| 22 | bool gpio_power_invert; /* gpio power is inverted */ | ||
| 23 | }; | 19 | }; |
| 24 | 20 | ||
| 25 | extern void pxa_set_mci_info(struct pxamci_platform_data *info); | 21 | extern void pxa_set_mci_info(struct pxamci_platform_data *info); |
diff --git a/include/linux/platform_data/mmc-s3cmci.h b/include/linux/platform_data/mmc-s3cmci.h index b68d9f0bdd9e..33310b11cbdd 100644 --- a/include/linux/platform_data/mmc-s3cmci.h +++ b/include/linux/platform_data/mmc-s3cmci.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * @no_wprotect: Set this to indicate there is no write-protect switch. | 7 | * @no_wprotect: Set this to indicate there is no write-protect switch. |
| 8 | * @no_detect: Set this if there is no detect switch. | 8 | * @no_detect: Set this if there is no detect switch. |
| 9 | * @wprotect_invert: Invert the default sense of the write protect switch. | 9 | * @wprotect_invert: Invert the default sense of the write protect switch. |
| 10 | * @detect_invert: Invert the default sense of the write protect switch. | ||
| 11 | * @use_dma: Set to allow the use of DMA. | 10 | * @use_dma: Set to allow the use of DMA. |
| 12 | * @gpio_detect: GPIO number for the card detect line. | 11 | * @gpio_detect: GPIO number for the card detect line. |
| 13 | * @gpio_wprotect: GPIO number for the write protect line. | 12 | * @gpio_wprotect: GPIO number for the write protect line. |
| @@ -31,11 +30,8 @@ struct s3c24xx_mci_pdata { | |||
| 31 | unsigned int no_wprotect:1; | 30 | unsigned int no_wprotect:1; |
| 32 | unsigned int no_detect:1; | 31 | unsigned int no_detect:1; |
| 33 | unsigned int wprotect_invert:1; | 32 | unsigned int wprotect_invert:1; |
| 34 | unsigned int detect_invert:1; /* set => detect active high */ | ||
| 35 | unsigned int use_dma:1; | 33 | unsigned int use_dma:1; |
| 36 | 34 | ||
| 37 | unsigned int gpio_detect; | ||
| 38 | unsigned int gpio_wprotect; | ||
| 39 | unsigned long ocr_avail; | 35 | unsigned long ocr_avail; |
| 40 | void (*set_power)(unsigned char power_mode, | 36 | void (*set_power)(unsigned char power_mode, |
| 41 | unsigned short vdd); | 37 | unsigned short vdd); |
