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

Commit 0e7cb145 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/ak4671', 'asoc/topic/cs42l51' and... 

Merge remote-tracking branches 'asoc/topic/ak4671', 'asoc/topic/cs42l51' and 'asoc/topic/alc5623' into asoc-io
parents 7b80300e 64e6b58d 423f0c4a 0cd257bf

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ atmel,24c02 i2c serial eeprom (24cxx) 
atmel,at97sc3204t	i2c trusted platform module (TPM)

capella,cm32181		CM32181: Ambient Light Sensor

catalyst,24c32		i2c serial eeprom

cirrus,cs42l51		Cirrus Logic CS42L51 audio codec

dallas,ds1307		64 x 8, Serial, I2C Real-Time Clock

dallas,ds1338		I2C RTC with 56-Byte NV RAM

dallas,ds1339		I2C Serial Real-Time Clock

sound/soc/codecs/ak4671.c

+119 −121
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/init.h>

#include <linux/i2c.h>

#include <linux/delay.h>

#include <linux/regmap.h>

#include <linux/slab.h>

#include <sound/soc.h>

#include <sound/initval.h>
@@ -23,104 +24,99 @@ 
#include "ak4671.h"





/* codec private data */

struct ak4671_priv {

	enum snd_soc_control_type control_type;

};



/* ak4671 register cache & default register settings */

