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

Unverified Commit 7275949e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/msm8916-wcd-digital',... 

Merge remote-tracking branches 'asoc/topic/msm8916-wcd-digital', 'asoc/topic/mtk', 'asoc/topic/nau8540', 'asoc/topic/nau8810' and 'asoc/topic/nau8824' into asoc-next
parents b886120a 2eec0a15 b1d0db06 415bc3a0 61cf1c47 b53117c0

sound/soc/codecs/msm8916-wcd-digital.c

+58 −57
Original line number Diff line number Diff line
@@ -348,14 +348,14 @@ static int msm8916_wcd_digital_enable_interpolator( 
						struct snd_kcontrol *kcontrol,

						int event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		/* apply the digital gain after the interpolator is enabled */

		usleep_range(10000, 10100);

		snd_soc_write(codec, rx_gain_reg[w->shift],

			      snd_soc_read(codec, rx_gain_reg[w->shift]));

		snd_soc_component_write(component, rx_gain_reg[w->shift],

			      snd_soc_component_read32(component, rx_gain_reg[w->shift]));

		break;

	}

	return 0;
@@ -365,7 +365,7 @@ static int msm8916_wcd_digital_enable_dec(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 snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	unsigned int decimator = w->shift + 1;

	u16 dec_reset_reg, tx_vol_ctl_reg, tx_mux_ctl_reg;

	u8 dec_hpf_cut_of_freq;
@@ -377,46 +377,46 @@ static int msm8916_wcd_digital_enable_dec(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		/* Enable TX digital mute */

		snd_soc_update_bits(codec, tx_vol_ctl_reg,

		snd_soc_component_update_bits(component, tx_vol_ctl_reg,

				    TX_VOL_CTL_CFG_MUTE_EN_MASK,

				    TX_VOL_CTL_CFG_MUTE_EN_ENABLE);

		dec_hpf_cut_of_freq = snd_soc_read(codec, tx_mux_ctl_reg) &

		dec_hpf_cut_of_freq = snd_soc_component_read32(component, tx_mux_ctl_reg) &

					TX_MUX_CTL_CUT_OFF_FREQ_MASK;

		dec_hpf_cut_of_freq >>= TX_MUX_CTL_CUT_OFF_FREQ_SHIFT;

		if (dec_hpf_cut_of_freq != TX_MUX_CTL_CF_NEG_3DB_150HZ) {

			/* set cut of freq to CF_MIN_3DB_150HZ (0x1) */

			snd_soc_update_bits(codec, tx_mux_ctl_reg,

			snd_soc_component_update_bits(component, tx_mux_ctl_reg,

					    TX_MUX_CTL_CUT_OFF_FREQ_MASK,

					    TX_MUX_CTL_CF_NEG_3DB_150HZ);

		}

		break;

	case SND_SOC_DAPM_POST_PMU:

		/* enable HPF */

		snd_soc_update_bits(codec, tx_mux_ctl_reg,

		snd_soc_component_update_bits(component, tx_mux_ctl_reg,

				    TX_MUX_CTL_HPF_BP_SEL_MASK,

				    TX_MUX_CTL_HPF_BP_SEL_NO_BYPASS);

		/* apply the digital gain after the decimator is enabled */

		snd_soc_write(codec, tx_gain_reg[w->shift],

			      snd_soc_read(codec, tx_gain_reg[w->shift]));

		snd_soc_update_bits(codec, tx_vol_ctl_reg,

		snd_soc_component_write(component, tx_gain_reg[w->shift],

			      snd_soc_component_read32(component, tx_gain_reg[w->shift]));

		snd_soc_component_update_bits(component, tx_vol_ctl_reg,

				    TX_VOL_CTL_CFG_MUTE_EN_MASK, 0);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_update_bits(codec, tx_vol_ctl_reg,

		snd_soc_component_update_bits(component, tx_vol_ctl_reg,

				    TX_VOL_CTL_CFG_MUTE_EN_MASK,

				    TX_VOL_CTL_CFG_MUTE_EN_ENABLE);

		snd_soc_update_bits(codec, tx_mux_ctl_reg,

		snd_soc_component_update_bits(component, tx_mux_ctl_reg,

				    TX_MUX_CTL_HPF_BP_SEL_MASK,

				    TX_MUX_CTL_HPF_BP_SEL_BYPASS);

		break;

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_update_bits(codec, dec_reset_reg, 1 << w->shift,

		snd_soc_component_update_bits(component, dec_reset_reg, 1 << w->shift,

				    1 << w->shift);

		snd_soc_update_bits(codec, dec_reset_reg, 1 << w->shift, 0x0);

		snd_soc_update_bits(codec, tx_mux_ctl_reg,

		snd_soc_component_update_bits(component, dec_reset_reg, 1 << w->shift, 0x0);

		snd_soc_component_update_bits(component, tx_mux_ctl_reg,

				    TX_MUX_CTL_HPF_BP_SEL_MASK,

				    TX_MUX_CTL_HPF_BP_SEL_BYPASS);

		snd_soc_update_bits(codec, tx_vol_ctl_reg,

		snd_soc_component_update_bits(component, tx_vol_ctl_reg,

				    TX_VOL_CTL_CFG_MUTE_EN_MASK, 0);

		break;

	}
@@ -428,35 +428,35 @@ static int msm8916_wcd_digital_enable_dmic(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 snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	unsigned int dmic;

	int ret;

	/* get dmic number out of widget name */

	char *dmic_num = strpbrk(w->name, "12");



	if (dmic_num == NULL) {

		dev_err(codec->dev, "Invalid DMIC\n");

		dev_err(component->dev, "Invalid DMIC\n");

		return -EINVAL;

	}

	ret = kstrtouint(dmic_num, 10, &dmic);

	if (ret < 0 || dmic > 2) {

		dev_err(codec->dev, "Invalid DMIC line on the codec\n");

		dev_err(component->dev, "Invalid DMIC line on the component\n");

		return -EINVAL;

	}



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_update_bits(codec, LPASS_CDC_CLK_DMIC_B1_CTL,

		snd_soc_component_update_bits(component, LPASS_CDC_CLK_DMIC_B1_CTL,

				    DMIC_B1_CTL_DMIC0_CLK_SEL_MASK,

				    DMIC_B1_CTL_DMIC0_CLK_SEL_DIV3);

		switch (dmic) {

		case 1:

			snd_soc_update_bits(codec, LPASS_CDC_TX1_DMIC_CTL,

			snd_soc_component_update_bits(component, LPASS_CDC_TX1_DMIC_CTL,

					    TXN_DMIC_CTL_CLK_SEL_MASK,

					    TXN_DMIC_CTL_CLK_SEL_DIV3);

			break;

		case 2:

			snd_soc_update_bits(codec, LPASS_CDC_TX2_DMIC_CTL,

			snd_soc_component_update_bits(component, LPASS_CDC_TX2_DMIC_CTL,

					    TXN_DMIC_CTL_CLK_SEL_MASK,

					    TXN_DMIC_CTL_CLK_SEL_DIV3);

			break;
@@ -575,20 +575,20 @@ static int msm8916_wcd_digital_get_clks(struct platform_device *pdev, 
	return 0;

}



static int msm8916_wcd_digital_codec_probe(struct snd_soc_codec *codec)

static int msm8916_wcd_digital_component_probe(struct snd_soc_component *component)

{

	struct msm8916_wcd_digital_priv *priv = dev_get_drvdata(codec->dev);

	struct msm8916_wcd_digital_priv *priv = dev_get_drvdata(component->dev);



	snd_soc_codec_set_drvdata(codec, priv);

	snd_soc_component_set_drvdata(component, priv);



	return 0;

}



static int msm8916_wcd_digital_codec_set_sysclk(struct snd_soc_codec *codec,

static int msm8916_wcd_digital_component_set_sysclk(struct snd_soc_component *component,

						int clk_id, int source,

						unsigned int freq, int dir)

{

	struct msm8916_wcd_digital_priv *p = dev_get_drvdata(codec->dev);

	struct msm8916_wcd_digital_priv *p = dev_get_drvdata(component->dev);



	return clk_set_rate(p->mclk, freq);

}
@@ -618,18 +618,18 @@ static int msm8916_wcd_digital_hw_params(struct snd_pcm_substream *substream, 
		rx_fs_rate = RX_I2S_CTL_RX_I2S_FS_RATE_F_48_KHZ;

		break;

	default:

		dev_err(dai->codec->dev, "Invalid sampling rate %d\n",

		dev_err(dai->component->dev, "Invalid sampling rate %d\n",

			params_rate(params));

		return -EINVAL;

	}



	switch (substream->stream) {

	case SNDRV_PCM_STREAM_CAPTURE:

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,

		snd_soc_component_update_bits(dai->component, LPASS_CDC_CLK_TX_I2S_CTL,

				    TX_I2S_CTL_TX_I2S_FS_RATE_MASK, tx_fs_rate);

		break;

	case SNDRV_PCM_STREAM_PLAYBACK:

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_RX_I2S_CTL,

		snd_soc_component_update_bits(dai->component, LPASS_CDC_CLK_RX_I2S_CTL,

				    RX_I2S_CTL_RX_I2S_FS_RATE_MASK, rx_fs_rate);

		break;

	default:
@@ -638,18 +638,19 @@ static int msm8916_wcd_digital_hw_params(struct snd_pcm_substream *substream, 


	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S16_LE:

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,

		snd_soc_component_update_bits(dai->component, LPASS_CDC_CLK_TX_I2S_CTL,

				    TX_I2S_CTL_TX_I2S_MODE_MASK,

				    TX_I2S_CTL_TX_I2S_MODE_16);

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_RX_I2S_CTL,

		snd_soc_component_update_bits(dai->component, LPASS_CDC_CLK_RX_I2S_CTL,

				    RX_I2S_CTL_RX_I2S_MODE_MASK,

				    RX_I2S_CTL_RX_I2S_MODE_16);

		break;



	case SNDRV_PCM_FORMAT_S32_LE:

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,

		snd_soc_component_update_bits(dai->component, LPASS_CDC_CLK_TX_I2S_CTL,

				    TX_I2S_CTL_TX_I2S_MODE_MASK,

				    TX_I2S_CTL_TX_I2S_MODE_32);

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_RX_I2S_CTL,

		snd_soc_component_update_bits(dai->component, LPASS_CDC_CLK_RX_I2S_CTL,

				    RX_I2S_CTL_RX_I2S_MODE_MASK,

				    RX_I2S_CTL_RX_I2S_MODE_32);

		break;
@@ -780,32 +781,32 @@ static const struct snd_soc_dapm_route msm8916_wcd_digital_audio_map[] = { 
static int msm8916_wcd_digital_startup(struct snd_pcm_substream *substream,

				       struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct snd_soc_component *component = dai->component;

	struct msm8916_wcd_digital_priv *msm8916_wcd;

	unsigned long mclk_rate;



	msm8916_wcd = snd_soc_codec_get_drvdata(codec);

	snd_soc_update_bits(codec, LPASS_CDC_CLK_MCLK_CTL,

	msm8916_wcd = snd_soc_component_get_drvdata(component);

	snd_soc_component_update_bits(component, LPASS_CDC_CLK_MCLK_CTL,

			    MCLK_CTL_MCLK_EN_MASK,

			    MCLK_CTL_MCLK_EN_ENABLE);

	snd_soc_update_bits(codec, LPASS_CDC_CLK_PDM_CTL,

	snd_soc_component_update_bits(component, LPASS_CDC_CLK_PDM_CTL,

			    LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_MASK,

			    LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_FB);



	mclk_rate = clk_get_rate(msm8916_wcd->mclk);

	switch (mclk_rate) {

	case 12288000:

		snd_soc_update_bits(codec, LPASS_CDC_TOP_CTL,

		snd_soc_component_update_bits(component, LPASS_CDC_TOP_CTL,

				    TOP_CTL_DIG_MCLK_FREQ_MASK,

				    TOP_CTL_DIG_MCLK_FREQ_F_12_288MHZ);

		break;

	case 9600000:

		snd_soc_update_bits(codec, LPASS_CDC_TOP_CTL,

		snd_soc_component_update_bits(component, LPASS_CDC_TOP_CTL,

				    TOP_CTL_DIG_MCLK_FREQ_MASK,

				    TOP_CTL_DIG_MCLK_FREQ_F_9_6MHZ);

		break;

	default:

		dev_err(codec->dev, "Invalid mclk rate %ld\n", mclk_rate);

		dev_err(component->dev, "Invalid mclk rate %ld\n", mclk_rate);

		break;

	}

	return 0;
@@ -814,7 +815,7 @@ static int msm8916_wcd_digital_startup(struct snd_pcm_substream *substream, 
static void msm8916_wcd_digital_shutdown(struct snd_pcm_substream *substream,

					 struct snd_soc_dai *dai)

{

	snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_PDM_CTL,

	snd_soc_component_update_bits(dai->component, LPASS_CDC_CLK_PDM_CTL,

			    LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_MASK, 0);

}
@@ -851,18 +852,19 @@ static struct snd_soc_dai_driver msm8916_wcd_digital_dai[] = { 
	       },

};



static const struct snd_soc_codec_driver msm8916_wcd_digital = {

	.probe = msm8916_wcd_digital_codec_probe,

	.set_sysclk = msm8916_wcd_digital_codec_set_sysclk,

	.component_driver = {

static const struct snd_soc_component_driver msm8916_wcd_digital = {

	.probe			= msm8916_wcd_digital_component_probe,

	.set_sysclk		= msm8916_wcd_digital_component_set_sysclk,

	.controls		= msm8916_wcd_digital_snd_controls,

	.num_controls		= ARRAY_SIZE(msm8916_wcd_digital_snd_controls),

	.dapm_widgets		= msm8916_wcd_digital_dapm_widgets,

		.num_dapm_widgets =

				 ARRAY_SIZE(msm8916_wcd_digital_dapm_widgets),

	.num_dapm_widgets	= ARRAY_SIZE(msm8916_wcd_digital_dapm_widgets),

	.dapm_routes		= msm8916_wcd_digital_audio_map,

	.num_dapm_routes	= ARRAY_SIZE(msm8916_wcd_digital_audio_map),

	},

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static const struct regmap_config msm8916_codec_regmap_config = {
@@ -915,7 +917,7 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev) 


	dev_set_drvdata(dev, priv);



	return snd_soc_register_codec(dev, &msm8916_wcd_digital,

	return devm_snd_soc_register_component(dev, &msm8916_wcd_digital,

				      msm8916_wcd_digital_dai,

				      ARRAY_SIZE(msm8916_wcd_digital_dai));

}
@@ -924,7 +926,6 @@ static int msm8916_wcd_digital_remove(struct platform_device *pdev) 
{

	struct msm8916_wcd_digital_priv *priv = dev_get_drvdata(&pdev->dev);



	snd_soc_unregister_codec(&pdev->dev);

	clk_disable_unprepare(priv->mclk);

	clk_disable_unprepare(priv->ahbclk);

sound/soc/codecs/nau8540.c

+36 −43
Original line number Diff line number Diff line
@@ -236,8 +236,8 @@ static const struct snd_kcontrol_new digital_ch1_mux = 
static int adc_power_control(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *k, int  event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);



	if (SND_SOC_DAPM_EVENT_ON(event)) {

		msleep(300);
@@ -258,8 +258,8 @@ static int adc_power_control(struct snd_soc_dapm_widget *w, 
static int aiftx_power_control(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *k, int  event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);



	if (SND_SOC_DAPM_EVENT_OFF(event)) {

		regmap_write(nau8540->regmap, NAU8540_REG_RST, 0x0001);
@@ -379,8 +379,8 @@ static int nau8540_clock_check(struct nau8540 *nau8540, int rate, int osr) 
static int nau8540_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 nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);

	unsigned int val_len = 0, osr;



	/* CLK_ADC = OSR * FS
@@ -422,8 +422,8 @@ static int nau8540_hw_params(struct snd_pcm_substream *substream, 


static int nau8540_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)

{

	struct snd_soc_codec *codec = dai->codec;

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);

	unsigned int ctrl1_val = 0, ctrl2_val = 0;



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
@@ -493,8 +493,8 @@ static int nau8540_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
static int nau8540_set_tdm_slot(struct snd_soc_dai *dai,

	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)

{

	struct snd_soc_codec *codec = dai->codec;

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);

	unsigned int ctrl2_val = 0, ctrl4_val = 0;



	if (slots > 4 || ((tx_mask & 0xf0) && (tx_mask & 0xf)))
@@ -649,10 +649,10 @@ static void nau8540_fll_apply(struct regmap *regmap, 
}



/* freq_out must be 256*Fs in order to achieve the best performance */

static int nau8540_set_pll(struct snd_soc_codec *codec, int pll_id, int source,

static int nau8540_set_pll(struct snd_soc_component *component, int pll_id, int source,

		unsigned int freq_in, unsigned int freq_out)

{

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);

	struct nau8540_fll fll_param;

	int ret, fs;
@@ -702,10 +702,10 @@ static int nau8540_set_pll(struct snd_soc_codec *codec, int pll_id, int source, 
	return 0;

}



static int nau8540_set_sysclk(struct snd_soc_codec *codec,

static int nau8540_set_sysclk(struct snd_soc_component *component,

	int clk_id, int source, unsigned int freq, int dir)

{

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);



	switch (clk_id) {

	case NAU8540_CLK_DIS:
@@ -777,9 +777,9 @@ static void nau8540_init_regs(struct nau8540 *nau8540) 
		NAU8540_I2S_DO34_TRI, NAU8540_I2S_DO34_TRI);

}



static int __maybe_unused nau8540_suspend(struct snd_soc_codec *codec)

static int __maybe_unused nau8540_suspend(struct snd_soc_component *component)

{

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);



	regcache_cache_only(nau8540->regmap, true);

	regcache_mark_dirty(nau8540->regmap);
@@ -787,9 +787,9 @@ static int __maybe_unused nau8540_suspend(struct snd_soc_codec *codec) 
	return 0;

}



static int __maybe_unused nau8540_resume(struct snd_soc_codec *codec)

static int __maybe_unused nau8540_resume(struct snd_soc_component *component)

{

	struct nau8540 *nau8540 = snd_soc_codec_get_drvdata(codec);

	struct nau8540 *nau8540 = snd_soc_component_get_drvdata(component);



	regcache_cache_only(nau8540->regmap, false);

	regcache_sync(nau8540->regmap);
@@ -797,21 +797,22 @@ static int __maybe_unused nau8540_resume(struct snd_soc_codec *codec) 
	return 0;

}



static const struct snd_soc_codec_driver nau8540_codec_driver = {

static const struct snd_soc_component_driver nau8540_component_driver = {

	.set_sysclk		= nau8540_set_sysclk,

	.set_pll		= nau8540_set_pll,

	.suspend		= nau8540_suspend,

	.resume			= nau8540_resume,

	.suspend_bias_off = true,



	.component_driver = {

	.controls		= nau8540_snd_controls,

	.num_controls		= ARRAY_SIZE(nau8540_snd_controls),

	.dapm_widgets		= nau8540_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(nau8540_dapm_widgets),

	.dapm_routes		= nau8540_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(nau8540_dapm_routes),

	},

	.suspend_bias_off	= 1,

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static const struct regmap_config nau8540_regmap_config = {
@@ -856,17 +857,10 @@ static int nau8540_i2c_probe(struct i2c_client *i2c, 
	nau8540_reset_chip(nau8540->regmap);

	nau8540_init_regs(nau8540);



	return snd_soc_register_codec(dev,

		&nau8540_codec_driver, &nau8540_dai, 1);

	return devm_snd_soc_register_component(dev,

		&nau8540_component_driver, &nau8540_dai, 1);

}



static int nau8540_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	return 0;

}





static const struct i2c_device_id nau8540_i2c_ids[] = {

	{ "nau8540", 0 },

	{ }
@@ -887,7 +881,6 @@ static struct i2c_driver nau8540_i2c_driver = { 
		.of_match_table = of_match_ptr(nau8540_of_ids),

	},

	.probe = nau8540_i2c_probe,

	.remove = nau8540_i2c_remove,

	.id_table = nau8540_i2c_ids,

};

module_i2c_driver(nau8540_i2c_driver);

sound/soc/codecs/nau8810.c

+33 −40
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ static bool nau8810_volatile_reg(struct device *dev, unsigned int reg) 
static int nau8810_eq_get(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);

	struct soc_bytes_ext *params = (void *)kcontrol->private_value;

	int i, reg, reg_val;

	u16 *val;
@@ -198,8 +198,8 @@ static int nau8810_eq_get(struct snd_kcontrol *kcontrol, 
static int nau8810_eq_put(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);

	struct soc_bytes_ext *params = (void *)kcontrol->private_value;

	void *data;

	u16 *val, value;
@@ -219,7 +219,7 @@ static int nau8810_eq_put(struct snd_kcontrol *kcontrol, 
		value = be16_to_cpu(*(val + i));

		ret = regmap_write(nau8810->regmap, reg + i, value);

		if (ret) {

			dev_err(codec->dev, "EQ configuration fail, register: %x ret: %d\n",

			dev_err(component->dev, "EQ configuration fail, register: %x ret: %d\n",

				reg + i, ret);

			kfree(data);

			return ret;
@@ -399,8 +399,8 @@ static const struct snd_kcontrol_new nau8810_loopback = 
static int check_mclk_select_pll(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);

	struct nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);

	unsigned int value;



	regmap_read(nau8810->regmap, NAU8810_REG_CLOCK, &value);
@@ -485,8 +485,8 @@ static const struct snd_soc_dapm_route nau8810_dapm_routes[] = { 
static int nau8810_set_sysclk(struct snd_soc_dai *dai,

				 int clk_id, unsigned int freq, int dir)

{

	struct snd_soc_codec *codec = dai->codec;

	struct nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);



	nau8810->clk_id = clk_id;

	nau8810->sysclk = freq;
@@ -538,8 +538,8 @@ static int nau88l0_calc_pll(unsigned int pll_in, 
static int nau8810_set_pll(struct snd_soc_dai *codec_dai, int pll_id,

	int source, unsigned int freq_in, unsigned int freq_out)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);

	struct regmap *map = nau8810->regmap;

	struct nau8810_pll *pll_param = &nau8810->pll;

	int ret, fs;
@@ -577,8 +577,8 @@ static int nau8810_set_pll(struct snd_soc_dai *codec_dai, int pll_id, 
static int nau8810_set_dai_fmt(struct snd_soc_dai *codec_dai,

		unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);

	u16 ctrl1_val = 0, ctrl2_val = 0;



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
@@ -667,8 +667,8 @@ static int nau8810_mclk_clkdiv(struct nau8810 *nau8810, int rate) 
static int nau8810_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 nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);

	int val_len = 0, val_rate = 0, ret = 0;



	switch (params_width(params)) {
@@ -723,10 +723,10 @@ static int nau8810_pcm_hw_params(struct snd_pcm_substream *substream, 
	return ret;

}



static int nau8810_set_bias_level(struct snd_soc_codec *codec,

static int nau8810_set_bias_level(struct snd_soc_component *component,

	enum snd_soc_bias_level level)

{

	struct nau8810 *nau8810 = snd_soc_codec_get_drvdata(codec);

	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);

	struct regmap *map = nau8810->regmap;



	switch (level) {
@@ -741,7 +741,7 @@ static int nau8810_set_bias_level(struct snd_soc_codec *codec, 
			NAU8810_IOBUF_EN | NAU8810_ABIAS_EN,

			NAU8810_IOBUF_EN | NAU8810_ABIAS_EN);



		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_sync(map);

			regmap_update_bits(map, NAU8810_REG_POWER1,

				NAU8810_REFIMP_MASK, NAU8810_REFIMP_3K);
@@ -808,18 +808,19 @@ static const struct regmap_config nau8810_regmap_config = { 
	.num_reg_defaults = ARRAY_SIZE(nau8810_reg_defaults),

};



static const struct snd_soc_codec_driver nau8810_codec_driver = {

static const struct snd_soc_component_driver nau8810_component_driver = {

	.set_bias_level		= nau8810_set_bias_level,

	.suspend_bias_off = true,



	.component_driver = {

	.controls		= nau8810_snd_controls,

	.num_controls		= ARRAY_SIZE(nau8810_snd_controls),

	.dapm_widgets		= nau8810_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(nau8810_dapm_widgets),

	.dapm_routes		= nau8810_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(nau8810_dapm_routes),

	},

	.suspend_bias_off	= 1,

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static int nau8810_i2c_probe(struct i2c_client *i2c,
@@ -842,15 +843,8 @@ static int nau8810_i2c_probe(struct i2c_client *i2c, 


	regmap_write(nau8810->regmap, NAU8810_REG_RESET, 0x00);



	return snd_soc_register_codec(dev,

		&nau8810_codec_driver, &nau8810_dai, 1);

}



static int nau8810_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);



	return 0;

	return devm_snd_soc_register_component(dev,

		&nau8810_component_driver, &nau8810_dai, 1);

}



static const struct i2c_device_id nau8810_i2c_id[] = {
@@ -873,7 +867,6 @@ static struct i2c_driver nau8810_i2c_driver = { 
		.of_match_table = of_match_ptr(nau8810_of_match),

	},

	.probe =    nau8810_i2c_probe,

	.remove =   nau8810_i2c_remove,

	.id_table = nau8810_i2c_id,

};

sound/soc/codecs/nau8824.c

+92 −61

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/nau8824.h

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ struct nau8824_osr_attr { 
};





int nau8824_enable_jack_detect(struct snd_soc_codec *codec,

int nau8824_enable_jack_detect(struct snd_soc_component *component,

	struct snd_soc_jack *jack);



#endif				/* _NAU8824_H */