Unverified Commit c42d8c17 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: max98357a: support MAX98360A in OF" from Tzung-Bi Shih <tzungbi@google.com>: 

Commit 1a0f2433 ("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
parents ba05f179 3e3b803f

Documentation/devicetree/bindings/sound/max98357a.txt

+9 −3
Original line number Diff line number Diff line 
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>;

};

sound/soc/codecs/max98357a.c

+1 −0
Original line number Diff line number Diff line
@@ -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);