Unverified Commit 7cc289b9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/mxs', 'asoc/topic/mxs-sgtl5000',... 

Merge remote-tracking branches 'asoc/topic/mxs', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/nau8540', 'asoc/topic/nau8824' and 'asoc/topic/nau8825' into asoc-next
parents fab9298c 949293d4 d04c413f fe83b1b7 080f773d fa25b4f5

Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt

+29 −4
Original line number Diff line number Diff line
@@ -5,6 +5,27 @@ Required properties: 
- model			: The user-visible name of this sound complex

- saif-controllers	: The phandle list of the MXS SAIF controller

- audio-codec		: The phandle of the SGTL5000 audio codec

- audio-routing		: A list of the connections between audio components.

			  Each entry is a pair of strings, the first being the

			  connection's sink, the second being the connection's

			  source. Valid names could be power supplies, SGTL5000

			  pins, and the jacks on the board:



			  Power supplies:

			   * Mic Bias



			  SGTL5000 pins:

			   * MIC_IN

			   * LINE_IN

			   * HP_OUT

			   * LINE_OUT



			  Board connectors:

			   * Mic Jack

			   * Line In Jack

			   * Headphone Jack

			   * Line Out Jack

			   * Ext Spk



Example:
@@ -14,4 +35,8 @@ sound { 
	model = "imx28-evk-sgtl5000";

	saif-controllers = <&saif0 &saif1>;

	audio-codec = <&sgtl5000>;

	audio-routing =

		"MIC_IN", "Mic Jack",

		"Mic Jack", "Mic Bias",

		"Headphone Jack", "HP_OUT";

};

Documentation/devicetree/bindings/sound/nau8825.txt

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ Optional properties: 
  - nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms

  - nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms



  - nuvoton,crosstalk-bypass: make crosstalk function bypass if set.

  - nuvoton,crosstalk-enable: make crosstalk function enable if set.



  - clocks: list of phandle and clock specifier pairs according to common clock bindings for the

      clocks described in clock-names
@@ -98,7 +98,7 @@ Example: 
      nuvoton,short-key-debounce = <2>;

      nuvoton,jack-insert-debounce = <7>;

      nuvoton,jack-eject-debounce = <7>;

      nuvoton,crosstalk-bypass;

      nuvoton,crosstalk-enable;



      clock-names = "mclk";

      clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;

sound/soc/codecs/nau8540.c

+80 −18
Original line number Diff line number Diff line
@@ -233,6 +233,41 @@ static SOC_ENUM_SINGLE_DECL( 
static const struct snd_kcontrol_new digital_ch1_mux =

	SOC_DAPM_ENUM("Digital CH1 Select", digital_ch1_enum);



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);



	if (SND_SOC_DAPM_EVENT_ON(event)) {

		msleep(300);

		/* DO12 and DO34 pad output enable */

		regmap_update_bits(nau8540->regmap, NAU8540_REG_PCM_CTRL1,

			NAU8540_I2S_DO12_TRI, 0);

		regmap_update_bits(nau8540->regmap, NAU8540_REG_PCM_CTRL2,

			NAU8540_I2S_DO34_TRI, 0);

	} else if (SND_SOC_DAPM_EVENT_OFF(event)) {

		regmap_update_bits(nau8540->regmap, NAU8540_REG_PCM_CTRL1,

			NAU8540_I2S_DO12_TRI, NAU8540_I2S_DO12_TRI);

		regmap_update_bits(nau8540->regmap, NAU8540_REG_PCM_CTRL2,

			NAU8540_I2S_DO34_TRI, NAU8540_I2S_DO34_TRI);

	}

	return 0;

}



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);



	if (SND_SOC_DAPM_EVENT_OFF(event)) {

		regmap_write(nau8540->regmap, NAU8540_REG_RST, 0x0001);

		regmap_write(nau8540->regmap, NAU8540_REG_RST, 0x0000);

	}

	return 0;

}



