UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/fix/sgtl5000', 'asoc/fix/topology' and 'asoc/fix/zx' into asoc-linus

This commit is contained in:
Mark Brown 2015-07-24 16:18:22 +01:00
parent c8a075ab1e b101acfabc 2c57d47801 2dfbe9afcd
commit 996034b117
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/uapi/sound/asoc.h
View File

@ -110,7 +110,7 @@
/* /*
* Block Header. * Block Header.
* This header preceeds all object and object arrays below. * This header precedes all object and object arrays below.
*/ */
struct snd_soc_tplg_hdr { struct snd_soc_tplg_hdr {
__le32 magic; /* magic number */ __le32 magic; /* magic number */
@ -222,7 +222,7 @@ struct snd_soc_tplg_stream_config {
/* /*
* Manifest. List totals for each payload type. Not used in parsing, but will * Manifest. List totals for each payload type. Not used in parsing, but will
* be passed to the component driver before any other objects in order for any * be passed to the component driver before any other objects in order for any
* global componnent resource allocations. * global component resource allocations.
* *
* File block representation for manifest :- * File block representation for manifest :-
* +-----------------------------------+----+ * +-----------------------------------+----+

2
sound/soc/codecs/sgtl5000.h
View File

@ -275,7 +275,7 @@
#define SGTL5000_BIAS_CTRL_MASK 0x000e #define SGTL5000_BIAS_CTRL_MASK 0x000e
#define SGTL5000_BIAS_CTRL_SHIFT 1 #define SGTL5000_BIAS_CTRL_SHIFT 1
#define SGTL5000_BIAS_CTRL_WIDTH 3 #define SGTL5000_BIAS_CTRL_WIDTH 3
#define SGTL5000_SMALL_POP 0 #define SGTL5000_SMALL_POP 1
/* /*
* SGTL5000_CHIP_MIC_CTRL * SGTL5000_CHIP_MIC_CTRL

23
sound/soc/soc-topology.c
View File

@ -144,7 +144,7 @@ static const struct snd_soc_tplg_kcontrol_ops io_ops[] = {
{SND_SOC_TPLG_CTL_STROBE, snd_soc_get_strobe, {SND_SOC_TPLG_CTL_STROBE, snd_soc_get_strobe,
snd_soc_put_strobe, NULL}, snd_soc_put_strobe, NULL},
{SND_SOC_TPLG_DAPM_CTL_VOLSW, snd_soc_dapm_get_volsw, {SND_SOC_TPLG_DAPM_CTL_VOLSW, snd_soc_dapm_get_volsw,
snd_soc_dapm_put_volsw, NULL}, snd_soc_dapm_put_volsw, snd_soc_info_volsw},
{SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE, snd_soc_dapm_get_enum_double, {SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE, snd_soc_dapm_get_enum_double,
snd_soc_dapm_put_enum_double, snd_soc_info_enum_double}, snd_soc_dapm_put_enum_double, snd_soc_info_enum_double},
{SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT, snd_soc_dapm_get_enum_double, {SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT, snd_soc_dapm_get_enum_double,
@ -580,27 +580,26 @@ static int soc_tplg_init_kcontrol(struct soc_tplg *tplg,
} }
static int soc_tplg_create_tlv(struct soc_tplg *tplg, static int soc_tplg_create_tlv(struct soc_tplg *tplg,
struct snd_kcontrol_new *kc, u32 tlv_size) struct snd_kcontrol_new *kc, struct snd_soc_tplg_ctl_tlv *tplg_tlv)
{ {
struct snd_soc_tplg_ctl_tlv *tplg_tlv;
struct snd_ctl_tlv *tlv; struct snd_ctl_tlv *tlv;
int size;
if (tlv_size == 0) if (tplg_tlv->count == 0)
return 0; return 0;
tplg_tlv = (struct snd_soc_tplg_ctl_tlv *) tplg->pos; size = ((tplg_tlv->count + (sizeof(unsigned int) - 1)) &
tplg->pos += tlv_size; ~(sizeof(unsigned int) - 1));
tlv = kzalloc(sizeof(*tlv) + size, GFP_KERNEL);
tlv = kzalloc(sizeof(*tlv) + tlv_size, GFP_KERNEL);
if (tlv == NULL) if (tlv == NULL)
return -ENOMEM; return -ENOMEM;
dev_dbg(tplg->dev, " created TLV type %d size %d bytes\n", dev_dbg(tplg->dev, " created TLV type %d size %d bytes\n",
tplg_tlv->numid, tplg_tlv->size); tplg_tlv->numid, size);
tlv->numid = tplg_tlv->numid; tlv->numid = tplg_tlv->numid;
tlv->length = tplg_tlv->size; tlv->length = size;
memcpy(tlv->tlv, tplg_tlv + 1, tplg_tlv->size); memcpy(&tlv->tlv[0], tplg_tlv->data, size);
kc->tlv.p = (void *)tlv; kc->tlv.p = (void *)tlv;
return 0; return 0;
@ -773,7 +772,7 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count,
} }
/* create any TLV data */ /* create any TLV data */
soc_tplg_create_tlv(tplg, &kc, mc->hdr.tlv_size); soc_tplg_create_tlv(tplg, &kc, &mc->tlv);
/* register control here */ /* register control here */
err = soc_tplg_add_kcontrol(tplg, &kc, err = soc_tplg_add_kcontrol(tplg, &kc,

4
sound/soc/zte/zx296702-i2s.c
View File

@ -393,9 +393,9 @@ static int zx_i2s_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
zx_i2s->mapbase = res->start; zx_i2s->mapbase = res->start;
zx_i2s->reg_base = devm_ioremap_resource(&pdev->dev, res); zx_i2s->reg_base = devm_ioremap_resource(&pdev->dev, res);
if (!zx_i2s->reg_base) { if (IS_ERR(zx_i2s->reg_base)) {
dev_err(&pdev->dev, "ioremap failed!\n"); dev_err(&pdev->dev, "ioremap failed!\n");
return -EIO; return PTR_ERR(zx_i2s->reg_base);
} }
writel_relaxed(0, zx_i2s->reg_base + ZX_I2S_FIFO_CTRL); writel_relaxed(0, zx_i2s->reg_base + ZX_I2S_FIFO_CTRL);

4
sound/soc/zte/zx296702-spdif.c
View File

@ -322,9 +322,9 @@ static int zx_spdif_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
zx_spdif->mapbase = res->start; zx_spdif->mapbase = res->start;
zx_spdif->reg_base = devm_ioremap_resource(&pdev->dev, res); zx_spdif->reg_base = devm_ioremap_resource(&pdev->dev, res);
if (!zx_spdif->reg_base) { if (IS_ERR(zx_spdif->reg_base)) {
dev_err(&pdev->dev, "ioremap failed!\n"); dev_err(&pdev->dev, "ioremap failed!\n");
return -EIO; return PTR_ERR(zx_spdif->reg_base);
} }
zx_spdif_dev_init(zx_spdif->reg_base); zx_spdif_dev_init(zx_spdif->reg_base);