June 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v3 1/3] ASoC: topology: Add topology UAPI header
by Liam Girdwood 03 Jun '15

03 Jun '15

The ASoC topology UAPI header defines the structures required to define any DSP firmware audio topology and control objects from userspace. The following objects are supported :- o kcontrols including TLV controls. o DAPM widgets and graph elements o Vendor bespoke objects. o Coefficient data o FE PCM capabilities and config. o BE link capabilities and config. o Codec <-> codec link capabilities and config. o Topology object manifest. The file format is simple and divided into blocks for each object type and each block has a header that defines it's size and type. Blocks can be in any order of type and can either all be in a single file or spread across more than one file. Blocks also have a group identifier ID so that they can be loaded and unloaded by ID. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc-dapm.h | 1 + include/uapi/sound/asoc.h | 388 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 389 insertions(+) create mode 100644 include/uapi/sound/asoc.h diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 1065095..6f440b2 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -15,6 +15,7 @@ #include <linux/types.h> #include <sound/control.h> +#include <sound/asoc.h> struct device; diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h new file mode 100644 index 0000000..1221520 --- /dev/null +++ b/include/uapi/sound/asoc.h @@ -0,0 +1,388 @@ +/* + * uapi/sound/asoc.h -- ALSA SoC Firmware Controls and DAPM + * + * Copyright (C) 2012 Texas Instruments Inc. + * Copyright (C) 2015 Intel Corporation. + * + * 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. + * + * Simple file API to load FW that includes mixers, coefficients, DAPM graphs, + * algorithms, equalisers, DAIs, widgets etc. +*/ + +#ifndef __LINUX_UAPI_SND_ASOC_H +#define __LINUX_UAPI_SND_ASOC_H + +#include <linux/types.h> +#include <sound/asound.h> + +/* + * Maximum number of channels topology kcontrol can represent. + */ +#define SND_SOC_TPLG_MAX_CHAN 8 + +/* + * Maximum number of PCM formats capability + */ +#define SND_SOC_TPLG_MAX_FORMATS 16 + +/* + * Maximum number of PCM stream configs + */ +#define SND_SOC_TPLG_STREAM_CONFIG_MAX 8 + +/* individual kcontrol info types - can be mixed with other types */ +#define SND_SOC_TPLG_CTL_VOLSW 1 +#define SND_SOC_TPLG_CTL_VOLSW_SX 2 +#define SND_SOC_TPLG_CTL_VOLSW_XR_SX 3 +#define SND_SOC_TPLG_CTL_ENUM 4 +#define SND_SOC_TPLG_CTL_BYTES 5 +#define SND_SOC_TPLG_CTL_ENUM_VALUE 6 +#define SND_SOC_TPLG_CTL_RANGE 7 +#define SND_SOC_TPLG_CTL_STROBE 8 + + +/* individual widget kcontrol info types - can be mixed with other types */ +#define SND_SOC_TPLG_DAPM_CTL_VOLSW 64 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE 65 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT 66 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE 67 +#define SND_SOC_TPLG_DAPM_CTL_PIN 68 + +/* DAPM widget types - add new items to the end */ +#define SND_SOC_TPLG_DAPM_INPUT 0 +#define SND_SOC_TPLG_DAPM_OUTPUT 1 +#define SND_SOC_TPLG_DAPM_MUX 2 +#define SND_SOC_TPLG_DAPM_MIXER 3 +#define SND_SOC_TPLG_DAPM_PGA 4 +#define SND_SOC_TPLG_DAPM_OUT_DRV 5 +#define SND_SOC_TPLG_DAPM_ADC 6 +#define SND_SOC_TPLG_DAPM_DAC 7 +#define SND_SOC_TPLG_DAPM_SWITCH 8 +#define SND_SOC_TPLG_DAPM_PRE 9 +#define SND_SOC_TPLG_DAPM_POST 10 +#define SND_SOC_TPLG_DAPM_AIF_IN 11 +#define SND_SOC_TPLG_DAPM_AIF_OUT 12 +#define SND_SOC_TPLG_DAPM_DAI_IN 13 +#define SND_SOC_TPLG_DAPM_DAI_OUT 14 +#define SND_SOC_TPLG_DAPM_DAI_LINK 15 +#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK + +/* Header magic number and string sizes */ +#define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */ + +/* string sizes */ +#define SND_SOC_TPLG_NUM_TEXTS 16 + +/* ABI version */ +#define SND_SOC_TPLG_ABI_VERSION 0x2 + +/* Max size of TLV data */ +#define SND_SOC_TPLG_TLV_SIZE 32 + +/* + * File and Block header data types. + * Add new generic and vendor types to end of list. + * Generic types are handled by the core whilst vendors types are passed + * to the component drivers for handling. + */ +#define SND_SOC_TPLG_TYPE_MIXER 1 +#define SND_SOC_TPLG_TYPE_BYTES 2 +#define SND_SOC_TPLG_TYPE_ENUM 3 +#define SND_SOC_TPLG_TYPE_DAPM_GRAPH 4 +#define SND_SOC_TPLG_TYPE_DAPM_WIDGET 5 +#define SND_SOC_TPLG_TYPE_DAI_LINK 6 +#define SND_SOC_TPLG_TYPE_PCM 7 +#define SND_SOC_TPLG_TYPE_MANIFEST 8 +#define SND_SOC_TPLG_TYPE_CODEC_LINK 9 +#define SND_SOC_TPLG_TYPE_MAX SND_SOC_TPLG_TYPE_CODEC_LINK + +/* vendor block IDs - please add new vendor types to end */ +#define SND_SOC_TPLG_TYPE_VENDOR_FW 1000 +#define SND_SOC_TPLG_TYPE_VENDOR_CONFIG 1001 +#define SND_SOC_TPLG_TYPE_VENDOR_COEFF 1002 +#define SND_SOC_TPLG_TYPEVENDOR_CODEC 1003 + +#define SND_SOC_TPLG_STREAM_PLAYBACK 0 +#define SND_SOC_TPLG_STREAM_CAPTURE 1 + +/* + * Block Header. + * This header preceeds all object and object arrays below. + */ +struct snd_soc_tplg_hdr { + __le32 magic; /* magic number */ + __le32 abi; /* ABI version */ + __le32 version; /* optional vendor specific version details */ + __le32 type; /* SND_SOC_TPLG_TYPE_ */ + __le32 size; /* size of this structure */ + __le32 vendor_type; /* optional vendor specific type info */ + __le32 payload_size; /* data bytes, excluding this header */ + __le32 index; /* identifier for block */ + __le32 count; /* number of elements in block */ +} __attribute__((packed)); + +/* + * Private data. + * All topology objects may have private data that can be used by the driver or + * firmware. Core will ignore this data. + */ +struct snd_soc_tplg_private { + __le32 size; /* in bytes of private data */ + char data[0]; +} __attribute__((packed)); + +/* + * Kcontrol TLV data. + */ +struct snd_soc_tplg_ctl_tlv { + __le32 size; /* in bytes aligned to 4 */ + __le32 numid; /* control element numeric identification */ + __le32 count; /* number of elem in data array */ + __le32 data[SND_SOC_TPLG_TLV_SIZE]; +} __attribute__((packed)); + +/* + * Kcontrol channel data + */ +struct snd_soc_tplg_channel { + __le32 size; /* in bytes of this structure */ + __le32 reg; + __le32 shift; + __le32 id; /* ID maps to Left, Right, LFE etc */ +} __attribute__((packed)); + +/* + * Kcontrol Operations IDs + */ +struct snd_soc_tplg_kcontrol_ops_id { + __le32 get; + __le32 put; + __le32 info; +} __attribute__((packed)); + +/* + * kcontrol header + */ +struct snd_soc_tplg_ctl_hdr { + __le32 size; /* in bytes of this structure */ + __le32 type; + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 access; + struct snd_soc_tplg_kcontrol_ops_id ops; + __le32 tlv_size; /* non zero means control has TLV data */ +} __attribute__((packed)); + +/* + * Stream Capabilities + */ +struct snd_soc_tplg_stream_caps { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le64 formats[SND_SOC_TPLG_MAX_FORMATS]; /* supported formats SNDRV_PCM_FMTBIT_* */ + __le32 rates; /* supported rates SNDRV_PCM_RATE_* */ + __le32 rate_min; /* min rate */ + __le32 rate_max; /* max rate */ + __le32 channels_min; /* min channels */ + __le32 channels_max; /* max channels */ + __le32 periods_min; /* min number of periods */ + __le32 periods_max; /* max number of periods */ + __le32 period_size_min; /* min period size bytes */ + __le32 period_size_max; /* max period size bytes */ + __le32 buffer_size_min; /* min buffer size bytes */ + __le32 buffer_size_max; /* max buffer size bytes */ +} __attribute__((packed)); + +/* + * FE or BE Stream configuration supported by SW/FW + */ +struct snd_soc_tplg_stream { + __le32 size; /* in bytes of this structure */ + __le64 format; /* SNDRV_PCM_FMTBIT_* */ + __le32 rate; /* SNDRV_PCM_RATE_* */ + __le32 period_bytes; /* size of period in bytes */ + __le32 buffer_bytes; /* size of buffer in bytes */ + __le32 channels; /* channels */ + __le32 tdm_slot; /* optional BE bitmask of supported TDM slots */ + __le32 dai_fmt; /* SND_SOC_DAIFMT_ */ +} __attribute__((packed)); + +/* + * Duplex stream configuration supported by SW/FW. + */ +struct snd_soc_tplg_stream_config { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + struct snd_soc_tplg_stream playback; + struct snd_soc_tplg_stream capture; +} __attribute__((packed)); + +/* + * 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 + * global componnent resource allocations. + * + * File block representation for manifest :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_manifest | 1 | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_manifest { + __le32 size; /* in bytes of this structure */ + __le32 control_elems; /* number of control elements */ + __le32 widget_elems; /* number of widget elements */ + __le32 graph_elems; /* number of graph elements */ + __le32 dai_elems; /* number of DAI elements */ + __le32 dai_link_elems; /* number of DAI link elements */ +} __attribute__((packed)); + +/* + * Mixer kcontrol. + * + * File block representation for mixer kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_mixer_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_mixer_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 min; + __le32 max; + __le32 platform_max; + __le32 invert; + __le32 num_channels; + struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN]; + struct snd_soc_tplg_ctl_tlv tlv; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Enumerated kcontrol + * + * File block representation for enum kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_enum_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_enum_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 num_channels; + struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN]; + __le32 items; + __le32 mask; + __le32 count; + char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 values[SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN / 4]; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Bytes kcontrol + * + * File block representation for bytes kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_bytes_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_bytes_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 max; + __le32 mask; + __le32 base; + __le32 num_regs; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * DAPM Graph Element + * + * File block representation for DAPM graph elements :- + * +-------------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-------------------------------------+----+ + * | struct snd_soc_tplg_dapm_graph_elem | N | + * +-------------------------------------+----+ + */ +struct snd_soc_tplg_dapm_graph_elem { + char sink[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char control[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char source[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; +} __attribute__((packed)); + +/* + * DAPM Widget. + * + * File block representation for DAPM widget :- + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_dapm_widget | N | + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_enum_control | 0|1 | + * | struct snd_soc_tplg_mixer_control | 0|N | + * +-------------------------------------+-----+ + * + * Optional enum or mixer control can be appended to the end of each widget + * in the block. + */ +struct snd_soc_tplg_dapm_widget { + __le32 size; /* in bytes of this structure */ + __le32 id; /* SND_SOC_DAPM_CTL */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char sname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + __le32 reg; /* negative reg = no direct dapm */ + __le32 shift; /* bits to shift */ + __le32 mask; /* non-shifted mask */ + __u32 invert; /* invert the power bit */ + __u32 ignore_suspend; /* kept enabled over suspend */ + __u16 event_flags; + __u16 event_type; + __u16 num_kcontrols; + struct snd_soc_tplg_private priv; + /* + * kcontrols that relate to this widget + * follow here after widget private data + */ +} __attribute__((packed)); + +struct snd_soc_tplg_pcm_cfg_caps { + struct snd_soc_tplg_stream_caps caps; + struct snd_soc_tplg_stream_config configs[SND_SOC_TPLG_STREAM_CONFIG_MAX]; + __le32 num_configs; /* number of configs */ +} __attribute__((packed)); + +/* + * Describes SW/FW specific features of PCM or DAI link. + * + * File block representation for PCM/DAI-Link :- + * +-----------------------------------+-----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+-----+ + * | struct snd_soc_tplg_dapm_pcm_dai | N | + * +-----------------------------------+-----+ + */ +struct snd_soc_tplg_pcm_dai { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 id; /* unique ID - used to match */ + __le32 playback; /* supports playback mode */ + __le32 capture; /* supports capture mode */ + __le32 compress; /* 1 = compressed; 0 = PCM */ + struct snd_soc_tplg_pcm_cfg_caps capconf[2]; /* capabilities and configs */ +} __attribute__((packed)); + +#endif -- 2.1.4

3 5

[alsa-devel] [PATCH] ASoC: fsl: Correct FSL_SAI_CR2_MSEL_MASK definition
by Takashi Iwai 03 Jun '15

03 Jun '15

The bit mask FSL_SAI_CR2_MSEL_MASK is defined as (0xff << 26) and this obviously overflows the 32bit integer. Also this clears other bits than the needed ones (FSL_SAI_CR2_MSEL_XXX) wrongly. This patch fixes the definition only to mask bits 26 and 27. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=84351 Reported-by: David Binderman <dcb314(a)hotmail.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/fsl/fsl_sai.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 34667209b607..0e33a17ddd01 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -72,7 +72,7 @@ /* SAI Transmit and Recieve Configuration 2 Register */ #define FSL_SAI_CR2_SYNC BIT(30) -#define FSL_SAI_CR2_MSEL_MASK (0xff << 26) +#define FSL_SAI_CR2_MSEL_MASK (0x03 << 26) #define FSL_SAI_CR2_MSEL_BUS 0 #define FSL_SAI_CR2_MSEL_MCLK1 BIT(26) #define FSL_SAI_CR2_MSEL_MCLK2 BIT(27) -- 2.4.2

2 2

[alsa-devel] simple-audio-card with omap4-dmic
by Jack Mitchell 03 Jun '15