static const u8 ak4671_reg[AK4671_CACHEREGNUM] = {

	0x00,	/* AK4671_AD_DA_POWER_MANAGEMENT	(0x00)	*/

	0xf6,	/* AK4671_PLL_MODE_SELECT0		(0x01)	*/

	0x00,	/* AK4671_PLL_MODE_SELECT1		(0x02)	*/

	0x02,	/* AK4671_FORMAT_SELECT			(0x03)	*/

	0x00,	/* AK4671_MIC_SIGNAL_SELECT		(0x04)	*/

	0x55,	/* AK4671_MIC_AMP_GAIN			(0x05)	*/

	0x00,	/* AK4671_MIXING_POWER_MANAGEMENT0	(0x06)	*/

	0x00,	/* AK4671_MIXING_POWER_MANAGEMENT1	(0x07)	*/

	0xb5,	/* AK4671_OUTPUT_VOLUME_CONTROL		(0x08)	*/

	0x00,	/* AK4671_LOUT1_SIGNAL_SELECT		(0x09)	*/

	0x00,	/* AK4671_ROUT1_SIGNAL_SELECT		(0x0a)	*/

	0x00,	/* AK4671_LOUT2_SIGNAL_SELECT		(0x0b)	*/

	0x00,	/* AK4671_ROUT2_SIGNAL_SELECT		(0x0c)	*/

	0x00,	/* AK4671_LOUT3_SIGNAL_SELECT		(0x0d)	*/

	0x00,	/* AK4671_ROUT3_SIGNAL_SELECT		(0x0e)	*/

	0x00,	/* AK4671_LOUT1_POWER_MANAGERMENT	(0x0f)	*/

	0x00,	/* AK4671_LOUT2_POWER_MANAGERMENT	(0x10)	*/

	0x80,	/* AK4671_LOUT3_POWER_MANAGERMENT	(0x11)	*/

	0x91,	/* AK4671_LCH_INPUT_VOLUME_CONTROL	(0x12)	*/

	0x91,	/* AK4671_RCH_INPUT_VOLUME_CONTROL	(0x13)	*/

	0xe1,	/* AK4671_ALC_REFERENCE_SELECT		(0x14)	*/

	0x00,	/* AK4671_DIGITAL_MIXING_CONTROL	(0x15)	*/

	0x00,	/* AK4671_ALC_TIMER_SELECT		(0x16)	*/

	0x00,	/* AK4671_ALC_MODE_CONTROL		(0x17)	*/

	0x02,	/* AK4671_MODE_CONTROL1			(0x18)	*/

	0x01,	/* AK4671_MODE_CONTROL2			(0x19)	*/

	0x18,	/* AK4671_LCH_OUTPUT_VOLUME_CONTROL	(0x1a)	*/

	0x18,	/* AK4671_RCH_OUTPUT_VOLUME_CONTROL	(0x1b)	*/

	0x00,	/* AK4671_SIDETONE_A_CONTROL		(0x1c)	*/

	0x02,	/* AK4671_DIGITAL_FILTER_SELECT		(0x1d)	*/

	0x00,	/* AK4671_FIL3_COEFFICIENT0		(0x1e)	*/

	0x00,	/* AK4671_FIL3_COEFFICIENT1		(0x1f)	*/

	0x00,	/* AK4671_FIL3_COEFFICIENT2		(0x20)	*/

	0x00,	/* AK4671_FIL3_COEFFICIENT3		(0x21)	*/

	0x00,	/* AK4671_EQ_COEFFICIENT0		(0x22)	*/

	0x00,	/* AK4671_EQ_COEFFICIENT1		(0x23)	*/

	0x00,	/* AK4671_EQ_COEFFICIENT2		(0x24)	*/

	0x00,	/* AK4671_EQ_COEFFICIENT3		(0x25)	*/

	0x00,	/* AK4671_EQ_COEFFICIENT4		(0x26)	*/

	0x00,	/* AK4671_EQ_COEFFICIENT5		(0x27)	*/

	0xa9,	/* AK4671_FIL1_COEFFICIENT0		(0x28)	*/

	0x1f,	/* AK4671_FIL1_COEFFICIENT1		(0x29)	*/

	0xad,	/* AK4671_FIL1_COEFFICIENT2		(0x2a)	*/

	0x20,	/* AK4671_FIL1_COEFFICIENT3		(0x2b)	*/

	0x00,	/* AK4671_FIL2_COEFFICIENT0		(0x2c)	*/

	0x00,	/* AK4671_FIL2_COEFFICIENT1		(0x2d)	*/

	0x00,	/* AK4671_FIL2_COEFFICIENT2		(0x2e)	*/

	0x00,	/* AK4671_FIL2_COEFFICIENT3		(0x2f)	*/

	0x00,	/* AK4671_DIGITAL_FILTER_SELECT2	(0x30)	*/

	0x00,	/* this register not used			*/

	0x00,	/* AK4671_E1_COEFFICIENT0		(0x32)	*/

	0x00,	/* AK4671_E1_COEFFICIENT1		(0x33)	*/

	0x00,	/* AK4671_E1_COEFFICIENT2		(0x34)	*/

	0x00,	/* AK4671_E1_COEFFICIENT3		(0x35)	*/

	0x00,	/* AK4671_E1_COEFFICIENT4		(0x36)	*/

	0x00,	/* AK4671_E1_COEFFICIENT5		(0x37)	*/

	0x00,	/* AK4671_E2_COEFFICIENT0		(0x38)	*/

	0x00,	/* AK4671_E2_COEFFICIENT1		(0x39)	*/

	0x00,	/* AK4671_E2_COEFFICIENT2		(0x3a)	*/

	0x00,	/* AK4671_E2_COEFFICIENT3		(0x3b)	*/

	0x00,	/* AK4671_E2_COEFFICIENT4		(0x3c)	*/

	0x00,	/* AK4671_E2_COEFFICIENT5		(0x3d)	*/

	0x00,	/* AK4671_E3_COEFFICIENT0		(0x3e)	*/

	0x00,	/* AK4671_E3_COEFFICIENT1		(0x3f)	*/

	0x00,	/* AK4671_E3_COEFFICIENT2		(0x40)	*/

	0x00,	/* AK4671_E3_COEFFICIENT3		(0x41)	*/

	0x00,	/* AK4671_E3_COEFFICIENT4		(0x42)	*/

	0x00,	/* AK4671_E3_COEFFICIENT5		(0x43)	*/

	0x00,	/* AK4671_E4_COEFFICIENT0		(0x44)	*/

	0x00,	/* AK4671_E4_COEFFICIENT1		(0x45)	*/

	0x00,	/* AK4671_E4_COEFFICIENT2		(0x46)	*/

	0x00,	/* AK4671_E4_COEFFICIENT3		(0x47)	*/

	0x00,	/* AK4671_E4_COEFFICIENT4		(0x48)	*/

	0x00,	/* AK4671_E4_COEFFICIENT5		(0x49)	*/

	0x00,	/* AK4671_E5_COEFFICIENT0		(0x4a)	*/

	0x00,	/* AK4671_E5_COEFFICIENT1		(0x4b)	*/

	0x00,	/* AK4671_E5_COEFFICIENT2		(0x4c)	*/

	0x00,	/* AK4671_E5_COEFFICIENT3		(0x4d)	*/

	0x00,	/* AK4671_E5_COEFFICIENT4		(0x4e)	*/

	0x00,	/* AK4671_E5_COEFFICIENT5		(0x4f)	*/

	0x88,	/* AK4671_EQ_CONTROL_250HZ_100HZ	(0x50)	*/

	0x88,	/* AK4671_EQ_CONTROL_3500HZ_1KHZ	(0x51)	*/

	0x08,	/* AK4671_EQ_CONTRO_10KHZ		(0x52)	*/

	0x00,	/* AK4671_PCM_IF_CONTROL0		(0x53)	*/

	0x00,	/* AK4671_PCM_IF_CONTROL1		(0x54)	*/

	0x00,	/* AK4671_PCM_IF_CONTROL2		(0x55)	*/

	0x18,	/* AK4671_DIGITAL_VOLUME_B_CONTROL	(0x56)	*/

	0x18,	/* AK4671_DIGITAL_VOLUME_C_CONTROL	(0x57)	*/

	0x00,	/* AK4671_SIDETONE_VOLUME_CONTROL	(0x58)	*/

	0x00,	/* AK4671_DIGITAL_MIXING_CONTROL2	(0x59)	*/

	0x00,	/* AK4671_SAR_ADC_CONTROL		(0x5a)	*/

static const struct reg_default ak4671_reg_defaults[] = {

	{ 0x00, 0x00 },	/* AK4671_AD_DA_POWER_MANAGEMENT	(0x00)	*/

	{ 0x01, 0xf6 },	/* AK4671_PLL_MODE_SELECT0		(0x01)	*/

	{ 0x02, 0x00 },	/* AK4671_PLL_MODE_SELECT1		(0x02)	*/

	{ 0x03, 0x02 },	/* AK4671_FORMAT_SELECT			(0x03)	*/

	{ 0x04, 0x00 },	/* AK4671_MIC_SIGNAL_SELECT		(0x04)	*/

	{ 0x05, 0x55 },	/* AK4671_MIC_AMP_GAIN			(0x05)	*/

	{ 0x06, 0x00 },	/* AK4671_MIXING_POWER_MANAGEMENT0	(0x06)	*/

	{ 0x07, 0x00 },	/* AK4671_MIXING_POWER_MANAGEMENT1	(0x07)	*/

	{ 0x08, 0xb5 },	/* AK4671_OUTPUT_VOLUME_CONTROL		(0x08)	*/

	{ 0x09, 0x00 },	/* AK4671_LOUT1_SIGNAL_SELECT		(0x09)	*/

	{ 0x0a, 0x00 },	/* AK4671_ROUT1_SIGNAL_SELECT		(0x0a)	*/

	{ 0x0b, 0x00 },	/* AK4671_LOUT2_SIGNAL_SELECT		(0x0b)	*/

	{ 0x0c, 0x00 },	/* AK4671_ROUT2_SIGNAL_SELECT		(0x0c)	*/

	{ 0x0d, 0x00 },	/* AK4671_LOUT3_SIGNAL_SELECT		(0x0d)	*/

	{ 0x0e, 0x00 },	/* AK4671_ROUT3_SIGNAL_SELECT		(0x0e)	*/

	{ 0x0f, 0x00 },	/* AK4671_LOUT1_POWER_MANAGERMENT	(0x0f)	*/

	{ 0x10, 0x00 },	/* AK4671_LOUT2_POWER_MANAGERMENT	(0x10)	*/

	{ 0x11, 0x80 },	/* AK4671_LOUT3_POWER_MANAGERMENT	(0x11)	*/

	{ 0x12, 0x91 },	/* AK4671_LCH_INPUT_VOLUME_CONTROL	(0x12)	*/

	{ 0x13, 0x91 },	/* AK4671_RCH_INPUT_VOLUME_CONTROL	(0x13)	*/

	{ 0x14, 0xe1 },	/* AK4671_ALC_REFERENCE_SELECT		(0x14)	*/

	{ 0x15, 0x00 },	/* AK4671_DIGITAL_MIXING_CONTROL	(0x15)	*/

	{ 0x16, 0x00 },	/* AK4671_ALC_TIMER_SELECT		(0x16)	*/

	{ 0x17, 0x00 },	/* AK4671_ALC_MODE_CONTROL		(0x17)	*/

	{ 0x18, 0x02 },	/* AK4671_MODE_CONTROL1			(0x18)	*/

	{ 0x19, 0x01 },	/* AK4671_MODE_CONTROL2			(0x19)	*/

	{ 0x1a, 0x18 },	/* AK4671_LCH_OUTPUT_VOLUME_CONTROL	(0x1a)	*/

	{ 0x1b, 0x18 },	/* AK4671_RCH_OUTPUT_VOLUME_CONTROL	(0x1b)	*/

	{ 0x1c, 0x00 },	/* AK4671_SIDETONE_A_CONTROL		(0x1c)	*/

	{ 0x1d, 0x02 },	/* AK4671_DIGITAL_FILTER_SELECT		(0x1d)	*/

	{ 0x1e, 0x00 },	/* AK4671_FIL3_COEFFICIENT0		(0x1e)	*/

	{ 0x1f, 0x00 },	/* AK4671_FIL3_COEFFICIENT1		(0x1f)	*/

	{ 0x20, 0x00 },	/* AK4671_FIL3_COEFFICIENT2		(0x20)	*/

	{ 0x21, 0x00 },	/* AK4671_FIL3_COEFFICIENT3		(0x21)	*/

	{ 0x22, 0x00 },	/* AK4671_EQ_COEFFICIENT0		(0x22)	*/

	{ 0x23, 0x00 },	/* AK4671_EQ_COEFFICIENT1		(0x23)	*/

	{ 0x24, 0x00 },	/* AK4671_EQ_COEFFICIENT2		(0x24)	*/

	{ 0x25, 0x00 },	/* AK4671_EQ_COEFFICIENT3		(0x25)	*/

	{ 0x26, 0x00 },	/* AK4671_EQ_COEFFICIENT4		(0x26)	*/

	{ 0x27, 0x00 },	/* AK4671_EQ_COEFFICIENT5		(0x27)	*/

	{ 0x28, 0xa9 },	/* AK4671_FIL1_COEFFICIENT0		(0x28)	*/

	{ 0x29, 0x1f },	/* AK4671_FIL1_COEFFICIENT1		(0x29)	*/

	{ 0x2a, 0xad },	/* AK4671_FIL1_COEFFICIENT2		(0x2a)	*/

	{ 0x2b, 0x20 },	/* AK4671_FIL1_COEFFICIENT3		(0x2b)	*/

	{ 0x2c, 0x00 },	/* AK4671_FIL2_COEFFICIENT0		(0x2c)	*/

	{ 0x2d, 0x00 },	/* AK4671_FIL2_COEFFICIENT1		(0x2d)	*/

	{ 0x2e, 0x00 },	/* AK4671_FIL2_COEFFICIENT2		(0x2e)	*/

	{ 0x2f, 0x00 },	/* AK4671_FIL2_COEFFICIENT3		(0x2f)	*/

	{ 0x30, 0x00 },	/* AK4671_DIGITAL_FILTER_SELECT2	(0x30)	*/



	{ 0x32, 0x00 },	/* AK4671_E1_COEFFICIENT0		(0x32)	*/

	{ 0x33, 0x00 },	/* AK4671_E1_COEFFICIENT1		(0x33)	*/

	{ 0x34, 0x00 },	/* AK4671_E1_COEFFICIENT2		(0x34)	*/

	{ 0x35, 0x00 },	/* AK4671_E1_COEFFICIENT3		(0x35)	*/

	{ 0x36, 0x00 },	/* AK4671_E1_COEFFICIENT4		(0x36)	*/

	{ 0x37, 0x00 },	/* AK4671_E1_COEFFICIENT5		(0x37)	*/

	{ 0x38, 0x00 },	/* AK4671_E2_COEFFICIENT0		(0x38)	*/

	{ 0x39, 0x00 },	/* AK4671_E2_COEFFICIENT1		(0x39)	*/

	{ 0x3a, 0x00 },	/* AK4671_E2_COEFFICIENT2		(0x3a)	*/

	{ 0x3b, 0x00 },	/* AK4671_E2_COEFFICIENT3		(0x3b)	*/

	{ 0x3c, 0x00 },	/* AK4671_E2_COEFFICIENT4		(0x3c)	*/

	{ 0x3d, 0x00 },	/* AK4671_E2_COEFFICIENT5		(0x3d)	*/

	{ 0x3e, 0x00 },	/* AK4671_E3_COEFFICIENT0		(0x3e)	*/

	{ 0x3f, 0x00 },	/* AK4671_E3_COEFFICIENT1		(0x3f)	*/

	{ 0x40, 0x00 },	/* AK4671_E3_COEFFICIENT2		(0x40)	*/

	{ 0x41, 0x00 },	/* AK4671_E3_COEFFICIENT3		(0x41)	*/

	{ 0x42, 0x00 },	/* AK4671_E3_COEFFICIENT4		(0x42)	*/

	{ 0x43, 0x00 },	/* AK4671_E3_COEFFICIENT5		(0x43)	*/

	{ 0x44, 0x00 },	/* AK4671_E4_COEFFICIENT0		(0x44)	*/

	{ 0x45, 0x00 },	/* AK4671_E4_COEFFICIENT1		(0x45)	*/

	{ 0x46, 0x00 },	/* AK4671_E4_COEFFICIENT2		(0x46)	*/

	{ 0x47, 0x00 },	/* AK4671_E4_COEFFICIENT3		(0x47)	*/

	{ 0x48, 0x00 },	/* AK4671_E4_COEFFICIENT4		(0x48)	*/

	{ 0x49, 0x00 },	/* AK4671_E4_COEFFICIENT5		(0x49)	*/

	{ 0x4a, 0x00 },	/* AK4671_E5_COEFFICIENT0		(0x4a)	*/

	{ 0x4b, 0x00 },	/* AK4671_E5_COEFFICIENT1		(0x4b)	*/

	{ 0x4c, 0x00 },	/* AK4671_E5_COEFFICIENT2		(0x4c)	*/

	{ 0x4d, 0x00 },	/* AK4671_E5_COEFFICIENT3		(0x4d)	*/

	{ 0x4e, 0x00 },	/* AK4671_E5_COEFFICIENT4		(0x4e)	*/

	{ 0x4f, 0x00 },	/* AK4671_E5_COEFFICIENT5		(0x4f)	*/

	{ 0x50, 0x88 },	/* AK4671_EQ_CONTROL_250HZ_100HZ	(0x50)	*/

	{ 0x51, 0x88 },	/* AK4671_EQ_CONTROL_3500HZ_1KHZ	(0x51)	*/

	{ 0x52, 0x08 },	/* AK4671_EQ_CONTRO_10KHZ		(0x52)	*/

	{ 0x53, 0x00 },	/* AK4671_PCM_IF_CONTROL0		(0x53)	*/

	{ 0x54, 0x00 },	/* AK4671_PCM_IF_CONTROL1		(0x54)	*/

	{ 0x55, 0x00 },	/* AK4671_PCM_IF_CONTROL2		(0x55)	*/

	{ 0x56, 0x18 },	/* AK4671_DIGITAL_VOLUME_B_CONTROL	(0x56)	*/

	{ 0x57, 0x18 },	/* AK4671_DIGITAL_VOLUME_C_CONTROL	(0x57)	*/

	{ 0x58, 0x00 },	/* AK4671_SIDETONE_VOLUME_CONTROL	(0x58)	*/

	{ 0x59, 0x00 },	/* AK4671_DIGITAL_MIXING_CONTROL2	(0x59)	*/

	{ 0x5a, 0x00 },	/* AK4671_SAR_ADC_CONTROL		(0x5a)	*/

};



/*
@@ -241,18 +237,16 @@ static const struct snd_kcontrol_new ak4671_rout3_mixer_controls[] = { 
/* Input MUXs */

static const char *ak4671_lin_mux_texts[] =

		{"LIN1", "LIN2", "LIN3", "LIN4"};

static const struct soc_enum ak4671_lin_mux_enum =

	SOC_ENUM_SINGLE(AK4671_MIC_SIGNAL_SELECT, 0,

			ARRAY_SIZE(ak4671_lin_mux_texts),

static SOC_ENUM_SINGLE_DECL(ak4671_lin_mux_enum,

			    AK4671_MIC_SIGNAL_SELECT, 0,

			    ak4671_lin_mux_texts);

static const struct snd_kcontrol_new ak4671_lin_mux_control =

	SOC_DAPM_ENUM("Route", ak4671_lin_mux_enum);



static const char *ak4671_rin_mux_texts[] =

		{"RIN1", "RIN2", "RIN3", "RIN4"};

static const struct soc_enum ak4671_rin_mux_enum =

	SOC_ENUM_SINGLE(AK4671_MIC_SIGNAL_SELECT, 2,

			ARRAY_SIZE(ak4671_rin_mux_texts),

static SOC_ENUM_SINGLE_DECL(ak4671_rin_mux_enum,

			    AK4671_MIC_SIGNAL_SELECT, 2,

			    ak4671_rin_mux_texts);

static const struct snd_kcontrol_new ak4671_rin_mux_control =

	SOC_DAPM_ENUM("Route", ak4671_rin_mux_enum);
@@ -619,18 +613,14 @@ static struct snd_soc_dai_driver ak4671_dai = { 


static int ak4671_probe(struct snd_soc_codec *codec)

{

	struct ak4671_priv *ak4671 = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4671->control_type);

	ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);

	if (ret < 0) {

		dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);

		return ret;

	}



	snd_soc_add_codec_controls(codec, ak4671_snd_controls,

			     ARRAY_SIZE(ak4671_snd_controls));



	ak4671_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return ret;
@@ -646,28 +636,36 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4671 = { 
	.probe = ak4671_probe,

	.remove = ak4671_remove,

	.set_bias_level = ak4671_set_bias_level,

	.reg_cache_size = AK4671_CACHEREGNUM,

	.reg_word_size = sizeof(u8),

	.reg_cache_default = ak4671_reg,

	.controls = ak4671_snd_controls,

	.num_controls = ARRAY_SIZE(ak4671_snd_controls),

	.dapm_widgets = ak4671_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(ak4671_dapm_widgets),

	.dapm_routes = ak4671_intercon,

	.num_dapm_routes = ARRAY_SIZE(ak4671_intercon),

};



static const struct regmap_config ak4671_regmap = {

	.reg_bits = 8,

	.val_bits = 8,



	.max_register = AK4671_SAR_ADC_CONTROL,

	.reg_defaults = ak4671_reg_defaults,

	.num_reg_defaults = ARRAY_SIZE(ak4671_reg_defaults),

	.cache_type = REGCACHE_RBTREE,

};



static int ak4671_i2c_probe(struct i2c_client *client,

			    const struct i2c_device_id *id)

{

	struct ak4671_priv *ak4671;

	struct regmap *regmap;

	int ret;



	ak4671 = devm_kzalloc(&client->dev, sizeof(struct ak4671_priv),

			      GFP_KERNEL);

	if (ak4671 == NULL)

		return -ENOMEM;



	i2c_set_clientdata(client, ak4671);

	ak4671->control_type = SND_SOC_I2C;

	regmap = devm_regmap_init_i2c(client, &ak4671_regmap);

	if (IS_ERR(regmap)) {

		ret = PTR_ERR(regmap);

		dev_err(&client->dev, "Failed to create regmap: %d\n", ret);

		return ret;

	}



	ret = snd_soc_register_codec(&client->dev,

			&soc_codec_dev_ak4671, &ak4671_dai, 1);

sound/soc/codecs/ak4671.h

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ 
#define AK4671_DIGITAL_MIXING_CONTROL2		0x59

#define AK4671_SAR_ADC_CONTROL			0x5a



#define AK4671_CACHEREGNUM			(AK4671_SAR_ADC_CONTROL + 1)



/* Bitfield Definitions */



/* AK4671_AD_DA_POWER_MANAGEMENT (0x00) Fields */

sound/soc/codecs/alc5623.c

+67 −50
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/i2c.h>

#include <linux/regmap.h>

#include <linux/slab.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -38,26 +39,13 @@ MODULE_PARM_DESC(caps_charge, "ALC5623 cap charge time (msecs)"); 


/* codec private data */

struct alc5623_priv {

	enum snd_soc_control_type control_type;

	struct regmap *regmap;

	u8 id;

	unsigned int sysclk;

	u16 reg_cache[ALC5623_VENDOR_ID2+2];

	unsigned int add_ctrl;

	unsigned int jack_det_ctrl;

};



static void alc5623_fill_cache(struct snd_soc_codec *codec)

{

	int i, step = codec->driver->reg_cache_step;

	u16 *cache = codec->reg_cache;



	/* not really efficient ... */

	codec->cache_bypass = 1;

	for (i = 0 ; i < codec->driver->reg_cache_size ; i += step)

		cache[i] = snd_soc_read(codec, i);

	codec->cache_bypass = 0;

}



static inline int alc5623_reset(struct snd_soc_codec *codec)

{

	return snd_soc_write(codec, ALC5623_RESET, 0);
@@ -228,32 +216,37 @@ static const char *alc5623_aux_out_input_sel[] = { 
		"Vmid", "HPOut Mix", "Speaker Mix", "Mono Mix"};



/* auxout output mux */

static const struct soc_enum alc5623_aux_out_input_enum =

SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 6, 4, alc5623_aux_out_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5623_aux_out_input_enum,

			    ALC5623_OUTPUT_MIXER_CTRL, 6,

			    alc5623_aux_out_input_sel);

static const struct snd_kcontrol_new alc5623_auxout_mux_controls =

SOC_DAPM_ENUM("Route", alc5623_aux_out_input_enum);



/* speaker output mux */

static const struct soc_enum alc5623_spkout_input_enum =

SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 10, 4, alc5623_spkout_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5623_spkout_input_enum,

			    ALC5623_OUTPUT_MIXER_CTRL, 10,

			    alc5623_spkout_input_sel);

static const struct snd_kcontrol_new alc5623_spkout_mux_controls =

SOC_DAPM_ENUM("Route", alc5623_spkout_input_enum);



/* headphone left output mux */

static const struct soc_enum alc5623_hpl_out_input_enum =

SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 9, 2, alc5623_hpl_out_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5623_hpl_out_input_enum,

			    ALC5623_OUTPUT_MIXER_CTRL, 9,

			    alc5623_hpl_out_input_sel);

static const struct snd_kcontrol_new alc5623_hpl_out_mux_controls =

SOC_DAPM_ENUM("Route", alc5623_hpl_out_input_enum);



/* headphone right output mux */

static const struct soc_enum alc5623_hpr_out_input_enum =

SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 8, 2, alc5623_hpr_out_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5623_hpr_out_input_enum,

			    ALC5623_OUTPUT_MIXER_CTRL, 8,

			    alc5623_hpr_out_input_sel);

