Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927',... (ccf9fc86) · Commits · 戴 / test

Documentation/devicetree/bindings/sound/max98925.txt

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		max98925 audio CODEC

		This device supports I2C.

		Required properties:

		- compatible : "maxim,max98925"

		- vmon-slot-no : slot number used to send voltage information

		- imon-slot-no : slot number used to send current information

		- reg : the I2C address of the device for I2C

		Example:

		codec: max98925@1a {
		compatible = "maxim,max98925";
		vmon-slot-no = <0>;
		imon-slot-no = <2>;
		reg = <0x1a>;
		};

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		max98926 audio CODEC

		This device supports I2C.

		Required properties:

		- compatible : "maxim,max98926"

		- vmon-slot-no : slot number used to send voltage information
		or in inteleave mode this will be used as
		interleave slot.

		- imon-slot-no : slot number used to send current information

		- interleave-mode : When using two MAX98926 in a system it is
		possible to create ADC data that that will
		overflow the frame size. Digital Audio Interleave
		mode provides a means to output VMON and IMON data
		from two devices on a single DOUT line when running
		smaller frames sizes such as 32 BCLKS per LRCLK or
		48 BCLKS per LRCLK.

		- reg : the I2C address of the device for I2C

		Example:

		codec: max98926@1a {
		compatible = "maxim,max98926";
		vmon-slot-no = <0>;
		imon-slot-no = <2>;
		reg = <0x1a>;
		};

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		Maxim Integrated MAX98925/MAX98926/MAX98927 Speaker Amplifier

		This device supports I2C.

		Required properties:

		- compatible : should be one of the following
		- "maxim,max98925"
		- "maxim,max98926"
		- "maxim,max98927"

		- vmon-slot-no : slot number used to send voltage information
		or in inteleave mode this will be used as
		interleave slot.
		MAX98925/MAX98926 slot range : 0 ~ 30, Default : 0
		MAX98927 slot range : 0 ~ 15, Default : 0

		- imon-slot-no : slot number used to send current information
		MAX98925/MAX98926 slot range : 0 ~ 30, Default : 0
		MAX98927 slot range : 0 ~ 15, Default : 0

		- interleave-mode : When using two MAX9892X in a system it is
		possible to create ADC data that that will
		overflow the frame size. Digital Audio Interleave
		mode provides a means to output VMON and IMON data
		from two devices on a single DOUT line when running
		smaller frames sizes such as 32 BCLKS per LRCLK or
		48 BCLKS per LRCLK.
		Range : 0 (off), 1 (on), Default : 0

		- reg : the I2C address of the device for I2C

		Example:

		codec: max98927@3a {
		compatible = "maxim,max98927";
		vmon-slot-no = <0>;
		imon-slot-no = <1>;
		interleave-mode = <0>;
		reg = <0x3a>;
		};

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		MT2701 with WM8960 CODEC

		Required properties:
		- compatible: "mediatek,mt2701-wm8960-machine"
		- mediatek,platform: the phandle of MT2701 ASoC platform
		- audio-routing: a list of the connections between audio
		- mediatek,audio-codec: the phandles of wm8960 codec
		- pinctrl-names: Should contain only one value - "default"
		- pinctrl-0: Should specify pin control groups used for this controller.

		Example:

		sound:sound {
		compatible = "mediatek,mt2701-wm8960-machine";
		mediatek,platform = <&afe>;
		audio-routing =
		"Headphone", "HP_L",
		"Headphone", "HP_R",
		"LINPUT1", "AMIC",
		"RINPUT1", "AMIC";
		mediatek,audio-codec = <&wm8960>;
		pinctrl-names = "default";
		pinctrl-0 = <&aud_pins_default>;
		};

+5 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ config SND_SOC_ALL_CODECS
		select SND_SOC_MAX9867 if I2C
		select SND_SOC_MAX98925 if I2C
		select SND_SOC_MAX98926 if I2C
		select SND_SOC_MAX98927 if I2C
		select SND_SOC_MAX9850 if I2C
		select SND_SOC_MAX9860 if I2C
		select SND_SOC_MAX9768 if I2C
		@@ -604,6 +605,10 @@ config SND_SOC_MAX98925
		config SND_SOC_MAX98926
		tristate

		config SND_SOC_MAX98927
		tristate "Maxim Integrated MAX98927 Speaker Amplifier"
		depends on I2C

		config SND_SOC_MAX9850
		tristate