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

Commit c4450699 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/rt5645' of... 

Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645
parents 6ff33f39 df5c79e9

sound/soc/codecs/rt5645.c

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

			rt5645->jack_type = SND_JACK_HEADPHONE;

		}



		snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);

		snd_soc_write(codec, RT5645_DEPOP_M1, 0x001d);

		snd_soc_write(codec, RT5645_DEPOP_M1, 0x0001);

	} else { /* jack out */

		rt5645->jack_type = 0;
@@ -2880,8 +2876,6 @@ int rt5645_set_jack_detect(struct snd_soc_codec *codec, 
		rt5645->en_button_func = true;

		regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,

				RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ);

		regmap_update_bits(rt5645->regmap, RT5645_DEPOP_M1,

				RT5645_HP_CB_MASK, RT5645_HP_CB_PU);

		regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1,

				RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL);

	}
@@ -3205,6 +3199,13 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Celes"),

		},

	},

	{

		.ident = "Google Ultima",

		.callback = strago_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "Ultima"),

		},

	},

	{ }

};