Commit 9f82b044 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next

parents cc43b456 1858fe97

include/sound/tlv320aic32x4.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ struct aic32x4_pdata { 
	u32 power_cfg;

	u32 micpga_routing;

	bool swapdacs;

	int rstn_gpio;

};



#endif

sound/soc/codecs/tlv320aic32x4.c

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

#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/cdev.h>

#include <linux/slab.h>
@@ -65,6 +66,7 @@ struct aic32x4_priv { 
	u32 power_cfg;

	u32 micpga_routing;

	bool swapdacs;

	int rstn_gpio;

};



/* 0dB min, 1dB steps */
@@ -627,10 +629,20 @@ static int aic32x4_probe(struct snd_soc_codec *codec) 
{

	struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);

	u32 tmp_reg;

	int ret;



	codec->hw_write = (hw_write_t) i2c_master_send;

	codec->control_data = aic32x4->control_data;



	if (aic32x4->rstn_gpio >= 0) {

		ret = devm_gpio_request_one(codec->dev, aic32x4->rstn_gpio,

				GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn");

		if (ret != 0)

			return ret;

		ndelay(10);

		gpio_set_value(aic32x4->rstn_gpio, 1);

	}



	snd_soc_write(codec, AIC32X4_RESET, 0x01);



	/* Power platform configuration */
@@ -675,6 +687,16 @@ static int aic32x4_probe(struct snd_soc_codec *codec) 
			     ARRAY_SIZE(aic32x4_snd_controls));

	aic32x4_add_widgets(codec);



	/*

	 * Workaround: for an unknown reason, the ADC needs to be powered up

	 * and down for the first capture to work properly. It seems related to

	 * a HW BUG or some kind of behavior not documented in the datasheet.

	 */

	tmp_reg = snd_soc_read(codec, AIC32X4_ADCSETUP);

	snd_soc_write(codec, AIC32X4_ADCSETUP, tmp_reg |

				AIC32X4_LADC_EN | AIC32X4_RADC_EN);

	snd_soc_write(codec, AIC32X4_ADCSETUP, tmp_reg);



	return 0;

}
@@ -713,10 +735,12 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c, 
		aic32x4->power_cfg = pdata->power_cfg;

		aic32x4->swapdacs = pdata->swapdacs;

		aic32x4->micpga_routing = pdata->micpga_routing;

		aic32x4->rstn_gpio = pdata->rstn_gpio;

	} else {

		aic32x4->power_cfg = 0;

		aic32x4->swapdacs = false;

		aic32x4->micpga_routing = 0;

		aic32x4->rstn_gpio = -1;

	}



	ret = snd_soc_register_codec(&i2c->dev,

sound/soc/codecs/tlv320aic32x4.h

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ 
#define AIC32X4_WORD_LEN_24BITS		0x02

#define AIC32X4_WORD_LEN_32BITS		0x03



#define AIC32X4_LADC_EN			(1 << 7)

#define AIC32X4_RADC_EN			(1 << 6)



#define AIC32X4_I2S_MODE		0x00

#define AIC32X4_DSP_MODE		0x01

#define AIC32X4_RIGHT_JUSTIFIED_MODE	0x02