History

Merge tag 'dmaengine-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine updates from Vinod Koul: "This round we have few new features, new driver and updates to few drivers. The new features to dmaengine core are: - Synchronized transfer termination API to terminate the dmaengine transfers in synchronized and async fashion as required by users. We have its user now in ALSA dmaengine lib, img, at_xdma, axi_dmac drivers. - Universal API for channel request and start consolidation of request flows. It's user is ompa-dma driver. - Introduce reuse of descriptors and use in pxa_dma driver Add/Remove: - New STM32 DMA driver - Removal of unused R-Car HPB-DMAC driver Updates: - ti-dma-crossbar updates for supporting eDMA - tegra-apb pm updates - idma64 - mv_xor updates - ste_dma updates" * tag 'dmaengine-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (54 commits) dmaengine: mv_xor: add suspend/resume support dmaengine: mv_xor: de-duplicate mv_chan_set_mode*() dmaengine: mv_xor: remove mv_xor_chan->current_type field dmaengine: omap-dma: Add support for DMA filter mapping to slave devices dmaengine: edma: Add support for DMA filter mapping to slave devices dmaengine: core: Introduce new, universal API to request a channel dmaengine: core: Move and merge the code paths using private_candidate dmaengine: core: Skip mask matching when it is not provided to private_candidate dmaengine: mdc: Correct terminate_all handling dmaengine: edma: Add probe callback to edma_tptc_driver dmaengine: dw: fix potential memory leak in dw_dma_parse_dt() dmaengine: stm32-dma: Fix unchecked deference of chan->desc dmaengine: sh: Remove unused R-Car HPB-DMAC driver dmaengine: usb-dmac: Document SoC specific compatibility strings ste_dma40: Delete an unnecessary variable initialisation in d40_probe() ste_dma40: Delete another unnecessary check in d40_probe() ste_dma40: Delete an unnecessary check before the function call "kmem_cache_destroy" dmaengine: tegra-apb: Free interrupts before killing tasklets dmaengine: tegra-apb: Update driver to use GFP_NOWAIT dmaengine: tegra-apb: Only save channel state for those in use ...

Linus Torvalds committed 10 years ago

Commit d6a32272 parents 4c257ec 8b6484344 files · +2088 −1181Browse files