static const struct snd_soc_dapm_widget nau8540_dapm_widgets[] = {

	SND_SOC_DAPM_SUPPLY("MICBIAS2", NAU8540_REG_MIC_BIAS, 11, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("MICBIAS1", NAU8540_REG_MIC_BIAS, 10, 0, NULL, 0),
@@ -247,14 +282,18 @@ static const struct snd_soc_dapm_widget nau8540_dapm_widgets[] = { 
	SND_SOC_DAPM_PGA("Frontend PGA3", NAU8540_REG_PWR, 14, 0, NULL, 0),

	SND_SOC_DAPM_PGA("Frontend PGA4", NAU8540_REG_PWR, 15, 0, NULL, 0),



	SND_SOC_DAPM_ADC("ADC1", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 0, 0),

	SND_SOC_DAPM_ADC("ADC2", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 1, 0),

	SND_SOC_DAPM_ADC("ADC3", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 2, 0),

	SND_SOC_DAPM_ADC("ADC4", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 3, 0),

	SND_SOC_DAPM_ADC_E("ADC1", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 0, 0, adc_power_control,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

	SND_SOC_DAPM_ADC_E("ADC2", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 1, 0, adc_power_control,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

	SND_SOC_DAPM_ADC_E("ADC3", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 2, 0, adc_power_control,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

	SND_SOC_DAPM_ADC_E("ADC4", NULL,

		NAU8540_REG_POWER_MANAGEMENT, 3, 0, adc_power_control,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),



	SND_SOC_DAPM_PGA("ADC CH1", NAU8540_REG_ANALOG_PWR, 0, 0, NULL, 0),

	SND_SOC_DAPM_PGA("ADC CH2", NAU8540_REG_ANALOG_PWR, 1, 0, NULL, 0),
@@ -270,7 +309,8 @@ static const struct snd_soc_dapm_widget nau8540_dapm_widgets[] = { 
	SND_SOC_DAPM_MUX("Digital CH1 Mux",

		SND_SOC_NOPM, 0, 0, &digital_ch1_mux),



	SND_SOC_DAPM_AIF_OUT("AIFTX", "Capture", 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT_E("AIFTX", "Capture", 0, SND_SOC_NOPM, 0, 0,

		aiftx_power_control, SND_SOC_DAPM_POST_PMD),

};



static const struct snd_soc_dapm_route nau8540_dapm_routes[] = {
@@ -575,7 +615,8 @@ static void nau8540_fll_apply(struct regmap *regmap, 
		NAU8540_CLK_SRC_MASK | NAU8540_CLK_MCLK_SRC_MASK,

		NAU8540_CLK_SRC_MCLK | fll_param->mclk_src);

	regmap_update_bits(regmap, NAU8540_REG_FLL1,

		NAU8540_FLL_RATIO_MASK, fll_param->ratio);

		NAU8540_FLL_RATIO_MASK | NAU8540_ICTRL_LATCH_MASK,

		fll_param->ratio | (0x6 << NAU8540_ICTRL_LATCH_SFT));

	/* FLL 16-bit fractional input */

	regmap_write(regmap, NAU8540_REG_FLL2, fll_param->fll_frac);

	/* FLL 10-bit integer input */
@@ -596,13 +637,14 @@ static void nau8540_fll_apply(struct regmap *regmap, 
			NAU8540_FLL_PDB_DAC_EN | NAU8540_FLL_LOOP_FTR_EN |

			NAU8540_FLL_FTR_SW_FILTER);

		regmap_update_bits(regmap, NAU8540_REG_FLL6,

			NAU8540_SDM_EN, NAU8540_SDM_EN);

			NAU8540_SDM_EN | NAU8540_CUTOFF500,

			NAU8540_SDM_EN | NAU8540_CUTOFF500);

	} else {

		regmap_update_bits(regmap, NAU8540_REG_FLL5,

			NAU8540_FLL_PDB_DAC_EN | NAU8540_FLL_LOOP_FTR_EN |

			NAU8540_FLL_FTR_SW_MASK, NAU8540_FLL_FTR_SW_ACCU);

		regmap_update_bits(regmap,

			NAU8540_REG_FLL6, NAU8540_SDM_EN, 0);

		regmap_update_bits(regmap, NAU8540_REG_FLL6,

			NAU8540_SDM_EN | NAU8540_CUTOFF500, 0);

	}

}
@@ -617,17 +659,22 @@ static int nau8540_set_pll(struct snd_soc_codec *codec, int pll_id, int source, 
	switch (pll_id) {

	case NAU8540_CLK_FLL_MCLK:

		regmap_update_bits(nau8540->regmap, NAU8540_REG_FLL3,

			NAU8540_FLL_CLK_SRC_MASK, NAU8540_FLL_CLK_SRC_MCLK);

			NAU8540_FLL_CLK_SRC_MASK | NAU8540_GAIN_ERR_MASK,

			NAU8540_FLL_CLK_SRC_MCLK | 0);

		break;



	case NAU8540_CLK_FLL_BLK:

		regmap_update_bits(nau8540->regmap, NAU8540_REG_FLL3,

			NAU8540_FLL_CLK_SRC_MASK, NAU8540_FLL_CLK_SRC_BLK);

			NAU8540_FLL_CLK_SRC_MASK | NAU8540_GAIN_ERR_MASK,

			NAU8540_FLL_CLK_SRC_BLK |

			(0xf << NAU8540_GAIN_ERR_SFT));

		break;



	case NAU8540_CLK_FLL_FS:

		regmap_update_bits(nau8540->regmap, NAU8540_REG_FLL3,

			NAU8540_FLL_CLK_SRC_MASK, NAU8540_FLL_CLK_SRC_FS);

			NAU8540_FLL_CLK_SRC_MASK | NAU8540_GAIN_ERR_MASK,

			NAU8540_FLL_CLK_SRC_FS |

			(0xf << NAU8540_GAIN_ERR_SFT));

		break;



	default:
@@ -710,9 +757,24 @@ static void nau8540_init_regs(struct nau8540 *nau8540) 
	regmap_update_bits(regmap, NAU8540_REG_CLOCK_CTRL,

		NAU8540_CLK_ADC_EN | NAU8540_CLK_I2S_EN,

		NAU8540_CLK_ADC_EN | NAU8540_CLK_I2S_EN);

	/* ADC OSR selection, CLK_ADC = Fs * OSR */

	/* ADC OSR selection, CLK_ADC = Fs * OSR;

	 * Channel time alignment enable.

	 */

	regmap_update_bits(regmap, NAU8540_REG_ADC_SAMPLE_RATE,

		NAU8540_ADC_OSR_MASK, NAU8540_ADC_OSR_64);

		NAU8540_CH_SYNC | NAU8540_ADC_OSR_MASK,

		NAU8540_CH_SYNC | NAU8540_ADC_OSR_64);

	/* PGA input mode selection */

	regmap_update_bits(regmap, NAU8540_REG_FEPGA1,

		NAU8540_FEPGA1_MODCH2_SHT | NAU8540_FEPGA1_MODCH1_SHT,

		NAU8540_FEPGA1_MODCH2_SHT | NAU8540_FEPGA1_MODCH1_SHT);

	regmap_update_bits(regmap, NAU8540_REG_FEPGA2,

		NAU8540_FEPGA2_MODCH4_SHT | NAU8540_FEPGA2_MODCH3_SHT,

		NAU8540_FEPGA2_MODCH4_SHT | NAU8540_FEPGA2_MODCH3_SHT);

	/* DO12 and DO34 pad output disable */

	regmap_update_bits(regmap, NAU8540_REG_PCM_CTRL1,

		NAU8540_I2S_DO12_TRI, NAU8540_I2S_DO12_TRI);

	regmap_update_bits(regmap, NAU8540_REG_PCM_CTRL2,

		NAU8540_I2S_DO34_TRI, NAU8540_I2S_DO34_TRI);

}



static int __maybe_unused nau8540_suspend(struct snd_soc_codec *codec)

sound/soc/codecs/nau8540.h

+20 −0
Original line number Diff line number Diff line
@@ -100,9 +100,13 @@ 
#define NAU8540_CLK_MCLK_SRC_MASK	0xf



/* FLL1 (0x04) */

#define NAU8540_ICTRL_LATCH_SFT	10

#define NAU8540_ICTRL_LATCH_MASK	(0x7 << NAU8540_ICTRL_LATCH_SFT)

#define NAU8540_FLL_RATIO_MASK	0x7f



/* FLL3 (0x06) */

#define NAU8540_GAIN_ERR_SFT		12

#define NAU8540_GAIN_ERR_MASK		(0xf << NAU8540_GAIN_ERR_SFT)

#define NAU8540_FLL_CLK_SRC_SFT	10

#define NAU8540_FLL_CLK_SRC_MASK	(0x3 << NAU8540_FLL_CLK_SRC_SFT)

#define NAU8540_FLL_CLK_SRC_MCLK	(0 << NAU8540_FLL_CLK_SRC_SFT)
@@ -127,6 +131,7 @@ 
/* FLL6 (0x9) */

#define NAU8540_DCO_EN			(0x1 << 15)

#define NAU8540_SDM_EN			(0x1 << 14)

#define NAU8540_CUTOFF500		(0x1 << 13)



/* PCM_CTRL0 (0x10) */

#define NAU8540_I2S_BP_SFT		7
@@ -146,6 +151,7 @@ 
#define NAU8540_I2S_DF_PCM_AB		0x3



/* PCM_CTRL1 (0x11) */

#define NAU8540_I2S_DO12_TRI		(0x1 << 15)

#define NAU8540_I2S_LRC_DIV_SFT	12

#define NAU8540_I2S_LRC_DIV_MASK	(0x3 << NAU8540_I2S_LRC_DIV_SFT)

#define NAU8540_I2S_DO12_OE		(0x1 << 4)
@@ -156,6 +162,7 @@ 
#define NAU8540_I2S_BLK_DIV_MASK	0x7



/* PCM_CTRL1 (0x12) */

#define NAU8540_I2S_DO34_TRI		(0x1 << 15)

#define NAU8540_I2S_DO34_OE		(0x1 << 11)

#define NAU8540_I2S_TSLOT_L_MASK	0x3ff
@@ -165,6 +172,7 @@ 
#define NAU8540_TDM_TX_MASK		0xf



/* ADC_SAMPLE_RATE (0x3A) */

#define NAU8540_CH_SYNC		(0x1 << 14)

#define NAU8540_ADC_OSR_MASK		0x3

#define NAU8540_ADC_OSR_256		0x3

#define NAU8540_ADC_OSR_128		0x2
@@ -183,6 +191,18 @@ 
#define NAU8540_PRECHARGE_DIS		(0x1 << 13)

#define NAU8540_GLOBAL_BIAS_EN	(0x1 << 12)



/* FEPGA1 (0x69) */

#define NAU8540_FEPGA1_MODCH2_SHT_SFT	7

#define NAU8540_FEPGA1_MODCH2_SHT	(0x1 << NAU8540_FEPGA1_MODCH2_SHT_SFT)

#define NAU8540_FEPGA1_MODCH1_SHT_SFT	3

#define NAU8540_FEPGA1_MODCH1_SHT	(0x1 << NAU8540_FEPGA1_MODCH1_SHT_SFT)



/* FEPGA2 (0x6A) */

#define NAU8540_FEPGA2_MODCH4_SHT_SFT	7

#define NAU8540_FEPGA2_MODCH4_SHT	(0x1 << NAU8540_FEPGA2_MODCH4_SHT_SFT)

#define NAU8540_FEPGA2_MODCH3_SHT_SFT	3

#define NAU8540_FEPGA2_MODCH3_SHT	(0x1 << NAU8540_FEPGA2_MODCH3_SHT_SFT)





/* System Clock Source */

enum {

sound/soc/codecs/nau8824.c

+12 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static bool nau8824_is_jack_inserted(struct nau8824 *nau8824); 


/* the parameter threshold of FLL */

#define NAU_FREF_MAX 13500000

#define NAU_FVCO_MAX 124000000

#define NAU_FVCO_MAX 100000000

#define NAU_FVCO_MIN 90000000



/* scaling for mclk from sysclk_src output */
@@ -811,6 +811,7 @@ static void nau8824_eject_jack(struct nau8824 *nau8824) 
		NAU8824_JD_SLEEP_MODE, NAU8824_JD_SLEEP_MODE);



	/* Close clock for jack type detection at manual mode */

	if (dapm->bias_level < SND_SOC_BIAS_PREPARE)

		nau8824_config_sysclk(nau8824, NAU8824_CLK_DIS, 0);

}
@@ -843,6 +844,11 @@ static void nau8824_jdet_work(struct work_struct *work) 
	event_mask |= SND_JACK_HEADSET;

	snd_soc_jack_report(nau8824->jack, event, event_mask);



	/* Enable short key press and release interruption. */

	regmap_update_bits(regmap, NAU8824_REG_INTERRUPT_SETTING,

		NAU8824_IRQ_KEY_RELEASE_DIS |

		NAU8824_IRQ_KEY_SHORT_PRESS_DIS, 0);



	nau8824_sema_release(nau8824);

}
@@ -850,14 +856,14 @@ static void nau8824_setup_auto_irq(struct nau8824 *nau8824) 
{

	struct regmap *regmap = nau8824->regmap;



	/* Enable jack ejection, short key press and release interruption. */

	/* Enable jack ejection interruption. */

	regmap_update_bits(regmap, NAU8824_REG_INTERRUPT_SETTING_1,

		NAU8824_IRQ_INSERT_EN | NAU8824_IRQ_EJECT_EN,

		NAU8824_IRQ_EJECT_EN);

	regmap_update_bits(regmap, NAU8824_REG_INTERRUPT_SETTING,

		NAU8824_IRQ_EJECT_DIS | NAU8824_IRQ_KEY_RELEASE_DIS |

		NAU8824_IRQ_KEY_SHORT_PRESS_DIS, 0);

		NAU8824_IRQ_EJECT_DIS, 0);

	/* Enable internal VCO needed for interruptions */

	if (nau8824->dapm->bias_level < SND_SOC_BIAS_PREPARE)

		nau8824_config_sysclk(nau8824, NAU8824_CLK_INTERNAL, 0);

	regmap_update_bits(regmap, NAU8824_REG_ENA_CTRL,

		NAU8824_JD_SLEEP_MODE, 0);