Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89575022 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: rt5645: rename jd_invert flag in platform data 



The jd_invert flag is actually used for level triggered IRQ. Rename
it to let code more readable.

Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6b5da663

include/sound/rt5645.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ struct rt5645_platform_data { 
	/* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */



	unsigned int jd_mode;

	/* Invert JD when jack insert */

	bool jd_invert;

	/* Use level triggered irq */

	bool level_trigger_irq;

};



#endif

sound/soc/codecs/rt5645.c

+4 −4
Original line number Diff line number Diff line
@@ -3151,7 +3151,7 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) 
			snd_soc_dapm_sync(dapm);

			rt5645->jack_type = SND_JACK_HEADPHONE;

		}

		if (rt5645->pdata.jd_invert)

		if (rt5645->pdata.level_trigger_irq)

			regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,

				RT5645_JD_1_1_MASK, RT5645_JD_1_1_NOR);

	} else { /* jack out */
@@ -3172,7 +3172,7 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) 
			snd_soc_dapm_disable_pin(dapm, "LDO2");

		snd_soc_dapm_disable_pin(dapm, "Mic Det Power");

		snd_soc_dapm_sync(dapm);

		if (rt5645->pdata.jd_invert)

		if (rt5645->pdata.level_trigger_irq)

			regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,

				RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV);

	}
@@ -3586,7 +3586,7 @@ static struct rt5645_platform_data buddy_platform_data = { 
	.dmic1_data_pin = RT5645_DMIC_DATA_GPIO5,

	.dmic2_data_pin = RT5645_DMIC_DATA_IN2P,

	.jd_mode = 3,

	.jd_invert = true,

	.level_trigger_irq = true,

};



static struct dmi_system_id dmi_platform_intel_broadwell[] = {
@@ -3838,7 +3838,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
	regmap_update_bits(rt5645->regmap, RT5645_ADDA_CLK1,

		RT5645_I2S_PD1_MASK, RT5645_I2S_PD1_2);



	if (rt5645->pdata.jd_invert) {

	if (rt5645->pdata.level_trigger_irq) {

		regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,

			RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV);

	}