ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection

cs4232 and cs4236 driver merge to solve PnP BIOS detection.

Also, the patch adds recognition if the chip is cs4236b+
or earlier part. This unifies drivers for both cs4232
and cs4236+ chips. It allows to use the PnP BIOS
detection for the cs4236+ chips. Previously, only
the snd-cs4232 could be detected by the PnP BIOS.

The cs4232+ cards reports two separate PnP BIOS ids.

The patch adds search for the second id to find out
resources assigned to a control port.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 6 insertions, 17 deletions

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 5915dc41c0ee..4e06bbd9298d 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -56,8 +56,8 @@ config SND_AD1848
           Say Y here to include support for AD1848 (Analog Devices) or
           CS4248 (Cirrus Logic - Crystal Semiconductors) chips.
           
-          For newer chips from Cirrus Logic, use the CS4231, CS4232 or
-          CS4236+ drivers.
+          For newer chips from Cirrus Logic, use the CS4231 or CS4232+
+          drivers.
 
           To compile this driver as a module, choose M here: the module
           will be called snd-ad1848.
@@ -114,26 +114,15 @@ config SND_CS4231
           To compile this driver as a module, choose M here: the module
           will be called snd-cs4231.
 
-config SND_CS4232
-        tristate "Generic Cirrus Logic CS4232 driver"
-        select SND_OPL3_LIB
-        select SND_MPU401_UART
-        select SND_WSS_LIB
-        help
-          Say Y here to include support for CS4232 chips from Cirrus
-          Logic - Crystal Semiconductors.
-
-          To compile this driver as a module, choose M here: the module
-          will be called snd-cs4232.
-
 config SND_CS4236
-        tristate "Generic Cirrus Logic CS4236+ driver"
+        tristate "Generic Cirrus Logic CS4232/CS4236+ driver"
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_WSS_LIB
         help
-          Say Y to include support for CS4235,CS4236,CS4237B,CS4238B,
-          CS4239 chips from Cirrus Logic - Crystal Semiconductors.
+          Say Y to include support for CS4232,CS4235,CS4236,CS4237B,
+          CS4238B,CS4239 chips from Cirrus Logic - Crystal
+          Semiconductors.
 
           To compile this driver as a module, choose M here: the module
           will be called snd-cs4236.