|
@@ -598,29 +598,9 @@ static struct platform_device sdhi0_power = {
|
|
|
},
|
|
|
};
|
|
|
|
|
|
-static void sdhi0_set_pwr(struct platform_device *pdev, int state)
|
|
|
-{
|
|
|
- static int power_gpio = -EINVAL;
|
|
|
-
|
|
|
- if (power_gpio < 0) {
|
|
|
- int ret = gpio_request(GPIO_PTB6, NULL);
|
|
|
- if (!ret) {
|
|
|
- power_gpio = GPIO_PTB6;
|
|
|
- gpio_direction_output(power_gpio, 0);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /*
|
|
|
- * Toggle the GPIO regardless, whether we managed to grab it above or
|
|
|
- * the fixed regulator driver did.
|
|
|
- */
|
|
|
- gpio_set_value(GPIO_PTB6, state);
|
|
|
-}
|
|
|
-
|
|
|
static struct sh_mobile_sdhi_info sdhi0_info = {
|
|
|
.dma_slave_tx = SHDMA_SLAVE_SDHI0_TX,
|
|
|
.dma_slave_rx = SHDMA_SLAVE_SDHI0_RX,
|
|
|
- .set_pwr = sdhi0_set_pwr,
|
|
|
.tmio_caps = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD |
|
|
|
MMC_CAP_NEEDS_POLL,
|
|
|
.tmio_flags = TMIO_MMC_USE_GPIO_CD,
|
|
@@ -650,25 +630,6 @@ static struct platform_device sdhi0_device = {
|
|
|
},
|
|
|
};
|
|
|
|
|
|
-static void cn12_set_pwr(struct platform_device *pdev, int state)
|
|
|
-{
|
|
|
- static int power_gpio = -EINVAL;
|
|
|
-
|
|
|
- if (power_gpio < 0) {
|
|
|
- int ret = gpio_request(GPIO_PTB7, NULL);
|
|
|
- if (!ret) {
|
|
|
- power_gpio = GPIO_PTB7;
|
|
|
- gpio_direction_output(power_gpio, 0);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /*
|
|
|
- * Toggle the GPIO regardless, whether we managed to grab it above or
|
|
|
- * the fixed regulator driver did.
|
|
|
- */
|
|
|
- gpio_set_value(GPIO_PTB7, state);
|
|
|
-}
|
|
|
-
|
|
|
#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
|
|
|
/* SDHI1 */
|
|
|
static struct sh_mobile_sdhi_info sdhi1_info = {
|
|
@@ -678,7 +639,6 @@ static struct sh_mobile_sdhi_info sdhi1_info = {
|
|
|
MMC_CAP_NEEDS_POLL,
|
|
|
.tmio_flags = TMIO_MMC_USE_GPIO_CD,
|
|
|
.cd_gpio = GPIO_PTW7,
|
|
|
- .set_pwr = cn12_set_pwr,
|
|
|
};
|
|
|
|
|
|
static struct resource sdhi1_resources[] = {
|
|
@@ -1000,7 +960,6 @@ static struct resource sh_mmcif_resources[] = {
|
|
|
};
|
|
|
|
|
|
static struct sh_mmcif_plat_data sh_mmcif_plat = {
|
|
|
- .set_pwr = cn12_set_pwr,
|
|
|
.sup_pclk = 0, /* SH7724: Max Pclk/2 */
|
|
|
.caps = MMC_CAP_4_BIT_DATA |
|
|
|
MMC_CAP_8_BIT_DATA |
|