Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs4271', 'asoc/topic...

diff --combined sound/soc/codecs/Kconfig
index 6a66216a9c0fb5d59fc3da33ef85dbafbee110c1,a68d1731a8fde35fe199f61fc702a9259ad25a81,7650625510276763e1abda48c8c8e84bd2bd66de,02a36b0b7f54608aedc7e8103e9c9f69e6472e1e,a68d1731a8fde35fe199f61fc702a9259ad25a81..1362edd380e5379f4f281aa84f124dd7a5e0d687
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@ -50,7 -50,7 -50,8 -50,7 -50,7 +50,8 @@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4265 if I2C
        select SND_SOC_CS4270 if I2C
-- --   select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
++ ++   select SND_SOC_CS4271_I2C if I2C
++ ++   select SND_SOC_CS4271_SPI if SPI_MASTER
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if I2C
@@@@@@ -223,7 -223,6 -224,6 -223,6 -223,6 +224,7 @@@@@@ config SND_SOC_AD193X_I2
        select SND_SOC_AD193X
     
     config SND_SOC_AD1980
 ++++   select REGMAP_AC97
        tristate
     
     config SND_SOC_AD73311
@@@@@@ -337,7 -336,7 -337,7 -336,8 -336,7 +338,8 @@@@@@ config SND_SOC_CS42L5
        tristate
     
     config SND_SOC_CS42L51_I2C
--- -   tristate
+++ +   tristate "Cirrus Logic CS42L51 CODEC (I2C)"
+++ +   depends on I2C
        select SND_SOC_CS42L51
     
     config SND_SOC_CS42L52
@@@@@@ -371,8 -370,8 -371,19 -371,8 -370,8 +373,19 @@@@@@ config SND_SOC_CS4270_VD33_ERRAT
        depends on SND_SOC_CS4270
     
     config SND_SOC_CS4271
-- --   tristate "Cirrus Logic CS4271 CODEC"
-- --   depends on SND_SOC_I2C_AND_SPI
++ ++   tristate
++ ++
++ ++config SND_SOC_CS4271_I2C
++ ++   tristate "Cirrus Logic CS4271 CODEC (I2C)"
++ ++   depends on I2C
++ ++   select SND_SOC_CS4271
++ ++   select REGMAP_I2C
++ ++
++ ++config SND_SOC_CS4271_SPI
++ ++   tristate "Cirrus Logic CS4271 CODEC (SPI)"
++ ++   depends on SPI_MASTER
++ ++   select SND_SOC_CS4271
++ ++   select REGMAP_SPI
     
     config SND_SOC_CS42XX8
        tristate

diff --combined sound/soc/codecs/cs42l51.c
index 669c38fc303468d51dd6bbd3dfa16e935c030e8c,09488d97de60d040bbdb37edfa3a94a999930633,09488d97de60d040bbdb37edfa3a94a999930633,3142bafc926299e690d59d78ca9f724728dd4aa9,09488d97de60d040bbdb37edfa3a94a999930633..b3951524339f90cdf8f90dbc23cbadd46a874af9
--- 1/sound/soc/codecs/cs42l51.c
--- 2/sound/soc/codecs/cs42l51.c
--- 3/sound/soc/codecs/cs42l51.c
--- 4/sound/soc/codecs/cs42l51.c
--- 5/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@@@@@ -153,15 -153,15 -153,15 -153,17 -153,15 +153,17 @@@@@@ static const struct snd_kcontrol_new cs
     static int cs42l51_pdn_event(struct snd_soc_dapm_widget *w,
                struct snd_kcontrol *kcontrol, int event)
     {
+++ +   struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+++ +
        switch (event) {
        case SND_SOC_DAPM_PRE_PMD:
--- -           snd_soc_update_bits(w->codec, CS42L51_POWER_CTL1,
+++ +           snd_soc_update_bits(codec, CS42L51_POWER_CTL1,
                                    CS42L51_POWER_CTL1_PDN,
                                    CS42L51_POWER_CTL1_PDN);
                break;
        default:
        case SND_SOC_DAPM_POST_PMD:
--- -           snd_soc_update_bits(w->codec, CS42L51_POWER_CTL1,
+++ +           snd_soc_update_bits(codec, CS42L51_POWER_CTL1,
                                    CS42L51_POWER_CTL1_PDN, 0);
                break;
        }
@@@@@@ -558,13 -558,11 -558,11 -560,11 -558,11 +560,13 @@@@@@ error
     }
     EXPORT_SYMBOL_GPL(cs42l51_probe);
     
 ----static const struct of_device_id cs42l51_of_match[] = {
 ++++const struct of_device_id cs42l51_of_match[] = {
        { .compatible = "cirrus,cs42l51", },
        { }
     };
     MODULE_DEVICE_TABLE(of, cs42l51_of_match);
 ++++EXPORT_SYMBOL_GPL(cs42l51_of_match);
 ++++
     MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
     MODULE_DESCRIPTION("Cirrus Logic CS42L51 ALSA SoC Codec Driver");
     MODULE_LICENSE("GPL");