diff options
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 889a897d41ac..630684f4a0bc 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
@@ -660,33 +660,53 @@ struct aic3x_rate_divs { | |||
660 | /* AIC3X codec mclk clock divider coefficients */ | 660 | /* AIC3X codec mclk clock divider coefficients */ |
661 | static const struct aic3x_rate_divs aic3x_divs[] = { | 661 | static const struct aic3x_rate_divs aic3x_divs[] = { |
662 | /* 8k */ | 662 | /* 8k */ |
663 | {12000000, 8000, 48000, 0xa, 16, 3840}, | ||
664 | {19200000, 8000, 48000, 0xa, 10, 2400}, | ||
663 | {22579200, 8000, 48000, 0xa, 8, 7075}, | 665 | {22579200, 8000, 48000, 0xa, 8, 7075}, |
664 | {33868800, 8000, 48000, 0xa, 5, 8049}, | 666 | {33868800, 8000, 48000, 0xa, 5, 8049}, |
665 | /* 11.025k */ | 667 | /* 11.025k */ |
668 | {12000000, 11025, 44100, 0x6, 15, 528}, | ||
669 | {19200000, 11025, 44100, 0x6, 9, 4080}, | ||
666 | {22579200, 11025, 44100, 0x6, 8, 0}, | 670 | {22579200, 11025, 44100, 0x6, 8, 0}, |
667 | {33868800, 11025, 44100, 0x6, 5, 3333}, | 671 | {33868800, 11025, 44100, 0x6, 5, 3333}, |
668 | /* 16k */ | 672 | /* 16k */ |
673 | {12000000, 16000, 48000, 0x4, 16, 3840}, | ||
674 | {19200000, 16000, 48000, 0x4, 10, 2400}, | ||
669 | {22579200, 16000, 48000, 0x4, 8, 7075}, | 675 | {22579200, 16000, 48000, 0x4, 8, 7075}, |
670 | {33868800, 16000, 48000, 0x4, 5, 8049}, | 676 | {33868800, 16000, 48000, 0x4, 5, 8049}, |
671 | /* 22.05k */ | 677 | /* 22.05k */ |
678 | {12000000, 22050, 44100, 0x2, 15, 528}, | ||
679 | {19200000, 22050, 44100, 0x2, 9, 4080}, | ||
672 | {22579200, 22050, 44100, 0x2, 8, 0}, | 680 | {22579200, 22050, 44100, 0x2, 8, 0}, |
673 | {33868800, 22050, 44100, 0x2, 5, 3333}, | 681 | {33868800, 22050, 44100, 0x2, 5, 3333}, |
674 | /* 32k */ | 682 | /* 32k */ |
683 | {12000000, 32000, 48000, 0x1, 16, 3840}, | ||
684 | {19200000, 32000, 48000, 0x1, 10, 2400}, | ||
675 | {22579200, 32000, 48000, 0x1, 8, 7075}, | 685 | {22579200, 32000, 48000, 0x1, 8, 7075}, |
676 | {33868800, 32000, 48000, 0x1, 5, 8049}, | 686 | {33868800, 32000, 48000, 0x1, 5, 8049}, |
677 | /* 44.1k */ | 687 | /* 44.1k */ |
688 | {12000000, 44100, 44100, 0x0, 15, 528}, | ||
689 | {19200000, 44100, 44100, 0x0, 9, 4080}, | ||
678 | {22579200, 44100, 44100, 0x0, 8, 0}, | 690 | {22579200, 44100, 44100, 0x0, 8, 0}, |
679 | {33868800, 44100, 44100, 0x0, 5, 3333}, | 691 | {33868800, 44100, 44100, 0x0, 5, 3333}, |
680 | /* 48k */ | 692 | /* 48k */ |
693 | {12000000, 48000, 48000, 0x0, 16, 3840}, | ||
694 | {19200000, 48000, 48000, 0x0, 10, 2400}, | ||
681 | {22579200, 48000, 48000, 0x0, 8, 7075}, | 695 | {22579200, 48000, 48000, 0x0, 8, 7075}, |
682 | {33868800, 48000, 48000, 0x0, 5, 8049}, | 696 | {33868800, 48000, 48000, 0x0, 5, 8049}, |
683 | /* 64k */ | 697 | /* 64k */ |
698 | {12000000, 64000, 96000, 0x1, 16, 3840}, | ||
699 | {19200000, 64000, 96000, 0x1, 10, 2400}, | ||
684 | {22579200, 64000, 96000, 0x1, 8, 7075}, | 700 | {22579200, 64000, 96000, 0x1, 8, 7075}, |
685 | {33868800, 64000, 96000, 0x1, 5, 8049}, | 701 | {33868800, 64000, 96000, 0x1, 5, 8049}, |
686 | /* 88.2k */ | 702 | /* 88.2k */ |
703 | {12000000, 88200, 88200, 0x0, 15, 528}, | ||
704 | {19200000, 88200, 88200, 0x0, 9, 4080}, | ||
687 | {22579200, 88200, 88200, 0x0, 8, 0}, | 705 | {22579200, 88200, 88200, 0x0, 8, 0}, |
688 | {33868800, 88200, 88200, 0x0, 5, 3333}, | 706 | {33868800, 88200, 88200, 0x0, 5, 3333}, |
689 | /* 96k */ | 707 | /* 96k */ |
708 | {12000000, 96000, 96000, 0x0, 16, 3840}, | ||
709 | {19200000, 96000, 96000, 0x0, 10, 2400}, | ||
690 | {22579200, 96000, 96000, 0x0, 8, 7075}, | 710 | {22579200, 96000, 96000, 0x0, 8, 7075}, |
691 | {33868800, 96000, 96000, 0x0, 5, 8049}, | 711 | {33868800, 96000, 96000, 0x0, 5, 8049}, |
692 | }; | 712 | }; |
@@ -807,6 +827,8 @@ static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, | |||
807 | struct aic3x_priv *aic3x = codec->private_data; | 827 | struct aic3x_priv *aic3x = codec->private_data; |
808 | 828 | ||
809 | switch (freq) { | 829 | switch (freq) { |
830 | case 12000000: | ||
831 | case 19200000: | ||
810 | case 22579200: | 832 | case 22579200: |
811 | case 33868800: | 833 | case 33868800: |
812 | aic3x->sysclk = freq; | 834 | aic3x->sysclk = freq; |