| Message ID | 1403251396-17487-1-git-send-email-tushar.b@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 053e69d57cc6253b19ea661f929c8c1b6a907bff |
| Headers | show |
On 06/21/2014 02:02 AM, Doug Anderson wrote: > Tushar, > > On Fri, Jun 20, 2014 at 1:03 AM, Tushar Behera <tushar.b@samsung.com> wrote: >> From: Wonjoon Lee <woojoo.lee@samsung.com> >> >> 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> >> --- >> >> Picked from https://chromium-review.googlesource.com/#/c/184091/ >> >> .../devicetree/bindings/sound/max98090.txt | 2 +- >> sound/soc/codecs/max98090.c | 2 ++ >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/sound/max98090.txt b/Documentation/devicetree/bindings/sound/max98090.txt >> index a5e63fa..c454e67 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 f5fccc7..4f5534d 100644 >> --- a/sound/soc/codecs/max98090.c >> +++ b/sound/soc/codecs/max98090.c >> @@ -2460,12 +2460,14 @@ static const struct dev_pm_ops max98090_pm = { >> >> static const struct i2c_device_id max98090_i2c_id[] = { >> { "max98090", MAX98090 }, >> + { "max98091", MAX98091 }, > > optional: This would allow you to add some extra error checking in > max98090_probe() to make sure that the device-tree specified device > matched the device that was detected. That could be in a future > patch, though. > > Reviewed-by: Doug Anderson <dianders@chromium.org> > Okay. I will add that in a follow-up patch. Thanks for reviewing.
On Fri, Jun 20, 2014 at 01:33:15PM +0530, Tushar Behera wrote: > From: Wonjoon Lee <woojoo.lee@samsung.com> > > 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. Applied, thanks.
diff --git a/Documentation/devicetree/bindings/sound/max98090.txt b/Documentation/devicetree/bindings/sound/max98090.txt index a5e63fa..c454e67 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 f5fccc7..4f5534d 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2460,12 +2460,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);