static const struct snd_kcontrol_new alc5623_hpr_out_mux_controls =

SOC_DAPM_ENUM("Route", alc5623_hpr_out_input_enum);



/* speaker output N select */

static const struct soc_enum alc5623_spk_n_sour_enum =

SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 14, 4, alc5623_spk_n_sour_sel);

static SOC_ENUM_SINGLE_DECL(alc5623_spk_n_sour_enum,

			    ALC5623_OUTPUT_MIXER_CTRL, 14,

			    alc5623_spk_n_sour_sel);

static const struct snd_kcontrol_new alc5623_spkoutn_mux_controls =

SOC_DAPM_ENUM("Route", alc5623_spk_n_sour_enum);
@@ -338,8 +331,9 @@ SND_SOC_DAPM_VMID("Vmid"), 
};



static const char *alc5623_amp_names[] = {"AB Amp", "D Amp"};

static const struct soc_enum alc5623_amp_enum =

	SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 13, 2, alc5623_amp_names);

static SOC_ENUM_SINGLE_DECL(alc5623_amp_enum,

			    ALC5623_OUTPUT_MIXER_CTRL, 13,

			    alc5623_amp_names);

static const struct snd_kcontrol_new alc5623_amp_mux_controls =

	SOC_DAPM_ENUM("Route", alc5623_amp_enum);
