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

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

Merge remote-tracking branches 'asoc/topic/tlv320aic23',... 

Merge remote-tracking branches 'asoc/topic/tlv320aic23', 'asoc/topic/tlv320aic26', 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33', 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/uda1380', 'asoc/topic/wl1273' and 'asoc/topic/wm2200' into asoc-next
parents 7cc64172 051389e2 6900ab55 b46f2c5c ac5630b5 d77c290a 9f04fba7 a1d0d786 1dbb348d 4ec20a97 6109ab2b

Documentation/devicetree/bindings/sound/tlv320aic32x4.txt

0 → 100644
+30 −0
Original line number Original line Diff line number Diff line 
Texas Instruments - tlv320aic32x4 Codec module



The tlv320aic32x4 serial control bus communicates through I2C protocols



Required properties:

 - compatible: Should be "ti,tlv320aic32x4"

 - reg: I2C slave address

 - supply-*: Required supply regulators are:

    "iov" - digital IO power supply

    "ldoin" - LDO power supply

    "dv" - Digital core power supply

    "av" - Analog core power supply

    If you supply ldoin, dv and av are optional. Otherwise they are required

   See regulator/regulator.txt for more information about the detailed binding

   format.



Optional properties:

 - reset-gpios: Reset-GPIO phandle with args as described in gpio/gpio.txt

 - clocks/clock-names: Clock named 'mclk' for the master clock of the codec.

   See clock/clock-bindings.txt for information about the detailed format.





Example:



codec: tlv320aic32x4@18 {

	compatible = "ti,tlv320aic32x4";

	reg = <0x18>;

	clocks = <&clks 201>;

	clock-names = "mclk";

};

Documentation/devicetree/bindings/sound/tlv320aic3x.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ Required properties: 




- compatible - "string" - One of:

- compatible - "string" - One of:

    "ti,tlv320aic3x" - Generic TLV320AIC3x device

    "ti,tlv320aic3x" - Generic TLV320AIC3x device

    "ti,tlv320aic32x4" - TLV320AIC32x4

    "ti,tlv320aic33" - TLV320AIC33

    "ti,tlv320aic33" - TLV320AIC33

    "ti,tlv320aic3007" - TLV320AIC3007

    "ti,tlv320aic3007" - TLV320AIC3007

    "ti,tlv320aic3106" - TLV320AIC3106

    "ti,tlv320aic3106" - TLV320AIC3106

sound/soc/codecs/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -79,8 +79,8 @@ snd-soc-tlv320aic23-objs := tlv320aic23.o 
snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o

snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o

snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o

snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o

snd-soc-tlv320aic26-objs := tlv320aic26.o

snd-soc-tlv320aic26-objs := tlv320aic26.o

snd-soc-tlv320aic3x-objs := tlv320aic3x.o

snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o

snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o

snd-soc-tlv320aic3x-objs := tlv320aic3x.o

snd-soc-tlv320dac33-objs := tlv320dac33.o

snd-soc-tlv320dac33-objs := tlv320dac33.o

snd-soc-twl4030-objs := twl4030.o

snd-soc-twl4030-objs := twl4030.o

snd-soc-twl6040-objs := twl6040.o

snd-soc-twl6040-objs := twl6040.o
@@ -223,8 +223,8 @@ obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o 
obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)	+= snd-soc-tlv320aic23-i2c.o

obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)	+= snd-soc-tlv320aic23-i2c.o

obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o

obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o

obj-$(CONFIG_SND_SOC_TLV320AIC26)	+= snd-soc-tlv320aic26.o

obj-$(CONFIG_SND_SOC_TLV320AIC26)	+= snd-soc-tlv320aic26.o

obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o

obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o

obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o

obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o

obj-$(CONFIG_SND_SOC_TLV320DAC33)	+= snd-soc-tlv320dac33.o

obj-$(CONFIG_SND_SOC_TLV320DAC33)	+= snd-soc-tlv320dac33.o

obj-$(CONFIG_SND_SOC_TWL4030)	+= snd-soc-twl4030.o

obj-$(CONFIG_SND_SOC_TWL4030)	+= snd-soc-twl4030.o

obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o

obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o

