ASoC: Overhaul Samsung drivers
Subsystems (6)
PATCH v3 1/1 ASoC: Overhaul Samsung drivers
From: Jassi Brar <[email protected]>
Hi,
Submitting revised patch series.
Since v2:
a) Divided 'ASoC Samsung Add common I2S driver' into two.
b) 'ARM Samsung Rename s3c64xx I2S platform device' based on plat tree
As Kgene agreed to prepare a branch for Mark, platform related changes are based on his tree wherever possible.
Patches for Kgene will be posted on Arm-Linux ml and those for Mark Brown, on ALSA ml, now that people have already 'seen' two versions of the patch series with same code but different segregation.
Here is overview of patches:-
For Kgene:-
************
S5PV310: DMA: Add platform devices for PL330 DMACs
ARM: Samsung: Rename s3c64xx I2S platform device
ARM: Samsung: Prepare audio header for new I2S driver
ARM: S3C64XX: I2S: Upgrade platform device
ARM: S5P64X0: I2S: Upgrade platform device
ARM: S5P6442: I2S: Upgrade platform device
ARM: S5PC100: I2S: Upgrade platform device
ARM: S5PV210: I2S: Upgrade platform device
ARM: S5PV310: Add audio platform devices
For Mark :-
***********
ASoC: Samsung: Remove redundant AQUILA driver
ASoC: Samsung: Rename DMA device
ARM: Samsung: Define common audio-dma device
ASoC: Samsung: Rename ASoC DMA driver
ASoC: Samsung: Rename AC97 platform device
ASoC: Samsung: Rename AC97 driver
ASoC: Samsung: Rename PCM driver
ASoC: Samsung: Generalize DMA driver namespace
ASoC: Samsung: Rename s3c64xx I2S device
ASoC: Samsung: Add common I2S driver
ASoC: SMARTQ: Move to use new I2S driver
ASoC: GONI: Move to use new I2S driver
ASoC: SMDK64XX: Move to use new I2S driver
ASoC: S3C64XX: Remove obsoleted I2S drivers
ASoC: SMDK64XX: Rename for other platforms
ASoC: SMDK_WM8580: Enable for SMDKC100
ASoC: Samsung: Generalize Kconfig symbols
ASoC: Samsung: Rename from s3c24xx to samsung
Thanks.
*************************************************
Since v1:
a) Use case 16 in set_bfs and default for error
b) Better code comments.
c) Use switch case in i2sv2_i2s_set_clkdiv
d) Use SNDRV_PCM_RATE_8000_96000
e) MAX_I2S -> SAMSUNG_I2S_SECOFF
f) Local namespace cleanup with i2s driver.
------------
Here come patches overhauling the Samsung ASoC support.
The AC97, PCM, SPDIF and ASoC-DMA related code has merely undergone cosmetic changes - symbol, device & driver renaming and file moving.
A new I2S controller driver has been added to manage Samsung SoCs since S3C64XX. Older driver has been changed only as is necessary. Regarding I2S, I have left the s3c24xx series untouched because the controllers are too different to run by a common driver. S3C2412's I2S does have some similarities, but not important enough to warrant impact on new driver design.
The new I2S driver has been designed around the notion of features/quirks. The newer SoCs have revised version of I2S_0(usually) than previous ones. So, I2S block is 'specified' in the platform code and the driver works on that configuration.
For now, Secondary I2S DAI works only with System-DMAC. I2S-Internal DMA and SRAM will be enabled later.
Testing:-
Simple testing of 5.1 channel and hardware mixing seems to work (though
there seems to be some issue with symmetric_rates in soc-core.c which would be tried to fix later as saperate issue).
I would appreciate any test-results for GONI and SMARTQ.
I suggest the patches 13,14,16 & 17 go via Kgene's Tree, and the rest via ASoC tree due to tight dependencies.
1). ASoC: Samsung: Remove redundant AQUILA driver 2). ASoC: Samsung: Rename DMA device
3). ARM: Samsung: Define common audio-dma device 4). ASoC: Samsung: Rename ASoC DMA driver 5). ASoC: Samsung: Rename AC97 platform device 6). ASoC: Samsung: Rename AC97 driver
7). ASoC: Samsung: Rename PCM driver
8). ASoC: Samsung: Generalize DMA driver namespace 9). ASoC: Samsung: Rename s3c64xx I2S device 10). ASoC: Samsung: Add common I2S driver 11). ARM: S3C64XX: I2S: Upgrade platform device 12). ARM: S5P6440: I2S: Upgrade platform device 13). ARM: S5P6442: I2S: Upgrade platform device 14). ARM: S5PC100: I2S: Upgrade platform device 15). ARM: S5PV210: I2S: Upgrade platform device 16). ARM: S5PV310: Add audio platform devices 17). ASoC: SMARTQ: Move to use new I2S driver 18). ASoC: GONI: Move to use new I2S driver 19). ASoC: SMDK64XX: Move to use new I2S driver 20). ASoC: S3C64XX: Remove obsoleted I2S drivers 21). ASoC: SMDK64XX: Rename for other platforms 22). ASoC: SMDK_WM8580: Enable for SMDKC100 23). ASoC: Samsung: Generalize Kconfig symbols 24). ASoC: Samsung: Rename from s3c24xx to samsung
PATCH 1/18 ASoC: Samsung: Remove redundant AQUILA driver
From: Jassi Brar <[email protected]>
AQUILA and GONI are essentially the same h/w w.r.t ASoC. They only differ by the fact that GONI has stereo speaker-out whereas AQUILA has mono.
The difference can easily be handled in the same MACHINE driver by making machine-specific runtime changes.
--- sound/soc/s3c24xx/Kconfig | 17 +-- sound/soc/s3c24xx/Makefile | 4 +- sound/soc/s3c24xx/aquila_wm8994.c | 295 ------------------------------------- sound/soc/s3c24xx/goni_wm8994.c | 19 +++- 4 files changed, 23 insertions(+), 312 deletions(-) delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c
sound/soc/s3c24xx/Kconfig +4 -13
@@ -144,22 +144,13 @@ config SND_S3C64XX_SOC_SMARTQ select SND_S3C64XX_SOC_I2S select SND_SOC_WM8750 -config SND_S5PC110_SOC_AQUILA_WM8994 - tristate "SoC I2S Audio support for AQUILA - WM8994" - depends on SND_S3C24XX_SOC && MACH_AQUILA +config SND_SOC_GONI_AQUILA_WM8994 + tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" + depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) select SND_S3C64XX_SOC_I2S_V4 select SND_SOC_WM8994 help - Say Y if you want to add support for SoC audio on aquila - with the WM8994. - -config SND_S5PV210_SOC_GONI_WM8994 - tristate "SoC I2S Audio support for GONI - WM8994" - depends on SND_S3C24XX_SOC && MACH_GONI - select SND_S3C64XX_SOC_I2S_V4 - select SND_SOC_WM8994 - help - Say Y if you want to add support for SoC audio on goni + Say Y if you want to add support for SoC audio on goni or aquila with the WM8994. config SND_SOC_SMDK_SPDIF
sound/soc/s3c24xx/Makefile +1 -3
@@ -33,7 +33,6 @@ snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o snd-soc-smdk64xx-wm8580-objs := smdk64xx_wm8580.o snd-soc-smdk-wm9713-objs := smdk_wm9713.o snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o -snd-soc-aquila-wm8994-objs := aquila_wm8994.o snd-soc-goni-wm8994-objs := goni_wm8994.o snd-soc-smdk-spdif-objs := smdk_spdif.o
@@ -50,6 +49,5 @@ obj-$(CONFIG_SND_S3C24XX_SOC_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o obj-$(CONFIG_SND_S3C64XX_SOC_WM8580) += snd-soc-smdk64xx-wm8580.o obj-$(CONFIG_SND_SOC_SMDK_WM9713) += snd-soc-smdk-wm9713.o obj-$(CONFIG_SND_S3C64XX_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o -obj-$(CONFIG_SND_S5PC110_SOC_AQUILA_WM8994) += snd-soc-aquila-wm8994.o -obj-$(CONFIG_SND_S5PV210_SOC_GONI_WM8994) += snd-soc-goni-wm8994.o obj-$(CONFIG_SND_SOC_SMDK_SPDIF) += snd-soc-smdk-spdif.o +obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
sound/soc/s3c24xx/aquila_wm8994.c deleted +0 -295
295 lines not on this page · raw message
sound/soc/s3c24xx/goni_wm8994.c +18 -1
@@ -28,6 +28,14 @@#include "s3c-dma.h" #include "s3c64xx-i2s.h" +#define MACHINE_NAME 0 +#define CPU_VOICE_DAI 1 + +static const char *aquila_str[] = { + [MACHINE_NAME ] ="aquila" , + [CPU_VOICE_DAI ] ="aquila-voice-dai" , +}; +static struct snd_soc_card goni;static struct platform_device *goni_snd_device;
@@ -115,6 +123,11 @@ static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)snd_soc_dapm_nc_pin (codec,"LINEOUT2N" );snd_soc_dapm_nc_pin (codec,"LINEOUT2P" ); +if (machine_is_aquila ()) { +snd_soc_dapm_nc_pin (codec,"SPKOUTRN" ); +snd_soc_dapm_nc_pin (codec,"SPKOUTRP" ); + } +snd_soc_dapm_sync (codec);/* Headset jack detection */
@@ -263,7 +276,11 @@ static int __init goni_init(void) {int ret; -if (!machine_is_goni ()) +if (machine_is_aquila ()) { + voice_dai.name = aquila_str[CPU_VOICE_DAI ]; + goni_dai[1 ].cpu_dai_name = aquila_str[CPU_VOICE_DAI ]; + goni.name = aquila_str[MACHINE_NAME ]; + }else if (!machine_is_goni ())return -ENODEV ; goni_snd_device =platform_device_alloc ("soc-audio" ,-1 );
Signature · 1 line
1.6.2.5
PATCH 2/18 ASoC: Samsung: Rename DMA device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Some Samsung SoCs have a PCM(DSP) controller. So the name s3c24xx-pcm-audio for DMA driver is not very appropraite. This patch moves :-
s3c24xx-pcm-audio -> samsung-audio
--- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 2 +- sound/soc/s3c24xx/goni_wm8994.c | 4 ++-- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 4 ++-- sound/soc/s3c24xx/neo1973_wm8753.c | 4 ++-- sound/soc/s3c24xx/rx1950_uda1380.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 4 ++-- 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/smartq_wm8987.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 ++-- sound/soc/s3c24xx/smdk_spdif.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-)
arch/arm/mach-s3c64xx/dev-audio.c +1 -1
@@ -340,7 +340,7 @@ void __init s3c64xx_ac97_setup_gpio(int num)static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_pcm = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .id =-1 , .dev = { .dma_mask = &s3c_device_audio_dmamask,
arch/arm/plat-s3c24xx/devs.c +1 -1
@@ -264,7 +264,7 @@ EXPORT_SYMBOL(s3c_device_iis);static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_pcm = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .id =-1 , .dev = { .dma_mask = &s3c_device_audio_dmamask,
sound/soc/s3c24xx/goni_wm8994.c +2 -2
@@ -251,7 +251,7 @@ static struct snd_soc_dai_link goni_dai[] = { .stream_name = "WM8994 HiFi", .cpu_dai_name = "s3c64xx-i2s-v4", .codec_dai_name = "wm8994-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a", .init = goni_wm8994_init, .ops = &goni_hifi_ops,
@@ -260,7 +260,7 @@ static struct snd_soc_dai_link goni_dai[] = { .stream_name = "Voice", .cpu_dai_name = "goni-voice-dai", .codec_dai_name = "wm8994-voice", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a", .ops = &goni_voice_ops, },
sound/soc/s3c24xx/jive_wm8750.c +1 -1
@@ -141,7 +141,7 @@ static struct snd_soc_dai_link jive_dai = { .stream_name = "WM8750", .cpu_dai_name = "s3c2412-i2s", .codec_dai_name = "wm8750-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a", .init = jive_wm8750_init, .ops = &jive_ops,
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -35,7 +35,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };
sound/soc/s3c24xx/neo1973_gta02_wm8753.c +2 -2
@@ -400,7 +400,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .init = neo1973_gta02_wm8753_init, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8753-codec.0-0x1a", .ops = &neo1973_gta02_hifi_ops, },
@@ -411,7 +411,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .codec_dai_name = "wm8753-voice", .ops = &neo1973_gta02_voice_ops, .codec_name = "wm8753-codec.0-0x1a", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };
sound/soc/s3c24xx/neo1973_wm8753.c +2 -2
@@ -556,7 +556,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { {/* Hifi Playback - for similatious use with voice below */ .name = "WM8753", .stream_name = "WM8753 HiFi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .codec_name = "wm8753-codec.0-0x1a",
@@ -566,7 +566,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { {/* Voice via BT */ .name = "Bluetooth", .stream_name = "Voice", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .cpu_dai_name = "bluetooth-dai", .codec_dai_name = "wm8753-voice", .codec_name = "wm8753-codec.0-0x1a",
sound/soc/s3c24xx/rx1950_uda1380.c +1 -1
@@ -96,7 +96,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = { .cpu_dai_name = "s3c24xx-iis", .codec_dai_name = "uda1380-hifi", .init = rx1950_uda1380_init, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "uda1380-codec.0-001a", .ops = &rx1950_ops, },
sound/soc/s3c24xx/s3c-dma.c +2 -2
@@ -477,7 +477,7 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev)static struct platform_driver s3c24xx_pcm_driver = { .driver = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .owner =THIS_MODULE , },
@@ -500,4 +500,4 @@ module_exit(snd_s3c24xx_pcm_exit);MODULE_AUTHOR ("Ben Dooks, <[email protected]>" );MODULE_DESCRIPTION ("Samsung S3C Audio DMA module" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c24xx-pcm-audio" ); +MODULE_ALIAS ("platform:samsung-audio" );
sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +1 -1
@@ -99,7 +99,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = { .codec_name = "tlv320aic3x-codec.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .init = simtec_hermes_init, };
sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +1 -1
@@ -88,7 +88,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = { .codec_name = "tlv320aic3x-codec.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .init = simtec_tlv320aic23_init, };
sound/soc/s3c24xx/s3c24xx_uda134x.c +1 -1
@@ -231,7 +231,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { .codec_dai_name = "uda134x-hifi", .cpu_dai_name = "s3c24xx-i2s", .ops = &s3c24xx_uda134x_ops, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", };static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
sound/soc/s3c24xx/smartq_wm8987.c +1 -1
@@ -213,7 +213,7 @@ static struct snd_soc_dai_link smartq_dai[] = { .stream_name = "SmartQ Hi-Fi", .cpu_dai_name = "s3c64xx-i2s.0", .codec_dai_name = "wm8750-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a", .init = smartq_wm8987_init, .ops = &smartq_hifi_ops,
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -31,7 +31,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };
sound/soc/s3c24xx/smdk64xx_wm8580.c +2 -2
@@ -224,7 +224,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .stream_name = "Playback", .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-playback", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b", .init = smdk64xx_wm8580_init_paifrx, .ops = &smdk64xx_ops,
@@ -234,7 +234,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .stream_name = "Capture", .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-capture", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b", .init = smdk64xx_wm8580_init_paiftx, .ops = &smdk64xx_ops,
sound/soc/s3c24xx/smdk_spdif.c +1 -1
@@ -157,7 +157,7 @@ static struct snd_soc_card smdk;static struct snd_soc_dai_link smdk_dai = { .name ="S/PDIF" , .stream_name ="S/PDIF PCM Playback" , - .platform_name ="s3c24xx-pcm-audio" , + .platform_name ="samsung-audio" , .cpu_dai_name ="samsung-spdif" , .codec_dai_name ="dit-hifi" , .codec_name ="spdif-dit" ,
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -45,7 +45,7 @@ static struct snd_soc_card smdk;static struct snd_soc_dai_link smdk_dai = { .name ="AC97" , .stream_name ="AC97 PCM" , - .platform_name ="s3c24xx-pcm-audio" , + .platform_name ="samsung-audio" , .cpu_dai_name ="s3c-ac97" , .codec_dai_name ="wm9713-hifi" , .codec_name ="wm9713-codec" ,
Signature · 1 line
1.6.2.5
PATCH 3/18 ARM: Samsung: Define common audio-dma device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
The ASoC uses common DMA driver for Audio devices. So it makes sense to a common audio-dma device shared across all platforms.
--- arch/arm/mach-s3c64xx/dev-audio.c | 13 ------------- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 15 --------------- arch/arm/plat-samsung/Makefile | 1 + arch/arm/plat-samsung/dev-asocdma.c | 24 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 2 +- 6 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 arch/arm/plat-samsung/dev-asocdma.c
arch/arm/mach-s3c64xx/dev-audio.c +0 -13
@@ -336,16 +336,3 @@ void __init s3c64xx_ac97_setup_gpio(int num)else s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; } - -static u64 s3c_device_audio_dmamask =0xffffffffUL ; - -struct platform_device s3c_device_pcm = { - .name ="samsung-audio" , - .id =-1 , - .dev = { - .dma_mask = &s3c_device_audio_dmamask, - .coherent_dma_mask =0xffffffffUL - } -}; -EXPORT_SYMBOL (s3c_device_pcm); -
arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -1
@@ -283,7 +283,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_fb, &s3c_device_ohci, &s3c_device_usb_hsotg, - &s3c_device_pcm, + &samsung_asoc_dma, &s3c64xx_device_iisv4, &samsung_device_keypad,
arch/arm/plat-s3c24xx/devs.c +0 -15
@@ -259,21 +259,6 @@ struct platform_device s3c_device_iis = {EXPORT_SYMBOL (s3c_device_iis); -/* ASoC PCM DMA */ - -static u64 s3c_device_audio_dmamask =0xffffffffUL ; - -struct platform_device s3c_device_pcm = { - .name ="samsung-audio" , - .id =-1 , - .dev = { - .dma_mask = &s3c_device_audio_dmamask, - .coherent_dma_mask =0xffffffffUL - } -}; - -EXPORT_SYMBOL (s3c_device_pcm); -/* RTC */ static struct resource s3c_rtc_resource[] = {
arch/arm/plat-samsung/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-y += clock.o obj-y += pwm-clock.o obj-y += gpio.o obj-y += gpio-config.o +obj-y += dev-asocdma.o obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT) += gpiolib.o obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o
arch/arm/plat-samsung/dev-asocdma.c new file +24 -0
@@ -0,0 +1,24 @@ +/* linux/arch/arm/plat-samsung/dev-asocdma.c +* +* Copyright (c) 2010 Samsung Electronics Co. Ltd +* 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. +*/ + +#include <linux/platform_device.h> +#include <linux/dma-mapping.h> + +static u64 audio_dmamask =DMA_BIT_MASK (32 ); + +struct platform_device samsung_asoc_dma = { + .name ="samsung-audio" , + .id =-1 , + .dev = { + .dma_mask = &audio_dmamask, + .coherent_dma_mask =DMA_BIT_MASK (32 ), + } +}; +EXPORT_SYMBOL (samsung_asoc_dma);
arch/arm/plat-samsung/include/plat/devs.h +1 -1
@@ -32,7 +32,7 @@ extern struct platform_device s3c64xx_device_iisv4;extern struct platform_device s3c64xx_device_spi0;extern struct platform_device s3c64xx_device_spi1; -extern struct platform_device s3c_device_pcm; +extern struct platform_device samsung_asoc_dma;extern struct platform_device s3c64xx_device_pcm0;extern struct platform_device s3c64xx_device_pcm1;
Signature · 1 line
1.6.2.5
PATCH 4/18 ASoC: Samsung: Rename ASoC DMA driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Rename Samsung ASoC DMA driver
s3c-dma.[c/h] -> dma.[c/h]
---
sound/soc/s3c24xx/Makefile | 2 +-
sound/soc/s3c24xx/{s3c-dma.c => dma.c} | 6 +++---
sound/soc/s3c24xx/{s3c-dma.h => dma.h} | 2 +-
sound/soc/s3c24xx/goni_wm8994.c | 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/rx1950_uda1380.c | 2 +-
sound/soc/s3c24xx/s3c-ac97.c | 2 +-
sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +-
sound/soc/s3c24xx/s3c-pcm.c | 2 +-
sound/soc/s3c24xx/s3c2412-i2s.c | 2 +-
sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +-
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-v4.c | 2 +-
sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +-
sound/soc/s3c24xx/smartq_wm8987.c | 2 +-
sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +-
sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +-
sound/soc/s3c24xx/smdk_spdif.c | 2 +-
sound/soc/s3c24xx/smdk_wm9713.c | 2 +-
sound/soc/s3c24xx/spdif.c | 2 +-
26 files changed, 28 insertions(+), 28 deletions(-)
rename sound/soc/s3c24xx/{s3c-dma.c => dma.c} (99%)
rename sound/soc/s3c24xx/{s3c-dma.h => dma.h} (97%)sound/soc/s3c24xx/Makefile +1 -1
@@ -1,5 +1,5 @@ # S3c24XX Platform Support -snd-soc-s3c24xx-objs := s3c-dma.o +snd-soc-s3c24xx-objs := 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
sound/soc/s3c24xx/dma.c renamed from sound/soc/s3c24xx/s3c-dma.c +3 -3
@@ -1,5 +1,5 @@/* -* s3c-dma.c -- ALSA Soc Audio Layer +* dma.c -- ALSA Soc Audio Layer * * (c) 2006 Wolfson Microelectronics PLC. * Graeme Gregory [email protected] or [email protected]
@@ -30,7 +30,7 @@#include <mach/hardware.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" static const struct snd_pcm_hardware s3c_dma_hardware = { .info = SNDRV_PCM_INFO_INTERLEAVED |
@@ -454,7 +454,7 @@ static int s3c_dma_new(struct snd_card *card,if (ret) goto out; } - out: +out:return ret; }
sound/soc/s3c24xx/dma.h renamed from sound/soc/s3c24xx/s3c-dma.h +1 -1
@@ -1,5 +1,5 @@/* -* s3c-dma.h -- +* 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
sound/soc/s3c24xx/goni_wm8994.c +1 -1
@@ -25,7 +25,7 @@#include <linux/mfd/wm8994/core.h> #include <linux/mfd/wm8994/registers.h> #include "../codecs/wm8994.h" -#include "s3c-dma.h" +#include "dma.h" #include "s3c64xx-i2s.h" #define MACHINE_NAME 0
sound/soc/s3c24xx/jive_wm8750.c +1 -1
@@ -25,7 +25,7 @@#include <asm/mach-types.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c2412-i2s.h" #include "../codecs/wm8750.h"
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -23,7 +23,7 @@#include <sound/soc.h> #include <sound/soc-dapm.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-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 "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" /* define the scenarios */
sound/soc/s3c24xx/rx1950_uda1380.c +1 -1
@@ -35,7 +35,7 @@#include <asm/mach-types.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" #include "../codecs/uda1380.h"
sound/soc/s3c24xx/s3c-ac97.c +1 -1
@@ -24,7 +24,7 @@#include <mach/dma.h> #include <plat/audio.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-ac97.h" #define AC_CMD_ADDR (x) (x << 16)
sound/soc/s3c24xx/s3c-i2s-v2.c +1 -1
@@ -28,7 +28,7 @@#include "regs-i2s-v2.h" #include "s3c-i2s-v2.h" -#include "s3c-dma.h" +#include "dma.h" #undef S3C_IIS_V2_SUPPORTED
sound/soc/s3c24xx/s3c-pcm.c +1 -1
@@ -29,7 +29,7 @@#include <plat/audio.h> #include <plat/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-pcm.h" static struct s3c2410_dma_client s3c_pcm_dma_client_out = {
sound/soc/s3c24xx/s3c2412-i2s.c +1 -1
@@ -35,7 +35,7 @@#include <mach/regs-gpio.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "regs-i2s-v2.h" #include "s3c2412-i2s.h"
sound/soc/s3c24xx/s3c24xx-i2s.c +1 -1
@@ -38,7 +38,7 @@#include <plat/regs-iis.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" static struct s3c2410_dma_client s3c24xx_dma_client_out = {
sound/soc/s3c24xx/s3c24xx_simtec.c +1 -1
@@ -21,7 +21,7 @@#include <plat/audio-simtec.h> -#include "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" #include "../codecs/uda134x.h"
sound/soc/s3c24xx/s3c64xx-i2s-v4.c +1 -1
@@ -21,7 +21,7 @@#include <mach/map.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "regs-i2s-v2.h" #include "s3c64xx-i2s.h"
sound/soc/s3c24xx/s3c64xx-i2s.c +1 -1
@@ -25,7 +25,7 @@#include <mach/map.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "regs-i2s-v2.h" #include "s3c64xx-i2s.h"
sound/soc/s3c24xx/smartq_wm8987.c +1 -1
@@ -24,7 +24,7 @@#include <asm/mach-types.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c64xx-i2s.h" #include "../codecs/wm8750.h"
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -19,7 +19,7 @@#include <sound/soc.h> #include <sound/soc-dapm.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-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 "s3c-dma.h" +#include "dma.h" #include "s3c64xx-i2s.h" /*
sound/soc/s3c24xx/smdk_spdif.c +1 -1
@@ -18,7 +18,7 @@#include <sound/soc.h> -#include "s3c-dma.h" +#include "dma.h" #include "spdif.h" /* Audio clock settings are belonged to board specific part. Every
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -15,7 +15,7 @@#include <linux/device.h> #include <sound/soc.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-ac97.h" static struct snd_soc_card smdk;
sound/soc/s3c24xx/spdif.c +1 -1
@@ -20,7 +20,7 @@#include <plat/audio.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "spdif.h" /* Registers */
Signature · 1 line
1.6.2.5
PATCH 5/18 ASoC: Samsung: Rename AC97 platform device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Call the AC97 controller devices found in S3C, S5P and newer SoCs as 'samsung-ac97' rather than 's3c-ac97'.
--- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/mach-s5pc100/dev-audio.c | 2 +- arch/arm/mach-s5pv210/dev-audio.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/s3c-ac97.c | 4 ++-- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-s3c64xx/dev-audio.c +1 -1
@@ -317,7 +317,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata;static u64 s3c64xx_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s3c64xx_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s3c64xx_ac97_resource), .resource = s3c64xx_ac97_resource,
arch/arm/mach-s5pc100/dev-audio.c +1 -1
@@ -275,7 +275,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {static u64 s5pc100_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s5pc100_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s5pc100_ac97_resource), .resource = s5pc100_ac97_resource,
arch/arm/mach-s5pv210/dev-audio.c +1 -1
@@ -315,7 +315,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {static u64 s5pv210_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s5pv210_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s5pv210_ac97_resource), .resource = s5pv210_ac97_resource,
arch/arm/plat-s3c24xx/devs.c +1 -1
@@ -482,7 +482,7 @@ static struct resource s3c_ac97_resource[] = { };struct platform_device s3c_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s3c_ac97_resource), .resource = s3c_ac97_resource,
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -32,7 +32,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "samsung-audio",
sound/soc/s3c24xx/s3c-ac97.c +2 -2
@@ -497,7 +497,7 @@ static struct platform_driver s3c_ac97_driver = { .probe = s3c_ac97_probe, .remove = s3c_ac97_remove, .driver = { - .name = "s3c-ac97", + .name = "samsung-ac97", .owner = THIS_MODULE, }, };
@@ -517,4 +517,4 @@ module_exit(s3c_ac97_exit);MODULE_AUTHOR ("Jaswinder Singh, <[email protected]>" );MODULE_DESCRIPTION ("AC97 driver for the Samsung SoC" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c-ac97" ); +MODULE_ALIAS ("platform:samsung-ac97" );
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -28,7 +28,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "samsung-audio",
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -46,7 +46,7 @@ static struct snd_soc_dai_link smdk_dai = { .name = "AC97", .stream_name = "AC97 PCM", .platform_name = "samsung-audio", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "wm9713-hifi", .codec_name = "wm9713-codec", };
Signature · 1 line
1.6.2.5
PATCH 6/18 ASoC: Samsung: Rename AC97 driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Rename Samsung AC97 driver
s3c-ac97.[c/h] -> ac97.[c/h]
---
sound/soc/s3c24xx/Makefile | 4 ++--
sound/soc/s3c24xx/{s3c-ac97.c => ac97.c} | 16 ++++++++--------
sound/soc/s3c24xx/{s3c-ac97.h => ac97.h} | 8 ++++----
sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +-
sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +-
sound/soc/s3c24xx/smdk_wm9713.c | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
rename sound/soc/s3c24xx/{s3c-ac97.c => ac97.c} (97%)
rename sound/soc/s3c24xx/{s3c-ac97.h => ac97.h} (73%)sound/soc/s3c24xx/Makefile +2 -2
@@ -3,7 +3,7 @@ snd-soc-s3c24xx-objs := 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 -snd-soc-s3c-ac97-objs := s3c-ac97.o +snd-soc-ac97-objs := ac97.o snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o snd-soc-s3c-pcm-objs := s3c-pcm.o
@@ -11,7 +11,7 @@ snd-soc-samsung-spdif-objs := spdif.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o -obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-s3c-ac97.o +obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-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_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o
sound/soc/s3c24xx/ac97.c renamed from sound/soc/s3c24xx/s3c-ac97.c +8 -8
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-ac97.c +/* sound/soc/s3c24xx/ac97.c * * ALSA SoC Audio Layer - S3C AC97 Controller driver * Evolved from s3c2443-ac97.c
@@ -25,7 +25,7 @@#include <plat/audio.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" #define AC_CMD_ADDR (x) (x << 16)#define AC_CMD_DATA (x) (x & 0xffff)
@@ -122,7 +122,7 @@ static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, data = (stat &0xffff );if (addr != reg) -pr_err ("s3c-ac97: req addr = %02x, rep addr = %02x\n" , +pr_err ("ac97: req addr = %02x, rep addr = %02x\n" , reg, addr);mutex_unlock (&s3c_ac97.lock);
@@ -334,7 +334,7 @@ static struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = {static struct snd_soc_dai_driver s3c_ac97_dai[] = { [S3C_AC97_DAI_PCM ] = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .ac97_control =1 , .playback = { .stream_name ="AC97 Playback" ,
@@ -351,7 +351,7 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = { .ops = &s3c_ac97_dai_ops, }, [S3C_AC97_DAI_MIC] = { - .name = "s3c-ac97-mic", + .name = "samsung-ac97-mic", .ac97_control = 1, .capture = { .stream_name = "AC97 Mic Capture",
@@ -407,7 +407,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) }if (!request_mem_region (mem_res->start, -resource_size (mem_res),"s3c-ac97" )) { +resource_size (mem_res),"ac97" )) {dev_err (&pdev->dev,"Unable to request register region\n" );return -EBUSY ; }
@@ -431,7 +431,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) s3c_ac97.ac97_clk =clk_get (&pdev->dev,"ac97" );if (IS_ERR (s3c_ac97.ac97_clk)) { -dev_err (&pdev->dev,"s3c-ac97 failed to get ac97_clock\n" ); +dev_err (&pdev->dev,"ac97 failed to get ac97_clock\n" ); ret = -ENODEV ; goto err2; }
@@ -446,7 +446,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) ret =request_irq (irq_res->start, s3c_ac97_irq,IRQF_DISABLED ,"AC97" ,NULL );if (ret <0 ) { -dev_err (&pdev->dev,"s3c-ac97: interrupt request failed.\n" ); +dev_err (&pdev->dev,"ac97: interrupt request failed.\n" ); goto err4; }
sound/soc/s3c24xx/ac97.h renamed from sound/soc/s3c24xx/s3c-ac97.h +4 -4
@@ -1,11 +1,11 @@ -/* sound/soc/s3c24xx/s3c-ac97.h +/* sound/soc/s3c24xx/ac97.h * * ALSA SoC Audio Layer - S3C AC97 Controller driver -* Evolved from s3c2443-ac97.h +* Evolved from s3c2443-ac97.h * * Copyright (c) 2010 Samsung Electronics Co. Ltd -* Author: Jaswinder Singh <[email protected]> -* Credits: Graeme Gregory, Sean Choi +* Author: Jaswinder Singh <[email protected]> +* Credits: Graeme Gregory, Sean Choi * * 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
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -24,7 +24,7 @@#include <sound/soc-dapm.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" static struct snd_soc_card ln2440sbc;
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -20,7 +20,7 @@#include <sound/soc-dapm.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" static struct snd_soc_card smdk2443;
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -16,7 +16,7 @@#include <sound/soc.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" static struct snd_soc_card smdk;
Signature · 1 line
1.6.2.5
PATCH 7/18 ASoC: Samsung: Rename PCM driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Rename Samsung PCM Controller driver
s3c-pcm.[c/h] -> pcm.[c/h]
---
sound/soc/s3c24xx/Makefile | 4 ++--
sound/soc/s3c24xx/{s3c-pcm.c => pcm.c} | 4 ++--
sound/soc/s3c24xx/{s3c-pcm.h => pcm.h} | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
rename sound/soc/s3c24xx/{s3c-pcm.c => pcm.c} (99%)
rename sound/soc/s3c24xx/{s3c-pcm.h => pcm.h} (99%)sound/soc/s3c24xx/Makefile +2 -2
@@ -6,8 +6,8 @@ snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o snd-soc-ac97-objs := ac97.o snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o -snd-soc-s3c-pcm-objs := s3c-pcm.o snd-soc-samsung-spdif-objs := spdif.o +snd-soc-pcm-objs := pcm.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o
@@ -16,8 +16,8 @@ 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_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o -obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-s3c-pcm.o obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o +obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o
sound/soc/s3c24xx/pcm.c renamed from sound/soc/s3c24xx/s3c-pcm.c +2 -2
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-pcm.c +/* sound/soc/s3c24xx/pcm.c * * ALSA SoC Audio Layer - S3C PCM-Controller driver *
@@ -30,7 +30,7 @@#include <plat/dma.h> #include "dma.h" -#include "s3c-pcm.h" +#include "pcm.h" static struct s3c2410_dma_client s3c_pcm_dma_client_out = { .name ="PCM Stereo out"
sound/soc/s3c24xx/pcm.h renamed from sound/soc/s3c24xx/s3c-pcm.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-pcm.h +/* sound/soc/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 version 2 as
Signature · 1 line
1.6.2.5
PATCH 8/18 ASoC: Samsung: Generalize DMA driver namespace
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Remove S3C,s3c from static defines.
s3c_dma_ -> dma_ s3c24xx_runtime_ -> runtime_ s3c24xx_audio_ -> audio_ s3c_preallocate_ -> preallocate_ s3c24xx_soc_platform -> samsung_asoc_platform s3c24xx_pcm_driver -> asoc_dma_driver snd_s3c24xx_pcm_ -> samsung_asoc_
--- sound/soc/s3c24xx/dma.c | 124 +++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 62 deletions(-)
sound/soc/s3c24xx/dma.c +62 -62
@@ -32,7 +32,7 @@#include "dma.h" -static const struct snd_pcm_hardware s3c_dma_hardware = { +static const struct snd_pcm_hardware dma_hardware = { .info =SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP |
@@ -53,7 +53,7 @@ static const struct snd_pcm_hardware s3c_dma_hardware = { .fifo_size = 32, }; -struct s3c24xx_runtime_data { +struct runtime_data {spinlock_t lock;int state;unsigned int dma_loaded;
@@ -65,14 +65,14 @@ struct s3c24xx_runtime_data {struct s3c_dma_params *params; }; -/* s3c_dma_enqueue +/* dma_enqueue * * place a dma buffer onto the queue for the dma system * to handle. */ -static void s3c_dma_enqueue (struct snd_pcm_substream *substream) +static void dma_enqueue (struct snd_pcm_substream *substream) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;dma_addr_t pos = prtd->dma_pos;unsigned int limit;int ret;
@@ -113,12 +113,12 @@ static void s3c_dma_enqueue(struct snd_pcm_substream *substream) prtd->dma_pos = pos; } -static void s3c24xx_audio_buffdone (struct s3c2410_dma_chan *channel, +static void audio_buffdone (struct s3c2410_dma_chan *channel,void *dev_id,int size,enum s3c2410_dma_buffresult result) {struct snd_pcm_substream *substream = dev_id; -struct s3c24xx_runtime_data *prtd; +struct runtime_data *prtd;pr_debug ("Entered %s\n" , __func__);
@@ -133,17 +133,17 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel,spin_lock (&prtd->lock);if (prtd->state &ST_RUNNING && !s3c_dma_has_circular ()) { prtd->dma_loaded--; -s3c_dma_enqueue (substream); +dma_enqueue (substream); }spin_unlock (&prtd->lock); } -static int s3c_dma_hw_params (struct snd_pcm_substream *substream, +static int dma_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd = runtime->private_data; +struct runtime_data *prtd = runtime->private_data;struct snd_soc_pcm_runtime *rtd = substream->private_data;unsigned long totbytes =params_buffer_bytes (params); struct s3c_dma_params *dma =
@@ -182,7 +182,7 @@ static int s3c_dma_hw_params(struct snd_pcm_substream *substream, }s3c2410_dma_set_buffdone_fn (prtd->params->channel, - s3c24xx_audio_buffdone); + audio_buffdone);snd_pcm_set_runtime_buffer (substream, &substream->dma_buffer);
@@ -200,9 +200,9 @@ static int s3c_dma_hw_params(struct snd_pcm_substream *substream,return 0 ; } -static int s3c_dma_hw_free (struct snd_pcm_substream *substream) +static int dma_hw_free (struct snd_pcm_substream *substream) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;pr_debug ("Entered %s\n" , __func__);
@@ -217,9 +217,9 @@ static int s3c_dma_hw_free(struct snd_pcm_substream *substream)return 0 ; } -static int s3c_dma_prepare (struct snd_pcm_substream *substream) +static int dma_prepare (struct snd_pcm_substream *substream) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;int ret =0 ;pr_debug ("Entered %s\n" , __func__);
@@ -250,14 +250,14 @@ static int s3c_dma_prepare(struct snd_pcm_substream *substream) prtd->dma_pos = prtd->dma_start;/* enqueue dma buffers */ -s3c_dma_enqueue (substream); +dma_enqueue (substream);return ret; } -static int s3c_dma_trigger (struct snd_pcm_substream *substream,int cmd) +static int dma_trigger (struct snd_pcm_substream *substream,int cmd) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;int ret =0 ;pr_debug ("Entered %s\n" , __func__);
@@ -290,10 +290,10 @@ static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) }static snd_pcm_uframes_t -s3c_dma_pointer (struct snd_pcm_substream *substream) +dma_pointer (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd = runtime->private_data; +struct runtime_data *prtd = runtime->private_data;unsigned long res;dma_addr_t src, dst;
@@ -325,17 +325,17 @@ s3c_dma_pointer(struct snd_pcm_substream *substream)return bytes_to_frames (substream->runtime, res); } -static int s3c_dma_open (struct snd_pcm_substream *substream) +static int dma_open (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd; +struct runtime_data *prtd;pr_debug ("Entered %s\n" , __func__);snd_pcm_hw_constraint_integer (runtime,SNDRV_PCM_HW_PARAM_PERIODS ); -snd_soc_set_runtime_hwparams (substream, &s3c_dma_hardware); +snd_soc_set_runtime_hwparams (substream, &dma_hardware); - prtd =kzalloc (sizeof (struct s3c24xx_runtime_data ),GFP_KERNEL ); + prtd =kzalloc (sizeof (struct runtime_data ),GFP_KERNEL );if (prtd ==NULL )return -ENOMEM ;
@@ -345,22 +345,22 @@ static int s3c_dma_open(struct snd_pcm_substream *substream)return 0 ; } -static int s3c_dma_close (struct snd_pcm_substream *substream) +static int dma_close (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd = runtime->private_data; +struct runtime_data *prtd = runtime->private_data;pr_debug ("Entered %s\n" , __func__);if (!prtd) -pr_debug ("s3c_dma_close called with prtd == NULL\n" ); +pr_debug ("dma_close called with prtd == NULL\n" );kfree (prtd);return 0 ; } -static int s3c_dma_mmap (struct snd_pcm_substream *substream, +static int dma_mmap (struct snd_pcm_substream *substream,struct vm_area_struct *vma) {struct snd_pcm_runtime *runtime = substream->runtime;
@@ -373,23 +373,23 @@ static int s3c_dma_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); } -static struct snd_pcm_ops s3c_dma_ops = { - .open = s3c_dma_open, - .close = s3c_dma_close, +static struct snd_pcm_ops dma_ops = { + .open = dma_open, + .close = dma_close, .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c_dma_hw_params, - .hw_free = s3c_dma_hw_free, - .prepare = s3c_dma_prepare, - .trigger = s3c_dma_trigger, - .pointer = s3c_dma_pointer, - .mmap = s3c_dma_mmap, + .hw_params = dma_hw_params, + .hw_free = dma_hw_free, + .prepare = dma_prepare, + .trigger = dma_trigger, + .pointer = dma_pointer, + .mmap = dma_mmap, }; -static int s3c_preallocate_dma_buffer (struct snd_pcm *pcm,int stream) +static int preallocate_dma_buffer (struct snd_pcm *pcm,int stream) {struct snd_pcm_substream *substream = pcm->streams[stream].substream;struct snd_dma_buffer *buf = &substream->dma_buffer; -size_t size = s3c_dma_hardware.buffer_bytes_max; +size_t size = dma_hardware.buffer_bytes_max;pr_debug ("Entered %s\n" , __func__);
@@ -404,7 +404,7 @@ static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)return 0 ; } -static void s3c_dma_free_dma_buffers (struct snd_pcm *pcm) +static void dma_free_dma_buffers (struct snd_pcm *pcm) {struct snd_pcm_substream *substream;struct snd_dma_buffer *buf;
@@ -427,9 +427,9 @@ static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) } } -static u64 s3c_dma_mask =DMA_BIT_MASK (32 ); +static u64 dma_mask =DMA_BIT_MASK (32 ); -static int s3c_dma_new (struct snd_card *card, +static int dma_new (struct snd_card *card,struct snd_soc_dai *dai,struct snd_pcm *pcm) {int ret =0 ;
@@ -437,19 +437,19 @@ static int s3c_dma_new(struct snd_card *card,pr_debug ("Entered %s\n" , __func__);if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c_dma_mask; + card->dev->dma_mask = &dma_mask;if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask =0xffffffff ;if (dai->driver->playback.channels_min) { - ret =s3c_preallocate_dma_buffer (pcm, + ret =preallocate_dma_buffer (pcm,SNDRV_PCM_STREAM_PLAYBACK );if (ret) goto out; }if (dai->driver->capture.channels_min) { - ret =s3c_preallocate_dma_buffer (pcm, + ret =preallocate_dma_buffer (pcm,SNDRV_PCM_STREAM_CAPTURE );if (ret) goto out;
@@ -458,46 +458,46 @@ out:return ret; } -static struct snd_soc_platform_driver s3c24xx_soc_platform = { - .ops = &s3c_dma_ops, - .pcm_new = s3c_dma_new, - .pcm_free = s3c_dma_free_dma_buffers, +static struct snd_soc_platform_driver samsung_asoc_platform = { + .ops = &dma_ops, + .pcm_new = dma_new, + .pcm_free = dma_free_dma_buffers, }; -static int __devinit s3c24xx_soc_platform_probe (struct platform_device *pdev) +static int __devinit samsung_asoc_platform_probe (struct platform_device *pdev) { -return snd_soc_register_platform (&pdev->dev, &s3c24xx_soc_platform); +return snd_soc_register_platform (&pdev->dev, &samsung_asoc_platform); } -static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev) +static int __devexit samsung_asoc_platform_remove(struct platform_device *pdev) {snd_soc_unregister_platform (&pdev->dev);return 0 ; } -static struct platform_driver s3c24xx_pcm_driver = { +static struct platform_driver asoc_dma_driver = { .driver = { .name ="samsung-audio" , .owner =THIS_MODULE , }, - .probe = s3c24xx_soc_platform_probe, - .remove =__devexit_p (s3c24xx_soc_platform_remove), + .probe = samsung_asoc_platform_probe, + .remove =__devexit_p (samsung_asoc_platform_remove), }; -static int __init snd_s3c24xx_pcm_init (void ) +static int __init samsung_asoc_init (void ) { -return platform_driver_register (&s3c24xx_pcm_driver); +return platform_driver_register (&asoc_dma_driver); } -module_init (snd_s3c24xx_pcm_init); +module_init (samsung_asoc_init); -static void __exit snd_s3c24xx_pcm_exit(void) +static void __exit samsung_asoc_exit(void) { -platform_driver_unregister (&s3c24xx_pcm_driver); +platform_driver_unregister (&asoc_dma_driver); } -module_exit (snd_s3c24xx_pcm_exit); +module_exit (samsung_asoc_exit);MODULE_AUTHOR ("Ben Dooks, <[email protected]>" ); -MODULE_DESCRIPTION ("Samsung S3C Audio DMA module" ); +MODULE_DESCRIPTION ("Samsung ASoC DMA Driver" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:samsung-audio" );
Signature · 1 line
1.6.2.5
PATCH 9/18 ASoC: Samsung: Rename s3c64xx I2S device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Since the I2S of S3C64XX and newer SoCs are incremental versions of each other with changes managable in a single driver, rename the 's3c64xx-iis' -> 'samsung-i2s'
--- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 4 ++-- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 ++-- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/s3c24xx/s3c64xx-i2s-v4.c +2 -2
@@ -206,7 +206,7 @@ static struct platform_driver s3c64xx_i2sv4_driver = { .probe = s3c64xx_i2sv4_dev_probe, .remove = s3c64xx_i2sv4_dev_remove, .driver = { - .name = "s3c64xx-iis-v4", + .name = "samsung-i2s-v4", .owner = THIS_MODULE, }, };
@@ -227,4 +227,4 @@ module_exit(s3c64xx_i2sv4_exit);MODULE_AUTHOR ("Jaswinder Singh, <[email protected]>" );MODULE_DESCRIPTION ("S3C64XX I2Sv4 SoC Interface" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c64xx-iis-v4" ); +MODULE_ALIAS ("platform:samsung-i2s-v4" );
sound/soc/s3c24xx/s3c64xx-i2s.c +2 -2
@@ -218,7 +218,7 @@ static struct platform_driver s3c64xx_iis_driver = { .probe = s3c64xx_iis_dev_probe, .remove = s3c64xx_iis_dev_remove, .driver = { - .name = "s3c64xx-iis", + .name = "samsung-i2s", .owner = THIS_MODULE, }, };
@@ -239,4 +239,4 @@ module_exit(s3c64xx_i2s_exit);MODULE_AUTHOR ("Ben Dooks, <[email protected]>" );MODULE_DESCRIPTION ("S3C64XX I2S SoC Interface" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c64xx-iis" ); +MODULE_ALIAS ("platform:samsung-i2s" );
sound/soc/s3c24xx/smdk64xx_wm8580.c +2 -2
@@ -222,7 +222,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Playback i/f */ .name = "WM8580 PAIF RX", .stream_name = "Playback", - .cpu_dai_name = "s3c64xx-iis-v4", + .cpu_dai_name = "samsung-i2s-v4", .codec_dai_name = "wm8580-hifi-playback", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
@@ -232,7 +232,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Capture i/f */ .name = "WM8580 PAIF TX", .stream_name = "Capture", - .cpu_dai_name = "s3c64xx-iis-v4", + .cpu_dai_name = "samsung-i2s-v4", .codec_dai_name = "wm8580-hifi-capture", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
Signature · 1 line
1.6.2.5
PATCH 10/18 ASoC: Samsung: Add common I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
The I2S controllers since S3C64XX are incremental revisions, with a new feature added to the last one. The programming i/f doesn't conflict between these revisions, so it is possible to have one common driver that could manage various versions of I2S (v3, 4 & 5)
--- sound/soc/s3c24xx/Kconfig | 3 + sound/soc/s3c24xx/Makefile | 2 + sound/soc/s3c24xx/i2s.c | 1256 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/s3c24xx/i2s.h | 29 + 4 files changed, 1290 insertions(+), 0 deletions(-) create mode 100644 sound/soc/s3c24xx/i2s.c create mode 100644 sound/soc/s3c24xx/i2s.h
sound/soc/s3c24xx/Kconfig +3 -0
@@ -40,6 +40,9 @@ config SND_S5P_SOC_SPDIF tristate select SND_SOC_SPDIF +config SND_SAMSUNG_I2S + tristate + config SND_S3C24XX_SOC_NEO1973_WM8753 tristate "SoC I2S Audio support for NEO1973 - WM8753" depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
sound/soc/s3c24xx/Makefile +2 -0
@@ -8,6 +8,7 @@ snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o snd-soc-samsung-spdif-objs := spdif.o snd-soc-pcm-objs := pcm.o +snd-soc-i2s-objs := i2s.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o
@@ -18,6 +19,7 @@ obj-$(CONFIG_SND_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o +obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o
sound/soc/s3c24xx/i2s.c new file +1256 -0
1,256 lines not on this page · raw message
sound/soc/s3c24xx/i2s.h new file +29 -0
@@ -0,0 +1,29 @@ +/* sound/soc/s3c24xx/i2s.h +* +* ALSA SoC Audio Layer - Samsung I2S Controller driver +* +* Copyright (c) 2010 Samsung Electronics Co. Ltd. +* 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. +*/ + +#ifndef __SND_SOC_SAMSUNG_I2S_H +#define __SND_SOC_SAMSUNG_I2S_H + +/* +* Maximum number of I2S blocks that any SoC can have. +* The secondary interface of a CPU dai(if there exists any), +* is indexed at [cpu-dai's ID + SAMSUNG_I2S_SECOFF] +*/ +#define SAMSUNG_I2S_SECOFF 4 + +#define SAMSUNG_I2S_DIV_BCLK 1 + +#define SAMSUNG_I2S_RCLKSRC_0 0 +#define SAMSUNG_I2S_RCLKSRC_1 1 +#define SAMSUNG_I2S_CDCLK 2 + +#endif /* __SND_SOC_SAMSUNG_I2S_H */
Signature · 1 line
1.6.2.5
PATCH 11/18 ASoC: SMARTQ: Move to use new I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Modify the smartq_wm8987.c to use new i2s controller driver.
--- sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/smartq_wm8987.c | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-)
sound/soc/s3c24xx/Kconfig +1 -1
@@ -144,7 +144,7 @@ config SND_SOC_SMDK_WM9713 config SND_S3C64XX_SOC_SMARTQ tristate "SoC I2S Audio support for SmartQ board" depends on SND_S3C24XX_SOC && MACH_SMARTQ - select SND_S3C64XX_SOC_I2S + select SND_SAMSUNG_I2S select SND_SOC_WM8750 config SND_SOC_GONI_AQUILA_WM8994
sound/soc/s3c24xx/smartq_wm8987.c +11 -14
@@ -25,7 +25,7 @@#include <asm/mach-types.h> #include "dma.h" -#include "s3c64xx-i2s.h" +#include "i2s.h" #include "../codecs/wm8750.h"
@@ -41,13 +41,9 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; -struct s3c_i2sv2_rate_calc div;unsigned int clk =0 ;int ret; -s3c_i2sv2_iis_calc_rate (&div,NULL ,params_rate (params), -s3c_i2sv2_get_clock (cpu_dai)); -switch (params_rate (params)) {case 8000 :case 16000 :
@@ -78,20 +74,21 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; -/* set the codec system clock for DAC and ADC */ - ret =snd_soc_dai_set_sysclk (codec_dai,WM8750_SYSCLK , clk, -SND_SOC_CLOCK_IN ); +/* Use PCLK for I2S signal generation */ + ret =snd_soc_dai_set_sysclk (cpu_dai,SAMSUNG_I2S_RCLKSRC_0 , +0 ,SND_SOC_CLOCK_IN );if (ret <0 )return ret; -/* set MCLK division for sample rate */ - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_RCLK , div.fs_div); +/* Gate the RCLK output on PAD */ + ret =snd_soc_dai_set_sysclk (cpu_dai,SAMSUNG_I2S_CDCLK , +0 ,SND_SOC_CLOCK_IN );if (ret <0 )return ret; -/* set prescaler division for sample rate */ - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_PRESCALER , - div.clk_div -1 ); +/* set the codec system clock for DAC and ADC */ + ret =snd_soc_dai_set_sysclk (codec_dai,WM8750_SYSCLK , clk, +SND_SOC_CLOCK_IN );if (ret <0 )return ret;
@@ -211,7 +208,7 @@ static struct snd_soc_dai_link smartq_dai[] = { { .name = "wm8987", .stream_name = "SmartQ Hi-Fi", - .cpu_dai_name = "s3c64xx-i2s.0", + .cpu_dai_name = "samsung-i2s.0", .codec_dai_name = "wm8750-hifi", .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a",
Signature · 1 line
1.6.2.5
PATCH 12/18 ASoC: GONI: Move to use new I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Modify the goni_wm8994.c to use new i2s controller driver.
--- sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/goni_wm8994.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-)
sound/soc/s3c24xx/Kconfig +1 -1
@@ -150,7 +150,7 @@ config SND_S3C64XX_SOC_SMARTQ config SND_SOC_GONI_AQUILA_WM8994 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) - select SND_S3C64XX_SOC_I2S_V4 + select SND_SAMSUNG_I2S select SND_SOC_WM8994 help Say Y if you want to add support for SoC audio on goni or aquila
sound/soc/s3c24xx/goni_wm8994.c +2 -8
@@ -26,7 +26,7 @@#include <linux/mfd/wm8994/registers.h> #include "../codecs/wm8994.h" #include "dma.h" -#include "s3c64xx-i2s.h" +#include "i2s.h" #define MACHINE_NAME 0#define CPU_VOICE_DAI 1
@@ -163,12 +163,6 @@ static int goni_hifi_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; -/* set the cpu system clock */ - ret =snd_soc_dai_set_sysclk (cpu_dai,S3C64XX_CLKSRC_PCLK , -0 ,SND_SOC_CLOCK_IN ); -if (ret <0 ) -return ret; -/* set codec DAI configuration */ ret =snd_soc_dai_set_fmt (codec_dai,SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBM_CFM );
@@ -249,7 +243,7 @@ static struct snd_soc_dai_link goni_dai[] = { { .name = "WM8994", .stream_name = "WM8994 HiFi", - .cpu_dai_name = "s3c64xx-i2s-v4", + .cpu_dai_name = "samsung-i2s.0", .codec_dai_name = "wm8994-hifi", .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a",
Signature · 1 line
1.6.2.5
PATCH 13/18 ASoC: SMDK64XX: Move to use new I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Modify the smdk64xx_wm8580.c to use new i2s controller driver.
--- sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 25 +++---------------------- 2 files changed, 4 insertions(+), 23 deletions(-)
sound/soc/s3c24xx/Kconfig +1 -1
@@ -73,7 +73,7 @@ config SND_S3C64XX_SOC_WM8580 tristate "SoC I2S Audio support for WM8580 on SMDK64XX" depends on SND_S3C24XX_SOC && MACH_SMDK6410 select SND_SOC_WM8580 - select SND_S3C64XX_SOC_I2S_V4 + select SND_SAMSUNG_I2S help Say Y if you want to add support for SoC audio on the SMDK6410.
sound/soc/s3c24xx/smdk64xx_wm8580.c +3 -22
@@ -20,7 +20,7 @@#include "../codecs/wm8580.h" #include "dma.h" -#include "s3c64xx-i2s.h" +#include "i2s.h" /* * Default CFG switch settings to use this driver:
@@ -96,17 +96,6 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; - ret =snd_soc_dai_set_sysclk (cpu_dai,S3C64XX_CLKSRC_CDCLK , -0 ,SND_SOC_CLOCK_IN ); -if (ret <0 ) -return ret; - -/* We use PCLK for basic ops in SoC-Slave mode */ - ret =snd_soc_dai_set_sysclk (cpu_dai,S3C64XX_CLKSRC_PCLK , -0 ,SND_SOC_CLOCK_IN ); -if (ret <0 ) -return ret; -/* Set WM8580 to drive MCLK from its PLLA */ ret =snd_soc_dai_set_clkdiv (codec_dai,WM8580_MCLK ,WM8580_CLKSRC_PLLA );
@@ -123,14 +112,6 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_BCLK , bfs); -if (ret <0 ) -return ret; - - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_RCLK , rfs); -if (ret <0 ) -return ret; -return 0 ; }
@@ -222,7 +203,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Playback i/f */ .name = "WM8580 PAIF RX", .stream_name = "Playback", - .cpu_dai_name = "samsung-i2s-v4", + .cpu_dai_name = "samsung-i2s.2", .codec_dai_name = "wm8580-hifi-playback", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
@@ -232,7 +213,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Capture i/f */ .name = "WM8580 PAIF TX", .stream_name = "Capture", - .cpu_dai_name = "samsung-i2s-v4", + .cpu_dai_name = "samsung-i2s.2", .codec_dai_name = "wm8580-hifi-capture", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
Signature · 1 line
1.6.2.5
PATCH 14/18 ASoC: S3C64XX: Remove obsoleted I2S drivers
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Now that we have better I2S CPU drivers and no need for the old ones, discard them.
--- sound/soc/s3c24xx/Kconfig | 10 -- sound/soc/s3c24xx/Makefile | 4 - sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 ---------------------------------- sound/soc/s3c24xx/s3c64xx-i2s.c | 242 ------------------------------------ sound/soc/s3c24xx/s3c64xx-i2s.h | 41 ------ 5 files changed, 0 insertions(+), 527 deletions(-) delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h
sound/soc/s3c24xx/Kconfig +0 -10
@@ -19,16 +19,6 @@ config SND_S3C2412_SOC_I2S select SND_S3C_I2SV2_SOC select S3C2410_DMA -config SND_S3C64XX_SOC_I2S - tristate - select SND_S3C_I2SV2_SOC - select S3C64XX_DMA - -config SND_S3C64XX_SOC_I2S_V4 - tristate - select SND_S3C_I2SV2_SOC - select S3C64XX_DMA - config SND_S3C_SOC_PCM tristate
sound/soc/s3c24xx/Makefile +0 -4
@@ -2,9 +2,7 @@ snd-soc-s3c24xx-objs := 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 snd-soc-ac97-objs := ac97.o -snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o snd-soc-samsung-spdif-objs := spdif.o snd-soc-pcm-objs := pcm.o
@@ -14,8 +12,6 @@ obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-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_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o
sound/soc/s3c24xx/s3c64xx-i2s-v4.c deleted +0 -230
230 lines not on this page · raw message
sound/soc/s3c24xx/s3c64xx-i2s.c deleted +0 -242
242 lines not on this page · raw message
sound/soc/s3c24xx/s3c64xx-i2s.h deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 15/18 ASoC: SMDK64XX: Rename for other platforms
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
We plan to use the same ASoC Machine driver for most of latest SMDK platforms. So rename the 64XX specific driver to generic named.
---
sound/soc/s3c24xx/Kconfig | 6 +-
sound/soc/s3c24xx/Makefile | 4 +-
.../s3c24xx/{smdk64xx_wm8580.c => smdk_wm8580.c} | 64 ++++++++++----------
3 files changed, 37 insertions(+), 37 deletions(-)
rename sound/soc/s3c24xx/{smdk64xx_wm8580.c => smdk_wm8580.c} (78%)sound/soc/s3c24xx/Kconfig +3 -3
@@ -59,13 +59,13 @@ config SND_S3C24XX_SOC_JIVE_WM8750 help Sat Y if you want to add support for SoC audio on the Jive. -config SND_S3C64XX_SOC_WM8580 - tristate "SoC I2S Audio support for WM8580 on SMDK64XX" +config SND_SOC_SMDK_WM8580 + tristate "SoC I2S Audio support for WM8580 on SMDK" depends on SND_S3C24XX_SOC && MACH_SMDK6410 select SND_SOC_WM8580 select SND_SAMSUNG_I2S help - Say Y if you want to add support for SoC audio on the SMDK6410. + Say Y if you want to add support for SoC audio on the SMDKs. config SND_S3C24XX_SOC_SMDK2443_WM9710 tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
sound/soc/s3c24xx/Makefile +2 -2
@@ -28,7 +28,7 @@ snd-soc-s3c24xx-simtec-objs := s3c24xx_simtec.o snd-soc-s3c24xx-simtec-hermes-objs := s3c24xx_simtec_hermes.o snd-soc-s3c24xx-simtec-tlv320aic23-objs := s3c24xx_simtec_tlv320aic23.o snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o -snd-soc-smdk64xx-wm8580-objs := smdk64xx_wm8580.o +snd-soc-smdk-wm8580-objs := smdk_wm8580.o snd-soc-smdk-wm9713-objs := smdk_wm9713.o snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o snd-soc-goni-wm8994-objs := goni_wm8994.o
@@ -44,7 +44,7 @@ obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC) += snd-soc-s3c24xx-simtec.o obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o obj-$(CONFIG_SND_S3C24XX_SOC_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o -obj-$(CONFIG_SND_S3C64XX_SOC_WM8580) += snd-soc-smdk64xx-wm8580.o +obj-$(CONFIG_SND_SOC_SMDK_WM8580) += snd-soc-smdk-wm8580.o obj-$(CONFIG_SND_SOC_SMDK_WM9713) += snd-soc-smdk-wm9713.o obj-$(CONFIG_SND_S3C64XX_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o obj-$(CONFIG_SND_SOC_SMDK_SPDIF) += snd-soc-smdk-spdif.o
sound/soc/s3c24xx/smdk_wm8580.c renamed from sound/soc/s3c24xx/smdk64xx_wm8580.c +32 -32
148 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 16/18 ASoC: SMDK_WM8580: Enable for SMDKC100
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Enable the ASoC Machine driver to run on SMDKC100 as well.
--- arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/smdk_wm8580.c | 73 +++++++++++++++++++++++--------- 3 files changed, 55 insertions(+), 22 deletions(-)
arch/arm/mach-s5pc100/mach-smdkc100.c +2 -0
@@ -95,6 +95,7 @@ static struct s3c2410_uartcfg smdkc100_uartcfgs[] __initdata = {/* I2C0 */ static struct i2c_board_info i2c_devs0[]__initdata = { + {I2C_BOARD_INFO ("wm8580" ,0x1b ),}, };/* I2C1 */
@@ -189,6 +190,7 @@ static struct platform_device *smdkc100_devices[] __initdata = { &s3c_device_ts, &s3c_device_wdt, &smdkc100_lcd_powerdev, + &samsung_asoc_dma, &s5pc100_device_iis0, &samsung_device_keypad, &s5pc100_device_ac97,
sound/soc/s3c24xx/Kconfig +1 -1
@@ -61,7 +61,7 @@ config SND_S3C24XX_SOC_JIVE_WM8750 config SND_SOC_SMDK_WM8580 tristate "SoC I2S Audio support for WM8580 on SMDK" - depends on SND_S3C24XX_SOC && MACH_SMDK6410 + depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) select SND_SOC_WM8580 select SND_SAMSUNG_I2S help
sound/soc/s3c24xx/smdk_wm8580.c +52 -21
97 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 17/18 ASoC: Samsung: Generalize Kconfig symbols
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Move prefixes to repesent the nature of Samsung ASoC suitably.
SND_S3C24XX_SOC -> ASOC_SAMSUNG SND_S3C_SOC_PCM -> SND_SAMSUNG_PCM SND_S3C_SOC_AC97 -> SND_SAMSUNG_AC97 SND_S5P_SOC_SPDIF -> SND_SAMSUNG_SPDIF SND_S3C24XX_SOC_I2S -> SND_S3C24XX_I2S SND_S3C64XX_SOC_SMARTQ -> ASOC_SMARTQ SND_SOC_SMDK_SPDIF -> ASOC_SAMSUNG_SMDK_SPDIF SND_SOC_SMDK_WM8580 -> ASOC_SAMSUNG_SMDK_WM8580 SND_SOC_SMDK_WM9713 -> ASOC_SAMSUNG_SMDK_WM9713 SND_SOC_GONI_AQUILA_WM8994 -> ASOC_GONI_AQUILA_WM8994
--- sound/soc/s3c24xx/Kconfig | 96 ++++++++++++++++++++++---------------------- sound/soc/s3c24xx/Makefile | 40 +++++++++--------- 2 files changed, 68 insertions(+), 68 deletions(-)
sound/soc/s3c24xx/Kconfig +48 -48
@@ -1,13 +1,13 @@ -config SND_S3C24XX_SOC - tristate "SoC Audio for the Samsung S3CXXXX chips" +config ASOC_SAMSUNG + tristate "ASoC support for Samsung" depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 select S3C64XX_DMA if ARCH_S3C64XX help Say Y or M if you want to add support for codecs attached to - the S3C24XX AC97 or I2S interfaces. You will also need to + the Samsung SoCs' Audio interfaces. You will also need to select the audio interfaces to support below. -config SND_S3C24XX_SOC_I2S +config SND_S3C24XX_I2S tristate select S3C2410_DMA
@@ -19,136 +19,136 @@ config SND_S3C2412_SOC_I2S select SND_S3C_I2SV2_SOC select S3C2410_DMA -config SND_S3C_SOC_PCM +config SND_SAMSUNG_PCM tristate -config SND_S3C_SOC_AC97 +config SND_SAMSUNG_AC97 tristate select SND_SOC_AC97_BUS -config SND_S5P_SOC_SPDIF +config SND_SAMSUNG_SPDIF tristate select SND_SOC_SPDIF config SND_SAMSUNG_I2S tristate -config SND_S3C24XX_SOC_NEO1973_WM8753 +config ASOC_SAMSUNG_NEO1973_WM8753 tristate "SoC I2S Audio support for NEO1973 - WM8753" - depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && MACH_NEO1973_GTA01 + select SND_S3C24XX_I2S select SND_SOC_WM8753 help Say Y if you want to add support for SoC audio on smdk2440 with the WM8753. -config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 +config ASOC_SAMSUNG_NEO1973_GTA02_WM8753 tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)" - depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && MACH_NEO1973_GTA02 + select SND_S3C24XX_I2S select SND_SOC_WM8753 help This driver provides audio support for the Openmoko Neo FreeRunner smartphone. -config SND_S3C24XX_SOC_JIVE_WM8750 +config ASOC_SAMSUNG_JIVE_WM8750 tristate "SoC I2S Audio support for Jive" - depends on SND_S3C24XX_SOC && MACH_JIVE + depends on ASOC_SAMSUNG && MACH_JIVE select SND_SOC_WM8750 select SND_S3C2412_SOC_I2S help Sat Y if you want to add support for SoC audio on the Jive. -config SND_SOC_SMDK_WM8580 +config ASOC_SAMSUNG_SMDK_WM8580 tristate "SoC I2S Audio support for WM8580 on SMDK" - depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) + depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100) select SND_SOC_WM8580 select SND_SAMSUNG_I2S help Say Y if you want to add support for SoC audio on the SMDKs. -config SND_S3C24XX_SOC_SMDK2443_WM9710 +config ASOC_SAMSUNG_SMDK2443_WM9710 tristate "SoC AC97 Audio support for SMDK2443 - WM9710" - depends on SND_S3C24XX_SOC && MACH_SMDK2443 + depends on ASOC_SAMSUNG && MACH_SMDK2443 select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC - select SND_S3C_SOC_AC97 + select SND_SAMSUNG_AC97 help Say Y if you want to add support for SoC audio on smdk2443 with the WM9710. -config SND_S3C24XX_SOC_LN2440SBC_ALC650 +config ASOC_SAMSUNG_LN2440SBC_ALC650 tristate "SoC AC97 Audio support for LN2440SBC - ALC650" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 + depends on ASOC_SAMSUNG && ARCH_S3C2410 select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC - select SND_S3C_SOC_AC97 + select SND_SAMSUNG_AC97 help Say Y if you want to add support for SoC audio on ln2440sbc with the ALC650. -config SND_S3C24XX_SOC_S3C24XX_UDA134X +config ASOC_SAMSUNG_S3C24XX_UDA134X tristate "SoC I2S Audio support UDA134X wired to a S3C24XX" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && ARCH_S3C2410 + select SND_S3C24XX_I2S select SND_SOC_L3 - select SND_SOC_UDA134X + select SND_SOC_UDA134X -config SND_S3C24XX_SOC_SIMTEC +config ASOC_SAMSUNG_SIMTEC tristate help Internal node for common S3C24XX/Simtec suppor -config SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 +config ASOC_SAMSUNG_SIMTEC_TLV320AIC23 tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && ARCH_S3C2410 + select SND_S3C24XX_I2S select SND_SOC_TLV320AIC23 - select SND_S3C24XX_SOC_SIMTEC + select ASOC_SAMSUNG_SIMTEC -config SND_S3C24XX_SOC_SIMTEC_HERMES +config ASOC_SAMSUNG_SIMTEC_HERMES tristate "SoC I2S Audio support for Simtec Hermes board" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && ARCH_S3C2410 + select SND_S3C24XX_I2S select SND_SOC_TLV320AIC3X - select SND_S3C24XX_SOC_SIMTEC + select ASOC_SAMSUNG_SIMTEC -config SND_S3C24XX_SOC_RX1950_UDA1380 +config ASOC_SAMSUNG_RX1950_UDA1380 tristate "Audio support for the HP iPAQ RX1950" - depends on SND_S3C24XX_SOC && MACH_RX1950 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && MACH_RX1950 + select SND_S3C24XX_I2S select SND_SOC_UDA1380 help This driver provides audio support for HP iPAQ RX1950 PDA. -config SND_SOC_SMDK_WM9713 +config ASOC_SAMSUNG_SMDK_WM9713 tristate "SoC AC97 Audio support for SMDK with WM9713" - depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110) + depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110) select SND_SOC_WM9713 - select SND_S3C_SOC_AC97 + select SND_SAMSUNG_AC97 help Sat Y if you want to add support for SoC audio on the SMDK. -config SND_S3C64XX_SOC_SMARTQ +config ASOC_SMARTQ tristate "SoC I2S Audio support for SmartQ board" - depends on SND_S3C24XX_SOC && MACH_SMARTQ + depends on ASOC_SAMSUNG && MACH_SMARTQ select SND_SAMSUNG_I2S select SND_SOC_WM8750 -config SND_SOC_GONI_AQUILA_WM8994 +config ASOC_GONI_AQUILA_WM8994 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" - depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) + depends on ASOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) select SND_SAMSUNG_I2S select SND_SOC_WM8994 help Say Y if you want to add support for SoC audio on goni or aquila with the WM8994. -config SND_SOC_SMDK_SPDIF +config ASOC_SAMSUNG_SMDK_SPDIF tristate "SoC S/PDIF Audio support for SMDK" depends on SND_S3C24XX_SOC && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210) - select SND_S5P_SOC_SPDIF + select SND_SAMSUNG_SPDIF help Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
sound/soc/s3c24xx/Makefile +20 -20
@@ -8,13 +8,13 @@ snd-soc-samsung-spdif-objs := spdif.o snd-soc-pcm-objs := pcm.o snd-soc-i2s-objs := i2s.o -obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o -obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o -obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-ac97.o +obj-$(CONFIG_ASOC_SAMSUNG) += snd-soc-s3c24xx.o +obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o +obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o -obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o -obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o +obj-$(CONFIG_SND_SAMSUNG_SPDIF) += snd-soc-samsung-spdif.o +obj-$(CONFIG_SND_SAMSUNG_PCM) += snd-soc-pcm.o obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o # S3C24XX Machine Support
@@ -34,18 +34,18 @@ snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o snd-soc-goni-wm8994-objs := goni_wm8994.o snd-soc-smdk-spdif-objs := smdk_spdif.o -obj-$(CONFIG_SND_S3C24XX_SOC_JIVE_WM8750) += snd-soc-jive-wm8750.o -obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o -obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o -obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o -obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o -obj-$(CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o -obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC) += snd-soc-s3c24xx-simtec.o -obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o -obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o -obj-$(CONFIG_SND_S3C24XX_SOC_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o -obj-$(CONFIG_SND_SOC_SMDK_WM8580) += snd-soc-smdk-wm8580.o -obj-$(CONFIG_SND_SOC_SMDK_WM9713) += snd-soc-smdk-wm9713.o -obj-$(CONFIG_SND_S3C64XX_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o -obj-$(CONFIG_SND_SOC_SMDK_SPDIF) += snd-soc-smdk-spdif.o -obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o +obj-$(CONFIG_ASOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o +obj-$(CONFIG_ASOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o +obj-$(CONFIG_ASOC_SAMSUNG_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o +obj-$(CONFIG_ASOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o +obj-$(CONFIG_ASOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o +obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o +obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o +obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o +obj-$(CONFIG_ASOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o +obj-$(CONFIG_ASOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o +obj-$(CONFIG_ASOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
Signature · 1 line
1.6.2.5
PATCH 18/18 ASoC: Samsung: Rename from s3c24xx to samsung
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Finally, move the 's3c24xx' directory to 'samsung'
---
sound/soc/Kconfig | 2 +-
sound/soc/Makefile | 2 +-
sound/soc/{s3c24xx => samsung}/Kconfig | 0
sound/soc/{s3c24xx => samsung}/Makefile | 0
sound/soc/{s3c24xx => samsung}/ac97.c | 2 +-
sound/soc/{s3c24xx => samsung}/ac97.h | 2 +-
sound/soc/{s3c24xx => samsung}/dma.c | 0
sound/soc/{s3c24xx => samsung}/dma.h | 0
sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 0
sound/soc/{s3c24xx => samsung}/i2s.c | 2 +-
sound/soc/{s3c24xx => samsung}/i2s.h | 2 +-
sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 2 +-
sound/soc/{s3c24xx => samsung}/lm4857.h | 0
sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 0
.../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 0
sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 0
sound/soc/{s3c24xx => samsung}/pcm.c | 2 +-
sound/soc/{s3c24xx => samsung}/pcm.h | 2 +-
sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0
sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 0
sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +-
sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +-
sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 0
sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0
sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +-
.../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 2 +-
.../s3c24xx_simtec_tlv320aic23.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 0
sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 2 +-
sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 0
sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 0
sound/soc/{s3c24xx => samsung}/smdk_wm8580.c | 0
sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 0
sound/soc/{s3c24xx => samsung}/spdif.c | 2 +-
sound/soc/{s3c24xx => samsung}/spdif.h | 2 +-
38 files changed, 20 insertions(+), 20 deletions(-)
rename sound/soc/{s3c24xx => samsung}/Kconfig (100%)
rename sound/soc/{s3c24xx => samsung}/Makefile (100%)
rename sound/soc/{s3c24xx => samsung}/ac97.c (99%)
rename sound/soc/{s3c24xx => samsung}/ac97.h (95%)
rename sound/soc/{s3c24xx => samsung}/dma.c (100%)
rename sound/soc/{s3c24xx => samsung}/dma.h (100%)
rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (100%)
rename sound/soc/{s3c24xx => samsung}/i2s.c (99%)
rename sound/soc/{s3c24xx => samsung}/i2s.h (96%)
rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (99%)
rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%)
rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (100%)
rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (100%)
rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (100%)
rename sound/soc/{s3c24xx => samsung}/pcm.c (99%)
rename sound/soc/{s3c24xx => samsung}/pcm.h (99%)
rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%)
rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (100%)
rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%)
rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%)
rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (99%)
rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (100%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (98%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (98%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (100%)
rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (99%)
rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (100%)
rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (100%)
rename sound/soc/{s3c24xx => samsung}/smdk_wm8580.c (100%)
rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (100%)
rename sound/soc/{s3c24xx => samsung}/spdif.c (99%)
rename sound/soc/{s3c24xx => samsung}/spdif.h (94%)sound/soc/Kconfig +1 -1
@@ -36,7 +36,7 @@ source "sound/soc/nuc900/Kconfig" source "sound/soc/omap/Kconfig" source "sound/soc/kirkwood/Kconfig" source "sound/soc/pxa/Kconfig" -source "sound/soc/s3c24xx/Kconfig" +source "sound/soc/samsung/Kconfig" source "sound/soc/s6000/Kconfig" source "sound/soc/sh/Kconfig" source "sound/soc/txx9/Kconfig"
sound/soc/Makefile +1 -1
@@ -14,7 +14,7 @@ obj-$(CONFIG_SND_SOC) += nuc900/ obj-$(CONFIG_SND_SOC) += omap/ obj-$(CONFIG_SND_SOC) += kirkwood/ obj-$(CONFIG_SND_SOC) += pxa/ -obj-$(CONFIG_SND_SOC) += s3c24xx/ +obj-$(CONFIG_SND_SOC) += samsung/ obj-$(CONFIG_SND_SOC) += s6000/ obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += txx9/
sound/soc/samsung/Kconfig renamed from sound/soc/s3c24xx/Kconfig +0 -0
sound/soc/samsung/Makefile renamed from sound/soc/s3c24xx/Makefile +0 -0
sound/soc/samsung/ac97.c renamed from sound/soc/s3c24xx/ac97.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/ac97.c +/* sound/soc/samsung/ac97.c * * ALSA SoC Audio Layer - S3C AC97 Controller driver * Evolved from s3c2443-ac97.c
sound/soc/samsung/ac97.h renamed from sound/soc/s3c24xx/ac97.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/ac97.h +/* sound/soc/samsung/ac97.h * * ALSA SoC Audio Layer - S3C AC97 Controller driver * Evolved from s3c2443-ac97.h
sound/soc/samsung/dma.c renamed from sound/soc/s3c24xx/dma.c +0 -0
sound/soc/samsung/dma.h renamed from sound/soc/s3c24xx/dma.h +0 -0
sound/soc/samsung/goni_wm8994.c renamed from sound/soc/s3c24xx/goni_wm8994.c +0 -0
sound/soc/samsung/i2s.c renamed from sound/soc/s3c24xx/i2s.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/i2s.c +/* sound/soc/samsung/i2s.c * * ALSA SoC Audio Layer - Samsung I2S Controller driver *
sound/soc/samsung/i2s.h renamed from sound/soc/s3c24xx/i2s.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/i2s.h +/* sound/soc/samsung/i2s.h * * ALSA SoC Audio Layer - Samsung I2S Controller driver *
sound/soc/samsung/jive_wm8750.c renamed from sound/soc/s3c24xx/jive_wm8750.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/jive_wm8750.c +/* sound/soc/samsung/jive_wm8750.c * * Copyright 2007,2008 Simtec Electronics *
sound/soc/samsung/lm4857.h renamed from sound/soc/s3c24xx/lm4857.h +0 -0
sound/soc/samsung/ln2440sbc_alc650.c renamed from sound/soc/s3c24xx/ln2440sbc_alc650.c +0 -0
sound/soc/samsung/neo1973_gta02_wm8753.c renamed from sound/soc/s3c24xx/neo1973_gta02_wm8753.c +0 -0
sound/soc/samsung/neo1973_wm8753.c renamed from sound/soc/s3c24xx/neo1973_wm8753.c +0 -0
sound/soc/samsung/pcm.c renamed from sound/soc/s3c24xx/pcm.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/pcm.c +/* sound/soc/samsung/pcm.c * * ALSA SoC Audio Layer - S3C PCM-Controller driver *
sound/soc/samsung/pcm.h renamed from sound/soc/s3c24xx/pcm.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/pcm.h +/* sound/soc/samsung/pcm.h * * 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
sound/soc/samsung/regs-i2s-v2.h renamed from sound/soc/s3c24xx/regs-i2s-v2.h +0 -0
sound/soc/samsung/rx1950_uda1380.c renamed from sound/soc/s3c24xx/rx1950_uda1380.c +0 -0
sound/soc/samsung/s3c-i2s-v2.c renamed from sound/soc/s3c24xx/s3c-i2s-v2.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-i2c-v2.c +/* sound/soc/samsung/s3c-i2c-v2.c * * ALSA Soc Audio Layer - I2S core for newer Samsung SoCs. *
sound/soc/samsung/s3c-i2s-v2.h renamed from sound/soc/s3c24xx/s3c-i2s-v2.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-i2s-v2.h +/* sound/soc/samsung/s3c-i2s-v2.h * * ALSA Soc Audio Layer - S3C_I2SV2 I2S driver *
sound/soc/samsung/s3c2412-i2s.c renamed from sound/soc/s3c24xx/s3c2412-i2s.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c2412-i2s.c +/* sound/soc/samsung/s3c2412-i2s.c * * ALSA Soc Audio Layer - S3C2412 I2S driver *
sound/soc/samsung/s3c2412-i2s.h renamed from sound/soc/s3c24xx/s3c2412-i2s.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c2412-i2s.c +/* sound/soc/samsung/s3c2412-i2s.c * * ALSA Soc Audio Layer - S3C2412 I2S driver *
sound/soc/samsung/s3c24xx-i2s.c renamed from sound/soc/s3c24xx/s3c24xx-i2s.c +0 -0
sound/soc/samsung/s3c24xx-i2s.h renamed from sound/soc/s3c24xx/s3c24xx-i2s.h +0 -0
sound/soc/samsung/s3c24xx_simtec.c renamed from sound/soc/s3c24xx/s3c24xx_simtec.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec.c +/* sound/soc/samsung/s3c24xx_simtec.c * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_simtec.h renamed from sound/soc/s3c24xx/s3c24xx_simtec.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec.h +/* sound/soc/samsung/s3c24xx_simtec.h * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_simtec_hermes.c renamed from sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +/* sound/soc/samsung/s3c24xx_simtec_hermes.c * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c renamed from sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +/* sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_uda134x.c renamed from sound/soc/s3c24xx/s3c24xx_uda134x.c +0 -0
sound/soc/samsung/smartq_wm8987.c renamed from sound/soc/s3c24xx/smartq_wm8987.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/smartq_wm8987.c +/* sound/soc/samsung/smartq_wm8987.c * * Copyright 2010 Maurus Cuelenaere <[email protected]> *
sound/soc/samsung/smdk2443_wm9710.c renamed from sound/soc/s3c24xx/smdk2443_wm9710.c +0 -0
sound/soc/samsung/smdk_spdif.c renamed from sound/soc/s3c24xx/smdk_spdif.c +0 -0
sound/soc/samsung/smdk_wm8580.c renamed from sound/soc/s3c24xx/smdk_wm8580.c +0 -0
sound/soc/samsung/smdk_wm9713.c renamed from sound/soc/s3c24xx/smdk_wm9713.c +0 -0
sound/soc/samsung/spdif.c renamed from sound/soc/s3c24xx/spdif.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/spdif.c +/* sound/soc/samsung/spdif.c * * ALSA SoC Audio Layer - Samsung S/PDIF Controller driver *
sound/soc/samsung/spdif.h renamed from sound/soc/s3c24xx/spdif.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/spdif.h +/* sound/soc/samsung/spdif.h * * ALSA SoC Audio Layer - Samsung S/PDIF Controller driver *
Signature · 1 line
1.6.2.5
PATCH v4 1/1 ASoC: Overhaul Samsung drivers
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Hi,
Now that the arch/arm side of the updates has been applied in
the Kgene's tree, I am submitting upgrade for the Samsung ASoC in the following 18 patches.
Thanks.
PATCH v4 1/18 ASoC: Samsung: Remove redundant AQUILA driver
From: Jassi Brar <[email protected]>
AQUILA and GONI are essentially the same h/w w.r.t ASoC. They only differ by the fact that GONI has stereo speaker-out whereas AQUILA has mono.
The difference can easily be handled in the same MACHINE driver by making machine-specific runtime changes.
--- sound/soc/s3c24xx/Kconfig | 17 +-- sound/soc/s3c24xx/Makefile | 4 +- sound/soc/s3c24xx/aquila_wm8994.c | 296 ------------------------------------- sound/soc/s3c24xx/goni_wm8994.c | 19 +++- 4 files changed, 23 insertions(+), 313 deletions(-) delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c
sound/soc/s3c24xx/Kconfig +4 -13
@@ -145,22 +145,13 @@ config SND_S3C64XX_SOC_SMARTQ select SND_S3C64XX_SOC_I2S select SND_SOC_WM8750 -config SND_S5PC110_SOC_AQUILA_WM8994 - tristate "SoC I2S Audio support for AQUILA - WM8994" - depends on SND_S3C24XX_SOC && MACH_AQUILA +config SND_SOC_GONI_AQUILA_WM8994 + tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" + depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) select SND_S3C64XX_SOC_I2S_V4 select SND_SOC_WM8994 help - Say Y if you want to add support for SoC audio on aquila - with the WM8994. - -config SND_S5PV210_SOC_GONI_WM8994 - tristate "SoC I2S Audio support for GONI - WM8994" - depends on SND_S3C24XX_SOC && MACH_GONI - select SND_S3C64XX_SOC_I2S_V4 - select SND_SOC_WM8994 - help - Say Y if you want to add support for SoC audio on goni + Say Y if you want to add support for SoC audio on goni or aquila with the WM8994. config SND_SOC_SMDK_SPDIF
sound/soc/s3c24xx/Makefile +1 -3
@@ -33,7 +33,6 @@ snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o snd-soc-smdk64xx-wm8580-objs := smdk64xx_wm8580.o snd-soc-smdk-wm9713-objs := smdk_wm9713.o snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o -snd-soc-aquila-wm8994-objs := aquila_wm8994.o snd-soc-goni-wm8994-objs := goni_wm8994.o snd-soc-smdk-spdif-objs := smdk_spdif.o
@@ -50,6 +49,5 @@ obj-$(CONFIG_SND_S3C24XX_SOC_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o obj-$(CONFIG_SND_S3C64XX_SOC_WM8580) += snd-soc-smdk64xx-wm8580.o obj-$(CONFIG_SND_SOC_SMDK_WM9713) += snd-soc-smdk-wm9713.o obj-$(CONFIG_SND_S3C64XX_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o -obj-$(CONFIG_SND_S5PC110_SOC_AQUILA_WM8994) += snd-soc-aquila-wm8994.o -obj-$(CONFIG_SND_S5PV210_SOC_GONI_WM8994) += snd-soc-goni-wm8994.o obj-$(CONFIG_SND_SOC_SMDK_SPDIF) += snd-soc-smdk-spdif.o +obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
sound/soc/s3c24xx/aquila_wm8994.c deleted +0 -296
296 lines not on this page · raw message
sound/soc/s3c24xx/goni_wm8994.c +18 -1
@@ -28,6 +28,14 @@#include "s3c-dma.h" #include "s3c64xx-i2s.h" +#define MACHINE_NAME 0 +#define CPU_VOICE_DAI 1 + +static const char *aquila_str[] = { + [MACHINE_NAME ] ="aquila" , + [CPU_VOICE_DAI ] ="aquila-voice-dai" , +}; +static struct snd_soc_card goni;static struct platform_device *goni_snd_device;
@@ -116,6 +124,11 @@ static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)snd_soc_dapm_nc_pin (dapm,"LINEOUT2N" );snd_soc_dapm_nc_pin (dapm,"LINEOUT2P" ); +if (machine_is_aquila ()) { +snd_soc_dapm_nc_pin (dapm,"SPKOUTRN" ); +snd_soc_dapm_nc_pin (dapm,"SPKOUTRP" ); + } +snd_soc_dapm_sync (dapm);/* Headset jack detection */
@@ -264,7 +277,11 @@ static int __init goni_init(void) {int ret; -if (!machine_is_goni ()) +if (machine_is_aquila ()) { + voice_dai.name = aquila_str[CPU_VOICE_DAI ]; + goni_dai[1 ].cpu_dai_name = aquila_str[CPU_VOICE_DAI ]; + goni.name = aquila_str[MACHINE_NAME ]; + }else if (!machine_is_goni ())return -ENODEV ; goni_snd_device =platform_device_alloc ("soc-audio" ,-1 );
Signature · 1 line
1.6.2.5
PATCH v4 2/18 ASoC: Samsung: Rename DMA device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Some Samsung SoCs have a PCM(DSP) controller. So the name s3c24xx-pcm-audio for DMA driver is not very appropraite. This patch moves :-
s3c24xx-pcm-audio -> samsung-audio
--- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 2 +- sound/soc/s3c24xx/goni_wm8994.c | 4 ++-- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 4 ++-- sound/soc/s3c24xx/neo1973_wm8753.c | 4 ++-- sound/soc/s3c24xx/rx1950_uda1380.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 4 ++-- 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/smartq_wm8987.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 ++-- sound/soc/s3c24xx/smdk_spdif.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-)
arch/arm/mach-s3c64xx/dev-audio.c +1 -1
@@ -319,7 +319,7 @@ void __init s3c64xx_ac97_setup_gpio(int num)static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_pcm = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .id =-1 , .dev = { .dma_mask = &s3c_device_audio_dmamask,
arch/arm/plat-s3c24xx/devs.c +1 -1
@@ -264,7 +264,7 @@ EXPORT_SYMBOL(s3c_device_iis);static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_pcm = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .id =-1 , .dev = { .dma_mask = &s3c_device_audio_dmamask,
sound/soc/s3c24xx/goni_wm8994.c +2 -2
@@ -252,7 +252,7 @@ static struct snd_soc_dai_link goni_dai[] = { .stream_name = "WM8994 HiFi", .cpu_dai_name = "s3c64xx-i2s-v4", .codec_dai_name = "wm8994-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a", .init = goni_wm8994_init, .ops = &goni_hifi_ops,
@@ -261,7 +261,7 @@ static struct snd_soc_dai_link goni_dai[] = { .stream_name = "Voice", .cpu_dai_name = "goni-voice-dai", .codec_dai_name = "wm8994-voice", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a", .ops = &goni_voice_ops, },
sound/soc/s3c24xx/jive_wm8750.c +1 -1
@@ -142,7 +142,7 @@ static struct snd_soc_dai_link jive_dai = { .stream_name = "WM8750", .cpu_dai_name = "s3c2412-i2s", .codec_dai_name = "wm8750-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a", .init = jive_wm8750_init, .ops = &jive_ops,
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -35,7 +35,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };
sound/soc/s3c24xx/neo1973_gta02_wm8753.c +2 -2
@@ -401,7 +401,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .init = neo1973_gta02_wm8753_init, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8753-codec.0-0x1a", .ops = &neo1973_gta02_hifi_ops, },
@@ -412,7 +412,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .codec_dai_name = "wm8753-voice", .ops = &neo1973_gta02_voice_ops, .codec_name = "wm8753-codec.0-0x1a", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };
sound/soc/s3c24xx/neo1973_wm8753.c +2 -2
@@ -559,7 +559,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { {/* Hifi Playback - for similatious use with voice below */ .name = "WM8753", .stream_name = "WM8753 HiFi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .codec_name = "wm8753-codec.0-0x1a",
@@ -569,7 +569,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { {/* Voice via BT */ .name = "Bluetooth", .stream_name = "Voice", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .cpu_dai_name = "bluetooth-dai", .codec_dai_name = "wm8753-voice", .codec_name = "wm8753-codec.0-0x1a",
sound/soc/s3c24xx/rx1950_uda1380.c +1 -1
@@ -95,7 +95,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = { .cpu_dai_name = "s3c24xx-iis", .codec_dai_name = "uda1380-hifi", .init = rx1950_uda1380_init, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "uda1380-codec.0-001a", .ops = &rx1950_ops, },
sound/soc/s3c24xx/s3c-dma.c +2 -2
@@ -476,7 +476,7 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev)static struct platform_driver s3c24xx_pcm_driver = { .driver = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .owner =THIS_MODULE , },
@@ -499,4 +499,4 @@ module_exit(snd_s3c24xx_pcm_exit);MODULE_AUTHOR ("Ben Dooks, <[email protected]>" );MODULE_DESCRIPTION ("Samsung S3C Audio DMA module" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c24xx-pcm-audio" ); +MODULE_ALIAS ("platform:samsung-audio" );
sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +1 -1
@@ -100,7 +100,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = { .codec_name = "tlv320aic3x-codec.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .init = simtec_hermes_init, };
sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +1 -1
@@ -89,7 +89,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = { .codec_name = "tlv320aic3x-codec.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .init = simtec_tlv320aic23_init, };
sound/soc/s3c24xx/s3c24xx_uda134x.c +1 -1
@@ -231,7 +231,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { .codec_dai_name = "uda134x-hifi", .cpu_dai_name = "s3c24xx-i2s", .ops = &s3c24xx_uda134x_ops, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", };static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
sound/soc/s3c24xx/smartq_wm8987.c +1 -1
@@ -214,7 +214,7 @@ static struct snd_soc_dai_link smartq_dai[] = { .stream_name = "SmartQ Hi-Fi", .cpu_dai_name = "s3c64xx-i2s.0", .codec_dai_name = "wm8750-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a", .init = smartq_wm8987_init, .ops = &smartq_hifi_ops,
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -31,7 +31,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };
sound/soc/s3c24xx/smdk64xx_wm8580.c +2 -2
@@ -226,7 +226,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .stream_name = "Playback", .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-playback", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b", .init = smdk64xx_wm8580_init_paifrx, .ops = &smdk64xx_ops,
@@ -236,7 +236,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .stream_name = "Capture", .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-capture", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b", .init = smdk64xx_wm8580_init_paiftx, .ops = &smdk64xx_ops,
sound/soc/s3c24xx/smdk_spdif.c +1 -1
@@ -157,7 +157,7 @@ static struct snd_soc_card smdk;static struct snd_soc_dai_link smdk_dai = { .name ="S/PDIF" , .stream_name ="S/PDIF PCM Playback" , - .platform_name ="s3c24xx-pcm-audio" , + .platform_name ="samsung-audio" , .cpu_dai_name ="samsung-spdif" , .codec_dai_name ="dit-hifi" , .codec_name ="spdif-dit" ,
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -45,7 +45,7 @@ static struct snd_soc_card smdk;static struct snd_soc_dai_link smdk_dai = { .name ="AC97" , .stream_name ="AC97 PCM" , - .platform_name ="s3c24xx-pcm-audio" , + .platform_name ="samsung-audio" , .cpu_dai_name ="s3c-ac97" , .codec_dai_name ="wm9713-hifi" , .codec_name ="wm9713-codec" ,
Signature · 1 line
1.6.2.5
Re: [PATCHv4 02/18] ASoC: Samsung: Rename DMA device
Quoted 9 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Some Samsung SoCs have a PCM(DSP) controller. So the name s3c24xx-pcm-audio for DMA driver is not very appropraite. This patch moves :-
s3c24xx-pcm-audio -> samsung-audioSigned-off-by Jassi Brar <[email protected]>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 20 lines
--- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 2 +- sound/soc/s3c24xx/goni_wm8994.c | 4 ++-- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 4 ++-- sound/soc/s3c24xx/neo1973_wm8753.c | 4 ++-- sound/soc/s3c24xx/rx1950_uda1380.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 4 ++-- 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/smartq_wm8987.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 ++-- sound/soc/s3c24xx/smdk_spdif.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-)
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/mach-s3c64xx/dev-
sound/soc/s3c24xx/s3c-dma.c static int __devexit
Quoted 142 lines
audio.c
index 7618627..bbaf7b3 100644arch/arm/mach-s3c64xx/dev-audio.c +1
-1@@ -319,7 +319,7 @@ void __init s3c64xx_ac97_setup_gpio(int num)static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_pcm = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .id =-1 , .dev = { .dma_mask = &s3c_device_audio_dmamask,arch/arm/plat-s3c24xx/devs.c +1
-1@@ -264,7 +264,7 @@ EXPORT_SYMBOL(s3c_device_iis);static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_pcm = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .id =-1 , .dev = { .dma_mask = &s3c_device_audio_dmamask,sound/soc/s3c24xx/goni_wm8994.c +2
-2@@ -252,7 +252,7 @@ static struct snd_soc_dai_link goni_dai[] = { .stream_name = "WM8994 HiFi", .cpu_dai_name = "s3c64xx-i2s-v4", .codec_dai_name = "wm8994-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a", .init = goni_wm8994_init, .ops = &goni_hifi_ops,@@ -261,7 +261,7 @@ static struct snd_soc_dai_link goni_dai[] = { .stream_name = "Voice", .cpu_dai_name = "goni-voice-dai", .codec_dai_name = "wm8994-voice", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a", .ops = &goni_voice_ops, },sound/soc/s3c24xx/jive_wm8750.c +1
-1@@ -142,7 +142,7 @@ static struct snd_soc_dai_link jive_dai = { .stream_name = "WM8750", .cpu_dai_name = "s3c2412-i2s", .codec_dai_name = "wm8750-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a", .init = jive_wm8750_init, .ops = &jive_ops,sound/soc/s3c24xx/ln2440sbc_alc650.c +1
-1@@ -35,7 +35,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };sound/soc/s3c24xx/neo1973_gta02_wm8753.c +2
-2@@ -401,7 +401,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .init = neo1973_gta02_wm8753_init, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8753-codec.0-0x1a", .ops = &neo1973_gta02_hifi_ops, },@@ -412,7 +412,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .codec_dai_name = "wm8753-voice", .ops = &neo1973_gta02_voice_ops, .codec_name = "wm8753-codec.0-0x1a", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };sound/soc/s3c24xx/neo1973_wm8753.c +2
-2@@ -559,7 +559,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { {/* Hifi Playback - for similatious use with voice below */ .name = "WM8753", .stream_name = "WM8753 HiFi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .codec_name = "wm8753-codec.0-0x1a",@@ -569,7 +569,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { {/* Voice via BT */ .name = "Bluetooth", .stream_name = "Voice", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .cpu_dai_name = "bluetooth-dai", .codec_dai_name = "wm8753-voice", .codec_name = "wm8753-codec.0-0x1a",sound/soc/s3c24xx/rx1950_uda1380.c +1
-1@@ -95,7 +95,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = { .cpu_dai_name = "s3c24xx-iis", .codec_dai_name = "uda1380-hifi", .init = rx1950_uda1380_init, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "uda1380-codec.0-001a", .ops = &rx1950_ops, },sound/soc/s3c24xx/s3c-dma.c +0
-0@@ -476,7 +476,7 @@ static int __devexit
s3c24xx_soc_platform_remove(struct
sound/soc/s3c24xx/s3c24xx_uda134x.c static struct snd_soc_dai_link
Quoted 49 lines
sound/soc/s3c24xx/s3c-dma.c +2
-2platform_device *pdev)static struct platform_driver s3c24xx_pcm_driver = { .driver = { - .name ="s3c24xx-pcm-audio" , + .name ="samsung-audio" , .owner =THIS_MODULE , },@@ -499,4 +499,4 @@ module_exit(snd_s3c24xx_pcm_exit);MODULE_AUTHOR ("Ben Dooks, <[email protected]>" );MODULE_DESCRIPTION ("Samsung S3C Audio DMA module" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c24xx-pcm-audio" ); +MODULE_ALIAS ("platform:samsung-audio" );sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +1
-1@@ -100,7 +100,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = { .codec_name = "tlv320aic3x-codec.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .init = simtec_hermes_init, };sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +1
-1@@ -89,7 +89,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = { .codec_name = "tlv320aic3x-codec.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .init = simtec_tlv320aic23_init, };sound/soc/s3c24xx/s3c24xx_uda134x.c +0
-0@@ -231,7 +231,7 @@ static struct snd_soc_dai_link
s3c24xx_uda134x_dai_link =
Review
Quoted 61 lines
sound/soc/s3c24xx/s3c24xx_uda134x.c +1
-1{ .codec_dai_name = "uda134x-hifi", .cpu_dai_name = "s3c24xx-i2s", .ops = &s3c24xx_uda134x_ops, - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", };static struct
snd_soc_cardsnd_soc_s3c24xx_uda134x= {sound/soc/s3c24xx/smartq_wm8987.c +1
-1@@ -214,7 +214,7 @@ static struct snd_soc_dai_link smartq_dai[] = { .stream_name = "SmartQ Hi-Fi", .cpu_dai_name = "s3c64xx-i2s.0", .codec_dai_name = "wm8750-hifi", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a", .init = smartq_wm8987_init, .ops = &smartq_hifi_ops,sound/soc/s3c24xx/smdk2443_wm9710.c +1
-1@@ -31,7 +31,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", }, };sound/soc/s3c24xx/smdk64xx_wm8580.c +2
-2@@ -226,7 +226,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .stream_name = "Playback", .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-playback", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b", .init = smdk64xx_wm8580_init_paifrx, .ops = &smdk64xx_ops,@@ -236,7 +236,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .stream_name = "Capture", .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-capture", - .platform_name = "s3c24xx-pcm-audio", + .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b", .init = smdk64xx_wm8580_init_paiftx, .ops = &smdk64xx_ops,(quoted diff) +0
-0
b/sound/soc/s3c24xx/smdk_spdif.c
Quoted 28 lines
index f31d22a..082b88d 100644
sound/soc/s3c24xx/smdk_spdif.c +1
-1@@ -157,7 +157,7 @@ static struct snd_soc_card smdk;static struct snd_soc_dai_link smdk_dai = { .name ="S/PDIF" , .stream_name ="S/PDIF PCM Playback" , - .platform_name ="s3c24xx-pcm-audio" , + .platform_name ="samsung-audio" , .cpu_dai_name ="samsung-spdif" , .codec_dai_name ="dit-hifi" , .codec_name ="spdif-dit" ,sound/soc/s3c24xx/smdk_wm9713.c +1
-2@@ -45,7 +45,7 @@ static struct snd_soc_card smdk;static struct snd_soc_dai_link smdk_dai = { .name ="AC97" , .stream_name ="AC97 PCM" , - .platform_name ="s3c24xx-pcm-audio" , + .platform_name ="samsung-audio" , .cpu_dai_name ="s3c-ac97" , .codec_dai_name ="wm9713-hifi" , .codec_name ="wm9713-codec" , --1.6.2.5
PATCH v4 3/18 ARM: Samsung: Define common audio-dma device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
The ASoC uses common DMA driver for Audio devices. So it makes sense to a common audio-dma device shared across all platforms.
--- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 13 ------------- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 17 ++--------------- arch/arm/plat-samsung/Makefile | 1 + arch/arm/plat-samsung/dev-asocdma.c | 24 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 2 +- 8 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 arch/arm/plat-samsung/dev-asocdma.c
arch/arm/mach-s3c2410/mach-h1940.c +1 -1
@@ -387,7 +387,7 @@ static struct platform_device *h1940_devices[] __initdata = { &s3c_device_wdt, &s3c_device_i2c0, &s3c_device_iis, - &s3c_device_pcm, + &samsung_asoc_dma, &s3c_device_usbgadget, &h1940_device_leds, &h1940_device_bluetooth,
arch/arm/mach-s3c2440/mach-rx1950.c +1 -1
@@ -692,7 +692,7 @@ static struct platform_device *rx1950_devices[] __initdata = { &s3c_device_wdt, &s3c_device_i2c0, &s3c_device_iis, - &s3c_device_pcm, + &samsung_asoc_dma, &s3c_device_usbgadget, &s3c_device_rtc, &s3c_device_nand,
arch/arm/mach-s3c64xx/dev-audio.c +0 -13
@@ -315,16 +315,3 @@ void __init s3c64xx_ac97_setup_gpio(int num)else s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; } - -static u64 s3c_device_audio_dmamask =0xffffffffUL ; - -struct platform_device s3c_device_pcm = { - .name ="samsung-audio" , - .id =-1 , - .dev = { - .dma_mask = &s3c_device_audio_dmamask, - .coherent_dma_mask =0xffffffffUL - } -}; -EXPORT_SYMBOL (s3c_device_pcm); -
arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -1
@@ -283,7 +283,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_fb, &s3c_device_ohci, &s3c_device_usb_hsotg, - &s3c_device_pcm, + &samsung_asoc_dma, &s3c64xx_device_iisv4, &samsung_device_keypad,
arch/arm/plat-s3c24xx/devs.c +2 -15
@@ -259,21 +259,6 @@ struct platform_device s3c_device_iis = {EXPORT_SYMBOL (s3c_device_iis); -/* ASoC PCM DMA */ - -static u64 s3c_device_audio_dmamask =0xffffffffUL ; - -struct platform_device s3c_device_pcm = { - .name ="samsung-audio" , - .id =-1 , - .dev = { - .dma_mask = &s3c_device_audio_dmamask, - .coherent_dma_mask =0xffffffffUL - } -}; - -EXPORT_SYMBOL (s3c_device_pcm); -/* RTC */ static struct resource s3c_rtc_resource[] = {
@@ -496,6 +481,8 @@ static struct resource s3c_ac97_resource[] = { }, }; +static u64 s3c_device_audio_dmamask =0xffffffffUL ; +struct platform_device s3c_device_ac97 = { .name ="s3c-ac97" , .id =-1 ,
arch/arm/plat-samsung/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-y += clock.o obj-y += pwm-clock.o obj-y += gpio.o obj-y += gpio-config.o +obj-y += dev-asocdma.o obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT) += gpiolib.o obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o
arch/arm/plat-samsung/dev-asocdma.c new file +24 -0
@@ -0,0 +1,24 @@ +/* linux/arch/arm/plat-samsung/dev-asocdma.c +* +* Copyright (c) 2010 Samsung Electronics Co. Ltd +* 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. +*/ + +#include <linux/platform_device.h> +#include <linux/dma-mapping.h> + +static u64 audio_dmamask =DMA_BIT_MASK (32 ); + +struct platform_device samsung_asoc_dma = { + .name ="samsung-audio" , + .id =-1 , + .dev = { + .dma_mask = &audio_dmamask, + .coherent_dma_mask =DMA_BIT_MASK (32 ), + } +}; +EXPORT_SYMBOL (samsung_asoc_dma);
arch/arm/plat-samsung/include/plat/devs.h +1 -1
@@ -32,7 +32,7 @@ extern struct platform_device s3c64xx_device_iisv4;extern struct platform_device s3c64xx_device_spi0;extern struct platform_device s3c64xx_device_spi1; -extern struct platform_device s3c_device_pcm; +extern struct platform_device samsung_asoc_dma;extern struct platform_device s3c64xx_device_pcm0;extern struct platform_device s3c64xx_device_pcm1;
Signature · 1 line
1.6.2.5
Re: [PATCHv4 03/18] ARM: Samsung: Define common audio-dma device
Quoted 7 lines · Jassi Brar
From: Jassi Brar <[email protected]>
The ASoC uses common DMA driver for Audio devices. So it makes sense to a common audio-dma device shared across all platforms.
Signed-off-by Jassi Brar <[email protected]>
Added Ben Dooks in Cc.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 12 lines
--- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 13 ------------- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 17 ++--------------- arch/arm/plat-samsung/Makefile | 1 + arch/arm/plat-samsung/dev-asocdma.c | 24 ++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 2 +- 8 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 arch/arm/plat-samsung/dev-asocdma.c
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/mach-s3c2410/mach-
arch/arm/mach-s3c2410/mach-h1940.c static struct platform_device *h1940_devices[]
Quoted 5 lines
h1940.c
index d7ada8c..1a81fe1 100644arch/arm/mach-s3c2410/mach-h1940.c +0
-0@@ -387,7 +387,7 @@ static struct platform_device *h1940_devices[]
__initdata
Review
Quoted 25 lines
arch/arm/mach-s3c2410/mach-h1940.c +1
-1= { &s3c_device_wdt, &s3c_device_i2c0, &s3c_device_iis, - &s3c_device_pcm, + &samsung_asoc_dma, &s3c_device_usbgadget, &h1940_device_leds,arch/arm/mach-s3c2410/mach-h1940.c +0
-0&h1940_device_bluetooth,arch/arm/mach- renamed from arch/arm/mach-s3c2440/mach-rx1950.c +0
-0
s3c2440/mach-rx1950.c
index e0622bb..eab6ae5 100644arch/arm/mach-s3c2440/mach-rx1950.c +1
-1@@ -692,7 +692,7 @@ static struct platform_device *rx1950_devices[] __initdata = { &s3c_device_wdt, &s3c_device_i2c0, &s3c_device_iis, - &s3c_device_pcm, + &samsung_asoc_dma, &s3c_device_usbgadget, &s3c_device_rtc,arch/arm/mach-s3c2440/mach-rx1950.c +0
-0&s3c_device_nand,(quoted diff) +0
-0
b/arch/arm/mach-s3c64xx/dev-
Review
Quoted 72 lines
audio.c
index bbaf7b3..4a4b8a5 100644arch/arm/mach-s3c64xx/dev-audio.c +0
-13@@ -315,16 +315,3 @@ void __init s3c64xx_ac97_setup_gpio(int num)else s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; } - -static u64 s3c_device_audio_dmamask =0xffffffffUL ; - -struct platform_device s3c_device_pcm = { - .name ="samsung-audio" , - .id =-1 , - .dev = { - .dma_mask = &s3c_device_audio_dmamask, - .coherent_dma_mask =0xffffffffUL - } -}; -EXPORT_SYMBOL (s3c_device_pcm); -arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-smdk6410.c +0
-0
s3c64xx/mach-smdk6410.c
index 77488fa..e85192a 100644arch/arm/mach-s3c64xx/mach-smdk6410.c +1
-1@@ -283,7 +283,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_fb, &s3c_device_ohci, &s3c_device_usb_hsotg, - &s3c_device_pcm, + &samsung_asoc_dma, &s3c64xx_device_iisv4, &samsung_device_keypad,arch/arm/plat-s3c24xx/devs.c +2
-15@@ -259,21 +259,6 @@ struct platform_device s3c_device_iis = {EXPORT_SYMBOL (s3c_device_iis); -/* ASoC PCM DMA */ - -static u64 s3c_device_audio_dmamask =0xffffffffUL ; - -struct platform_device s3c_device_pcm = { - .name ="samsung-audio" , - .id =-1 , - .dev = { - .dma_mask = &s3c_device_audio_dmamask, - .coherent_dma_mask =0xffffffffUL - } -}; - -EXPORT_SYMBOL (s3c_device_pcm); -/* RTC */ static struct resource s3c_rtc_resource[] = {@@ -496,6 +481,8 @@ static struct resource s3c_ac97_resource[] = { }, }; +static u64 s3c_device_audio_dmamask =0xffffffffUL ; +struct platform_device s3c_device_ac97 = { .name ="s3c-ac97" , .id =-1 ,(quoted diff) +0
-0
b/arch/arm/plat-samsung/Makefile
Review
Quoted 12 lines
index afcce47..19d8a16 100644
arch/arm/plat-samsung/Makefile +1
-0@@ -17,6 +17,7 @@ obj-y += clock.o obj-y += pwm-clock.o obj-y += gpio.o obj-y += gpio-config.o +obj-y += dev-asocdma.o obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT) += gpiolib.o obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o(quoted diff) +0
-0
b/arch/arm/plat-samsung/dev-
Quoted 46 lines
asocdma.c
new file mode 100644
index 0000000..b7b1fcaarch/arm/plat-samsung/dev-asocdma.c new file +24
-0@@ -0,0 +1,24 @@ +/* linux/arch/arm/plat-samsung/dev-asocdma.c +* +* Copyright (c) 2010 Samsung Electronics Co. Ltd +* 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. +*/ + +#include <linux/platform_device.h> +#include <linux/dma-mapping.h> + +static u64 audio_dmamask =DMA_BIT_MASK (32 ); + +struct platform_device samsung_asoc_dma = { + .name ="samsung-audio" , + .id =-1 , + .dev = { + .dma_mask = &audio_dmamask, + .coherent_dma_mask =DMA_BIT_MASK (32 ), + } +}; +EXPORT_SYMBOL (samsung_asoc_dma);arch/arm/plat- renamed from arch/arm/plat-samsung/include/plat/devs.h +0
-0
samsung/include/plat/devs.h
index dec0ded..e9e3b6e 100644arch/arm/plat-samsung/include/plat/devs.h +1
-2@@ -32,7 +32,7 @@ extern struct platform_device s3c64xx_device_iisv4;extern struct platform_device s3c64xx_device_spi0;extern struct platform_device s3c64xx_device_spi1; -extern struct platform_device s3c_device_pcm; +extern struct platform_device samsung_asoc_dma;extern struct platform_device s3c64xx_device_pcm0;extern struct platform_device s3c64xx_device_pcm1; --1.6.2.5
PATCH v4 4/18 ASoC: Samsung: Rename ASoC DMA driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Rename Samsung ASoC DMA driver
s3c-dma.[c/h] -> dma.[c/h]
---
sound/soc/s3c24xx/Makefile | 2 +-
sound/soc/s3c24xx/{s3c-dma.c => dma.c} | 6 +++---
sound/soc/s3c24xx/{s3c-dma.h => dma.h} | 2 +-
sound/soc/s3c24xx/goni_wm8994.c | 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/rx1950_uda1380.c | 2 +-
sound/soc/s3c24xx/s3c-ac97.c | 2 +-
sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +-
sound/soc/s3c24xx/s3c-pcm.c | 2 +-
sound/soc/s3c24xx/s3c2412-i2s.c | 2 +-
sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +-
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-v4.c | 2 +-
sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +-
sound/soc/s3c24xx/smartq_wm8987.c | 2 +-
sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +-
sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +-
sound/soc/s3c24xx/smdk_spdif.c | 2 +-
sound/soc/s3c24xx/smdk_wm9713.c | 2 +-
sound/soc/s3c24xx/spdif.c | 2 +-
26 files changed, 28 insertions(+), 28 deletions(-)
rename sound/soc/s3c24xx/{s3c-dma.c => dma.c} (99%)
rename sound/soc/s3c24xx/{s3c-dma.h => dma.h} (97%)sound/soc/s3c24xx/Makefile +1 -1
@@ -1,5 +1,5 @@ # S3c24XX Platform Support -snd-soc-s3c24xx-objs := s3c-dma.o +snd-soc-s3c24xx-objs := 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
sound/soc/s3c24xx/dma.c renamed from sound/soc/s3c24xx/s3c-dma.c +3 -3
@@ -1,5 +1,5 @@/* -* s3c-dma.c -- ALSA Soc Audio Layer +* dma.c -- ALSA Soc Audio Layer * * (c) 2006 Wolfson Microelectronics PLC. * Graeme Gregory [email protected] or [email protected]
@@ -30,7 +30,7 @@#include <mach/hardware.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" static const struct snd_pcm_hardware s3c_dma_hardware = { .info = SNDRV_PCM_INFO_INTERLEAVED |
@@ -453,7 +453,7 @@ static int s3c_dma_new(struct snd_card *card,if (ret) goto out; } - out: +out:return ret; }
sound/soc/s3c24xx/dma.h renamed from sound/soc/s3c24xx/s3c-dma.h +1 -1
@@ -1,5 +1,5 @@/* -* s3c-dma.h -- +* 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
sound/soc/s3c24xx/goni_wm8994.c +1 -1
@@ -25,7 +25,7 @@#include <linux/mfd/wm8994/core.h> #include <linux/mfd/wm8994/registers.h> #include "../codecs/wm8994.h" -#include "s3c-dma.h" +#include "dma.h" #include "s3c64xx-i2s.h" #define MACHINE_NAME 0
sound/soc/s3c24xx/jive_wm8750.c +1 -1
@@ -25,7 +25,7 @@#include <asm/mach-types.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c2412-i2s.h" #include "../codecs/wm8750.h"
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -23,7 +23,7 @@#include <sound/soc.h> #include <sound/soc-dapm.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-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 "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" /* define the scenarios */
sound/soc/s3c24xx/rx1950_uda1380.c +1 -1
@@ -35,7 +35,7 @@#include <asm/mach-types.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" #include "../codecs/uda1380.h"
sound/soc/s3c24xx/s3c-ac97.c +1 -1
@@ -24,7 +24,7 @@#include <mach/dma.h> #include <plat/audio.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-ac97.h" #define AC_CMD_ADDR (x) (x << 16)
sound/soc/s3c24xx/s3c-i2s-v2.c +1 -1
@@ -28,7 +28,7 @@#include "regs-i2s-v2.h" #include "s3c-i2s-v2.h" -#include "s3c-dma.h" +#include "dma.h" #undef S3C_IIS_V2_SUPPORTED
sound/soc/s3c24xx/s3c-pcm.c +1 -1
@@ -29,7 +29,7 @@#include <plat/audio.h> #include <plat/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-pcm.h" static struct s3c2410_dma_client s3c_pcm_dma_client_out = {
sound/soc/s3c24xx/s3c2412-i2s.c +1 -1
@@ -35,7 +35,7 @@#include <mach/regs-gpio.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "regs-i2s-v2.h" #include "s3c2412-i2s.h"
sound/soc/s3c24xx/s3c24xx-i2s.c +1 -1
@@ -38,7 +38,7 @@#include <plat/regs-iis.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" static struct s3c2410_dma_client s3c24xx_dma_client_out = {
sound/soc/s3c24xx/s3c24xx_simtec.c +1 -1
@@ -21,7 +21,7 @@#include <plat/audio-simtec.h> -#include "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.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 "s3c-dma.h" +#include "dma.h" #include "s3c24xx-i2s.h" #include "../codecs/uda134x.h"
sound/soc/s3c24xx/s3c64xx-i2s-v4.c +1 -1
@@ -21,7 +21,7 @@#include <mach/map.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "regs-i2s-v2.h" #include "s3c64xx-i2s.h"
sound/soc/s3c24xx/s3c64xx-i2s.c +1 -1
@@ -25,7 +25,7 @@#include <mach/map.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "regs-i2s-v2.h" #include "s3c64xx-i2s.h"
sound/soc/s3c24xx/smartq_wm8987.c +1 -1
@@ -24,7 +24,7 @@#include <asm/mach-types.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c64xx-i2s.h" #include "../codecs/wm8750.h"
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -19,7 +19,7 @@#include <sound/soc.h> #include <sound/soc-dapm.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-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 "s3c-dma.h" +#include "dma.h" #include "s3c64xx-i2s.h" /*
sound/soc/s3c24xx/smdk_spdif.c +1 -1
@@ -18,7 +18,7 @@#include <sound/soc.h> -#include "s3c-dma.h" +#include "dma.h" #include "spdif.h" /* Audio clock settings are belonged to board specific part. Every
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -15,7 +15,7 @@#include <linux/device.h> #include <sound/soc.h> -#include "s3c-dma.h" +#include "dma.h" #include "s3c-ac97.h" static struct snd_soc_card smdk;
sound/soc/s3c24xx/spdif.c +1 -1
@@ -20,7 +20,7 @@#include <plat/audio.h> #include <mach/dma.h> -#include "s3c-dma.h" +#include "dma.h" #include "spdif.h" /* Registers */
Signature · 1 line
1.6.2.5
PATCH v4 5/18 ASoC: Samsung: Rename AC97 platform device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Call the AC97 controller devices found in S3C, S5P and newer SoCs as 'samsung-ac97' rather than 's3c-ac97'.
--- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/mach-s5pc100/dev-audio.c | 2 +- arch/arm/mach-s5pv210/dev-audio.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/s3c-ac97.c | 4 ++-- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-s3c64xx/dev-audio.c +1 -1
@@ -296,7 +296,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata;static u64 s3c64xx_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s3c64xx_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s3c64xx_ac97_resource), .resource = s3c64xx_ac97_resource,
arch/arm/mach-s5pc100/dev-audio.c +1 -1
@@ -281,7 +281,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {static u64 s5pc100_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s5pc100_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s5pc100_ac97_resource), .resource = s5pc100_ac97_resource,
arch/arm/mach-s5pv210/dev-audio.c +1 -1
@@ -311,7 +311,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {static u64 s5pv210_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s5pv210_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s5pv210_ac97_resource), .resource = s5pv210_ac97_resource,
arch/arm/plat-s3c24xx/devs.c +1 -1
@@ -484,7 +484,7 @@ static struct resource s3c_ac97_resource[] = {static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s3c_ac97_resource), .resource = s3c_ac97_resource,
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -32,7 +32,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "samsung-audio",
sound/soc/s3c24xx/s3c-ac97.c +2 -2
@@ -497,7 +497,7 @@ static struct platform_driver s3c_ac97_driver = { .probe = s3c_ac97_probe, .remove = s3c_ac97_remove, .driver = { - .name = "s3c-ac97", + .name = "samsung-ac97", .owner = THIS_MODULE, }, };
@@ -517,4 +517,4 @@ module_exit(s3c_ac97_exit);MODULE_AUTHOR ("Jaswinder Singh, <[email protected]>" );MODULE_DESCRIPTION ("AC97 driver for the Samsung SoC" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c-ac97" ); +MODULE_ALIAS ("platform:samsung-ac97" );
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -28,7 +28,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "samsung-audio",
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -46,7 +46,7 @@ static struct snd_soc_dai_link smdk_dai = { .name = "AC97", .stream_name = "AC97 PCM", .platform_name = "samsung-audio", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "wm9713-hifi", .codec_name = "wm9713-codec", };
Signature · 1 line
1.6.2.5
Re: [PATCHv4 05/18] ASoC: Samsung: Rename AC97 platform device
Quoted 7 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Call the AC97 controller devices found in S3C, S5P and newer SoCs as 'samsung-ac97' rather than 's3c-ac97'.
Signed-off-by Jassi Brar <[email protected]>
Added Ben Dooks in Cc.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 11 lines
--- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/mach-s5pc100/dev-audio.c | 2 +- arch/arm/mach-s5pv210/dev-audio.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/s3c-ac97.c | 4 ++-- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/mach-s3c64xx/dev-
Review
Quoted 14 lines
audio.c
index 4a4b8a5..cad6702 100644arch/arm/mach-s3c64xx/dev-audio.c +1
-1@@ -296,7 +296,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata;static u64 s3c64xx_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s3c64xx_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s3c64xx_ac97_resource), .resource = s3c64xx_ac97_resource,(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/dev-
Review
Quoted 14 lines
audio.c
index 10ab275..ab2d271 100644arch/arm/mach-s5pc100/dev-audio.c +1
-1@@ -281,7 +281,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {static u64 s5pc100_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s5pc100_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s5pc100_ac97_resource), .resource = s5pc100_ac97_resource,(quoted diff) +0
-0
b/arch/arm/mach-s5pv210/dev-
Quoted 89 lines
audio.c
index ddd2704..8d58f19 100644arch/arm/mach-s5pv210/dev-audio.c +1
-1@@ -311,7 +311,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {static u64 s5pv210_ac97_dmamask =DMA_BIT_MASK (32 );struct platform_device s5pv210_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s5pv210_ac97_resource), .resource = s5pv210_ac97_resource,arch/arm/plat-s3c24xx/devs.c +1
-1@@ -484,7 +484,7 @@ static struct resource s3c_ac97_resource[] = {static u64 s3c_device_audio_dmamask =0xffffffffUL ;struct platform_device s3c_device_ac97 = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .id =-1 , .num_resources =ARRAY_SIZE (s3c_ac97_resource), .resource = s3c_ac97_resource,sound/soc/s3c24xx/ln2440sbc_alc650.c +1
-1@@ -32,7 +32,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "samsung-audio",sound/soc/s3c24xx/s3c-ac97.c +2
-2@@ -497,7 +497,7 @@ static struct platform_driver s3c_ac97_driver = { .probe = s3c_ac97_probe, .remove = s3c_ac97_remove, .driver = { - .name = "s3c-ac97", + .name = "samsung-ac97", .owner = THIS_MODULE, }, };@@ -517,4 +517,4 @@ module_exit(s3c_ac97_exit);MODULE_AUTHOR ("Jaswinder Singh, <[email protected]>" );MODULE_DESCRIPTION ("AC97 driver for the Samsung SoC" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c-ac97" ); +MODULE_ALIAS ("platform:samsung-ac97" );sound/soc/s3c24xx/smdk2443_wm9710.c +1
-1@@ -28,7 +28,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "samsung-audio",sound/soc/s3c24xx/smdk_wm9713.c +1
-2@@ -46,7 +46,7 @@ static struct snd_soc_dai_link smdk_dai = { .name = "AC97", .stream_name = "AC97 PCM", .platform_name = "samsung-audio", - .cpu_dai_name = "s3c-ac97", + .cpu_dai_name = "samsung-ac97", .codec_dai_name = "wm9713-hifi", .codec_name = "wm9713-codec", }; --1.6.2.5
PATCH v4 6/18 ASoC: Samsung: Rename AC97 driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Rename Samsung AC97 driver
s3c-ac97.[c/h] -> ac97.[c/h]
---
sound/soc/s3c24xx/Makefile | 4 ++--
sound/soc/s3c24xx/{s3c-ac97.c => ac97.c} | 16 ++++++++--------
sound/soc/s3c24xx/{s3c-ac97.h => ac97.h} | 8 ++++----
sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +-
sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +-
sound/soc/s3c24xx/smdk_wm9713.c | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
rename sound/soc/s3c24xx/{s3c-ac97.c => ac97.c} (97%)
rename sound/soc/s3c24xx/{s3c-ac97.h => ac97.h} (73%)sound/soc/s3c24xx/Makefile +2 -2
@@ -3,7 +3,7 @@ snd-soc-s3c24xx-objs := 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 -snd-soc-s3c-ac97-objs := s3c-ac97.o +snd-soc-ac97-objs := ac97.o snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o snd-soc-s3c-pcm-objs := s3c-pcm.o
@@ -11,7 +11,7 @@ snd-soc-samsung-spdif-objs := spdif.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o -obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-s3c-ac97.o +obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-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_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o
sound/soc/s3c24xx/ac97.c renamed from sound/soc/s3c24xx/s3c-ac97.c +8 -8
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-ac97.c +/* sound/soc/s3c24xx/ac97.c * * ALSA SoC Audio Layer - S3C AC97 Controller driver * Evolved from s3c2443-ac97.c
@@ -25,7 +25,7 @@#include <plat/audio.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" #define AC_CMD_ADDR (x) (x << 16)#define AC_CMD_DATA (x) (x & 0xffff)
@@ -122,7 +122,7 @@ static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, data = (stat &0xffff );if (addr != reg) -pr_err ("s3c-ac97: req addr = %02x, rep addr = %02x\n" , +pr_err ("ac97: req addr = %02x, rep addr = %02x\n" , reg, addr);mutex_unlock (&s3c_ac97.lock);
@@ -334,7 +334,7 @@ static struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = {static struct snd_soc_dai_driver s3c_ac97_dai[] = { [S3C_AC97_DAI_PCM ] = { - .name ="s3c-ac97" , + .name ="samsung-ac97" , .ac97_control =1 , .playback = { .stream_name ="AC97 Playback" ,
@@ -351,7 +351,7 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = { .ops = &s3c_ac97_dai_ops, }, [S3C_AC97_DAI_MIC] = { - .name = "s3c-ac97-mic", + .name = "samsung-ac97-mic", .ac97_control = 1, .capture = { .stream_name = "AC97 Mic Capture",
@@ -407,7 +407,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) }if (!request_mem_region (mem_res->start, -resource_size (mem_res),"s3c-ac97" )) { +resource_size (mem_res),"ac97" )) {dev_err (&pdev->dev,"Unable to request register region\n" );return -EBUSY ; }
@@ -431,7 +431,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) s3c_ac97.ac97_clk =clk_get (&pdev->dev,"ac97" );if (IS_ERR (s3c_ac97.ac97_clk)) { -dev_err (&pdev->dev,"s3c-ac97 failed to get ac97_clock\n" ); +dev_err (&pdev->dev,"ac97 failed to get ac97_clock\n" ); ret = -ENODEV ; goto err2; }
@@ -446,7 +446,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) ret =request_irq (irq_res->start, s3c_ac97_irq,IRQF_DISABLED ,"AC97" ,NULL );if (ret <0 ) { -dev_err (&pdev->dev,"s3c-ac97: interrupt request failed.\n" ); +dev_err (&pdev->dev,"ac97: interrupt request failed.\n" ); goto err4; }
sound/soc/s3c24xx/ac97.h renamed from sound/soc/s3c24xx/s3c-ac97.h +4 -4
@@ -1,11 +1,11 @@ -/* sound/soc/s3c24xx/s3c-ac97.h +/* sound/soc/s3c24xx/ac97.h * * ALSA SoC Audio Layer - S3C AC97 Controller driver -* Evolved from s3c2443-ac97.h +* Evolved from s3c2443-ac97.h * * Copyright (c) 2010 Samsung Electronics Co. Ltd -* Author: Jaswinder Singh <[email protected]> -* Credits: Graeme Gregory, Sean Choi +* Author: Jaswinder Singh <[email protected]> +* Credits: Graeme Gregory, Sean Choi * * 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
sound/soc/s3c24xx/ln2440sbc_alc650.c +1 -1
@@ -24,7 +24,7 @@#include <sound/soc-dapm.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" static struct snd_soc_card ln2440sbc;
sound/soc/s3c24xx/smdk2443_wm9710.c +1 -1
@@ -20,7 +20,7 @@#include <sound/soc-dapm.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" static struct snd_soc_card smdk2443;
sound/soc/s3c24xx/smdk_wm9713.c +1 -1
@@ -16,7 +16,7 @@#include <sound/soc.h> #include "dma.h" -#include "s3c-ac97.h" +#include "ac97.h" static struct snd_soc_card smdk;
Signature · 1 line
1.6.2.5
PATCH v4 7/18 ASoC: Samsung: Rename PCM driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Rename Samsung PCM Controller driver
s3c-pcm.[c/h] -> pcm.[c/h]
---
sound/soc/s3c24xx/Makefile | 4 ++--
sound/soc/s3c24xx/{s3c-pcm.c => pcm.c} | 4 ++--
sound/soc/s3c24xx/{s3c-pcm.h => pcm.h} | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
rename sound/soc/s3c24xx/{s3c-pcm.c => pcm.c} (99%)
rename sound/soc/s3c24xx/{s3c-pcm.h => pcm.h} (99%)sound/soc/s3c24xx/Makefile +2 -2
@@ -6,8 +6,8 @@ snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o snd-soc-ac97-objs := ac97.o snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o -snd-soc-s3c-pcm-objs := s3c-pcm.o snd-soc-samsung-spdif-objs := spdif.o +snd-soc-pcm-objs := pcm.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o
@@ -16,8 +16,8 @@ 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_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o -obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-s3c-pcm.o obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o +obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o
sound/soc/s3c24xx/pcm.c renamed from sound/soc/s3c24xx/s3c-pcm.c +2 -2
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-pcm.c +/* sound/soc/s3c24xx/pcm.c * * ALSA SoC Audio Layer - S3C PCM-Controller driver *
@@ -30,7 +30,7 @@#include <plat/dma.h> #include "dma.h" -#include "s3c-pcm.h" +#include "pcm.h" static struct s3c2410_dma_client s3c_pcm_dma_client_out = { .name ="PCM Stereo out"
sound/soc/s3c24xx/pcm.h renamed from sound/soc/s3c24xx/s3c-pcm.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-pcm.h +/* sound/soc/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 version 2 as
Signature · 1 line
1.6.2.5
PATCH v4 8/18 ASoC: Samsung: Generalize DMA driver namespace
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Remove S3C,s3c from static defines.
s3c_dma_ -> dma_ s3c24xx_runtime_ -> runtime_ s3c24xx_audio_ -> audio_ s3c_preallocate_ -> preallocate_ s3c24xx_soc_platform -> samsung_asoc_platform s3c24xx_pcm_driver -> asoc_dma_driver snd_s3c24xx_pcm_ -> samsung_asoc_
--- sound/soc/s3c24xx/dma.c | 124 +++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 62 deletions(-)
sound/soc/s3c24xx/dma.c +62 -62
@@ -32,7 +32,7 @@#include "dma.h" -static const struct snd_pcm_hardware s3c_dma_hardware = { +static const struct snd_pcm_hardware dma_hardware = { .info =SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP |
@@ -53,7 +53,7 @@ static const struct snd_pcm_hardware s3c_dma_hardware = { .fifo_size = 32, }; -struct s3c24xx_runtime_data { +struct runtime_data {spinlock_t lock;int state;unsigned int dma_loaded;
@@ -65,14 +65,14 @@ struct s3c24xx_runtime_data {struct s3c_dma_params *params; }; -/* s3c_dma_enqueue +/* dma_enqueue * * place a dma buffer onto the queue for the dma system * to handle. */ -static void s3c_dma_enqueue (struct snd_pcm_substream *substream) +static void dma_enqueue (struct snd_pcm_substream *substream) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;dma_addr_t pos = prtd->dma_pos;unsigned int limit;int ret;
@@ -112,12 +112,12 @@ static void s3c_dma_enqueue(struct snd_pcm_substream *substream) prtd->dma_pos = pos; } -static void s3c24xx_audio_buffdone (struct s3c2410_dma_chan *channel, +static void audio_buffdone (struct s3c2410_dma_chan *channel,void *dev_id,int size,enum s3c2410_dma_buffresult result) {struct snd_pcm_substream *substream = dev_id; -struct s3c24xx_runtime_data *prtd; +struct runtime_data *prtd;pr_debug ("Entered %s\n" , __func__);
@@ -132,17 +132,17 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel,spin_lock (&prtd->lock);if (prtd->state &ST_RUNNING && !s3c_dma_has_circular ()) { prtd->dma_loaded--; -s3c_dma_enqueue (substream); +dma_enqueue (substream); }spin_unlock (&prtd->lock); } -static int s3c_dma_hw_params (struct snd_pcm_substream *substream, +static int dma_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd = runtime->private_data; +struct runtime_data *prtd = runtime->private_data;struct snd_soc_pcm_runtime *rtd = substream->private_data;unsigned long totbytes =params_buffer_bytes (params); struct s3c_dma_params *dma =
@@ -181,7 +181,7 @@ static int s3c_dma_hw_params(struct snd_pcm_substream *substream, }s3c2410_dma_set_buffdone_fn (prtd->params->channel, - s3c24xx_audio_buffdone); + audio_buffdone);snd_pcm_set_runtime_buffer (substream, &substream->dma_buffer);
@@ -199,9 +199,9 @@ static int s3c_dma_hw_params(struct snd_pcm_substream *substream,return 0 ; } -static int s3c_dma_hw_free (struct snd_pcm_substream *substream) +static int dma_hw_free (struct snd_pcm_substream *substream) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;pr_debug ("Entered %s\n" , __func__);
@@ -216,9 +216,9 @@ static int s3c_dma_hw_free(struct snd_pcm_substream *substream)return 0 ; } -static int s3c_dma_prepare (struct snd_pcm_substream *substream) +static int dma_prepare (struct snd_pcm_substream *substream) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;int ret =0 ;pr_debug ("Entered %s\n" , __func__);
@@ -249,14 +249,14 @@ static int s3c_dma_prepare(struct snd_pcm_substream *substream) prtd->dma_pos = prtd->dma_start;/* enqueue dma buffers */ -s3c_dma_enqueue (substream); +dma_enqueue (substream);return ret; } -static int s3c_dma_trigger (struct snd_pcm_substream *substream,int cmd) +static int dma_trigger (struct snd_pcm_substream *substream,int cmd) { -struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; +struct runtime_data *prtd = substream->runtime->private_data;int ret =0 ;pr_debug ("Entered %s\n" , __func__);
@@ -289,10 +289,10 @@ static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) }static snd_pcm_uframes_t -s3c_dma_pointer (struct snd_pcm_substream *substream) +dma_pointer (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd = runtime->private_data; +struct runtime_data *prtd = runtime->private_data;unsigned long res;dma_addr_t src, dst;
@@ -324,17 +324,17 @@ s3c_dma_pointer(struct snd_pcm_substream *substream)return bytes_to_frames (substream->runtime, res); } -static int s3c_dma_open (struct snd_pcm_substream *substream) +static int dma_open (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd; +struct runtime_data *prtd;pr_debug ("Entered %s\n" , __func__);snd_pcm_hw_constraint_integer (runtime,SNDRV_PCM_HW_PARAM_PERIODS ); -snd_soc_set_runtime_hwparams (substream, &s3c_dma_hardware); +snd_soc_set_runtime_hwparams (substream, &dma_hardware); - prtd =kzalloc (sizeof (struct s3c24xx_runtime_data ),GFP_KERNEL ); + prtd =kzalloc (sizeof (struct runtime_data ),GFP_KERNEL );if (prtd ==NULL )return -ENOMEM ;
@@ -344,22 +344,22 @@ static int s3c_dma_open(struct snd_pcm_substream *substream)return 0 ; } -static int s3c_dma_close (struct snd_pcm_substream *substream) +static int dma_close (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; -struct s3c24xx_runtime_data *prtd = runtime->private_data; +struct runtime_data *prtd = runtime->private_data;pr_debug ("Entered %s\n" , __func__);if (!prtd) -pr_debug ("s3c_dma_close called with prtd == NULL\n" ); +pr_debug ("dma_close called with prtd == NULL\n" );kfree (prtd);return 0 ; } -static int s3c_dma_mmap (struct snd_pcm_substream *substream, +static int dma_mmap (struct snd_pcm_substream *substream,struct vm_area_struct *vma) {struct snd_pcm_runtime *runtime = substream->runtime;
@@ -372,23 +372,23 @@ static int s3c_dma_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); } -static struct snd_pcm_ops s3c_dma_ops = { - .open = s3c_dma_open, - .close = s3c_dma_close, +static struct snd_pcm_ops dma_ops = { + .open = dma_open, + .close = dma_close, .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c_dma_hw_params, - .hw_free = s3c_dma_hw_free, - .prepare = s3c_dma_prepare, - .trigger = s3c_dma_trigger, - .pointer = s3c_dma_pointer, - .mmap = s3c_dma_mmap, + .hw_params = dma_hw_params, + .hw_free = dma_hw_free, + .prepare = dma_prepare, + .trigger = dma_trigger, + .pointer = dma_pointer, + .mmap = dma_mmap, }; -static int s3c_preallocate_dma_buffer (struct snd_pcm *pcm,int stream) +static int preallocate_dma_buffer (struct snd_pcm *pcm,int stream) {struct snd_pcm_substream *substream = pcm->streams[stream].substream;struct snd_dma_buffer *buf = &substream->dma_buffer; -size_t size = s3c_dma_hardware.buffer_bytes_max; +size_t size = dma_hardware.buffer_bytes_max;pr_debug ("Entered %s\n" , __func__);
@@ -403,7 +403,7 @@ static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)return 0 ; } -static void s3c_dma_free_dma_buffers (struct snd_pcm *pcm) +static void dma_free_dma_buffers (struct snd_pcm *pcm) {struct snd_pcm_substream *substream;struct snd_dma_buffer *buf;
@@ -426,9 +426,9 @@ static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) } } -static u64 s3c_dma_mask =DMA_BIT_MASK (32 ); +static u64 dma_mask =DMA_BIT_MASK (32 ); -static int s3c_dma_new (struct snd_card *card, +static int dma_new (struct snd_card *card,struct snd_soc_dai *dai,struct snd_pcm *pcm) {int ret =0 ;
@@ -436,19 +436,19 @@ static int s3c_dma_new(struct snd_card *card,pr_debug ("Entered %s\n" , __func__);if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c_dma_mask; + card->dev->dma_mask = &dma_mask;if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask =0xffffffff ;if (dai->driver->playback.channels_min) { - ret =s3c_preallocate_dma_buffer (pcm, + ret =preallocate_dma_buffer (pcm,SNDRV_PCM_STREAM_PLAYBACK );if (ret) goto out; }if (dai->driver->capture.channels_min) { - ret =s3c_preallocate_dma_buffer (pcm, + ret =preallocate_dma_buffer (pcm,SNDRV_PCM_STREAM_CAPTURE );if (ret) goto out;
@@ -457,46 +457,46 @@ out:return ret; } -static struct snd_soc_platform_driver s3c24xx_soc_platform = { - .ops = &s3c_dma_ops, - .pcm_new = s3c_dma_new, - .pcm_free = s3c_dma_free_dma_buffers, +static struct snd_soc_platform_driver samsung_asoc_platform = { + .ops = &dma_ops, + .pcm_new = dma_new, + .pcm_free = dma_free_dma_buffers, }; -static int __devinit s3c24xx_soc_platform_probe (struct platform_device *pdev) +static int __devinit samsung_asoc_platform_probe (struct platform_device *pdev) { -return snd_soc_register_platform (&pdev->dev, &s3c24xx_soc_platform); +return snd_soc_register_platform (&pdev->dev, &samsung_asoc_platform); } -static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev) +static int __devexit samsung_asoc_platform_remove(struct platform_device *pdev) {snd_soc_unregister_platform (&pdev->dev);return 0 ; } -static struct platform_driver s3c24xx_pcm_driver = { +static struct platform_driver asoc_dma_driver = { .driver = { .name ="samsung-audio" , .owner =THIS_MODULE , }, - .probe = s3c24xx_soc_platform_probe, - .remove =__devexit_p (s3c24xx_soc_platform_remove), + .probe = samsung_asoc_platform_probe, + .remove =__devexit_p (samsung_asoc_platform_remove), }; -static int __init snd_s3c24xx_pcm_init (void ) +static int __init samsung_asoc_init (void ) { -return platform_driver_register (&s3c24xx_pcm_driver); +return platform_driver_register (&asoc_dma_driver); } -module_init (snd_s3c24xx_pcm_init); +module_init (samsung_asoc_init); -static void __exit snd_s3c24xx_pcm_exit(void) +static void __exit samsung_asoc_exit(void) { -platform_driver_unregister (&s3c24xx_pcm_driver); +platform_driver_unregister (&asoc_dma_driver); } -module_exit (snd_s3c24xx_pcm_exit); +module_exit (samsung_asoc_exit);MODULE_AUTHOR ("Ben Dooks, <[email protected]>" ); -MODULE_DESCRIPTION ("Samsung S3C Audio DMA module" ); +MODULE_DESCRIPTION ("Samsung ASoC DMA Driver" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:samsung-audio" );
Signature · 1 line
1.6.2.5
PATCH v4 9/18 ASoC: Samsung: Rename s3c64xx I2S device
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Since the I2S of S3C64XX and newer SoCs are incremental versions of each other with changes managable in a single driver, rename the 's3c64xx-iis' -> 'samsung-i2s'
--- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 4 ++-- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 ++-- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/s3c24xx/s3c64xx-i2s-v4.c +2 -2
@@ -206,7 +206,7 @@ static struct platform_driver s3c64xx_i2sv4_driver = { .probe = s3c64xx_i2sv4_dev_probe, .remove = s3c64xx_i2sv4_dev_remove, .driver = { - .name = "s3c64xx-iis-v4", + .name = "samsung-i2s-v4", .owner = THIS_MODULE, }, };
@@ -227,4 +227,4 @@ module_exit(s3c64xx_i2sv4_exit);MODULE_AUTHOR ("Jaswinder Singh, <[email protected]>" );MODULE_DESCRIPTION ("S3C64XX I2Sv4 SoC Interface" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c64xx-iis-v4" ); +MODULE_ALIAS ("platform:samsung-i2s-v4" );
sound/soc/s3c24xx/s3c64xx-i2s.c +2 -2
@@ -218,7 +218,7 @@ static struct platform_driver s3c64xx_iis_driver = { .probe = s3c64xx_iis_dev_probe, .remove = s3c64xx_iis_dev_remove, .driver = { - .name = "s3c64xx-iis", + .name = "samsung-i2s", .owner = THIS_MODULE, }, };
@@ -239,4 +239,4 @@ module_exit(s3c64xx_i2s_exit);MODULE_AUTHOR ("Ben Dooks, <[email protected]>" );MODULE_DESCRIPTION ("S3C64XX I2S SoC Interface" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("platform:s3c64xx-iis" ); +MODULE_ALIAS ("platform:samsung-i2s" );
sound/soc/s3c24xx/smdk64xx_wm8580.c +2 -2
@@ -224,7 +224,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Playback i/f */ .name = "WM8580 PAIF RX", .stream_name = "Playback", - .cpu_dai_name = "s3c64xx-iis-v4", + .cpu_dai_name = "samsung-i2s-v4", .codec_dai_name = "wm8580-hifi-playback", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
@@ -234,7 +234,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Capture i/f */ .name = "WM8580 PAIF TX", .stream_name = "Capture", - .cpu_dai_name = "s3c64xx-iis-v4", + .cpu_dai_name = "samsung-i2s-v4", .codec_dai_name = "wm8580-hifi-capture", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
Signature · 1 line
1.6.2.5
PATCH v4 10/18 ASoC: Samsung: Add common I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
The I2S controllers since S3C64XX are incremental revisions, with a new feature added to the last one. The programming i/f doesn't conflict between these revisions, so it is possible to have one common driver that could manage various versions of I2S (v3, 4 & 5)
--- sound/soc/s3c24xx/Kconfig | 3 + sound/soc/s3c24xx/Makefile | 2 + sound/soc/s3c24xx/i2s.c | 1256 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/s3c24xx/i2s.h | 29 + 4 files changed, 1290 insertions(+), 0 deletions(-) create mode 100644 sound/soc/s3c24xx/i2s.c create mode 100644 sound/soc/s3c24xx/i2s.h
sound/soc/s3c24xx/Kconfig +3 -0
@@ -41,6 +41,9 @@ config SND_S5P_SOC_SPDIF tristate select SND_SOC_SPDIF +config SND_SAMSUNG_I2S + tristate + config SND_S3C24XX_SOC_NEO1973_WM8753 tristate "SoC I2S Audio support for NEO1973 - WM8753" depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
sound/soc/s3c24xx/Makefile +2 -0
@@ -8,6 +8,7 @@ snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o snd-soc-samsung-spdif-objs := spdif.o snd-soc-pcm-objs := pcm.o +snd-soc-i2s-objs := i2s.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o
@@ -18,6 +19,7 @@ obj-$(CONFIG_SND_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o +obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o
sound/soc/s3c24xx/i2s.c new file +1256 -0
1,256 lines not on this page · raw message
sound/soc/s3c24xx/i2s.h new file +29 -0
@@ -0,0 +1,29 @@ +/* sound/soc/s3c24xx/i2s.h +* +* ALSA SoC Audio Layer - Samsung I2S Controller driver +* +* Copyright (c) 2010 Samsung Electronics Co. Ltd. +* 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. +*/ + +#ifndef __SND_SOC_SAMSUNG_I2S_H +#define __SND_SOC_SAMSUNG_I2S_H + +/* +* Maximum number of I2S blocks that any SoC can have. +* The secondary interface of a CPU dai(if there exists any), +* is indexed at [cpu-dai's ID + SAMSUNG_I2S_SECOFF] +*/ +#define SAMSUNG_I2S_SECOFF 4 + +#define SAMSUNG_I2S_DIV_BCLK 1 + +#define SAMSUNG_I2S_RCLKSRC_0 0 +#define SAMSUNG_I2S_RCLKSRC_1 1 +#define SAMSUNG_I2S_CDCLK 2 + +#endif /* __SND_SOC_SAMSUNG_I2S_H */
Signature · 1 line
1.6.2.5
PATCH v4 11/18 ASoC: SMARTQ: Move to use new I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Modify the smartq_wm8987.c to use new i2s controller driver.
--- sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/smartq_wm8987.c | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-)
sound/soc/s3c24xx/Kconfig +1 -1
@@ -145,7 +145,7 @@ config SND_SOC_SMDK_WM9713 config SND_S3C64XX_SOC_SMARTQ tristate "SoC I2S Audio support for SmartQ board" depends on SND_S3C24XX_SOC && MACH_SMARTQ - select SND_S3C64XX_SOC_I2S + select SND_SAMSUNG_I2S select SND_SOC_WM8750 config SND_SOC_GONI_AQUILA_WM8994
sound/soc/s3c24xx/smartq_wm8987.c +11 -14
@@ -25,7 +25,7 @@#include <asm/mach-types.h> #include "dma.h" -#include "s3c64xx-i2s.h" +#include "i2s.h" #include "../codecs/wm8750.h"
@@ -41,13 +41,9 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; -struct s3c_i2sv2_rate_calc div;unsigned int clk =0 ;int ret; -s3c_i2sv2_iis_calc_rate (&div,NULL ,params_rate (params), -s3c_i2sv2_get_clock (cpu_dai)); -switch (params_rate (params)) {case 8000 :case 16000 :
@@ -78,20 +74,21 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; -/* set the codec system clock for DAC and ADC */ - ret =snd_soc_dai_set_sysclk (codec_dai,WM8750_SYSCLK , clk, -SND_SOC_CLOCK_IN ); +/* Use PCLK for I2S signal generation */ + ret =snd_soc_dai_set_sysclk (cpu_dai,SAMSUNG_I2S_RCLKSRC_0 , +0 ,SND_SOC_CLOCK_IN );if (ret <0 )return ret; -/* set MCLK division for sample rate */ - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_RCLK , div.fs_div); +/* Gate the RCLK output on PAD */ + ret =snd_soc_dai_set_sysclk (cpu_dai,SAMSUNG_I2S_CDCLK , +0 ,SND_SOC_CLOCK_IN );if (ret <0 )return ret; -/* set prescaler division for sample rate */ - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_PRESCALER , - div.clk_div -1 ); +/* set the codec system clock for DAC and ADC */ + ret =snd_soc_dai_set_sysclk (codec_dai,WM8750_SYSCLK , clk, +SND_SOC_CLOCK_IN );if (ret <0 )return ret;
@@ -212,7 +209,7 @@ static struct snd_soc_dai_link smartq_dai[] = { { .name = "wm8987", .stream_name = "SmartQ Hi-Fi", - .cpu_dai_name = "s3c64xx-i2s.0", + .cpu_dai_name = "samsung-i2s.0", .codec_dai_name = "wm8750-hifi", .platform_name = "samsung-audio", .codec_name = "wm8750-codec.0-0x1a",
Signature · 1 line
1.6.2.5
PATCH v4 12/18 ASoC: GONI: Move to use new I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Modify the goni_wm8994.c to use new i2s controller driver.
--- sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/goni_wm8994.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-)
sound/soc/s3c24xx/Kconfig +1 -1
@@ -151,7 +151,7 @@ config SND_S3C64XX_SOC_SMARTQ config SND_SOC_GONI_AQUILA_WM8994 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) - select SND_S3C64XX_SOC_I2S_V4 + select SND_SAMSUNG_I2S select SND_SOC_WM8994 help Say Y if you want to add support for SoC audio on goni or aquila
sound/soc/s3c24xx/goni_wm8994.c +2 -8
@@ -26,7 +26,7 @@#include <linux/mfd/wm8994/registers.h> #include "../codecs/wm8994.h" #include "dma.h" -#include "s3c64xx-i2s.h" +#include "i2s.h" #define MACHINE_NAME 0#define CPU_VOICE_DAI 1
@@ -164,12 +164,6 @@ static int goni_hifi_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; -/* set the cpu system clock */ - ret =snd_soc_dai_set_sysclk (cpu_dai,S3C64XX_CLKSRC_PCLK , -0 ,SND_SOC_CLOCK_IN ); -if (ret <0 ) -return ret; -/* set codec DAI configuration */ ret =snd_soc_dai_set_fmt (codec_dai,SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBM_CFM );
@@ -250,7 +244,7 @@ static struct snd_soc_dai_link goni_dai[] = { { .name = "WM8994", .stream_name = "WM8994 HiFi", - .cpu_dai_name = "s3c64xx-i2s-v4", + .cpu_dai_name = "samsung-i2s.0", .codec_dai_name = "wm8994-hifi", .platform_name = "samsung-audio", .codec_name = "wm8994-codec.0-0x1a",
Signature · 1 line
1.6.2.5
PATCH v4 13/18 ASoC: SMDK64XX: Move to use new I2S driver
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Modify the smdk64xx_wm8580.c to use new i2s controller driver.
--- sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 25 +++---------------------- 2 files changed, 4 insertions(+), 23 deletions(-)
sound/soc/s3c24xx/Kconfig +1 -1
@@ -74,7 +74,7 @@ config SND_S3C64XX_SOC_WM8580 tristate "SoC I2S Audio support for WM8580 on SMDK64XX" depends on SND_S3C24XX_SOC && MACH_SMDK6410 select SND_SOC_WM8580 - select SND_S3C64XX_SOC_I2S_V4 + select SND_SAMSUNG_I2S help Say Y if you want to add support for SoC audio on the SMDK6410.
sound/soc/s3c24xx/smdk64xx_wm8580.c +3 -22
@@ -20,7 +20,7 @@#include "../codecs/wm8580.h" #include "dma.h" -#include "s3c64xx-i2s.h" +#include "i2s.h" /* * Default CFG switch settings to use this driver:
@@ -96,17 +96,6 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; - ret =snd_soc_dai_set_sysclk (cpu_dai,S3C64XX_CLKSRC_CDCLK , -0 ,SND_SOC_CLOCK_IN ); -if (ret <0 ) -return ret; - -/* We use PCLK for basic ops in SoC-Slave mode */ - ret =snd_soc_dai_set_sysclk (cpu_dai,S3C64XX_CLKSRC_PCLK , -0 ,SND_SOC_CLOCK_IN ); -if (ret <0 ) -return ret; -/* Set WM8580 to drive MCLK from its PLLA */ ret =snd_soc_dai_set_clkdiv (codec_dai,WM8580_MCLK ,WM8580_CLKSRC_PLLA );
@@ -123,14 +112,6 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_BCLK , bfs); -if (ret <0 ) -return ret; - - ret =snd_soc_dai_set_clkdiv (cpu_dai,S3C_I2SV2_DIV_RCLK , rfs); -if (ret <0 ) -return ret; -return 0 ; }
@@ -224,7 +205,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Playback i/f */ .name = "WM8580 PAIF RX", .stream_name = "Playback", - .cpu_dai_name = "samsung-i2s-v4", + .cpu_dai_name = "samsung-i2s.2", .codec_dai_name = "wm8580-hifi-playback", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
@@ -234,7 +215,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { {/* Primary Capture i/f */ .name = "WM8580 PAIF TX", .stream_name = "Capture", - .cpu_dai_name = "samsung-i2s-v4", + .cpu_dai_name = "samsung-i2s.2", .codec_dai_name = "wm8580-hifi-capture", .platform_name = "samsung-audio", .codec_name = "wm8580-codec.0-001b",
Signature · 1 line
1.6.2.5
PATCH v4 14/18 ASoC: S3C64XX: Remove obsoleted I2S drivers
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Now that we have better I2S CPU drivers and no need for the old ones, discard them.
--- sound/soc/s3c24xx/Kconfig | 10 -- sound/soc/s3c24xx/Makefile | 4 - sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 ---------------------------------- sound/soc/s3c24xx/s3c64xx-i2s.c | 242 ------------------------------------ sound/soc/s3c24xx/s3c64xx-i2s.h | 41 ------ 5 files changed, 0 insertions(+), 527 deletions(-) delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h
sound/soc/s3c24xx/Kconfig +0 -10
@@ -20,16 +20,6 @@ config SND_S3C2412_SOC_I2S select SND_S3C_I2SV2_SOC select S3C2410_DMA -config SND_S3C64XX_SOC_I2S - tristate - select SND_S3C_I2SV2_SOC - select S3C64XX_DMA - -config SND_S3C64XX_SOC_I2S_V4 - tristate - select SND_S3C_I2SV2_SOC - select S3C64XX_DMA - config SND_S3C_SOC_PCM tristate
sound/soc/s3c24xx/Makefile +0 -4
@@ -2,9 +2,7 @@ snd-soc-s3c24xx-objs := 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 snd-soc-ac97-objs := ac97.o -snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o snd-soc-samsung-spdif-objs := spdif.o snd-soc-pcm-objs := pcm.o
@@ -14,8 +12,6 @@ obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-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_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o
sound/soc/s3c24xx/s3c64xx-i2s-v4.c deleted +0 -230
230 lines not on this page · raw message
sound/soc/s3c24xx/s3c64xx-i2s.c deleted +0 -242
242 lines not on this page · raw message
sound/soc/s3c24xx/s3c64xx-i2s.h deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH v4 15/18 ASoC: SMDK64XX: Rename for other platforms
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
We plan to use the same ASoC Machine driver for most of latest SMDK platforms. So rename the 64XX specific driver to generic named.
---
sound/soc/s3c24xx/Kconfig | 6 +-
sound/soc/s3c24xx/Makefile | 4 +-
.../s3c24xx/{smdk64xx_wm8580.c => smdk_wm8580.c} | 64 ++++++++++----------
3 files changed, 37 insertions(+), 37 deletions(-)
rename sound/soc/s3c24xx/{smdk64xx_wm8580.c => smdk_wm8580.c} (78%)sound/soc/s3c24xx/Kconfig +3 -3
@@ -60,13 +60,13 @@ config SND_S3C24XX_SOC_JIVE_WM8750 help Sat Y if you want to add support for SoC audio on the Jive. -config SND_S3C64XX_SOC_WM8580 - tristate "SoC I2S Audio support for WM8580 on SMDK64XX" +config SND_SOC_SMDK_WM8580 + tristate "SoC I2S Audio support for WM8580 on SMDK" depends on SND_S3C24XX_SOC && MACH_SMDK6410 select SND_SOC_WM8580 select SND_SAMSUNG_I2S help - Say Y if you want to add support for SoC audio on the SMDK6410. + Say Y if you want to add support for SoC audio on the SMDKs. config SND_S3C24XX_SOC_SMDK2443_WM9710 tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
sound/soc/s3c24xx/Makefile +2 -2
@@ -28,7 +28,7 @@ snd-soc-s3c24xx-simtec-objs := s3c24xx_simtec.o snd-soc-s3c24xx-simtec-hermes-objs := s3c24xx_simtec_hermes.o snd-soc-s3c24xx-simtec-tlv320aic23-objs := s3c24xx_simtec_tlv320aic23.o snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o -snd-soc-smdk64xx-wm8580-objs := smdk64xx_wm8580.o +snd-soc-smdk-wm8580-objs := smdk_wm8580.o snd-soc-smdk-wm9713-objs := smdk_wm9713.o snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o snd-soc-goni-wm8994-objs := goni_wm8994.o
@@ -44,7 +44,7 @@ obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC) += snd-soc-s3c24xx-simtec.o obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o obj-$(CONFIG_SND_S3C24XX_SOC_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o -obj-$(CONFIG_SND_S3C64XX_SOC_WM8580) += snd-soc-smdk64xx-wm8580.o +obj-$(CONFIG_SND_SOC_SMDK_WM8580) += snd-soc-smdk-wm8580.o obj-$(CONFIG_SND_SOC_SMDK_WM9713) += snd-soc-smdk-wm9713.o obj-$(CONFIG_SND_S3C64XX_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o obj-$(CONFIG_SND_SOC_SMDK_SPDIF) += snd-soc-smdk-spdif.o
sound/soc/s3c24xx/smdk_wm8580.c renamed from sound/soc/s3c24xx/smdk64xx_wm8580.c +32 -32
150 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH v4 16/18 ASoC: SMDK_WM8580: Enable for SMDKC100
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Enable the ASoC Machine driver to run on SMDKC100 as well.
--- arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/smdk_wm8580.c | 73 +++++++++++++++++++++++--------- 3 files changed, 55 insertions(+), 22 deletions(-)
arch/arm/mach-s5pc100/mach-smdkc100.c +2 -0
@@ -96,6 +96,7 @@ static struct s3c2410_uartcfg smdkc100_uartcfgs[] __initdata = {/* I2C0 */ static struct i2c_board_info i2c_devs0[]__initdata = { + {I2C_BOARD_INFO ("wm8580" ,0x1b ),}, };/* I2C1 */
@@ -190,6 +191,7 @@ static struct platform_device *smdkc100_devices[] __initdata = { &s3c_device_ts, &s3c_device_wdt, &smdkc100_lcd_powerdev, + &samsung_asoc_dma, &s5pc100_device_iis0, &samsung_device_keypad, &s5pc100_device_ac97,
sound/soc/s3c24xx/Kconfig +1 -1
@@ -62,7 +62,7 @@ config SND_S3C24XX_SOC_JIVE_WM8750 config SND_SOC_SMDK_WM8580 tristate "SoC I2S Audio support for WM8580 on SMDK" - depends on SND_S3C24XX_SOC && MACH_SMDK6410 + depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) select SND_SOC_WM8580 select SND_SAMSUNG_I2S help
sound/soc/s3c24xx/smdk_wm8580.c +52 -21
97 lines not on this page · raw message
Signature · 1 line
1.6.2.5
Re: [PATCHv4 16/18] ASoC: SMDK_WM8580: Enable for SMDKC100
Quoted 6 lines · Jassi Brar
From: Jassi Brar <[email protected]>
Enable the ASoC Machine driver to run on SMDKC100 as well.
Signed-off-by Jassi Brar <[email protected]>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 4 lines
--- arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + sound/soc/s3c24xx/Kconfig | 2 +- sound/soc/s3c24xx/smdk_wm8580.c | 73
+++++++++++++++++++++++--------
Quoted 147 lines
(quoted diff) +0
-1- 3 files changed, 55 insertions(+), 22 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s5pc100/mach-smdkc100.c +0
-0
s5pc100/mach-smdkc100.c
index 18b405d..dd192a2 100644arch/arm/mach-s5pc100/mach-smdkc100.c +1
-0@@ -96,6 +96,7 @@ static struct s3c2410_uartcfg smdkc100_uartcfgs[] __initdata = {/* I2C0 */ static struct i2c_board_info i2c_devs0[]__initdata = { + {I2C_BOARD_INFO ("wm8580" ,0x1b ),}, };/* I2C1 */
arch/arm/mach-s5pc100/mach-smdkc100.c +1
-0@@ -190,6 +191,7 @@ static struct platform_device *smdkc100_devices[] __initdata = { &s3c_device_ts, &s3c_device_wdt, &smdkc100_lcd_powerdev, + &samsung_asoc_dma, &s5pc100_device_iis0, &samsung_device_keypad,arch/arm/mach-s5pc100/mach-smdkc100.c +0
-0&s5pc100_device_ac97,sound/soc/s3c24xx/Kconfig +1
-1@@ -62,7 +62,7 @@ config SND_S3C24XX_SOC_JIVE_WM8750 config SND_SOC_SMDK_WM8580 tristate "SoC I2S Audio support for WM8580 on SMDK" - depends on SND_S3C24XX_SOC && MACH_SMDK6410 + depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) select SND_SOC_WM8580 select SND_SAMSUNG_I2S helpsound/soc/s3c24xx/smdk_wm8580.c +39
-21@@ -18,6 +18,8 @@#include <sound/soc.h> #include <sound/soc-dapm.h> +#include <asm/mach-types.h> +#include "../codecs/wm8580.h" #include "dma.h" #include "i2s.h" @@ -201,33 +203,49 @@ static int smdk_wm8580_init_paifrx(struct snd_soc_pcm_runtime *rtd)return 0 ; } +enum { +PRI_PLAYBACK =0 , +PRI_CAPTURE , +SEC_PLAYBACK , +}; +static struct snd_soc_dai_link smdk_dai[] = { -{/* Primary Playback i/f */ - .name ="WM8580 PAIF RX" , - .stream_name ="Playback" , - .cpu_dai_name ="samsung-i2s.2" , - .codec_dai_name ="wm8580-hifi-playback" , - .platform_name ="samsung-audio" , - .codec_name ="wm8580-codec.0-001b" , - .init = smdk_wm8580_init_paifrx, - .ops = &smdk_ops, -}, -{/* Primary Capture i/f */ - .name ="WM8580 PAIF TX" , - .stream_name ="Capture" , - .cpu_dai_name ="samsung-i2s.2" , - .codec_dai_name ="wm8580-hifi-capture" , - .platform_name ="samsung-audio" , - .codec_name ="wm8580-codec.0-001b" , - .init = smdk_wm8580_init_paiftx, - .ops = &smdk_ops, -}, + [PRI_PLAYBACK ] = {/* Primary Playback i/f */ + .name ="WM8580 PAIF RX" , + .stream_name ="Playback" , + .cpu_dai_name ="samsung-i2s.2" , + .codec_dai_name ="wm8580-hifi-playback" , + .platform_name ="samsung-audio" , + .codec_name ="wm8580-codec.0-001b" , + .init = smdk_wm8580_init_paifrx, + .ops = &smdk_ops, + }, + [PRI_CAPTURE ] = {/* Primary Capture i/f */ + .name ="WM8580 PAIF TX" , + .stream_name ="Capture" , + .cpu_dai_name ="samsung-i2s.2" , + .codec_dai_name ="wm8580-hifi-capture" , + .platform_name ="samsung-audio" , + .codec_name ="wm8580-codec.0-001b" , + .init = smdk_wm8580_init_paiftx, + .ops = &smdk_ops, + }, + [SEC_PLAYBACK ] = {/* Sec_Fifo Playback i/f */ + .name ="Sec_FIFO TX" , + .stream_name ="Playback" , + .cpu_dai_name ="samsung-i2s.x" , + .codec_dai_name ="wm8580-hifi-playback" , + .platform_name ="samsung-audio" , + .codec_name ="wm8580-codec.0-001b" , + .init = smdk_wm8580_init_paifrx, + .ops = &smdk_ops, + }, };static struct snd_soc_card smdk = { .name ="SMDK-I2S" , .dai_link = smdk_dai, - .num_links =ARRAY_SIZE (smdk_dai), + .num_links =2 , };static struct
platform_device*smdk_snd_device;sound/soc/s3c24xx/smdk_wm8580.c +13
-1@@ -235,6 +253,19 @@ static struct platform_device *smdk_snd_device;static int __init smdk_audio_init (void ) {int ret; +char *str; + +if (machine_is_smdkc100 ()) { + smdk.num_links =3 ; +/* S5PC100 has I2S0 as v5 */ + str = (char *)smdk_dai[PRI_PLAYBACK ].cpu_dai_name; + str[strlen (str) -1 ] ='0' ; + str = (char *)smdk_dai[PRI_CAPTURE ].cpu_dai_name; + str[strlen (str) -1 ] ='0' ; +/* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */ + str = (char *)smdk_dai[SEC_PLAYBACK ].cpu_dai_name; + str[strlen (str) -1 ] ='0' +SAMSUNG_I2S_SECOFF ; + } smdk_snd_device =platform_device_alloc ("soc-audio" ,-1 );if (!smdk_snd_device) --1.6.2.5
PATCH v4 17/18 ASoC: Samsung: Generalize Kconfig symbols
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Move prefixes to repesent the nature of Samsung ASoC suitably.
SND_S3C24XX_SOC -> ASOC_SAMSUNG
SND_S3C_SOC_PCM -> SND_SAMSUNG_PCM
SND_S3C_SOC_AC97 -> SND_SAMSUNG_AC97
SND_S5P_SOC_SPDIF -> SND_SAMSUNG_SPDIF
SND_S3C24XX_SOC_I2S -> SND_S3C24XX_I2S
SND_S3C64XX_SOC_SMARTQ -> ASOC_SMARTQ
SND_SOC_SMDK_SPDIF -> ASOC_SAMSUNG_SMDK_SPDIF
SND_SOC_SMDK_WM8580 -> ASOC_SAMSUNG_SMDK_WM8580
SND_SOC_SMDK_WM9713 -> ASOC_SAMSUNG_SMDK_WM9713
SND_SOC_GONI_AQUILA_WM8994 -> ASOC_GONI_AQUILA_WM8994--- sound/soc/s3c24xx/Kconfig | 98 ++++++++++++++++++++++---------------------- sound/soc/s3c24xx/Makefile | 40 +++++++++--------- 2 files changed, 69 insertions(+), 69 deletions(-)
sound/soc/s3c24xx/Kconfig +49 -49
@@ -1,14 +1,14 @@ -config SND_S3C24XX_SOC - tristate "SoC Audio for the Samsung S3CXXXX chips" +config ASOC_SAMSUNG + tristate "ASoC support for Samsung" depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 select S3C64XX_DMA if ARCH_S3C64XX select S3C2410_DMA if ARCH_S3C2410 help Say Y or M if you want to add support for codecs attached to - the S3C24XX AC97 or I2S interfaces. You will also need to + the Samsung SoCs' Audio interfaces. You will also need to select the audio interfaces to support below. -config SND_S3C24XX_SOC_I2S +config SND_S3C24XX_I2S tristate select S3C2410_DMA
@@ -20,136 +20,136 @@ config SND_S3C2412_SOC_I2S select SND_S3C_I2SV2_SOC select S3C2410_DMA -config SND_S3C_SOC_PCM +config SND_SAMSUNG_PCM tristate -config SND_S3C_SOC_AC97 +config SND_SAMSUNG_AC97 tristate select SND_SOC_AC97_BUS -config SND_S5P_SOC_SPDIF +config SND_SAMSUNG_SPDIF tristate select SND_SOC_SPDIF config SND_SAMSUNG_I2S tristate -config SND_S3C24XX_SOC_NEO1973_WM8753 +config ASOC_SAMSUNG_NEO1973_WM8753 tristate "SoC I2S Audio support for NEO1973 - WM8753" - depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && MACH_NEO1973_GTA01 + select SND_S3C24XX_I2S select SND_SOC_WM8753 help Say Y if you want to add support for SoC audio on smdk2440 with the WM8753. -config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 +config ASOC_SAMSUNG_NEO1973_GTA02_WM8753 tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)" - depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && MACH_NEO1973_GTA02 + select SND_S3C24XX_I2S select SND_SOC_WM8753 help This driver provides audio support for the Openmoko Neo FreeRunner smartphone. -config SND_S3C24XX_SOC_JIVE_WM8750 +config ASOC_SAMSUNG_JIVE_WM8750 tristate "SoC I2S Audio support for Jive" - depends on SND_S3C24XX_SOC && MACH_JIVE + depends on ASOC_SAMSUNG && MACH_JIVE select SND_SOC_WM8750 select SND_S3C2412_SOC_I2S help Sat Y if you want to add support for SoC audio on the Jive. -config SND_SOC_SMDK_WM8580 +config ASOC_SAMSUNG_SMDK_WM8580 tristate "SoC I2S Audio support for WM8580 on SMDK" - depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) + depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100) select SND_SOC_WM8580 select SND_SAMSUNG_I2S help Say Y if you want to add support for SoC audio on the SMDKs. -config SND_S3C24XX_SOC_SMDK2443_WM9710 +config ASOC_SAMSUNG_SMDK2443_WM9710 tristate "SoC AC97 Audio support for SMDK2443 - WM9710" - depends on SND_S3C24XX_SOC && MACH_SMDK2443 + depends on ASOC_SAMSUNG && MACH_SMDK2443 select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC - select SND_S3C_SOC_AC97 + select SND_SAMSUNG_AC97 help Say Y if you want to add support for SoC audio on smdk2443 with the WM9710. -config SND_S3C24XX_SOC_LN2440SBC_ALC650 +config ASOC_SAMSUNG_LN2440SBC_ALC650 tristate "SoC AC97 Audio support for LN2440SBC - ALC650" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 + depends on ASOC_SAMSUNG && ARCH_S3C2410 select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC - select SND_S3C_SOC_AC97 + select SND_SAMSUNG_AC97 help Say Y if you want to add support for SoC audio on ln2440sbc with the ALC650. -config SND_S3C24XX_SOC_S3C24XX_UDA134X +config ASOC_SAMSUNG_S3C24XX_UDA134X tristate "SoC I2S Audio support UDA134X wired to a S3C24XX" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && ARCH_S3C2410 + select SND_S3C24XX_I2S select SND_SOC_L3 - select SND_SOC_UDA134X + select SND_SOC_UDA134X -config SND_S3C24XX_SOC_SIMTEC +config ASOC_SAMSUNG_SIMTEC tristate help Internal node for common S3C24XX/Simtec suppor -config SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 +config ASOC_SAMSUNG_SIMTEC_TLV320AIC23 tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && ARCH_S3C2410 + select SND_S3C24XX_I2S select SND_SOC_TLV320AIC23 - select SND_S3C24XX_SOC_SIMTEC + select ASOC_SAMSUNG_SIMTEC -config SND_S3C24XX_SOC_SIMTEC_HERMES +config ASOC_SAMSUNG_SIMTEC_HERMES tristate "SoC I2S Audio support for Simtec Hermes board" - depends on SND_S3C24XX_SOC && ARCH_S3C2410 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && ARCH_S3C2410 + select SND_S3C24XX_I2S select SND_SOC_TLV320AIC3X - select SND_S3C24XX_SOC_SIMTEC + select ASOC_SAMSUNG_SIMTEC -config SND_S3C24XX_SOC_RX1950_UDA1380 +config ASOC_SAMSUNG_RX1950_UDA1380 tristate "Audio support for the HP iPAQ RX1950" - depends on SND_S3C24XX_SOC && MACH_RX1950 - select SND_S3C24XX_SOC_I2S + depends on ASOC_SAMSUNG && MACH_RX1950 + select SND_S3C24XX_I2S select SND_SOC_UDA1380 help This driver provides audio support for HP iPAQ RX1950 PDA. -config SND_SOC_SMDK_WM9713 +config ASOC_SAMSUNG_SMDK_WM9713 tristate "SoC AC97 Audio support for SMDK with WM9713" - depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110) + depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110) select SND_SOC_WM9713 - select SND_S3C_SOC_AC97 + select SND_SAMSUNG_AC97 help Sat Y if you want to add support for SoC audio on the SMDK. -config SND_S3C64XX_SOC_SMARTQ +config ASOC_SMARTQ tristate "SoC I2S Audio support for SmartQ board" - depends on SND_S3C24XX_SOC && MACH_SMARTQ + depends on ASOC_SAMSUNG && MACH_SMARTQ select SND_SAMSUNG_I2S select SND_SOC_WM8750 -config SND_SOC_GONI_AQUILA_WM8994 +config ASOC_GONI_AQUILA_WM8994 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" - depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) + depends on ASOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) select SND_SAMSUNG_I2S select SND_SOC_WM8994 help Say Y if you want to add support for SoC audio on goni or aquila with the WM8994. -config SND_SOC_SMDK_SPDIF +config ASOC_SAMSUNG_SMDK_SPDIF tristate "SoC S/PDIF Audio support for SMDK" - depends on SND_S3C24XX_SOC && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210) - select SND_S5P_SOC_SPDIF + depends on ASOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210) + select SND_SAMSUNG_SPDIF help Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
sound/soc/s3c24xx/Makefile +20 -20
@@ -8,13 +8,13 @@ snd-soc-samsung-spdif-objs := spdif.o snd-soc-pcm-objs := pcm.o snd-soc-i2s-objs := i2s.o -obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o -obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o -obj-$(CONFIG_SND_S3C_SOC_AC97) += snd-soc-ac97.o +obj-$(CONFIG_ASOC_SAMSUNG) += snd-soc-s3c24xx.o +obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o +obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o -obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o -obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o +obj-$(CONFIG_SND_SAMSUNG_SPDIF) += snd-soc-samsung-spdif.o +obj-$(CONFIG_SND_SAMSUNG_PCM) += snd-soc-pcm.o obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o # S3C24XX Machine Support
@@ -34,18 +34,18 @@ snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o snd-soc-goni-wm8994-objs := goni_wm8994.o snd-soc-smdk-spdif-objs := smdk_spdif.o -obj-$(CONFIG_SND_S3C24XX_SOC_JIVE_WM8750) += snd-soc-jive-wm8750.o -obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o -obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o -obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o -obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o -obj-$(CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o -obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC) += snd-soc-s3c24xx-simtec.o -obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o -obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o -obj-$(CONFIG_SND_S3C24XX_SOC_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o -obj-$(CONFIG_SND_SOC_SMDK_WM8580) += snd-soc-smdk-wm8580.o -obj-$(CONFIG_SND_SOC_SMDK_WM9713) += snd-soc-smdk-wm9713.o -obj-$(CONFIG_SND_S3C64XX_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o -obj-$(CONFIG_SND_SOC_SMDK_SPDIF) += snd-soc-smdk-spdif.o -obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o +obj-$(CONFIG_ASOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o +obj-$(CONFIG_ASOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o +obj-$(CONFIG_ASOC_SAMSUNG_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o +obj-$(CONFIG_ASOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o +obj-$(CONFIG_ASOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o +obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o +obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o +obj-$(CONFIG_ASOC_SAMSUNG_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o +obj-$(CONFIG_ASOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o +obj-$(CONFIG_ASOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o +obj-$(CONFIG_ASOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o +obj-$(CONFIG_ASOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
Signature · 1 line
1.6.2.5
Re: [PATCHv4 17/18] ASoC: Samsung: Generalize Kconfig symbols
Quoted 4 lines · Jassi Brar
SND_SOC_SMDK_SPDIF -> ASOC_SAMSUNG_SMDK_SPDIF
SND_SOC_SMDK_WM8580 -> ASOC_SAMSUNG_SMDK_WM8580
SND_SOC_SMDK_WM9713 -> ASOC_SAMSUNG_SMDK_WM9713
SND_SOC_GONI_AQUILA_WM8994 -> ASOC_GONI_AQUILA_WM8994Hrm. These ones I'm not entirely happy about - we're pretty consistently using SND_SOC_ rather than ASOC_ throughout the subsystem so changing to ASOC_ feels like churn. Is there any great reason for the rename? I don't mind the addition of SAMSUNG_ one way or the other, it's just the subsystem prefix.
I've applied this just now as the rename patch depends on it.
Re: [PATCHv4 17/18] ASoC: Samsung: Generalize Kconfig symbols
Quoted 7 lines · Mark Brown
Quoted 4 lines · Jassi Brar
SND_SOC_SMDK_SPDIF->ASOC_SAMSUNG_SMDK_SPDIFSND_SOC_SMDK_WM8580->ASOC_SAMSUNG_SMDK_WM8580SND_SOC_SMDK_WM9713->ASOC_SAMSUNG_SMDK_WM9713SND_SOC_GONI_AQUILA_WM8994->ASOC_GONI_AQUILA_WM8994
Quoted 5 lines
Hrm. These ones I'm not entirely happy about - we're pretty consistently using
SND_SOC_rather thanASOC_throughout the subsystem so changing toASOC_feels like churn. Is there any great reason for the rename? I don't mind the addition ofSAMSUNG_one way or the other, it's just the subsystem prefix.
If SND_SOC is to be used across all platforms, my changes are indeed out of line.
Otherwise, ASOC represents SND_SOC better and compactly.
Quoted 1 line
I've applied this just now as the rename patch depends on it.
Ok, though I was/am willing to submit yet another revision.
Thanks.
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Re: [PATCHv4 17/18] ASoC: Samsung: Generalize Kconfig symbols
Quoted 3 lines · Jassi Brar
If
SND_SOCis to be used across all platforms, my changes are indeed out of line.
Otherwise, ASOC representsSND_SOCbetter and compactly.
I agree it's probably a slightly better name but everything else is using SND_SOC_ already...
Quoted 3 lines
Quoted 1 line
I've applied this just now as the rename patch depends on it.
Ok, though I was/am willing to submit yet another revision.
No need for that, the series is sufficiently useful (and lengthy to review!) for this to be a fairly minor detail.
PATCH v4 18/18 ASoC: Samsung: Rename from s3c24xx to samsung
In reply to Jassi BrarFrom: Jassi Brar <[email protected]>
Finally, move the 's3c24xx' directory to 'samsung'
---
sound/soc/Kconfig | 2 +-
sound/soc/Makefile | 2 +-
sound/soc/{s3c24xx => samsung}/Kconfig | 0
sound/soc/{s3c24xx => samsung}/Makefile | 0
sound/soc/{s3c24xx => samsung}/ac97.c | 2 +-
sound/soc/{s3c24xx => samsung}/ac97.h | 2 +-
sound/soc/{s3c24xx => samsung}/dma.c | 0
sound/soc/{s3c24xx => samsung}/dma.h | 0
sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 0
sound/soc/{s3c24xx => samsung}/i2s.c | 2 +-
sound/soc/{s3c24xx => samsung}/i2s.h | 2 +-
sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 2 +-
sound/soc/{s3c24xx => samsung}/lm4857.h | 0
sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 0
.../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 0
sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 0
sound/soc/{s3c24xx => samsung}/pcm.c | 2 +-
sound/soc/{s3c24xx => samsung}/pcm.h | 2 +-
sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0
sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 0
sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +-
sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +-
sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 0
sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0
sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +-
.../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 2 +-
.../s3c24xx_simtec_tlv320aic23.c | 2 +-
sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 0
sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 2 +-
sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 0
sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 0
sound/soc/{s3c24xx => samsung}/smdk_wm8580.c | 0
sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 0
sound/soc/{s3c24xx => samsung}/spdif.c | 2 +-
sound/soc/{s3c24xx => samsung}/spdif.h | 2 +-
38 files changed, 20 insertions(+), 20 deletions(-)
rename sound/soc/{s3c24xx => samsung}/Kconfig (100%)
rename sound/soc/{s3c24xx => samsung}/Makefile (100%)
rename sound/soc/{s3c24xx => samsung}/ac97.c (99%)
rename sound/soc/{s3c24xx => samsung}/ac97.h (95%)
rename sound/soc/{s3c24xx => samsung}/dma.c (100%)
rename sound/soc/{s3c24xx => samsung}/dma.h (100%)
rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (100%)
rename sound/soc/{s3c24xx => samsung}/i2s.c (99%)
rename sound/soc/{s3c24xx => samsung}/i2s.h (96%)
rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (99%)
rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%)
rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (100%)
rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (100%)
rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (100%)
rename sound/soc/{s3c24xx => samsung}/pcm.c (99%)
rename sound/soc/{s3c24xx => samsung}/pcm.h (99%)
rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%)
rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (100%)
rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%)
rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%)
rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (99%)
rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (100%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (98%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (98%)
rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (100%)
rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (99%)
rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (100%)
rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (100%)
rename sound/soc/{s3c24xx => samsung}/smdk_wm8580.c (100%)
rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (100%)
rename sound/soc/{s3c24xx => samsung}/spdif.c (99%)
rename sound/soc/{s3c24xx => samsung}/spdif.h (94%)sound/soc/Kconfig +1 -1
@@ -38,7 +38,7 @@ source "sound/soc/nuc900/Kconfig" source "sound/soc/omap/Kconfig" source "sound/soc/kirkwood/Kconfig" source "sound/soc/pxa/Kconfig" -source "sound/soc/s3c24xx/Kconfig" +source "sound/soc/samsung/Kconfig" source "sound/soc/s6000/Kconfig" source "sound/soc/sh/Kconfig" source "sound/soc/txx9/Kconfig"
sound/soc/Makefile +1 -1
@@ -14,7 +14,7 @@ obj-$(CONFIG_SND_SOC) += nuc900/ obj-$(CONFIG_SND_SOC) += omap/ obj-$(CONFIG_SND_SOC) += kirkwood/ obj-$(CONFIG_SND_SOC) += pxa/ -obj-$(CONFIG_SND_SOC) += s3c24xx/ +obj-$(CONFIG_SND_SOC) += samsung/ obj-$(CONFIG_SND_SOC) += s6000/ obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += txx9/
sound/soc/samsung/Kconfig renamed from sound/soc/s3c24xx/Kconfig +0 -0
sound/soc/samsung/Makefile renamed from sound/soc/s3c24xx/Makefile +0 -0
sound/soc/samsung/ac97.c renamed from sound/soc/s3c24xx/ac97.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/ac97.c +/* sound/soc/samsung/ac97.c * * ALSA SoC Audio Layer - S3C AC97 Controller driver * Evolved from s3c2443-ac97.c
sound/soc/samsung/ac97.h renamed from sound/soc/s3c24xx/ac97.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/ac97.h +/* sound/soc/samsung/ac97.h * * ALSA SoC Audio Layer - S3C AC97 Controller driver * Evolved from s3c2443-ac97.h
sound/soc/samsung/dma.c renamed from sound/soc/s3c24xx/dma.c +0 -0
sound/soc/samsung/dma.h renamed from sound/soc/s3c24xx/dma.h +0 -0
sound/soc/samsung/goni_wm8994.c renamed from sound/soc/s3c24xx/goni_wm8994.c +0 -0
sound/soc/samsung/i2s.c renamed from sound/soc/s3c24xx/i2s.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/i2s.c +/* sound/soc/samsung/i2s.c * * ALSA SoC Audio Layer - Samsung I2S Controller driver *
sound/soc/samsung/i2s.h renamed from sound/soc/s3c24xx/i2s.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/i2s.h +/* sound/soc/samsung/i2s.h * * ALSA SoC Audio Layer - Samsung I2S Controller driver *
sound/soc/samsung/jive_wm8750.c renamed from sound/soc/s3c24xx/jive_wm8750.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/jive_wm8750.c +/* sound/soc/samsung/jive_wm8750.c * * Copyright 2007,2008 Simtec Electronics *
sound/soc/samsung/lm4857.h renamed from sound/soc/s3c24xx/lm4857.h +0 -0
sound/soc/samsung/ln2440sbc_alc650.c renamed from sound/soc/s3c24xx/ln2440sbc_alc650.c +0 -0
sound/soc/samsung/neo1973_gta02_wm8753.c renamed from sound/soc/s3c24xx/neo1973_gta02_wm8753.c +0 -0
sound/soc/samsung/neo1973_wm8753.c renamed from sound/soc/s3c24xx/neo1973_wm8753.c +0 -0
sound/soc/samsung/pcm.c renamed from sound/soc/s3c24xx/pcm.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/pcm.c +/* sound/soc/samsung/pcm.c * * ALSA SoC Audio Layer - S3C PCM-Controller driver *
sound/soc/samsung/pcm.h renamed from sound/soc/s3c24xx/pcm.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/pcm.h +/* sound/soc/samsung/pcm.h * * 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
sound/soc/samsung/regs-i2s-v2.h renamed from sound/soc/s3c24xx/regs-i2s-v2.h +0 -0
sound/soc/samsung/rx1950_uda1380.c renamed from sound/soc/s3c24xx/rx1950_uda1380.c +0 -0
sound/soc/samsung/s3c-i2s-v2.c renamed from sound/soc/s3c24xx/s3c-i2s-v2.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-i2c-v2.c +/* sound/soc/samsung/s3c-i2c-v2.c * * ALSA Soc Audio Layer - I2S core for newer Samsung SoCs. *
sound/soc/samsung/s3c-i2s-v2.h renamed from sound/soc/s3c24xx/s3c-i2s-v2.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c-i2s-v2.h +/* sound/soc/samsung/s3c-i2s-v2.h * * ALSA Soc Audio Layer - S3C_I2SV2 I2S driver *
sound/soc/samsung/s3c2412-i2s.c renamed from sound/soc/s3c24xx/s3c2412-i2s.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c2412-i2s.c +/* sound/soc/samsung/s3c2412-i2s.c * * ALSA Soc Audio Layer - S3C2412 I2S driver *
sound/soc/samsung/s3c2412-i2s.h renamed from sound/soc/s3c24xx/s3c2412-i2s.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c2412-i2s.c +/* sound/soc/samsung/s3c2412-i2s.c * * ALSA Soc Audio Layer - S3C2412 I2S driver *
sound/soc/samsung/s3c24xx-i2s.c renamed from sound/soc/s3c24xx/s3c24xx-i2s.c +0 -0
sound/soc/samsung/s3c24xx-i2s.h renamed from sound/soc/s3c24xx/s3c24xx-i2s.h +0 -0
sound/soc/samsung/s3c24xx_simtec.c renamed from sound/soc/s3c24xx/s3c24xx_simtec.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec.c +/* sound/soc/samsung/s3c24xx_simtec.c * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_simtec.h renamed from sound/soc/s3c24xx/s3c24xx_simtec.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec.h +/* sound/soc/samsung/s3c24xx_simtec.h * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_simtec_hermes.c renamed from sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +/* sound/soc/samsung/s3c24xx_simtec_hermes.c * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c renamed from sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +/* sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c * * Copyright 2009 Simtec Electronics *
sound/soc/samsung/s3c24xx_uda134x.c renamed from sound/soc/s3c24xx/s3c24xx_uda134x.c +0 -0
sound/soc/samsung/smartq_wm8987.c renamed from sound/soc/s3c24xx/smartq_wm8987.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/smartq_wm8987.c +/* sound/soc/samsung/smartq_wm8987.c * * Copyright 2010 Maurus Cuelenaere <[email protected]> *
sound/soc/samsung/smdk2443_wm9710.c renamed from sound/soc/s3c24xx/smdk2443_wm9710.c +0 -0
sound/soc/samsung/smdk_spdif.c renamed from sound/soc/s3c24xx/smdk_spdif.c +0 -0
sound/soc/samsung/smdk_wm8580.c renamed from sound/soc/s3c24xx/smdk_wm8580.c +0 -0
sound/soc/samsung/smdk_wm9713.c renamed from sound/soc/s3c24xx/smdk_wm9713.c +0 -0
sound/soc/samsung/spdif.c renamed from sound/soc/s3c24xx/spdif.c +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/spdif.c +/* sound/soc/samsung/spdif.c * * ALSA SoC Audio Layer - Samsung S/PDIF Controller driver *
sound/soc/samsung/spdif.h renamed from sound/soc/s3c24xx/spdif.h +1 -1
@@ -1,4 +1,4 @@ -/* sound/soc/s3c24xx/spdif.h +/* sound/soc/samsung/spdif.h * * ALSA SoC Audio Layer - Samsung S/PDIF Controller driver *
Signature · 1 line
1.6.2.5
Quoted 3 lines · Jassi Brar
Now that the
arch/armside of the updates has been applied in
the Kgene's tree, I am submitting upgrade for the Samsung ASoC in the following 18 patches.
I've applied all of these, thanks. There were some merges due to the bugfix patches that have been going in but they were all trivial so I'm fairly sure they're OK - please check, though. The automatic clock configuration in the I2S driver is particularly nice, it makes the machine drivers much simpler.