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

Commit 8c1b5306 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Change Samsung Kconfig from ASOC_ to SND_SOC_ 



The rest of ASoC is using SND_SOC_ as the prefix for all the Kconfig
symbols so do so for the new Samsung drivers too, rather than using
ASOC_ as they currently are.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarSeungwhan Youn <sw.youn@samsung.com>
Acked-by: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent e9d3f951

sound/soc/samsung/Kconfig

+36 −36
Original line number Diff line number Diff line 
config ASOC_SAMSUNG

config SND_SOC_SAMSUNG

	tristate "ASoC support for Samsung"

	depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PV310

	select S3C64XX_DMA if ARCH_S3C64XX
@@ -34,51 +34,51 @@ config SND_SAMSUNG_SPDIF 
config SND_SAMSUNG_I2S

	tristate



config ASOC_SAMSUNG_NEO1973_WM8753

config SND_SOC_SAMSUNG_NEO1973_WM8753

	tristate "SoC I2S Audio support for NEO1973 - WM8753"

	depends on ASOC_SAMSUNG && MACH_NEO1973_GTA01

	depends on SND_SOC_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 ASOC_SAMSUNG_NEO1973_GTA02_WM8753

config SND_SOC_SAMSUNG_NEO1973_GTA02_WM8753

	tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"

	depends on ASOC_SAMSUNG && MACH_NEO1973_GTA02

	depends on SND_SOC_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 ASOC_SAMSUNG_JIVE_WM8750

config SND_SOC_SAMSUNG_JIVE_WM8750

	tristate "SoC I2S Audio support for Jive"

	depends on ASOC_SAMSUNG && MACH_JIVE

	depends on SND_SOC_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 ASOC_SAMSUNG_SMDK_WM8580

config SND_SOC_SAMSUNG_SMDK_WM8580

	tristate "SoC I2S Audio support for WM8580 on SMDK"

	depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || MACH_SMDKC110)

	depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || MACH_SMDKC110)

	select SND_SOC_WM8580

	select SND_SAMSUNG_I2S

	help

	  Say Y if you want to add support for SoC audio on the SMDKs.



config ASOC_SAMSUNG_SMDK_WM8994

config SND_SOC_SAMSUNG_SMDK_WM8994

	tristate "SoC I2S Audio support for WM8994 on SMDK"

	depends on ASOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210)

	depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210)

	select SND_SOC_WM8994

	select SND_SAMSUNG_I2S

	help

		Say Y if you want to add support for SoC audio on the SMDKs.



config ASOC_SAMSUNG_SMDK2443_WM9710

config SND_SOC_SAMSUNG_SMDK2443_WM9710

	tristate "SoC AC97 Audio support for SMDK2443 - WM9710"

	depends on ASOC_SAMSUNG && MACH_SMDK2443

	depends on SND_SOC_SAMSUNG && MACH_SMDK2443

	select S3C2410_DMA

	select AC97_BUS

	select SND_SOC_AC97_CODEC
@@ -87,9 +87,9 @@ config ASOC_SAMSUNG_SMDK2443_WM9710 
	  Say Y if you want to add support for SoC audio on smdk2443

	  with the WM9710.



config ASOC_SAMSUNG_LN2440SBC_ALC650

config SND_SOC_SAMSUNG_LN2440SBC_ALC650

	tristate "SoC AC97 Audio support for LN2440SBC - ALC650"

	depends on ASOC_SAMSUNG && ARCH_S3C2410

	depends on SND_SOC_SAMSUNG && ARCH_S3C2410

	select S3C2410_DMA

	select AC97_BUS

	select SND_SOC_AC97_CODEC
@@ -98,74 +98,74 @@ config ASOC_SAMSUNG_LN2440SBC_ALC650 
	  Say Y if you want to add support for SoC audio on ln2440sbc

	  with the ALC650.



config ASOC_SAMSUNG_S3C24XX_UDA134X

config SND_SOC_SAMSUNG_S3C24XX_UDA134X

	tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"

	depends on ASOC_SAMSUNG && ARCH_S3C2410

	depends on SND_SOC_SAMSUNG && ARCH_S3C2410

	select SND_S3C24XX_I2S

	select SND_SOC_L3

	select SND_SOC_UDA134X



config ASOC_SAMSUNG_SIMTEC

config SND_SOC_SAMSUNG_SIMTEC

	tristate

	help

	  Internal node for common S3C24XX/Simtec suppor



config ASOC_SAMSUNG_SIMTEC_TLV320AIC23

config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23

	tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"

	depends on ASOC_SAMSUNG && ARCH_S3C2410

	depends on SND_SOC_SAMSUNG && ARCH_S3C2410

	select SND_S3C24XX_I2S

	select SND_SOC_TLV320AIC23

	select ASOC_SAMSUNG_SIMTEC

	select SND_SOC_SAMSUNG_SIMTEC



config ASOC_SAMSUNG_SIMTEC_HERMES

config SND_SOC_SAMSUNG_SIMTEC_HERMES

	tristate "SoC I2S Audio support for Simtec Hermes board"

	depends on ASOC_SAMSUNG && ARCH_S3C2410

	depends on SND_SOC_SAMSUNG && ARCH_S3C2410

	select SND_S3C24XX_I2S

	select SND_SOC_TLV320AIC3X

	select ASOC_SAMSUNG_SIMTEC

	select SND_SOC_SAMSUNG_SIMTEC



config ASOC_SAMSUNG_H1940_UDA1380

config SND_SOC_SAMSUNG_H1940_UDA1380

	tristate "Audio support for the HP iPAQ H1940"

	depends on ASOC_SAMSUNG && ARCH_H1940

	depends on SND_SOC_SAMSUNG && ARCH_H1940

	select SND_S3C24XX_I2S

	select SND_SOC_UDA1380

	help

	  This driver provides audio support for HP iPAQ h1940 PDA.



config ASOC_SAMSUNG_RX1950_UDA1380

config SND_SOC_SAMSUNG_RX1950_UDA1380

	tristate "Audio support for the HP iPAQ RX1950"

	depends on ASOC_SAMSUNG && MACH_RX1950

	depends on SND_SOC_SAMSUNG && MACH_RX1950

	select SND_S3C24XX_I2S

	select SND_SOC_UDA1380

	help

	  This driver provides audio support for HP iPAQ RX1950 PDA.



config ASOC_SAMSUNG_SMDK_WM9713

config SND_SOC_SAMSUNG_SMDK_WM9713

	tristate "SoC AC97 Audio support for SMDK with WM9713"

	depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110 || MACH_SMDKV310 || MACH_SMDKC210)

	depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110 || MACH_SMDKV310 || MACH_SMDKC210)

	select SND_SOC_WM9713

	select SND_SAMSUNG_AC97

	help

	  Sat Y if you want to add support for SoC audio on the SMDK.



config ASOC_SMARTQ

config SND_SOC_SMARTQ

	tristate "SoC I2S Audio support for SmartQ board"

	depends on ASOC_SAMSUNG && MACH_SMARTQ

	depends on SND_SOC_SAMSUNG && MACH_SMARTQ

	select SND_SAMSUNG_I2S

	select SND_SOC_WM8750



config ASOC_GONI_AQUILA_WM8994

config SND_SOC_GONI_AQUILA_WM8994

	tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"

	depends on ASOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)

	depends on SND_SOC_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 ASOC_SAMSUNG_SMDK_SPDIF

config SND_SOC_SAMSUNG_SMDK_SPDIF

	tristate "SoC S/PDIF Audio support for SMDK"

	depends on ASOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210)

	depends on SND_SOC_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/samsung/Makefile

+18 −18
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ snd-soc-samsung-spdif-objs := spdif.o 
snd-soc-pcm-objs := pcm.o

snd-soc-i2s-objs := i2s.o



obj-$(CONFIG_ASOC_SAMSUNG) += snd-soc-s3c24xx.o

obj-$(CONFIG_SND_SOC_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
@@ -36,20 +36,20 @@ 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_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_H1940_UDA1380) += snd-soc-h1940-uda1380.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_WM8994) += snd-soc-smdk-wm8994.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
 
obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o

obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o

obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o

obj-$(CONFIG_SND_SOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o

obj-$(CONFIG_SND_SOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o

obj-$(CONFIG_SND_SOC_SAMSUNG_H1940_UDA1380) += snd-soc-h1940-uda1380.o

obj-$(CONFIG_SND_SOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o

obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o

obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o

obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o