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

Commit a3af0c65 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: ak4613: add single-end optional property for IN/OUT pins 



ak4613 IN/OUT pin can be selected as differential/single-end.
Default is differential, because it is register default settings.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8005c49d

Documentation/devicetree/bindings/sound/ak4613.txt

+10 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,16 @@ Required properties: 
- compatible : "asahi-kasei,ak4613"

- compatible : "asahi-kasei,ak4613"

- reg : The chip select number on the I2C bus

- reg : The chip select number on the I2C bus





Optional properties:

- ak4613,in1-single-end	: Boolean. Indicate input / output pins are single-ended.

- ak4613,in2-single-end	  rather than differential.

- ak4613,out1-single-end

- ak4613,out2-single-end

- ak4613,out3-single-end

- ak4613,out4-single-end

- ak4613,out5-single-end

- ak4613,out6-single-end



Example:

Example:





&i2c {

&i2c {

sound/soc/codecs/ak4613.c

+29 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,8 @@ struct ak4613_priv { 




	unsigned int fmt;

	unsigned int fmt;

	u8 fmt_ctrl;

	u8 fmt_ctrl;

	u8 oc;

	u8 ic;

	int cnt;

	int cnt;

};

};
@@ -343,6 +345,9 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, 
	snd_soc_update_bits(codec, CTRL1, FMT_MASK, fmt_ctrl);

	snd_soc_update_bits(codec, CTRL1, FMT_MASK, fmt_ctrl);

	snd_soc_write(codec, CTRL2, ctrl2);

	snd_soc_write(codec, CTRL2, ctrl2);





	snd_soc_write(codec, ICTRL, priv->ic);

	snd_soc_write(codec, OCTRL, priv->oc);



hw_params_end:

hw_params_end:

	if (ret < 0)

	if (ret < 0)

		dev_warn(dev, "unsupported data width/format combination\n");

		dev_warn(dev, "unsupported data width/format combination\n");
@@ -431,6 +436,28 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4613 = { 
	.num_dapm_routes	= ARRAY_SIZE(ak4613_intercon),

	.num_dapm_routes	= ARRAY_SIZE(ak4613_intercon),

};

};





static void ak4613_parse_of(struct ak4613_priv *priv,

			    struct device *dev)

{

	struct device_node *np = dev->of_node;

	char prop[32];

	int i;



	/* Input 1 - 2 */

	for (i = 0; i < 2; i++) {

		snprintf(prop, sizeof(prop), "ak4613,in%d-single-end", i + 1);

		if (!of_get_property(np, prop, NULL))

			priv->ic |= 1 << i;

	}



	/* Output 1 - 6 */

	for (i = 0; i < 6; i++) {

		snprintf(prop, sizeof(prop), "ak4613,out%d-single-end", i + 1);

		if (!of_get_property(np, prop, NULL))

			priv->oc |= 1 << i;

	}

}



static int ak4613_i2c_probe(struct i2c_client *i2c,

static int ak4613_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

			    const struct i2c_device_id *id)

{

{
@@ -458,6 +485,8 @@ static int ak4613_i2c_probe(struct i2c_client *i2c, 
	if (!priv)

	if (!priv)

		return -ENOMEM;

		return -ENOMEM;





	ak4613_parse_of(priv, dev);



	priv->fmt_ctrl		= NO_FMT;

	priv->fmt_ctrl		= NO_FMT;

	priv->cnt		= 0;

	priv->cnt		= 0;