03 Jun '15

I'm currently working with a PandaBoard clone (OMAP44xx) which doesn't have the usual twl6040 codec, however I would like to attach a digital microphone directly into the OMAP. I have added the following to my device tree: sound { compatible = "simple-audio-card"; simple-audio-card,name = "dmic-card"; simple-audio-card,format = "pdm"; status = "okay"; simple-audio-card,dai-link@0 { cpu { sound-dai = <&dmic>; }; codec { sound-dai = <&dmic_codec>; }; }; }; dmic_codec: dmic_codec { #sound-dai-cells = <0>; compatible = "linux,dmic-codec"; }; and created a small patch to allow the generic dmic-hifi codec to be instantiated from device tree. diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index fde5325..67b9198 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -69,11 +69,18 @@ static int dmic_dev_remove(struct platform_device *pdev) return 0; } -MODULE_ALIAS("platform:dmic-codec"); +#ifdef CONFIG_OF +static const struct of_device_id dmic_dt_ids[] = { + { .compatible = "linux,dmic-codec", }, + { } +}; +MODULE_DEVICE_TABLE(of, dmic_dt_ids); +#endif static struct platform_driver dmic_driver = { .driver = { .name = "dmic-codec", + .of_match_table = of_match_ptr(dmic_dt_ids), }, .probe = dmic_dev_probe, .remove = dmic_dev_remove, @@ -81,6 +88,7 @@ static struct platform_driver dmic_driver = { module_platform_driver(dmic_driver); +MODULE_ALIAS("platform:dmic-codec"); MODULE_DESCRIPTION("Generic DMIC driver"); MODULE_AUTHOR("Liam Girdwood <lrg(a)slimlogic.co.uk>"); MODULE_LICENSE("GPL"); However, no soundcards get loaded, and I don't get error or warnings in dmesg, so I'm at a bit of a loss at where I'm going wrong. Can anybody see any glaring mistakes? I know the driver is definitely getting loaded as I have seen errors relating to me not specifying the sound-dai-cells from the simple-audio-card driver. Any ideas would be greatly recieved! Cheers,

1 1

[alsa-devel] [PATCH v2 1/2] ASoC: rt5645: change gpio to gpiod APIs
by Bard Liao 03 Jun '15

03 Jun '15

Move gpio to gpio_desc and use gpiod APIs in codec driver. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- include/sound/rt5645.h | 3 --- sound/soc/codecs/rt5645.c | 47 +++++++++++++---------------------------------- sound/soc/codecs/rt5645.h | 1 + 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index 652cb9e..22734bc 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h @@ -20,9 +20,6 @@ struct rt5645_platform_data { unsigned int dmic2_data_pin; /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */ - unsigned int hp_det_gpio; - bool gpio_hp_det_active_high; - unsigned int jd_mode; }; diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index aaede45..0cb4942 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2938,17 +2938,11 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645) switch (rt5645->pdata.jd_mode) { case 0: /* Not using rt5645 JD */ - if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) { - gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); - dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n", - rt5645->pdata.hp_det_gpio, gpio_state); - } - if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || - (!rt5645->pdata.gpio_hp_det_active_high && - !gpio_state)) { - report = rt5645_jack_detect(rt5645->codec, 1); - } else { - report = rt5645_jack_detect(rt5645->codec, 0); + if (rt5645->gpiod_hp_det) { + gpio_state = gpiod_get_value(rt5645->gpiod_hp_det); + dev_dbg(rt5645->codec->dev, "gpio_state = %d\n", + gpio_state); + report = rt5645_jack_detect(rt5645->codec, gpio_state); } snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE); @@ -3253,19 +3247,17 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, } else { if (dmi_check_system(dmi_platform_intel_braswell)) { rt5645->pdata = *rt5645_pdata; - gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); - - if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) { - rt5645->pdata.hp_det_gpio = -1; - dev_err(&i2c->dev, "failed to initialize gpiod\n"); - } else { - rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod); - rt5645->pdata.gpio_hp_det_active_high - = !gpiod_is_active_low(gpiod); - } } } + rt5645->gpiod_hp_det = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); + + if (IS_ERR(rt5645->gpiod_hp_det) || + gpiod_direction_input(rt5645->gpiod_hp_det)) { + rt5645->gpiod_hp_det = NULL; + dev_err(&i2c->dev, "failed to initialize gpiod\n"); + } + rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap); if (IS_ERR(rt5645->regmap)) { ret = PTR_ERR(rt5645->regmap); @@ -3425,16 +3417,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret); } - if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) { - ret = gpio_request(rt5645->pdata.hp_det_gpio, "rt5645"); - if (ret) - dev_err(&i2c->dev, "Fail gpio_request hp_det_gpio\n"); - - ret = gpio_direction_input(rt5645->pdata.hp_det_gpio); - if (ret) - dev_err(&i2c->dev, "Fail gpio_direction hp_det_gpio\n"); - } - INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work); return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645, @@ -3450,9 +3432,6 @@ static int rt5645_i2c_remove(struct i2c_client *i2c) cancel_delayed_work_sync(&rt5645->jack_detect_work); - if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) - gpio_free(rt5645->pdata.hp_det_gpio); - snd_soc_unregister_codec(&i2c->dev); return 0; diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index 9ec4e89..0353a6a 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -2182,6 +2182,7 @@ struct rt5645_priv { struct rt5645_platform_data pdata; struct regmap *regmap; struct i2c_client *i2c; + struct gpio_desc *gpiod_hp_det; struct snd_soc_jack *hp_jack; struct snd_soc_jack *mic_jack; struct snd_soc_jack *btn_jack; -- 1.8.1.1.439.g50a6b54

