Skip to content

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

ALSA: hda - Replace with the generic fixup codes in patch_cirrus.c 

... to make easier to integrate into the common generic parser in near
future.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a33b7b0a
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 90 deletions
sound/pci/hda/patch_cirrus.c
View file @ b35aabd7
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
*/ */
struct cs_spec { struct cs_spec {
int board_config; struct hda_gen_spec gen;
struct auto_pin_cfg autocfg; struct auto_pin_cfg autocfg;
struct hda_multi_out multiout; struct hda_multi_out multiout;
struct snd_kcontrol *vmaster_sw; struct snd_kcontrol *vmaster_sw;
...@@ -80,16 +81,17 @@ enum { ...@@ -80,16 +81,17 @@ enum {
CS420X_MBP53, CS420X_MBP53,
CS420X_MBP55, CS420X_MBP55,
CS420X_IMAC27, CS420X_IMAC27,
CS420X_IMAC27_122, CS420X_GPIO_13,
CS420X_APPLE, CS420X_GPIO_23,
CS420X_IMAC27_122 = CS420X_GPIO_23,
CS420X_APPLE = CS420X_GPIO_13,
CS420X_AUTO, CS420X_AUTO,
CS420X_MODELS
}; };
/* CS421x boards */ /* CS421x boards */
enum { enum {
CS421X_CDB4210, CS421X_CDB4210,
CS421X_MODELS CS421X_SENSE_B,
}; };
/* Vendor-specific processing widget */ /* Vendor-specific processing widget */
...@@ -1278,38 +1280,30 @@ static int cs_parse_auto_config(struct hda_codec *codec) ...@@ -1278,38 +1280,30 @@ static int cs_parse_auto_config(struct hda_codec *codec)
return 0; return 0;
} }
static const char * const cs420x_models[CS420X_MODELS] = { static const struct hda_model_fixup cs420x_models[] = {
[CS420X_MBP53] = "mbp53", { .id = CS420X_MBP53, .name = "mbp53" },
[CS420X_MBP55] = "mbp55", { .id = CS420X_MBP55, .name = "mbp55" },
[CS420X_IMAC27] = "imac27", { .id = CS420X_IMAC27, .name = "imac27" },
[CS420X_IMAC27_122] = "imac27_122", { .id = CS420X_IMAC27_122, .name = "imac27_122" },
[CS420X_APPLE] = "apple", { .id = CS420X_APPLE, .name = "apple" },
[CS420X_AUTO] = "auto", {}
}; };
static const struct snd_pci_quirk cs420x_fixup_tbl[] = {
static const struct snd_pci_quirk cs420x_cfg_tbl[] = {
SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53), SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55), SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55), SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
/* this conflicts with too many other models */ /* this conflicts with too many other models */
/*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/ /*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/
{} /* terminator */
};
static const struct snd_pci_quirk cs420x_codec_cfg_tbl[] = { /* codec SSID */
SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122), SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122),
SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS420X_APPLE), SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS420X_APPLE),
{} /* terminator */ {} /* terminator */
}; };
struct cs_pincfg { static const struct hda_pintbl mbp53_pincfgs[] = {
hda_nid_t nid;
u32 val;
};
static const struct cs_pincfg mbp53_pincfgs[] = {
{ 0x09, 0x012b4050 }, { 0x09, 0x012b4050 },
{ 0x0a, 0x90100141 }, { 0x0a, 0x90100141 },
{ 0x0b, 0x90100140 }, { 0x0b, 0x90100140 },
...@@ -1323,7 +1317,7 @@ static const struct cs_pincfg mbp53_pincfgs[] = { ...@@ -1323,7 +1317,7 @@ static const struct cs_pincfg mbp53_pincfgs[] = {
{} /* terminator */ {} /* terminator */
}; };
static const struct cs_pincfg mbp55_pincfgs[] = { static const struct hda_pintbl mbp55_pincfgs[] = {
{ 0x09, 0x012b4030 }, { 0x09, 0x012b4030 },
{ 0x0a, 0x90100121 }, { 0x0a, 0x90100121 },
{ 0x0b, 0x90100120 }, { 0x0b, 0x90100120 },
...@@ -1337,7 +1331,7 @@ static const struct cs_pincfg mbp55_pincfgs[] = { ...@@ -1337,7 +1331,7 @@ static const struct cs_pincfg mbp55_pincfgs[] = {
{} /* terminator */ {} /* terminator */
}; };
static const struct cs_pincfg imac27_pincfgs[] = { static const struct hda_pintbl imac27_pincfgs[] = {
{ 0x09, 0x012b4050 }, { 0x09, 0x012b4050 },
{ 0x0a, 0x90100140 }, { 0x0a, 0x90100140 },
{ 0x0b, 0x90100142 }, { 0x0b, 0x90100142 },
...@@ -1351,22 +1345,59 @@ static const struct cs_pincfg imac27_pincfgs[] = { ...@@ -1351,22 +1345,59 @@ static const struct cs_pincfg imac27_pincfgs[] = {
{} /* terminator */ {} /* terminator */
}; };
static const struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = { static void cs420x_fixup_gpio_13(struct hda_codec *codec,
[CS420X_MBP53] = mbp53_pincfgs, const struct hda_fixup *fix, int action)
[CS420X_MBP55] = mbp55_pincfgs, {
[CS420X_IMAC27] = imac27_pincfgs, if (action == HDA_FIXUP_ACT_PRE_PROBE) {
}; struct cs_spec *spec = codec->spec;
spec->gpio_eapd_hp = 2; /* GPIO1 = headphones */
spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
spec->gpio_mask = spec->gpio_dir =
spec->gpio_eapd_hp | spec->gpio_eapd_speaker;
}
}
static void fix_pincfg(struct hda_codec *codec, int model, static void cs420x_fixup_gpio_23(struct hda_codec *codec,
const struct cs_pincfg **pin_configs) const struct hda_fixup *fix, int action)
{ {
const struct cs_pincfg *cfg = pin_configs[model]; if (action == HDA_FIXUP_ACT_PRE_PROBE) {
if (!cfg) struct cs_spec *spec = codec->spec;
return; spec->gpio_eapd_hp = 4; /* GPIO2 = headphones */
for (; cfg->nid; cfg++) spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
snd_hda_codec_set_pincfg(codec, cfg->nid, cfg->val); spec->gpio_mask = spec->gpio_dir =
spec->gpio_eapd_hp | spec->gpio_eapd_speaker;
}
} }
static const struct hda_fixup cs420x_fixups[] = {
[CS420X_MBP53] = {
.type = HDA_FIXUP_PINS,
.v.pins = mbp53_pincfgs,
.chained = true,
.chain_id = CS420X_APPLE,
},
[CS420X_MBP55] = {
.type = HDA_FIXUP_PINS,
.v.pins = mbp55_pincfgs,
.chained = true,
.chain_id = CS420X_GPIO_13,
},
[CS420X_IMAC27] = {
.type = HDA_FIXUP_PINS,
.v.pins = imac27_pincfgs,
.chained = true,
.chain_id = CS420X_GPIO_13,
},
[CS420X_GPIO_13] = {
.type = HDA_FIXUP_FUNC,
.v.func = cs420x_fixup_gpio_13,
},
[CS420X_GPIO_23] = {
.type = HDA_FIXUP_FUNC,
.v.func = cs420x_fixup_gpio_23,
},
};
static int patch_cs420x(struct hda_codec *codec) static int patch_cs420x(struct hda_codec *codec)
{ {
struct cs_spec *spec; struct cs_spec *spec;
...@@ -1379,33 +1410,9 @@ static int patch_cs420x(struct hda_codec *codec) ...@@ -1379,33 +1410,9 @@ static int patch_cs420x(struct hda_codec *codec)
spec->vendor_nid = CS420X_VENDOR_NID; spec->vendor_nid = CS420X_VENDOR_NID;
spec->board_config = snd_hda_pick_fixup(codec, cs420x_models, cs420x_fixup_tbl,
snd_hda_check_board_config(codec, CS420X_MODELS, cs420x_fixups);
cs420x_models, cs420x_cfg_tbl); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
if (spec->board_config < 0)
spec->board_config =
snd_hda_check_board_codec_sid_config(codec,
CS420X_MODELS, NULL, cs420x_codec_cfg_tbl);
if (spec->board_config >= 0)
fix_pincfg(codec, spec->board_config, cs_pincfgs);
switch (spec->board_config) {
case CS420X_IMAC27:
case CS420X_MBP53:
case CS420X_MBP55:
case CS420X_APPLE:
spec->gpio_eapd_hp = 2; /* GPIO1 = headphones */
spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
spec->gpio_mask = spec->gpio_dir =
spec->gpio_eapd_hp | spec->gpio_eapd_speaker;
break;
case CS420X_IMAC27_122:
spec->gpio_eapd_hp = 4; /* GPIO2 = headphones */
spec->gpio_eapd_speaker = 8; /* GPIO3 = speakers */
spec->gpio_mask = spec->gpio_dir =
spec->gpio_eapd_hp | spec->gpio_eapd_speaker;
break;
}
err = cs_parse_auto_config(codec); err = cs_parse_auto_config(codec);
if (err < 0) if (err < 0)
...@@ -1413,6 +1420,8 @@ static int patch_cs420x(struct hda_codec *codec) ...@@ -1413,6 +1420,8 @@ static int patch_cs420x(struct hda_codec *codec)
codec->patch_ops = cs_patch_ops; codec->patch_ops = cs_patch_ops;
snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
return 0; return 0;
error: error:
...@@ -1430,11 +1439,12 @@ static int patch_cs420x(struct hda_codec *codec) ...@@ -1430,11 +1439,12 @@ static int patch_cs420x(struct hda_codec *codec)
*/ */
/* CS4210 board names */ /* CS4210 board names */
static const char *cs421x_models[CS421X_MODELS] = { static const struct hda_model_fixup cs421x_models[] = {
[CS421X_CDB4210] = "cdb4210", { .id = CS421X_CDB4210, .name = "cdb4210" },
{}
}; };
static const struct snd_pci_quirk cs421x_cfg_tbl[] = { static const struct snd_pci_quirk cs421x_fixup_tbl[] = {
/* Test Intel board + CDB2410 */ /* Test Intel board + CDB2410 */
SND_PCI_QUIRK(0x8086, 0x5001, "DP45SG/CDB4210", CS421X_CDB4210), SND_PCI_QUIRK(0x8086, 0x5001, "DP45SG/CDB4210", CS421X_CDB4210),
{} /* terminator */ {} /* terminator */
...@@ -1442,7 +1452,7 @@ static const struct snd_pci_quirk cs421x_cfg_tbl[] = { ...@@ -1442,7 +1452,7 @@ static const struct snd_pci_quirk cs421x_cfg_tbl[] = {
/* CS4210 board pinconfigs */ /* CS4210 board pinconfigs */
/* Default CS4210 (CDB4210)*/ /* Default CS4210 (CDB4210)*/
static const struct cs_pincfg cdb4210_pincfgs[] = { static const struct hda_pintbl cdb4210_pincfgs[] = {
{ 0x05, 0x0321401f }, { 0x05, 0x0321401f },
{ 0x06, 0x90170010 }, { 0x06, 0x90170010 },
{ 0x07, 0x03813031 }, { 0x07, 0x03813031 },
...@@ -1452,8 +1462,26 @@ static const struct cs_pincfg cdb4210_pincfgs[] = { ...@@ -1452,8 +1462,26 @@ static const struct cs_pincfg cdb4210_pincfgs[] = {
{} /* terminator */ {} /* terminator */
}; };
static const struct cs_pincfg *cs421x_pincfgs[CS421X_MODELS] = { /* Setup GPIO/SENSE for each board (if used) */
[CS421X_CDB4210] = cdb4210_pincfgs, static void cs421x_fixup_sense_b(struct hda_codec *codec,
const struct hda_fixup *fix, int action)
{
struct cs_spec *spec = codec->spec;
if (action == HDA_FIXUP_ACT_PRE_PROBE)
spec->sense_b = 1;
}
static const struct hda_fixup cs421x_fixups[] = {
[CS421X_CDB4210] = {
.type = HDA_FIXUP_PINS,
.v.pins = cdb4210_pincfgs,
.chained = true,
.chain_id = CS421X_SENSE_B,
},
[CS421X_SENSE_B] = {
.type = HDA_FIXUP_FUNC,
.v.func = cs421x_fixup_sense_b,
}
}; };
static const struct hda_verb cs421x_coef_init_verbs[] = { static const struct hda_verb cs421x_coef_init_verbs[] = {
...@@ -1935,26 +1963,9 @@ static int patch_cs4210(struct hda_codec *codec) ...@@ -1935,26 +1963,9 @@ static int patch_cs4210(struct hda_codec *codec)
spec->vendor_nid = CS4210_VENDOR_NID; spec->vendor_nid = CS4210_VENDOR_NID;
spec->board_config = snd_hda_pick_fixup(codec, cs421x_models, cs421x_fixup_tbl,
snd_hda_check_board_config(codec, CS421X_MODELS, cs421x_fixups);
cs421x_models, cs421x_cfg_tbl); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
if (spec->board_config >= 0)
fix_pincfg(codec, spec->board_config, cs421x_pincfgs);
/*
Setup GPIO/SENSE for each board (if used)
*/
switch (spec->board_config) {
case CS421X_CDB4210:
snd_printd("CS4210 board: %s\n",
cs421x_models[spec->board_config]);
/* spec->gpio_mask = 3;
spec->gpio_dir = 3;
spec->gpio_data = 3;
*/
spec->sense_b = 1;
break;
}
/* /*
Update the GPIO/DMIC/SENSE_B pinmux before the configuration Update the GPIO/DMIC/SENSE_B pinmux before the configuration
...@@ -1969,6 +1980,8 @@ static int patch_cs4210(struct hda_codec *codec) ...@@ -1969,6 +1980,8 @@ static int patch_cs4210(struct hda_codec *codec)
codec->patch_ops = cs421x_patch_ops; codec->patch_ops = cs421x_patch_ops;
snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
return 0; return 0;
error: error:
......
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