7 files changed, 21 insertions, 20 deletions

diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index d639e55c5124..1d4e7164e80a 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -380,8 +380,8 @@ int mpc5200_audio_dma_create(struct of_device *op)
         int ret;
 
         /* Fetch the registers and IRQ of the PSC */
-        irq = irq_of_parse_and_map(op->node, 0);
-        if (of_address_to_resource(op->node, 0, &res)) {
+        irq = irq_of_parse_and_map(op->dev.of_node, 0);
+        if (of_address_to_resource(op->dev.of_node, 0, &res)) {
                 dev_err(&op->dev, "Missing reg property\n");
                 return -ENODEV;
         }
@@ -399,7 +399,7 @@ int mpc5200_audio_dma_create(struct of_device *op)
         }
 
         /* Get the PSC ID */
-        prop = of_get_property(op->node, "cell-index", &size);
+        prop = of_get_property(op->dev.of_node, "cell-index", &size);
         if (!prop || size < sizeof *prop) {
                 ret = -ENODEV;
                 goto out_free;
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 3dbc7f7cd7b9..e2ee220bfb7e 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -317,12 +317,12 @@ static struct of_device_id psc_ac97_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_ac97_match);
 
 static struct of_platform_driver psc_ac97_driver = {
-        .match_table = psc_ac97_match,
         .probe = psc_ac97_of_probe,
         .remove = __devexit_p(psc_ac97_of_remove),
         .driver = {
                 .name = "mpc5200-psc-ac97",
                 .owner = THIS_MODULE,
+                .of_match_table = psc_ac97_match,
         },
 };
 
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index ce8de90fb94a..4f455bd6851f 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -181,7 +181,7 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
 
         /* Check for the codec handle.  If it is not present then we
          * are done */
-        if (!of_get_property(op->node, "codec-handle", NULL))
+        if (!of_get_property(op->dev.of_node, "codec-handle", NULL))
                 return 0;
 
         /* Due to errata in the dma mode; need to line up enabling
@@ -220,12 +220,12 @@ static struct of_device_id psc_i2s_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_i2s_match);
 
 static struct of_platform_driver psc_i2s_driver = {
-        .match_table = psc_i2s_match,
         .probe = psc_i2s_of_probe,
         .remove = __devexit_p(psc_i2s_of_remove),
         .driver = {
                 .name = "mpc5200-psc-i2s",
                 .owner = THIS_MODULE,
+                .of_match_table = psc_i2s_match,
         },
 };
 
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 83de1c81c8c4..6a2764ee8203 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -203,7 +203,7 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
 static int mpc8610_hpcd_probe(struct of_device *ofdev,
         const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct device_node *codec_np = NULL;
         struct device_node *guts_np = NULL;
         struct device_node *dma_np = NULL;
@@ -580,9 +580,11 @@ static struct of_device_id mpc8610_hpcd_match[] = {
 MODULE_DEVICE_TABLE(of, mpc8610_hpcd_match);
 
 static struct of_platform_driver mpc8610_hpcd_of_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "mpc8610_hpcd",
-        .match_table    = mpc8610_hpcd_match,
+        .driver = {
+                .name = "mpc8610_hpcd",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc8610_hpcd_match,
+        },
         .probe          = mpc8610_hpcd_probe,
         .remove         = mpc8610_hpcd_remove,
 };
diff --git a/sound/soc/sh/siu.h b/sound/soc/sh/siu.h
index c0bfab8fed3d..492b1cae24cc 100644
--- a/sound/soc/sh/siu.h
+++ b/sound/soc/sh/siu.h
@@ -71,8 +71,7 @@ struct siu_firmware {
 #include <linux/dmaengine.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-
-#include <asm/dmaengine.h>
+#include <linux/sh_dma.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 8f85719212f9..36170be15aa7 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -31,7 +31,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc-dai.h>
 
-#include <asm/dmaengine.h>
 #include <asm/siu.h>
 
 #include "siu.h"
@@ -358,13 +357,13 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)
         if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 siu_stream = &port_info->playback;
                 param = &siu_stream->param;
-                param->slave_id = port ? SHDMA_SLAVE_SIUB_TX :
-                        SHDMA_SLAVE_SIUA_TX;
+                param->slave_id = port ? pdata->dma_slave_tx_b :
+                        pdata->dma_slave_tx_a;
         } else {
                 siu_stream = &port_info->capture;
                 param = &siu_stream->param;
-                param->slave_id = port ? SHDMA_SLAVE_SIUB_RX :
-                        SHDMA_SLAVE_SIUA_RX;
+                param->slave_id = port ? pdata->dma_slave_rx_b :
+                        pdata->dma_slave_rx_a;
         }
 
         param->dma_dev = pdata->dma_dev;
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index 49cc7ea9a518..0e3452303ea6 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -160,7 +160,7 @@ static void txx9aclc_dma_tasklet(unsigned long data)
                 void __iomem *base = drvdata->base;
 
                 spin_unlock_irqrestore(&dmadata->dma_lock, flags);
-                chan->device->device_terminate_all(chan);
+                chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
                 /* first time */
                 for (i = 0; i < NR_DMA_CHAIN; i++) {
                         desc = txx9aclc_dma_submit(dmadata,
@@ -268,7 +268,7 @@ static int txx9aclc_pcm_close(struct snd_pcm_substream *substream)
         struct dma_chan *chan = dmadata->dma_chan;
 
         dmadata->frag_count = -1;
-        chan->device->device_terminate_all(chan);
+        chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
         return 0;
 }
 
@@ -397,7 +397,8 @@ static int txx9aclc_pcm_remove(struct platform_device *pdev)
                 struct dma_chan *chan = dmadata->dma_chan;
                 if (chan) {
                         dmadata->frag_count = -1;
-                        chan->device->device_terminate_all(chan);
+                        chan->device->device_control(chan,
+                                                     DMA_TERMINATE_ALL, 0);
                         dma_release_channel(chan);
                 }
                 dev->dmadata[i].dma_chan = NULL;