@@ -869,18 +863,28 @@ static struct snd_soc_dai_driver alc5623_dai = { 


static int alc5623_suspend(struct snd_soc_codec *codec)

{

	struct alc5623_priv *alc5623 = snd_soc_codec_get_drvdata(codec);



	alc5623_set_bias_level(codec, SND_SOC_BIAS_OFF);

	regcache_cache_only(alc5623->regmap, true);



	return 0;

}



static int alc5623_resume(struct snd_soc_codec *codec)

{

	int i, step = codec->driver->reg_cache_step;

	u16 *cache = codec->reg_cache;

	struct alc5623_priv *alc5623 = snd_soc_codec_get_drvdata(codec);

	int ret;



	/* Sync reg_cache with the hardware */

	for (i = 2 ; i < codec->driver->reg_cache_size ; i += step)

		snd_soc_write(codec, i, cache[i]);

	regcache_cache_only(alc5623->regmap, false);

	ret = regcache_sync(alc5623->regmap);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to sync register cache: %d\n",

			ret);

		regcache_cache_only(alc5623->regmap, true);

		return ret;

	}



	alc5623_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -900,14 +904,14 @@ static int alc5623_probe(struct snd_soc_codec *codec) 
	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	ret = snd_soc_codec_set_cache_io(codec, 8, 16, alc5623->control_type);

	codec->control_data = alc5623->regmap;

	ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP);

	if (ret < 0) {

		dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);

		return ret;

	}



	alc5623_reset(codec);

	alc5623_fill_cache(codec);



	/* power on device */

	alc5623_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -980,9 +984,15 @@ static struct snd_soc_codec_driver soc_codec_device_alc5623 = { 
	.suspend = alc5623_suspend,

	.resume = alc5623_resume,

	.set_bias_level = alc5623_set_bias_level,

	.reg_cache_size = ALC5623_VENDOR_ID2+2,

	.reg_word_size = sizeof(u16),

	.reg_cache_step = 2,

};



