aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>2016-04-14 00:37:35 -0400
committerMark Brown <broonie@kernel.org>2016-04-28 13:49:24 -0400
commit7e12dc87ac59963cf1765fb8272412db19004987 (patch)
tree5a5defbb3a177e22d4319e47d0d4bef6e9152c41
parent2889099eb8cd0811dc2986643d46c0b62b90eeb4 (diff)
ASoC: Intel: Skylake: Add multichannel support for HDMI
Channel max is changed to 8 from stereo to support multichannel capability for HDMI devices. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/skylake/skl-pcm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index dab0900eef26..8de921272f71 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -51,7 +51,7 @@ static struct snd_pcm_hardware azx_pcm_hw = {
51 .rate_min = 8000, 51 .rate_min = 8000,
52 .rate_max = 48000, 52 .rate_max = 48000,
53 .channels_min = 1, 53 .channels_min = 1,
54 .channels_max = HDA_QUAD, 54 .channels_max = 8,
55 .buffer_bytes_max = AZX_MAX_BUF_SIZE, 55 .buffer_bytes_max = AZX_MAX_BUF_SIZE,
56 .period_bytes_min = 128, 56 .period_bytes_min = 128,
57 .period_bytes_max = AZX_MAX_BUF_SIZE / 2, 57 .period_bytes_max = AZX_MAX_BUF_SIZE / 2,
@@ -682,7 +682,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = {
682 .playback = { 682 .playback = {
683 .stream_name = "HDMI1 Playback", 683 .stream_name = "HDMI1 Playback",
684 .channels_min = HDA_STEREO, 684 .channels_min = HDA_STEREO,
685 .channels_max = HDA_STEREO, 685 .channels_max = 8,
686 .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | 686 .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
687 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | 687 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
688 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | 688 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
@@ -697,7 +697,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = {
697 .playback = { 697 .playback = {
698 .stream_name = "HDMI2 Playback", 698 .stream_name = "HDMI2 Playback",
699 .channels_min = HDA_STEREO, 699 .channels_min = HDA_STEREO,
700 .channels_max = HDA_STEREO, 700 .channels_max = 8,
701 .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | 701 .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
702 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | 702 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
703 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | 703 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
@@ -712,7 +712,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = {
712 .playback = { 712 .playback = {
713 .stream_name = "HDMI3 Playback", 713 .stream_name = "HDMI3 Playback",
714 .channels_min = HDA_STEREO, 714 .channels_min = HDA_STEREO,
715 .channels_max = HDA_STEREO, 715 .channels_max = 8,
716 .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | 716 .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
717 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | 717 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
718 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | 718 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
@@ -765,7 +765,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = {
765 .playback = { 765 .playback = {
766 .stream_name = "iDisp1 Tx", 766 .stream_name = "iDisp1 Tx",
767 .channels_min = HDA_STEREO, 767 .channels_min = HDA_STEREO,
768 .channels_max = HDA_STEREO, 768 .channels_max = 8,
769 .rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_48000, 769 .rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_48000,
770 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE | 770 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE |
771 SNDRV_PCM_FMTBIT_S24_LE, 771 SNDRV_PCM_FMTBIT_S24_LE,
@@ -777,7 +777,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = {
777 .playback = { 777 .playback = {
778 .stream_name = "iDisp2 Tx", 778 .stream_name = "iDisp2 Tx",
779 .channels_min = HDA_STEREO, 779 .channels_min = HDA_STEREO,
780 .channels_max = HDA_STEREO, 780 .channels_max = 8,
781 .rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000| 781 .rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000|
782 SNDRV_PCM_RATE_48000, 782 SNDRV_PCM_RATE_48000,
783 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE | 783 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE |
@@ -790,7 +790,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = {
790 .playback = { 790 .playback = {
791 .stream_name = "iDisp3 Tx", 791 .stream_name = "iDisp3 Tx",
792 .channels_min = HDA_STEREO, 792 .channels_min = HDA_STEREO,
793 .channels_max = HDA_STEREO, 793 .channels_max = 8,
794 .rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000| 794 .rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000|
795 SNDRV_PCM_RATE_48000, 795 SNDRV_PCM_RATE_48000,
796 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE | 796 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE |