Unverified Commit a0bc855f authored by Jiri Prchal's avatar Jiri Prchal Committed by Mark Brown
Browse files

ASoC: codecs: tlv320aic3x: add AIC3106 



In DT binding is mentioned that this driver is compatible with 3106.
So added compatibility string and model number.

Signed-off-by: default avatarJiri Prchal <jiri.prchal@aksignal.cz>
Link: https://lore.kernel.org/r/20210408135908.125667-1-jiri.prchal@aksignal.cz


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f9858380

sound/soc/codecs/tlv320aic3x-i2c.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ static const struct i2c_device_id aic3x_i2c_id[] = { 
	{ "tlv320aic33", AIC3X_MODEL_33 },

	{ "tlv320aic33", AIC3X_MODEL_33 },

	{ "tlv320aic3007", AIC3X_MODEL_3007 },

	{ "tlv320aic3007", AIC3X_MODEL_3007 },

	{ "tlv320aic3104", AIC3X_MODEL_3104 },

	{ "tlv320aic3104", AIC3X_MODEL_3104 },

	{ "tlv320aic3106", AIC3X_MODEL_3106 },

	{ }

	{ }

};

};

MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);

MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
@@ -49,6 +50,7 @@ static const struct of_device_id aic3x_of_id[] = { 
	{ .compatible = "ti,tlv320aic33" },

	{ .compatible = "ti,tlv320aic33" },

	{ .compatible = "ti,tlv320aic3007" },

	{ .compatible = "ti,tlv320aic3007" },

	{ .compatible = "ti,tlv320aic3104" },

	{ .compatible = "ti,tlv320aic3104" },

	{ .compatible = "ti,tlv320aic3106" },

	{},

	{},

};

};

MODULE_DEVICE_TABLE(of, aic3x_of_id);

MODULE_DEVICE_TABLE(of, aic3x_of_id);

sound/soc/codecs/tlv320aic3x-spi.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ static const struct spi_device_id aic3x_spi_id[] = { 
	{ "tlv320aic33", AIC3X_MODEL_33 },

	{ "tlv320aic33", AIC3X_MODEL_33 },

	{ "tlv320aic3007", AIC3X_MODEL_3007 },

	{ "tlv320aic3007", AIC3X_MODEL_3007 },

	{ "tlv320aic3104", AIC3X_MODEL_3104 },

	{ "tlv320aic3104", AIC3X_MODEL_3104 },

	{ "tlv320aic3106", AIC3X_MODEL_3106 },

	{ }

	{ }

};

};

MODULE_DEVICE_TABLE(spi, aic3x_spi_id);

MODULE_DEVICE_TABLE(spi, aic3x_spi_id);
@@ -54,6 +55,7 @@ static const struct of_device_id aic3x_of_id[] = { 
	{ .compatible = "ti,tlv320aic33" },

	{ .compatible = "ti,tlv320aic33" },

	{ .compatible = "ti,tlv320aic3007" },

	{ .compatible = "ti,tlv320aic3007" },

	{ .compatible = "ti,tlv320aic3104" },

	{ .compatible = "ti,tlv320aic3104" },

	{ .compatible = "ti,tlv320aic3106" },

	{},

	{},

};

};

MODULE_DEVICE_TABLE(of, aic3x_of_id);

MODULE_DEVICE_TABLE(of, aic3x_of_id);

sound/soc/codecs/tlv320aic3x.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1003,6 +1003,7 @@ static int aic3x_add_widgets(struct snd_soc_component *component) 
	switch (aic3x->model) {

	switch (aic3x->model) {

	case AIC3X_MODEL_3X:

	case AIC3X_MODEL_3X:

	case AIC3X_MODEL_33:

	case AIC3X_MODEL_33:

	case AIC3X_MODEL_3106:

		snd_soc_dapm_new_controls(dapm, aic3x_extra_dapm_widgets,

		snd_soc_dapm_new_controls(dapm, aic3x_extra_dapm_widgets,

					  ARRAY_SIZE(aic3x_extra_dapm_widgets));

					  ARRAY_SIZE(aic3x_extra_dapm_widgets));

		snd_soc_dapm_add_routes(dapm, intercon_extra,

		snd_soc_dapm_add_routes(dapm, intercon_extra,
@@ -1580,6 +1581,7 @@ static int aic3x_init(struct snd_soc_component *component) 
	switch (aic3x->model) {

	switch (aic3x->model) {

	case AIC3X_MODEL_3X:

	case AIC3X_MODEL_3X:

	case AIC3X_MODEL_33:

	case AIC3X_MODEL_33:

	case AIC3X_MODEL_3106:

		aic3x_mono_init(component);

		aic3x_mono_init(component);

		break;

		break;

	case AIC3X_MODEL_3007:

	case AIC3X_MODEL_3007:
@@ -1646,6 +1648,7 @@ static int aic3x_component_probe(struct snd_soc_component *component) 
	switch (aic3x->model) {

	switch (aic3x->model) {

	case AIC3X_MODEL_3X:

	case AIC3X_MODEL_3X:

	case AIC3X_MODEL_33:

	case AIC3X_MODEL_33:

	case AIC3X_MODEL_3106:

		snd_soc_add_component_controls(component, aic3x_extra_snd_controls,

		snd_soc_add_component_controls(component, aic3x_extra_snd_controls,

				ARRAY_SIZE(aic3x_extra_snd_controls));

				ARRAY_SIZE(aic3x_extra_snd_controls));

		snd_soc_add_component_controls(component, aic3x_mono_controls,

		snd_soc_add_component_controls(component, aic3x_mono_controls,

sound/soc/codecs/tlv320aic3x.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ int aic3x_remove(struct device *dev); 
#define AIC3X_MODEL_33 1

#define AIC3X_MODEL_33 1

#define AIC3X_MODEL_3007 2

#define AIC3X_MODEL_3007 2

#define AIC3X_MODEL_3104 3

#define AIC3X_MODEL_3104 3

#define AIC3X_MODEL_3106 4





/* AIC3X register space */

/* AIC3X register space */

#define AIC3X_CACHEREGNUM		110

#define AIC3X_CACHEREGNUM		110