Commit 7954d5cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  i.MX31: framebuffer driver
  i.MX31: Image Processing Unit DMA and IRQ drivers
  dmaengine: add async_tx_clear_ack() macro
  dmaengine: dma_issue_pending_all == nop when CONFIG_DMA_ENGINE=n
  dmaengine: kill some dubious WARN_ONCEs
  fsldma: print correct IRQ on mpc83xx
  fsldma: check for NO_IRQ in fsl_dma_chan_remove()
  dmatest: Use custom map/unmap for destination buffer
  fsldma: use a valid 'device' for dma_pool_create
  dmaengine: fix dependency chaining
parents 37f5fed5 86528da2

arch/arm/plat-mxc/include/mach/ipu.h

0 → 100644
+181 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008

 * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>

 *

 * Copyright (C) 2005-2007 Freescale Semiconductor, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _IPU_H_

#define _IPU_H_



#include <linux/types.h>

#include <linux/dmaengine.h>



/* IPU DMA Controller channel definitions. */

enum ipu_channel {

	IDMAC_IC_0 = 0,		/* IC (encoding task) to memory */

	IDMAC_IC_1 = 1,		/* IC (viewfinder task) to memory */

	IDMAC_ADC_0 = 1,

	IDMAC_IC_2 = 2,

	IDMAC_ADC_1 = 2,

	IDMAC_IC_3 = 3,

	IDMAC_IC_4 = 4,

	IDMAC_IC_5 = 5,

	IDMAC_IC_6 = 6,

	IDMAC_IC_7 = 7,		/* IC (sensor data) to memory */

	IDMAC_IC_8 = 8,

	IDMAC_IC_9 = 9,

	IDMAC_IC_10 = 10,

	IDMAC_IC_11 = 11,

	IDMAC_IC_12 = 12,

	IDMAC_IC_13 = 13,

	IDMAC_SDC_0 = 14,	/* Background synchronous display data */

	IDMAC_SDC_1 = 15,	/* Foreground data (overlay) */

	IDMAC_SDC_2 = 16,

	IDMAC_SDC_3 = 17,

	IDMAC_ADC_2 = 18,

	IDMAC_ADC_3 = 19,

	IDMAC_ADC_4 = 20,

	IDMAC_ADC_5 = 21,

	IDMAC_ADC_6 = 22,

	IDMAC_ADC_7 = 23,

	IDMAC_PF_0 = 24,

	IDMAC_PF_1 = 25,

	IDMAC_PF_2 = 26,

	IDMAC_PF_3 = 27,

	IDMAC_PF_4 = 28,

	IDMAC_PF_5 = 29,

	IDMAC_PF_6 = 30,

	IDMAC_PF_7 = 31,

};



/* Order significant! */

enum ipu_channel_status {

	IPU_CHANNEL_FREE,

	IPU_CHANNEL_INITIALIZED,

	IPU_CHANNEL_READY,

	IPU_CHANNEL_ENABLED,

};



#define IPU_CHANNELS_NUM 32



enum pixel_fmt {

	/* 1 byte */

	IPU_PIX_FMT_GENERIC,

	IPU_PIX_FMT_RGB332,

	IPU_PIX_FMT_YUV420P,

	IPU_PIX_FMT_YUV422P,

	IPU_PIX_FMT_YUV420P2,

	IPU_PIX_FMT_YVU422P,

	/* 2 bytes */

	IPU_PIX_FMT_RGB565,

	IPU_PIX_FMT_RGB666,

	IPU_PIX_FMT_BGR666,

	IPU_PIX_FMT_YUYV,

	IPU_PIX_FMT_UYVY,

	/* 3 bytes */

	IPU_PIX_FMT_RGB24,

	IPU_PIX_FMT_BGR24,

	/* 4 bytes */

	IPU_PIX_FMT_GENERIC_32,

	IPU_PIX_FMT_RGB32,

	IPU_PIX_FMT_BGR32,

	IPU_PIX_FMT_ABGR32,

	IPU_PIX_FMT_BGRA32,

	IPU_PIX_FMT_RGBA32,

};



enum ipu_color_space {

	IPU_COLORSPACE_RGB,

	IPU_COLORSPACE_YCBCR,

	IPU_COLORSPACE_YUV

};



/*

 * Enumeration of IPU rotation modes

 */

enum ipu_rotate_mode {

	/* Note the enum values correspond to BAM value */

	IPU_ROTATE_NONE = 0,

	IPU_ROTATE_VERT_FLIP = 1,

	IPU_ROTATE_HORIZ_FLIP = 2,

	IPU_ROTATE_180 = 3,

	IPU_ROTATE_90_RIGHT = 4,

	IPU_ROTATE_90_RIGHT_VFLIP = 5,

	IPU_ROTATE_90_RIGHT_HFLIP = 6,

	IPU_ROTATE_90_LEFT = 7,

};



struct ipu_platform_data {

	unsigned int	irq_base;

};



/*

 * Enumeration of DI ports for ADC.

 */

enum display_port {

	DISP0,

	DISP1,

	DISP2,

	DISP3

};



struct idmac_video_param {

	unsigned short		in_width;

	unsigned short		in_height;

	uint32_t		in_pixel_fmt;

	unsigned short		out_width;

	unsigned short		out_height;

	uint32_t		out_pixel_fmt;

	unsigned short		out_stride;

	bool			graphics_combine_en;

	bool			global_alpha_en;

	bool			key_color_en;

	enum display_port	disp;

	unsigned short		out_left;

	unsigned short		out_top;

};



/*

 * Union of initialization parameters for a logical channel. So far only video

 * parameters are used.

 */

union ipu_channel_param {

	struct idmac_video_param video;

};



struct idmac_tx_desc {

	struct dma_async_tx_descriptor	txd;

	struct scatterlist		*sg;	/* scatterlist for this */

	unsigned int			sg_len;	/* tx-descriptor. */

	struct list_head		list;

};



struct idmac_channel {

	struct dma_chan		dma_chan;

	dma_cookie_t		completed;	/* last completed cookie	   */

	union ipu_channel_param	params;

	enum ipu_channel	link;	/* input channel, linked to the output	   */

	enum ipu_channel_status	status;

	void			*client;	/* Only one client per channel	   */

	unsigned int		n_tx_desc;

	struct idmac_tx_desc	*desc;		/* allocated tx-descriptors	   */

	struct scatterlist	*sg[2];	/* scatterlist elements in buffer-0 and -1 */

	struct list_head	free_list;	/* free tx-descriptors		   */

	struct list_head	queue;		/* queued tx-descriptors	   */

	spinlock_t		lock;		/* protects sg[0,1], queue	   */

	struct mutex		chan_mutex; /* protects status, cookie, free_list  */

	bool			sec_chan_en;

	int			active_buffer;

	unsigned int		eof_irq;

	char			eof_name[16];	/* EOF IRQ name for request_irq()  */

};



#define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd)

#define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan)



#endif

arch/arm/plat-mxc/include/mach/irqs.h

+9 −1
Original line number Diff line number Diff line
@@ -35,7 +35,15 @@ 
#define MXC_BOARD_IRQ_START	(MXC_INTERNAL_IRQS + MXC_GPIO_IRQS)

#define MXC_BOARD_IRQS	16



#define NR_IRQS		(MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)

#define MXC_IPU_IRQ_START	(MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)



#ifdef CONFIG_MX3_IPU_IRQS

#define MX3_IPU_IRQS CONFIG_MX3_IPU_IRQS

#else

#define MX3_IPU_IRQS 0

#endif



#define NR_IRQS			(MXC_IPU_IRQ_START + MX3_IPU_IRQS)



extern void imx_irq_set_priority(unsigned char irq, unsigned char prio);

arch/arm/plat-mxc/include/mach/mx3fb.h

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008

 * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __ASM_ARCH_MX3FB_H__

#define __ASM_ARCH_MX3FB_H__



#include <linux/device.h>

#include <linux/fb.h>



/* Proprietary FB_SYNC_ flags */

#define FB_SYNC_OE_ACT_HIGH    0x80000000

#define FB_SYNC_CLK_INVERT     0x40000000

#define FB_SYNC_DATA_INVERT    0x20000000

#define FB_SYNC_CLK_IDLE_EN    0x10000000

#define FB_SYNC_SHARP_MODE     0x08000000

#define FB_SYNC_SWAP_RGB       0x04000000

#define FB_SYNC_CLK_SEL_EN     0x02000000



/**

 * struct mx3fb_platform_data - mx3fb platform data

 *

 * @dma_dev:   pointer to the dma-device, used for dma-slave connection

 * @mode:      pointer to a platform-provided per mxc_register_fb() videomode

 */

struct mx3fb_platform_data {

       struct device                   *dma_dev;

       const char                      *name;

       const struct fb_videomode       *mode;

       int                             num_modes;

};



#endif

drivers/dma/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -62,6 +62,25 @@ config MV_XOR 
	---help---

	  Enable support for the Marvell XOR engine.



config MX3_IPU

	bool "MX3x Image Processing Unit support"

	depends on ARCH_MX3

	select DMA_ENGINE

	default y

	help

	  If you plan to use the Image Processing unit in the i.MX3x, say

	  Y here. If unsure, select Y.



config MX3_IPU_IRQS

	int "Number of dynamically mapped interrupts for IPU"

	depends on MX3_IPU

	range 2 137

	default 4

	help

	  Out of 137 interrupt sources on i.MX31 IPU only very few are used.

	  To avoid bloating the irq_desc[] array we allocate a sufficient

	  number of IRQ slots and map them dynamically to specific sources.



config DMA_ENGINE

	bool

drivers/dma/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o 
obj-$(CONFIG_FSL_DMA) += fsldma.o

obj-$(CONFIG_MV_XOR) += mv_xor.o

obj-$(CONFIG_DW_DMAC) += dw_dmac.o

obj-$(CONFIG_MX3_IPU) += ipu/

CRA Git | Maintained and supported by SUSTech CRA and CCSE