lkml.org 
[lkml]   [2018]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/15] ARM: pxa: add dma slave map
    Date
    In order to remove the specific knowledge of the dma mapping from PXA
    drivers, add a default slave map for pxa architectures.

    This is the first step, and once all drivers are converted,
    pxad_filter_fn() will be made static, and the DMA resources removed from
    device.c.

    Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
    Reported-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/mach-pxa/devices.c | 55 +++++++++++++++++++++++++++++++++++++++++++++
    1 file changed, 55 insertions(+)

    diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
    index d7c9a8476d57..da67ebe9a7d5 100644
    --- a/arch/arm/mach-pxa/devices.c
    +++ b/arch/arm/mach-pxa/devices.c
    @@ -4,6 +4,8 @@
    #include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/dma-mapping.h>
    +#include <linux/dma/pxa-dma.h>
    +#include <linux/dmaengine.h>
    #include <linux/spi/pxa2xx_spi.h>
    #include <linux/platform_data/i2c-pxa.h>

    @@ -1202,9 +1204,62 @@ void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info)
    platform_device_add(pd);
    }

    +#define PDMA_FILTER_PARAM(_prio, _requestor) (&(struct pxad_param) { \
    + .prio = PXAD_PRIO_##_prio, .drcmr = _requestor })
    +
    +static const struct dma_slave_map pxa_slave_map[] = {
    + /* PXA25x, PXA27x and PXA3xx common entries */
    + { "pxa-pcm-audio", "ac97_mic_mono", PDMA_FILTER_PARAM(LOWEST, 8) },
    + { "pxa-pcm-audio", "ac97_aux_mono_in", PDMA_FILTER_PARAM(LOWEST, 9) },
    + { "pxa-pcm-audio", "ac97_aux_mono_out", PDMA_FILTER_PARAM(LOWEST, 10) },
    + { "pxa-pcm-audio", "ac97_stereo_in", PDMA_FILTER_PARAM(LOWEST, 11) },
    + { "pxa-pcm-audio", "ac97_stereo_out", PDMA_FILTER_PARAM(LOWEST, 12) },
    + { "pxa-pcm-audio", "ssp1_rx", PDMA_FILTER_PARAM(LOWEST, 13) },
    + { "pxa-pcm-audio", "ssp1_tx", PDMA_FILTER_PARAM(LOWEST, 14) },
    + { "pxa-pcm-audio", "ssp2_rx", PDMA_FILTER_PARAM(LOWEST, 15) },
    + { "pxa-pcm-audio", "ssp2_tx", PDMA_FILTER_PARAM(LOWEST, 16) },
    + { "pxa2xx-ir", "rx", PDMA_FILTER_PARAM(LOWEST, 17) },
    + { "pxa2xx-ir", "tx", PDMA_FILTER_PARAM(LOWEST, 18) },
    + { "pxa2xx-mci.0", "rx", PDMA_FILTER_PARAM(LOWEST, 21) },
    + { "pxa2xx-mci.0", "tx", PDMA_FILTER_PARAM(LOWEST, 22) },
    + { "smc911x.0", "rx", PDMA_FILTER_PARAM(LOWEST, -1) },
    + { "smc911x.0", "tx", PDMA_FILTER_PARAM(LOWEST, -1) },
    + { "smc91x.0", "data", PDMA_FILTER_PARAM(LOWEST, -1) },
    +
    + /* PXA25x specific map */
    + { "pxa25x-ssp.0", "rx", PDMA_FILTER_PARAM(LOWEST, 13) },
    + { "pxa25x-ssp.0", "tx", PDMA_FILTER_PARAM(LOWEST, 14) },
    + { "pxa25x-nssp.1", "rx", PDMA_FILTER_PARAM(LOWEST, 15) },
    + { "pxa25x-nssp.1", "tx", PDMA_FILTER_PARAM(LOWEST, 16) },
    + { "pxa25x-nssp.2", "rx", PDMA_FILTER_PARAM(LOWEST, 23) },
    + { "pxa25x-nssp.2", "tx", PDMA_FILTER_PARAM(LOWEST, 24) },
    + { "pxa-pcm-audio", "nssp2_rx", PDMA_FILTER_PARAM(LOWEST, 15) },
    + { "pxa-pcm-audio", "nssp2_tx", PDMA_FILTER_PARAM(LOWEST, 16) },
    + { "pxa-pcm-audio", "nssp3_rx", PDMA_FILTER_PARAM(LOWEST, 23) },
    + { "pxa-pcm-audio", "nssp3_tx", PDMA_FILTER_PARAM(LOWEST, 24) },
    +
    + /* PXA27x specific map */
    + { "pxa-pcm-audio", "ssp3_rx", PDMA_FILTER_PARAM(LOWEST, 66) },
    + { "pxa-pcm-audio", "ssp3_tx", PDMA_FILTER_PARAM(LOWEST, 67) },
    + { "pxa27x-camera.0", "CI_Y", PDMA_FILTER_PARAM(HIGHEST, 68) },
    + { "pxa27x-camera.0", "CI_U", PDMA_FILTER_PARAM(HIGHEST, 69) },
    + { "pxa27x-camera.0", "CI_V", PDMA_FILTER_PARAM(HIGHEST, 70) },
    +
    + /* PXA3xx specific map */
    + { "pxa-pcm-audio", "ssp4_rx", PDMA_FILTER_PARAM(LOWEST, 2) },
    + { "pxa-pcm-audio", "ssp4_tx", PDMA_FILTER_PARAM(LOWEST, 3) },
    + { "pxa2xx-mci.1", "rx", PDMA_FILTER_PARAM(LOWEST, 93) },
    + { "pxa2xx-mci.1", "tx", PDMA_FILTER_PARAM(LOWEST, 94) },
    + { "pxa3xx-nand", "data", PDMA_FILTER_PARAM(LOWEST, 97) },
    + { "pxa2xx-mci.2", "rx", PDMA_FILTER_PARAM(LOWEST, 100) },
    + { "pxa2xx-mci.2", "tx", PDMA_FILTER_PARAM(LOWEST, 101) },
    +};
    +
    static struct mmp_dma_platdata pxa_dma_pdata = {
    .dma_channels = 0,
    .nb_requestors = 0,
    + .slave_map = pxa_slave_map,
    + .slave_map_cnt = ARRAY_SIZE(pxa_slave_map),
    };

    static struct resource pxa_dma_resource[] = {
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-04-02 16:35    [W:4.102 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site