ARM: SAMSUNG: Remove unnecessary code for dma
This patch removes the usage of DMACH_DT_PROP and dt_dmach_prop from dma code as the new generic dma dt binding support has been added. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
parent
ca48384879
commit
ba7a9a784f
|
@ -24,7 +24,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum dma_ch {
|
enum dma_ch {
|
||||||
DMACH_DT_PROP = -1, /* not yet supported, do not use */
|
|
||||||
DMACH_XD0 = 0,
|
DMACH_XD0 = 0,
|
||||||
DMACH_XD1,
|
DMACH_XD1,
|
||||||
DMACH_SDI,
|
DMACH_SDI,
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
*/
|
*/
|
||||||
enum dma_ch {
|
enum dma_ch {
|
||||||
/* DMA0/SDMA0 */
|
/* DMA0/SDMA0 */
|
||||||
DMACH_DT_PROP = -1, /* not yet supported, do not use */
|
|
||||||
DMACH_UART0 = 0,
|
DMACH_UART0 = 0,
|
||||||
DMACH_UART0_SRC2,
|
DMACH_UART0_SRC2,
|
||||||
DMACH_UART1,
|
DMACH_UART1,
|
||||||
|
|
|
@ -23,23 +23,15 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch,
|
||||||
struct device *dev, char *ch_name)
|
struct device *dev, char *ch_name)
|
||||||
{
|
{
|
||||||
dma_cap_mask_t mask;
|
dma_cap_mask_t mask;
|
||||||
void *filter_param;
|
|
||||||
|
|
||||||
dma_cap_zero(mask);
|
dma_cap_zero(mask);
|
||||||
dma_cap_set(param->cap, mask);
|
dma_cap_set(param->cap, mask);
|
||||||
|
|
||||||
/*
|
|
||||||
* If a dma channel property of a device node from device tree is
|
|
||||||
* specified, use that as the fliter parameter.
|
|
||||||
*/
|
|
||||||
filter_param = (dma_ch == DMACH_DT_PROP) ?
|
|
||||||
(void *)param->dt_dmach_prop : (void *)dma_ch;
|
|
||||||
|
|
||||||
if (dev->of_node)
|
if (dev->of_node)
|
||||||
return (unsigned)dma_request_slave_channel(dev, ch_name);
|
return (unsigned)dma_request_slave_channel(dev, ch_name);
|
||||||
else
|
else
|
||||||
return (unsigned)dma_request_channel(mask, pl330_filter,
|
return (unsigned)dma_request_channel(mask, pl330_filter,
|
||||||
filter_param);
|
(void *)dma_ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int samsung_dmadev_release(unsigned ch, void *param)
|
static int samsung_dmadev_release(unsigned ch, void *param)
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
|
|
||||||
struct samsung_dma_req {
|
struct samsung_dma_req {
|
||||||
enum dma_transaction_type cap;
|
enum dma_transaction_type cap;
|
||||||
struct property *dt_dmach_prop;
|
|
||||||
struct s3c2410_dma_client *client;
|
struct s3c2410_dma_client *client;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
* use these just as IDs.
|
* use these just as IDs.
|
||||||
*/
|
*/
|
||||||
enum dma_ch {
|
enum dma_ch {
|
||||||
DMACH_DT_PROP = -1,
|
|
||||||
DMACH_UART0_RX = 0,
|
DMACH_UART0_RX = 0,
|
||||||
DMACH_UART0_TX,
|
DMACH_UART0_TX,
|
||||||
DMACH_UART1_RX,
|
DMACH_UART1_RX,
|
||||||
|
|
Loading…
Reference in New Issue