Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7ba5f1d authored by Padmavathi Venna's avatar Padmavathi Venna Committed by Mark Brown
Browse files

ARM: SAMSUNG: Make dma request compatible to generic dma bindings. 



This patch make the dma dev request operation compatible for both
DT and non-DT cases. It takes the all the arguments required for
dma_request_slave_channel and dma_request_channel. If the driver
is initiated via DT or non-DT the corresponding call will be made.

Signed-off-by: default avatarPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 40476f61

arch/arm/plat-samsung/dma-ops.c

+8 −2
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
#include <mach/dma.h>



static unsigned samsung_dmadev_request(enum dma_ch dma_ch,

				struct samsung_dma_req *param)

				struct samsung_dma_req *param,

				struct device *dev, char *ch_name)

{

	dma_cap_mask_t mask;

	void *filter_param;
@@ -33,7 +34,12 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch, 
	 */

	filter_param = (dma_ch == DMACH_DT_PROP) ?

		(void *)param->dt_dmach_prop : (void *)dma_ch;

	return (unsigned)dma_request_channel(mask, pl330_filter, filter_param);



	if (dev->of_node)

		return (unsigned)dma_request_slave_channel(dev, ch_name);

	else

		return (unsigned)dma_request_channel(mask, pl330_filter,

							filter_param);

}



static int samsung_dmadev_release(unsigned ch, void *param)

arch/arm/plat-samsung/include/plat/dma-ops.h

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ struct samsung_dma_config { 
};



struct samsung_dma_ops {

	unsigned (*request)(enum dma_ch ch, struct samsung_dma_req *param);

	unsigned (*request)(enum dma_ch ch, struct samsung_dma_req *param,

				struct device *dev, char *ch_name);

	int (*release)(unsigned ch, void *param);

	int (*config)(unsigned ch, struct samsung_dma_config *param);

	int (*prepare)(unsigned ch, struct samsung_dma_prep *param);

arch/arm/plat-samsung/s3c-dma-ops.c

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ static void s3c_dma_cb(struct s3c2410_dma_chan *channel, void *param, 
}



static unsigned s3c_dma_request(enum dma_ch dma_ch,

					struct samsung_dma_req *param)

				struct samsung_dma_req *param,

				struct device *dev, char *ch_name)

{

	struct cb_data *data;