lkml.org 
[lkml]   [2012]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 6/6] ALSA: hda - clean up CX20549 test mixer setup
    On 04/06/2012 03:34 PM, Michael Karcher wrote:
    > name pins consistently (MIC1/LINE1/HP-OUT/CD) on all controls
    > affecting those pins.

    If this is a test mixer only, so maybe it does not matter that much, but
    anyway:

    Loopback controls are usually labeled

    "Line Playback Volume"
    "Mic Playback Volume"

    And outputs:

    "Headphone Playback Volume"

    For line outputs, I'm not sure if the right thing is

    "Front Playback Volume",
    "Line-Out Playback Volume", or
    "Line Out Playback Volume"


    > remove duplicate SET_AMP_GAIN_MUTE to 0x17/index 0 and 0x17/index 1
    >
    > really select MIC1, not Mixer out for recording
    >
    > "Mixer out" for recording is not a "pin", adjust comment
    >
    > Signed-off-by: Michael Karcher<kernel@mkarcher.dialup.fu-berlin.de>
    > ---
    > sound/pci/hda/patch_conexant.c | 38 +++++++++++++++++---------------------
    > 1 files changed, 17 insertions(+), 21 deletions(-)
    >
    > diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
    > index 8fe9f9d..a36488d 100644
    > --- a/sound/pci/hda/patch_conexant.c
    > +++ b/sound/pci/hda/patch_conexant.c
    > @@ -930,10 +930,10 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = {
    > /* Output controls */
    > HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT),
    > HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT),
    > - HDA_CODEC_VOLUME("Node 11 Playback Volume", 0x11, 0x0, HDA_OUTPUT),
    > - HDA_CODEC_MUTE("Node 11 Playback Switch", 0x11, 0x0, HDA_OUTPUT),
    > - HDA_CODEC_VOLUME("Node 12 Playback Volume", 0x12, 0x0, HDA_OUTPUT),
    > - HDA_CODEC_MUTE("Node 12 Playback Switch", 0x12, 0x0, HDA_OUTPUT),
    > + HDA_CODEC_VOLUME("HP-OUT Playback Volume", 0x11, 0x0, HDA_OUTPUT),
    > + HDA_CODEC_MUTE("HP-OUT Playback Switch", 0x11, 0x0, HDA_OUTPUT),
    > + HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x12, 0x0, HDA_OUTPUT),
    > + HDA_CODEC_MUTE("LINE1 Playback Switch", 0x12, 0x0, HDA_OUTPUT),
    >
    > /* Modes for retasking pin widgets */
    > CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT),
    > @@ -944,16 +944,16 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = {
    >
    > /* Loopback mixer controls */
    >
    > - HDA_CODEC_VOLUME("Mixer-1 Volume", 0x17, 0x0, HDA_INPUT),
    > - HDA_CODEC_MUTE("Mixer-1 Switch", 0x17, 0x0, HDA_INPUT),
    > - HDA_CODEC_VOLUME("Mixer-2 Volume", 0x17, 0x1, HDA_INPUT),
    > - HDA_CODEC_MUTE("Mixer-2 Switch", 0x17, 0x1, HDA_INPUT),
    > - HDA_CODEC_VOLUME("Mixer-3 Volume", 0x17, 0x2, HDA_INPUT),
    > - HDA_CODEC_MUTE("Mixer-3 Switch", 0x17, 0x2, HDA_INPUT),
    > - HDA_CODEC_VOLUME("Mixer-4 Volume", 0x17, 0x3, HDA_INPUT),
    > - HDA_CODEC_MUTE("Mixer-4 Switch", 0x17, 0x3, HDA_INPUT),
    > - HDA_CODEC_VOLUME("Mixer-5 Volume", 0x17, 0x4, HDA_INPUT),
    > - HDA_CODEC_MUTE("Mixer-5 Switch", 0x17, 0x4, HDA_INPUT),
    > + HDA_CODEC_VOLUME("PCM Volume", 0x17, 0x0, HDA_INPUT),
    > + HDA_CODEC_MUTE("PCM Switch", 0x17, 0x0, HDA_INPUT),
    > + HDA_CODEC_VOLUME("MIC1 pin Volume", 0x17, 0x1, HDA_INPUT),
    > + HDA_CODEC_MUTE("MIC1 pin Switch", 0x17, 0x1, HDA_INPUT),
    > + HDA_CODEC_VOLUME("LINE1 pin Volume", 0x17, 0x2, HDA_INPUT),
    > + HDA_CODEC_MUTE("LINE1 pin Switch", 0x17, 0x2, HDA_INPUT),
    > + HDA_CODEC_VOLUME("HP-OUT pin Volume", 0x17, 0x3, HDA_INPUT),
    > + HDA_CODEC_MUTE("HP-OUT pin Switch", 0x17, 0x3, HDA_INPUT),

    Eh, is there a loopback control from the headphone?

    > + HDA_CODEC_VOLUME("CD pin Volume", 0x17, 0x4, HDA_INPUT),
    > + HDA_CODEC_MUTE("CD pin Switch", 0x17, 0x4, HDA_INPUT),
    > {
    > .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
    > .name = "Input Source",
    > @@ -985,10 +985,6 @@ static const struct hda_verb cxt5045_test_init_verbs[] = {
    > {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
    > {0x18, AC_VERB_SET_DIGI_CONVERT_1, 0},
    >
    > - /* Start with output sum widgets muted and their output gains at min */
    > - {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
    > - {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
    > -
    > /* Unmute retasking pin widget output buffers since the default
    > * state appears to be output. As the pin mode is changed by the
    > * user the pin mode control will take care of enabling the pin's
    > @@ -1003,11 +999,11 @@ static const struct hda_verb cxt5045_test_init_verbs[] = {
    > /* Set ADC connection select to match default mixer setting (mic1
    > * pin)
    > */
    > - {0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
    > - {0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
    > + {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
    > + {0x17, AC_VERB_SET_CONNECT_SEL, 0x01},
    >
    > /* Mute all inputs to mixer widget (even unconnected ones) */
    > - {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer pin */
    > + {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer */
    > {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* Mic1 pin */
    > {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* Line pin */
    > {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* HP pin */



    --
    David Henningsson, Canonical Ltd.
    http://launchpad.net/~diwic


    \
     
     \ /
      Last update: 2012-04-10 08:57    [W:0.028 / U:63.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site