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

Commit e4eb7343 authored by Manish Dewangan's avatar Manish Dewangan
Browse files

ASoC: msm8952: add support for packed 24 bit 



Changes to support packed 24 bit (SNDRV_PCM_FORMAT_S24_3LE).

CRs-Fixed: 1011048
Change-Id: Id0718889e14c9f1f184899faa7159e126919537a
Signed-off-by: default avatarManish Dewangan <manish@codeaurora.org>
parent e51543cc

sound/soc/msm/msm8952-slimbus.c

+47 −7
Original line number Diff line number Diff line
@@ -496,6 +496,10 @@ static int mi2s_rx_bit_format_get(struct snd_kcontrol *kcontrol, 
{



	switch (mi2s_rx_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;
@@ -517,6 +521,9 @@ static int mi2s_rx_bit_format_put(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol)

{

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

	case 2:

		mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;

	case 1:

		mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;
@@ -609,6 +616,10 @@ static int slim5_rx_bit_format_get(struct snd_kcontrol *kcontrol, 
{



	switch (slim5_rx_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;
@@ -630,6 +641,9 @@ static int slim5_rx_bit_format_put(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol)

{

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

	case 2:

		slim5_rx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;

	case 1:

		slim5_rx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;
@@ -645,6 +659,10 @@ static int slim6_rx_bit_format_get(struct snd_kcontrol *kcontrol, 
{



	switch (slim6_rx_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;
@@ -666,6 +684,9 @@ static int slim6_rx_bit_format_put(struct snd_kcontrol *kcontrol, 
				   struct snd_ctl_elem_value *ucontrol)

{

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

	case 2:

		slim6_rx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;

	case 1:

		slim6_rx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;
@@ -738,6 +759,10 @@ static int slim0_rx_bit_format_get(struct snd_kcontrol *kcontrol, 
{



	switch (slim0_rx_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;
@@ -759,6 +784,9 @@ static int slim0_rx_bit_format_put(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol)

{

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

	case 2:

		slim0_rx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;

	case 1:

		slim0_rx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;
@@ -827,6 +855,9 @@ static int slim0_tx_bit_format_get(struct snd_kcontrol *kcontrol, 
			struct snd_ctl_elem_value *ucontrol)

{

	switch (slim0_tx_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;
@@ -847,6 +878,9 @@ static int slim0_tx_bit_format_put(struct snd_kcontrol *kcontrol, 
	int rc = 0;



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

	case 2:

		slim0_tx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;

	case 1:

		slim0_tx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;
@@ -1020,7 +1054,7 @@ static const char *const slim0_tx_ch_text[] = {"One", "Two", "Three", "Four", 
						"Five", "Six", "Seven",

						"Eight"};

static const char *const vi_feed_ch_text[] = {"One", "Two"};

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

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

static char const *slim0_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",

	"KHZ_192", "KHZ_44P1"};

static const char *const slim5_rx_ch_text[] = {"One", "Two"};
@@ -1029,20 +1063,22 @@ static char const *slim5_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96", 
	"KHZ_192", "KHZ_44P1"};

static char const *slim6_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",

						  "KHZ_192", "KHZ_44P1"};

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

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

static const char *const proxy_rx_ch_text[] = {"One", "Two", "Three", "Four",

	"Five", "Six", "Seven", "Eight"};

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

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



static const struct soc_enum msm_snd_enum[] = {

	SOC_ENUM_SINGLE_EXT(2, spk_function),

	SOC_ENUM_SINGLE_EXT(2, slim0_rx_ch_text),

	SOC_ENUM_SINGLE_EXT(8, slim0_tx_ch_text),

	SOC_ENUM_SINGLE_EXT(2, rx_bit_format_text),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(rx_bit_format_text),

			    rx_bit_format_text),

	SOC_ENUM_SINGLE_EXT(4, slim0_rx_sample_rate_text),

	SOC_ENUM_SINGLE_EXT(2, vi_feed_ch_text),

	SOC_ENUM_SINGLE_EXT(4, slim5_rx_sample_rate_text),

	SOC_ENUM_SINGLE_EXT(2, slim5_rx_bit_format_text),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(slim5_rx_bit_format_text),

			    slim5_rx_bit_format_text),

	SOC_ENUM_SINGLE_EXT(2, slim5_rx_ch_text),

	SOC_ENUM_SINGLE_EXT(8, proxy_rx_ch_text),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(slim6_rx_sample_rate_text),
@@ -1645,7 +1681,9 @@ static int quat_mi2s_clk_ctl(struct snd_pcm_substream *substream, bool enable) 
			mi2s_rx_clk.enable = enable;

			mi2s_rx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUAD_MI2S_IBIT;

			if (mi2s_rx_bit_format == SNDRV_PCM_FORMAT_S24_LE)

			if ((mi2s_rx_bit_format == SNDRV_PCM_FORMAT_S24_LE) ||

				(mi2s_rx_bit_format ==

						SNDRV_PCM_FORMAT_S24_3LE))

				mi2s_rx_clk.clk_freq_in_hz =

					Q6AFE_LPASS_IBIT_CLK_3_P072_MHZ;

			else
@@ -1705,7 +1743,9 @@ static int quin_mi2s_sclk_ctl(struct snd_pcm_substream *substream, bool enable) 
			mi2s_rx_clk.enable = enable;

			mi2s_rx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT;

			if (mi2s_rx_bit_format == SNDRV_PCM_FORMAT_S24_LE)

			if ((mi2s_rx_bit_format == SNDRV_PCM_FORMAT_S24_LE) ||

				(mi2s_rx_bit_format ==

					SNDRV_PCM_FORMAT_S24_3LE))

				mi2s_rx_clk.clk_freq_in_hz =

					Q6AFE_LPASS_IBIT_CLK_3_P072_MHZ;

			else

sound/soc/msm/msm8952.c

+9 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static struct afe_clk_set wsa_ana_clk = { 
	0,

};



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

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

static const char *const mi2s_ch_text[] = {"One", "Two"};

static const char *const loopback_mclk_text[] = {"DISABLE", "ENABLE"};

static const char *const btsco_rate_text[] = {"BTSCO_RATE_8KHZ",
@@ -747,6 +747,10 @@ static int mi2s_rx_bit_format_get(struct snd_kcontrol *kcontrol, 
{



	switch (mi2s_rx_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;
@@ -768,6 +772,10 @@ static int mi2s_rx_bit_format_put(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol)

{

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

	case 2:

		mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		mi2s_rx_bits_per_sample = 32;

		break;

	case 1:

		mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		mi2s_rx_bits_per_sample = 32;