static const struct regmap_config alc5623_regmap = {

	.reg_bits = 8,

	.val_bits = 16,

	.reg_stride = 2,



	.max_register = ALC5623_VENDOR_ID2,

	.cache_type = REGCACHE_RBTREE,

};



/*
@@ -996,19 +1006,32 @@ static int alc5623_i2c_probe(struct i2c_client *client, 
{

	struct alc5623_platform_data *pdata;

	struct alc5623_priv *alc5623;

	int ret, vid1, vid2;

	unsigned int vid1, vid2;

	int ret;



	vid1 = i2c_smbus_read_word_data(client, ALC5623_VENDOR_ID1);

	if (vid1 < 0) {

		dev_err(&client->dev, "failed to read I2C\n");

		return -EIO;

	alc5623 = devm_kzalloc(&client->dev, sizeof(struct alc5623_priv),

			       GFP_KERNEL);

	if (alc5623 == NULL)

		return -ENOMEM;



	alc5623->regmap = devm_regmap_init_i2c(client, &alc5623_regmap);

	if (IS_ERR(alc5623->regmap)) {

		ret = PTR_ERR(alc5623->regmap);

		dev_err(&client->dev, "Failed to initialise I/O: %d\n", ret);

		return ret;

	}



	ret = regmap_read(alc5623->regmap, ALC5623_VENDOR_ID1, &vid1);

	if (ret < 0) {

		dev_err(&client->dev, "failed to read vendor ID1: %d\n", ret);

		return ret;

	}

	vid1 = ((vid1 & 0xff) << 8) | (vid1 >> 8);



	vid2 = i2c_smbus_read_byte_data(client, ALC5623_VENDOR_ID2);

	if (vid2 < 0) {

		dev_err(&client->dev, "failed to read I2C\n");

		return -EIO;

	ret = regmap_read(alc5623->regmap, ALC5623_VENDOR_ID2, &vid2);

	if (ret < 0) {

		dev_err(&client->dev, "failed to read vendor ID2: %d\n", ret);

		return ret;

	}



	if ((vid1 != 0x10ec) || (vid2 != id->driver_data)) {
@@ -1021,11 +1044,6 @@ static int alc5623_i2c_probe(struct i2c_client *client, 


	dev_dbg(&client->dev, "Found codec id : alc56%02x\n", vid2);



	alc5623 = devm_kzalloc(&client->dev, sizeof(struct alc5623_priv),

			       GFP_KERNEL);

	if (alc5623 == NULL)

		return -ENOMEM;



	pdata = client->dev.platform_data;

	if (pdata) {

		alc5623->add_ctrl = pdata->add_ctrl;
@@ -1048,7 +1066,6 @@ static int alc5623_i2c_probe(struct i2c_client *client, 
	}



	i2c_set_clientdata(client, alc5623);

	alc5623->control_type = SND_SOC_I2C;



	ret =  snd_soc_register_codec(&client->dev,

		&soc_codec_device_alc5623, &alc5623_dai, 1);

sound/soc/codecs/alc5632.c

+24 −16
Original line number Diff line number Diff line
@@ -293,51 +293,59 @@ static const char * const alc5632_i2s_out_sel[] = { 
		"ADC LR", "Voice Stereo Digital"};



/* auxout output mux */

