6 files changed, 57 insertions, 24 deletions

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index ac15c23fd5d..208dbb121f4 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -200,14 +200,15 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
 /*
  * Register MMC devices. Called from mach-omap1 and mach-omap2 device init.
  */
-int __init omap_mmc_add(int id, unsigned long base, unsigned long size,
-                unsigned int irq, struct omap_mmc_platform_data *data)
+int __init omap_mmc_add(const char *name, int id, unsigned long base,
+                                unsigned long size, unsigned int irq,
+                                struct omap_mmc_platform_data *data)
 {
         struct platform_device *pdev;
         struct resource res[OMAP_MMC_NR_RES];
         int ret;
 
-        pdev = platform_device_alloc("mmci-omap", id);
+        pdev = platform_device_alloc(name, id);
         if (!pdev)
                 return -ENOMEM;
 
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index e77373c39f8..47ec77af4cc 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -709,6 +709,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
         chan->dev_name = dev_name;
         chan->callback = callback;
         chan->data = data;
+        chan->flags = 0;
 
 #ifndef CONFIG_ARCH_OMAP1
         if (cpu_class_is_omap2()) {
@@ -1888,11 +1889,11 @@ static int omap2_dma_handle_ch(int ch)
                 status = dma_read(CSR(ch));
         }
 
+        dma_write(status, CSR(ch));
+
         if (likely(dma_chan[ch].callback != NULL))
                 dma_chan[ch].callback(ch, status, dma_chan[ch].data);
 
-        dma_write(status, CSR(ch));
-
         return 0;
 }
 
diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h
index b2062f1175d..a8e1178a946 100644
--- a/arch/arm/plat-omap/include/mach/cpu.h
+++ b/arch/arm/plat-omap/include/mach/cpu.h
@@ -339,6 +339,7 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define OMAP3430_REV_ES2_0      0x34301034
 #define OMAP3430_REV_ES2_1      0x34302034
 #define OMAP3430_REV_ES3_0      0x34303034
+#define OMAP3430_REV_ES3_1      0x34304034
 
 /*
  * omap_chip bits
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h
index eef873db3d4..113c2466c86 100644
--- a/arch/arm/plat-omap/include/mach/mcbsp.h
+++ b/arch/arm/plat-omap/include/mach/mcbsp.h
@@ -344,7 +344,8 @@ struct omap_mcbsp_platform_data {
         u8 dma_rx_sync, dma_tx_sync;
         u16 rx_irq, tx_irq;
         struct omap_mcbsp_ops *ops;
-        char const *clk_name;
+        char const **clk_names;
+        int num_clks;
 };
 
 struct omap_mcbsp {
@@ -376,7 +377,8 @@ struct omap_mcbsp {
         /* Protect the field .free, while checking if the mcbsp is in use */
         spinlock_t lock;
         struct omap_mcbsp_platform_data *pdata;
-        struct clk *clk;
+        struct clk **clks;
+        int num_clks;
 };
 extern struct omap_mcbsp **mcbsp_ptr;
 extern int omap_mcbsp_count;
diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h
index 031250f0280..73a9e15031b 100644
--- a/arch/arm/plat-omap/include/mach/mmc.h
+++ b/arch/arm/plat-omap/include/mach/mmc.h
@@ -115,8 +115,9 @@ void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
                                 int nr_controllers);
 void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                                 int nr_controllers);
-int omap_mmc_add(int id, unsigned long base, unsigned long size,
-                        unsigned int irq, struct omap_mmc_platform_data *data);
+int omap_mmc_add(const char *name, int id, unsigned long base,
+                                unsigned long size, unsigned int irq,
+                                struct omap_mmc_platform_data *data);
 #else
 static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
                                 int nr_controllers)
@@ -126,8 +127,9 @@ static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                                 int nr_controllers)
 {
 }
-static inline int omap_mmc_add(int id, unsigned long base, unsigned long size,
-                unsigned int irq, struct omap_mmc_platform_data *data)
+static inline int omap_mmc_add(const char *name, int id, unsigned long base,
+                                unsigned long size, unsigned int irq,
+                                struct omap_mmc_platform_data *data)
 {
         return 0;
 }
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index f2401a831f9..e5842e30e53 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -214,6 +214,7 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type);
 int omap_mcbsp_request(unsigned int id)
 {
         struct omap_mcbsp *mcbsp;
+        int i;
         int err;
 
         if (!omap_mcbsp_check_valid_id(id)) {
@@ -225,7 +226,8 @@ int omap_mcbsp_request(unsigned int id)
         if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
                 mcbsp->pdata->ops->request(id);
 
-        clk_enable(mcbsp->clk);
+        for (i = 0; i < mcbsp->num_clks; i++)
+                clk_enable(mcbsp->clks[i]);
 
         spin_lock(&mcbsp->lock);
         if (!mcbsp->free) {
@@ -276,6 +278,7 @@ EXPORT_SYMBOL(omap_mcbsp_request);
 void omap_mcbsp_free(unsigned int id)
 {
         struct omap_mcbsp *mcbsp;
+        int i;
 
         if (!omap_mcbsp_check_valid_id(id)) {
                 printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
@@ -286,7 +289,8 @@ void omap_mcbsp_free(unsigned int id)
         if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
                 mcbsp->pdata->ops->free(id);
 
-        clk_disable(mcbsp->clk);
+        for (i = mcbsp->num_clks - 1; i >= 0; i--)
+                clk_disable(mcbsp->clks[i]);
 
         spin_lock(&mcbsp->lock);
         if (mcbsp->free) {
@@ -872,6 +876,7 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev)
         struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;
         struct omap_mcbsp *mcbsp;
         int id = pdev->id - 1;
+        int i;
         int ret = 0;
 
         if (!pdata) {
@@ -916,14 +921,25 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev)
         mcbsp->dma_rx_sync = pdata->dma_rx_sync;
         mcbsp->dma_tx_sync = pdata->dma_tx_sync;
 
-        if (pdata->clk_name)
-                mcbsp->clk = clk_get(&pdev->dev, pdata->clk_name);
-        if (IS_ERR(mcbsp->clk)) {
-                dev_err(&pdev->dev,
-                        "Invalid clock configuration for McBSP%d.\n",
-                        mcbsp->id);
-                ret = PTR_ERR(mcbsp->clk);
-                goto err_clk;
+        if (pdata->num_clks) {
+                mcbsp->num_clks = pdata->num_clks;
+                mcbsp->clks = kzalloc(mcbsp->num_clks * sizeof(struct clk *),
+                                        GFP_KERNEL);
+                if (!mcbsp->clks) {
+                        ret = -ENOMEM;
+                        goto exit;
+                }
+                for (i = 0; i < mcbsp->num_clks; i++) {
+                        mcbsp->clks[i] = clk_get(&pdev->dev, pdata->clk_names[i]);
+                        if (IS_ERR(mcbsp->clks[i])) {
+                                dev_err(&pdev->dev,
+                                        "Invalid %s configuration for McBSP%d.\n",
+                                        pdata->clk_names[i], mcbsp->id);
+                                ret = PTR_ERR(mcbsp->clks[i]);
+                                goto err_clk;
+                        }
+                }
+
         }
 
         mcbsp->pdata = pdata;
@@ -932,6 +948,9 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev)
         return 0;
 
 err_clk:
+        while (i--)
+                clk_put(mcbsp->clks[i]);
+        kfree(mcbsp->clks);
         iounmap(mcbsp->io_base);
 err_ioremap:
         mcbsp->free = 0;
@@ -942,6 +961,7 @@ exit:
 static int __devexit omap_mcbsp_remove(struct platform_device *pdev)
 {
         struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
+        int i;
 
         platform_set_drvdata(pdev, NULL);
         if (mcbsp) {
@@ -950,12 +970,18 @@ static int __devexit omap_mcbsp_remove(struct platform_device *pdev)
                                 mcbsp->pdata->ops->free)
                         mcbsp->pdata->ops->free(mcbsp->id);
 
-                clk_disable(mcbsp->clk);
-                clk_put(mcbsp->clk);
+                for (i = mcbsp->num_clks - 1; i >= 0; i--) {
+                        clk_disable(mcbsp->clks[i]);
+                        clk_put(mcbsp->clks[i]);
+                }
 
                 iounmap(mcbsp->io_base);
 
-                mcbsp->clk = NULL;
+                if (mcbsp->num_clks) {
+                        kfree(mcbsp->clks);
+                        mcbsp->clks = NULL;
+                        mcbsp->num_clks = 0;
+                }
                 mcbsp->free = 0;
                 mcbsp->dev = NULL;
         }