diff options
| author | Wonjoon Lee <woojoo.lee@samsung.com> | 2014-06-20 12:03:15 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-30 22:51:23 +0400 |
| commit | 053e69d57cc6253b19ea661f929c8c1b6a907bff (patch) | |
| tree | 55210469f176fcdace255da074a01ad3daf63210 | |
| parent | 6c49a986957bc5fe39b29166cb7fad573dc242ba (diff) | |
| download | linux-053e69d57cc6253b19ea661f929c8c1b6a907bff.tar.xz | |
ASoC: max98090: Add max98091 compatible string
The MAX98091 CODEC is the same as MAX98090 CODEC, but with an extra
microphone. Existing driver for MAX98090 CODEC already has support
for MAX98091 CODEC. Adding proper compatible string so that MAX98091
CODEC can be specified from device tree.
Signed-off-by: Wonjoon Lee <woojoo.lee@samsung.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Tushar Behera <tushar.b@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | Documentation/devicetree/bindings/sound/max98090.txt | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/max98090.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/max98090.txt b/Documentation/devicetree/bindings/sound/max98090.txt index a5e63fa47dc5..c454e67f54bb 100644 --- a/Documentation/devicetree/bindings/sound/max98090.txt +++ b/Documentation/devicetree/bindings/sound/max98090.txt @@ -4,7 +4,7 @@ This device supports I2C only. Required properties: -- compatible : "maxim,max98090". +- compatible : "maxim,max98090" or "maxim,max98091". - reg : The I2C address of the device. diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 3aec3ae78fe0..c00b36872dfe 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2447,12 +2447,14 @@ static const struct dev_pm_ops max98090_pm = { static const struct i2c_device_id max98090_i2c_id[] = { { "max98090", MAX98090 }, + { "max98091", MAX98091 }, { } }; MODULE_DEVICE_TABLE(i2c, max98090_i2c_id); static const struct of_device_id max98090_of_match[] = { { .compatible = "maxim,max98090", }, + { .compatible = "maxim,max98091", }, { } }; MODULE_DEVICE_TABLE(of, max98090_of_match); |