static const struct soc_enum alc5632_aux_out_input_enum =

SOC_ENUM_SINGLE(ALC5632_OUTPUT_MIXER_CTRL, 6, 4, alc5632_aux_out_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5632_aux_out_input_enum,

			    ALC5632_OUTPUT_MIXER_CTRL, 6,

			    alc5632_aux_out_input_sel);

static const struct snd_kcontrol_new alc5632_auxout_mux_controls =

SOC_DAPM_ENUM("AuxOut Mux", alc5632_aux_out_input_enum);



/* speaker output mux */

static const struct soc_enum alc5632_spkout_input_enum =

SOC_ENUM_SINGLE(ALC5632_OUTPUT_MIXER_CTRL, 10, 4, alc5632_spkout_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5632_spkout_input_enum,

			    ALC5632_OUTPUT_MIXER_CTRL, 10,

			    alc5632_spkout_input_sel);

static const struct snd_kcontrol_new alc5632_spkout_mux_controls =

SOC_DAPM_ENUM("SpeakerOut Mux", alc5632_spkout_input_enum);



/* headphone left output mux */

static const struct soc_enum alc5632_hpl_out_input_enum =

SOC_ENUM_SINGLE(ALC5632_OUTPUT_MIXER_CTRL, 9, 2, alc5632_hpl_out_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5632_hpl_out_input_enum,

			    ALC5632_OUTPUT_MIXER_CTRL, 9,

			    alc5632_hpl_out_input_sel);