4 8

[alsa-devel] [PATCH] ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)
by Clemens Ladisch 03 Jun '15

03 Jun '15

The driver worked around an error in the MAYA44 USB(+)'s mixer unit descriptor by aborting before parsing the missing field. However, aborting parsing too early prevented parsing of the other units connected to this unit, so the capture mixer controls would be missing. Fix this by moving the check for this descriptor error after the parsing of the unit's input pins. Reported-by: nightmixes <nightmixes(a)gmail.com> Tested-by: nightmixes <nightmixes(a)gmail.com> Signed-off-by: Clemens Ladisch <clemens(a)ladisch.de> --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1583,18 +1583,15 @@ static int parse_audio_mixer_unit(struct unitid); return -EINVAL; } - /* no bmControls field (e.g. Maya44) -> ignore */ - if (desc->bLength <= 10 + input_pins) { - usb_audio_dbg(state->chip, "MU %d has no bmControls field\n", - unitid); - return 0; - } num_ins = 0; ich = 0; for (pin = 0; pin < input_pins; pin++) { err = parse_audio_unit(state, desc->baSourceID[pin]); if (err < 0) + continue; + /* no bmControls field (e.g. Maya44) -> ignore */ + if (desc->bLength <= 10 + input_pins) continue; err = check_input_term(state, desc->baSourceID[pin], &iterm); if (err < 0)

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: add MAYA44 USB+ mixer control names
by Clemens Ladisch 03 Jun '15

03 Jun '15

Add mixer control names for the ESI Maya44 USB+ (which appears to be identical width the AudioTrak Maya44 USB). Reported-by: nightmixes <nightmixes(a)gmail.com> Signed-off-by: Clemens Ladisch <clemens(a)ladisch.de> --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -437,6 +437,11 @@ static struct usbmix_ctl_map usbmix_ctl_ .map = ebox44_map, }, { + /* MAYA44 USB+ */ + .id = USB_ID(0x2573, 0x0008), + .map = maya44_map, + }, + { /* KEF X300A */ .id = USB_ID(0x27ac, 0x1000), .map = scms_usb3318_map,

2 1

[alsa-devel] [PATCH v5 0/2] Add HDA codec match and new registers
by Vinod Koul 03 Jun '15

03 Jun '15

This series is split from SKL driver series and adds default codec match function and then the new HDA registers definitions added in SKL Jeeja KP (1): ALSA: hda - add new HDA registers Vinod Koul (1): ALSA: hda - add HDA default codec match function include/sound/hda_register.h | 88 ++++++++++++++++++++++++++++++++++++++++++++ include/sound/hdaudio.h | 14 +++++++ sound/hda/hda_bus_type.c | 41 +++++++++++++++++++++ 3 files changed, 143 insertions(+) -- 1.9.1

2 3

[alsa-devel] [PATCH 0/5] OMAPDSS: HDMI audio compliance fixes
by Jyri Sarha 03 Jun '15

03 Jun '15

I have rebased these patches from ti-linux-3.14.y on top of Linux 4.0.0. I tested them briefly on OMAP4 and OMAP5 in my environment, but I could not test any channel count beyond stereo. However, there were no conflicts in the rebase and each fix makes sense when looking at the chip TRM and the relevant HDMI specs. All the changes are really minor, but most of them apply to OMAPDSS side, so it is probably best to merge them trough there. Best regards, Jyri Misael Lopez Cruz (5): OMAPDSS: HDMI4: Set correct CC for 8-channels layout OMAPDSS: HDMI5: Set valid sample order OMAPDSS: HDMI5: Fix AUDICONF3 bitfield offsets ASoC: omap-hdmi-audio: Force channel allocation only for OMAP4 ASoC: omap-hdmi-audio: Fix invalid combination of DM_INH and CA drivers/video/fbdev/omap2/dss/hdmi4_core.c | 12 +++++++++++- drivers/video/fbdev/omap2/dss/hdmi5_core.c | 5 ++++- sound/soc/omap/omap-hdmi-audio.c | 12 +++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) -- 1.9.1

