Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e12dc87 authored by Subhransu S. Prusty's avatar Subhransu S. Prusty Committed by Mark Brown
Browse files

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: default avatarSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2889099e

sound/soc/intel/skylake/skl-pcm.c

+7 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static struct snd_pcm_hardware azx_pcm_hw = { 
	.rate_min =		8000,

	.rate_max =		48000,

	.channels_min =		1,

	.channels_max =		HDA_QUAD,

	.channels_max =		8,

	.buffer_bytes_max =	AZX_MAX_BUF_SIZE,

	.period_bytes_min =	128,

	.period_bytes_max =	AZX_MAX_BUF_SIZE / 2,
@@ -682,7 +682,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { 
	.playback = {

		.stream_name = "HDMI1 Playback",

		.channels_min = HDA_STEREO,

		.channels_max = HDA_STEREO,

		.channels_max = 8,

		.rates = SNDRV_PCM_RATE_32000 |	SNDRV_PCM_RATE_44100 |

			SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |

			SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
@@ -697,7 +697,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { 
	.playback = {

		.stream_name = "HDMI2 Playback",

		.channels_min = HDA_STEREO,

		.channels_max = HDA_STEREO,

		.channels_max = 8,

		.rates = SNDRV_PCM_RATE_32000 |	SNDRV_PCM_RATE_44100 |

			SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |

			SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
@@ -712,7 +712,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { 
	.playback = {

		.stream_name = "HDMI3 Playback",

		.channels_min = HDA_STEREO,

		.channels_max = HDA_STEREO,

		.channels_max = 8,

		.rates = SNDRV_PCM_RATE_32000 |	SNDRV_PCM_RATE_44100 |

			SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |

			SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
@@ -765,7 +765,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { 
	.playback = {

		.stream_name = "iDisp1 Tx",

		.channels_min = HDA_STEREO,

		.channels_max = HDA_STEREO,

		.channels_max = 8,

		.rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_48000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE |

			SNDRV_PCM_FMTBIT_S24_LE,
@@ -777,7 +777,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { 
	.playback = {

		.stream_name = "iDisp2 Tx",

		.channels_min = HDA_STEREO,

		.channels_max = HDA_STEREO,

		.channels_max = 8,

		.rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000|

			SNDRV_PCM_RATE_48000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE |
@@ -790,7 +790,7 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { 
	.playback = {

		.stream_name = "iDisp3 Tx",

		.channels_min = HDA_STEREO,

		.channels_max = HDA_STEREO,

		.channels_max = 8,

		.rates = SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000|

			SNDRV_PCM_RATE_48000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE |