diff options
| -rw-r--r-- | Documentation/devicetree/bindings/sound/tlv320aic32x4.txt | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/tlv320aic32x4-i2c.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/tlv320aic32x4-spi.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt index 5e2741af27be..9651fc7503a4 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt | |||
| @@ -3,7 +3,9 @@ Texas Instruments - tlv320aic32x4 Codec module | |||
| 3 | The tlv320aic32x4 serial control bus communicates through I2C protocols | 3 | The tlv320aic32x4 serial control bus communicates through I2C protocols |
| 4 | 4 | ||
| 5 | Required properties: | 5 | Required properties: |
| 6 | - compatible: Should be "ti,tlv320aic32x4" | 6 | - compatible - "string" - One of: |
| 7 | "ti,tlv320aic32x4" TLV320AIC3204 | ||
| 8 | "ti,tlv320aic32x6" TLV320AIC3206, TLV320AIC3256 | ||
| 7 | - reg: I2C slave address | 9 | - reg: I2C slave address |
| 8 | - supply-*: Required supply regulators are: | 10 | - supply-*: Required supply regulators are: |
| 9 | "iov" - digital IO power supply | 11 | "iov" - digital IO power supply |
diff --git a/sound/soc/codecs/tlv320aic32x4-i2c.c b/sound/soc/codecs/tlv320aic32x4-i2c.c index 59606cf3008f..385fa2e9525a 100644 --- a/sound/soc/codecs/tlv320aic32x4-i2c.c +++ b/sound/soc/codecs/tlv320aic32x4-i2c.c | |||
| @@ -47,12 +47,14 @@ static int aic32x4_i2c_remove(struct i2c_client *i2c) | |||
| 47 | 47 | ||
| 48 | static const struct i2c_device_id aic32x4_i2c_id[] = { | 48 | static const struct i2c_device_id aic32x4_i2c_id[] = { |
| 49 | { "tlv320aic32x4", 0 }, | 49 | { "tlv320aic32x4", 0 }, |
| 50 | { "tlv320aic32x6", 1 }, | ||
| 50 | { /* sentinel */ } | 51 | { /* sentinel */ } |
| 51 | }; | 52 | }; |
| 52 | MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id); | 53 | MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id); |
| 53 | 54 | ||
| 54 | static const struct of_device_id aic32x4_of_id[] = { | 55 | static const struct of_device_id aic32x4_of_id[] = { |
| 55 | { .compatible = "ti,tlv320aic32x4", }, | 56 | { .compatible = "ti,tlv320aic32x4", }, |
| 57 | { .compatible = "ti,tlv320aic32x6", }, | ||
| 56 | { /* senitel */ } | 58 | { /* senitel */ } |
| 57 | }; | 59 | }; |
| 58 | MODULE_DEVICE_TABLE(of, aic32x4_of_id); | 60 | MODULE_DEVICE_TABLE(of, aic32x4_of_id); |
diff --git a/sound/soc/codecs/tlv320aic32x4-spi.c b/sound/soc/codecs/tlv320aic32x4-spi.c index 724fcdd491b2..07d78ae51e05 100644 --- a/sound/soc/codecs/tlv320aic32x4-spi.c +++ b/sound/soc/codecs/tlv320aic32x4-spi.c | |||
| @@ -48,12 +48,14 @@ static int aic32x4_spi_remove(struct spi_device *spi) | |||
| 48 | 48 | ||
| 49 | static const struct spi_device_id aic32x4_spi_id[] = { | 49 | static const struct spi_device_id aic32x4_spi_id[] = { |
| 50 | { "tlv320aic32x4", 0 }, | 50 | { "tlv320aic32x4", 0 }, |
| 51 | { "tlv320aic32x6", 1 }, | ||
| 51 | { /* sentinel */ } | 52 | { /* sentinel */ } |
| 52 | }; | 53 | }; |
| 53 | MODULE_DEVICE_TABLE(spi, aic32x4_spi_id); | 54 | MODULE_DEVICE_TABLE(spi, aic32x4_spi_id); |
| 54 | 55 | ||
| 55 | static const struct of_device_id aic32x4_of_id[] = { | 56 | static const struct of_device_id aic32x4_of_id[] = { |
| 56 | { .compatible = "ti,tlv320aic32x4", }, | 57 | { .compatible = "ti,tlv320aic32x4", }, |
| 58 | { .compatible = "ti,tlv320aic32x6", }, | ||
| 57 | { /* senitel */ } | 59 | { /* senitel */ } |
| 58 | }; | 60 | }; |
| 59 | MODULE_DEVICE_TABLE(of, aic32x4_of_id); | 61 | MODULE_DEVICE_TABLE(of, aic32x4_of_id); |
