ASoC: tas5720: add TAS5722 register support

Introduce a custom super-set register map and associated bit definitions
to allow driver access to all TAS5722 device functionality.

Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andreas Dannenberg 2017-12-11 13:01:55 -06:00 committed by Mark Brown
parent 872bcad246
commit d5eb436acc
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 52 additions and 1 deletions

View File

@ -466,6 +466,15 @@ static const struct regmap_config tas5720_regmap_config = {
.volatile_reg = tas5720_is_volatile_reg, .volatile_reg = tas5720_is_volatile_reg,
}; };
static const struct regmap_config tas5722_regmap_config = {
.reg_bits = 8,
.val_bits = 8,
.max_register = TAS5722_MAX_REG,
.cache_type = REGCACHE_RBTREE,
.volatile_reg = tas5720_is_volatile_reg,
};
/* /*
* DAC analog gain. There are four discrete values to select from, ranging * DAC analog gain. There are four discrete values to select from, ranging
* from 19.2 dB to 26.3dB. * from 19.2 dB to 26.3dB.
@ -564,6 +573,7 @@ static int tas5720_probe(struct i2c_client *client,
{ {
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct tas5720_data *data; struct tas5720_data *data;
const struct regmap_config *regmap_config;
int ret; int ret;
int i; int i;
@ -574,7 +584,18 @@ static int tas5720_probe(struct i2c_client *client,
data->tas5720_client = client; data->tas5720_client = client;
data->devtype = id->driver_data; data->devtype = id->driver_data;
data->regmap = devm_regmap_init_i2c(client, &tas5720_regmap_config); switch (id->driver_data) {
case TAS5720:
regmap_config = &tas5720_regmap_config;
break;
case TAS5722:
regmap_config = &tas5722_regmap_config;
break;
default:
dev_err(dev, "unexpected private driver data\n");
return -EINVAL;
}
data->regmap = devm_regmap_init_i2c(client, regmap_config);
if (IS_ERR(data->regmap)) { if (IS_ERR(data->regmap)) {
ret = PTR_ERR(data->regmap); ret = PTR_ERR(data->regmap);
dev_err(dev, "failed to allocate register map: %d\n", ret); dev_err(dev, "failed to allocate register map: %d\n", ret);

View File

@ -30,6 +30,11 @@
#define TAS5720_DIGITAL_CLIP1_REG 0x11 #define TAS5720_DIGITAL_CLIP1_REG 0x11
#define TAS5720_MAX_REG TAS5720_DIGITAL_CLIP1_REG #define TAS5720_MAX_REG TAS5720_DIGITAL_CLIP1_REG
/* Additional TAS5722-specific Registers */
#define TAS5722_DIGITAL_CTRL2_REG 0x13
#define TAS5722_ANALOG_CTRL2_REG 0x14
#define TAS5722_MAX_REG TAS5722_ANALOG_CTRL2_REG
/* TAS5720_DEVICE_ID_REG */ /* TAS5720_DEVICE_ID_REG */
#define TAS5720_DEVICE_ID 0x01 #define TAS5720_DEVICE_ID 0x01
#define TAS5722_DEVICE_ID 0x12 #define TAS5722_DEVICE_ID 0x12
@ -52,6 +57,7 @@
#define TAS5720_SAIF_FORMAT_MASK GENMASK(2, 0) #define TAS5720_SAIF_FORMAT_MASK GENMASK(2, 0)
/* TAS5720_DIGITAL_CTRL2_REG */ /* TAS5720_DIGITAL_CTRL2_REG */
#define TAS5722_VOL_RAMP_RATE BIT(6)
#define TAS5720_MUTE BIT(4) #define TAS5720_MUTE BIT(4)
#define TAS5720_TDM_SLOT_SEL_MASK GENMASK(2, 0) #define TAS5720_TDM_SLOT_SEL_MASK GENMASK(2, 0)
@ -88,4 +94,28 @@
#define TAS5720_CLIP1_MASK GENMASK(7, 2) #define TAS5720_CLIP1_MASK GENMASK(7, 2)
#define TAS5720_CLIP1_SHIFT (0x2) #define TAS5720_CLIP1_SHIFT (0x2)
/* TAS5722_DIGITAL_CTRL2_REG */
#define TAS5722_HPF_3_7HZ (0x0 << 5)
#define TAS5722_HPF_7_4HZ (0x1 << 5)
#define TAS5722_HPF_14_9HZ (0x2 << 5)
#define TAS5722_HPF_29_7HZ (0x3 << 5)
#define TAS5722_HPF_59_4HZ (0x4 << 5)
#define TAS5722_HPF_118_4HZ (0x5 << 5)
#define TAS5722_HPF_235_0HZ (0x6 << 5)
#define TAS5722_HPF_463_2HZ (0x7 << 5)
#define TAS5722_HPF_MASK GENMASK(7, 5)
#define TAS5722_AUTO_SLEEP_OFF (0x0 << 3)
#define TAS5722_AUTO_SLEEP_1024LR (0x1 << 3)
#define TAS5722_AUTO_SLEEP_65536LR (0x2 << 3)
#define TAS5722_AUTO_SLEEP_262144LR (0x3 << 3)
#define TAS5722_AUTO_SLEEP_MASK GENMASK(4, 3)
#define TAS5722_TDM_SLOT_16B BIT(2)
#define TAS5722_MCLK_PIN_CFG BIT(1)
#define TAS5722_VOL_CONTROL_LSB BIT(0)
/* TAS5722_ANALOG_CTRL2_REG */
#define TAS5722_FAULTZ_PU BIT(3)
#define TAS5722_VREG_LVL BIT(2)
#define TAS5722_PWR_TUNE BIT(0)
#endif /* __TAS5720_H__ */ #endif /* __TAS5720_H__ */