sound/soc/codecs/cs42l51.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -117,8 +117,7 @@ static const char *chan_mix[] = { 
	"R L",

	"R L",

};

};





static const struct soc_enum cs42l51_chan_mix =

static SOC_ENUM_SINGLE_EXT_DECL(cs42l51_chan_mix, chan_mix);

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(chan_mix), chan_mix);





static const struct snd_kcontrol_new cs42l51_snd_controls[] = {

static const struct snd_kcontrol_new cs42l51_snd_controls[] = {

	SOC_DOUBLE_R_SX_TLV("PCM Playback Volume",

	SOC_DOUBLE_R_SX_TLV("PCM Playback Volume",
@@ -174,22 +173,22 @@ static int cs42l51_pdn_event(struct snd_soc_dapm_widget *w, 




static const char *cs42l51_dac_names[] = {"Direct PCM",

static const char *cs42l51_dac_names[] = {"Direct PCM",

	"DSP PCM", "ADC"};

	"DSP PCM", "ADC"};

static const struct soc_enum cs42l51_dac_mux_enum =

static SOC_ENUM_SINGLE_DECL(cs42l51_dac_mux_enum,

	SOC_ENUM_SINGLE(CS42L51_DAC_CTL, 6, 3, cs42l51_dac_names);

			    CS42L51_DAC_CTL, 6, cs42l51_dac_names);

static const struct snd_kcontrol_new cs42l51_dac_mux_controls =

static const struct snd_kcontrol_new cs42l51_dac_mux_controls =

	SOC_DAPM_ENUM("Route", cs42l51_dac_mux_enum);

	SOC_DAPM_ENUM("Route", cs42l51_dac_mux_enum);





static const char *cs42l51_adcl_names[] = {"AIN1 Left", "AIN2 Left",

static const char *cs42l51_adcl_names[] = {"AIN1 Left", "AIN2 Left",

	"MIC Left", "MIC+preamp Left"};

	"MIC Left", "MIC+preamp Left"};

static const struct soc_enum cs42l51_adcl_mux_enum =

static SOC_ENUM_SINGLE_DECL(cs42l51_adcl_mux_enum,

	SOC_ENUM_SINGLE(CS42L51_ADC_INPUT, 4, 4, cs42l51_adcl_names);

			    CS42L51_ADC_INPUT, 4, cs42l51_adcl_names);

static const struct snd_kcontrol_new cs42l51_adcl_mux_controls =

static const struct snd_kcontrol_new cs42l51_adcl_mux_controls =

	SOC_DAPM_ENUM("Route", cs42l51_adcl_mux_enum);

	SOC_DAPM_ENUM("Route", cs42l51_adcl_mux_enum);





static const char *cs42l51_adcr_names[] = {"AIN1 Right", "AIN2 Right",

static const char *cs42l51_adcr_names[] = {"AIN1 Right", "AIN2 Right",

	"MIC Right", "MIC+preamp Right"};

	"MIC Right", "MIC+preamp Right"};

static const struct soc_enum cs42l51_adcr_mux_enum =

static SOC_ENUM_SINGLE_DECL(cs42l51_adcr_mux_enum,

	SOC_ENUM_SINGLE(CS42L51_ADC_INPUT, 6, 4, cs42l51_adcr_names);

			    CS42L51_ADC_INPUT, 6, cs42l51_adcr_names);

static const struct snd_kcontrol_new cs42l51_adcr_mux_controls =

static const struct snd_kcontrol_new cs42l51_adcr_mux_controls =

	SOC_DAPM_ENUM("Route", cs42l51_adcr_mux_enum);

	SOC_DAPM_ENUM("Route", cs42l51_adcr_mux_enum);

sound/soc/codecs/tlv320aic23-spi.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ static int aic23_spi_probe(struct spi_device *spi) 




	dev_dbg(&spi->dev, "probing tlv320aic23 spi device\n");

	dev_dbg(&spi->dev, "probing tlv320aic23 spi device\n");





	spi->bits_per_word = 16;

	spi->mode = SPI_MODE_0;

	spi->mode = SPI_MODE_0;

	ret = spi_setup(spi);

	ret = spi_setup(spi);

	if (ret < 0)

	if (ret < 0)