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

Unverified Commit 27a4b3f9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/sgtl5000' of... 

Merge branch 'fix/sgtl5000' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000
parents 58fadc19 a8992973

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -9921,6 +9921,13 @@ F: Documentation/ABI/stable/sysfs-bus-nvmem 
F:	include/linux/nvmem-consumer.h

F:	include/linux/nvmem-provider.h



NXP SGTL5000 DRIVER

M:	Fabio Estevam <fabio.estevam@nxp.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/sound/sgtl5000.txt

F:	sound/soc/codecs/sgtl5000*



NXP TDA998X DRM DRIVER

M:	Russell King <linux@armlinux.org.uk>

S:	Supported

sound/soc/codecs/sgtl5000.c

+11 −0
Original line number Diff line number Diff line
@@ -876,15 +876,26 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream, 
static int sgtl5000_set_bias_level(struct snd_soc_component *component,

				   enum snd_soc_bias_level level)

{

	struct sgtl5000_priv *sgtl = snd_soc_component_get_drvdata(component);

	int ret;



	switch (level) {

	case SND_SOC_BIAS_ON:

	case SND_SOC_BIAS_PREPARE:

	case SND_SOC_BIAS_STANDBY:

		regcache_cache_only(sgtl->regmap, false);

		ret = regcache_sync(sgtl->regmap);

		if (ret) {

			regcache_cache_only(sgtl->regmap, true);

			return ret;

		}



		snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,

				    SGTL5000_REFTOP_POWERUP,

				    SGTL5000_REFTOP_POWERUP);

		break;

	case SND_SOC_BIAS_OFF:

		regcache_cache_only(sgtl->regmap, true);

		snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,

				    SGTL5000_REFTOP_POWERUP, 0);

		break;