Merge "ASoC: wcd937x: Enable hph OCP"
diff --git a/asoc/msm-dai-q6-v2.c b/asoc/msm-dai-q6-v2.c
index 171337a..9516867 100644
--- a/asoc/msm-dai-q6-v2.c
+++ b/asoc/msm-dai-q6-v2.c
@@ -3231,8 +3231,9 @@
sizeof(struct asm_aac_dec_cfg_v2_t));
break;
case DEC_FMT_SBC:
- case DEC_FMT_MP3:
- /* No decoder specific data available */
+ memcpy(&dai_data->dec_config.data,
+ ucontrol->value.bytes.data + format_size,
+ sizeof(struct asm_sbc_dec_cfg_t));
break;
default:
pr_debug("%s: Default decoder config for %d format: Expect abr_dec_cfg\n",
diff --git a/asoc/sdm845.c b/asoc/sdm845.c
index 392ac85..e2ab1f0 100644
--- a/asoc/sdm845.c
+++ b/asoc/sdm845.c
@@ -5412,6 +5412,7 @@
.codec_name = "tavil_codec",
.codec_dai_name = "tavil_rx2",
.ignore_suspend = 1,
+ .ignore_pmdown_time = 1,
.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
.ops = &msm_slimbus_2_be_ops,
},
diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 0d5721e..2810beb 100644
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -3541,6 +3541,10 @@
media_type.sample_rate =
cfg->data.aac_config.sample_rate;
break;
+ case ASM_MEDIA_FMT_SBC:
+ media_type.sample_rate =
+ cfg->data.sbc_config.sample_rate;
+ break;
default:
media_type.sample_rate =
afe_config.slim_sch.sample_rate;
diff --git a/include/dsp/apr_audio-v2.h b/include/dsp/apr_audio-v2.h
index eb529dc..9ac7281 100644
--- a/include/dsp/apr_audio-v2.h
+++ b/include/dsp/apr_audio-v2.h
@@ -4311,9 +4311,23 @@
* #ASM_MEDIA_FMT_SBC media format.
*/
struct asm_sbc_dec_cfg_t {
- /* All configuration is extracted from the stream */
-} __packed;
+ uint16_t channels;
+ /*
+ * Number of channels present in the SBC stream.
+ *
+ * @values
+ * - 1 -- Mono
+ * - 2 -- Stereo
+ */
+ uint32_t sample_rate;
+ /*
+ * Number of samples per second.
+ *
+ * @values 8000, 11025, 12000, 16000, 22050, 24000, 32000,
+ * 44100, 48000, 64000, 88200, 96000 Hz
+ */
+} __packed;
/*
* Payload of the MP3 decoder configuration parameters in the
* #ASM_MEDIA_FMT_MP3 media format.