Merge remote-tracking branch 'asoc/topic/core' into asoc-next
This commit is contained in:
commit
6439e5c2a7
|
@ -214,7 +214,7 @@ struct snd_soc_dai_driver {
|
|||
int (*suspend)(struct snd_soc_dai *dai);
|
||||
int (*resume)(struct snd_soc_dai *dai);
|
||||
/* compress dai */
|
||||
bool compress_dai;
|
||||
int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num);
|
||||
/* DAI is also used for the control bus */
|
||||
bool bus_control;
|
||||
|
||||
|
|
|
@ -452,7 +452,9 @@ int snd_soc_platform_read(struct snd_soc_platform *platform,
|
|||
int snd_soc_platform_write(struct snd_soc_platform *platform,
|
||||
unsigned int reg, unsigned int val);
|
||||
int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);
|
||||
int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num);
|
||||
#ifdef CONFIG_SND_SOC_COMPRESS
|
||||
int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num);
|
||||
#endif
|
||||
|
||||
struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,
|
||||
const char *dai_link, int stream);
|
||||
|
@ -605,7 +607,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
|
|||
struct snd_ctl_elem_value *ucontrol);
|
||||
int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol);
|
||||
int snd_soc_limit_volume(struct snd_soc_codec *codec,
|
||||
int snd_soc_limit_volume(struct snd_soc_card *card,
|
||||
const char *name, int max);
|
||||
int snd_soc_bytes_info(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo);
|
||||
|
|
|
@ -9,7 +9,6 @@ menuconfig SND_SOC
|
|||
select SND_JACK if INPUT=y || INPUT=SND
|
||||
select REGMAP_I2C if I2C
|
||||
select REGMAP_SPI if SPI_MASTER
|
||||
select SND_COMPRESS_OFFLOAD
|
||||
---help---
|
||||
|
||||
If you want ASoC support, you should say Y here and also to the
|
||||
|
@ -30,6 +29,10 @@ config SND_SOC_GENERIC_DMAENGINE_PCM
|
|||
bool
|
||||
select SND_DMAENGINE_PCM
|
||||
|
||||
config SND_SOC_COMPRESS
|
||||
bool
|
||||
select SND_COMPRESS_OFFLOAD
|
||||
|
||||
config SND_SOC_TOPOLOGY
|
||||
bool
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
|
||||
snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o
|
||||
snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o
|
||||
snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o
|
||||
|
||||
ifneq ($(CONFIG_SND_SOC_TOPOLOGY),)
|
||||
snd-soc-core-objs += soc-topology.o
|
||||
|
|
|
@ -12,6 +12,7 @@ config SND_MFLD_MACHINE
|
|||
|
||||
config SND_SST_MFLD_PLATFORM
|
||||
tristate
|
||||
select SND_SOC_COMPRESS
|
||||
|
||||
config SND_SST_IPC
|
||||
tristate
|
||||
|
|
|
@ -512,7 +512,7 @@ static struct snd_soc_dai_driver sst_platform_dai[] = {
|
|||
},
|
||||
{
|
||||
.name = "compress-cpu-dai",
|
||||
.compress_dai = 1,
|
||||
.compress_new = snd_soc_new_compress,
|
||||
.ops = &sst_compr_dai_ops,
|
||||
.playback = {
|
||||
.stream_name = "Compress Playback",
|
||||
|
|
|
@ -297,7 +297,7 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
|
|||
dev_err(card->dev, "Failed to add TPA6130A2 controls\n");
|
||||
return err;
|
||||
}
|
||||
snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);
|
||||
snd_soc_limit_volume(card, "TPA6130A2 Headphone Playback Volume", 42);
|
||||
|
||||
err = omap_mcbsp_st_add_controls(rtd, 2);
|
||||
if (err < 0) {
|
||||
|
|
|
@ -612,8 +612,15 @@ static struct snd_compr_ops soc_compr_dyn_ops = {
|
|||
.get_codec_caps = soc_compr_get_codec_caps
|
||||
};
|
||||
|
||||
/* create a new compress */
|
||||
int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
|
||||
/**
|
||||
* snd_soc_new_compress - create a new compress.
|
||||
*
|
||||
* @rtd: The runtime for which we will create compress
|
||||
* @num: the device index number (zero based - shared with normal PCMs)
|
||||
*
|
||||
* Return: 0 for success, else error.
|
||||
*/
|
||||
int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_platform *platform = rtd->platform;
|
||||
|
@ -703,3 +710,4 @@ compr_err:
|
|||
kfree(compr);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_new_compress);
|
||||
|
|
|
@ -1370,9 +1370,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
|
|||
soc_dpcm_debugfs_add(rtd);
|
||||
#endif
|
||||
|
||||
if (cpu_dai->driver->compress_dai) {
|
||||
if (cpu_dai->driver->compress_new) {
|
||||
/*create compress_device"*/
|
||||
ret = soc_new_compress(rtd, num);
|
||||
ret = cpu_dai->driver->compress_new(rtd, num);
|
||||
if (ret < 0) {
|
||||
dev_err(card->dev, "ASoC: can't create compress %s\n",
|
||||
dai_link->stream_name);
|
||||
|
|
|
@ -588,16 +588,16 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range);
|
|||
/**
|
||||
* snd_soc_limit_volume - Set new limit to an existing volume control.
|
||||
*
|
||||
* @codec: where to look for the control
|
||||
* @card: where to look for the control
|
||||
* @name: Name of the control
|
||||
* @max: new maximum limit
|
||||
*
|
||||
* Return 0 for success, else error.
|
||||
*/
|
||||
int snd_soc_limit_volume(struct snd_soc_codec *codec,
|
||||
int snd_soc_limit_volume(struct snd_soc_card *card,
|
||||
const char *name, int max)
|
||||
{
|
||||
struct snd_card *card = codec->component.card->snd_card;
|
||||
struct snd_card *snd_card = card->snd_card;
|
||||
struct snd_kcontrol *kctl;
|
||||
struct soc_mixer_control *mc;
|
||||
int found = 0;
|
||||
|
@ -607,7 +607,7 @@ int snd_soc_limit_volume(struct snd_soc_codec *codec,
|
|||
if (unlikely(!name || max <= 0))
|
||||
return -EINVAL;
|
||||
|
||||
list_for_each_entry(kctl, &card->controls, list) {
|
||||
list_for_each_entry(kctl, &snd_card->controls, list) {
|
||||
if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name))) {
|
||||
found = 1;
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue