Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
This commit is contained in:
commit
f9061f2fc1
|
@ -3,7 +3,14 @@ Texas Instruments - tlv320aic3x Codec module
|
|||
The tlv320aic3x serial control bus communicates through I2C protocols
|
||||
|
||||
Required properties:
|
||||
- compatible - "string" - "ti,tlv320aic3x"
|
||||
|
||||
- compatible - "string" - One of:
|
||||
"ti,tlv320aic3x" - Generic TLV320AIC3x device
|
||||
"ti,tlv320aic33" - TLV320AIC33
|
||||
"ti,tlv320aic3007" - TLV320AIC3007
|
||||
"ti,tlv320aic3106" - TLV320AIC3106
|
||||
|
||||
|
||||
- reg - <int> - I2C slave address
|
||||
|
||||
|
||||
|
|
|
@ -1474,6 +1474,7 @@ static const struct i2c_device_id aic3x_i2c_id[] = {
|
|||
{ "tlv320aic3x", AIC3X_MODEL_3X },
|
||||
{ "tlv320aic33", AIC3X_MODEL_33 },
|
||||
{ "tlv320aic3007", AIC3X_MODEL_3007 },
|
||||
{ "tlv320aic3106", AIC3X_MODEL_3X },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
|
||||
|
@ -1564,6 +1565,9 @@ static int aic3x_i2c_remove(struct i2c_client *client)
|
|||
#if defined(CONFIG_OF)
|
||||
static const struct of_device_id tlv320aic3x_of_match[] = {
|
||||
{ .compatible = "ti,tlv320aic3x", },
|
||||
{ .compatible = "ti,tlv320aic33" },
|
||||
{ .compatible = "ti,tlv320aic3007" },
|
||||
{ .compatible = "ti,tlv320aic3106" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, tlv320aic3x_of_match);
|
||||
|
|
Loading…
Reference in a new issue