1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index a6d0e3dbed07..823f58179f9d 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -1,7 +1,7 @@
 /*
  * Topcliff PCH DMA controller driver
  * Copyright (c) 2010 Intel Corporation
- * Copyright (C) 2011 OKI SEMICONDUCTOR CO., LTD.
+ * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -99,7 +99,7 @@ struct pch_dma_desc {
 struct pch_dma_chan {
         struct dma_chan         chan;
         void __iomem *membase;
-        enum dma_data_direction dir;
+        enum dma_transfer_direction dir;
         struct tasklet_struct   tasklet;
         unsigned long           err_status;
 
@@ -224,7 +224,7 @@ static void pdc_set_dir(struct dma_chan *chan)
                 mask_ctl = DMA_MASK_CTL0_MODE & ~(DMA_CTL0_MODE_MASK_BITS <<
                                        (DMA_CTL0_BITS_PER_CH * chan->chan_id));
                 val &= mask_mode;
-                if (pd_chan->dir == DMA_TO_DEVICE)
+                if (pd_chan->dir == DMA_MEM_TO_DEV)
                         val |= 0x1 << (DMA_CTL0_BITS_PER_CH * chan->chan_id +
                                        DMA_CTL0_DIR_SHIFT_BITS);
                 else
@@ -242,7 +242,7 @@ static void pdc_set_dir(struct dma_chan *chan)
                 mask_ctl = DMA_MASK_CTL2_MODE & ~(DMA_CTL0_MODE_MASK_BITS <<
                                                  (DMA_CTL0_BITS_PER_CH * ch));
                 val &= mask_mode;
-                if (pd_chan->dir == DMA_TO_DEVICE)
+                if (pd_chan->dir == DMA_MEM_TO_DEV)
                         val |= 0x1 << (DMA_CTL0_BITS_PER_CH * ch +
                                        DMA_CTL0_DIR_SHIFT_BITS);
                 else
@@ -607,7 +607,7 @@ static void pd_issue_pending(struct dma_chan *chan)
 
 static struct dma_async_tx_descriptor *pd_prep_slave_sg(struct dma_chan *chan,
                         struct scatterlist *sgl, unsigned int sg_len,
-                        enum dma_data_direction direction, unsigned long flags)
+                        enum dma_transfer_direction direction, unsigned long flags)
 {
         struct pch_dma_chan *pd_chan = to_pd_chan(chan);
         struct pch_dma_slave *pd_slave = chan->private;
@@ -623,9 +623,9 @@ static struct dma_async_tx_descriptor *pd_prep_slave_sg(struct dma_chan *chan,
                 return NULL;
         }
 
-        if (direction == DMA_FROM_DEVICE)
+        if (direction == DMA_DEV_TO_MEM)
                 reg = pd_slave->rx_reg;
-        else if (direction == DMA_TO_DEVICE)
+        else if (direction == DMA_MEM_TO_DEV)
                 reg = pd_slave->tx_reg;
         else
                 return NULL;
@@ -1018,6 +1018,8 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev)
 #define PCI_DEVICE_ID_ML7223_DMA2_4CH   0x800E
 #define PCI_DEVICE_ID_ML7223_DMA3_4CH   0x8017
 #define PCI_DEVICE_ID_ML7223_DMA4_4CH   0x803B
+#define PCI_DEVICE_ID_ML7831_DMA1_8CH   0x8810
+#define PCI_DEVICE_ID_ML7831_DMA2_4CH   0x8815
 
 DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = {
         { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 },
@@ -1030,6 +1032,8 @@ DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = {
         { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA2_4CH), 4}, /* Video SPI */
         { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA3_4CH), 4}, /* Security */
         { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA4_4CH), 4}, /* FPGA */
+        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA1_8CH), 8}, /* UART */
+        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA2_4CH), 4}, /* SPI */
         { 0, },
 };
 
@@ -1057,7 +1061,7 @@ static void __exit pch_dma_exit(void)
 module_init(pch_dma_init);
 module_exit(pch_dma_exit);
 
-MODULE_DESCRIPTION("Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH "
+MODULE_DESCRIPTION("Intel EG20T PCH / LAPIS Semicon ML7213/ML7223/ML7831 IOH "
                    "DMA controller driver");
 MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>");
 MODULE_LICENSE("GPL v2");