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

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

Merge "ASoC: sdm845: Add support for fractional sampling rates" into msm-4.9

parents e157002d 2ef6c62e

sound/soc/msm/sdm845.c

+30 −1
Original line number Diff line number Diff line
@@ -397,7 +397,8 @@ static char const *usb_sample_rate_text[] = {"KHZ_8", "KHZ_11P025", 
					"KHZ_88P2", "KHZ_96", "KHZ_176P4",

					"KHZ_192", "KHZ_352P8", "KHZ_384"};

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

						  "KHZ_192"};

						"KHZ_192", "KHZ_32", "KHZ_44P1",

						"KHZ_88P2", "KHZ_176P4"	};

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

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

static char const *tdm_bit_format_text[] = {"S16_LE", "S24_LE", "S32_LE"};
@@ -1466,6 +1467,22 @@ static int ext_disp_rx_sample_rate_get(struct snd_kcontrol *kcontrol, 
		return idx;



	switch (ext_disp_rx_cfg[idx].sample_rate) {

	case SAMPLING_RATE_176P4KHZ:

		sample_rate_val = 6;

		break;



	case SAMPLING_RATE_88P2KHZ:

		sample_rate_val = 5;

		break;



	case SAMPLING_RATE_44P1KHZ:

		sample_rate_val = 4;

		break;



	case SAMPLING_RATE_32KHZ:

		sample_rate_val = 3;

		break;



	case SAMPLING_RATE_192KHZ:

		sample_rate_val = 2;

		break;
@@ -1496,6 +1513,18 @@ static int ext_disp_rx_sample_rate_put(struct snd_kcontrol *kcontrol, 
		return idx;



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

	case 6:

		ext_disp_rx_cfg[idx].sample_rate = SAMPLING_RATE_176P4KHZ;

		break;

	case 5:

		ext_disp_rx_cfg[idx].sample_rate = SAMPLING_RATE_88P2KHZ;

		break;

	case 4:

		ext_disp_rx_cfg[idx].sample_rate = SAMPLING_RATE_44P1KHZ;

		break;

	case 3:

		ext_disp_rx_cfg[idx].sample_rate = SAMPLING_RATE_32KHZ;

		break;

	case 2:

		ext_disp_rx_cfg[idx].sample_rate = SAMPLING_RATE_192KHZ;

		break;