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

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

Merge remote-tracking branches 'asoc/fix/da732x' and 'asoc/fix/sta32x' into asoc-linus

parents f3cfc7d9 75306820 b3619b28

sound/soc/codecs/da732x.c

+12 −0
Original line number Diff line number Diff line
@@ -1268,11 +1268,23 @@ static struct snd_soc_dai_driver da732x_dai[] = { 
	},

};



static bool da732x_volatile(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case DA732X_REG_HPL_DAC_OFF_CNTL:

	case DA732X_REG_HPR_DAC_OFF_CNTL:

		return true;

	default:

		return false;

	}

}



static const struct regmap_config da732x_regmap = {

	.reg_bits		= 8,

	.val_bits		= 8,



	.max_register		= DA732X_MAX_REG,

	.volatile_reg		= da732x_volatile,

	.reg_defaults		= da732x_reg_cache,

	.num_reg_defaults	= ARRAY_SIZE(da732x_reg_cache),

	.cache_type		= REGCACHE_RBTREE,

sound/soc/codecs/sta32x.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ SOC_SINGLE_TLV("Treble Tone Control", STA32X_TONE, STA32X_TONE_TTC_SHIFT, 15, 0, 
SOC_ENUM("Limiter1 Attack Rate (dB/ms)", sta32x_limiter1_attack_rate_enum),

SOC_ENUM("Limiter2 Attack Rate (dB/ms)", sta32x_limiter2_attack_rate_enum),

SOC_ENUM("Limiter1 Release Rate (dB/ms)", sta32x_limiter1_release_rate_enum),

SOC_ENUM("Limiter2 Release Rate (dB/ms)", sta32x_limiter1_release_rate_enum),

SOC_ENUM("Limiter2 Release Rate (dB/ms)", sta32x_limiter2_release_rate_enum),



/* depending on mode, the attack/release thresholds have

 * two different enum definitions; provide both