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

Commit 5b8bf2a5 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: oxygen: simplify model-specific MCLK handling 



Replace the get_i2s_mclk callback with tables of MCLK values.  This
simplifies the MCLK-handling code in both the framework and the model-
specific drivers.

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

sound/pci/oxygen/oxygen.c

+2 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ static const struct oxygen_model model_generic = { 
	.mixer_init = generic_wm8785_mixer_init,

	.cleanup = generic_cleanup,

	.resume = generic_resume,

	.get_i2s_mclk = oxygen_default_i2s_mclk,

	.set_dac_params = set_ak4396_params,

	.set_adc_params = set_wm8785_params,

	.update_dac_volume = update_ak4396_volume,
@@ -589,6 +588,8 @@ static const struct oxygen_model model_generic = { 
	.dac_volume_max = 255,

	.function_flags = OXYGEN_FUNCTION_SPI |

			  OXYGEN_FUNCTION_ENABLE_SPI_4_5,

	.dac_mclks = OXYGEN_MCLKS(256, 256, 128),

	.adc_mclks = OXYGEN_MCLKS(256, 256, 128),

	.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

};

sound/pci/oxygen/oxygen.h

+6 −4
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
#define PCM_AC97	5

#define PCM_COUNT	6



#define OXYGEN_MCLKS(f_single, f_double, f_quad) ((MCLK_##f_single << 0) | \

						  (MCLK_##f_double << 2) | \

						  (MCLK_##f_quad   << 4))



#define OXYGEN_IO_SIZE	0x100



#define OXYGEN_EEPROM_ID	0x434d	/* "CM" */
@@ -81,8 +85,6 @@ struct oxygen_model { 
	void (*resume)(struct oxygen *chip);

	void (*pcm_hardware_filter)(unsigned int channel,

				    struct snd_pcm_hardware *hardware);

	unsigned int (*get_i2s_mclk)(struct oxygen *chip, unsigned int channel,

				     struct snd_pcm_hw_params *hw_params);

	void (*set_dac_params)(struct oxygen *chip,

			       struct snd_pcm_hw_params *params);

	void (*set_adc_params)(struct oxygen *chip,
@@ -105,6 +107,8 @@ struct oxygen_model { 
	u8 dac_volume_max;

	u8 misc_flags;

	u8 function_flags;

	u8 dac_mclks;

	u8 adc_mclks;

	u16 dac_i2s_format;

	u16 adc_i2s_format;

};
@@ -171,8 +175,6 @@ void oxygen_update_spdif_source(struct oxygen *chip); 
/* oxygen_pcm.c */



int oxygen_pcm_init(struct oxygen *chip);

unsigned int oxygen_default_i2s_mclk(struct oxygen *chip, unsigned int channel,

				     struct snd_pcm_hw_params *hw_params);



/* oxygen_io.c */

sound/pci/oxygen/oxygen_lib.c

+24 −12
Original line number Diff line number Diff line
@@ -414,28 +414,40 @@ static void oxygen_init(struct oxygen *chip) 
		      (OXYGEN_FORMAT_16 << OXYGEN_MULTICH_FORMAT_SHIFT));

	oxygen_write8(chip, OXYGEN_REC_CHANNELS, OXYGEN_REC_CHANNELS_2_2_2);

	oxygen_write16(chip, OXYGEN_I2S_MULTICH_FORMAT,

		       OXYGEN_RATE_48000 | chip->model.dac_i2s_format |

		       OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |

		       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);

		       OXYGEN_RATE_48000 |

		       chip->model.dac_i2s_format |

		       OXYGEN_I2S_MCLK(chip->model.dac_mclks) |

		       OXYGEN_I2S_BITS_16 |

		       OXYGEN_I2S_MASTER |

		       OXYGEN_I2S_BCLK_64);

	if (chip->model.device_config & CAPTURE_0_FROM_I2S_1)

		oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,

			       OXYGEN_RATE_48000 | chip->model.adc_i2s_format |

			       OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |

			       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);

			       OXYGEN_RATE_48000 |

			       chip->model.adc_i2s_format |

			       OXYGEN_I2S_MCLK(chip->model.adc_mclks) |

			       OXYGEN_I2S_BITS_16 |

			       OXYGEN_I2S_MASTER |

			       OXYGEN_I2S_BCLK_64);

	else

		oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,

			       OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);

			       OXYGEN_I2S_MASTER |

			       OXYGEN_I2S_MUTE_MCLK);

	if (chip->model.device_config & (CAPTURE_0_FROM_I2S_2 |

					 CAPTURE_2_FROM_I2S_2))

		oxygen_write16(chip, OXYGEN_I2S_B_FORMAT,

			       OXYGEN_RATE_48000 | chip->model.adc_i2s_format |

			       OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |

			       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);

			       OXYGEN_RATE_48000 |

			       chip->model.adc_i2s_format |

			       OXYGEN_I2S_MCLK(chip->model.adc_mclks) |

			       OXYGEN_I2S_BITS_16 |

			       OXYGEN_I2S_MASTER |

			       OXYGEN_I2S_BCLK_64);

	else

		oxygen_write16(chip, OXYGEN_I2S_B_FORMAT,

			       OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);

			       OXYGEN_I2S_MASTER |

			       OXYGEN_I2S_MUTE_MCLK);

	oxygen_write16(chip, OXYGEN_I2S_C_FORMAT,

		       OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);

		       OXYGEN_I2S_MASTER |

		       OXYGEN_I2S_MUTE_MCLK);

	oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL,

			    OXYGEN_SPDIF_OUT_ENABLE |

			    OXYGEN_SPDIF_LOOPBACK);

