[PATCH 1/2] ASoC: max98090: Add max98091 compatible string

[PATCH 1/2] ASoC: max98090: Add max98091 compatible string

[Tushar Behera]

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 },
 	{ }
 };
 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);
-- 
1.7.9.5

[PATCH 2/2] ASoC: samsung: Extend snow driver to support MAX98091

[Tushar Behera]

Peach-pi board has MAX98091 CODEC. Extend snow machine driver to support
this board.

Signed-off-by: Tushar Behera <tushar.b@samsung.com>
---
 Documentation/devicetree/bindings/sound/snow.txt |    1 +
 sound/soc/samsung/snow.c                         |    1 +
 2 files changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/snow.txt b/Documentation/devicetree/bindings/sound/snow.txt
index 678b191..e0b7a82 100644
--- a/Documentation/devicetree/bindings/sound/snow.txt
+++ b/Documentation/devicetree/bindings/sound/snow.txt
@@ -3,6 +3,7 @@ Audio Binding for Snow boards
 Required properties:
 - compatible : Can be one of the following,
 			"google,snow-audio-max98090" or
+			"google,snow-audio-max98091" or
 			"google,snow-audio-max98095"
 - samsung,i2s-controller: The phandle of the Samsung I2S controller
 - samsung,audio-codec: The phandle of the audio codec
diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c
index 014c177..8bbd348 100644
--- a/sound/soc/samsung/snow.c
+++ b/sound/soc/samsung/snow.c
@@ -103,6 +103,7 @@ static int snow_probe(struct platform_device *pdev)
 
 static const struct of_device_id snow_of_match[] = {
 	{ .compatible = "google,snow-audio-max98090", },
+	{ .compatible = "google,snow-audio-max98091", },
 	{ .compatible = "google,snow-audio-max98095", },
 	{},
 };
-- 
1.7.9.5

Re: [PATCH 2/2] ASoC: samsung: Extend snow driver to support MAX98091

[Doug Anderson]

Tushar,

On Fri, Jun 20, 2014 at 1:03 AM, Tushar Behera <tushar.b@samsung.com> wrote:
> Peach-pi board has MAX98091 CODEC. Extend snow machine driver to support
> this board.
>
> Signed-off-by: Tushar Behera <tushar.b@samsung.com>
> ---
>  Documentation/devicetree/bindings/sound/snow.txt |    1 +
>  sound/soc/samsung/snow.c                         |    1 +
>  2 files changed, 2 insertions(+)

Reviewed-by: Doug Anderson <dianders@chromium.org>

Re: [PATCH 2/2] ASoC: samsung: Extend snow driver to support MAX98091

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

On Fri, Jun 20, 2014 at 01:33:16PM +0530, Tushar Behera wrote:
> Peach-pi board has MAX98091 CODEC. Extend snow machine driver to support
> this board.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/2] ASoC: max98090: Add max98091 compatible string

[Doug Anderson]

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>

Re: [PATCH 1/2] ASoC: max98090: Add max98091 compatible string

[Tushar Behera]

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.
-- 
Tushar Behera

Re: [PATCH 1/2] ASoC: max98090: Add max98091 compatible string

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

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.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]