[PATCH for-next 1/3] ASoC: dt-bindings: Add TAS2563 compatible to the TAS2562 binding
Add the Texas Instruments TAS2563 audio amplifier to the TAS262 binding.
CC: Rob Herring robh@kernel.org Signed-off-by: Dan Murphy dmurphy@ti.com --- Documentation/devicetree/bindings/sound/tas2562.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/sound/tas2562.txt b/Documentation/devicetree/bindings/sound/tas2562.txt index 658e1fb18a99..94796b547184 100644 --- a/Documentation/devicetree/bindings/sound/tas2562.txt +++ b/Documentation/devicetree/bindings/sound/tas2562.txt @@ -8,7 +8,7 @@ real time monitoring of loudspeaker behavior. Required properties: - #address-cells - Should be <1>. - #size-cells - Should be <0>. - - compatible: - Should contain "ti,tas2562". + - compatible: - Should contain "ti,tas2562", "ti,tas2563". - reg: - The i2c address. Should be 0x4c, 0x4d, 0x4e or 0x4f. - ti,imon-slot-no:- TDM TX current sense time slot.
The TAS2563 is register compatible with the TAS2562. The main difference is the TAS2563 has a programmable DSP to manage different audio profiles.
Signed-off-by: Dan Murphy dmurphy@ti.com --- sound/soc/codecs/tas2562.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index d5e04030a0c1..79c3c3d79766 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -55,6 +55,11 @@ struct tas2562_data { int volume_lvl; };
+enum tas256x_model { + TAS2562, + TAS2563, +}; + static int tas2562_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { @@ -664,13 +669,15 @@ static int tas2562_probe(struct i2c_client *client, }
static const struct i2c_device_id tas2562_id[] = { - { "tas2562", 0 }, + { "tas2562", TAS2562 }, + { "tas2563", TAS2563 }, { } }; MODULE_DEVICE_TABLE(i2c, tas2562_id);
static const struct of_device_id tas2562_of_match[] = { { .compatible = "ti,tas2562", }, + { .compatible = "ti,tas2563", }, { }, }; MODULE_DEVICE_TABLE(of, tas2562_of_match);
Fix error message for setting the sample rate. It says bitwidth but should say sample rate.
Signed-off-by: Dan Murphy dmurphy@ti.com --- sound/soc/codecs/tas2562.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index 79c3c3d79766..6b7f7a18da36 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -276,7 +276,7 @@ static int tas2562_hw_params(struct snd_pcm_substream *substream,
ret = tas2562_set_samplerate(tas2562, params_rate(params)); if (ret) - dev_err(tas2562->dev, "set bitwidth failed, %d\n", ret); + dev_err(tas2562->dev, "set sample rate failed, %d\n", ret);
return ret; }
On Wed, Feb 26, 2020 at 07:03:05AM -0600, Dan Murphy wrote:
Fix error message for setting the sample rate. It says bitwidth but should say sample rate.
Fixes should always go at the start of a series so they can be applied as such without any dependency on any new features or cleanups.
Mark
On 2/26/20 10:12 AM, Mark Brown wrote:
On Wed, Feb 26, 2020 at 07:03:05AM -0600, Dan Murphy wrote:
Fix error message for setting the sample rate. It says bitwidth but should say sample rate.
Fixes should always go at the start of a series so they can be applied as such without any dependency on any new features or cleanups.
OK I will rebase and put the fixes first.
Dan
participants (2)
-
Dan Murphy -
Mark Brown