[PATCH 0/2] ASoC: max98357a: support MAX98360A in OF

[PATCH 0/2] ASoC: max98357a: support MAX98360A in OF

[Tzung-Bi Shih]

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

[PATCH 1/2] ASoC: max98357a: add compatible string for MAX98360A

[Tzung-Bi Shih]

Maxim MAX98360A audio amplifier is functionally identical to MAX98357A.
Adds compatible string "maxim,max98360a" for driver reuse.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
 sound/soc/codecs/max98357a.c | 1 +
 1 file changed, 1 insertion(+)

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);
-- 
2.27.0.278.ge193c7cf3a9-goog

[PATCH 2/2] ASoC: dt-bindings: add compatible string for MAX98360A

[Tzung-Bi Shih]

Maxim MAX98360A audio amplifier is functionally identical to MAX98357A.
Adds compatible string "maxim,max98360a" for driver reuse.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
 .../devicetree/bindings/sound/max98357a.txt          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/max98357a.txt b/Documentation/devicetree/bindings/sound/max98357a.txt
index 4bce14ce806f..75db84d06240 100644
--- a/Documentation/devicetree/bindings/sound/max98357a.txt
+++ b/Documentation/devicetree/bindings/sound/max98357a.txt
@@ -1,9 +1,10 @@
-Maxim MAX98357A audio DAC
+Maxim MAX98357A/MAX98360A audio DAC
 
-This node models the Maxim MAX98357A DAC.
+This node models the Maxim MAX98357A/MAX98360A DAC.
 
 Required properties:
-- compatible   : "maxim,max98357a"
+- compatible   : "maxim,max98357a" for MAX98357A.
+                 "maxim,max98360a" for MAX98360A.
 
 Optional properties:
 - sdmode-gpios : GPIO specifier for the chip's SD_MODE pin.
@@ -20,3 +21,8 @@ max98357a {
 	compatible = "maxim,max98357a";
 	sdmode-gpios = <&qcom_pinmux 25 0>;
 };
+
+max98360a {
+	compatible = "maxim,max98360a";
+	sdmode-gpios = <&qcom_pinmux 25 0>;
+};
-- 
2.27.0.278.ge193c7cf3a9-goog

Re: [PATCH 2/2] ASoC: dt-bindings: add compatible string for MAX98360A

[Rob Herring]

On Fri, Jun 05, 2020 at 11:49:31AM +0800, Tzung-Bi Shih wrote:
> Maxim MAX98360A audio amplifier is functionally identical to MAX98357A.
> Adds compatible string "maxim,max98360a" for driver reuse.
> 
> Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
> ---
>  .../devicetree/bindings/sound/max98357a.txt          | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/max98357a.txt b/Documentation/devicetree/bindings/sound/max98357a.txt
> index 4bce14ce806f..75db84d06240 100644
> --- a/Documentation/devicetree/bindings/sound/max98357a.txt
> +++ b/Documentation/devicetree/bindings/sound/max98357a.txt
> @@ -1,9 +1,10 @@
> -Maxim MAX98357A audio DAC
> +Maxim MAX98357A/MAX98360A audio DAC
>  
> -This node models the Maxim MAX98357A DAC.
> +This node models the Maxim MAX98357A/MAX98360A DAC.
>  
>  Required properties:
> -- compatible   : "maxim,max98357a"
> +- compatible   : "maxim,max98357a" for MAX98357A.
> +                 "maxim,max98360a" for MAX98360A.
>  
>  Optional properties:
>  - sdmode-gpios : GPIO specifier for the chip's SD_MODE pin.
> @@ -20,3 +21,8 @@ max98357a {
>  	compatible = "maxim,max98357a";
>  	sdmode-gpios = <&qcom_pinmux 25 0>;
>  };
> +
> +max98360a {
> +	compatible = "maxim,max98360a";
> +	sdmode-gpios = <&qcom_pinmux 25 0>;
> +};

Nothing new here, you don't need another example.

> -- 
> 2.27.0.278.ge193c7cf3a9-goog
> 

Re: [PATCH 0/2] ASoC: max98357a: support MAX98360A in OF

[Mark Brown]

On Fri, 5 Jun 2020 11:49:29 +0800, Tzung-Bi Shih wrote:
> 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
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: max98357a: add compatible string for MAX98360A
      commit: 3aad07b87ac3fa1c67a75403f7f9c576da8df71d
[2/2] ASoC: dt-bindings: add compatible string for MAX98360A
      commit: 3e3b803f9e76b2ec386c0f3f0618fb7d0bca4ffc

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark