UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: tmio_mmc: do not enable card hotplug interrupts, if unused 

If TMIO MMC is used in polling mode, or the card is non-removable, or
card-detection is performed, using an external interrupt, there is no
need to enable controller native card hotplug interrupts.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Guennadi Liakhovetski 2012-02-22 13:16:09 +01:00 committed by Chris Ball
parent e3f1adb63c
commit e23cd53c79
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mmc/host/tmio_mmc_pio.c
View File

@ -304,6 +304,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command
{ {
struct mmc_data *data = host->data; struct mmc_data *data = host->data;
int c = cmd->opcode; int c = cmd->opcode;
u32 irq_mask = TMIO_MASK_CMD;
/* Command 12 is handled by hardware */ /* Command 12 is handled by hardware */
if (cmd->opcode == 12 && !cmd->arg) { if (cmd->opcode == 12 && !cmd->arg) {
@ -339,7 +340,9 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command
c |= TRANSFER_READ; c |= TRANSFER_READ;
} }
tmio_mmc_enable_mmc_irqs(host, TMIO_MASK_CMD); if (!host->native_hotplug)
irq_mask &= ~(TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT);
tmio_mmc_enable_mmc_irqs(host, irq_mask);
/* Fire off the command */ /* Fire off the command */
sd_ctrl_write32(host, CTL_ARG_REG, cmd->arg); sd_ctrl_write32(host, CTL_ARG_REG, cmd->arg);
@ -963,6 +966,8 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host,
irq_mask |= TMIO_MASK_READOP; irq_mask |= TMIO_MASK_READOP;
if (!_host->chan_tx) if (!_host->chan_tx)
irq_mask |= TMIO_MASK_WRITEOP; irq_mask |= TMIO_MASK_WRITEOP;
if (!_host->native_hotplug)
irq_mask &= ~(TMIO_STAT_CARD_REMOVE | TMIO_STAT_CARD_INSERT);
tmio_mmc_enable_mmc_irqs(_host, irq_mask); tmio_mmc_enable_mmc_irqs(_host, irq_mask);