Commit 24f7ac3d authored by Lucas Tanure's avatar Lucas Tanure Committed by Takashi Iwai
Browse files

ALSA: hda/cs8409: Move codec properties to its own struct 



To accommodate move, cs42l42_resume has been added to mirror
the existing function cs42l42_suspend.
Function cs42l42_reset is no longer required, since cs42l42_resume
and cs42l42_suspend perform the same operations.

Signed-off-by: default avatarLucas Tanure <tanureal@opensource.cirrus.com>
Signed-off-by: default avatarVitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210811185654.6837-19-vitalyr@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 636eb9d2

sound/pci/hda/patch_cs8409-tables.c

+101 −82
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ const struct snd_kcontrol_new cs42l42_dac_volume_mixer = { 
	.get = cs42l42_volume_get,

	.put = cs42l42_volume_put,

	.tlv = { .p = cs42l42_dac_db_scale },

	.private_value = HDA_COMPOSE_AMP_VAL_OFS(CS8409_PIN_ASP1_TRANSMITTER_A, 3, 0,

	.private_value = HDA_COMPOSE_AMP_VAL_OFS(CS8409_PIN_ASP1_TRANSMITTER_A, 3, CS8409_CODEC0,

			 HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE

};
@@ -41,89 +41,14 @@ const struct snd_kcontrol_new cs42l42_adc_volume_mixer = { 
	.get = cs42l42_volume_get,

	.put = cs42l42_volume_put,

	.tlv = { .p = cs42l42_adc_db_scale },

	.private_value = HDA_COMPOSE_AMP_VAL_OFS(CS8409_PIN_ASP1_RECEIVER_A, 1, 0,

	.private_value = HDA_COMPOSE_AMP_VAL_OFS(CS8409_PIN_ASP1_RECEIVER_A, 1, CS8409_CODEC0,

			 HDA_INPUT, CS42L42_VOL_ADC) | HDA_AMP_VAL_MIN_MUTE

};



/* Dell Inspiron platforms

 * with cs8409 bridge and cs42l42 codec

 */

const struct snd_pci_quirk cs8409_fixup_tbl[] = {

	SND_PCI_QUIRK(0x1028, 0x0A11, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A12, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A23, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A24, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A25, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A29, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A2A, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A2B, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0AB0, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB2, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB1, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB3, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB4, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB5, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AD9, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0ADA, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0ADB, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0ADC, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AF4, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AF5, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0A77, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A78, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A79, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7A, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7D, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7E, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7F, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A80, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0ADF, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE0, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE1, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE2, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE9, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEA, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEB, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEC, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AED, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEE, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEF, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AF0, "Cyborg", CS8409_CYBORG),

	{} /* terminator */

};



/* Dell Inspiron models with cs8409/cs42l42 */

const struct hda_model_fixup cs8409_models[] = {

	{ .id = CS8409_BULLSEYE, .name = "bullseye" },

	{ .id = CS8409_WARLOCK, .name = "warlock" },

	{ .id = CS8409_CYBORG, .name = "cyborg" },

	{}

};



const struct hda_fixup cs8409_fixups[] = {

	[CS8409_BULLSEYE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = cs8409_cs42l42_pincfgs,

		.chained = true,

		.chain_id = CS8409_FIXUPS,

	},

	[CS8409_WARLOCK] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = cs8409_cs42l42_pincfgs,

		.chained = true,

		.chain_id = CS8409_FIXUPS,

	},

	[CS8409_CYBORG] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = cs8409_cs42l42_pincfgs,

		.chained = true,

		.chain_id = CS8409_FIXUPS,

	},

	[CS8409_FIXUPS] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cs8409_cs42l42_fixups,

	},

};

/******************************************************************************

 *                   BULLSEYE / WARLOCK / CYBORG Specific Arrays

 *                               CS8409/CS42L42

 ******************************************************************************/



