Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 87c90ac0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/max98373',... 

Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/max98373', 'asoc/topic/max98926' and 'asoc/topic/max98927' into asoc-next
parents 2f1eceda 769e40f0 2f3d24a1 866b9c81 68fea7cd

Documentation/devicetree/bindings/sound/max98373.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
Maxim Integrated MAX98373 Speaker Amplifier



This device supports I2C.



Required properties:



 - compatible : "maxim,max98373"



 - reg : the I2C address of the device.



Optional properties:



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

                   or in inteleave mode this will be used as

                   interleave slot.

                   slot range : 0 ~ 15,  Default : 0



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

                   slot range : 0 ~ 15,  Default : 0



  - maxim,spkfb-slot-no : slot number used to send speaker feedback information

                   slot range : 0 ~ 15,  Default : 0



  - maxim,interleave-mode : For cases where a single combined channel

		   for the I/V sense data is not sufficient, the device can also be configured

		   to share a single data output channel on alternating frames.

		   In this configuration, the current and voltage data will be frame interleaved

		   on a single output channel.

                   Boolean, define to enable the interleave mode, Default : false



Example:



codec: max98373@31 {

   compatible = "maxim,max98373";

   reg = <0x31>;

   maxim,vmon-slot-no = <0>;

   maxim,imon-slot-no = <1>;

   maxim,spkfb-slot-no = <2>;

   maxim,interleave-mode;

};

sound/soc/codecs/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_MAX98925 if I2C

	select SND_SOC_MAX98926 if I2C

	select SND_SOC_MAX98927 if I2C

	select SND_SOC_MAX98373 if I2C

	select SND_SOC_MAX9850 if I2C

	select SND_SOC_MAX9860 if I2C

	select SND_SOC_MAX9768 if I2C
@@ -625,6 +626,10 @@ config SND_SOC_MAX98927 
	tristate "Maxim Integrated MAX98927 Speaker Amplifier"

	depends on I2C



config SND_SOC_MAX98373

	tristate "Maxim Integrated MAX98373 Speaker Amplifier"

	depends on I2C



config SND_SOC_MAX9850

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ snd-soc-max9867-objs := max9867.o 
snd-soc-max98925-objs := max98925.o

snd-soc-max98926-objs := max98926.o

snd-soc-max98927-objs := max98927.o

snd-soc-max98373-objs := max98373.o

snd-soc-max9850-objs := max9850.o

snd-soc-max9860-objs := max9860.o

snd-soc-mc13783-objs := mc13783.o
@@ -333,6 +334,7 @@ obj-$(CONFIG_SND_SOC_MAX9867) += snd-soc-max9867.o 
obj-$(CONFIG_SND_SOC_MAX98925)	+= snd-soc-max98925.o

obj-$(CONFIG_SND_SOC_MAX98926)	+= snd-soc-max98926.o

obj-$(CONFIG_SND_SOC_MAX98927)	+= snd-soc-max98927.o

obj-$(CONFIG_SND_SOC_MAX98373)	+= snd-soc-max98373.o

obj-$(CONFIG_SND_SOC_MAX9850)	+= snd-soc-max9850.o

obj-$(CONFIG_SND_SOC_MAX9860)	+= snd-soc-max9860.o

obj-$(CONFIG_SND_SOC_MC13783)	+= snd-soc-mc13783.o