Commit 78cfca32 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/cs35l32',... 

Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/cs35l32', 'asoc/fix/hdac', 'asoc/fix/nau8825' and 'asoc/fix/rt5616' into asoc-linus
parents e4080577 ab9f87c4 dd5dc001 1b377ccd e6cee900 af139d55

sound/soc/codecs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ config SND_SOC_RT5514 


config SND_SOC_RT5616

	tristate "Realtek RT5616 CODEC"

	depends on I2C



config SND_SOC_RT5631

	tristate "Realtek ALC5631/RT5631 CODEC"

sound/soc/codecs/arizona.c

+12 −0
Original line number Diff line number Diff line
@@ -249,6 +249,18 @@ int arizona_init_spk(struct snd_soc_codec *codec) 
}

EXPORT_SYMBOL_GPL(arizona_init_spk);



int arizona_free_spk(struct snd_soc_codec *codec)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;



	arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT_WARN, arizona);

	arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT, arizona);



	return 0;

}

EXPORT_SYMBOL_GPL(arizona_free_spk);



static const struct snd_soc_dapm_route arizona_mono_routes[] = {

	{ "OUT1R", NULL, "OUT1L" },

	{ "OUT2R", NULL, "OUT2L" },

sound/soc/codecs/arizona.h

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,8 @@ extern int arizona_init_spk(struct snd_soc_codec *codec); 
extern int arizona_init_gpio(struct snd_soc_codec *codec);

extern int arizona_init_mono(struct snd_soc_codec *codec);



extern int arizona_free_spk(struct snd_soc_codec *codec);



extern int arizona_init_dai(struct arizona_priv *priv, int dai);



int arizona_set_output_mode(struct snd_soc_codec *codec, int output,

sound/soc/codecs/cs35l32.c

+13 −4
Original line number Diff line number Diff line
@@ -274,7 +274,9 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client, 
	if (of_property_read_u32(np, "cirrus,sdout-share", &val) >= 0)

		pdata->sdout_share = val;



	of_property_read_u32(np, "cirrus,boost-manager", &val);

	if (of_property_read_u32(np, "cirrus,boost-manager", &val))

		val = -1u;



	switch (val) {

	case CS35L32_BOOST_MGR_AUTO:

	case CS35L32_BOOST_MGR_AUTO_AUDIO:
@@ -282,13 +284,15 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client, 
	case CS35L32_BOOST_MGR_FIXED:

		pdata->boost_mng = val;

		break;

	case -1u:

	default:

		dev_err(&i2c_client->dev,

			"Wrong cirrus,boost-manager DT value %d\n", val);

		pdata->boost_mng = CS35L32_BOOST_MGR_BYPASS;

	}



	of_property_read_u32(np, "cirrus,sdout-datacfg", &val);

	if (of_property_read_u32(np, "cirrus,sdout-datacfg", &val))

		val = -1u;

	switch (val) {

	case CS35L32_DATA_CFG_LR_VP:

	case CS35L32_DATA_CFG_LR_STAT:
@@ -296,13 +300,15 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client, 
	case CS35L32_DATA_CFG_LR_VPSTAT:

		pdata->sdout_datacfg = val;

		break;

	case -1u:

	default:

		dev_err(&i2c_client->dev,

			"Wrong cirrus,sdout-datacfg DT value %d\n", val);

		pdata->sdout_datacfg = CS35L32_DATA_CFG_LR;

	}



	of_property_read_u32(np, "cirrus,battery-threshold", &val);

	if (of_property_read_u32(np, "cirrus,battery-threshold", &val))

		val = -1u;

	switch (val) {

	case CS35L32_BATT_THRESH_3_1V:

	case CS35L32_BATT_THRESH_3_2V:
@@ -310,13 +316,15 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client, 
	case CS35L32_BATT_THRESH_3_4V:

		pdata->batt_thresh = val;

		break;

	case -1u:

	default:

		dev_err(&i2c_client->dev,

			"Wrong cirrus,battery-threshold DT value %d\n", val);

		pdata->batt_thresh = CS35L32_BATT_THRESH_3_3V;

	}



	of_property_read_u32(np, "cirrus,battery-recovery", &val);

	if (of_property_read_u32(np, "cirrus,battery-recovery", &val))

		val = -1u;

	switch (val) {

	case CS35L32_BATT_RECOV_3_1V:

	case CS35L32_BATT_RECOV_3_2V:
@@ -326,6 +334,7 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client, 
	case CS35L32_BATT_RECOV_3_6V:

		pdata->batt_recov = val;

		break;

	case -1u:

	default:

		dev_err(&i2c_client->dev,

			"Wrong cirrus,battery-recovery DT value %d\n", val);

sound/soc/codecs/cs47l24.c

+3 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,9 @@ static int cs47l24_codec_remove(struct snd_soc_codec *codec) 
	priv->core.arizona->dapm = NULL;



	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);



	arizona_free_spk(codec);



	return 0;

}