Merge branch 'topic/xilinx' into for-linus (cecd5fc5) · Commits · e / devices / android_kernel_teracube_emerald

drivers/dma/xilinx/xilinx_dma.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -366,6 +366,20 @@ struct xilinx_dma_chan {
		u16 tdest;
		};

		/**
		* enum xdma_ip_type: DMA IP type.
		*
		* XDMA_TYPE_AXIDMA: Axi dma ip.
		* XDMA_TYPE_CDMA: Axi cdma ip.
		* XDMA_TYPE_VDMA: Axi vdma ip.
		*
		*/
		enum xdma_ip_type {
		XDMA_TYPE_AXIDMA = 0,
		XDMA_TYPE_CDMA,
		XDMA_TYPE_VDMA,
		};

		struct xilinx_dma_config {
		enum xdma_ip_type dmatype;
		int (clk_init)(struct platform_device pdev, struct clk **axi_clk,

+0 −14

Original line number	Diff line number	Diff line
		@@ -41,20 +41,6 @@ struct xilinx_vdma_config {
		int ext_fsync;
		};

		/**
		* enum xdma_ip_type: DMA IP type.
		*
		* XDMA_TYPE_AXIDMA: Axi dma ip.
		* XDMA_TYPE_CDMA: Axi cdma ip.
		* XDMA_TYPE_VDMA: Axi vdma ip.
		*
		*/
		enum xdma_ip_type {
		XDMA_TYPE_AXIDMA = 0,
		XDMA_TYPE_CDMA,
		XDMA_TYPE_VDMA,
		};

		int xilinx_vdma_channel_set_config(struct dma_chan *dchan,
		struct xilinx_vdma_config *cfg);