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

Commit 97c1b145 authored by Ben Dooks's avatar Ben Dooks Committed by Ben Dooks
Browse files

[ARM] S3C: Move DMA channel management code to plat-s3c 



Change the name of S3C2410_DMA_CHANNELS to S3C_DMA_CHANNELS in the process.

Signed-off-by: default avatarBen Dooks <ben@simtec.co.uk>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 20934cdb

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

+2 −6
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ enum dma_ch { 


/* we have 4 dma channels */

#ifndef CONFIG_CPU_S3C2443

#define S3C2410_DMA_CHANNELS		(4)

#define S3C_DMA_CHANNELS		(4)

#else

#define S3C2410_DMA_CHANNELS		(6)

#define S3C_DMA_CHANNELS		(6)

#endif



/* types */
@@ -192,10 +192,6 @@ struct s3c2410_dma_chan { 
	struct sys_device	dev;

};



/* the currently allocated channel information */

extern struct s3c2410_dma_chan s3c2410_chans[];



/* note, we don't really use dma_device_t at the moment */

typedef unsigned long dma_device_t;



#endif /* __ASM_ARCH_DMA_H */

arch/arm/plat-s3c/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -150,6 +150,13 @@ config S3C_GPIO_CFG_S3C64XX 
	  Internal configuration to enable S3C64XX style GPIO configuration

	  functions.



# DMA



config S3C_DMA

	bool

	help

	  Internal configuration for S3C DMA core



# device definitions to compile in



config S3C_DEV_HSMMC

arch/arm/plat-s3c/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ obj-y += pwm-clock.o 
obj-y				+= gpio.o

obj-y				+= gpio-config.o



# DMA support



obj-$(CONFIG_S3C_DMA)		+= dma.o



# PM support



obj-$(CONFIG_PM)		+= pm.o

arch/arm/plat-s3c/dma.c

0 → 100644
+86 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c/dma.c

 *

 * Copyright (c) 2003-2005,2006,2009 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * S3C DMA core

 *

 * 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.

*/



struct s3c2410_dma_buf;



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/errno.h>



#include <mach/dma.h>

#include <mach/irqs.h>



#include <plat/dma-plat.h>



/* dma channel state information */

struct s3c2410_dma_chan s3c2410_chans[S3C_DMA_CHANNELS];

struct s3c2410_dma_chan *s3c_dma_chan_map[DMACH_MAX];



/* s3c_dma_lookup_channel

 *

 * change the dma channel number given into a real dma channel id

*/



struct s3c2410_dma_chan *s3c_dma_lookup_channel(unsigned int channel)

{

	if (channel & DMACH_LOW_LEVEL)

		return &s3c2410_chans[channel & ~DMACH_LOW_LEVEL];

	else

		return s3c_dma_chan_map[channel];

}



/* do we need to protect the settings of the fields from

 * irq?

*/



int s3c2410_dma_set_opfn(unsigned int channel, s3c2410_dma_opfn_t rtn)

{

	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);



	if (chan == NULL)

		return -EINVAL;



	pr_debug("%s: chan=%p, op rtn=%p\n", __func__, chan, rtn);



	chan->op_fn = rtn;



	return 0;

}

EXPORT_SYMBOL(s3c2410_dma_set_opfn);



int s3c2410_dma_set_buffdone_fn(unsigned int channel, s3c2410_dma_cbfn_t rtn)

{

	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);



	if (chan == NULL)

		return -EINVAL;



	pr_debug("%s: chan=%p, callback rtn=%p\n", __func__, chan, rtn);



	chan->callback_fn = rtn;



	return 0;

}

EXPORT_SYMBOL(s3c2410_dma_set_buffdone_fn);



int s3c2410_dma_setflags(unsigned int channel, unsigned int flags)

{

	struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);



	if (chan == NULL)

		return -EINVAL;



	chan->flags = flags;

	return 0;

}

EXPORT_SYMBOL(s3c2410_dma_setflags);

arch/arm/plat-s3c/include/plat/dma-core.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* arch/arm/plat-s3c/include/plat/dma.h

 *

 * Copyright 2008 Openmoko, Inc.

 * Copyright 2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * Samsung S3C DMA core support

 *

 * 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.

*/



extern struct s3c2410_dma_chan *s3c_dma_lookup_channel(unsigned int channel);



extern struct s3c2410_dma_chan *s3c_dma_chan_map[];



/* the currently allocated channel information */

extern struct s3c2410_dma_chan s3c2410_chans[];