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

Commit 15f78ea6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branches 'topic/rt5640', 'topic/rt5645' and 'topic/rt5651' of... 

Merge branches 'topic/rt5640', 'topic/rt5645' and 'topic/rt5651' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rl6231
parents 57f174f4 8c325704 c1406846

include/sound/rt5645.h

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

 * linux/sound/rt5645.h -- Platform data for RT5645

 *

 * 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_RT5645_H

#define __LINUX_SND_RT5645_H



struct rt5645_platform_data {

	/* IN2 can optionally be differential */

	bool in2_diff;



	bool dmic_en;

	unsigned int dmic1_data_pin;

	/* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */

	unsigned int dmic2_data_pin;

	/* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */

};



#endif

include/sound/rt5651.h

0 → 100644
+21 −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_RT5651_H

#define __LINUX_SND_RT5651_H



struct rt5651_platform_data {

	/* IN2 can optionally be differential */

	bool in2_diff;



	bool dmic_en;

};



#endif

sound/soc/codecs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_PCM512x_SPI if SPI_MASTER

	select SND_SOC_RT5631 if I2C

	select SND_SOC_RT5640 if I2C

	select SND_SOC_RT5645 if I2C

	select SND_SOC_RT5651 if I2C

	select SND_SOC_SGTL5000 if I2C

	select SND_SOC_SI476X if MFD_SI476X_CORE

	select SND_SOC_SIRF_AUDIO_CODEC
@@ -396,6 +398,12 @@ config SND_SOC_RT5631 
config SND_SOC_RT5640

	tristate



config SND_SOC_RT5645

        tristate



config SND_SOC_RT5651

	tristate



#Freescale sgtl5000 codec

config SND_SOC_SGTL5000

	tristate "Freescale SGTL5000 CODEC"

sound/soc/codecs/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o 
snd-soc-pcm512x-spi-objs := pcm512x-spi.o

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

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

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

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

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

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

snd-soc-alc5632-objs := alc5632.o
@@ -211,6 +213,8 @@ 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_RT5631)	+= snd-soc-rt5631.o

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

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

obj-$(CONFIG_SND_SOC_RT5651)	+= snd-soc-rt5651.o

obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o

obj-$(CONFIG_SND_SOC_SIGMADSP)	+= snd-soc-sigmadsp.o

obj-$(CONFIG_SND_SOC_SI476X)	+= snd-soc-si476x.o