Commit 73388562 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.15-rc1' of... 

Merge tag 'asoc-fix-v6.15-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.15

A set of small fixes, quirks and device ID additions that came in since
-rc1, none of them super stand out.  There's also a change to Srini's
email address in MAINTAINERS.
parents b5458fca e6c46184

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -685,6 +685,8 @@ Simon Wunderlich <sw@simonwunderlich.de> <simon.wunderlich@saxnet.de> 
Simon Wunderlich <sw@simonwunderlich.de> <simon@open-mesh.com>

Simon Wunderlich <sw@simonwunderlich.de> <siwu@hrz.tu-chemnitz.de>

Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Kandagatla <srini@kernel.org> <srinivas.kandagatla@st.com>

Srinivas Kandagatla <srini@kernel.org> <srinivas.kandagatla@linaro.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -17368,7 +17368,7 @@ T: git git://git.infradead.org/nvme.git 
F:	drivers/nvme/target/









NVMEM FRAMEWORK









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Srinivas Kandagatla <srini@kernel.org>









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git









F:	Documentation/ABI/stable/sysfs-bus-nvmem








@@ -19573,7 +19573,7 @@ S:	Supported







F:	drivers/crypto/intel/qat/

















QCOM AUDIO (ASoC) DRIVERS









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Srinivas Kandagatla <srini@kernel.org>









L:	linux-sound@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Supported








@@ -19873,7 +19873,7 @@ F:	Documentation/devicetree/bindings/net/qcom,ethqos.yaml







F:	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

















QUALCOMM FASTRPC DRIVER









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Srinivas Kandagatla <srini@kernel.org>









M:	Amol Maheshwari <amahesh@qti.qualcomm.com>









L:	linux-arm-msm@vger.kernel.org









L:	dri-devel@lists.freedesktop.org








@@ -21921,7 +21921,7 @@ S:	Maintained







F:	drivers/media/rc/serial_ir.c

















SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Srinivas Kandagatla <srini@kernel.org>









L:	linux-sound@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/slimbus/

























drivers/firmware/cirrus/test/cs_dsp_mock_mem_maps.c



+0
−30






























Original line number
Diff line number
Diff line







@@ -461,36 +461,6 @@ unsigned int cs_dsp_mock_xm_header_get_alg_base_in_words(struct cs_dsp_test *pri







}









EXPORT_SYMBOL_NS_GPL(cs_dsp_mock_xm_header_get_alg_base_in_words, "FW_CS_DSP_KUNIT_TEST_UTILS");



















/**









 * cs_dsp_mock_xm_header_get_fw_version_from_regmap() - Firmware version.









 *









 * @priv:	Pointer to struct cs_dsp_test.









 *









 * Return: Firmware version word value.









 */









unsigned int cs_dsp_mock_xm_header_get_fw_version_from_regmap(struct cs_dsp_test *priv)









{









	unsigned int xm = cs_dsp_mock_base_addr_for_mem(priv, WMFW_ADSP2_XM);









	union {









		struct wmfw_id_hdr adsp2;









		struct wmfw_v3_id_hdr halo;









	} hdr;



















	switch (priv->dsp->type) {









	case WMFW_ADSP2:









		regmap_raw_read(priv->dsp->regmap, xm, &hdr.adsp2, sizeof(hdr.adsp2));









		return be32_to_cpu(hdr.adsp2.ver);









	case WMFW_HALO:









		regmap_raw_read(priv->dsp->regmap, xm, &hdr.halo, sizeof(hdr.halo));









		return be32_to_cpu(hdr.halo.ver);









	default:









		KUNIT_FAIL(priv->test, NULL);









		return 0;









	}









}









EXPORT_SYMBOL_NS_GPL(cs_dsp_mock_xm_header_get_fw_version_from_regmap,









		     "FW_CS_DSP_KUNIT_TEST_UTILS");



















/**









 * cs_dsp_mock_xm_header_get_fw_version() - Firmware version.









 *
































drivers/firmware/cirrus/test/cs_dsp_test_bin.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2198,7 +2198,7 @@ static int cs_dsp_bin_test_common_init(struct kunit *test, struct cs_dsp *dsp)

















	priv->local->bin_builder =









		cs_dsp_mock_bin_init(priv, 1,









				     cs_dsp_mock_xm_header_get_fw_version_from_regmap(priv));









				     cs_dsp_mock_xm_header_get_fw_version(xm_hdr));









	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->local->bin_builder);



















	/* We must provide a dummy wmfw to load */
































drivers/firmware/cirrus/test/cs_dsp_test_bin_error.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -451,7 +451,7 @@ static int cs_dsp_bin_err_test_common_init(struct kunit *test, struct cs_dsp *ds

















	local->bin_builder =









		cs_dsp_mock_bin_init(priv, 1,









				     cs_dsp_mock_xm_header_get_fw_version_from_regmap(priv));









				     cs_dsp_mock_xm_header_get_fw_version(local->xm_header));









	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, local->bin_builder);



















	/* Init cs_dsp */