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

Commit 0ca0c2d8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/rt286' into HEAD

parents 249adddb 23c4fd5c

include/sound/rt286.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * linux/sound/rt286.h -- Platform data for RT286

 *

 * Copyright 2013 Realtek Microelectronics

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __LINUX_SND_RT286_H

#define __LINUX_SND_RT286_H



struct rt286_platform_data {

	bool cbj_en; /*combo jack enable*/

	bool gpio2_en; /*GPIO2 enable*/

};



#endif

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_PCM3008

	select SND_SOC_PCM512x_I2C if I2C

	select SND_SOC_PCM512x_SPI if SPI_MASTER

	select SND_SOC_RT286 if I2C

	select SND_SOC_RT5631 if I2C

	select SND_SOC_RT5640 if I2C

	select SND_SOC_RT5645 if I2C
@@ -449,6 +450,9 @@ config SND_SOC_RL6231 
	default m if SND_SOC_RT5645=m

	default m if SND_SOC_RT5651=m



config SND_SOC_RT286

	tristate



config SND_SOC_RT5631

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ snd-soc-pcm512x-objs := pcm512x.o 
snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o

snd-soc-pcm512x-spi-objs := pcm512x-spi.o

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

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

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

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

snd-soc-rt5645-objs := rt5645.o
@@ -233,6 +234,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o 
obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o

obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o

obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o

obj-$(CONFIG_SND_SOC_RT286)	+= snd-soc-rt286.o

obj-$(CONFIG_SND_SOC_RT5631)	+= snd-soc-rt5631.o

obj-$(CONFIG_SND_SOC_RT5640)	+= snd-soc-rt5640.o

obj-$(CONFIG_SND_SOC_RT5645)	+= snd-soc-rt5645.o