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

ALSA: hda/realtek - Update headset mode for ALC225 



Dell new platform with new hardware layout.
Old headset mode policy will cause headset mode check type has a
chance to check fail.
So, we update new headset mode to match new hardware layout.
New headset mode policy also could suitable to old hardware layout.

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

sound/pci/hda/patch_realtek.c

+52 −25
Original line number Diff line number Diff line
@@ -3838,6 +3838,17 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec, 
	}

}



static struct coef_fw alc225_pre_hsmode[] = {

	UPDATE_COEF(0x4a, 1<<8, 0),

	UPDATE_COEFEX(0x57, 0x05, 1<<14, 0),

	UPDATE_COEF(0x63, 3<<14, 3<<14),

	UPDATE_COEF(0x4a, 3<<4, 2<<4),

	UPDATE_COEF(0x4a, 3<<10, 3<<10),

	UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

	UPDATE_COEF(0x4a, 3<<10, 0),

	{}

};



static void alc_headset_mode_unplugged(struct hda_codec *codec)

{

	static struct coef_fw coef0255[] = {
@@ -3899,13 +3910,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) 
		{}

	};

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x4a, 1<<8, 0),

		UPDATE_COEFEX(0x57, 0x05, 1<<14, 0),

		UPDATE_COEF(0x63, 3<<14, 3<<14),

		UPDATE_COEF(0x4a, 3<<4, 2<<4),

		UPDATE_COEF(0x4a, 3<<10, 3<<10),

		UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

		UPDATE_COEF(0x4a, 3<<10, 0),

		UPDATE_COEF(0x63, 3<<14, 0),

		{}

	};

	static struct coef_fw coef0274[] = {
@@ -4079,6 +4084,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, alc225_pre_hsmode);

		alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x31<<10);

		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);

		alc_process_coef_fw(codec, coef0225);
@@ -4091,7 +4097,12 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
static void alc_headset_mode_default(struct hda_codec *codec)

{

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

		UPDATE_COEF(0x45, 0x3f<<10, 0x30<<10),

		UPDATE_COEF(0x45, 0x3f<<10, 0x31<<10),

		UPDATE_COEF(0x49, 3<<8, 0<<8),

		UPDATE_COEF(0x4a, 3<<4, 3<<4),

		UPDATE_COEF(0x63, 3<<14, 0),

		UPDATE_COEF(0x67, 0xf000, 0x3000),

		{}

	};

	static struct coef_fw coef0255[] = {
@@ -4145,6 +4156,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, alc225_pre_hsmode);

		alc_process_coef_fw(codec, coef0225);

		break;

	case 0x10ec0255:
@@ -4228,11 +4240,14 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) 
		WRITE_COEF(0xc3, 0x0000),

		{}

	};

	static struct coef_fw coef0225[] = {

	static struct coef_fw coef0225_1[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x35<<10),

		UPDATE_COEF(0x49, 1<<8, 1<<8),

		UPDATE_COEF(0x4a, 7<<6, 7<<6),

		UPDATE_COEF(0x4a, 3<<4, 3<<4),

		UPDATE_COEF(0x63, 3<<14, 2<<14),

		{}

	};

	static struct coef_fw coef0225_2[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x35<<10),

		UPDATE_COEF(0x63, 3<<14, 1<<14),

		{}

	};
@@ -4282,7 +4297,11 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, coef0225);

		val = alc_read_coef_idx(codec, 0x45);

		if (val & (1 << 9))

			alc_process_coef_fw(codec, coef0225_2);

		else

			alc_process_coef_fw(codec, coef0225_1);

		break;

	case 0x10ec0867:

		alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0);
@@ -4338,9 +4357,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) 
	};

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x39<<10),

		UPDATE_COEF(0x49, 1<<8, 1<<8),

		UPDATE_COEF(0x4a, 7<<6, 7<<6),

		UPDATE_COEF(0x4a, 3<<4, 3<<4),

		UPDATE_COEF(0x63, 3<<14, 2<<14),

		{}

	};
@@ -4424,11 +4441,6 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
		WRITE_COEF(0xc3, 0x0c00),

		{}

	};

	static struct coef_fw coef0225[] = {

		UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10),

		UPDATE_COEF(0x49, 1<<8, 1<<8),

		{}

	};

	static struct coef_fw coef0274[] = {

		UPDATE_COEF(0x4a, 0x0010, 0),

		UPDATE_COEF(0x4a, 0x8000, 0),
@@ -4517,10 +4529,25 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_process_coef_fw(codec, coef0225);

		alc_process_coef_fw(codec, alc225_pre_hsmode);

		alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000);

		val = alc_read_coef_idx(codec, 0x45);

		if (val & (1 << 9)) {

			alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x34<<10);

			alc_update_coef_idx(codec, 0x49, 3<<8, 2<<8);

			msleep(800);

			val = alc_read_coef_idx(codec, 0x46);

			is_ctia = (val & 0x00f0) == 0x00f0;

		} else {

			alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x34<<10);

			alc_update_coef_idx(codec, 0x49, 3<<8, 1<<8);

			msleep(800);

			val = alc_read_coef_idx(codec, 0x46);

			is_ctia = (val & 0x00f0) == 0x00f0;

		}

		alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6);

		alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4);

		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);

		break;

	case 0x10ec0867:

		is_ctia = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE