shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

update sdmmc driver: disable sd insert/remove wakeup

Browse Source
This commit is contained in:
kfx
2011-04-18 15:20:16 +08:00
parent 3178a4c070
commit bd6529a1b6
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mmc/core/bus.c
View File

@@ -279,7 +279,6 @@ void mmc_remove_card(struct mmc_card *card)
#endif
if (mmc_card_present(card)) {
mmc_card_clr_present(card); //add by kfx
if (mmc_host_is_spi(card->host)) {
printk(KERN_INFO "%s: SPI card removed\n",
mmc_hostname(card->host));

2
drivers/mmc/core/sd.c
View File

@@ -590,7 +590,7 @@ static void mmc_sd_detect(struct mmc_host *host)
#endif
mmc_release_host(host);
if (err && mmc_card_present(host->card)) { //mod by kfx
if (err) {
mmc_sd_remove(host);
mmc_claim_host(host);

4
drivers/mmc/host/rk29_sdmmc.c
View File

@@ -1365,7 +1365,7 @@ static int rk29_sdmmc_suspend(struct platform_device *pdev, pm_message_t state)
dev_info(host->dev, "Enter rk29_sdmmc_suspend\n");
if(host->mmc && !host->is_sdio){
ret = mmc_suspend_host(host->mmc, state);
if(host->enable_sd_warkup)
if(!host->enable_sd_warkup)
free_irq(host->gpio_irq, host);
}
rk29_sdmmc_write(host->regs, SDMMC_CLKENA, 0);
@@ -1384,7 +1384,7 @@ static int rk29_sdmmc_resume(struct platform_device *pdev)
clk_enable(host->clk);
rk29_sdmmc_write(host->regs, SDMMC_CLKENA, 1);
if(host->mmc && !host->is_sdio){
if(host->enable_sd_warkup)
if(!host->enable_sd_warkup)
ret = request_irq(host->gpio_irq,
rk29_sdmmc_detect_change_isr,
rk29_sdmmc_get_cd(host->mmc)?IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING,