ARM: SAMSUNG: Remove Samsung specific enum type for dma direction (51ddf31d) · Commits · 戴 / test

arch/arm/mach-s3c2410/include/mach/dma.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ struct s3c2410_dma_chan {
		struct s3c2410_dma_client *client;

		/* channel configuration */
		enum s3c2410_dmasrc source;
		enum dma_data_direction source;
		enum dma_ch req_ch;
		unsigned long dev_addr;
		unsigned long load_timeout;

+2 −2

Original line number	Diff line number	Diff line
		@@ -148,11 +148,11 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = {

		static void s3c2412_dma_direction(struct s3c2410_dma_chan *chan,
		struct s3c24xx_dma_map *map,
		enum s3c2410_dmasrc dir)
		enum dma_data_direction dir)
		{
		unsigned long chsel;

		if (dir == S3C2410_DMASRC_HW)
		if (dir == DMA_FROM_DEVICE)
		chsel = map->channels_rx[0];
		else
		chsel = map->channels[0];

+5 −5

Original line number	Diff line number	Diff line
		@@ -147,14 +147,14 @@ static void s3c64xx_dma_fill_lli(struct s3c2410_dma_chan *chan,
		u32 control0, control1;

		switch (chan->source) {
		case S3C2410_DMASRC_HW:
		case DMA_FROM_DEVICE:
		src = chan->dev_addr;
		dst = data;
		control0 = PL080_CONTROL_SRC_AHB2;
		control0 \|= PL080_CONTROL_DST_INCR;
		break;

		case S3C2410_DMASRC_MEM:
		case DMA_TO_DEVICE:
		src = data;
		dst = chan->dev_addr;
		control0 = PL080_CONTROL_DST_AHB2;
		@@ -416,7 +416,7 @@ EXPORT_SYMBOL(s3c2410_dma_enqueue);


		int s3c2410_dma_devconfig(enum dma_ch channel,
		enum s3c2410_dmasrc source,
		enum dma_data_direction source,
		unsigned long devaddr)
		{
		struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
		@@ -437,11 +437,11 @@ int s3c2410_dma_devconfig(enum dma_ch channel,
		pr_debug("%s: peripheral %d\n", __func__, peripheral);

		switch (source) {
		case S3C2410_DMASRC_HW:
		case DMA_FROM_DEVICE:
		config = 2 << PL080_CONFIG_FLOW_CONTROL_SHIFT;
		config \|= peripheral << PL080_CONFIG_SRC_SEL_SHIFT;
		break;
		case S3C2410_DMASRC_MEM:
		case DMA_TO_DEVICE:
		config = 1 << PL080_CONFIG_FLOW_CONTROL_SHIFT;
		config \|= peripheral << PL080_CONFIG_DST_SEL_SHIFT;
		break;

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ struct s3c2410_dma_chan {
		unsigned char peripheral;

		unsigned int flags;
		enum s3c2410_dmasrc source;
		enum dma_data_direction source;


		dma_addr_t dev_addr;

+5 −5

Original line number	Diff line number	Diff line
		@@ -1094,14 +1094,14 @@ EXPORT_SYMBOL(s3c2410_dma_config);
		*
		* configure the dma source/destination hardware type and address
		*
		* source: S3C2410_DMASRC_HW: source is hardware
		* S3C2410_DMASRC_MEM: source is memory
		* source: DMA_FROM_DEVICE: source is hardware
		* DMA_TO_DEVICE: source is memory
		*
		* devaddr: physical address of the source
		*/

		int s3c2410_dma_devconfig(enum dma_ch channel,
		enum s3c2410_dmasrc source,
		enum dma_data_direction source,
		unsigned long devaddr)
		{
		struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
		@@ -1131,7 +1131,7 @@ int s3c2410_dma_devconfig(enum dma_ch channel,
		hwcfg \|= S3C2410_DISRCC_INC;

		switch (source) {
		case S3C2410_DMASRC_HW:
		case DMA_FROM_DEVICE:
		/* source is hardware */
		pr_debug("%s: hw source, devaddr=%08lx, hwcfg=%d\n",
		__func__, devaddr, hwcfg);
		@@ -1142,7 +1142,7 @@ int s3c2410_dma_devconfig(enum dma_ch channel,
		chan->addr_reg = dma_regaddr(chan, S3C2410_DMA_DIDST);
		break;

		case S3C2410_DMASRC_MEM:
		case DMA_TO_DEVICE:
		/* source is memory */
		pr_debug("%s: mem source, devaddr=%08lx, hwcfg=%d\n",
		__func__, devaddr, hwcfg);