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

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

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

ASoC: Fixes for v5.13

A collection of fixes and device ID updates that have come up in the
past few -rcs, none of which stand out particularly.
parents 600dd2a7 c8a4556d

Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ patternProperties: 
          rate



      sound-dai:

        $ref: /schemas/types.yaml#/definitions/phandle

        $ref: /schemas/types.yaml#/definitions/phandle-array

        description: phandle of the CPU DAI



    patternProperties:
@@ -71,7 +71,7 @@ patternProperties: 


        properties:

          sound-dai:

            $ref: /schemas/types.yaml#/definitions/phandle

            $ref: /schemas/types.yaml#/definitions/phandle-array

            description: phandle of the codec DAI



        required:

sound/soc/codecs/rt5659.c

+21 −5
Original line number Diff line number Diff line
@@ -2433,13 +2433,18 @@ static int set_dmic_power(struct snd_soc_dapm_widget *w, 
	return 0;

}



static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = {

static const struct snd_soc_dapm_widget rt5659_particular_dapm_widgets[] = {

	SND_SOC_DAPM_SUPPLY("LDO2", RT5659_PWR_ANLG_3, RT5659_PWR_LDO2_BIT, 0,

		NULL, 0),

	SND_SOC_DAPM_SUPPLY("PLL", RT5659_PWR_ANLG_3, RT5659_PWR_PLL_BIT, 0,

		NULL, 0),

	SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5659_PWR_ANLG_2, RT5659_PWR_MB1_BIT,

		0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("Mic Det Power", RT5659_PWR_VOL,

		RT5659_PWR_MIC_DET_BIT, 0, NULL, 0),

};



static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = {

	SND_SOC_DAPM_SUPPLY("PLL", RT5659_PWR_ANLG_3, RT5659_PWR_PLL_BIT, 0,

		NULL, 0),

	SND_SOC_DAPM_SUPPLY("Mono Vref", RT5659_PWR_ANLG_1,

		RT5659_PWR_VREF3_BIT, 0, NULL, 0),
@@ -2464,8 +2469,6 @@ static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = { 
		RT5659_ADC_MONO_R_ASRC_SFT, 0, NULL, 0),



	/* Input Side */

	SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5659_PWR_ANLG_2, RT5659_PWR_MB1_BIT,

		0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("MICBIAS2", RT5659_PWR_ANLG_2, RT5659_PWR_MB2_BIT,

		0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("MICBIAS3", RT5659_PWR_ANLG_2, RT5659_PWR_MB3_BIT,
@@ -3660,10 +3663,23 @@ static int rt5659_set_bias_level(struct snd_soc_component *component, 


static int rt5659_probe(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm =

		snd_soc_component_get_dapm(component);

	struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);



	rt5659->component = component;



	switch (rt5659->pdata.jd_src) {

	case RT5659_JD_HDA_HEADER:

		break;



	default:

		snd_soc_dapm_new_controls(dapm,

			rt5659_particular_dapm_widgets,

			ARRAY_SIZE(rt5659_particular_dapm_widgets));

		break;

	}



	return 0;

}

sound/soc/codecs/rt5682-sdw.c

+2 −1
Original line number Diff line number Diff line
@@ -462,7 +462,8 @@ static int rt5682_io_init(struct device *dev, struct sdw_slave *slave) 


	regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_2,

		RT5682_EXT_JD_SRC, RT5682_EXT_JD_SRC_MANUAL);

	regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd042);

	regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd142);

	regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_5, 0x0700, 0x0600);

	regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_3,

		RT5682_CBJ_IN_BUF_EN, RT5682_CBJ_IN_BUF_EN);

	regmap_update_bits(rt5682->regmap, RT5682_SAR_IL_CMD_1,

sound/soc/codecs/tas2562.h

+7 −7
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ 
#define TAS2562_TDM_CFG0_RAMPRATE_MASK		BIT(5)

#define TAS2562_TDM_CFG0_RAMPRATE_44_1		BIT(5)

#define TAS2562_TDM_CFG0_SAMPRATE_MASK		GENMASK(3, 1)

#define TAS2562_TDM_CFG0_SAMPRATE_7305_8KHZ	0x0

#define TAS2562_TDM_CFG0_SAMPRATE_14_7_16KHZ	0x1

#define TAS2562_TDM_CFG0_SAMPRATE_22_05_24KHZ	0x2

#define TAS2562_TDM_CFG0_SAMPRATE_29_4_32KHZ	0x3

#define TAS2562_TDM_CFG0_SAMPRATE_44_1_48KHZ	0x4

#define TAS2562_TDM_CFG0_SAMPRATE_88_2_96KHZ	0x5

#define TAS2562_TDM_CFG0_SAMPRATE_176_4_192KHZ	0x6

#define TAS2562_TDM_CFG0_SAMPRATE_7305_8KHZ	(0x0 << 1)

#define TAS2562_TDM_CFG0_SAMPRATE_14_7_16KHZ	(0x1 << 1)

#define TAS2562_TDM_CFG0_SAMPRATE_22_05_24KHZ	(0x2 << 1)

#define TAS2562_TDM_CFG0_SAMPRATE_29_4_32KHZ	(0x3 << 1)

#define TAS2562_TDM_CFG0_SAMPRATE_44_1_48KHZ	(0x4 << 1)

#define TAS2562_TDM_CFG0_SAMPRATE_88_2_96KHZ	(0x5 << 1)

#define TAS2562_TDM_CFG0_SAMPRATE_176_4_192KHZ	(0x6 << 1)



#define TAS2562_TDM_CFG2_RIGHT_JUSTIFY	BIT(6)

sound/soc/fsl/fsl-asoc-card.c

+1 −0
Original line number Diff line number Diff line
@@ -744,6 +744,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	/* Initialize sound card */

	priv->pdev = pdev;

	priv->card.dev = &pdev->dev;

	priv->card.owner = THIS_MODULE;

	ret = snd_soc_of_parse_card_name(&priv->card, "model");

	if (ret) {

		snprintf(priv->name, sizeof(priv->name), "%s-audio",