Merge remote-tracking branches 'asoc/topic/ad193x' and 'asoc/topic/arizona' into asoc-next (2c218b74) · Commits · e / devices / android_kernel_oneplus_sm8150

sound/soc/codecs/Kconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ config SND_SOC_ALL_CODECS
		select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI
		select SND_SOC_WM8996 if I2C
		select SND_SOC_WM8997 if MFD_WM8997
		select SND_SOC_WM8998 if MFD_WM8998
		select SND_SOC_WM9081 if I2C
		select SND_SOC_WM9090 if I2C
		select SND_SOC_WM9705 if SND_SOC_AC97_BUS
		@@ -195,9 +196,11 @@ config SND_SOC_ARIZONA
		default y if SND_SOC_WM5102=y
		default y if SND_SOC_WM5110=y
		default y if SND_SOC_WM8997=y
		default y if SND_SOC_WM8998=y
		default m if SND_SOC_WM5102=m
		default m if SND_SOC_WM5110=m
		default m if SND_SOC_WM8997=m
		default m if SND_SOC_WM8998=m

		config SND_SOC_WM_HUBS
		tristate
		@@ -866,6 +869,9 @@ config SND_SOC_WM8996
		config SND_SOC_WM8997
		tristate

		config SND_SOC_WM8998
		tristate

		config SND_SOC_WM9081
		tristate

sound/soc/codecs/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ snd-soc-wm8993-objs := wm8993.o
		snd-soc-wm8994-objs := wm8994.o wm8958-dsp2.o
		snd-soc-wm8995-objs := wm8995.o
		snd-soc-wm8997-objs := wm8997.o
		snd-soc-wm8998-objs := wm8998.o
		snd-soc-wm9081-objs := wm9081.o
		snd-soc-wm9090-objs := wm9090.o
		snd-soc-wm9705-objs := wm9705.o
		@@ -364,6 +365,7 @@ obj-$(CONFIG_SND_SOC_WM8993) += snd-soc-wm8993.o
		obj-$(CONFIG_SND_SOC_WM8994) += snd-soc-wm8994.o
		obj-$(CONFIG_SND_SOC_WM8995) += snd-soc-wm8995.o
		obj-$(CONFIG_SND_SOC_WM8997) += snd-soc-wm8997.o
		obj-$(CONFIG_SND_SOC_WM8998) += snd-soc-wm8998.o
		obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-wm9081.o
		obj-$(CONFIG_SND_SOC_WM9090) += snd-soc-wm9090.o
		obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o

sound/soc/codecs/ad193x-i2c.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@
		#include "ad193x.h"

		static const struct i2c_device_id ad193x_id[] = {
		{ "ad1936", 0 },
		{ "ad1937", 0 },
		{ "ad1936", AD193X },
		{ "ad1937", AD193X },
		{ }
		};
		MODULE_DEVICE_TABLE(i2c, ad193x_id);
		@@ -30,7 +30,9 @@ static int ad193x_i2c_probe(struct i2c_client *client,
		config.val_bits = 8;
		config.reg_bits = 8;

		return ad193x_probe(&client->dev, devm_regmap_init_i2c(client, &config));
		return ad193x_probe(&client->dev,
		devm_regmap_init_i2c(client, &config),
		(enum ad193x_type)id->driver_data);
		}

		static int ad193x_i2c_remove(struct i2c_client *client)