static const struct snd_kcontrol_new alc5632_hpl_out_mux_controls =

SOC_DAPM_ENUM("Left Headphone Mux", alc5632_hpl_out_input_enum);



/* headphone right output mux */

static const struct soc_enum alc5632_hpr_out_input_enum =

SOC_ENUM_SINGLE(ALC5632_OUTPUT_MIXER_CTRL, 8, 2, alc5632_hpr_out_input_sel);

static SOC_ENUM_SINGLE_DECL(alc5632_hpr_out_input_enum,

			    ALC5632_OUTPUT_MIXER_CTRL, 8,

			    alc5632_hpr_out_input_sel);

static const struct snd_kcontrol_new alc5632_hpr_out_mux_controls =

SOC_DAPM_ENUM("Right Headphone Mux", alc5632_hpr_out_input_enum);



/* speaker output N select */

static const struct soc_enum alc5632_spk_n_sour_enum =

SOC_ENUM_SINGLE(ALC5632_OUTPUT_MIXER_CTRL, 14, 4, alc5632_spk_n_sour_sel);

static SOC_ENUM_SINGLE_DECL(alc5632_spk_n_sour_enum,

			    ALC5632_OUTPUT_MIXER_CTRL, 14,

			    alc5632_spk_n_sour_sel);

static const struct snd_kcontrol_new alc5632_spkoutn_mux_controls =

