diff options
author | Ryan Lee <RyanS.Lee@maximintegrated.com> | 2018-01-10 00:02:01 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-10 05:26:37 -0500 |
commit | b6158323bbe706416f8f13912879a429be5cc2a9 (patch) | |
tree | 6171bbbfa520431a287baa96a275b314837569a4 | |
parent | 3831a5b87ff87a31dba2f212bcecd4f2b8c7c6d4 (diff) |
ASoC: max98373: Modified control names for TLV controls
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/max98373.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index ad17bb1fee7b..31b0864583e8 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c | |||
@@ -611,13 +611,13 @@ SOC_ENUM("Output Voltage", max98373_out_volt_enum), | |||
611 | /* Dynamic Headroom Tracking */ | 611 | /* Dynamic Headroom Tracking */ |
612 | SOC_SINGLE("DHT Switch", MAX98373_R20D4_DHT_EN, | 612 | SOC_SINGLE("DHT Switch", MAX98373_R20D4_DHT_EN, |
613 | MAX98373_DHT_EN_SHIFT, 1, 0), | 613 | MAX98373_DHT_EN_SHIFT, 1, 0), |
614 | SOC_SINGLE_TLV("DHT Gain Min", MAX98373_R20D1_DHT_CFG, | 614 | SOC_SINGLE_TLV("DHT Min Volume", MAX98373_R20D1_DHT_CFG, |
615 | MAX98373_DHT_SPK_GAIN_MIN_SHIFT, 9, 0, max98373_dht_spkgain_min_tlv), | 615 | MAX98373_DHT_SPK_GAIN_MIN_SHIFT, 9, 0, max98373_dht_spkgain_min_tlv), |
616 | SOC_SINGLE_TLV("DHT Rot Pnt", MAX98373_R20D1_DHT_CFG, | 616 | SOC_SINGLE_TLV("DHT Rot Pnt Volume", MAX98373_R20D1_DHT_CFG, |
617 | MAX98373_DHT_ROT_PNT_SHIFT, 15, 0, max98373_dht_rotation_point_tlv), | 617 | MAX98373_DHT_ROT_PNT_SHIFT, 15, 0, max98373_dht_rotation_point_tlv), |
618 | SOC_SINGLE_TLV("DHT Attack Step", MAX98373_R20D2_DHT_ATTACK_CFG, | 618 | SOC_SINGLE_TLV("DHT Attack Step Volume", MAX98373_R20D2_DHT_ATTACK_CFG, |
619 | MAX98373_DHT_ATTACK_STEP_SHIFT, 4, 0, max98373_dht_step_size_tlv), | 619 | MAX98373_DHT_ATTACK_STEP_SHIFT, 4, 0, max98373_dht_step_size_tlv), |
620 | SOC_SINGLE_TLV("DHT Release Step", MAX98373_R20D3_DHT_RELEASE_CFG, | 620 | SOC_SINGLE_TLV("DHT Release Step Volume", MAX98373_R20D3_DHT_RELEASE_CFG, |
621 | MAX98373_DHT_RELEASE_STEP_SHIFT, 4, 0, max98373_dht_step_size_tlv), | 621 | MAX98373_DHT_RELEASE_STEP_SHIFT, 4, 0, max98373_dht_step_size_tlv), |
622 | SOC_ENUM("DHT Attack Rate", max98373_dht_attack_rate_enum), | 622 | SOC_ENUM("DHT Attack Rate", max98373_dht_attack_rate_enum), |
623 | SOC_ENUM("DHT Release Rate", max98373_dht_release_rate_enum), | 623 | SOC_ENUM("DHT Release Rate", max98373_dht_release_rate_enum), |
@@ -650,36 +650,36 @@ SOC_SINGLE("BDE Thresh Hysteresis", MAX98373_R209B_BDE_THRESH_HYST, 0, 0xFF, 0), | |||
650 | SOC_SINGLE("BDE Hold Time", MAX98373_R2090_BDE_LVL_HOLD, 0, 0xFF, 0), | 650 | SOC_SINGLE("BDE Hold Time", MAX98373_R2090_BDE_LVL_HOLD, 0, 0xFF, 0), |
651 | SOC_SINGLE("BDE Attack Rate", MAX98373_R2091_BDE_GAIN_ATK_REL_RATE, 4, 0xF, 0), | 651 | SOC_SINGLE("BDE Attack Rate", MAX98373_R2091_BDE_GAIN_ATK_REL_RATE, 4, 0xF, 0), |
652 | SOC_SINGLE("BDE Release Rate", MAX98373_R2091_BDE_GAIN_ATK_REL_RATE, 0, 0xF, 0), | 652 | SOC_SINGLE("BDE Release Rate", MAX98373_R2091_BDE_GAIN_ATK_REL_RATE, 0, 0xF, 0), |
653 | SOC_SINGLE_TLV("BDE LVL1 Clip Thresh", MAX98373_R20A9_BDE_L1_CFG_2, | 653 | SOC_SINGLE_TLV("BDE LVL1 Clip Thresh Volume", MAX98373_R20A9_BDE_L1_CFG_2, |
654 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 654 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
655 | SOC_SINGLE_TLV("BDE LVL2 Clip Thresh", MAX98373_R20AC_BDE_L2_CFG_2, | 655 | SOC_SINGLE_TLV("BDE LVL2 Clip Thresh Volume", MAX98373_R20AC_BDE_L2_CFG_2, |
656 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 656 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
657 | SOC_SINGLE_TLV("BDE LVL3 Clip Thresh", MAX98373_R20AF_BDE_L3_CFG_2, | 657 | SOC_SINGLE_TLV("BDE LVL3 Clip Thresh Volume", MAX98373_R20AF_BDE_L3_CFG_2, |
658 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 658 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
659 | SOC_SINGLE_TLV("BDE LVL4 Clip Thresh", MAX98373_R20B2_BDE_L4_CFG_2, | 659 | SOC_SINGLE_TLV("BDE LVL4 Clip Thresh Volume", MAX98373_R20B2_BDE_L4_CFG_2, |
660 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 660 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
661 | SOC_SINGLE_TLV("BDE LVL1 Clip Gain Reduct", MAX98373_R20AA_BDE_L1_CFG_3, | 661 | SOC_SINGLE_TLV("BDE LVL1 Clip Reduction Volume", MAX98373_R20AA_BDE_L1_CFG_3, |
662 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 662 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
663 | SOC_SINGLE_TLV("BDE LVL2 Clip Gain Reduct", MAX98373_R20AD_BDE_L2_CFG_3, | 663 | SOC_SINGLE_TLV("BDE LVL2 Clip Reduction Volume", MAX98373_R20AD_BDE_L2_CFG_3, |
664 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 664 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
665 | SOC_SINGLE_TLV("BDE LVL3 Clip Gain Reduct", MAX98373_R20B0_BDE_L3_CFG_3, | 665 | SOC_SINGLE_TLV("BDE LVL3 Clip Reduction Volume", MAX98373_R20B0_BDE_L3_CFG_3, |
666 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 666 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
667 | SOC_SINGLE_TLV("BDE LVL4 Clip Gain Reduct", MAX98373_R20B3_BDE_L4_CFG_3, | 667 | SOC_SINGLE_TLV("BDE LVL4 Clip Reduction Volume", MAX98373_R20B3_BDE_L4_CFG_3, |
668 | 0, 0x3C, 0, max98373_bde_gain_tlv), | 668 | 0, 0x3C, 0, max98373_bde_gain_tlv), |
669 | SOC_SINGLE_TLV("BDE LVL1 Limiter Thresh", MAX98373_R20A8_BDE_L1_CFG_1, | 669 | SOC_SINGLE_TLV("BDE LVL1 Limiter Thresh Volume", MAX98373_R20A8_BDE_L1_CFG_1, |
670 | 0, 0xF, 0, max98373_limiter_thresh_tlv), | 670 | 0, 0xF, 0, max98373_limiter_thresh_tlv), |
671 | SOC_SINGLE_TLV("BDE LVL2 Limiter Thresh", MAX98373_R20AB_BDE_L2_CFG_1, | 671 | SOC_SINGLE_TLV("BDE LVL2 Limiter Thresh Volume", MAX98373_R20AB_BDE_L2_CFG_1, |
672 | 0, 0xF, 0, max98373_limiter_thresh_tlv), | 672 | 0, 0xF, 0, max98373_limiter_thresh_tlv), |
673 | SOC_SINGLE_TLV("BDE LVL3 Limiter Thresh", MAX98373_R20AE_BDE_L3_CFG_1, | 673 | SOC_SINGLE_TLV("BDE LVL3 Limiter Thresh Volume", MAX98373_R20AE_BDE_L3_CFG_1, |
674 | 0, 0xF, 0, max98373_limiter_thresh_tlv), | 674 | 0, 0xF, 0, max98373_limiter_thresh_tlv), |
675 | SOC_SINGLE_TLV("BDE LVL4 Limiter Thresh", MAX98373_R20B1_BDE_L4_CFG_1, | 675 | SOC_SINGLE_TLV("BDE LVL4 Limiter Thresh Volume", MAX98373_R20B1_BDE_L4_CFG_1, |
676 | 0, 0xF, 0, max98373_limiter_thresh_tlv), | 676 | 0, 0xF, 0, max98373_limiter_thresh_tlv), |
677 | /* Limiter */ | 677 | /* Limiter */ |
678 | SOC_SINGLE("Limiter Switch", MAX98373_R20E2_LIMITER_EN, | 678 | SOC_SINGLE("Limiter Switch", MAX98373_R20E2_LIMITER_EN, |
679 | MAX98373_LIMITER_EN_SHIFT, 1, 0), | 679 | MAX98373_LIMITER_EN_SHIFT, 1, 0), |
680 | SOC_SINGLE("Limiter Src Switch", MAX98373_R20E0_LIMITER_THRESH_CFG, | 680 | SOC_SINGLE("Limiter Src Switch", MAX98373_R20E0_LIMITER_THRESH_CFG, |
681 | MAX98373_LIMITER_THRESH_SRC_SHIFT, 1, 0), | 681 | MAX98373_LIMITER_THRESH_SRC_SHIFT, 1, 0), |
682 | SOC_SINGLE_TLV("Limiter Thresh", MAX98373_R20E0_LIMITER_THRESH_CFG, | 682 | SOC_SINGLE_TLV("Limiter Thresh Volume", MAX98373_R20E0_LIMITER_THRESH_CFG, |
683 | MAX98373_LIMITER_THRESH_SHIFT, 15, 0, max98373_limiter_thresh_tlv), | 683 | MAX98373_LIMITER_THRESH_SHIFT, 15, 0, max98373_limiter_thresh_tlv), |
684 | SOC_ENUM("Limiter Attack Rate", max98373_limiter_attack_rate_enum), | 684 | SOC_ENUM("Limiter Attack Rate", max98373_limiter_attack_rate_enum), |
685 | SOC_ENUM("Limiter Release Rate", max98373_limiter_release_rate_enum), | 685 | SOC_ENUM("Limiter Release Rate", max98373_limiter_release_rate_enum), |