const struct hda_verb cs8409_cs42l42_init_verbs[] = {

	{ CS8409_PIN_AFG, AC_VERB_SET_GPIO_WAKE_MASK, 0x0018 },		/* WAKE from GPIO 3,4 */
@@ -144,7 +69,7 @@ const struct hda_pintbl cs8409_cs42l42_pincfgs[] = { 
};



/* Vendor specific HW configuration for CS42L42 */

const struct cs8409_i2c_param cs42l42_init_reg_seq[CS42L42_INIT_REG_SEQ_SIZE] = {

static const struct cs8409_i2c_param cs42l42_init_reg_seq[] = {

	{ 0x1010, 0xB0 },

	{ 0x1D01, 0x00 },

	{ 0x1D02, 0x06 },
@@ -310,3 +235,97 @@ const struct cs8409_cir_param cs8409_cs42l42_bullseye_atn[] = { 
	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0x0000 },

	{} /* Terminator */

};



struct sub_codec cs8409_cs42l42_codec = {

	.addr = CS42L42_I2C_ADDR,

	.reset_gpio = CS8409_CS42L42_RESET,

	.irq_mask = CS8409_CS42L42_INT,

	.init_seq = cs42l42_init_reg_seq,

	.init_seq_num = ARRAY_SIZE(cs42l42_init_reg_seq),

	.hp_jack_in = 0,

	.mic_jack_in = 0,

	.paged = 1,

	.suspended = 1,

};



/******************************************************************************

 *                         CS8409 Patch Driver Structs

 *                    Arrays Used for all projects using CS8409

 ******************************************************************************/



const struct snd_pci_quirk cs8409_fixup_tbl[] = {

	SND_PCI_QUIRK(0x1028, 0x0A11, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A12, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A23, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A24, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A25, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A29, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A2A, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0A2B, "Bullseye", CS8409_BULLSEYE),

	SND_PCI_QUIRK(0x1028, 0x0AB0, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB2, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB1, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB3, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB4, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AB5, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AD9, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0ADA, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0ADB, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0ADC, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AF4, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0AF5, "Warlock", CS8409_WARLOCK),

	SND_PCI_QUIRK(0x1028, 0x0A77, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A78, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A79, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7A, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7D, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7E, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A7F, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0A80, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0ADF, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE0, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE1, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE2, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AE9, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEA, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEB, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEC, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AED, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEE, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AEF, "Cyborg", CS8409_CYBORG),

	SND_PCI_QUIRK(0x1028, 0x0AF0, "Cyborg", CS8409_CYBORG),

	{} /* terminator */

};



/* Dell Inspiron models with cs8409/cs42l42 */

const struct hda_model_fixup cs8409_models[] = {

	{ .id = CS8409_BULLSEYE, .name = "bullseye" },

	{ .id = CS8409_WARLOCK, .name = "warlock" },

	{ .id = CS8409_CYBORG, .name = "cyborg" },

	{}

};



const struct hda_fixup cs8409_fixups[] = {

	[CS8409_BULLSEYE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = cs8409_cs42l42_pincfgs,

		.chained = true,

		.chain_id = CS8409_FIXUPS,

	},

	[CS8409_WARLOCK] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = cs8409_cs42l42_pincfgs,

		.chained = true,

		.chain_id = CS8409_FIXUPS,

	},

	[CS8409_CYBORG] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = cs8409_cs42l42_pincfgs,

		.chained = true,

		.chain_id = CS8409_FIXUPS,

	},

	[CS8409_FIXUPS] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cs8409_cs42l42_fixups,

	},

};

sound/pci/hda/patch_cs8409.c

+155 −157

File changed.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/patch_cs8409.h

+28 −11
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ enum cs8409_coefficient_index_registers { 


/* CS42L42 Specific Definitions */



#define CS8409_MAX_CODECS			8

#define CS42L42_VOLUMES				(4U)



#define CS42L42_HP_VOL_REAL_MIN			(-63)

#define CS42L42_HP_VOL_REAL_MAX			(0)

#define CS42L42_AMIC_VOL_REAL_MIN		(-97)
@@ -243,8 +243,6 @@ enum cs8409_coefficient_index_registers { 
#define CS8409_CS42L42_DMIC_PIN_NID		CS8409_PIN_DMIC1_IN

#define CS8409_CS42L42_DMIC_ADC_PIN_NID		CS8409_PIN_DMIC1



#define CS42L42_INIT_REG_SEQ_SIZE		59



enum {

	CS8409_BULLSEYE,

	CS8409_WARLOCK,
@@ -252,6 +250,10 @@ enum { 
	CS8409_FIXUPS,

};



enum {

	CS8409_CODEC0,

};



enum {

	CS42L42_VOL_ADC,

	CS42L42_VOL_DAC,
@@ -268,25 +270,40 @@ struct cs8409_cir_param { 
	unsigned int coeff;

};



struct sub_codec {

	struct hda_codec *codec;

	unsigned int addr;

	unsigned int reset_gpio;

	unsigned int irq_mask;

	const struct cs8409_i2c_param *init_seq;

	unsigned int init_seq_num;



	unsigned int hp_jack_in:1;

	unsigned int mic_jack_in:1;

	unsigned int suspended:1;

	unsigned int paged:1;

	unsigned int last_page;

	unsigned int hsbias_hiz;

	unsigned int full_scale_vol:1;



	s8 vol[CS42L42_VOLUMES];

};



struct cs8409_spec {

	struct hda_gen_spec gen;

	struct hda_codec *codec;



	struct sub_codec *scodecs[CS8409_MAX_CODECS];

	unsigned int num_scodecs;



	unsigned int gpio_mask;

	unsigned int gpio_dir;

	unsigned int gpio_data;



	unsigned int cs42l42_hp_jack_in:1;

	unsigned int cs42l42_mic_jack_in:1;

	unsigned int cs42l42_suspended:1;

	s8 vol[CS42L42_VOLUMES];



	struct mutex i2c_mux;

	unsigned int i2c_clck_enabled;

	unsigned int dev_addr;

	struct delayed_work i2c_clk_work;

	unsigned int paged;

	unsigned int last_page;



	/* verb exec op override */

	int (*exec_verb)(struct hdac_device *dev, unsigned int cmd, unsigned int flags,
@@ -305,9 +322,9 @@ extern const struct hda_model_fixup cs8409_models[]; 
extern const struct hda_fixup cs8409_fixups[];

extern const struct hda_verb cs8409_cs42l42_init_verbs[];

extern const struct hda_pintbl cs8409_cs42l42_pincfgs[];

extern const struct cs8409_i2c_param cs42l42_init_reg_seq[CS42L42_INIT_REG_SEQ_SIZE];

extern const struct cs8409_cir_param cs8409_cs42l42_hw_cfg[];

extern const struct cs8409_cir_param cs8409_cs42l42_bullseye_atn[];

extern struct sub_codec cs8409_cs42l42_codec;



void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int action);