3 8

[alsa-devel] [PATCH v2] ASoC: qcom: Remove QCOM dependency from LPASS variants
by Kenneth Westfield 03 Jun '15

03 Jun '15

From: Kenneth Westfield <kwestfie(a)codeaurora.org> Building with the following config options ... CONFIG_COMPILE_TEST=y # CONFIG_SND_SOC_QCOM is not set CONFIG_SND_SOC_LPASS_IPQ806X=m CONFIG_SND_SOC_STORM=m ... causes the following build warning: warning: (SND_SOC_STORM) selects SND_SOC_LPASS_IPQ806X which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && SND_SOC_QCOM) To fix this, the dependency on SND_SOC_QCOM from the user-invisible LPASS variant config options has been removed. This will allow for successful randconfig builds that use COMPILE_TEST. Reported-by: Jim Davis <jim.epost(a)gmail.com> Fixes: dc1ebd1811e9 ("ASoC: qcom: Add apq8016 lpass driver support") Fixes: 9bae4880acee ("ASoC: qcom: move ipq806x specific bits out of lpass driver") Signed-off-by: Kenneth Westfield <kwestfie(a)codeaurora.org> --- Created fix in response to Jim's bug report: http://mailman.alsa-project.org/pipermail/alsa-devel/2015-May/092870.html sound/soc/qcom/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 938144c..290b056 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -14,13 +14,11 @@ config SND_SOC_LPASS_PLATFORM config SND_SOC_LPASS_IPQ806X tristate - depends on SND_SOC_QCOM select SND_SOC_LPASS_CPU select SND_SOC_LPASS_PLATFORM config SND_SOC_LPASS_APQ8016 tristate - depends on SND_SOC_QCOM select SND_SOC_LPASS_CPU select SND_SOC_LPASS_PLATFORM -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

