ASoC: tlv320aic32x4: Add support for TAS2505
v2 cover ASoC: tlv320aic32x4: Add support for TAS2505
Hi,
this is v2 from my patchset that add support for the TAS2505 to the tlv320aic32x4 driver.
kind regards,
Claudius
Changes from v1:
- clarified commit message of first patch, which add the type value to the struct
- removed unnecessary code to put and get speaker volume
- removed 'Gain' from 'HP Driver Playback Volume' control
- fixed rebase issues
Claudius Heine (3):
ASoC: tlv320aic32x4: add type to device private data struct
ASoC: tlv320aic32x4: add support for TAS2505
ASoC: tlv320aic32x4: dt-bindings: add TAS2505 to compatible
.../bindings/sound/tlv320aic32x4.txt | 1 + sound/soc/codecs/tlv320aic32x4-i2c.c | 22 ++- sound/soc/codecs/tlv320aic32x4-spi.c | 23 ++- sound/soc/codecs/tlv320aic32x4.c | 139 +++++++++++++++++- sound/soc/codecs/tlv320aic32x4.h | 10 ++ 5 files changed, 186 insertions(+), 9 deletions(-)
base-commit: 70585216fe7730d9fb5453d3e2804e149d0fe201
Signature · 1 line
2.32.0
PATCH v2 1/3 ASoC: tlv320aic32x4: add type to device private data struct
While this driver can already handle different device variants, the variant information cannot be used in the driver code and therefor cannot have different code paths depending on the device variant.
This change adds a type value into the aic32x4_priv structure, that contains a device variant identifier, which was set when the driver was bound to the device.
--- sound/soc/codecs/tlv320aic32x4-i2c.c | 20 ++++++++++++++++---- sound/soc/codecs/tlv320aic32x4-spi.c | 23 +++++++++++++++++++---- sound/soc/codecs/tlv320aic32x4.c | 3 +++ sound/soc/codecs/tlv320aic32x4.h | 5 +++++ 4 files changed, 43 insertions(+), 8 deletions(-)
sound/soc/codecs/tlv320aic32x4-i2c.c +16 -4
@@ -16,6 +16,8 @@#include "tlv320aic32x4.h" +static const struct of_device_id aic32x4_of_id[]; +static int aic32x4_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {
@@ -27,6 +29,16 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c, config.val_bits =8 ; regmap =devm_regmap_init_i2c (i2c, &config); + +if (i2c->dev.of_node) { +const struct of_device_id *oid; + + oid =of_match_node (aic32x4_of_id, i2c->dev.of_node); +dev_set_drvdata (&i2c->dev, (void *)oid->data); + }else if (id) { +dev_set_drvdata (&i2c->dev, (void *)id->driver_data); + } +return aic32x4_probe (&i2c->dev, regmap); }
@@ -36,15 +48,15 @@ static int aic32x4_i2c_remove(struct i2c_client *i2c) }static const struct i2c_device_id aic32x4_i2c_id[] = { - {"tlv320aic32x4" ,0 }, - {"tlv320aic32x6" ,1 }, + {"tlv320aic32x4" , (kernel_ulong_t )AIC32X4_TYPE_AIC32X4 }, + {"tlv320aic32x6" , (kernel_ulong_t )AIC32X4_TYPE_AIC32X6 }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, aic32x4_i2c_id);static const struct of_device_id aic32x4_of_id[] = { - { .compatible ="ti,tlv320aic32x4" , }, - { .compatible ="ti,tlv320aic32x6" , }, + { .compatible ="ti,tlv320aic32x4" , .data = (void *)AIC32X4_TYPE_AIC32X4 }, + { .compatible ="ti,tlv320aic32x6" , .data = (void *)AIC32X4_TYPE_AIC32X6 }, {/* senitel */ } };MODULE_DEVICE_TABLE (of, aic32x4_of_id);
sound/soc/codecs/tlv320aic32x4-spi.c +19 -4
@@ -16,6 +16,8 @@#include "tlv320aic32x4.h" +static const struct of_device_id aic32x4_of_id[]; +static int aic32x4_spi_probe (struct spi_device *spi) {struct regmap *regmap;
@@ -28,6 +30,19 @@ static int aic32x4_spi_probe(struct spi_device *spi) config.read_flag_mask =0x01 ; regmap =devm_regmap_init_spi (spi, &config); + +if (spi->dev.of_node) { +const struct of_device_id *oid; + + oid =of_match_node (aic32x4_of_id, spi->dev.of_node); +dev_set_drvdata (&spi->dev, (void *)oid->data); + }else { +const struct spi_device_id *id_entry; + + id_entry =spi_get_device_id (spi); +dev_set_drvdata (&spi->dev, (void *)id_entry->driver_data); + } +return aic32x4_probe (&spi->dev, regmap); }
@@ -37,15 +52,15 @@ static int aic32x4_spi_remove(struct spi_device *spi) }static const struct spi_device_id aic32x4_spi_id[] = { - {"tlv320aic32x4" ,0 }, - {"tlv320aic32x6" ,1 }, + {"tlv320aic32x4" , (kernel_ulong_t )AIC32X4_TYPE_AIC32X4 }, + {"tlv320aic32x6" , (kernel_ulong_t )AIC32X4_TYPE_AIC32X6 }, {/* sentinel */ } };MODULE_DEVICE_TABLE (spi, aic32x4_spi_id);static const struct of_device_id aic32x4_of_id[] = { - { .compatible ="ti,tlv320aic32x4" , }, - { .compatible ="ti,tlv320aic32x6" , }, + { .compatible ="ti,tlv320aic32x4" , .data = (void *)AIC32X4_TYPE_AIC32X4 }, + { .compatible ="ti,tlv320aic32x6" , .data = (void *)AIC32X4_TYPE_AIC32X6 }, {/* senitel */ } };MODULE_DEVICE_TABLE (of, aic32x4_of_id);
sound/soc/codecs/tlv320aic32x4.c +3 -0
@@ -48,6 +48,7 @@ struct aic32x4_priv {struct aic32x4_setup_data *setup;struct device *dev; +enum aic32x4_type type; }; static int aic32x4_reset_adc(struct snd_soc_dapm_widget *w,
@@ -1198,6 +1199,8 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap)return -ENOMEM ; aic32x4->dev = dev; + aic32x4->type = (enum aic32x4_type )dev_get_drvdata (dev); +dev_set_drvdata (dev, aic32x4);if (pdata) {
sound/soc/codecs/tlv320aic32x4.h +5 -0
@@ -10,6 +10,11 @@struct device ;struct regmap_config ; +enum aic32x4_type { +AIC32X4_TYPE_AIC32X4 =0 , +AIC32X4_TYPE_AIC32X6 , +}; +extern const struct regmap_config aic32x4_regmap_config;int aic32x4_probe (struct device *dev,struct regmap *regmap);int aic32x4_remove (struct device *dev);
Signature · 1 line
2.32.0
PATCH v2 2/3 ASoC: tlv320aic32x4: add support for TAS2505
In reply to Claudius HeineThis adds support for TAS2505 and TAS2521 to the tlv320aic32x4 driver.
The TAS2505 seems to be a stripped down version of the TLV320AIC32X4 so it makes sense to handle them in the same driver.
--- sound/soc/codecs/tlv320aic32x4-i2c.c | 2 + sound/soc/codecs/tlv320aic32x4.c | 136 ++++++++++++++++++++++++++- sound/soc/codecs/tlv320aic32x4.h | 5 + 3 files changed, 142 insertions(+), 1 deletion(-)
sound/soc/codecs/tlv320aic32x4-i2c.c +2 -0
@@ -50,6 +50,7 @@ static int aic32x4_i2c_remove(struct i2c_client *i2c)static const struct i2c_device_id aic32x4_i2c_id[] = { {"tlv320aic32x4" , (kernel_ulong_t )AIC32X4_TYPE_AIC32X4 }, {"tlv320aic32x6" , (kernel_ulong_t )AIC32X4_TYPE_AIC32X6 }, + {"tas2505" , (kernel_ulong_t )AIC32X4_TYPE_TAS2505 }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, aic32x4_i2c_id);
@@ -57,6 +58,7 @@ MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id);static const struct of_device_id aic32x4_of_id[] = { { .compatible ="ti,tlv320aic32x4" , .data = (void *)AIC32X4_TYPE_AIC32X4 }, { .compatible ="ti,tlv320aic32x6" , .data = (void *)AIC32X4_TYPE_AIC32X6 }, + { .compatible ="ti,tas2505" , .data = (void *)AIC32X4_TYPE_TAS2505 }, {/* senitel */ } };MODULE_DEVICE_TABLE (of, aic32x4_of_id);
sound/soc/codecs/tlv320aic32x4.c +135 -1
155 lines not on this page · raw message
sound/soc/codecs/tlv320aic32x4.h +5 -0
@@ -13,6 +13,7 @@ struct regmap_config;enum aic32x4_type {AIC32X4_TYPE_AIC32X4 =0 ,AIC32X4_TYPE_AIC32X6 , +AIC32X4_TYPE_TAS2505 , };extern const struct regmap_config aic32x4_regmap_config;
@@ -93,6 +94,9 @@ int aic32x4_register_clocks(struct device *dev, const char *mclk_name);#define AIC32X4_LOLGAIN AIC32X4_REG(1, 18)#define AIC32X4_LORGAIN AIC32X4_REG(1, 19)#define AIC32X4_HEADSTART AIC32X4_REG(1, 20) +#define TAS2505_SPK AIC32X4_REG(1, 45) +#define TAS2505_SPKVOL1 AIC32X4_REG(1, 46) +#define TAS2505_SPKVOL2 AIC32X4_REG(1, 48)#define AIC32X4_MICBIAS AIC32X4_REG(1, 51)#define AIC32X4_LMICPGAPIN AIC32X4_REG(1, 52)#define AIC32X4_LMICPGANIN AIC32X4_REG(1, 54)
@@ -101,6 +105,7 @@ int aic32x4_register_clocks(struct device *dev, const char *mclk_name);#define AIC32X4_FLOATINGINPUT AIC32X4_REG(1, 58)#define AIC32X4_LMICPGAVOL AIC32X4_REG(1, 59)#define AIC32X4_RMICPGAVOL AIC32X4_REG(1, 60) +#define TAS2505_REFPOWERUP AIC32X4_REG(1, 122)#define AIC32X4_REFPOWERUP AIC32X4_REG(1, 123)/* Bits, masks, and shifts */
Signature · 1 line
2.32.0
PATCH v2 3/3 ASoC: tlv320aic32x4: dt-bindings: add TAS2505 to compatible
In reply to Claudius HeineThis adds 'ti,tas2505' for TAS2505 to the list of allowed compatible strings.
--- Documentation/devicetree/bindings/sound/tlv320aic32x4.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/sound/tlv320aic32x4.txt +1 -0
@@ -6,6 +6,7 @@ Required properties: - compatible - "string" - One of: "ti,tlv320aic32x4" TLV320AIC3204 "ti,tlv320aic32x6" TLV320AIC3206, TLV320AIC3256 + "ti,tas2505" TAS2505, TAS2521 - reg: I2C slave address - supply-*: Required supply regulators are: "iov" - digital IO power supply
Signature · 1 line
2.32.0
Mark Brown
maintainerQuoted 5 lines · Claudius Heine
this is v2 from my patchset that add support for the TAS2505 to the tlv320aic32x4 driver.
kind regards,
Claudius
Quoted 7 lines
Changes from v1:
- clarified commit message of first patch, which add the type value to the struct
- removed unnecessary code to put and get speaker volume
- removed 'Gain' from 'HP Driver Playback Volume' control
- fixed rebase issues[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: tlv320aic32x4: add type to device private data struct
commit: 688d47cdd9344b1485eb28c2a7aa99743ed529a3
[2/3] ASoC: tlv320aic32x4: add support for TAS2505
commit: b4525b6196cd7f83eba16d8679a55f8bb9571052
[3/3] ASoC: tlv320aic32x4: dt-bindings: add TAS2505 to compatible
commit: 8e0eb2fb5c0732a6fa53f2df7079754152857c24All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark