Commit 2f69b4b2 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/rl6231', 'asoc/topic/rl6347a',... 

Merge remote-tracking branches 'asoc/topic/rl6231', 'asoc/topic/rl6347a', 'asoc/topic/rockchip', 'asoc/topic/rt286' and 'asoc/topic/rt298' into asoc-next
parents 2f028b15 59b01131 d3a58664 705e9994 4774e27a e3d62cb8

sound/soc/codecs/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -690,7 +690,6 @@ config SND_SOC_RL6347A 


config SND_SOC_RT286

	tristate

	select SND_SOC_RT5663

	depends on I2C



config SND_SOC_RT298

sound/soc/codecs/rl6231.c

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ struct pll_calc_map { 
};



static const struct pll_calc_map pll_preset_table[] = {

	{19200000,  4096000,  23, 14, 1, false},

	{19200000,  24576000,  3, 30, 3, false},

};

sound/soc/codecs/rl6347a.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ int rl6347a_hw_write(void *context, unsigned int reg, unsigned int value) 
	if (ret == 4)

		return 0;

	else

		pr_err("ret=%d\n", ret);

		dev_err(&client->dev, "I2C error %d\n", ret);

	if (ret < 0)

		return ret;

	else

sound/soc/codecs/rt298.c

+22 −2
Original line number Diff line number Diff line
@@ -326,11 +326,31 @@ static void rt298_jack_detect_work(struct work_struct *work) 
int rt298_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)

{

	struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm;

	bool hp = false;

	bool mic = false;

	int status = 0;



	/* If jack in NULL, disable HS jack */

	if (!jack) {

		regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x0);

		dapm = snd_soc_codec_get_dapm(codec);

		snd_soc_dapm_disable_pin(dapm, "LDO1");

		snd_soc_dapm_sync(dapm);

		return 0;

	}



	rt298->jack = jack;

	regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2);



	rt298_jack_detect(rt298, &hp, &mic);

	if (hp == true)

		status |= SND_JACK_HEADPHONE;



	/* Send an initial empty report */

	snd_soc_jack_report(rt298->jack, 0,

	if (mic == true)

		status |= SND_JACK_MICROPHONE;



	snd_soc_jack_report(rt298->jack, status,

		SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);



	return 0;

sound/soc/rockchip/rk3399_gru_sound.c

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#define SOUND_FS	256



unsigned int rt5514_dmic_delay;

static unsigned int rt5514_dmic_delay;



static struct snd_soc_jack rockchip_sound_jack;
@@ -228,15 +228,15 @@ static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static struct snd_soc_ops rockchip_sound_max98357a_ops = {

static const struct snd_soc_ops rockchip_sound_max98357a_ops = {

	.hw_params = rockchip_sound_max98357a_hw_params,

};



static struct snd_soc_ops rockchip_sound_rt5514_ops = {

static const struct snd_soc_ops rockchip_sound_rt5514_ops = {

	.hw_params = rockchip_sound_rt5514_hw_params,

};



static struct snd_soc_ops rockchip_sound_da7219_ops = {

static const struct snd_soc_ops rockchip_sound_da7219_ops = {

	.hw_params = rockchip_sound_da7219_hw_params,

};