2 1

[alsa-devel] [asoc:topic/arizona 1/7] sound/soc/codecs/arizona.h:122:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS'
by kbuild test robot 03 Jun '15

03 Jun '15

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/arizona head: 69a6582eeb17dc083b2510f1ca2eaa54ff679b49 commit: 21a37e39e02d7f57691219fee88cf1d48a74e5bd [1/7] ASoC: arizona: Use auto disable muxes for routing config: xtensa-allyesconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/m… -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 21a37e39e02d7f57691219fee88cf1d48a74e5bd # save the attached .config to linux build tree make.cross ARCH=xtensa All error/warnings: In file included from sound/soc/codecs/wm5102.c:33:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ >> sound/soc/codecs/arizona.h:122:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in1, base_reg); \ ^ >> sound/soc/codecs/wm5102.c:943:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm5102.c:943:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm5102.c:24: >> sound/soc/codecs/wm5102.c:943:21: error: 'EQ1_in1_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ >> sound/soc/codecs/arizona.h:122:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in1, base_reg); \ ^ >> sound/soc/codecs/wm5102.c:943:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm5102.c:33:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ sound/soc/codecs/arizona.h:123:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in2, base_reg + 2); \ ^ >> sound/soc/codecs/wm5102.c:943:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm5102.c:943:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm5102.c:24: >> sound/soc/codecs/wm5102.c:943:21: error: 'EQ1_in2_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ sound/soc/codecs/arizona.h:123:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in2, base_reg + 2); \ ^ >> sound/soc/codecs/wm5102.c:943:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm5102.c:33:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ sound/soc/codecs/arizona.h:124:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in3, base_reg + 4); \ ^ >> sound/soc/codecs/wm5102.c:943:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm5102.c:943:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm5102.c:24: >> sound/soc/codecs/wm5102.c:943:21: error: 'EQ1_in3_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ sound/soc/codecs/arizona.h:124:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in3, base_reg + 4); \ ^ >> sound/soc/codecs/wm5102.c:943:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm5102.c:33:0: -- In file included from sound/soc/codecs/wm5110.c:32:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ >> sound/soc/codecs/arizona.h:122:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in1, base_reg); \ ^ >> sound/soc/codecs/wm5110.c:470:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm5110.c:470:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm5110.c:24: >> sound/soc/codecs/wm5110.c:470:21: error: 'EQ1_in1_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ >> sound/soc/codecs/arizona.h:122:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in1, base_reg); \ ^ >> sound/soc/codecs/wm5110.c:470:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm5110.c:32:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ sound/soc/codecs/arizona.h:123:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in2, base_reg + 2); \ ^ >> sound/soc/codecs/wm5110.c:470:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm5110.c:470:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm5110.c:24: >> sound/soc/codecs/wm5110.c:470:21: error: 'EQ1_in2_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ sound/soc/codecs/arizona.h:123:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in2, base_reg + 2); \ ^ >> sound/soc/codecs/wm5110.c:470:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm5110.c:32:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ sound/soc/codecs/arizona.h:124:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in3, base_reg + 4); \ ^ >> sound/soc/codecs/wm5110.c:470:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm5110.c:470:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm5110.c:24: >> sound/soc/codecs/wm5110.c:470:21: error: 'EQ1_in3_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ sound/soc/codecs/arizona.h:124:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in3, base_reg + 4); \ ^ >> sound/soc/codecs/wm5110.c:470:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm5110.c:32:0: -- In file included from sound/soc/codecs/wm8997.c:32:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ >> sound/soc/codecs/arizona.h:122:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in1, base_reg); \ ^ >> sound/soc/codecs/wm8997.c:333:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm8997.c:333:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm8997.c:24: >> sound/soc/codecs/wm8997.c:333:21: error: 'EQ1_in1_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ >> sound/soc/codecs/arizona.h:122:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in1, base_reg); \ ^ >> sound/soc/codecs/wm8997.c:333:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm8997.c:32:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ sound/soc/codecs/arizona.h:123:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in2, base_reg + 2); \ ^ >> sound/soc/codecs/wm8997.c:333:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm8997.c:333:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm8997.c:24: >> sound/soc/codecs/wm8997.c:333:21: error: 'EQ1_in2_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ sound/soc/codecs/arizona.h:123:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in2, base_reg + 2); \ ^ >> sound/soc/codecs/wm8997.c:333:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm8997.c:32:0: >> include/linux/mfd/arizona/registers.h:646:50: error: expected ')' before numeric constant #define ARIZONA_EQ1MIX_INPUT_1_SOURCE 0x880 ^ sound/soc/codecs/arizona.h:111:9: note: in definition of macro 'ARIZONA_MUX_ENUM_DECL' name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) ^ sound/soc/codecs/arizona.h:124:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in3, base_reg + 4); \ ^ >> sound/soc/codecs/wm8997.c:333:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ >> sound/soc/codecs/wm8997.c:333:26: note: in expansion of macro 'ARIZONA_EQ1MIX_INPUT_1_SOURCE' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from include/sound/soc.h:365:0, from sound/soc/codecs/wm8997.c:24: >> sound/soc/codecs/wm8997.c:333:21: error: 'EQ1_in3_enum' undeclared here (not in a function) ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ include/sound/soc-dapm.h:298:37: note: in definition of macro 'SOC_DAPM_ENUM' .private_value = (unsigned long)&xenum } ^ >> sound/soc/codecs/arizona.h:119:9: note: in expansion of macro 'ARIZONA_MUX_CTL_DECL' static ARIZONA_MUX_CTL_DECL(name) ^ sound/soc/codecs/arizona.h:124:2: note: in expansion of macro 'ARIZONA_MUX_ENUMS' ARIZONA_MUX_ENUMS(name##_in3, base_reg + 4); \ ^ >> sound/soc/codecs/wm8997.c:333:1: note: in expansion of macro 'ARIZONA_MIXER_ENUMS' ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE); ^ In file included from sound/soc/codecs/wm8997.c:32:0: vim +/ARIZONA_MUX_ENUMS +122 sound/soc/codecs/arizona.h 07ed873e Mark Brown 2012-06-18 105 SOC_SINGLE_RANGE_TLV(name " Input 4 Volume", base + 7, \ 07ed873e Mark Brown 2012-06-18 106 ARIZONA_MIXER_VOL_SHIFT, 0x20, 0x50, 0, \ 07ed873e Mark Brown 2012-06-18 107 arizona_mixer_tlv) 07ed873e Mark Brown 2012-06-18 108 07ed873e Mark Brown 2012-06-18 109 #define ARIZONA_MUX_ENUM_DECL(name, reg) \ 21a37e39 Charles Keepax 2015-05-01 110 SOC_VALUE_ENUM_SINGLE_AUTODISABLE_DECL( \ 21a37e39 Charles Keepax 2015-05-01 @111 name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values) 07ed873e Mark Brown 2012-06-18 112 07ed873e Mark Brown 2012-06-18 113 #define ARIZONA_MUX_CTL_DECL(name) \ 07ed873e Mark Brown 2012-06-18 114 const struct snd_kcontrol_new name##_mux = \ 355e3a08 Lars-Peter Clausen 2014-04-14 115 SOC_DAPM_ENUM("Route", name##_enum) 07ed873e Mark Brown 2012-06-18 116 17bd09e5 Charles Keepax 2012-11-13 117 #define ARIZONA_MUX_ENUMS(name, base_reg) \ 17bd09e5 Charles Keepax 2012-11-13 118 static ARIZONA_MUX_ENUM_DECL(name##_enum, base_reg); \ 17bd09e5 Charles Keepax 2012-11-13 @119 static ARIZONA_MUX_CTL_DECL(name) 17bd09e5 Charles Keepax 2012-11-13 120 07ed873e Mark Brown 2012-06-18 121 #define ARIZONA_MIXER_ENUMS(name, base_reg) \ 17bd09e5 Charles Keepax 2012-11-13 @122 ARIZONA_MUX_ENUMS(name##_in1, base_reg); \ 17bd09e5 Charles Keepax 2012-11-13 123 ARIZONA_MUX_ENUMS(name##_in2, base_reg + 2); \ 17bd09e5 Charles Keepax 2012-11-13 124 ARIZONA_MUX_ENUMS(name##_in3, base_reg + 4); \ 17bd09e5 Charles Keepax 2012-11-13 125 ARIZONA_MUX_ENUMS(name##_in4, base_reg + 6) :::::: The code at line 122 was first introduced by commit :::::: 17bd09e5457740425fee6ca2bb685a2a55c12c18 ASoC: arizona: Add support for multiplexer with no associated mixer :::::: TO: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> :::::: CC: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- 0-DAY kernel test infrastructure Open Source Technology Center http://lists.01.org/mailman/listinfo/kbuild Intel Corporation

2 1