sound/pci/oxygen/oxygen_pcm.c

+23 −16
Original line number Diff line number Diff line
@@ -274,17 +274,6 @@ static unsigned int oxygen_rate(struct snd_pcm_hw_params *hw_params) 
	}

}



unsigned int oxygen_default_i2s_mclk(struct oxygen *chip,

				     unsigned int channel,

				     struct snd_pcm_hw_params *hw_params)

{

	if (params_rate(hw_params) <= 96000)

		return OXYGEN_I2S_MCLK_256;

	else

		return OXYGEN_I2S_MCLK_128;

}

EXPORT_SYMBOL(oxygen_default_i2s_mclk);



static unsigned int oxygen_i2s_bits(struct snd_pcm_hw_params *hw_params)

{

	if (params_format(hw_params) == SNDRV_PCM_FORMAT_S32_LE)
@@ -344,6 +333,26 @@ static int oxygen_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static u16 get_mclk(struct oxygen *chip, unsigned int channel,

		    struct snd_pcm_hw_params *params)

{

	unsigned int mclks, shift;



	if (channel == PCM_MULTICH)

		mclks = chip->model.dac_mclks;

	else

		mclks = chip->model.adc_mclks;



	if (params_rate(params) <= 48000)

		shift = 0;

	else if (params_rate(params) <= 96000)

		shift = 2;

	else

		shift = 4;



	return OXYGEN_I2S_MCLK(mclks >> shift);

}



static int oxygen_rec_a_hw_params(struct snd_pcm_substream *substream,

				  struct snd_pcm_hw_params *hw_params)

{
@@ -360,8 +369,8 @@ static int oxygen_rec_a_hw_params(struct snd_pcm_substream *substream, 
			     OXYGEN_REC_FORMAT_A_MASK);

	oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT,

			      oxygen_rate(hw_params) |

			      chip->model.get_i2s_mclk(chip, PCM_A, hw_params) |

			      chip->model.adc_i2s_format |

			      get_mclk(chip, PCM_A, hw_params) |

			      oxygen_i2s_bits(hw_params),

			      OXYGEN_I2S_RATE_MASK |

			      OXYGEN_I2S_FORMAT_MASK |
@@ -396,9 +405,8 @@ static int oxygen_rec_b_hw_params(struct snd_pcm_substream *substream, 
	if (!is_ac97)

		oxygen_write16_masked(chip, OXYGEN_I2S_B_FORMAT,

				      oxygen_rate(hw_params) |

				      chip->model.get_i2s_mclk(chip, PCM_B,

							       hw_params) |

				      chip->model.adc_i2s_format |

				      get_mclk(chip, PCM_B, hw_params) |

				      oxygen_i2s_bits(hw_params),

				      OXYGEN_I2S_RATE_MASK |

				      OXYGEN_I2S_FORMAT_MASK |
@@ -479,8 +487,7 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream, 
	oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,

			      oxygen_rate(hw_params) |

			      chip->model.dac_i2s_format |

			      chip->model.get_i2s_mclk(chip, PCM_MULTICH,

						       hw_params) |

			      get_mclk(chip, PCM_MULTICH, hw_params) |

			      oxygen_i2s_bits(hw_params),

			      OXYGEN_I2S_RATE_MASK |

			      OXYGEN_I2S_FORMAT_MASK |

sound/pci/oxygen/oxygen_regs.h

+5 −3
Original line number Diff line number Diff line
@@ -139,9 +139,11 @@ 
#define  OXYGEN_I2S_FORMAT_I2S		0x0000

#define  OXYGEN_I2S_FORMAT_LJUST	0x0008

#define  OXYGEN_I2S_MCLK_MASK		0x0030	/* MCLK/LRCK */

#define  OXYGEN_I2S_MCLK_128		0x0000

#define  OXYGEN_I2S_MCLK_256		0x0010

#define  OXYGEN_I2S_MCLK_512		0x0020

#define  OXYGEN_I2S_MCLK_SHIFT		4

#define  MCLK_128			0

#define  MCLK_256			1

#define  MCLK_512			2

#define  OXYGEN_I2S_MCLK(f)		(((f) & 3) << OXYGEN_I2S_MCLK_SHIFT)

#define  OXYGEN_I2S_BITS_MASK		0x00c0

#define  OXYGEN_I2S_BITS_16		0x0000

#define  OXYGEN_I2S_BITS_20		0x0040