S3C AUDIO: Rename s3c24xx_pcm prefix to generic s3c_audio
Subsystems (5)
PATCH 1/7 S3C AUDIO: Rename s3c24xx_pcm prefix to generic s3c_audio
From: Jassi Brar <[email protected]>
The s3c24xx_pcm prefix for the soc_platform is inappropriate when some Samsung SoCs have PCM controllers which will eventually have drivers and hence namespace ambiguities.
The prefix 's3c24xx_pcm' is neither specific to 24xx nor is it about any 'pcm' controller. It is shared across audio protocols. And 's3c_audio' seems better suited for the purpose.
--- sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c-i2s-v2.h | 4 +- sound/soc/s3c24xx/s3c2412-i2s.c | 4 +- sound/soc/s3c24xx/s3c2443-ac97.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-i2s.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-pcm.c | 76 +++++++++++++++++++------------------- sound/soc/s3c24xx/s3c24xx-pcm.h | 6 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- 8 files changed, 58 insertions(+), 58 deletions(-)
sound/soc/s3c24xx/s3c-i2s-v2.c +1 -1
@@ -394,7 +394,7 @@ static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd,int capture = (substream->stream ==SNDRV_PCM_STREAM_CAPTURE );unsigned long irqs;int ret =0 ; -int channel = ((struct s3c24xx_pcm_dma_params *) +int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel;pr_debug ("Entered %s\n" , __func__);
sound/soc/s3c24xx/s3c-i2s-v2.h +2 -2
@@ -49,8 +49,8 @@ struct s3c_i2sv2_info {unsigned char master; -struct s3c24xx_pcm_dma_params *dma_playback; -struct s3c24xx_pcm_dma_params *dma_capture; +struct s3c_audio_dma_params *dma_playback; +struct s3c_audio_dma_params *dma_capture;u32 suspend_iismod;u32 suspend_iiscon;
sound/soc/s3c24xx/s3c2412-i2s.c +2 -2
@@ -50,14 +50,14 @@ static struct s3c2410_dma_client s3c2412_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_out = { +static struct s3c_audio_dma_params s3c2412_i2s_pcm_stereo_out = { .client = &s3c2412_dma_client_out, .channel =DMACH_I2S_OUT , .dma_addr =S3C2410_PA_IIS +S3C2412_IISTXD , .dma_size =4 , }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_in = { +static struct s3c_audio_dma_params s3c2412_i2s_pcm_stereo_in = { .client = &s3c2412_dma_client_in, .channel =DMACH_I2S_IN , .dma_addr =S3C2410_PA_IIS +S3C2412_IISRXD ,
sound/soc/s3c24xx/s3c2443-ac97.c +5 -5
@@ -188,21 +188,21 @@ static struct s3c2410_dma_client s3c2443_dma_client_micin = { .name = "AC97 Mic Mono in" }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_out = { +static struct s3c_audio_dma_params s3c2443_ac97_pcm_stereo_out = { .client = &s3c2443_dma_client_out, .channel =DMACH_PCM_OUT , .dma_addr =S3C2440_PA_AC97 +S3C_AC97_PCM_DATA , .dma_size =4 , }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_in = { +static struct s3c_audio_dma_params s3c2443_ac97_pcm_stereo_in = { .client = &s3c2443_dma_client_in, .channel =DMACH_PCM_IN , .dma_addr =S3C2440_PA_AC97 +S3C_AC97_PCM_DATA , .dma_size =4 , }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = { +static struct s3c_audio_dma_params s3c2443_ac97_mic_mono_in = { .client = &s3c2443_dma_client_micin, .channel =DMACH_MIC_IN , .dma_addr =S3C2440_PA_AC97 +S3C_AC97_MIC_DATA ,
@@ -290,7 +290,7 @@ static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd, {u32 ac_glbctrl;struct snd_soc_pcm_runtime *rtd = substream->private_data; -int channel = ((struct s3c24xx_pcm_dma_params *) +int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl =readl (s3c24xx_ac97.regs +S3C_AC97_GLBCTRL );
@@ -339,7 +339,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, {u32 ac_glbctrl;struct snd_soc_pcm_runtime *rtd = substream->private_data; -int channel = ((struct s3c24xx_pcm_dma_params *) +int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl =readl (s3c24xx_ac97.regs +S3C_AC97_GLBCTRL );
sound/soc/s3c24xx/s3c24xx-i2s.c +5 -5
@@ -49,14 +49,14 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { +static struct s3c_audio_dma_params s3c24xx_i2s_pcm_stereo_out = { .client = &s3c24xx_dma_client_out, .channel =DMACH_I2S_OUT , .dma_addr =S3C2410_PA_IIS +S3C2410_IISFIFO , .dma_size =2 , }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { +static struct s3c_audio_dma_params s3c24xx_i2s_pcm_stereo_in = { .client = &s3c24xx_dma_client_in, .channel =DMACH_I2S_IN , .dma_addr =S3C2410_PA_IIS +S3C2410_IISFIFO ,
@@ -258,12 +258,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream,switch (params_format (params)) {case SNDRV_PCM_FORMAT_S8 : iismod &= ~S3C2410_IISMOD_16BIT ; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size =1 ;break ;case SNDRV_PCM_FORMAT_S16_LE : iismod |=S3C2410_IISMOD_16BIT ; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size =2 ;break ;default :
@@ -280,7 +280,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, {int ret =0 ;struct snd_soc_pcm_runtime *rtd = substream->private_data; -int channel = ((struct s3c24xx_pcm_dma_params *) +int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel;pr_debug ("Entered %s\n" , __func__);
sound/soc/s3c24xx/s3c24xx-pcm.c +38 -38
219 lines not on this page · raw message
sound/soc/s3c24xx/s3c24xx-pcm.h +3 -3
@@ -9,13 +9,13 @@* ALSA PCM interface for the Samsung S3C24xx CPU */ -#ifndef _S3C24XX_PCM_H -#define _S3C24XX_PCM_H +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H #define ST_RUNNING (1<<0) #define ST_OPENED (1<<1) -struct s3c24xx_pcm_dma_params { +struct s3c_audio_dma_params { struct s3c2410_dma_client *client; /* stream identifier */ int channel; /* Channel ID */ dma_addr_t dma_addr;
sound/soc/s3c24xx/s3c64xx-i2s.c +2 -2
@@ -46,7 +46,7 @@ static struct s3c2410_dma_client s3c64xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2 ] = { +static struct s3c_audio_dma_params s3c64xx_i2s_pcm_stereo_out[2 ] = { [0 ] = { .channel =DMACH_I2S0_OUT , .client = &s3c64xx_dma_client_out,
@@ -61,7 +61,7 @@ static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { }, }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_in[2 ] = { +static struct s3c_audio_dma_params s3c64xx_i2s_pcm_stereo_in[2 ] = { [0 ] = { .channel =DMACH_I2S0_IN , .client = &s3c64xx_dma_client_in,
Signature · 1 line
1.6.2.5
PATCH 2/7 S3C AUDIO: Rename s3c24xx-pcm driver to generic s3c_audio
From: Jassi Brar <[email protected]>
Following the s3c24xx_pcm prefix rename, the driver is also renamed.
--- sound/soc/s3c24xx/Makefile | 2 +- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 +- sound/soc/s3c24xx/neo1973_wm8753.c | 2 +- sound/soc/s3c24xx/s3c-audio.c | 467 ++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-audio.h | 31 ++ sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 467 ------------------------ sound/soc/s3c24xx/s3c24xx-pcm.h | 31 -- sound/soc/s3c24xx/s3c24xx_simtec.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +- 20 files changed, 514 insertions(+), 514 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-audio.c create mode 100644 sound/soc/s3c24xx/s3c-audio.h delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.c delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.h
sound/soc/s3c24xx/Makefile +1 -1
@@ -1,5 +1,5 @@ # S3c24XX Platform Support -snd-soc-s3c24xx-objs := s3c24xx-pcm.o +snd-soc-s3c24xx-objs := s3c-audio.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
sound/soc/s3c24xx/jive_wm8750.c +1 -1
@@ -25,7 +25,7 @@#include <asm/mach-types.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c2412-i2s.h" #include "../codecs/wm8750.h"
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -24,7 +24,7 @@#include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" static struct snd_soc_card ln2440sbc;
sound/soc/s3c24xx/neo1973_gta02_wm8753.c +1 -1
@@ -32,7 +32,7 @@#include <asm/io.h> #include <mach/gta02.h> #include "../codecs/wm8753.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" static struct snd_soc_card neo1973_gta02;
sound/soc/s3c24xx/neo1973_wm8753.c +1 -1
@@ -36,7 +36,7 @@#include "../codecs/wm8753.h" #include "lm4857.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" /* define the scenarios */
sound/soc/s3c24xx/s3c-audio.c new file +467 -0
467 lines not on this page · raw message
sound/soc/s3c24xx/s3c-audio.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* s3c-audio.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 +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* ALSA PCM interface for the Samsung S3C24xx CPU +*/ + +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H + +#define ST_RUNNING (1<<0) +#define ST_OPENED (1<<1) + +struct s3c_audio_dma_params { +struct s3c2410_dma_client *client;/* stream identifier */ +int channel;/* Channel ID */ +dma_addr_t dma_addr; +int dma_size;/* Size of the DMA transfer */ +}; + +#define S3C24XX_DAI_I2S 0 + +/* platform data */ +extern struct snd_soc_platform s3c24xx_soc_platform; +extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; + +#endif
sound/soc/s3c24xx/s3c-i2s-v2.c +1 -1
@@ -35,7 +35,7 @@#include <mach/dma.h> #include "s3c-i2s-v2.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #undef S3C_IIS_V2_SUPPORTED
sound/soc/s3c24xx/s3c2412-i2s.c +1 -1
@@ -37,7 +37,7 @@#include <mach/regs-gpio.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c2412-i2s.h" #define S3C2412_I2S_DEBUG 0
sound/soc/s3c24xx/s3c2443-ac97.c +1 -1
@@ -35,7 +35,7 @@#include <asm/dma.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" struct s3c24xx_ac97_info {
sound/soc/s3c24xx/s3c24xx-i2s.c +1 -1
@@ -38,7 +38,7 @@#include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" static struct s3c2410_dma_client s3c24xx_dma_client_out = {
sound/soc/s3c24xx/s3c24xx-pcm.c deleted +0 -467
467 lines not on this page · raw message
sound/soc/s3c24xx/s3c24xx-pcm.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -* s3c24xx-pcm.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 -* Free Software Foundation; either version 2 of the License, or (at your -* option) any later version. -* -* ALSA PCM interface for the Samsung S3C24xx CPU -*/ - -#ifndef _S3C_AUDIO_H -#define _S3C_AUDIO_H - -#define ST_RUNNING (1<<0) -#define ST_OPENED (1<<1) - -struct s3c_audio_dma_params { -struct s3c2410_dma_client *client;/* stream identifier */ -int channel;/* Channel ID */ -dma_addr_t dma_addr; -int dma_size;/* Size of the DMA transfer */ -}; - -#define S3C24XX_DAI_I2S 0 - -/* platform data */ -extern struct snd_soc_platform s3c24xx_soc_platform; -extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; - -#endif
sound/soc/s3c24xx/s3c24xx_simtec.c +1 -1
@@ -21,7 +21,7 @@#include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h"
sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +1 -1
@@ -18,7 +18,7 @@#include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h"
sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +1 -1
@@ -18,7 +18,7 @@#include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h"
sound/soc/s3c24xx/s3c24xx_uda134x.c +1 -1
@@ -24,7 +24,7 @@#include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "../codecs/uda134x.h"
sound/soc/s3c24xx/s3c64xx-i2s.c +1 -1
@@ -35,7 +35,7 @@#include <mach/map.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c64xx-i2s.h" static struct s3c2410_dma_client s3c64xx_dma_client_out = {
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -20,7 +20,7 @@#include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" static struct snd_soc_card smdk2443;
sound/soc/s3c24xx/smdk64xx_wm8580.c +1 -1
@@ -19,7 +19,7 @@#include <sound/soc-dapm.h> #include "../codecs/wm8580.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c64xx-i2s.h" #define S3C64XX_I2S_V4 2
Signature · 1 line
1.6.2.5
PATCH 3/7 S3C64XX PCM: Define PCM Controller base registers
From: Jassi Brar <[email protected]>
--- arch/arm/mach-s3c6400/include/mach/map.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-s3c6400/include/mach/map.h +2 -0
@@ -48,6 +48,8 @@#define S3C64XX_PA_IIS1 (0x7F003000)#define S3C64XX_PA_TIMER (0x7F006000)#define S3C64XX_PA_IIC0 (0x7F004000) +#define S3C64XX_PA_PCM0 (0x7F009000) +#define S3C64XX_PA_PCM1 (0x7F00A000)#define S3C64XX_PA_IISV4 (0x7F00D000)#define S3C64XX_PA_IIC1 (0x7F00F000)
Signature · 1 line
1.6.2.5
PATCH 4/7 S3C64XX PCM: Added PCLK clock source for the PCM controllers
From: Jassi Brar <[email protected]>
--- arch/arm/plat-s3c64xx/clock.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/plat-s3c64xx/clock.c +12 -0
@@ -129,6 +129,18 @@ static struct clk init_clocks_disable[] = { .enable = s3c64xx_pclk_ctrl, .ctrlbit = S3C_CLKCON_PCLK_IIS1, }, { + .name = "pcm", + .id = 0, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM0, + }, { + .name = "pcm", + .id = 1, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM1, + }, { .name = "spi", .id = 0, .parent = &clk_p,
Signature · 1 line
1.6.2.5
PATCH 5/7 S3C AUDIO: Add header to pass platform data to device drivers.
From: Jassi Brar <[email protected]>
--- arch/arm/plat-s3c/include/plat/audio.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s3c/include/plat/audio.h
arch/arm/plat-s3c/include/plat/audio.h new file +20 -0
@@ -0,0 +1,20 @@ +/* arch/arm/plat-s3c/include/plat/audio.h +* +* Copyright (c) 2009 Samsung Electronics Co. Ltd +* Author: Jaswinder Singh <[email protected]> +* +* 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 s3c_audio_pdata - common platform data for audio device drivers +* @pdata: Pointer to protocol(I2S, PCM or AC97) specific platform data +* @cfg_gpio: Callback function to setup mux'ed pins in I2S/PCM/AC97 mode +*/ +struct s3c_audio_pdata { +void *pdata; + +int (*cfg_gpio)(struct platform_device *); +};
Signature · 1 line
1.6.2.5
PATCH 6/7 S3C64XX PCM: Defined PCM controller platform devices
From: Jassi Brar <[email protected]>
--- arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c64xx/dev-audio.c | 101 ++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletions(-)
arch/arm/plat-s3c/include/plat/devs.h +3 -0
@@ -28,6 +28,9 @@ extern struct platform_device s3c64xx_device_iis0;extern struct platform_device s3c64xx_device_iis1;extern struct platform_device s3c64xx_device_iisv4; +extern struct platform_device s3c64xx_device_pcm0; +extern struct platform_device s3c64xx_device_pcm1; +extern struct platform_device s3c_device_fb;extern struct platform_device s3c_device_usb;extern struct platform_device s3c_device_lcd;
arch/arm/plat-s3c64xx/dev-audio.c +100 -1
112 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 7/7 S3C PCM: Added the CPU driver for PCM controllers
From: Jassi Brar <[email protected]>
--- sound/soc/s3c24xx/Kconfig | 3 + sound/soc/s3c24xx/Makefile | 2 + sound/soc/s3c24xx/s3c-pcm.c | 558 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-pcm.h | 123 ++++++++++ 4 files changed, 686 insertions(+), 0 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-pcm.c create mode 100644 sound/soc/s3c24xx/s3c-pcm.h
sound/soc/s3c24xx/Kconfig +3 -0
@@ -24,6 +24,9 @@ config SND_S3C64XX_SOC_I2S select SND_S3C_I2SV2_SOC select S3C64XX_DMA +config SND_S3C_SOC_PCM + tristate + config SND_S3C2443_SOC_AC97 tristate select S3C2410_DMA
sound/soc/s3c24xx/Makefile +2 -0
@@ -5,6 +5,7 @@ snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o snd-soc-s3c2443-ac97-objs := s3c2443-ac97.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o +snd-soc-s3c-pcm-objs := s3c-pcm.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o
@@ -12,6 +13,7 @@ obj-$(CONFIG_SND_S3C2443_SOC_AC97) += snd-soc-s3c2443-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += snd-soc-s3c64xx-i2s.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o +obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-s3c-pcm.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o
sound/soc/s3c24xx/s3c-pcm.c new file +558 -0
558 lines not on this page · raw message
sound/soc/s3c24xx/s3c-pcm.h new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
1.6.2.5
Re: [PATCH 2/7] S3C AUDIO: Rename s3c24xx-pcm driver to generic s3c_audio
In reply to [email protected]Quoted 3 lines · On Wed, Nov 04, 2009 at 05:29:04PM +0900, [email protected] wrote:
From: Jassi Brar <[email protected]>
Following the
s3c24xx_pcmprefix rename, the driver is also renamed.
This needs to be part of the previous patch, without these changes the previous patch will cause the code to fail to build.
Re: [PATCH 2/7] S3C AUDIO: Rename s3c24xx-pcm driver to generic s3c_audio
Quoted 7 lines · Mark Brown
Quoted 3 lines · On Wed, Nov 04, 2009 at 05:29:04PM +0900, [email protected] wrote:
From: Jassi Brar <[email protected]>
Following the
s3c24xx_pcmprefix rename, the driver is also renamed.This needs to be part of the previous patch, without these changes the previous patch will cause the code to fail to build.
The changes in the previous patch(1/7) are all local to s3c24xx-pcm.c besides I have verified that.