Skip to content

L
linux
Commit 766538ac authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda/realtek: Unify LED helper code 

Both mute and mic-mute LED callbacks do almost similar tasks with just
different bits.  Factor out the common code and use them from the
callbacks for simplification.

This ended up with covering the forgotten stuff, too; e.g. VREF LED
handling required the temporary power up/down that was missing for the
mute LED, or some forgotten polarity checks are added.
Tested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20200618110842.27238-13-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d1d37c57
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 64 deletions
sound/pci/hda/patch_realtek.c
View file @ 766538ac
...@@ -67,6 +67,13 @@ struct alc_customize_define { ...@@ -67,6 +67,13 @@ struct alc_customize_define {
unsigned int fixup:1; /* Means that this sku is set by driver, not read from hw */ unsigned int fixup:1; /* Means that this sku is set by driver, not read from hw */
}; };
struct alc_coef_led {
unsigned int idx;
unsigned int mask;
unsigned int on;
unsigned int off;
};
struct alc_spec { struct alc_spec {
struct hda_gen_spec gen; /* must be at head */ struct hda_gen_spec gen; /* must be at head */
...@@ -88,14 +95,8 @@ struct alc_spec { ...@@ -88,14 +95,8 @@ struct alc_spec {
unsigned int gpio_mute_led_mask; unsigned int gpio_mute_led_mask;
unsigned int gpio_mic_led_mask; unsigned int gpio_mic_led_mask;
unsigned int mute_led_coef_idx; struct alc_coef_led mute_led_coef;
unsigned int mute_led_coefbit_mask; struct alc_coef_led mic_led_coef;
unsigned int mute_led_coefbit_on;
unsigned int mute_led_coefbit_off;
unsigned int mic_led_coef_idx;
unsigned int mic_led_coefbit_mask;
unsigned int mic_led_coefbit_on;
unsigned int mic_led_coefbit_off;
hda_nid_t headset_mic_pin; hda_nid_t headset_mic_pin;
hda_nid_t headphone_mic_pin; hda_nid_t headphone_mic_pin;
...@@ -3988,6 +3989,23 @@ static void alc269_fixup_x101_headset_mic(struct hda_codec *codec, ...@@ -3988,6 +3989,23 @@ static void alc269_fixup_x101_headset_mic(struct hda_codec *codec,
} }
} }
static void alc_update_vref_led(struct hda_codec *codec, hda_nid_t pin,
bool polarity, bool on)
{
unsigned int pinval;
if (!pin)
return;
if (polarity)
on = !on;
pinval = snd_hda_codec_get_pin_target(codec, pin);
pinval &= ~AC_PINCTL_VREFEN;
pinval |= on ? AC_PINCTL_VREF_80 : AC_PINCTL_VREF_HIZ;
/* temporarily power up/down for setting VREF */
snd_hda_power_up_pm(codec);
snd_hda_set_pin_ctl_cache(codec, pin, pinval);
snd_hda_power_down_pm(codec);
}
/* update mute-LED according to the speaker mute state via mic VREF pin */ /* update mute-LED according to the speaker mute state via mic VREF pin */
static int vref_mute_led_set(struct led_classdev *led_cdev, static int vref_mute_led_set(struct led_classdev *led_cdev,
...@@ -3995,19 +4013,9 @@ static int vref_mute_led_set(struct led_classdev *led_cdev, ...@@ -3995,19 +4013,9 @@ static int vref_mute_led_set(struct led_classdev *led_cdev,
{ {
struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent); struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent);
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
unsigned int pinval;
if (spec->mute_led_polarity) alc_update_vref_led(codec, spec->mute_led_nid,
brightness = !brightness; spec->mute_led_polarity, brightness);
pinval = snd_hda_codec_get_pin_target(codec, spec->mute_led_nid);
pinval &= ~AC_PINCTL_VREFEN;
pinval |= brightness ? AC_PINCTL_VREF_80 : AC_PINCTL_VREF_HIZ;
if (spec->mute_led_nid) {
/* temporarily power up/down for setting VREF */
snd_hda_power_up_pm(codec);
snd_hda_set_pin_ctl_cache(codec, spec->mute_led_nid, pinval);
snd_hda_power_down_pm(codec);
}
return 0; return 0;
} }
...@@ -4170,17 +4178,9 @@ static int vref_micmute_led_set(struct led_classdev *led_cdev, ...@@ -4170,17 +4178,9 @@ static int vref_micmute_led_set(struct led_classdev *led_cdev,
{ {
struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent); struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent);
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
unsigned int pinval;
if (!spec->cap_mute_led_nid) alc_update_vref_led(codec, spec->cap_mute_led_nid,
return 0; spec->micmute_led_polarity, brightness);
pinval = snd_hda_codec_get_pin_target(codec, spec->cap_mute_led_nid);
pinval &= ~AC_PINCTL_VREFEN;
if (brightness)
pinval |= AC_PINCTL_VREF_80;
else
pinval |= AC_PINCTL_VREF_HIZ;
snd_hda_set_pin_ctl_cache(codec, spec->cap_mute_led_nid, pinval);
return 0; return 0;
} }
...@@ -4215,6 +4215,17 @@ static void alc280_fixup_hp_gpio4(struct hda_codec *codec, ...@@ -4215,6 +4215,17 @@ static void alc280_fixup_hp_gpio4(struct hda_codec *codec,
} }
} }
static void alc_update_coef_led(struct hda_codec *codec,
struct alc_coef_led *led,
bool polarity, bool on)
{
if (polarity)
on = !on;
/* temporarily power up/down for setting COEF bit */
alc_update_coef_idx(codec, led->idx, led->mask,
on ? led->on : led->off);
}
/* update mute-LED according to the speaker mute state via COEF bit */ /* update mute-LED according to the speaker mute state via COEF bit */
static int coef_mute_led_set(struct led_classdev *led_cdev, static int coef_mute_led_set(struct led_classdev *led_cdev,
enum led_brightness brightness) enum led_brightness brightness)
...@@ -4222,18 +4233,8 @@ static int coef_mute_led_set(struct led_classdev *led_cdev, ...@@ -4222,18 +4233,8 @@ static int coef_mute_led_set(struct led_classdev *led_cdev,
struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent); struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent);
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
if (spec->mute_led_polarity) alc_update_coef_led(codec, &spec->mute_led_coef,
brightness = !brightness; spec->mute_led_polarity, brightness);
/* temporarily power up/down for setting COEF bit */
if (brightness)
alc_update_coef_idx(codec, spec->mute_led_coef_idx,
spec->mute_led_coefbit_mask,
spec->mute_led_coefbit_on);
else
alc_update_coef_idx(codec, spec->mute_led_coef_idx,
spec->mute_led_coefbit_mask,
spec->mute_led_coefbit_off);
return 0; return 0;
} }
...@@ -4245,10 +4246,10 @@ static void alc285_fixup_hp_mute_led_coefbit(struct hda_codec *codec, ...@@ -4245,10 +4246,10 @@ static void alc285_fixup_hp_mute_led_coefbit(struct hda_codec *codec,
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
spec->mute_led_polarity = 0; spec->mute_led_polarity = 0;
spec->mute_led_coef_idx = 0x0b; spec->mute_led_coef.idx = 0x0b;
spec->mute_led_coefbit_mask = 1<<3; spec->mute_led_coef.mask = 1 << 3;
spec->mute_led_coefbit_on = 1<<3; spec->mute_led_coef.on = 1 << 3;
spec->mute_led_coefbit_off = 0; spec->mute_led_coef.off = 0;
snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set); snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
} }
} }
...@@ -4261,10 +4262,10 @@ static void alc236_fixup_hp_mute_led_coefbit(struct hda_codec *codec, ...@@ -4261,10 +4262,10 @@ static void alc236_fixup_hp_mute_led_coefbit(struct hda_codec *codec,
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
spec->mute_led_polarity = 0; spec->mute_led_polarity = 0;
spec->mute_led_coef_idx = 0x34; spec->mute_led_coef.idx = 0x34;
spec->mute_led_coefbit_mask = 1<<5; spec->mute_led_coef.mask = 1 << 5;
spec->mute_led_coefbit_on = 0; spec->mute_led_coef.on = 0;
spec->mute_led_coefbit_off = 1<<5; spec->mute_led_coef.off = 1 << 5;
snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set); snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
} }
} }
...@@ -4276,12 +4277,8 @@ static int coef_micmute_led_set(struct led_classdev *led_cdev, ...@@ -4276,12 +4277,8 @@ static int coef_micmute_led_set(struct led_classdev *led_cdev,
struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent); struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent);
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
if (brightness) alc_update_coef_led(codec, &spec->mic_led_coef,
alc_update_coef_idx(codec, spec->mic_led_coef_idx, spec->micmute_led_polarity, brightness);
spec->mic_led_coefbit_mask, spec->mic_led_coefbit_on);
else
alc_update_coef_idx(codec, spec->mic_led_coef_idx,
spec->mic_led_coefbit_mask, spec->mic_led_coefbit_off);
return 0; return 0;
} }
...@@ -4291,10 +4288,10 @@ static void alc285_fixup_hp_coef_micmute_led(struct hda_codec *codec, ...@@ -4291,10 +4288,10 @@ static void alc285_fixup_hp_coef_micmute_led(struct hda_codec *codec,
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
spec->mic_led_coef_idx = 0x19; spec->mic_led_coef.idx = 0x19;
spec->mic_led_coefbit_mask = 1<<13; spec->mic_led_coef.mask = 1 << 13;
spec->mic_led_coefbit_on = 1<<13; spec->mic_led_coef.on = 1 << 13;
spec->mic_led_coefbit_off = 0; spec->mic_led_coef.off = 0;
snd_hda_gen_add_micmute_led_cdev(codec, coef_micmute_led_set); snd_hda_gen_add_micmute_led_cdev(codec, coef_micmute_led_set);
} }
} }
...@@ -4305,10 +4302,10 @@ static void alc236_fixup_hp_coef_micmute_led(struct hda_codec *codec, ...@@ -4305,10 +4302,10 @@ static void alc236_fixup_hp_coef_micmute_led(struct hda_codec *codec,
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
spec->mic_led_coef_idx = 0x35; spec->mic_led_coef.idx = 0x35;
spec->mic_led_coefbit_mask = 3<<2; spec->mic_led_coef.mask = 3 << 2;
spec->mic_led_coefbit_on = 2<<2; spec->mic_led_coef.on = 2 << 2;
spec->mic_led_coefbit_off = 1<<2; spec->mic_led_coef.off = 1 << 2;
snd_hda_gen_add_micmute_led_cdev(codec, coef_micmute_led_set); snd_hda_gen_add_micmute_led_cdev(codec, coef_micmute_led_set);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7