Merge branch 'master' into for-next

5 files changed, 8 insertions, 3 deletions

diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c
index cccb9f3c9d01..db9381b85bf0 100644
--- a/arch/arm/mach-msm/board-msm7x27.c
+++ b/arch/arm/mach-msm/board-msm7x27.c
@@ -20,7 +20,6 @@
 #include <linux/input.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/power_supply.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index bac1f3c38a3b..e32981928c77 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -20,7 +20,6 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/io.h>
 #include <linux/smsc911x.h>
 
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index ec4606643d2c..e3cc80792d6c 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -19,7 +19,6 @@
 #include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
-#include <linux/bootmem.h>
 #include <linux/delay.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index 3d725ae518e4..02cae5e2951c 100644
--- a/arch/arm/mach-msm/dma.c
+++ b/arch/arm/mach-msm/dma.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
+#include <linux/completion.h>
 #include <mach/dma.h>
 
 #define MSM_DMOV_CHANNEL_COUNT 16
@@ -69,6 +70,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 +119,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 +225,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);