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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Select wm_hubs automatically for WM8994
ASoC: Remove duplicate AUX definition from WM8776
ASoC:: remove a redundant snd_soc_unregister_codec call in wm8988_register
ASoC: wm8727: add a missing return in wm8727_platform_probe
ASoC: fsi: fixup wrong value setting order of TDM
ASoC: fsi: fixup clock inversion operation

Linus Torvalds 84b37df4 95977d0e

+15 -20
+2 -2
sound/soc/codecs/Kconfig
··· 83 83 84 84 config SND_SOC_WM_HUBS 85 85 tristate 86 - default y if SND_SOC_WM8993=y 87 - default m if SND_SOC_WM8993=m 86 + default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y 87 + default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m 88 88 89 89 config SND_SOC_AC97_CODEC 90 90 tristate
+2
sound/soc/codecs/wm8727.c
··· 127 127 goto err_codec; 128 128 } 129 129 130 + return 0; 131 + 130 132 err_codec: 131 133 snd_soc_unregister_codec(codec); 132 134 err:
-1
sound/soc/codecs/wm8776.c
··· 94 94 95 95 static const struct snd_soc_dapm_widget wm8776_dapm_widgets[] = { 96 96 SND_SOC_DAPM_INPUT("AUX"), 97 - SND_SOC_DAPM_INPUT("AUX"), 98 97 99 98 SND_SOC_DAPM_INPUT("AIN1"), 100 99 SND_SOC_DAPM_INPUT("AIN2"),
-1
sound/soc/codecs/wm8988.c
··· 885 885 ret = snd_soc_register_dai(&wm8988_dai); 886 886 if (ret != 0) { 887 887 dev_err(codec->dev, "Failed to register DAI: %d\n", ret); 888 - snd_soc_unregister_codec(codec); 889 888 goto err_codec; 890 889 } 891 890
+11 -16
sound/soc/sh/fsi.c
··· 683 683 684 684 /* clock inversion (CKG2) */ 685 685 data = 0; 686 - switch (SH_FSI_INVERSION_MASK & flags) { 687 - case SH_FSI_LRM_INV: 688 - data = 1 << 12; 689 - break; 690 - case SH_FSI_BRM_INV: 691 - data = 1 << 8; 692 - break; 693 - case SH_FSI_LRS_INV: 694 - data = 1 << 4; 695 - break; 696 - case SH_FSI_BRS_INV: 697 - data = 1 << 0; 698 - break; 699 - } 686 + if (SH_FSI_LRM_INV & flags) 687 + data |= 1 << 12; 688 + if (SH_FSI_BRM_INV & flags) 689 + data |= 1 << 8; 690 + if (SH_FSI_LRS_INV & flags) 691 + data |= 1 << 4; 692 + if (SH_FSI_BRS_INV & flags) 693 + data |= 1 << 0; 694 + 700 695 fsi_reg_write(fsi, CKG2, data); 701 696 702 697 /* do fmt, di fmt */ ··· 721 726 break; 722 727 case SH_FSI_FMT_TDM: 723 728 msg = "TDM"; 724 - data = CR_FMT(CR_TDM) | (fsi->chan - 1); 725 729 fsi->chan = is_play ? 726 730 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags); 731 + data = CR_FMT(CR_TDM) | (fsi->chan - 1); 727 732 break; 728 733 case SH_FSI_FMT_TDM_DELAY: 729 734 msg = "TDM Delay"; 730 - data = CR_FMT(CR_TDM_D) | (fsi->chan - 1); 731 735 fsi->chan = is_play ? 732 736 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags); 737 + data = CR_FMT(CR_TDM_D) | (fsi->chan - 1); 733 738 break; 734 739 default: 735 740 dev_err(dai->dev, "unknown format.\n");