ASoC: Rename 's3c24xx-pcm' driver to 's3c-dma'
Making room for namespace for the PCM Controller driver the platform driver(s3c24xx-pcm) has been renamed to SoC agnostic name 's3c-dma'. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
faa31776e4
commit
d3ff5a3e61
18 changed files with 23 additions and 22 deletions
|
@ -1,5 +1,5 @@
|
|||
# S3c24XX Platform Support
|
||||
snd-soc-s3c24xx-objs := s3c24xx-pcm.o
|
||||
snd-soc-s3c24xx-objs := s3c-dma.o
|
||||
snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
|
||||
snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o
|
||||
snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c2412-i2s.h"
|
||||
|
||||
#include "../codecs/wm8750.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <sound/soc-dapm.h>
|
||||
|
||||
#include "../codecs/ac97.h"
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-ac97.h"
|
||||
|
||||
static struct snd_soc_card ln2440sbc;
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <asm/io.h>
|
||||
#include <mach/gta02.h>
|
||||
#include "../codecs/wm8753.h"
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-i2s.h"
|
||||
|
||||
static struct snd_soc_card neo1973_gta02;
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
#include "../codecs/wm8753.h"
|
||||
#include "lm4857.h"
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-i2s.h"
|
||||
|
||||
/* define the scenarios */
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* s3c24xx-pcm.c -- ALSA Soc Audio Layer
|
||||
* s3c-dma.c -- ALSA Soc Audio Layer
|
||||
*
|
||||
* (c) 2006 Wolfson Microelectronics PLC.
|
||||
* Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com
|
||||
|
@ -30,7 +30,7 @@
|
|||
#include <mach/hardware.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
|
||||
static const struct snd_pcm_hardware s3c_dma_hardware = {
|
||||
.info = SNDRV_PCM_INFO_INTERLEAVED |
|
||||
|
@ -79,12 +79,13 @@ static void s3c_dma_enqueue(struct snd_pcm_substream *substream)
|
|||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
if (s3c_dma_has_circular()) {
|
||||
if (s3c_dma_has_circular())
|
||||
limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period;
|
||||
} else
|
||||
else
|
||||
limit = prtd->dma_limit;
|
||||
|
||||
pr_debug("%s: loaded %d, limit %d\n", __func__, prtd->dma_loaded, limit);
|
||||
pr_debug("%s: loaded %d, limit %d\n",
|
||||
__func__, prtd->dma_loaded, limit);
|
||||
|
||||
while (prtd->dma_loaded < limit) {
|
||||
unsigned long len = prtd->dma_period;
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* s3c24xx-pcm.h --
|
||||
* s3c-dma.h --
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
|
@ -35,7 +35,7 @@
|
|||
#include <mach/dma.h>
|
||||
|
||||
#include "s3c-i2s-v2.h"
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
|
||||
#undef S3C_IIS_V2_SUPPORTED
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <mach/regs-gpio.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c2412-i2s.h"
|
||||
|
||||
#define S3C2412_I2S_DEBUG 0
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <asm/dma.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-ac97.h"
|
||||
|
||||
struct s3c24xx_ac97_info {
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include <plat/regs-iis.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-i2s.h"
|
||||
|
||||
static struct s3c2410_dma_client s3c24xx_dma_client_out = {
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <plat/audio-simtec.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-i2s.h"
|
||||
#include "s3c24xx_simtec.h"
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include <plat/audio-simtec.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-i2s.h"
|
||||
#include "s3c24xx_simtec.h"
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include <plat/audio-simtec.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-i2s.h"
|
||||
#include "s3c24xx_simtec.h"
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include <plat/regs-iis.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-i2s.h"
|
||||
#include "../codecs/uda134x.h"
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <mach/map.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c64xx-i2s.h"
|
||||
|
||||
static struct s3c2410_dma_client s3c64xx_dma_client_out = {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <sound/soc-dapm.h>
|
||||
|
||||
#include "../codecs/ac97.h"
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c24xx-ac97.h"
|
||||
|
||||
static struct snd_soc_card smdk2443;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <sound/soc-dapm.h>
|
||||
|
||||
#include "../codecs/wm8580.h"
|
||||
#include "s3c24xx-pcm.h"
|
||||
#include "s3c-dma.h"
|
||||
#include "s3c64xx-i2s.h"
|
||||
|
||||
#define S3C64XX_I2S_V4 2
|
||||
|
|
Reference in a new issue