sound/soc/codecs/ad193x-spi.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		static int ad193x_spi_probe(struct spi_device *spi)
		{
		const struct spi_device_id *id = spi_get_device_id(spi);
		struct regmap_config config;

		config = ad193x_regmap_config;
		@@ -24,7 +25,8 @@ static int ad193x_spi_probe(struct spi_device *spi)
		config.read_flag_mask = 0x09;
		config.write_flag_mask = 0x08;

		return ad193x_probe(&spi->dev, devm_regmap_init_spi(spi, &config));
		return ad193x_probe(&spi->dev, devm_regmap_init_spi(spi, &config),
		(enum ad193x_type)id->driver_data);
		}

		static int ad193x_spi_remove(struct spi_device *spi)
		@@ -33,6 +35,17 @@ static int ad193x_spi_remove(struct spi_device *spi)
		return 0;
		}

		static const struct spi_device_id ad193x_spi_id[] = {
		{ "ad193x", AD193X },
		{ "ad1933", AD1933 },
		{ "ad1934", AD1934 },
		{ "ad1938", AD193X },
		{ "ad1939", AD193X },
		{ "adau1328", AD193X },
		{ }
		};
		MODULE_DEVICE_TABLE(spi, ad193x_spi_id);

		static struct spi_driver ad193x_spi_driver = {
		.driver = {
		.name = "ad193x",
		@@ -40,6 +53,7 @@ static struct spi_driver ad193x_spi_driver = {
		},
		.probe = ad193x_spi_probe,
		.remove = ad193x_spi_remove,
		.id_table = ad193x_spi_id,
		};
		module_spi_driver(ad193x_spi_driver);

sound/soc/codecs/ad193x.c

+93 −35

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		/* codec private data */
		struct ad193x_priv {
		struct regmap *regmap;
		enum ad193x_type type;
		int sysclk;
		};

		@@ -47,12 +48,6 @@ static const struct snd_kcontrol_new ad193x_snd_controls[] = {
		SOC_DOUBLE_R_TLV("DAC4 Volume", AD193X_DAC_L4_VOL,
		AD193X_DAC_R4_VOL, 0, 0xFF, 1, adau193x_tlv),

		/* ADC switch control */
		SOC_DOUBLE("ADC1 Switch", AD193X_ADC_CTRL0, AD193X_ADCL1_MUTE,
		AD193X_ADCR1_MUTE, 1, 1),
		SOC_DOUBLE("ADC2 Switch", AD193X_ADC_CTRL0, AD193X_ADCL2_MUTE,
		AD193X_ADCR2_MUTE, 1, 1),

		/* DAC switch control */
		SOC_DOUBLE("DAC1 Switch", AD193X_DAC_CHNL_MUTE, AD193X_DACL1_MUTE,
		AD193X_DACR1_MUTE, 1, 1),
		@@ -63,26 +58,37 @@ static const struct snd_kcontrol_new ad193x_snd_controls[] = {
		SOC_DOUBLE("DAC4 Switch", AD193X_DAC_CHNL_MUTE, AD193X_DACL4_MUTE,
		AD193X_DACR4_MUTE, 1, 1),

		/* DAC de-emphasis */
		SOC_ENUM("Playback Deemphasis", ad193x_deemp_enum),
		};

		static const struct snd_kcontrol_new ad193x_adc_snd_controls[] = {
		/* ADC switch control */
		SOC_DOUBLE("ADC1 Switch", AD193X_ADC_CTRL0, AD193X_ADCL1_MUTE,
		AD193X_ADCR1_MUTE, 1, 1),
		SOC_DOUBLE("ADC2 Switch", AD193X_ADC_CTRL0, AD193X_ADCL2_MUTE,
		AD193X_ADCR2_MUTE, 1, 1),

		/* ADC high-pass filter */
		SOC_SINGLE("ADC High Pass Filter Switch", AD193X_ADC_CTRL0,
		AD193X_ADC_HIGHPASS_FILTER, 1, 0),

		/* DAC de-emphasis */
		SOC_ENUM("Playback Deemphasis", ad193x_deemp_enum),
		};

		static const struct snd_soc_dapm_widget ad193x_dapm_widgets[] = {
		SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0),
		SND_SOC_DAPM_PGA("DAC Output", AD193X_DAC_CTRL0, 0, 1, NULL, 0),
		SND_SOC_DAPM_ADC("ADC", "Capture", SND_SOC_NOPM, 0, 0),
		SND_SOC_DAPM_SUPPLY("PLL_PWR", AD193X_PLL_CLK_CTRL0, 0, 1, NULL, 0),
		SND_SOC_DAPM_SUPPLY("ADC_PWR", AD193X_ADC_CTRL0, 0, 1, NULL, 0),
		SND_SOC_DAPM_SUPPLY("SYSCLK", AD193X_PLL_CLK_CTRL0, 7, 0, NULL, 0),
		SND_SOC_DAPM_VMID("VMID"),
		SND_SOC_DAPM_OUTPUT("DAC1OUT"),
		SND_SOC_DAPM_OUTPUT("DAC2OUT"),
		SND_SOC_DAPM_OUTPUT("DAC3OUT"),
		SND_SOC_DAPM_OUTPUT("DAC4OUT"),
		};

		static const struct snd_soc_dapm_widget ad193x_adc_widgets[] = {
		SND_SOC_DAPM_ADC("ADC", "Capture", SND_SOC_NOPM, 0, 0),
		SND_SOC_DAPM_SUPPLY("ADC_PWR", AD193X_ADC_CTRL0, 0, 1, NULL, 0),
		SND_SOC_DAPM_INPUT("ADC1IN"),
		SND_SOC_DAPM_INPUT("ADC2IN"),
		};
		@@ -91,18 +97,33 @@ static const struct snd_soc_dapm_route audio_paths[] = {
		{ "DAC", NULL, "SYSCLK" },
		{ "DAC Output", NULL, "DAC" },
		{ "DAC Output", NULL, "VMID" },
		{ "ADC", NULL, "SYSCLK" },
		{ "DAC", NULL, "ADC_PWR" },
		{ "ADC", NULL, "ADC_PWR" },
		{ "DAC1OUT", NULL, "DAC Output" },
		{ "DAC2OUT", NULL, "DAC Output" },
		{ "DAC3OUT", NULL, "DAC Output" },
		{ "DAC4OUT", NULL, "DAC Output" },
		{ "SYSCLK", NULL, "PLL_PWR" },
		};

		static const struct snd_soc_dapm_route ad193x_adc_audio_paths[] = {
		{ "ADC", NULL, "SYSCLK" },
		{ "ADC", NULL, "ADC_PWR" },
		{ "ADC", NULL, "ADC1IN" },
		{ "ADC", NULL, "ADC2IN" },
		{ "SYSCLK", NULL, "PLL_PWR" },
		};

		static inline bool ad193x_has_adc(const struct ad193x_priv *ad193x)
		{
		switch (ad193x->type) {
		case AD1933:
		case AD1934:
		return false;
		default:
		break;
		}

		return true;
		}

		/*
		* DAI ops entries
		*/
		@@ -147,8 +168,10 @@ static int ad193x_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,

		regmap_update_bits(ad193x->regmap, AD193X_DAC_CTRL1,
		AD193X_DAC_CHAN_MASK, channels << AD193X_DAC_CHAN_SHFT);
		if (ad193x_has_adc(ad193x))
		regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2,
		AD193X_ADC_CHAN_MASK, channels << AD193X_ADC_CHAN_SHFT);
		AD193X_ADC_CHAN_MASK,
		channels << AD193X_ADC_CHAN_SHFT);

		return 0;
		}
		@@ -172,7 +195,9 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
		adc_serfmt \|= AD193X_ADC_SERFMT_AUX;
		break;
		default:
		if (ad193x_has_adc(ad193x))
		return -EINVAL;
		break;
		}

		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
		@@ -217,10 +242,12 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
		return -EINVAL;
		}

		if (ad193x_has_adc(ad193x)) {
		regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1,
		AD193X_ADC_SERFMT_MASK, adc_serfmt);
		regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL2,
		AD193X_ADC_FMT_MASK, adc_fmt);
		}
		regmap_update_bits(ad193x->regmap, AD193X_DAC_CTRL1,
		AD193X_DAC_FMT_MASK, dac_fmt);

		@@ -287,6 +314,7 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream,
		AD193X_DAC_WORD_LEN_MASK,
		word_len << AD193X_DAC_WORD_LEN_SHFT);

		if (ad193x_has_adc(ad193x))
		regmap_update_bits(ad193x->regmap, AD193X_ADC_CTRL1,
		AD193X_ADC_WORD_LEN_MASK, word_len);

		@@ -326,6 +354,8 @@ static struct snd_soc_dai_driver ad193x_dai = {
		static int ad193x_codec_probe(struct snd_soc_codec *codec)
		{
		struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
		int num, ret;

		/* default setting for ad193x */

		@@ -335,14 +365,46 @@ static int ad193x_codec_probe(struct snd_soc_codec *codec)
		regmap_write(ad193x->regmap, AD193X_DAC_CTRL2, 0x1A);
		/* dac in tdm mode */
		regmap_write(ad193x->regmap, AD193X_DAC_CTRL0, 0x40);

		/* adc only */
		if (ad193x_has_adc(ad193x)) {
		/* high-pass filter enable */
		regmap_write(ad193x->regmap, AD193X_ADC_CTRL0, 0x3);
		/* sata delay=1, adc aux mode */
		regmap_write(ad193x->regmap, AD193X_ADC_CTRL1, 0x43);
		}

		/* pll input: mclki/xi */
		regmap_write(ad193x->regmap, AD193X_PLL_CLK_CTRL0, 0x99); /* mclk=24.576Mhz: 0x9D; mclk=12.288Mhz: 0x99 */
		regmap_write(ad193x->regmap, AD193X_PLL_CLK_CTRL1, 0x04);

		/* adc only */
		if (ad193x_has_adc(ad193x)) {
		/* add adc controls */
		num = ARRAY_SIZE(ad193x_adc_snd_controls);
		ret = snd_soc_add_codec_controls(codec,
		ad193x_adc_snd_controls,
		num);
		if (ret)
		return ret;

		/* add adc widgets */
		num = ARRAY_SIZE(ad193x_adc_widgets);
		ret = snd_soc_dapm_new_controls(dapm,
		ad193x_adc_widgets,
		num);
		if (ret)
		return ret;

		/* add adc routes */
		num = ARRAY_SIZE(ad193x_adc_audio_paths);
		ret = snd_soc_dapm_add_routes(dapm,
		ad193x_adc_audio_paths,
		num);
		if (ret)
		return ret;
		}

		return 0;
		}

		@@ -356,18 +418,13 @@ static struct snd_soc_codec_driver soc_codec_dev_ad193x = {
		.num_dapm_routes = ARRAY_SIZE(audio_paths),
		};

		static bool adau193x_reg_volatile(struct device *dev, unsigned int reg)
		{
		return false;
		}

		const struct regmap_config ad193x_regmap_config = {
		.max_register = AD193X_NUM_REGS - 1,
		.volatile_reg = adau193x_reg_volatile,
		};
		EXPORT_SYMBOL_GPL(ad193x_regmap_config);

		int ad193x_probe(struct device dev, struct regmap regmap)
		int ad193x_probe(struct device dev, struct regmap regmap,
		enum ad193x_type type)
		{
		struct ad193x_priv *ad193x;

		@@ -379,6 +436,7 @@ int ad193x_probe(struct device dev, struct regmap regmap)
		return -ENOMEM;

		ad193x->regmap = regmap;
		ad193x->type = type;

		dev_set_drvdata(dev, ad193x);