Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support
  mmc: msm_sdcc: Fix issue where clocks could be disabled mid transaction
  mmc: msm_sdcc: Fix the dma exec function to use the proper delays
  mmc: msm_sdcc: Don't set host->curr.mrq until after we're sure the busclk timer won't fire
  mmc: msm_sdcc: Enable busclk idle timer for power savings
  mmc: msm_sdcc: Don't disable interrupts while suspending
  mmc: msm_sdcc: Fix issue where we might not end a sucessfull request
  mmc: msm_sdcc: Featurize busclock power save and disable it by default
  mmc: msm_sdcc: Fix bug where busclk expiry timer was not properly disabled
  mmc: msm_sdcc: Reduce command timeouts and improve reliability.
  mmc: msm_sdcc: Schedule clock disable after probe
  mmc: msm_sdcc: Wrap readl/writel calls with appropriate clk delays
  mmc: msm_sdcc: Driver clocking/irq improvements
  msm: Add 'execute' datamover callback
  mmc: msm_sdcc: Snoop SDIO_CCCR_ABORT register
  mmc: msm_sdcc: Clean up clock management and add a 10us delay after enabling clocks

2 files changed, 7 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index 3d725ae518e4..d029d1f5f9e2 100644
--- a/arch/arm/mach-msm/dma.c
+++ b/arch/arm/mach-msm/dma.c
@@ -69,6 +69,8 @@ void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd)
                         writel(DMOV_CONFIG_IRQ_EN, DMOV_CONFIG(id));
                 }
 #endif
+                if (cmd->execute_func)
+                        cmd->execute_func(cmd);
                 PRINT_IO("msm_dmov_enqueue_cmd(%d), start command, status %x\n", id, status);
                 list_add_tail(&cmd->list, &active_commands[id]);
                 if (!channel_active)
@@ -116,6 +118,7 @@ int msm_dmov_exec_cmd(unsigned id, unsigned int cmdptr)
 
         cmd.dmov_cmd.cmdptr = cmdptr;
         cmd.dmov_cmd.complete_func = dmov_exec_cmdptr_complete_func;
+        cmd.dmov_cmd.execute_func = NULL;
         cmd.id = id;
         init_completion(&cmd.complete);
 
@@ -221,6 +224,8 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
                                 cmd = list_entry(ready_commands[id].next, typeof(*cmd), list);
                                 list_del(&cmd->list);
                                 list_add_tail(&cmd->list, &active_commands[id]);
+                                if (cmd->execute_func)
+                                        cmd->execute_func(cmd);
                                 PRINT_FLOW("msm_datamover_irq_handler id %d, start command\n", id);
                                 writel(cmd->cmdptr, DMOV_CMD_PTR(id));
                         }
diff --git a/arch/arm/mach-msm/include/mach/dma.h b/arch/arm/mach-msm/include/mach/dma.h
index 04c51cc04f31..00f9bbfadbe6 100644
--- a/arch/arm/mach-msm/include/mach/dma.h
+++ b/arch/arm/mach-msm/include/mach/dma.h
@@ -28,6 +28,8 @@ struct msm_dmov_cmd {
         void (*complete_func)(struct msm_dmov_cmd *cmd,
                               unsigned int result,
                               struct msm_dmov_errdata *err);
+        void (*execute_func)(struct msm_dmov_cmd *cmd);
+        void *data;
 };
 
 void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd);