diff options
| author | Mark Brown | 2021-03-01 23:31:40 +0000 |
|---|---|---|
| committer | Mark Brown | 2021-03-10 12:50:52 +0000 |
| commit | 19244c6c9c78c0430e2be048a12daa38f7131d9d (patch) | |
| tree | 027ac3298dc306a1153b028a1cb28016660b7868 /sound/soc | |
| parent | bb18c678754ce1514100fb4c0bf6113b5af36c48 (diff) | |
| parent | eee51df776bd6cac10a76b2779a9fdee3f622b2b (diff) | |
Merge series "AsoC: rt5640/rt5651: Volume control fixes" from Hans de Goede <hdegoede@redhat.com>:
Hi All,
Here is a series of rt5640/rt5651 volume-control fixes which I wrote
while working on a bytcr-rt5640 UCM profile patch-series adding
hardware-volume control to devices using this UCM profile.
The UCM series will also work on older kernels, but it works best on
kernels with this series applied, giving e.g. finer grained volume
control and support for hardware muting the outputs.
Regards,
Hans
Hans de Goede (5):
ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor
of 10
ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor
of 10
ASoC: rt5640: Add emulated 'DAC1 Playback Switch' control
ASoC: rt5640: Rename 'Mono DAC Playback Volume' to 'DAC2 Playback
Volume'
ASoC: Intel: bytcr_rt5640: Add used AIF to the components string
sound/soc/codecs/rt5640.c | 106 +++++++++++++++++++++++---
sound/soc/codecs/rt5640.h | 4 +
sound/soc/codecs/rt5651.c | 4 +-
sound/soc/intel/boards/bytcr_rt5640.c | 11 ++-
4 files changed, 111 insertions(+), 14 deletions(-)
--
2.30.1
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/rt5640.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5651.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 1414ad15d01c..a5674c227b3a 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -339,9 +339,9 @@ static bool rt5640_readable_register(struct device *dev, unsigned int reg) } static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0); -static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0); +static const DECLARE_TLV_DB_MINMAX(dac_vol_tlv, -6562, 0); static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); -static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); +static const DECLARE_TLV_DB_MINMAX(adc_vol_tlv, -1762, 3000); static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); /* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */ diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index d198e191fb0c..e59fdc81dbd4 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -285,9 +285,9 @@ static bool rt5651_readable_register(struct device *dev, unsigned int reg) } static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0); -static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0); +static const DECLARE_TLV_DB_MINMAX(dac_vol_tlv, -6562, 0); static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); -static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); +static const DECLARE_TLV_DB_MINMAX(adc_vol_tlv, -1762, 3000); static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); /* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */ |