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

Commit 28becbd5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/ssm4567' into asoc-next

parents cb42e0f7 dbe71b9d

include/sound/rt298.h

0 → 100644
+20 −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_RT298_H

#define __LINUX_SND_RT298_H



struct rt298_platform_data {

	bool cbj_en; /*combo jack enable*/

	bool gpio2_en; /*GPIO2 enable*/

	bool suspend_power_off; /* power is off during suspend */

};



#endif

sound/soc/codecs/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_PCM512x_I2C if I2C

	select SND_SOC_PCM512x_SPI if SPI_MASTER

	select SND_SOC_RT286 if I2C

	select SND_SOC_RT298 if I2C

	select SND_SOC_RT5631 if I2C

	select SND_SOC_RT5640 if I2C

	select SND_SOC_RT5645 if I2C
@@ -512,12 +513,18 @@ config SND_SOC_RL6231 
config SND_SOC_RL6347A

	tristate

	default y if SND_SOC_RT286=y

	default y if SND_SOC_RT298=y

	default m if SND_SOC_RT286=m

	default m if SND_SOC_RT298=m



config SND_SOC_RT286

	tristate

	depends on I2C



config SND_SOC_RT298

	tristate

	depends on I2C



config SND_SOC_RT5631

	tristate "Realtek ALC5631/RT5631 CODEC"

	depends on I2C

sound/soc/codecs/Makefile

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

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

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

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

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

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

snd-soc-rt5645-objs := rt5645.o
@@ -266,6 +267,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o 
obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o

obj-$(CONFIG_SND_SOC_RL6347A)	+= snd-soc-rl6347a.o

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

obj-$(CONFIG_SND_SOC_RT298)	+= snd-soc-rt298.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

sound/soc/codecs/adau1373.c

+0 −1
Original line number Diff line number Diff line
@@ -1534,7 +1534,6 @@ MODULE_DEVICE_TABLE(i2c, adau1373_i2c_id); 
static struct i2c_driver adau1373_i2c_driver = {

	.driver = {

		.name = "adau1373",

		.owner = THIS_MODULE,

	},

	.probe = adau1373_i2c_probe,

	.remove = adau1373_i2c_remove,

sound/soc/codecs/adau1701.c

+0 −1
Original line number Diff line number Diff line
@@ -915,7 +915,6 @@ MODULE_DEVICE_TABLE(i2c, adau1701_i2c_id); 
static struct i2c_driver adau1701_i2c_driver = {

	.driver = {

		.name	= "adau1701",

		.owner	= THIS_MODULE,

		.of_match_table	= of_match_ptr(adau1701_dt_ids),

	},

	.probe		= adau1701_i2c_probe,