Merge branch 'spear/dwdma' into late/cleanup

This is a series originally prepared for inclusion in 3.9, which did
not work out because of dependencies on the dmaengine driver. All the
changes for the dmaengine code are merged in 3.9 now, so we can finally
do the switchover and remove the now unnecessary dma definitions for
spear13xx from the platform code.

The dma platform_data actually made up the majority of the spear13xx
platform code overall, so moving that into device tree files makes the
code substantially smaller.

* spear/dwdma:
  ata: arasan: remove the need for platform_data
  ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT
  serial: pl011: use generic DMA slave configuration if possible
  spi: pl022: use generic DMA slave configuration if possible

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 19 insertions, 18 deletions

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 405022d302c3..7638121cb5d1 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -209,8 +209,6 @@ struct arasan_cf_dev {
         struct dma_chan *dma_chan;
         /* Mask for DMA transfers */
         dma_cap_mask_t mask;
-        /* dma channel private data */
-        void *dma_priv;
         /* DMA transfer work */
         struct work_struct work;
         /* DMA delayed finish work */
@@ -308,6 +306,7 @@ static void cf_card_detect(struct arasan_cf_dev *acdev, bool hotplugged)
 static int cf_init(struct arasan_cf_dev *acdev)
 {
         struct arasan_cf_pdata *pdata = dev_get_platdata(acdev->host->dev);
+        unsigned int if_clk;
         unsigned long flags;
         int ret = 0;
 
@@ -325,8 +324,12 @@ static int cf_init(struct arasan_cf_dev *acdev)
 
         spin_lock_irqsave(&acdev->host->lock, flags);
         /* configure CF interface clock */
-        writel((pdata->cf_if_clk <= CF_IF_CLK_200M) ? pdata->cf_if_clk :
-                        CF_IF_CLK_166M, acdev->vbase + CLK_CFG);
+        /* TODO: read from device tree */
+        if_clk = CF_IF_CLK_166M;
+        if (pdata && pdata->cf_if_clk <= CF_IF_CLK_200M)
+                if_clk = pdata->cf_if_clk;
+
+        writel(if_clk, acdev->vbase + CLK_CFG);
 
         writel(TRUE_IDE_MODE | CFHOST_ENB, acdev->vbase + OP_MODE);
         cf_interrupt_enable(acdev, CARD_DETECT_IRQ, 1);
@@ -357,12 +360,6 @@ static void dma_callback(void *dev)
         complete(&acdev->dma_completion);
 }
 
-static bool filter(struct dma_chan *chan, void *slave)
-{
-        chan->private = slave;
-        return true;
-}
-
 static inline void dma_complete(struct arasan_cf_dev *acdev)
 {
         struct ata_queued_cmd *qc = acdev->qc;
@@ -530,8 +527,7 @@ static void data_xfer(struct work_struct *work)
 
         /* request dma channels */
         /* dma_request_channel may sleep, so calling from process context */
-        acdev->dma_chan = dma_request_channel(acdev->mask, filter,
-                        acdev->dma_priv);
+        acdev->dma_chan = dma_request_slave_channel(acdev->host->dev, "data");
         if (!acdev->dma_chan) {
                 dev_err(acdev->host->dev, "Unable to get dma_chan\n");
                 goto chan_request_fail;
@@ -798,6 +794,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
         struct ata_host *host;
         struct ata_port *ap;
         struct resource *res;
+        u32 quirk;
         irq_handler_t irq_handler = NULL;
         int ret = 0;
 
@@ -817,12 +814,17 @@ static int arasan_cf_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        if (pdata)
+                quirk = pdata->quirk;
+        else
+                quirk = CF_BROKEN_UDMA; /* as it is on spear1340 */
+
         /* if irq is 0, support only PIO */
         acdev->irq = platform_get_irq(pdev, 0);
         if (acdev->irq)
                 irq_handler = arasan_cf_interrupt;
         else
-                pdata->quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;
+                quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;
 
         acdev->pbase = res->start;
         acdev->vbase = devm_ioremap_nocache(&pdev->dev, res->start,
@@ -859,17 +861,16 @@ static int arasan_cf_probe(struct platform_device *pdev)
         INIT_WORK(&acdev->work, data_xfer);
         INIT_DELAYED_WORK(&acdev->dwork, delayed_finish);
         dma_cap_set(DMA_MEMCPY, acdev->mask);
-        acdev->dma_priv = pdata->dma_priv;
 
         /* Handle platform specific quirks */
-        if (pdata->quirk) {
-                if (pdata->quirk & CF_BROKEN_PIO) {
+        if (quirk) {
+                if (quirk & CF_BROKEN_PIO) {
                         ap->ops->set_piomode = NULL;
                         ap->pio_mask = 0;
                 }
-                if (pdata->quirk & CF_BROKEN_MWDMA)
+                if (quirk & CF_BROKEN_MWDMA)
                         ap->mwdma_mask = 0;
-                if (pdata->quirk & CF_BROKEN_UDMA)
+                if (quirk & CF_BROKEN_UDMA)
                         ap->udma_mask = 0;
         }
         ap->flags |= ATA_FLAG_PIO_POLLING | ATA_FLAG_NO_ATAPI;