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

Commit 465de977 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/max98357a' into asoc-linus

parents 09269e4e 08d0a55c

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_MAX98088 if I2C

	select SND_SOC_MAX98090 if I2C

	select SND_SOC_MAX98095 if I2C

	select SND_SOC_MAX98357A

	select SND_SOC_MAX98357A if GPIOLIB

	select SND_SOC_MAX9850 if I2C

	select SND_SOC_MAX9768 if I2C

	select SND_SOC_MAX9877 if I2C

sound/soc/codecs/max98357a.c

+11 −1
Original line number Diff line number Diff line
@@ -12,9 +12,19 @@ 
 * max98357a.c -- MAX98357A ALSA SoC Codec driver

 */



#include <linux/module.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/kernel.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/soc-dai.h>

#include <sound/soc-dapm.h>



#define DRV_NAME "max98357a"