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

Commit b12a1906 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/max98095' into asoc-next

parents 9713d5d0 b10ab7b8 e3048c3d

Documentation/devicetree/bindings/sound/max98090.txt

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ Required properties: 


- interrupts : The CODEC's interrupt output.



Optional properties:



- clocks: The phandle of the master clock to the CODEC



- clock-names: Should be "mclk"



Pins on the device (for linking into audio routes):



  * MIC1

Documentation/devicetree/bindings/sound/max98095.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ Required properties: 


- reg : The I2C address of the device.



Optional properties:



- clocks: The phandle of the master clock to the CODEC



- clock-names: Should be "mclk"



Example:



max98095: codec@11 {

sound/soc/codecs/max98090.c

+27 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/regmap.h>

#include <linux/slab.h>

#include <linux/acpi.h>

#include <linux/clk.h>

#include <sound/jack.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -1547,19 +1548,19 @@ static const int lrclk_rates[] = { 
};



static const int user_pclk_rates[] = {

	13000000, 13000000

	13000000, 13000000, 19200000, 19200000,

};



static const int user_lrclk_rates[] = {

	44100, 48000

	44100, 48000, 44100, 48000,

};



static const unsigned long long ni_value[] = {

	3528, 768

	3528, 768, 441, 8

};



static const unsigned long long mi_value[] = {

	8125, 1625

	8125, 1625, 1500, 25

};



static void max98090_configure_bclk(struct snd_soc_codec *codec)
@@ -1800,6 +1801,19 @@ static int max98090_set_bias_level(struct snd_soc_codec *codec, 
		break;



	case SND_SOC_BIAS_PREPARE:

		/*

		 * SND_SOC_BIAS_PREPARE is called while preparing for a

		 * transition to ON or away from ON. If current bias_level

		 * is SND_SOC_BIAS_ON, then it is preparing for a transition

		 * away from ON. Disable the clock in that case, otherwise

		 * enable it.

		 */

		if (!IS_ERR(max98090->mclk)) {

			if (codec->dapm.bias_level == SND_SOC_BIAS_ON)

				clk_disable_unprepare(max98090->mclk);

			else

				clk_prepare_enable(max98090->mclk);

		}

		break;



	case SND_SOC_BIAS_STANDBY:
@@ -1929,6 +1943,11 @@ static int max98090_dai_set_sysclk(struct snd_soc_dai *dai, 
	if (freq == max98090->sysclk)

		return 0;



	if (!IS_ERR(max98090->mclk)) {

		freq = clk_round_rate(max98090->mclk, freq);

		clk_set_rate(max98090->mclk, freq);

	}



	/* Setup clocks for slave mode, and using the PLL

	 * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)

	 *		 0x02 (when master clk is 20MHz to 40MHz)..
@@ -2213,6 +2232,10 @@ static int max98090_probe(struct snd_soc_codec *codec) 


	dev_dbg(codec->dev, "max98090_probe\n");



	max98090->mclk = devm_clk_get(codec->dev, "mclk");

	if (PTR_ERR(max98090->mclk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;



	max98090->codec = codec;



	/* Reset the codec, the DSP core, and disable all interrupts */

sound/soc/codecs/max98090.h

+1 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,7 @@ struct max98090_priv { 
	struct snd_soc_codec *codec;

	enum max98090_type devtype;

	struct max98090_pdata *pdata;

	struct clk *mclk;

	unsigned int sysclk;

	unsigned int bclk;

	unsigned int lrclk;

sound/soc/codecs/max98095.c

+24 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/i2c.h>

#include <linux/clk.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -42,6 +43,7 @@ struct max98095_priv { 
	struct regmap *regmap;

	enum max98095_type devtype;

	struct max98095_pdata *pdata;

	struct clk *mclk;

	unsigned int sysclk;

	struct max98095_cdata dai[3];

	const char **eq_texts;
@@ -1395,6 +1397,11 @@ static int max98095_dai_set_sysclk(struct snd_soc_dai *dai, 
	if (freq == max98095->sysclk)

		return 0;



	if (!IS_ERR(max98095->mclk)) {

		freq = clk_round_rate(max98095->mclk, freq);

		clk_set_rate(max98095->mclk, freq);

	}



	/* Setup clocks for slave mode, and using the PLL

	 * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)

	 *         0x02 (when master clk is 20MHz to 40MHz)..
@@ -1634,6 +1641,19 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec, 
		break;



	case SND_SOC_BIAS_PREPARE:

		/*

		 * SND_SOC_BIAS_PREPARE is called while preparing for a

		 * transition to ON or away from ON. If current bias_level

		 * is SND_SOC_BIAS_ON, then it is preparing for a transition

		 * away from ON. Disable the clock in that case, otherwise

		 * enable it.

		 */

		if (!IS_ERR(max98095->mclk)) {

			if (codec->dapm.bias_level == SND_SOC_BIAS_ON)

				clk_disable_unprepare(max98095->mclk);

			else

				clk_prepare_enable(max98095->mclk);

		}

		break;



	case SND_SOC_BIAS_STANDBY:
@@ -2238,6 +2258,10 @@ static int max98095_probe(struct snd_soc_codec *codec) 
	struct i2c_client *client;

	int ret = 0;



	max98095->mclk = devm_clk_get(codec->dev, "mclk");

	if (PTR_ERR(max98095->mclk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;



	/* reset the codec, the DSP core, and disable all interrupts */

	max98095_reset(codec);