Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi', 'asoc...

diff --cc sound/soc/codecs/max98090.c
Simple merge

diff --cc sound/soc/codecs/max98095.c
Simple merge

diff --cc sound/soc/codecs/mc13783.c
Simple merge

diff --cc sound/soc/codecs/rt5640.c
Simple merge

diff --cc sound/soc/codecs/tlv320aic31xx.c
Simple merge

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge

diff --cc sound/soc/soc-core.c
index 4b87ab394b1cdaf9a59ea509746e7f8e2e042ead,051c006281f5c2c003583f7104c9ec02dc886dfc,051c006281f5c2c003583f7104c9ec02dc886dfc,051c006281f5c2c003583f7104c9ec02dc886dfc,051c006281f5c2c003583f7104c9ec02dc886dfc,051c006281f5c2c003583f7104c9ec02dc886dfc,051c006281f5c2c003583f7104c9ec02dc886dfc,051c006281f5c2c003583f7104c9ec02dc886dfc,54a1d91f1d9661aab8c9758380825e6d2db02329..c4ed4c9bb360c081ffbd1ec99f7bf57dc3a19bcc
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
--- 3/sound/soc/soc-core.c
--- 4/sound/soc/soc-core.c
--- 5/sound/soc/soc-core.c
--- 6/sound/soc/soc-core.c
--- 7/sound/soc/soc-core.c
--- 8/sound/soc/soc-core.c
--- 9/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@@@@@@@@ -1596,43 -1539,21 -1539,21 -1539,21 -1539,21 -1539,21 -1539,21 -1539,21 -1634,26 +1634,43 @@@@@@@@@@ static void soc_unregister_ac97_codec(s
                        codec->ac97_registered = 0;
                }
         }
 +++++++ 
 +++++++ static void soc_unregister_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
 +++++++ {
 +++++++        soc_unregister_ac97_codec(rtd->codec);
 +++++++ }
         #endif
         
 --------static int soc_check_aux_dev(struct snd_soc_card *card, int num)
 ++++++++struct snd_soc_codec *soc_find_matching_codec(struct snd_soc_card *card, int num)
         {
                struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
                struct snd_soc_codec *codec;
         
 --------       /* find CODEC from registered CODECs*/
 ++++++++       /* find CODEC from registered CODECs */
                list_for_each_entry(codec, &codec_list, list) {
 --------               if (!strcmp(codec->name, aux_dev->codec_name))
 --------                       return 0;
 ++++++++               if (aux_dev->codec_of_node &&
 ++++++++                  (codec->dev->of_node != aux_dev->codec_of_node))
 ++++++++                       continue;
 ++++++++               if (aux_dev->codec_name && strcmp(codec->name, aux_dev->codec_name))
 ++++++++                       continue;
 ++++++++               return codec;
                }
         
 --------       dev_err(card->dev, "ASoC: %s not registered\n", aux_dev->codec_name);
 ++++++++       return NULL;
 ++++++++}
 +++++++ 
 ++++++++static int soc_check_aux_dev(struct snd_soc_card *card, int num)
 ++++++++{
 ++++++++       struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
 ++++++++       const char *codecname = aux_dev->codec_name;
 ++++++++       struct snd_soc_codec *codec = soc_find_matching_codec(card, num);
        +
 ++++++++       if (codec)
 ++++++++               return 0;
 ++++++++       if (aux_dev->codec_of_node)
 ++++++++               codecname = of_node_full_name(aux_dev->codec_of_node);
 ++++++++
 ++++++++       dev_err(card->dev, "ASoC: %s not registered\n", codecname);
                return -EPROBE_DEFER;
         }
         
@@@@@@@@@@ -2550,22 -2667,14 -2667,14 -2667,14 -2667,14 -2667,14 -2667,14 -2667,14 -2767,14 +2588,22 @@@@@@@@@@ static int snd_soc_read_signed(struct s
                int ret;
                unsigned int val;
         
 --------       val = (snd_soc_read(codec, reg) >> shift) & mask;
 ++++++++       ret = snd_soc_component_read(component, reg, &val);
 ++++++++       if (ret < 0)
 ++++++++               return ret;
 +++++++ 
        -       if (!sign_bit)
        -               return val;
 ++++++++       val = (val >> shift) & mask;
        +
 -------        if (!sign_bit)
 -------                return val;
 ++++++++       if (!sign_bit) {
 ++++++++               *signed_val = val;
 ++++++++               return 0;
 ++++++++       }
         
                /* non-negative number */
 --------       if (!(val & BIT(sign_bit)))
 --------               return val;
 ++++++++       if (!(val & BIT(sign_bit))) {
 ++++++++               *signed_val = val;
 ++++++++               return 0;
 ++++++++       }
         
                ret = val;