Commit b5a8342c authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tas2552',...

Merge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tas2552', 'asoc/topic/tas3a227e' and 'asoc/topic/tas571x' into asoc-next
Texas Instruments TAS5711/TAS5717/TAS5719 stereo power amplifiers
The codec is controlled through an I2C interface. It also has two other
signals that can be wired up to GPIOs: reset (strongly recommended), and
powerdown (optional).
Required properties:
- compatible: "ti,tas5711", "ti,tas5717", or "ti,tas5719"
- reg: The I2C address of the device
- #sound-dai-cells: must be equal to 0
Optional properties:
- reset-gpios: GPIO specifier for the TAS571x's active low reset line
- pdn-gpios: GPIO specifier for the TAS571x's active low powerdown line
- clocks: clock phandle for the MCLK input
- clock-names: should be "mclk"
- AVDD-supply: regulator phandle for the AVDD supply (all chips)
- DVDD-supply: regulator phandle for the DVDD supply (all chips)
- HPVDD-supply: regulator phandle for the HPVDD supply (5717/5719)
- PVDD_AB-supply: regulator phandle for the PVDD_AB supply (5717/5719)
- PVDD_CD-supply: regulator phandle for the PVDD_CD supply (5717/5719)
- PVDD_A-supply: regulator phandle for the PVDD_A supply (5711)
- PVDD_B-supply: regulator phandle for the PVDD_B supply (5711)
- PVDD_C-supply: regulator phandle for the PVDD_C supply (5711)
- PVDD_D-supply: regulator phandle for the PVDD_D supply (5711)
Example:
tas5717: audio-codec@2a {
compatible = "ti,tas5717";
reg = <0x2a>;
#sound-dai-cells = <0>;
reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
pdn-gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
clocks = <&clk_core CLK_I2S>;
clock-names = "mclk";
};
...@@ -9922,6 +9922,12 @@ L: netdev@vger.kernel.org ...@@ -9922,6 +9922,12 @@ L: netdev@vger.kernel.org
S: Maintained S: Maintained
F: drivers/net/ethernet/ti/netcp* F: drivers/net/ethernet/ti/netcp*
TI TAS571X FAMILY ASoC CODEC DRIVER
M: Kevin Cernekee <cernekee@chromium.org>
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
S: Odd Fixes
F: sound/soc/codecs/tas571x*
TI TWL4030 SERIES SOC CODEC DRIVER TI TWL4030 SERIES SOC CODEC DRIVER
M: Peter Ujfalusi <peter.ujfalusi@ti.com> M: Peter Ujfalusi <peter.ujfalusi@ti.com>
L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: alsa-devel@alsa-project.org (moderated for non-subscribers)
......
#ifndef __DT_TAS2552_H
#define __DT_TAS2552_H
#define TAS2552_PLL_CLKIN (0)
#define TAS2552_PDM_CLK (1)
#define TAS2552_CLK_TARGET_MASK (1)
#define TAS2552_PLL_CLKIN_MCLK ((0 << 1) | TAS2552_PLL_CLKIN)
#define TAS2552_PLL_CLKIN_BCLK ((1 << 1) | TAS2552_PLL_CLKIN)
#define TAS2552_PLL_CLKIN_IVCLKIN ((2 << 1) | TAS2552_PLL_CLKIN)
#define TAS2552_PLL_CLKIN_1_8_FIXED ((3 << 1) | TAS2552_PLL_CLKIN)
#define TAS2552_PDM_CLK_PLL ((0 << 1) | TAS2552_PDM_CLK)
#define TAS2552_PDM_CLK_IVCLKIN ((1 << 1) | TAS2552_PDM_CLK)
#define TAS2552_PDM_CLK_BCLK ((2 << 1) | TAS2552_PDM_CLK)
#define TAS2552_PDM_CLK_MCLK ((3 << 1) | TAS2552_PDM_CLK)
#endif /* __DT_TAS2552_H */
...@@ -104,6 +104,7 @@ config SND_SOC_ALL_CODECS ...@@ -104,6 +104,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_STAC9766 if SND_SOC_AC97_BUS select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
select SND_SOC_TAS2552 if I2C select SND_SOC_TAS2552 if I2C
select SND_SOC_TAS5086 if I2C select SND_SOC_TAS5086 if I2C
select SND_SOC_TAS571X if I2C
select SND_SOC_TFA9879 if I2C select SND_SOC_TFA9879 if I2C
select SND_SOC_TLV320AIC23_I2C if I2C select SND_SOC_TLV320AIC23_I2C if I2C
select SND_SOC_TLV320AIC23_SPI if SPI_MASTER select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
...@@ -612,6 +613,10 @@ config SND_SOC_TAS5086 ...@@ -612,6 +613,10 @@ config SND_SOC_TAS5086
tristate "Texas Instruments TAS5086 speaker amplifier" tristate "Texas Instruments TAS5086 speaker amplifier"
depends on I2C depends on I2C
config SND_SOC_TAS571X
tristate "Texas Instruments TAS5711/TAS5717/TAS5719 power amplifiers"
depends on I2C
config SND_SOC_TFA9879 config SND_SOC_TFA9879
tristate "NXP Semiconductors TFA9879 amplifier" tristate "NXP Semiconductors TFA9879 amplifier"
depends on I2C depends on I2C
......
...@@ -106,6 +106,7 @@ snd-soc-sta350-objs := sta350.o ...@@ -106,6 +106,7 @@ snd-soc-sta350-objs := sta350.o
snd-soc-sta529-objs := sta529.o snd-soc-sta529-objs := sta529.o
snd-soc-stac9766-objs := stac9766.o snd-soc-stac9766-objs := stac9766.o
snd-soc-tas5086-objs := tas5086.o snd-soc-tas5086-objs := tas5086.o
snd-soc-tas571x-objs := tas571x.o
snd-soc-tfa9879-objs := tfa9879.o snd-soc-tfa9879-objs := tfa9879.o
snd-soc-tlv320aic23-objs := tlv320aic23.o snd-soc-tlv320aic23-objs := tlv320aic23.o
snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
...@@ -288,6 +289,7 @@ obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o ...@@ -288,6 +289,7 @@ obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o
obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o
obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o
obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o
obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o
obj-$(CONFIG_SND_SOC_TFA9879) += snd-soc-tfa9879.o obj-$(CONFIG_SND_SOC_TFA9879) += snd-soc-tfa9879.o
obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o 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
......
...@@ -1217,8 +1217,8 @@ static int sta350_i2c_probe(struct i2c_client *i2c, ...@@ -1217,8 +1217,8 @@ static int sta350_i2c_probe(struct i2c_client *i2c,
if (IS_ERR(sta350->gpiod_nreset)) if (IS_ERR(sta350->gpiod_nreset))
return PTR_ERR(sta350->gpiod_nreset); return PTR_ERR(sta350->gpiod_nreset);
sta350->gpiod_power_down = devm_gpiod_get(dev, "power-down", sta350->gpiod_power_down = devm_gpiod_get_optional(dev, "power-down",
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(sta350->gpiod_power_down)) if (IS_ERR(sta350->gpiod_power_down))
return PTR_ERR(sta350->gpiod_power_down); return PTR_ERR(sta350->gpiod_power_down);
......
This diff is collapsed.
...@@ -45,10 +45,14 @@ ...@@ -45,10 +45,14 @@
#define TAS2552_MAX_REG 0x20 #define TAS2552_MAX_REG 0x20
/* CFG1 Register Masks */ /* CFG1 Register Masks */
#define TAS2552_MUTE_MASK (1 << 2) #define TAS2552_DEV_RESET (1 << 0)
#define TAS2552_SWS_MASK (1 << 1) #define TAS2552_SWS (1 << 1)
#define TAS2552_WCLK_MASK 0x07 #define TAS2552_MUTE (1 << 2)
#define TAS2552_CLASSD_EN_MASK (1 << 7) #define TAS2552_PLL_SRC_MCLK (0x0 << 4)
#define TAS2552_PLL_SRC_BCLK (0x1 << 4)
#define TAS2552_PLL_SRC_IVCLKIN (0x2 << 4)
#define TAS2552_PLL_SRC_1_8_FIXED (0x3 << 4)
#define TAS2552_PLL_SRC_MASK TAS2552_PLL_SRC_1_8_FIXED
/* CFG2 Register Masks */ /* CFG2 Register Masks */
#define TAS2552_CLASSD_EN (1 << 7) #define TAS2552_CLASSD_EN (1 << 7)
...@@ -59,38 +63,44 @@ ...@@ -59,38 +63,44 @@
#define TAS2552_IVSENSE_EN (1 << 1) #define TAS2552_IVSENSE_EN (1 << 1)
/* CFG3 Register Masks */ /* CFG3 Register Masks */
#define TAS2552_WORD_CLK_MASK (1 << 7) #define TAS2552_WCLK_FREQ_8KHZ (0x0 << 0)
#define TAS2552_BIT_CLK_MASK (1 << 6) #define TAS2552_WCLK_FREQ_11_12KHZ (0x1 << 0)
#define TAS2552_DATA_FORMAT_MASK (0x11 << 2) #define TAS2552_WCLK_FREQ_16KHZ (0x2 << 0)
#define TAS2552_WCLK_FREQ_22_24KHZ (0x3 << 0)
#define TAS2552_DAIFMT_I2S_MASK 0xf3 #define TAS2552_WCLK_FREQ_32KHZ (0x4 << 0)
#define TAS2552_DAIFMT_DSP (1 << 3) #define TAS2552_WCLK_FREQ_44_48KHZ (0x5 << 0)
#define TAS2552_DAIFMT_RIGHT_J (1 << 4) #define TAS2552_WCLK_FREQ_88_96KHZ (0x6 << 0)
#define TAS2552_DAIFMT_LEFT_J (0x11 << 3) #define TAS2552_WCLK_FREQ_176_192KHZ (0x7 << 0)
#define TAS2552_WCLK_FREQ_MASK TAS2552_WCLK_FREQ_176_192KHZ
#define TAS2552_PLL_SRC_MCLK 0x00 #define TAS2552_DIN_SRC_SEL_MUTED (0x0 << 3)
#define TAS2552_PLL_SRC_BCLK (1 << 3) #define TAS2552_DIN_SRC_SEL_LEFT (0x1 << 3)
#define TAS2552_PLL_SRC_IVCLKIN (1 << 4) #define TAS2552_DIN_SRC_SEL_RIGHT (0x2 << 3)
#define TAS2552_PLL_SRC_1_8_FIXED (0x11 << 3) #define TAS2552_DIN_SRC_SEL_AVG_L_R (0x3 << 3)
#define TAS2552_DIN_SRC_SEL_MUTED 0x00
#define TAS2552_DIN_SRC_SEL_LEFT (1 << 4)
#define TAS2552_DIN_SRC_SEL_RIGHT (1 << 5)
#define TAS2552_DIN_SRC_SEL_AVG_L_R (0x11 << 4)
#define TAS2552_PDM_IN_SEL (1 << 5) #define TAS2552_PDM_IN_SEL (1 << 5)
#define TAS2552_I2S_OUT_SEL (1 << 6) #define TAS2552_I2S_OUT_SEL (1 << 6)
#define TAS2552_ANALOG_IN_SEL (1 << 7) #define TAS2552_ANALOG_IN_SEL (1 << 7)
/* CFG3 WCLK Dividers */ /* DOUT Register Masks */
#define TAS2552_8KHZ 0x00 #define TAS2552_SDOUT_TRISTATE (1 << 2)
#define TAS2552_11_12KHZ (1 << 1)
#define TAS2552_16KHZ (1 << 2) /* Serial Interface Control Register Masks */
#define TAS2552_22_24KHZ (1 << 3) #define TAS2552_WORDLENGTH_16BIT (0x0 << 0)
#define TAS2552_32KHZ (1 << 4) #define TAS2552_WORDLENGTH_20BIT (0x1 << 0)
#define TAS2552_44_48KHZ (1 << 5) #define TAS2552_WORDLENGTH_24BIT (0x2 << 0)
#define TAS2552_88_96KHZ (1 << 6) #define TAS2552_WORDLENGTH_32BIT (0x3 << 0)
#define TAS2552_176_192KHZ (1 << 7) #define TAS2552_WORDLENGTH_MASK TAS2552_WORDLENGTH_32BIT
#define TAS2552_DATAFORMAT_I2S (0x0 << 2)
#define TAS2552_DATAFORMAT_DSP (0x1 << 2)
#define TAS2552_DATAFORMAT_RIGHT_J (0x2 << 2)
#define TAS2552_DATAFORMAT_LEFT_J (0x3 << 2)
#define TAS2552_DATAFORMAT_MASK TAS2552_DATAFORMAT_LEFT_J
#define TAS2552_CLKSPERFRAME_32 (0x0 << 4)
#define TAS2552_CLKSPERFRAME_64 (0x1 << 4)
#define TAS2552_CLKSPERFRAME_128 (0x2 << 4)
#define TAS2552_CLKSPERFRAME_256 (0x3 << 4)
#define TAS2552_CLKSPERFRAME_MASK TAS2552_CLKSPERFRAME_256
#define TAS2552_BCLKDIR (1 << 6)
#define TAS2552_WCLKDIR (1 << 7)
/* OUTPUT_DATA register */ /* OUTPUT_DATA register */
#define TAS2552_PDM_DATA_I 0x00 #define TAS2552_PDM_DATA_I 0x00
...@@ -99,12 +109,12 @@ ...@@ -99,12 +109,12 @@
#define TAS2552_PDM_DATA_V_I (0x11 << 6) #define TAS2552_PDM_DATA_V_I (0x11 << 6)
/* PDM CFG Register */ /* PDM CFG Register */
#define TAS2552_PDM_DATA_ES_RISE 0x4 #define TAS2552_PDM_CLK_SEL_PLL (0x0 << 0)
#define TAS2552_PDM_CLK_SEL_IVCLKIN (0x1 << 0)
#define TAS2552_PDM_PLL_CLK_SEL 0x00 #define TAS2552_PDM_CLK_SEL_BCLK (0x2 << 0)
#define TAS2552_PDM_IV_CLK_SEL (1 << 1) #define TAS2552_PDM_CLK_SEL_MCLK (0x3 << 0)
#define TAS2552_PDM_BCLK_SEL (1 << 2) #define TAS2552_PDM_CLK_SEL_MASK TAS2552_PDM_CLK_SEL_MCLK
#define TAS2552_PDM_MCLK_SEL (1 << 3) #define TAS2552_PDM_DATA_ES (1 << 2)
/* Boost pass-through register */ /* Boost pass-through register */
#define TAS2552_APT_DELAY_50 0x00 #define TAS2552_APT_DELAY_50 0x00
......
This diff is collapsed.
/*
* TAS571x amplifier audio driver
*
* Copyright (C) 2015 Google, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#ifndef _TAS571X_H
#define _TAS571X_H
/* device registers */
#define TAS571X_SDI_REG 0x04
#define TAS571X_SDI_FMT_MASK 0x0f
#define TAS571X_SYS_CTRL_2_REG 0x05
#define TAS571X_SYS_CTRL_2_SDN_MASK 0x40
#define TAS571X_SOFT_MUTE_REG 0x06
#define TAS571X_SOFT_MUTE_CH1_SHIFT 0
#define TAS571X_SOFT_MUTE_CH2_SHIFT 1
#define TAS571X_SOFT_MUTE_CH3_SHIFT 2
#define TAS571X_MVOL_REG 0x07
#define TAS571X_CH1_VOL_REG 0x08
#define TAS571X_CH2_VOL_REG 0x09
#define TAS571X_OSC_TRIM_REG 0x1b
#endif /* _TAS571X_H */
...@@ -254,12 +254,13 @@ static const struct regmap_config ts3a227e_regmap_config = { ...@@ -254,12 +254,13 @@ static const struct regmap_config ts3a227e_regmap_config = {
.num_reg_defaults = ARRAY_SIZE(ts3a227e_reg_defaults), .num_reg_defaults = ARRAY_SIZE(ts3a227e_reg_defaults),
}; };
static int ts3a227e_parse_dt(struct ts3a227e *ts3a227e, struct device_node *np) static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e,
struct device *dev)
{ {
u32 micbias; u32 micbias;
int err; int err;
err = of_property_read_u32(np, "ti,micbias", &micbias); err = device_property_read_u32(dev, "ti,micbias", &micbias);
if (!err) { if (!err) {
regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3, regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3,
MICBIAS_SETTING_MASK, MICBIAS_SETTING_MASK,
...@@ -287,12 +288,10 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c, ...@@ -287,12 +288,10 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
if (IS_ERR(ts3a227e->regmap)) if (IS_ERR(ts3a227e->regmap))
return PTR_ERR(ts3a227e->regmap); return PTR_ERR(ts3a227e->regmap);
if (dev->of_node) { ret = ts3a227e_parse_device_property(ts3a227e, dev);
ret = ts3a227e_parse_dt(ts3a227e, dev->of_node); if (ret) {
if (ret) { dev_err(dev, "Failed to parse device property: %d\n", ret);
dev_err(dev, "Failed to parse device tree: %d\n", ret); return ret;
return ret;
}
} }
ret = devm_request_threaded_irq(dev, i2c->irq, NULL, ts3a227e_interrupt, ret = devm_request_threaded_irq(dev, i2c->irq, NULL, ts3a227e_interrupt,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment