diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-15 20:58:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-15 20:58:44 +0100 |
| commit | c42d8c17a9523a4f28b6f6be3920a6674e50c5d3 (patch) | |
| tree | d5ffb3abc419c73d356f3488b71ddac60e3d599f /sound | |
| parent | ba05f17965573985b6a709c2cb2264a9807e6b3c (diff) | |
| parent | 3e3b803f9e76b2ec386c0f3f0618fb7d0bca4ffc (diff) | |
| download | linux-c42d8c17a9523a4f28b6f6be3920a6674e50c5d3.tar.gz | |
Merge series "ASoC: max98357a: support MAX98360A in OF" from Tzung-Bi Shih <tzungbi@google.com>:
Commit 1a0f2433d738 ("ASoC: max98357a: Add ACPI HID MAX98360A") supports
MAX98360A in ACPI world. This series supports MAX98360A in OF world.
Tzung-Bi Shih (2):
ASoC: max98357a: add compatible string for MAX98360A
ASoC: dt-bindings: add compatible string for MAX98360A
.../devicetree/bindings/sound/max98357a.txt | 12 +++++++++---
sound/soc/codecs/max98357a.c | 1 +
2 files changed, 10 insertions(+), 3 deletions(-)
--
2.27.0.278.ge193c7cf3a9-goog
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max98357a.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index a8bd793a7867..4f431133d0bb 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -125,6 +125,7 @@ static int max98357a_platform_probe(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id max98357a_device_id[] = { { .compatible = "maxim,max98357a" }, + { .compatible = "maxim,max98360a" }, {} }; MODULE_DEVICE_TABLE(of, max98357a_device_id); |