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

Commit 2e3e8188 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: Add S24_3LE support to DP driver"

parents 98094374 8e4368d3

asoc/codecs/msm_hdmi_codec_rx.c

+2 −1
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ static struct snd_soc_dai_driver msm_ext_disp_audio_codec_rx_dais[] = { 
			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				   SNDRV_PCM_FMTBIT_S24_LE,

				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S24_3LE,

		},

		.ops = &msm_ext_disp_audio_codec_rx_dai_ops,

	},

asoc/msm-dai-q6-hdmi-v2.c

+6 −2
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ static int msm_dai_q6_hdmi_hw_params(struct snd_pcm_substream *substream, 
		dai_data->port_config.hdmi_multi_ch.bit_width = 16;

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

	case SNDRV_PCM_FORMAT_S24_3LE:

		dai_data->port_config.hdmi_multi_ch.bit_width = 24;

		break;

	}
@@ -435,7 +436,9 @@ static struct snd_soc_dai_driver msm_dai_q6_hdmi_hdmi_rx_dai = { 
			 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |

			 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |

			 SNDRV_PCM_RATE_192000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,

		.formats = SNDRV_PCM_FMTBIT_S16_LE |

			   SNDRV_PCM_FMTBIT_S24_LE |

			   SNDRV_PCM_FMTBIT_S24_3LE,

		.channels_min = 2,

		.channels_max = 8,

		.rate_max = 192000,
@@ -457,7 +460,8 @@ static struct snd_soc_dai_driver msm_dai_q6_display_port_rx_dai[] = { 
				 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				   SNDRV_PCM_FMTBIT_S24_LE,

				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S24_3LE,

			.channels_min = 2,

			.channels_max = 8,

			.rate_max =     192000,

asoc/sdm845.c

+8 −2
Original line number Diff line number Diff line
@@ -408,7 +408,8 @@ static const char *const slim_tx_ch_text[] = {"One", "Two", "Three", "Four", 
static const char *const vi_feed_ch_text[] = {"One", "Two"};

static char const *bit_format_text[] = {"S16_LE", "S24_LE", "S24_3LE",

					  "S32_LE"};

static char const *ext_disp_bit_format_text[] = {"S16_LE", "S24_LE"};

static char const *ext_disp_bit_format_text[] = {"S16_LE", "S24_LE",

						 "S24_3LE"};

static char const *slim_sample_rate_text[] = {"KHZ_8", "KHZ_16",

					"KHZ_32", "KHZ_44P1", "KHZ_48",

					"KHZ_88P2", "KHZ_96", "KHZ_176P4",
@@ -1420,10 +1421,12 @@ static int ext_disp_rx_format_get(struct snd_kcontrol *kcontrol, 
		return idx;



	switch (ext_disp_rx_cfg[idx].bit_format) {

	case SNDRV_PCM_FORMAT_S24_3LE:

		ucontrol->value.integer.value[0] = 2;

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

		ucontrol->value.integer.value[0] = 1;

		break;



	case SNDRV_PCM_FORMAT_S16_LE:

	default:

		ucontrol->value.integer.value[0] = 0;
@@ -1445,6 +1448,9 @@ static int ext_disp_rx_format_put(struct snd_kcontrol *kcontrol, 
		return idx;



	switch (ucontrol->value.integer.value[0]) {

	case 2:

		ext_disp_rx_cfg[idx].bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;

	case 1:

		ext_disp_rx_cfg[idx].bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;