lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] pxa/littleton: update littleton to use the new gpio_card_detect for mmc

Browse Source 
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Eric Miao
2009-07-13 22:57:56 +08:00
parent 7a648256b2
commit 70f6d3e8a6
1 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
arch/arm/mach-pxa/littleton.c
View File

@@ -265,45 +265,12 @@ static inline void littleton_init_keypad(void) {}
#endif #endif
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
static int littleton_mci_init(struct device *dev,
irq_handler_t littleton_detect_int, void *data)
{
int err, gpio_cd = GPIO_MMC1_CARD_DETECT;
err = gpio_request(gpio_cd, "mmc card detect");
if (err)
goto err_request_cd;
gpio_direction_input(gpio_cd);
err = request_irq(gpio_to_irq(gpio_cd), littleton_detect_int,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"mmc card detect", data);
if (err) {
dev_err(dev, "failed to request card detect IRQ\n");
goto err_request_irq;
}
return 0;
err_request_irq:
gpio_free(gpio_cd);
err_request_cd:
return err;
}
static void littleton_mci_exit(struct device *dev, void *data)
{
int gpio_cd = GPIO_MMC1_CARD_DETECT;
free_irq(gpio_to_irq(gpio_cd), data);
gpio_free(gpio_cd);
}
static struct pxamci_platform_data littleton_mci_platform_data = { static struct pxamci_platform_data littleton_mci_platform_data = {
.detect_delay = 20, .detect_delay = 20,
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
.init = littleton_mci_init, .gpio_card_detect = GPIO_MMC1_CARD_DETECT,
.exit = littleton_mci_exit, .gpio_card_ro = -1,
.gpio_power = -1,
}; };
static void __init littleton_init_mmc(void) static void __init littleton_init_mmc(void)