mirror of https://gitee.com/openkylin/linux.git
ASoC: Last minute fixes
Some last minute fixes for ASoC. Small, focused changes to specific drivers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJPspeNAAoJEBus8iNuMP3deBkP/15YJrq0uQ6JkLwbkS6aor/R C0BILwQVvHhTt2IAUq44T1lJwjdTYhTgZU8IF5PJhmeSrPGJY3aGaxDocuYhoHFM RQJye5lxfkmsvMjS+nx0qxaSyYMyTP0rM3GC0urgMME/1KKQ9P0/PcwVvtbGt/aR JuhWmh8Zkk2qmsdFlcd3wFoiVqSDwHmnLJkcj5a6SxAHuwwVGxfF+ZjWJrt+7VFo xkmKGpb5iWDmgiZJwGBCwYzVp+pbOEltKoRuhmmtDOgXm01YlMwBLQzvoaJA8uaK p+xzrAPvr25rQxLnv4W0LFHJcF/ONkyfPP0nfxK2Y1pMYY7xvMRmM8l5yw0QF97m FFZdjz9IBPVW0urCsRrVC/b+2a4VdOlCloYoffGocd1oroNZJlBcFsWtx5/9QOiK 5eynB2EY/Aywu+Sle9BIKV2Gx7gseo9wdt8oi1cK1CmCeser1NekG0cavJJux8LO oHrOssKb4rRK1Br0jT1A4xUr0G2mIwTWIvNrRIVkNId8PVfGUKbW6dlTkG72h6Jp j1Rs4lR0wSlCYfwBzxrmf7/L/5dTNDFiiVZWBky29prq3yNkhqTvKMqCSyb5Uboc /zJdzfFwh+dF8w08fxvpd0VfeNPiWNyPqDOH0dbjxCL68lnmUoS1WJ5ec1l6ZJht 1xXeuj4sK9PZ6uzJc/Il =iqgt -----END PGP SIGNATURE----- Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Last minute fixes Some last minute fixes for ASoC. Small, focused changes to specific drivers.
This commit is contained in:
commit
21363cf0ca
|
@ -568,22 +568,22 @@ static const struct snd_kcontrol_new cs42l73_snd_controls[] = {
|
|||
attn_tlv),
|
||||
|
||||
SOC_SINGLE_TLV("SPK-IP Mono Volume",
|
||||
CS42L73_SPKMIPMA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_SPKMIPMA, 0, 0x3F, 1, attn_tlv),
|
||||
SOC_SINGLE_TLV("SPK-XSP Mono Volume",
|
||||
CS42L73_SPKMXSPA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_SPKMXSPA, 0, 0x3F, 1, attn_tlv),
|
||||
SOC_SINGLE_TLV("SPK-ASP Mono Volume",
|
||||
CS42L73_SPKMASPA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_SPKMASPA, 0, 0x3F, 1, attn_tlv),
|
||||
SOC_SINGLE_TLV("SPK-VSP Mono Volume",
|
||||
CS42L73_SPKMVSPMA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_SPKMVSPMA, 0, 0x3F, 1, attn_tlv),
|
||||
|
||||
SOC_SINGLE_TLV("ESL-IP Mono Volume",
|
||||
CS42L73_ESLMIPMA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_ESLMIPMA, 0, 0x3F, 1, attn_tlv),
|
||||
SOC_SINGLE_TLV("ESL-XSP Mono Volume",
|
||||
CS42L73_ESLMXSPA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_ESLMXSPA, 0, 0x3F, 1, attn_tlv),
|
||||
SOC_SINGLE_TLV("ESL-ASP Mono Volume",
|
||||
CS42L73_ESLMASPA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_ESLMASPA, 0, 0x3F, 1, attn_tlv),
|
||||
SOC_SINGLE_TLV("ESL-VSP Mono Volume",
|
||||
CS42L73_ESLMVSPMA, 0, 0x3E, 1, attn_tlv),
|
||||
CS42L73_ESLMVSPMA, 0, 0x3F, 1, attn_tlv),
|
||||
|
||||
SOC_ENUM("IP Digital Swap/Mono Select", ip_swap_enum),
|
||||
|
||||
|
|
|
@ -1144,7 +1144,7 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w,
|
|||
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,
|
||||
WM8994_AIF2DACL_ENA |
|
||||
WM8994_AIF2DACR_ENA, 0);
|
||||
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,
|
||||
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4,
|
||||
WM8994_AIF2ADCL_ENA |
|
||||
WM8994_AIF2ADCR_ENA, 0);
|
||||
|
||||
|
|
Loading…
Reference in New Issue