SOC_DAPM_ENUM("SpeakerOut N Mux", alc5632_spk_n_sour_enum);



/* speaker amplifier */

static const char *alc5632_amp_names[] = {"AB Amp", "D Amp"};

static const struct soc_enum alc5632_amp_enum =

	SOC_ENUM_SINGLE(ALC5632_OUTPUT_MIXER_CTRL, 13, 2, alc5632_amp_names);

static SOC_ENUM_SINGLE_DECL(alc5632_amp_enum,

			    ALC5632_OUTPUT_MIXER_CTRL, 13,

			    alc5632_amp_names);

static const struct snd_kcontrol_new alc5632_amp_mux_controls =

	SOC_DAPM_ENUM("AB-D Amp Mux", alc5632_amp_enum);



/* ADC output select */

static const struct soc_enum alc5632_adcr_func_enum =

	SOC_ENUM_SINGLE(ALC5632_DAC_FUNC_SELECT, 5, 2, alc5632_adcr_func_sel);

static SOC_ENUM_SINGLE_DECL(alc5632_adcr_func_enum,

			    ALC5632_DAC_FUNC_SELECT, 5,

			    alc5632_adcr_func_sel);

static const struct snd_kcontrol_new alc5632_adcr_func_controls =

	SOC_DAPM_ENUM("ADCR Mux", alc5632_adcr_func_enum);



/* I2S out select */

static const struct soc_enum alc5632_i2s_out_enum =

	SOC_ENUM_SINGLE(ALC5632_I2S_OUT_CTL, 5, 2, alc5632_i2s_out_sel);

static SOC_ENUM_SINGLE_DECL(alc5632_i2s_out_enum,

			    ALC5632_I2S_OUT_CTL, 5,

			    alc5632_i2s_out_sel);

static const struct snd_kcontrol_new alc5632_i2s_out_controls =

	SOC_DAPM_ENUM("I2SOut Mux", alc5632_i2s_out_enum);