Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/cs42xx8',... (651c939f) · Commits · e / devices / android_kernel_teracube_emerald

sound/soc/codecs/cs42l73.c

+58 −64

Original line number	Diff line number	Diff line
		@@ -490,8 +490,8 @@ static const struct snd_kcontrol_new cs42l73_snd_controls[] = {
		static int cs42l73_spklo_spk_amp_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
		struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
		struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);
		switch (event) {
		case SND_SOC_DAPM_POST_PMD:
		/* 150 ms delay between setting PDN and MCLKDIS */
		@@ -506,8 +506,8 @@ static int cs42l73_spklo_spk_amp_event(struct snd_soc_dapm_widget *w,
		static int cs42l73_ear_amp_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
		struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
		struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);
		switch (event) {
		case SND_SOC_DAPM_POST_PMD:
		/* 50 ms delay between setting PDN and MCLKDIS */
		@@ -524,8 +524,8 @@ static int cs42l73_ear_amp_event(struct snd_soc_dapm_widget *w,
		static int cs42l73_hp_amp_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
		struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
		struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);
		switch (event) {
		case SND_SOC_DAPM_POST_PMD:
		/* 30 ms delay between setting PDN and MCLKDIS */
		@@ -884,8 +884,8 @@ static int cs42l73_get_mclk_coeff(int mclk, int srate)

		static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq)
		{
		struct snd_soc_codec *codec = dai->codec;
		struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = dai->component;
		struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);

		int mclkx_coeff;
		u32 mclk = 0;
		@@ -899,14 +899,14 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq)
		mclk = cs42l73_mclkx_coeffs[mclkx_coeff].mclkx /
		cs42l73_mclkx_coeffs[mclkx_coeff].ratio;

		dev_dbg(codec->dev, "MCLK%u %u <-> internal MCLK %u\n",
		dev_dbg(component->dev, "MCLK%u %u <-> internal MCLK %u\n",
		priv->mclksel + 1, cs42l73_mclkx_coeffs[mclkx_coeff].mclkx,
		mclk);

		dmmcc = (priv->mclksel << 4) \|
		(cs42l73_mclkx_coeffs[mclkx_coeff].mclkdiv << 1);

		snd_soc_write(codec, CS42L73_DMMCC, dmmcc);
		snd_soc_component_write(component, CS42L73_DMMCC, dmmcc);

		priv->sysclk = mclkx_coeff;
		priv->mclk = mclk;
		@@ -917,8 +917,8 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq)
		static int cs42l73_set_sysclk(struct snd_soc_dai *dai,
		int clk_id, unsigned int freq, int dir)
		{
		struct snd_soc_codec *codec = dai->codec;
		struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = dai->component;
		struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);

		switch (clk_id) {
		case CS42L73_CLKID_MCLK1:
		@@ -930,7 +930,7 @@ static int cs42l73_set_sysclk(struct snd_soc_dai *dai,
		}

		if ((cs42l73_set_mclk(dai, freq)) < 0) {
		dev_err(codec->dev, "Unable to set MCLK for dai %s\n",
		dev_err(component->dev, "Unable to set MCLK for dai %s\n",
		dai->name);
		return -EINVAL;
		}
		@@ -942,14 +942,14 @@ static int cs42l73_set_sysclk(struct snd_soc_dai *dai,

		static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
		{
		struct snd_soc_codec *codec = codec_dai->codec;
		struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = codec_dai->component;
		struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);
		u8 id = codec_dai->id;
		unsigned int inv, format;
		u8 spc, mmcc;

		spc = snd_soc_read(codec, CS42L73_SPC(id));
		mmcc = snd_soc_read(codec, CS42L73_MMCC(id));
		spc = snd_soc_component_read32(component, CS42L73_SPC(id));
		mmcc = snd_soc_component_read32(component, CS42L73_MMCC(id));

		switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
		case SND_SOC_DAIFMT_CBM_CFM:
		@@ -974,12 +974,12 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
		case SND_SOC_DAIFMT_DSP_A:
		case SND_SOC_DAIFMT_DSP_B:
		if (mmcc & CS42L73_MS_MASTER) {
		dev_err(codec->dev,
		dev_err(component->dev,
		"PCM format in slave mode only\n");
		return -EINVAL;
		}
		if (id == CS42L73_ASP) {
		dev_err(codec->dev,
		dev_err(component->dev,
		"PCM format is not supported on ASP port\n");
		return -EINVAL;
		}
		@@ -1029,7 +1029,7 @@ static unsigned int cs42l73_get_xspfs_coeff(u32 rate)
		return 0; /* 0 = Don't know */
		}

		static void cs42l73_update_asrc(struct snd_soc_codec *codec, int id, int srate)
		static void cs42l73_update_asrc(struct snd_soc_component *component, int id, int srate)
		{
		u8 spfs = 0;

		@@ -1038,13 +1038,13 @@ static void cs42l73_update_asrc(struct snd_soc_codec *codec, int id, int srate)

		switch (id) {
		case CS42L73_XSP:
		snd_soc_update_bits(codec, CS42L73_VXSPFS, 0x0f, spfs);
		snd_soc_component_update_bits(component, CS42L73_VXSPFS, 0x0f, spfs);
		break;
		case CS42L73_ASP:
		snd_soc_update_bits(codec, CS42L73_ASPC, 0x3c, spfs << 2);
		snd_soc_component_update_bits(component, CS42L73_ASPC, 0x3c, spfs << 2);
		break;
		case CS42L73_VSP:
		snd_soc_update_bits(codec, CS42L73_VXSPFS, 0xf0, spfs << 4);
		snd_soc_component_update_bits(component, CS42L73_VXSPFS, 0xf0, spfs << 4);
		break;
		default:
		break;
		@@ -1055,8 +1055,8 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params,
		struct snd_soc_dai *dai)
		{
		struct snd_soc_codec *codec = dai->codec;
		struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = dai->component;
		struct cs42l73_private *priv = snd_soc_component_get_drvdata(component);
		int id = dai->id;
		int mclk_coeff;
		int srate = params_rate(params);
		@@ -1070,7 +1070,7 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
		if (mclk_coeff < 0)
		return -EINVAL;

		dev_dbg(codec->dev,
		dev_dbg(component->dev,
		"DAI[%d]: MCLK %u, srate %u, MMCC[5:0] = %x\n",
		id, priv->mclk, srate,
		cs42l73_mclk_coeffs[mclk_coeff].mmcc);
		@@ -1091,38 +1091,38 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
		/* Update ASRCs */
		priv->config[id].srate = srate;

		snd_soc_write(codec, CS42L73_SPC(id), priv->config[id].spc);
		snd_soc_write(codec, CS42L73_MMCC(id), priv->config[id].mmcc);
		snd_soc_component_write(component, CS42L73_SPC(id), priv->config[id].spc);
		snd_soc_component_write(component, CS42L73_MMCC(id), priv->config[id].mmcc);

		cs42l73_update_asrc(codec, id, srate);
		cs42l73_update_asrc(component, id, srate);

		return 0;
		}

		static int cs42l73_set_bias_level(struct snd_soc_codec *codec,
		static int cs42l73_set_bias_level(struct snd_soc_component *component,
		enum snd_soc_bias_level level)
		{
		struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);
		struct cs42l73_private *cs42l73 = snd_soc_component_get_drvdata(component);

		switch (level) {
		case SND_SOC_BIAS_ON:
		snd_soc_update_bits(codec, CS42L73_DMMCC, CS42L73_MCLKDIS, 0);
		snd_soc_update_bits(codec, CS42L73_PWRCTL1, CS42L73_PDN, 0);
		snd_soc_component_update_bits(component, CS42L73_DMMCC, CS42L73_MCLKDIS, 0);
		snd_soc_component_update_bits(component, CS42L73_PWRCTL1, CS42L73_PDN, 0);
		break;

		case SND_SOC_BIAS_PREPARE:
		break;

		case SND_SOC_BIAS_STANDBY:
		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
		regcache_cache_only(cs42l73->regmap, false);
		regcache_sync(cs42l73->regmap);
		}
		snd_soc_update_bits(codec, CS42L73_PWRCTL1, CS42L73_PDN, 1);
		snd_soc_component_update_bits(component, CS42L73_PWRCTL1, CS42L73_PDN, 1);
		break;

		case SND_SOC_BIAS_OFF:
		snd_soc_update_bits(codec, CS42L73_PWRCTL1, CS42L73_PDN, 1);
		snd_soc_component_update_bits(component, CS42L73_PWRCTL1, CS42L73_PDN, 1);
		if (cs42l73->shutdwn_delay > 0) {
		mdelay(cs42l73->shutdwn_delay);
		cs42l73->shutdwn_delay = 0;
		@@ -1131,7 +1131,7 @@ static int cs42l73_set_bias_level(struct snd_soc_codec *codec,
		* down.
		*/
		}
		snd_soc_update_bits(codec, CS42L73_DMMCC, CS42L73_MCLKDIS, 1);
		snd_soc_component_update_bits(component, CS42L73_DMMCC, CS42L73_MCLKDIS, 1);
		break;
		}
		return 0;
		@@ -1139,10 +1139,10 @@ static int cs42l73_set_bias_level(struct snd_soc_codec *codec,

		static int cs42l73_set_tristate(struct snd_soc_dai *dai, int tristate)
		{
		struct snd_soc_codec *codec = dai->codec;
		struct snd_soc_component *component = dai->component;
		int id = dai->id;

		return snd_soc_update_bits(codec, CS42L73_SPC(id), CS42L73_SP_3ST,
		return snd_soc_component_update_bits(component, CS42L73_SPC(id), CS42L73_SP_3ST,
		tristate << 7);
		}

		@@ -1235,13 +1235,13 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
		}
		};

		static int cs42l73_probe(struct snd_soc_codec *codec)
		static int cs42l73_probe(struct snd_soc_component *component)
		{
		struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);
		struct cs42l73_private *cs42l73 = snd_soc_component_get_drvdata(component);

		/* Set Charge Pump Frequency */
		if (cs42l73->pdata.chgfreq)
		snd_soc_update_bits(codec, CS42L73_CPFCHC,
		snd_soc_component_update_bits(component, CS42L73_CPFCHC,
		CS42L73_CHARGEPUMP_MASK,
		cs42l73->pdata.chgfreq << 4);

		@@ -1252,19 +1252,20 @@ static int cs42l73_probe(struct snd_soc_codec *codec)
		return 0;
		}

		static const struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {
		static const struct snd_soc_component_driver soc_component_dev_cs42l73 = {
		.probe = cs42l73_probe,
		.set_bias_level = cs42l73_set_bias_level,
		.suspend_bias_off = true,

		.component_driver = {
		.controls = cs42l73_snd_controls,
		.num_controls = ARRAY_SIZE(cs42l73_snd_controls),
		.dapm_widgets = cs42l73_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(cs42l73_dapm_widgets),
		.dapm_routes = cs42l73_audio_map,
		.num_dapm_routes = ARRAY_SIZE(cs42l73_audio_map),
		},
		.suspend_bias_off = 1,
		.idle_bias_on = 1,
		.use_pmdown_time = 1,
		.endianness = 1,
		.non_legacy_dai_naming = 1,
		};

		static const struct regmap_config cs42l73_regmap = {
		@@ -1361,20 +1362,14 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
		dev_info(&i2c_client->dev,
		"Cirrus Logic CS42L73, Revision: %02X\n", reg & 0xFF);

		ret = snd_soc_register_codec(&i2c_client->dev,
		&soc_codec_dev_cs42l73, cs42l73_dai,
		ret = devm_snd_soc_register_component(&i2c_client->dev,
		&soc_component_dev_cs42l73, cs42l73_dai,
		ARRAY_SIZE(cs42l73_dai));
		if (ret < 0)
		return ret;
		return 0;
		}

		static int cs42l73_i2c_remove(struct i2c_client *client)
		{
		snd_soc_unregister_codec(&client->dev);
		return 0;
		}

		static const struct of_device_id cs42l73_of_match[] = {
		{ .compatible = "cirrus,cs42l73", },
		{},
		@@ -1395,7 +1390,6 @@ static struct i2c_driver cs42l73_i2c_driver = {
		},
		.id_table = cs42l73_id,
		.probe = cs42l73_i2c_probe,
		.remove = cs42l73_i2c_remove,

		};

sound/soc/codecs/cs42xx8-i2c.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ static int cs42xx8_i2c_probe(struct i2c_client *i2c,

		static int cs42xx8_i2c_remove(struct i2c_client *i2c)
		{
		snd_soc_unregister_codec(&i2c->dev);
		pm_runtime_disable(&i2c->dev);

		return 0;

sound/soc/codecs/cs42xx8.c

+28 −29

Original line number	Diff line number	Diff line
		@@ -194,8 +194,8 @@ static const struct cs42xx8_ratios cs42xx8_ratios[] = {
		static int cs42xx8_set_dai_sysclk(struct snd_soc_dai *codec_dai,
		int clk_id, unsigned int freq, int dir)
		{
		struct snd_soc_codec *codec = codec_dai->codec;
		struct cs42xx8_priv *cs42xx8 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = codec_dai->component;
		struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);

		cs42xx8->sysclk = freq;

		@@ -205,8 +205,8 @@ static int cs42xx8_set_dai_sysclk(struct snd_soc_dai *codec_dai,
		static int cs42xx8_set_dai_fmt(struct snd_soc_dai *codec_dai,
		unsigned int format)
		{
		struct snd_soc_codec *codec = codec_dai->codec;
		struct cs42xx8_priv *cs42xx8 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = codec_dai->component;
		struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);
		u32 val;

		/* Set DAI format */
		@@ -224,7 +224,7 @@ static int cs42xx8_set_dai_fmt(struct snd_soc_dai *codec_dai,
		val = CS42XX8_INTF_DAC_DIF_TDM \| CS42XX8_INTF_ADC_DIF_TDM;
		break;
		default:
		dev_err(codec->dev, "unsupported dai format\n");
		dev_err(component->dev, "unsupported dai format\n");
		return -EINVAL;
		}

		@@ -241,7 +241,7 @@ static int cs42xx8_set_dai_fmt(struct snd_soc_dai *codec_dai,
		cs42xx8->slave_mode = false;
		break;
		default:
		dev_err(codec->dev, "unsupported master/slave mode\n");
		dev_err(component->dev, "unsupported master/slave mode\n");
		return -EINVAL;
		}

		@@ -252,8 +252,8 @@ static int cs42xx8_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params,
		struct snd_soc_dai *dai)
		{
		struct snd_soc_codec *codec = dai->codec;
		struct cs42xx8_priv *cs42xx8 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = dai->component;
		struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);
		bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
		u32 ratio = cs42xx8->sysclk / params_rate(params);
		u32 i, fm, val, mask;
		@@ -267,7 +267,7 @@ static int cs42xx8_hw_params(struct snd_pcm_substream *substream,
		}

		if (i == ARRAY_SIZE(cs42xx8_ratios)) {
		dev_err(codec->dev, "unsupported sysclk ratio\n");
		dev_err(component->dev, "unsupported sysclk ratio\n");
		return -EINVAL;
		}

		@@ -285,8 +285,8 @@ static int cs42xx8_hw_params(struct snd_pcm_substream *substream,

		static int cs42xx8_digital_mute(struct snd_soc_dai *dai, int mute)
		{
		struct snd_soc_codec *codec = dai->codec;
		struct cs42xx8_priv *cs42xx8 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = dai->component;
		struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);
		u8 dac_unmute = cs42xx8->tx_channels ?
		~((0x1 << cs42xx8->tx_channels) - 1) : 0;

		@@ -382,14 +382,14 @@ const struct regmap_config cs42xx8_regmap_config = {
		};
		EXPORT_SYMBOL_GPL(cs42xx8_regmap_config);

		static int cs42xx8_codec_probe(struct snd_soc_codec *codec)
		static int cs42xx8_component_probe(struct snd_soc_component *component)
		{
		struct cs42xx8_priv *cs42xx8 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
		struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);
		struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

		switch (cs42xx8->drvdata->num_adcs) {
		case 3:
		snd_soc_add_codec_controls(codec, cs42xx8_adc3_snd_controls,
		snd_soc_add_component_controls(component, cs42xx8_adc3_snd_controls,
		ARRAY_SIZE(cs42xx8_adc3_snd_controls));
		snd_soc_dapm_new_controls(dapm, cs42xx8_adc3_dapm_widgets,
		ARRAY_SIZE(cs42xx8_adc3_dapm_widgets));
		@@ -406,18 +406,17 @@ static int cs42xx8_codec_probe(struct snd_soc_codec *codec)
		return 0;
		}

		static const struct snd_soc_codec_driver cs42xx8_driver = {
		.probe = cs42xx8_codec_probe,
		.idle_bias_off = true,

		.component_driver = {
		static const struct snd_soc_component_driver cs42xx8_driver = {
		.probe = cs42xx8_component_probe,
		.controls = cs42xx8_snd_controls,
		.num_controls = ARRAY_SIZE(cs42xx8_snd_controls),
		.dapm_widgets = cs42xx8_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(cs42xx8_dapm_widgets),
		.dapm_routes = cs42xx8_dapm_routes,
		.num_dapm_routes = ARRAY_SIZE(cs42xx8_dapm_routes),
		},
		.use_pmdown_time = 1,
		.endianness = 1,
		.non_legacy_dai_naming = 1,
		};

		const struct cs42xx8_driver_data cs42448_data = {
		@@ -520,9 +519,9 @@ int cs42xx8_probe(struct device dev, struct regmap regmap)
		/* Each adc supports stereo input */
		cs42xx8_dai.capture.channels_max = cs42xx8->drvdata->num_adcs * 2;

		ret = snd_soc_register_codec(dev, &cs42xx8_driver, &cs42xx8_dai, 1);
		ret = devm_snd_soc_register_component(dev, &cs42xx8_driver, &cs42xx8_dai, 1);
		if (ret) {
		dev_err(dev, "failed to register codec:%d\n", ret);
		dev_err(dev, "failed to register component:%d\n", ret);
		goto err_enable;
		}

sound/soc/codecs/cs43130.c

+122 −121

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/cs43130.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ struct cs43130_dai {
		};

		struct cs43130_private {
		struct snd_soc_codec *codec;
		struct snd_soc_component *component;
		struct regmap *regmap;
		struct regulator_bulk_data supplies[CS43130_NUM_SUPPLIES];
		struct gpio_desc *reset_gpio;