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

Commit 4972a177 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

[ALSA] oxygen: generalize DAC volume TLV handling 



Add a pointer for DAC volume TLV data to the model structure so that the
model driver do not need to manually assign it in their control filter.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e983532e

sound/pci/oxygen/hifier.c

+2 −5
Original line number Diff line number Diff line
@@ -127,12 +127,8 @@ static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0); 


static int hifier_control_filter(struct snd_kcontrol_new *template)

{

	if (!strcmp(template->name, "Master Playback Volume")) {

		template->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;

		template->tlv.p = ak4396_db_scale;

	} else if (!strcmp(template->name, "Stereo Upmixing")) {

	if (!strcmp(template->name, "Stereo Upmixing"))

		return 1; /* stereo only - we don't need upmixing */

	}

	return 0;

}
@@ -148,6 +144,7 @@ static const struct oxygen_model model_hifier = { 
	.set_adc_params = set_cs5340_params,

	.update_dac_volume = update_ak4396_volume,

	.update_dac_mute = update_ak4396_mute,

	.dac_tlv = ak4396_db_scale,

	.model_data_size = sizeof(struct hifier_data),

	.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

		       PLAYBACK_1_TO_SPDIF |

sound/pci/oxygen/oxygen.c

+2 −11
Original line number Diff line number Diff line
@@ -249,27 +249,18 @@ static void set_ak5385_params(struct oxygen *chip, 


static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);



static int ak4396_control_filter(struct snd_kcontrol_new *template)

{

	if (!strcmp(template->name, "Master Playback Volume")) {

		template->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;

		template->tlv.p = ak4396_db_scale;

	}

	return 0;

}



static const struct oxygen_model model_generic = {

	.shortname = "C-Media CMI8788",

	.longname = "C-Media Oxygen HD Audio",

	.chip = "CMI8788",

	.owner = THIS_MODULE,

	.init = generic_init,

	.control_filter = ak4396_control_filter,

	.cleanup = generic_cleanup,

	.set_dac_params = set_ak4396_params,

	.set_adc_params = set_wm8785_params,

	.update_dac_volume = update_ak4396_volume,

	.update_dac_mute = update_ak4396_mute,

	.dac_tlv = ak4396_db_scale,

	.model_data_size = sizeof(struct generic_data),

	.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

		       PLAYBACK_1_TO_SPDIF |
@@ -291,12 +282,12 @@ static const struct oxygen_model model_meridian = { 
	.chip = "CMI8788",

	.owner = THIS_MODULE,

	.init = meridian_init,

	.control_filter = ak4396_control_filter,

	.cleanup = generic_cleanup,

	.set_dac_params = set_ak4396_params,

	.set_adc_params = set_ak5385_params,

	.update_dac_volume = update_ak4396_volume,

	.update_dac_mute = update_ak4396_mute,

	.dac_tlv = ak4396_db_scale,

	.model_data_size = sizeof(struct generic_data),

	.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

		       PLAYBACK_1_TO_SPDIF |

sound/pci/oxygen/oxygen.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct oxygen_model { 
	void (*gpio_changed)(struct oxygen *chip);

	void (*ac97_switch)(struct oxygen *chip,

			    unsigned int reg, unsigned int mute);

	const unsigned int *dac_tlv;

	size_t model_data_size;

	unsigned int pcm_dev_cfg;

	u8 dac_channels;

sound/pci/oxygen/oxygen_mixer.c

+5 −0
Original line number Diff line number Diff line
@@ -941,6 +941,11 @@ static int add_controls(struct oxygen *chip, 
			return err;

		if (err == 1)

			continue;

		if (!strcmp(template.name, "Master Playback Volume") &&

		    chip->model->dac_tlv) {

			template.tlv.p = chip->model->dac_tlv;

			template.access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;

		}

		ctl = snd_ctl_new1(&template, chip);

		if (!ctl)

			return -ENOMEM;

sound/pci/oxygen/virtuoso.c

+5 −10
Original line number Diff line number Diff line
@@ -502,24 +502,16 @@ static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -12700, 100, 0); 


static int xonar_d2_control_filter(struct snd_kcontrol_new *template)

{

	if (!strcmp(template->name, "Master Playback Volume")) {

		template->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;

		template->tlv.p = pcm1796_db_scale;

	} else if (!strncmp(template->name, "CD Capture ", 11)) {

	if (!strncmp(template->name, "CD Capture ", 11))

		/* CD in is actually connected to the video in pin */

		template->private_value ^= AC97_CD ^ AC97_VIDEO;

	}

	return 0;

}



static int xonar_dx_control_filter(struct snd_kcontrol_new *template)

{

	if (!strcmp(template->name, "Master Playback Volume")) {

		template->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;

		template->tlv.p = cs4362a_db_scale;

	} else if (!strncmp(template->name, "CD Capture ", 11)) {

	if (!strncmp(template->name, "CD Capture ", 11))

		return 1; /* no CD input */

	}

	return 0;

}
@@ -547,6 +539,7 @@ static const struct oxygen_model xonar_models[] = { 
		.set_adc_params = set_cs53x1_params,

		.update_dac_volume = update_pcm1796_volume,

		.update_dac_mute = update_pcm1796_mute,

		.dac_tlv = pcm1796_db_scale,

		.model_data_size = sizeof(struct xonar_data),

		.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

			       PLAYBACK_1_TO_SPDIF |
@@ -575,6 +568,7 @@ static const struct oxygen_model xonar_models[] = { 
		.update_dac_volume = update_pcm1796_volume,

		.update_dac_mute = update_pcm1796_mute,

		.gpio_changed = xonar_gpio_changed,

		.dac_tlv = pcm1796_db_scale,

		.model_data_size = sizeof(struct xonar_data),

		.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

			       PLAYBACK_1_TO_SPDIF |
@@ -604,6 +598,7 @@ static const struct oxygen_model xonar_models[] = { 
		.update_dac_mute = update_cs43xx_mute,

		.gpio_changed = xonar_gpio_changed,

		.ac97_switch = xonar_dx_ac97_switch,

		.dac_tlv = cs4362a_db_scale,

		.model_data_size = sizeof(struct xonar_data),

		.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

			       PLAYBACK_1_TO_SPDIF |