[15/15] ARM: pxa: change SSP DMA channels allocation
Commit Message
Now the dma_slave_map is available for PXA architecture, switch the SSP
device to it.
This specifically means that :
- for platform data based machines, the DMA requestor channels are
extracted from platform data and passed further to the SSP user,
ie. usually the pxa-pcm-audio driver
- for device tree platforms, the dma node should be hooked into the
pxa-pcm-audio node.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
arch/arm/plat-pxa/ssp.c | 50 +++++-----------------------------------------
include/linux/pxa2xx_ssp.h | 4 ++--
sound/soc/pxa/pxa-ssp.c | 5 ++---
3 files changed, 9 insertions(+), 50 deletions(-)
Comments
Hi Robert,
I love your patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v4.16]
[cannot apply to arm-soc/for-next next-20180329]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Robert-Jarzmik/ARM-pxa-switch-to-DMA-slave-maps/20180402-233029
config: arm-allmodconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All errors (new ones prefixed by >>):
>> arch/arm/plat-pxa/ssp.c:19:10: fatal error: mach/audio.h: No such file or directory
#include <mach/audio.h>
^~~~~~~~~~~~~~
compilation terminated.
vim +19 arch/arm/plat-pxa/ssp.c
> 19 #include <mach/audio.h>
20 #include <linux/module.h>
21 #include <linux/kernel.h>
22 #include <linux/sched.h>
23 #include <linux/slab.h>
24 #include <linux/errno.h>
25 #include <linux/interrupt.h>
26 #include <linux/ioport.h>
27 #include <linux/init.h>
28 #include <linux/mutex.h>
29 #include <linux/clk.h>
30 #include <linux/err.h>
31 #include <linux/platform_device.h>
32 #include <linux/spi/pxa2xx_spi.h>
33 #include <linux/io.h>
34 #include <linux/of.h>
35 #include <linux/of_device.h>
36
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
@@ -16,6 +16,7 @@
* Author: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
*/
+#include <mach/audio.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@@ -116,6 +117,7 @@ static int pxa_ssp_probe(struct platform_device *pdev)
struct resource *res;
struct ssp_device *ssp;
struct device *dev = &pdev->dev;
+ struct pxa_ssp_info *info = dev_get_platdata(dev);
ssp = devm_kzalloc(dev, sizeof(struct ssp_device), GFP_KERNEL);
if (ssp == NULL)
@@ -127,51 +129,9 @@ static int pxa_ssp_probe(struct platform_device *pdev)
if (IS_ERR(ssp->clk))
return PTR_ERR(ssp->clk);
- if (dev->of_node) {
- struct of_phandle_args dma_spec;
- struct device_node *np = dev->of_node;
- int ret;
-
- /*
- * FIXME: we should allocate the DMA channel from this
- * context and pass the channel down to the ssp users.
- * For now, we lookup the rx and tx indices manually
- */
-
- /* rx */
- ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells",
- 0, &dma_spec);
-
- if (ret) {
- dev_err(dev, "Can't parse dmas property\n");
- return -ENODEV;
- }
- ssp->drcmr_rx = dma_spec.args[0];
- of_node_put(dma_spec.np);
-
- /* tx */
- ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells",
- 1, &dma_spec);
- if (ret) {
- dev_err(dev, "Can't parse dmas property\n");
- return -ENODEV;
- }
- ssp->drcmr_tx = dma_spec.args[0];
- of_node_put(dma_spec.np);
- } else {
- res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
- if (res == NULL) {
- dev_err(dev, "no SSP RX DRCMR defined\n");
- return -ENODEV;
- }
- ssp->drcmr_rx = res->start;
-
- res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
- if (res == NULL) {
- dev_err(dev, "no SSP TX DRCMR defined\n");
- return -ENODEV;
- }
- ssp->drcmr_tx = res->start;
+ if (!dev->of_node && info) {
+ ssp->dma_chan_rx = info->dma_chan_rx_name;
+ ssp->dma_chan_tx = info->dma_chan_tx_name;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -212,9 +212,9 @@ struct ssp_device {
int type;
int use_count;
int irq;
- int drcmr_rx;
- int drcmr_tx;
+ const char *dma_chan_rx;
+ const char *dma_chan_tx;
struct device_node *of_node;
};
@@ -104,9 +104,8 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
dma = kzalloc(sizeof(struct snd_dmaengine_dai_dma_data), GFP_KERNEL);
if (!dma)
return -ENOMEM;
-
- dma->filter_data = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
- &ssp->drcmr_tx : &ssp->drcmr_rx;
+ dma->chan_name = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
+ ssp->dma_chan_tx : ssp->dma_chan_rx;
snd_soc_dai_set_dma_data(cpu_dai, substream, dma);