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

Commit 949ff5b8 authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: fix for cookie changes and merge 



Fixed trivial issues in drivers:
	drivers/dma/imx-sdma.c
	drivers/dma/intel_mid_dma.c
	drivers/dma/ioat/dma_v3.c
	drivers/dma/iop-adma.c
	drivers/dma/sirf-dma.c
	drivers/dma/timb_dma.c

Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 8867bd50

drivers/dma/imx-sdma.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1127,6 +1127,7 @@ static void sdma_issue_pending(struct dma_chan *chan) 
	struct sdma_engine *sdma = sdmac->sdma;

	struct sdma_engine *sdma = sdmac->sdma;





	if (sdmac->status == DMA_IN_PROGRESS)

	if (sdmac->status == DMA_IN_PROGRESS)

		sdma_enable_channel(sdma, sdmac->channel);

}

}





#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1	34

#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1	34

drivers/dma/intel_mid_dma.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -477,6 +477,7 @@ static enum dma_status intel_mid_dma_tx_status(struct dma_chan *chan, 
						dma_cookie_t cookie,

						dma_cookie_t cookie,

						struct dma_tx_state *txstate)

						struct dma_tx_state *txstate)

{

{

	struct intel_mid_dma_chan *midc = to_intel_mid_dma_chan(chan);

	enum dma_status ret;

	enum dma_status ret;





	ret = dma_cookie_status(chan, cookie, txstate);

	ret = dma_cookie_status(chan, cookie, txstate);

drivers/dma/ioat/dma_v3.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <linux/dmaengine.h>

#include <linux/dmaengine.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/prefetch.h>

#include <linux/prefetch.h>

#include "../dmaengine.h"

#include "registers.h"

#include "registers.h"

#include "hw.h"

#include "hw.h"

#include "dma.h"

#include "dma.h"

drivers/dma/iop-adma.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -894,6 +894,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan, 
					struct dma_tx_state *txstate)

					struct dma_tx_state *txstate)

{

{

	struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);

	struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);

	int ret;





	ret = dma_cookie_status(chan, cookie, txstate);

	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret == DMA_SUCCESS)

	if (ret == DMA_SUCCESS)

drivers/dma/sirf-dma.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/sirfsoc_dma.h>

#include <linux/sirfsoc_dma.h>





#include "dmaengine.h"



#define SIRFSOC_DMA_DESCRIPTORS                 16

#define SIRFSOC_DMA_DESCRIPTORS                 16

#define SIRFSOC_DMA_CHANNELS                    16

#define SIRFSOC_DMA_CHANNELS                    16