lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 111/111] ALSA: ctxfi: Add SB046x PCI ID
    Date
    From: Edward Matijevic <motolav@gmail.com>

    commit 1b073ebb174d0c7109b438e0a5eb4495137803ec upstream.

    Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names

    Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
    After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found

    [ This is only about defining the model name string, and the rest is
    handled just like before, as a default unknown device.
    Edward confirmed that the stuff has been working fine -- tiwai ]

    Signed-off-by: Edward Matijevic <motolav@gmail.com>
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/cae7d1a4-8bd9-7dfe-7427-db7e766f7272@gmail.com
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/pci/ctxfi/ctatc.c | 2 ++
    sound/pci/ctxfi/cthardware.h | 3 ++-
    2 files changed, 4 insertions(+), 1 deletion(-)

    --- a/sound/pci/ctxfi/ctatc.c
    +++ b/sound/pci/ctxfi/ctatc.c
    @@ -36,6 +36,7 @@
    | ((IEC958_AES3_CON_FS_48000) << 24))

    static const struct snd_pci_quirk subsys_20k1_list[] = {
    + SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
    SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
    SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
    SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
    @@ -64,6 +65,7 @@ static const struct snd_pci_quirk subsys

    static const char *ct_subsys_name[NUM_CTCARDS] = {
    /* 20k1 models */
    + [CTSB046X] = "SB046x",
    [CTSB055X] = "SB055x",
    [CTSB073X] = "SB073x",
    [CTUAA] = "UAA",
    --- a/sound/pci/ctxfi/cthardware.h
    +++ b/sound/pci/ctxfi/cthardware.h
    @@ -26,8 +26,9 @@ enum CHIPTYP {

    enum CTCARDS {
    /* 20k1 models */
    + CTSB046X,
    + CT20K1_MODEL_FIRST = CTSB046X,
    CTSB055X,
    - CT20K1_MODEL_FIRST = CTSB055X,
    CTSB073X,
    CTUAA,
    CT20K1_UNKNOWN,

    \
     
     \ /
      Last update: 2022-05-27 14:01    [W:7.901 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site