ALSA: wss_lib: use wss detection code instead of ad1848 one

Use the wss detection code and kill the ad1848 library.
The library is fully assimilated into the new wss library.

This required reworking of the AD1848 family code
so the code is changed to correctly detect chips from
the AD1848 and CS4231 families.

I have tested it on following cards:
Gallant SC-6600 (codec: AD1848, driver: snd-sc6600)
SoundScape VIVO/90 (codec: AD1845, driver: snd-sscape)
SG Waverider (codec: CS4231A, driver: Rene Herman's snd-galaxy)
Opti930 (codec: built-in - CS4231 compatible, driver: snd-opti93x)
Opti931 (codec: built-in - CS4231 compatible, driver: snd-opti93x)
Gallant SC-70P (chip/codec: CS4237B, driver: snd-cs4236)
Audio Plus 3D (chip/codec: CMI8330A, driver: snd-cmi8330)
Dell Latitude CP (chip/codec: cs4236, driver snd-cs4232)

Sound playback and recording works on all these cards.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 5 insertions, 10 deletions

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index cca11d5dc33b..ec80444c2a96 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -4,11 +4,6 @@ config SND_WSS_LIB
         tristate
         select SND_PCM
 
-config SND_AD1848_LIB
-        tristate
-        select SND_PCM
-        select SND_WSS_LIB
-
 config SND_SB_COMMON
         tristate
 
@@ -56,7 +51,7 @@ config SND_AD1816A
 
 config SND_AD1848
         tristate "Generic AD1848/CS4248 driver"
-        select SND_AD1848_LIB
+        select SND_WSS_LIB
         help
           Say Y here to include support for AD1848 (Analog Devices) or
           CS4248 (Cirrus Logic - Crystal Semiconductors) chips.
@@ -97,7 +92,7 @@ config SND_AZT2320
 
 config SND_CMI8330
         tristate "C-Media CMI8330"
-        select SND_AD1848_LIB
+        select SND_WSS_LIB
         select SND_SB16_DSP
         help
           Say Y here to include support for soundcards based on the
@@ -193,7 +188,7 @@ config SND_ES18XX
 config SND_SC6000
         tristate "Gallant SC-6000, Audio Excel DSP 16"
         depends on HAS_IOPORT
-        select SND_AD1848_LIB
+        select SND_WSS_LIB
         select SND_OPL3_LIB
         select SND_MPU401_UART
         help
@@ -280,7 +275,7 @@ config SND_OPTI92X_AD1848
         select SND_OPL3_LIB
         select SND_OPL4_LIB
         select SND_MPU401_UART
-        select SND_AD1848_LIB
+        select SND_WSS_LIB
         help
           Say Y here to include support for soundcards based on Opti
           82C92x or OTI-601 chips and using an AD1848 codec.
@@ -373,7 +368,7 @@ config SND_SB16_CSP
 
 config SND_SGALAXY
         tristate "Aztech Sound Galaxy"
-        select SND_AD1848_LIB
+        select SND_WSS_LIB
         help
           Say Y here to include support for Aztech Sound Galaxy
           soundcards.