ASoC: codecs: ES8326: Change Hp_detect register names

The old register naming method is confusing. The reg 0x57 decides
the default headset hardware connection type, and the reg 0xfb is
the headset detection status register, which changes during headset
insertion. Change the name to ES8326_HPDET_TYPE and ES8326_HPDET_STA.

Signed-off-by: Zhu Ning <zhuning0077@gmail.com>
Link: https://lore.kernel.org/r/20230717033223.42506-1-zhuning0077@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c
index a7fbb75..b62fff4 100644 (file)
--- a/sound/soc/codecs/es8326.c
+++ b/sound/soc/codecs/es8326.c
@@ -159,7 +159,7 @@ static const struct snd_soc_dapm_route es8326_dapm_routes[] = {
 };
 
 static const struct regmap_range es8326_volatile_ranges[] = {
-       regmap_reg_range(ES8326_HP_DETECT, ES8326_HP_DETECT),
+       regmap_reg_range(ES8326_HPDET_STA, ES8326_HPDET_STA),
 };
 
 static const struct regmap_access_table es8326_volatile_table = {
@@ -519,7 +519,7 @@ static void es8326_jack_button_handler(struct work_struct *work)
                return;
 
        mutex_lock(&es8326->lock);
-       iface = snd_soc_component_read(comp, ES8326_HP_DETECT);
+       iface = snd_soc_component_read(comp, ES8326_HPDET_STA);
        switch (iface) {
        case 0x93:
                /* pause button detected */
@@ -578,7 +578,7 @@ static void es8326_jack_detect_handler(struct work_struct *work)
        unsigned int iface;
 
        mutex_lock(&es8326->lock);
-       iface = snd_soc_component_read(comp, ES8326_HP_DETECT);
+       iface = snd_soc_component_read(comp, ES8326_HPDET_STA);
        dev_dbg(comp->dev, "gpio flag %#04x", iface);
        if ((iface & ES8326_HPINSERT_FLAG) == 0) {
                /* Jack unplugged or spurious IRQ */
@@ -651,7 +651,7 @@ static int es8326_resume(struct snd_soc_component *component)
        regmap_write(es8326->regmap, ES8326_ADC1_SRC, es8326->mic1_src);
        regmap_write(es8326->regmap, ES8326_ADC2_SRC, es8326->mic2_src);
        regmap_write(es8326->regmap, ES8326_HPJACK_TIMER, 0x88);
-       regmap_write(es8326->regmap, ES8326_HP_DET,
+       regmap_write(es8326->regmap, ES8326_HPDET_TYPE,
                     ES8326_HP_DET_SRC_PIN9 | es8326->jack_pol);
        regmap_write(es8326->regmap, ES8326_INT_SOURCE, es8326->interrupt_src);
        regmap_write(es8326->regmap, ES8326_INTOUT_IO, es8326->interrupt_clk);
@@ -743,7 +743,7 @@ static void es8326_enable_jack_detect(struct snd_soc_component *component,
 
        mutex_lock(&es8326->lock);
        if (es8326->jd_inverted)
-               snd_soc_component_update_bits(component, ES8326_HP_DET,
+               snd_soc_component_update_bits(component, ES8326_HPDET_TYPE,
                                              ES8326_HP_DET_JACK_POL, ~es8326->jack_pol);
        es8326->jack = jack;
 

diff --git a/sound/soc/codecs/es8326.h b/sound/soc/codecs/es8326.h
index 3f8f7da..cd04d11 100644 (file)
--- a/sound/soc/codecs/es8326.h
+++ b/sound/soc/codecs/es8326.h
@@ -73,15 +73,19 @@
 #define ES8326_DRC_RECOVERY    0x53
 #define ES8326_DRC_WINSIZE     0x54
 #define ES8326_HPJACK_TIMER    0x56
-#define ES8326_HP_DET          0x57
+#define ES8326_HPDET_TYPE      0x57
 #define ES8326_INT_SOURCE      0x58
 #define ES8326_INTOUT_IO       0x59
 #define ES8326_SDINOUT1_IO     0x5A
 #define ES8326_SDINOUT23_IO    0x5B
 #define ES8326_JACK_PULSE      0x5C
 
+#define ES8326_HP_MISC         0xF7
+#define ES8326_CTIA_OMTP_STA   0xF8
 #define ES8326_PULLUP_CTL      0xF9
-#define ES8326_HP_DETECT       0xFB
+#define ES8326_CSM_I2C_STA     0xFA
+#define ES8326_HPDET_STA       0xFB
+#define ES8326_CSM_MUTE_STA    0xFC
 #define ES8326_CHIP_ID1                0xFD
 #define ES8326_CHIP_ID2                0xFE
 #define ES8326_CHIP_VERSION    0xFF
@@ -146,7 +150,7 @@
 #define ES8326_ADC3_SHIFT 0
 #define ES8326_ADC4_SHIFT 3
 
-/* ES8326_HP_DET */
+/* ES8326_HPDET_TYPE */
 #define ES8326_HP_DET_SRC_PIN27 (1 << 5)
 #define ES8326_HP_DET_SRC_PIN9 (1 << 4)
 #define ES8326_HP_DET_JACK_POL (1 << 3)
@@ -174,7 +178,7 @@
 #define ES8326_SDINOUT2_SHIFT 4
 #define ES8326_SDINOUT3_SHIFT 0
 
-/* ES8326_HP_DETECT */
+/* ES8326_HPDET_STA */
 #define ES8326_HPINSERT_FLAG (1 << 1)
 #define ES8326_HPBUTTON_FLAG (1 << 0)
 
@@ -182,4 +186,3 @@
 #define ES8326_VERSION_B (1 << 0)
 
 #endif
-