Showing the changes to include/linux/platform_data (2 of 44 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/dma-rcar-hpbdma.h +0 −103
  2. include/linux/platform_data/edma.h +7 −0
include/linux/platform_data/dma-rcar-hpbdma.h+0−103
@@ -1,103 +0,0 @@
1−/*
2− * Copyright (C) 2011-2013 Renesas Electronics Corporation
3− * Copyright (C) 2013 Cogent Embedded, Inc.
4− *
5− * This program is free software; you can redistribute it and/or modify
6− * it under the terms of the GNU General Public License version 2
7− * as published by the Free Software Foundation.
8− */
9−
10−#ifndef __DMA_RCAR_HPBDMA_H
11−#define __DMA_RCAR_HPBDMA_H
12−
13−#include <linux/bitops.h>
14−#include <linux/types.h>
15−
16−/* Transmit sizes and respective register values */
17−enum {
18− XMIT_SZ_8BIT = 0,
19− XMIT_SZ_16BIT = 1,
20− XMIT_SZ_32BIT = 2,
21− XMIT_SZ_MAX
22−};
23−
24−/* DMA control register (DCR) bits */
25−#define HPB_DMAE_DCR_DTAMD (1u << 26)
26−#define HPB_DMAE_DCR_DTAC (1u << 25)
27−#define HPB_DMAE_DCR_DTAU (1u << 24)
28−#define HPB_DMAE_DCR_DTAU1 (1u << 23)
29−#define HPB_DMAE_DCR_SWMD (1u << 22)
30−#define HPB_DMAE_DCR_BTMD (1u << 21)
31−#define HPB_DMAE_DCR_PKMD (1u << 20)
32−#define HPB_DMAE_DCR_CT (1u << 18)
33−#define HPB_DMAE_DCR_ACMD (1u << 17)
34−#define HPB_DMAE_DCR_DIP (1u << 16)
35−#define HPB_DMAE_DCR_SMDL (1u << 13)
36−#define HPB_DMAE_DCR_SPDAM (1u << 12)
37−#define HPB_DMAE_DCR_SDRMD_MASK (3u << 10)
38−#define HPB_DMAE_DCR_SDRMD_MOD (0u << 10)
39−#define HPB_DMAE_DCR_SDRMD_AUTO (1u << 10)
40−#define HPB_DMAE_DCR_SDRMD_TIMER (2u << 10)
41−#define HPB_DMAE_DCR_SPDS_MASK (3u << 8)
42−#define HPB_DMAE_DCR_SPDS_8BIT (0u << 8)
43−#define HPB_DMAE_DCR_SPDS_16BIT (1u << 8)
44−#define HPB_DMAE_DCR_SPDS_32BIT (2u << 8)
45−#define HPB_DMAE_DCR_DMDL (1u << 5)
46−#define HPB_DMAE_DCR_DPDAM (1u << 4)
47−#define HPB_DMAE_DCR_DDRMD_MASK (3u << 2)
48−#define HPB_DMAE_DCR_DDRMD_MOD (0u << 2)
49−#define HPB_DMAE_DCR_DDRMD_AUTO (1u << 2)
50−#define HPB_DMAE_DCR_DDRMD_TIMER (2u << 2)
51−#define HPB_DMAE_DCR_DPDS_MASK (3u << 0)
52−#define HPB_DMAE_DCR_DPDS_8BIT (0u << 0)
53−#define HPB_DMAE_DCR_DPDS_16BIT (1u << 0)
54−#define HPB_DMAE_DCR_DPDS_32BIT (2u << 0)
55−
56−/* Asynchronous reset register (ASYNCRSTR) bits */
57−#define HPB_DMAE_ASYNCRSTR_ASRST41 BIT(10)
58−#define HPB_DMAE_ASYNCRSTR_ASRST40 BIT(9)
59−#define HPB_DMAE_ASYNCRSTR_ASRST39 BIT(8)
60−#define HPB_DMAE_ASYNCRSTR_ASRST27 BIT(7)
61−#define HPB_DMAE_ASYNCRSTR_ASRST26 BIT(6)
62−#define HPB_DMAE_ASYNCRSTR_ASRST25 BIT(5)
63−#define HPB_DMAE_ASYNCRSTR_ASRST24 BIT(4)
64−#define HPB_DMAE_ASYNCRSTR_ASRST23 BIT(3)
65−#define HPB_DMAE_ASYNCRSTR_ASRST22 BIT(2)
66−#define HPB_DMAE_ASYNCRSTR_ASRST21 BIT(1)
67−#define HPB_DMAE_ASYNCRSTR_ASRST20 BIT(0)
68−
69−struct hpb_dmae_slave_config {
70− unsigned int id;
71− dma_addr_t addr;
72− u32 dcr;
73− u32 port;
74− u32 rstr;
75− u32 mdr;
76− u32 mdm;
77− u32 flags;
78−#define HPB_DMAE_SET_ASYNC_RESET BIT(0)
79−#define HPB_DMAE_SET_ASYNC_MODE BIT(1)
80− u32 dma_ch;
81−};
82−
83−#define HPB_DMAE_CHANNEL(_irq, _s_id) \
84−{ \
85− .ch_irq = _irq, \
86− .s_id = _s_id, \
87−}
88−
89−struct hpb_dmae_channel {
90− unsigned int ch_irq;
91− unsigned int s_id;
92−};
93−
94−struct hpb_dmae_pdata {
95− const struct hpb_dmae_slave_config *slaves;
96− int num_slaves;
97− const struct hpb_dmae_channel *channels;
98− int num_channels;
99− const unsigned int ts_shift[XMIT_SZ_MAX];
100− int num_hw_channels;
101−};
102−
103−#endif
include/linux/platform_data/edma.h+7−0
@@ -53,12 +53,16 @@ enum dma_event_q { · 52 unmodified lines
5353 #define EDMA_CTLR(i) ((i) >> 16)
5454 #define EDMA_CHAN_SLOT(i) ((i) & 0xffff)
5555
56+#define EDMA_FILTER_PARAM(ctlr, chan) ((int[]) { EDMA_CTLR_CHAN(ctlr, chan) })
57+
5658 struct edma_rsv_info {
5759
5860 const s16 (*rsv_chans)[2];
5961 const s16 (*rsv_slots)[2];
6062 };
6163
64+struct dma_slave_map;
65+
6266 /* platform_data for EDMA driver */
6367 struct edma_soc_info {
6468 /*
@@ -76,6 +80,9 @@ struct edma_soc_info { · 11 unmodified lines
7680
7781 s8 (*queue_priority_mapping)[2];
7882 const s16 (*xbar_chans)[2];
83+
84+ const struct dma_slave_map *slave_map;
85+ int slavecnt;
7986 };
8087
8188 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t