2008-07-03 13:24:40 +04:00
/*
* linux / arch / arm / mach - omap2 / mcbsp . c
*
* Copyright ( C ) 2008 Instituto Nokia de Tecnologia
* Contact : Eduardo Valentin < eduardo . valentin @ indt . org . br >
*
* 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 .
*
* Multichannel mode not supported .
*/
# include <linux/module.h>
# include <linux/init.h>
# include <linux/clk.h>
# include <linux/err.h>
# include <linux/io.h>
# include <linux/platform_device.h>
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
# include <linux/slab.h>
2008-07-03 13:24:40 +04:00
2009-01-15 14:09:51 +03:00
# include <mach/irqs.h>
2009-10-20 20:40:47 +04:00
# include <plat/dma.h>
# include <plat/cpu.h>
# include <plat/mcbsp.h>
OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
The OMAP ASoC McBSP code implemented CLKR and FSR signal muxing via
direct System Control Module writes on OMAP2+. This required the
omap_ctrl_{read,write}l() functions to be exported, which is against
policy: the only code that should call those functions directly is
OMAP core code, not device drivers. omap_ctrl_{read,write}*() are no
longer exported, so the driver no longer builds as a module.
Fix the pinmuxing part of the problem by removing calls to
omap_ctrl_{read,write}l() from the OMAP ASoC McBSP code and
implementing signal muxing functions in arch/arm/mach-omap2/mcbsp.c.
Due to the unfortunate way that McBSP support is implemented in ASoC
and the OMAP tree, these symbols must be exported for use by
sound/soc/omap/omap-mcbsp.c.
Going forward, the McBSP device driver should be moved from
arch/arm/*omap* into drivers/ or sound/soc/*, and the CPU DAI driver
should be implemented as a platform_driver as many other ASoC CPU DAI
drivers are. These two steps should resolve many of the layering
problems, which will rapidly reappear during a McBSP hwmod/PM runtime
conversion.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-10-08 21:40:19 +04:00
# include <plat/control.h>
2008-07-03 13:24:40 +04:00
OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
The OMAP ASoC McBSP code implemented CLKR and FSR signal muxing via
direct System Control Module writes on OMAP2+. This required the
omap_ctrl_{read,write}l() functions to be exported, which is against
policy: the only code that should call those functions directly is
OMAP core code, not device drivers. omap_ctrl_{read,write}*() are no
longer exported, so the driver no longer builds as a module.
Fix the pinmuxing part of the problem by removing calls to
omap_ctrl_{read,write}l() from the OMAP ASoC McBSP code and
implementing signal muxing functions in arch/arm/mach-omap2/mcbsp.c.
Due to the unfortunate way that McBSP support is implemented in ASoC
and the OMAP tree, these symbols must be exported for use by
sound/soc/omap/omap-mcbsp.c.
Going forward, the McBSP device driver should be moved from
arch/arm/*omap* into drivers/ or sound/soc/*, and the CPU DAI driver
should be implemented as a platform_driver as many other ASoC CPU DAI
drivers are. These two steps should resolve many of the layering
problems, which will rapidly reappear during a McBSP hwmod/PM runtime
conversion.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-10-08 21:40:19 +04:00
/* McBSP internal signal muxing functions */
void omap2_mcbsp1_mux_clkr_src ( u8 mux )
{
u32 v ;
v = omap_ctrl_readl ( OMAP2_CONTROL_DEVCONF0 ) ;
if ( mux = = CLKR_SRC_CLKR )
v & = OMAP2_MCBSP1_CLKR_MASK ;
else if ( mux = = CLKR_SRC_CLKX )
v | = OMAP2_MCBSP1_CLKR_MASK ;
omap_ctrl_writel ( v , OMAP2_CONTROL_DEVCONF0 ) ;
}
EXPORT_SYMBOL ( omap2_mcbsp1_mux_clkr_src ) ;
void omap2_mcbsp1_mux_fsr_src ( u8 mux )
{
u32 v ;
v = omap_ctrl_readl ( OMAP2_CONTROL_DEVCONF0 ) ;
if ( mux = = FSR_SRC_FSR )
v & = OMAP2_MCBSP1_FSR_MASK ;
else if ( mux = = FSR_SRC_FSX )
v | = OMAP2_MCBSP1_FSR_MASK ;
omap_ctrl_writel ( v , OMAP2_CONTROL_DEVCONF0 ) ;
}
EXPORT_SYMBOL ( omap2_mcbsp1_mux_fsr_src ) ;
/* Platform data */
2008-07-03 13:24:40 +04:00
2008-10-08 11:01:40 +04:00
# ifdef CONFIG_ARCH_OMAP2420
static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata [ ] = {
2008-07-03 13:24:40 +04:00
{
2008-09-04 02:46:18 +04:00
. phys_base = OMAP24XX_MCBSP1_BASE ,
2008-07-03 13:24:40 +04:00
. dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX ,
. rx_irq = INT_24XX_MCBSP1_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP1_IRQ_TX ,
} ,
{
2008-09-04 02:46:18 +04:00
. phys_base = OMAP24XX_MCBSP2_BASE ,
2008-07-03 13:24:40 +04:00
. dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX ,
. rx_irq = INT_24XX_MCBSP2_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP2_IRQ_TX ,
} ,
} ;
2008-10-08 11:01:40 +04:00
# define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata)
2010-02-15 21:03:33 +03:00
# define OMAP2420_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)
2008-07-03 13:24:40 +04:00
# else
2008-10-08 11:01:40 +04:00
# define omap2420_mcbsp_pdata NULL
# define OMAP2420_MCBSP_PDATA_SZ 0
2010-02-15 21:03:33 +03:00
# define OMAP2420_MCBSP_REG_NUM 0
2008-10-08 11:01:40 +04:00
# endif
# ifdef CONFIG_ARCH_OMAP2430
static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata [ ] = {
{
. phys_base = OMAP24XX_MCBSP1_BASE ,
. dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX ,
. rx_irq = INT_24XX_MCBSP1_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP1_IRQ_TX ,
} ,
{
. phys_base = OMAP24XX_MCBSP2_BASE ,
. dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX ,
. rx_irq = INT_24XX_MCBSP2_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP2_IRQ_TX ,
} ,
{
. phys_base = OMAP2430_MCBSP3_BASE ,
. dma_rx_sync = OMAP24XX_DMA_MCBSP3_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP3_TX ,
. rx_irq = INT_24XX_MCBSP3_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP3_IRQ_TX ,
} ,
{
. phys_base = OMAP2430_MCBSP4_BASE ,
. dma_rx_sync = OMAP24XX_DMA_MCBSP4_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP4_TX ,
. rx_irq = INT_24XX_MCBSP4_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP4_IRQ_TX ,
} ,
{
. phys_base = OMAP2430_MCBSP5_BASE ,
. dma_rx_sync = OMAP24XX_DMA_MCBSP5_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP5_TX ,
. rx_irq = INT_24XX_MCBSP5_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP5_IRQ_TX ,
} ,
} ;
# define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata)
2010-02-15 21:03:33 +03:00
# define OMAP2430_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)
2008-10-08 11:01:40 +04:00
# else
# define omap2430_mcbsp_pdata NULL
# define OMAP2430_MCBSP_PDATA_SZ 0
2010-02-15 21:03:33 +03:00
# define OMAP2430_MCBSP_REG_NUM 0
2008-07-03 13:24:40 +04:00
# endif
2010-02-12 23:26:48 +03:00
# ifdef CONFIG_ARCH_OMAP3
2008-07-03 13:24:40 +04:00
static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata [ ] = {
{
2008-09-04 02:46:18 +04:00
. phys_base = OMAP34XX_MCBSP1_BASE ,
2008-07-03 13:24:40 +04:00
. dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX ,
. rx_irq = INT_24XX_MCBSP1_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP1_IRQ_TX ,
2010-06-03 08:39:33 +04:00
. buffer_size = 0x80 , /* The FIFO has 128 locations */
2008-07-03 13:24:40 +04:00
} ,
{
2008-09-04 02:46:18 +04:00
. phys_base = OMAP34XX_MCBSP2_BASE ,
2010-02-22 15:21:11 +03:00
. phys_base_st = OMAP34XX_MCBSP2_ST_BASE ,
2008-07-03 13:24:40 +04:00
. dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX ,
. rx_irq = INT_24XX_MCBSP2_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP2_IRQ_TX ,
2010-06-03 08:39:33 +04:00
. buffer_size = 0x500 , /* The FIFO has 1024 + 256 locations */
2008-07-03 13:24:40 +04:00
} ,
2008-10-08 11:01:40 +04:00
{
. phys_base = OMAP34XX_MCBSP3_BASE ,
2010-02-22 15:21:11 +03:00
. phys_base_st = OMAP34XX_MCBSP3_ST_BASE ,
2008-10-08 11:01:40 +04:00
. dma_rx_sync = OMAP24XX_DMA_MCBSP3_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP3_TX ,
. rx_irq = INT_24XX_MCBSP3_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP3_IRQ_TX ,
2010-06-03 08:39:33 +04:00
. buffer_size = 0x80 , /* The FIFO has 128 locations */
2008-10-08 11:01:40 +04:00
} ,
{
. phys_base = OMAP34XX_MCBSP4_BASE ,
. dma_rx_sync = OMAP24XX_DMA_MCBSP4_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP4_TX ,
. rx_irq = INT_24XX_MCBSP4_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP4_IRQ_TX ,
2010-06-03 08:39:33 +04:00
. buffer_size = 0x80 , /* The FIFO has 128 locations */
2008-10-08 11:01:40 +04:00
} ,
{
. phys_base = OMAP34XX_MCBSP5_BASE ,
. dma_rx_sync = OMAP24XX_DMA_MCBSP5_RX ,
. dma_tx_sync = OMAP24XX_DMA_MCBSP5_TX ,
. rx_irq = INT_24XX_MCBSP5_IRQ_RX ,
. tx_irq = INT_24XX_MCBSP5_IRQ_TX ,
2010-06-03 08:39:33 +04:00
. buffer_size = 0x80 , /* The FIFO has 128 locations */
2008-10-08 11:01:40 +04:00
} ,
2008-07-03 13:24:40 +04:00
} ;
# define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata)
2010-02-15 21:03:33 +03:00
# define OMAP34XX_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)
2008-07-03 13:24:40 +04:00
# else
# define omap34xx_mcbsp_pdata NULL
# define OMAP34XX_MCBSP_PDATA_SZ 0
2010-02-15 21:03:33 +03:00
# define OMAP34XX_MCBSP_REG_NUM 0
2008-07-03 13:24:40 +04:00
# endif
2009-07-28 17:27:10 +04:00
static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata [ ] = {
{
. phys_base = OMAP44XX_MCBSP1_BASE ,
. dma_rx_sync = OMAP44XX_DMA_MCBSP1_RX ,
. dma_tx_sync = OMAP44XX_DMA_MCBSP1_TX ,
2010-05-12 21:18:39 +04:00
. tx_irq = OMAP44XX_IRQ_MCBSP1 ,
2009-07-28 17:27:10 +04:00
} ,
{
. phys_base = OMAP44XX_MCBSP2_BASE ,
. dma_rx_sync = OMAP44XX_DMA_MCBSP2_RX ,
. dma_tx_sync = OMAP44XX_DMA_MCBSP2_TX ,
2010-05-12 21:18:39 +04:00
. tx_irq = OMAP44XX_IRQ_MCBSP2 ,
2009-07-28 17:27:10 +04:00
} ,
{
. phys_base = OMAP44XX_MCBSP3_BASE ,
. dma_rx_sync = OMAP44XX_DMA_MCBSP3_RX ,
. dma_tx_sync = OMAP44XX_DMA_MCBSP3_TX ,
2010-05-12 21:18:39 +04:00
. tx_irq = OMAP44XX_IRQ_MCBSP3 ,
2009-07-28 17:27:10 +04:00
} ,
{
. phys_base = OMAP44XX_MCBSP4_BASE ,
. dma_rx_sync = OMAP44XX_DMA_MCBSP4_RX ,
. dma_tx_sync = OMAP44XX_DMA_MCBSP4_TX ,
2010-05-12 21:18:39 +04:00
. tx_irq = OMAP44XX_IRQ_MCBSP4 ,
2009-07-28 17:27:10 +04:00
} ,
} ;
# define OMAP44XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap44xx_mcbsp_pdata)
2010-02-15 21:03:33 +03:00
# define OMAP44XX_MCBSP_REG_NUM (OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)
2009-07-28 17:27:10 +04:00
2008-10-08 11:01:39 +04:00
static int __init omap2_mcbsp_init ( void )
2008-07-03 13:24:40 +04:00
{
2010-02-15 21:03:33 +03:00
if ( cpu_is_omap2420 ( ) ) {
2008-10-08 11:01:40 +04:00
omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ ;
2010-02-15 21:03:33 +03:00
omap_mcbsp_cache_size = OMAP2420_MCBSP_REG_NUM * sizeof ( u16 ) ;
} else if ( cpu_is_omap2430 ( ) ) {
2008-10-08 11:01:40 +04:00
omap_mcbsp_count = OMAP2430_MCBSP_PDATA_SZ ;
2010-02-15 21:03:33 +03:00
omap_mcbsp_cache_size = OMAP2430_MCBSP_REG_NUM * sizeof ( u32 ) ;
} else if ( cpu_is_omap34xx ( ) ) {
2008-10-08 11:01:39 +04:00
omap_mcbsp_count = OMAP34XX_MCBSP_PDATA_SZ ;
2010-02-15 21:03:33 +03:00
omap_mcbsp_cache_size = OMAP34XX_MCBSP_REG_NUM * sizeof ( u32 ) ;
} else if ( cpu_is_omap44xx ( ) ) {
2009-07-28 17:27:10 +04:00
omap_mcbsp_count = OMAP44XX_MCBSP_PDATA_SZ ;
2010-02-15 21:03:33 +03:00
omap_mcbsp_cache_size = OMAP44XX_MCBSP_REG_NUM * sizeof ( u32 ) ;
}
2008-10-08 11:01:39 +04:00
mcbsp_ptr = kzalloc ( omap_mcbsp_count * sizeof ( struct omap_mcbsp * ) ,
GFP_KERNEL ) ;
if ( ! mcbsp_ptr )
return - ENOMEM ;
2008-10-08 11:01:40 +04:00
if ( cpu_is_omap2420 ( ) )
omap_mcbsp_register_board_cfg ( omap2420_mcbsp_pdata ,
OMAP2420_MCBSP_PDATA_SZ ) ;
if ( cpu_is_omap2430 ( ) )
omap_mcbsp_register_board_cfg ( omap2430_mcbsp_pdata ,
OMAP2430_MCBSP_PDATA_SZ ) ;
2008-10-08 11:01:40 +04:00
if ( cpu_is_omap34xx ( ) )
omap_mcbsp_register_board_cfg ( omap34xx_mcbsp_pdata ,
OMAP34XX_MCBSP_PDATA_SZ ) ;
2009-07-28 17:27:10 +04:00
if ( cpu_is_omap44xx ( ) )
omap_mcbsp_register_board_cfg ( omap44xx_mcbsp_pdata ,
OMAP44XX_MCBSP_PDATA_SZ ) ;
2008-07-03 13:24:40 +04:00
return omap_mcbsp_init ( ) ;
}
arch_initcall ( omap2_mcbsp_init ) ;