Commit 5948342a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.17-rc4' of... 

Merge tag 'asoc-fix-v5.17-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.18

More fixes that have arrived in the past few -rcs, plus a MAINTAINERS
update.  The biggest update here is the fix for control change
notifications in ASoC generic controls found by mixer-test.
parents 2a845837 a887f9c7

Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ title: Audio codec controlled by ChromeOS EC 


maintainers:

  - Cheng-Yi Chiang <cychiang@chromium.org>

  - Tzung-Bi Shih <tzungbi@google.com>



description: |

  Google's ChromeOS EC codec is a digital mic codec provided by the

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4543,6 +4543,7 @@ F: drivers/platform/chrome/ 








CHROMEOS EC CODEC DRIVER









M:	Cheng-Yi Chiang <cychiang@chromium.org>









M:	Tzung-Bi Shih <tzungbi@google.com>









R:	Guenter Roeck <groeck@chromium.org>









S:	Maintained









F:	Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
































drivers/soc/mediatek/mtk-scpsys.c



+4
−11






























Original line number
Diff line number
Diff line







@@ -411,17 +411,12 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)







	return ret;









}



















static int init_clks(struct platform_device *pdev, struct clk **clk)









static void init_clks(struct platform_device *pdev, struct clk **clk)









{









	int i;



















	for (i = CLK_NONE + 1; i < CLK_MAX; i++) {









	for (i = CLK_NONE + 1; i < CLK_MAX; i++)









		clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);









		if (IS_ERR(clk[i]))









			return PTR_ERR(clk[i]);









	}



















	return 0;









}



















static struct scp *init_scp(struct platform_device *pdev,








@@ -431,7 +426,7 @@ static struct scp *init_scp(struct platform_device *pdev,







{









	struct genpd_onecell_data *pd_data;









	struct resource *res;









	int i, j, ret;









	int i, j;









	struct scp *scp;









	struct clk *clk[CLK_MAX];


















@@ -486,9 +481,7 @@ static struct scp *init_scp(struct platform_device *pdev,

















	pd_data->num_domains = num;



















	ret = init_clks(pdev, clk);









	if (ret)









		return ERR_PTR(ret);









	init_clks(pdev, clk);



















	for (i = 0; i < num; i++) {









		struct scp_domain *scpd = &scp->domains[i];
































sound/soc/amd/acp/acp-mach.h



+0
−1






























Original line number
Diff line number
Diff line







@@ -21,7 +21,6 @@







#include <linux/gpio/consumer.h>



















#define EN_SPKR_GPIO_GB                0x11F









#define EN_SPKR_GPIO_NK                0x146









#define EN_SPKR_GPIO_NONE      -EINVAL



















enum be_id {
































sound/soc/amd/acp/acp-sof-mach.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -37,7 +37,7 @@ static struct acp_card_drvdata sof_rt5682_max_data = {







	.hs_codec_id = RT5682,









	.amp_codec_id = MAX98360A,









	.dmic_codec_id = DMIC,









	.gpio_spkr_en = EN_SPKR_GPIO_NK,









	.gpio_spkr_en = EN_SPKR_GPIO_NONE,









};



















static struct acp_card_drvdata sof_rt5682s_max_data = {








@@ -47,7 +47,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = {







	.hs_codec_id = RT5682S,









	.amp_codec_id = MAX98360A,









	.dmic_codec_id = DMIC,









	.gpio_spkr_en = EN_SPKR_GPIO_NK,









	.gpio_spkr_en = EN_SPKR_GPIO_NONE,









};



















static const struct snd_kcontrol_new acp_controls[] = {