tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/asoc' into for-linus

Takashi Iwai d70ab7f7 58936b29

+16 -12
unified split
+1 -1
include/linux/mfd/wm8994/pdata.h
··· 29 #define WM8994_CONFIGURE_GPIO 0x8000 30 31 #define WM8994_DRC_REGS 5 32 - #define WM8994_EQ_REGS 19 33 34 /** 35 * DRC configurations are specified with a label and a set of register
··· 29 #define WM8994_CONFIGURE_GPIO 0x8000 30 31 #define WM8994_DRC_REGS 5 32 + #define WM8994_EQ_REGS 20 33 34 /** 35 * DRC configurations are specified with a label and a set of register
+4 -4
sound/soc/codecs/wm8580.c
··· 491 paifa |= 0x8; 492 break; 493 case SNDRV_PCM_FORMAT_S20_3LE: 494 - paifa |= 0x10; 495 paifb |= WM8580_AIF_LENGTH_20; 496 break; 497 case SNDRV_PCM_FORMAT_S24_LE: 498 - paifa |= 0x10; 499 paifb |= WM8580_AIF_LENGTH_24; 500 break; 501 case SNDRV_PCM_FORMAT_S32_LE: 502 - paifa |= 0x10; 503 - paifb |= WM8580_AIF_LENGTH_24; 504 break; 505 default: 506 return -EINVAL;
··· 491 paifa |= 0x8; 492 break; 493 case SNDRV_PCM_FORMAT_S20_3LE: 494 + paifa |= 0x0; 495 paifb |= WM8580_AIF_LENGTH_20; 496 break; 497 case SNDRV_PCM_FORMAT_S24_LE: 498 + paifa |= 0x0; 499 paifb |= WM8580_AIF_LENGTH_24; 500 break; 501 case SNDRV_PCM_FORMAT_S32_LE: 502 + paifa |= 0x0; 503 + paifb |= WM8580_AIF_LENGTH_32; 504 break; 505 default: 506 return -EINVAL;
+1 -1
sound/soc/codecs/wm8962.c
··· 3339 int mask; 3340 int active; 3341 3342 - mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); 3343 3344 active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); 3345 active &= ~mask;
··· 3339 int mask; 3340 int active; 3341 3342 + mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2_MASK); 3343 3344 active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); 3345 active &= ~mask;
+1 -1
sound/soc/codecs/wm_hubs.c
··· 293 SOC_DOUBLE_R("Speaker ZC Switch", 294 WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT, 295 7, 1, 0), 296 - SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 0, 3, 7, 0, 297 spkboost_tlv), 298 SOC_ENUM("Speaker Reference", speaker_ref), 299 SOC_ENUM("Speaker Mode", speaker_mode),
··· 293 SOC_DOUBLE_R("Speaker ZC Switch", 294 WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT, 295 7, 1, 0), 296 + SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 3, 0, 7, 0, 297 spkboost_tlv), 298 SOC_ENUM("Speaker Reference", speaker_ref), 299 SOC_ENUM("Speaker Mode", speaker_mode),
+9 -5
sound/soc/soc-core.c
··· 1619 #ifdef CONFIG_SND_SOC_AC97_BUS 1620 /* register any AC97 codecs */ 1621 for (i = 0; i < card->num_rtd; i++) { 1622 - ret = soc_register_ac97_dai_link(&card->rtd[i]); 1623 - if (ret < 0) { 1624 - printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name); 1625 - goto probe_dai_err; 1626 - } 1627 } 1628 #endif 1629 1630 card->instantiated = 1; ··· 3074 pr_debug("Registered DAI '%s'\n", dai->name); 3075 } 3076 3077 snd_soc_instantiate_cards(); 3078 return 0; 3079 3080 err:
··· 1619 #ifdef CONFIG_SND_SOC_AC97_BUS 1620 /* register any AC97 codecs */ 1621 for (i = 0; i < card->num_rtd; i++) { 1622 + ret = soc_register_ac97_dai_link(&card->rtd[i]); 1623 + if (ret < 0) { 1624 + printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name); 1625 + while (--i >= 0) 1626 + soc_unregister_ac97_dai_link(&card->rtd[i]); 1627 + goto probe_dai_err; 1628 } 1629 + } 1630 #endif 1631 1632 card->instantiated = 1; ··· 3072 pr_debug("Registered DAI '%s'\n", dai->name); 3073 } 3074 3075 + mutex_lock(&client_mutex); 3076 snd_soc_instantiate_cards(); 3077 + mutex_unlock(&client_mutex); 3078 return 0; 3079 3080 err: