Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c027ddcd authored by Kailang Yang's avatar Kailang Yang Committed by Takashi Iwai
Browse files

ALSA: hda - Add alc_codec_rename() helper 



Added alc_codec_rename() helper for renaming codec->chip_name.
Added Acer-specific codec naming for ALC269/662.

[Clean-up and refactoring by tiwai]

Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent da00c244

sound/pci/hda/patch_realtek.c

+25 −17
Original line number Diff line number Diff line
@@ -3848,6 +3848,18 @@ static struct hda_codec_ops alc_patch_ops = { 
	.reboot_notify = alc_shutup,

};













/* replace the codec chip_name with the given string */













static int alc_codec_rename(struct hda_codec *codec, const char *name)













{













	kfree(codec->chip_name);













	codec->chip_name = kstrdup(name, GFP_KERNEL);













	if (!codec->chip_name) {













		alc_free(codec);













		return -ENOMEM;













	}













	return 0;













}



























/*















 * Test configuration for debugging















 *










@@ -14169,17 +14181,15 @@ static int patch_alc269(struct hda_codec *codec)



























	alc_auto_parse_customize_define(codec);



























	alc_fix_pll_init(codec, 0x20, 0x04, 15);



























	if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010){













		kfree(codec->chip_name);













		codec->chip_name = kstrdup("ALC259", GFP_KERNEL);













		if (!codec->chip_name) {













			alc_free(codec);













			return -ENOMEM;













		}













		if (codec->bus->pci->subsystem_vendor == 0x1025 &&













		    spec->cdefine.platform_type == 1)













			alc_codec_rename(codec, "ALC271X");













		else













			alc_codec_rename(codec, "ALC259");















		is_alc269vb = 1;













	}













	} else













		alc_fix_pll_init(codec, 0x20, 0x04, 15);





























	board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,















						  alc269_models,










@@ -18394,14 +18404,12 @@ static int patch_alc662(struct hda_codec *codec)



























	alc_fix_pll_init(codec, 0x20, 0x04, 15);



























	if (alc_read_coef_idx(codec, 0)==0x8020){













		kfree(codec->chip_name);













		codec->chip_name = kstrdup("ALC661", GFP_KERNEL);













		if (!codec->chip_name) {













			alc_free(codec);













			return -ENOMEM;













		}













	}













	if (alc_read_coef_idx(codec, 0) == 0x8020)













		alc_codec_rename(codec, "ALC661");













	else if ((alc_read_coef_idx(codec, 0) & (1 << 14)) &&













		 codec->bus->pci->subsystem_vendor == 0x1025 &&













		 spec->cdefine.platform_type == 1)













		alc_codec_rename(codec, "ALC272X");





























	board_config = snd_hda_check_board_config(codec, ALC662_MODEL_LAST,















						  alc662_models,