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

Commit ab41a65b 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: Enable support for multichannel tunnel USB"

parents 444860e8 97217c9a

sound/soc/msm/msmcobalt.c

+3 −1
Original line number Diff line number Diff line
@@ -191,7 +191,9 @@ static char const *slim_sample_rate_text[] = {"KHZ_8", "KHZ_16", 
					"KHZ_88P2", "KHZ_96", "KHZ_176P4",

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

static char const *bt_sample_rate_text[] = {"KHZ_8", "KHZ_16", "KHZ_48"};

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

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

					   "Five", "Six", "Seven",

					   "Eight"};

static char const *ch_text[] = {"Two", "Three", "Four", "Five",

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

static char const *usb_sample_rate_text[] = {"KHZ_8", "KHZ_11P025",

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -2502,7 +2502,7 @@ static struct snd_soc_dai_driver msm_dai_q6_usb_rx_dai = { 
			 SNDRV_PCM_RATE_192000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,

		.channels_min = 1,

		.channels_max = 2,

		.channels_max = 8,

		.rate_max = 192000,

		.rate_min = 8000,

	},
@@ -2523,7 +2523,7 @@ static struct snd_soc_dai_driver msm_dai_q6_usb_tx_dai = { 
			 SNDRV_PCM_RATE_192000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,

		.channels_min = 1,

		.channels_max = 2,

		.channels_max = 8,

		.rate_max = 192000,

		.rate_min = 8000,

	},