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

[alsa-devel] [PATCH] ALSA: jack: fix a randconfig build issue
by Jie Yang 02 May '15

02 May '15

Building errors reported such as below when 'CONFIG_INPUT=m': ...undefined reference to `input_xxx'... Here change to enable SND_JACK selectively to fix the issue. Also remove the config 'SND_HDA_INPUT_JACK' which won't be used anymore. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/pci/hda/Kconfig | 10 +--------- sound/pci/hda/hda_codec.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 5c296d3..117bf5c 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -4,7 +4,7 @@ config SND_HDA tristate select SND_PCM select SND_VMASTER - select SND_JACK + select SND_JACK if INPUT=y || INPUT=SND select SND_HDA_CORE config SND_HDA_INTEL @@ -84,14 +84,6 @@ config SND_HDA_INPUT_BEEP_MODE Set 1 to always enable the digital beep interface for HD-audio by default. -config SND_HDA_INPUT_JACK - bool "Support jack plugging notification via input layer" - depends on INPUT=y || INPUT=SND - select SND_JACK - help - Say Y here to enable the jack plugging notification via - input layer. - config SND_HDA_PATCH_LOADER bool "Support initialization patch loading for HD-audio" select FW_LOADER diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 0f8b6b5..ed7e9cf 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -274,10 +274,8 @@ struct hda_codec { unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */ struct delayed_work jackpoll_work; -#ifdef CONFIG_SND_HDA_INPUT_JACK /* jack detection */ struct snd_array jacks; -#endif int depop_delay; /* depop delay in ms, -1 for default delay time */ -- 1.9.1

2 1

[alsa-devel] [PATCH] ALSA: jack: fix a randconfig build issue
by Jie Yang 02 May '15

02 May '15

There may be no input_dev for jack(e.g. phantom jack), when CONFIG_INPUT is not selected, building errors such as: undefined reference to `input_xxx'... Here add #ifdef judgement to fix the issue. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- include/sound/jack.h | 2 ++ sound/core/jack.c | 40 ++++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 23bede1..c1010f9 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -72,7 +72,9 @@ enum snd_jack_types { #define SND_JACK_SWITCH_TYPES 6 struct snd_jack { +#ifdef CONFIG_INPUT struct input_dev *input_dev; +#endif struct list_head kctl_list; struct snd_card *card; int registered; diff --git a/sound/core/jack.c b/sound/core/jack.c index eb66327..3a1901e 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -32,6 +32,7 @@ struct snd_jack_kctl { unsigned int mask_bits; /* only masked status bits are reported via kctl */ }; +#ifdef CONFIG_INPUT static int jack_switch_types[SND_JACK_SWITCH_TYPES] = { SW_HEADPHONE_INSERT, SW_MICROPHONE_INSERT, @@ -40,9 +41,11 @@ static int jack_switch_types[SND_JACK_SWITCH_TYPES] = { SW_VIDEOOUT_INSERT, SW_LINEIN_INSERT, }; +#endif static int snd_jack_dev_disconnect(struct snd_device *device) { +#ifdef CONFIG_INPUT struct snd_jack *jack = device->device_data; if (!jack->input_dev) @@ -54,7 +57,9 @@ static int snd_jack_dev_disconnect(struct snd_device *device) input_unregister_device(jack->input_dev); else input_free_device(jack->input_dev); + jack->input_dev = NULL; +#endif return 0; } @@ -83,11 +88,12 @@ static int snd_jack_dev_register(struct snd_device *device) { struct snd_jack *jack = device->device_data; struct snd_card *card = device->card; - int err, i; + int err = 0; snprintf(jack->name, sizeof(jack->name), "%s %s", card->shortname, jack->id); +#ifdef CONFIG_INPUT if (!jack->input_dev) return 0; @@ -98,7 +104,7 @@ static int snd_jack_dev_register(struct snd_device *device) jack->input_dev->dev.parent = snd_card_get_device_link(card); /* Add capabilities for any keys that are enabled */ - for (i = 0; i < ARRAY_SIZE(jack->key); i++) { + for (int i = 0; i < ARRAY_SIZE(jack->key); i++) { int testbit = SND_JACK_BTN_0 >> i; if (!(jack->type & testbit)) @@ -113,6 +119,7 @@ static int snd_jack_dev_register(struct snd_device *device) err = input_register_device(jack->input_dev); if (err == 0) jack->registered = 1; +#endif return err; } @@ -209,7 +216,6 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, struct snd_jack *jack; struct snd_jack_kctl *jack_kctl = NULL; int err; - int i; static struct snd_device_ops ops = { .dev_free = snd_jack_dev_free, .dev_register = snd_jack_dev_register, @@ -230,26 +236,31 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, /* don't creat input device for phantom jack */ if (!phantom_jack) { +#ifdef CONFIG_INPUT jack->input_dev = input_allocate_device(); if (jack->input_dev == NULL) { err = -ENOMEM; - goto fail_input; + goto error; } jack->input_dev->phys = "ALSA"; - jack->type = type; - - for (i = 0; i < SND_JACK_SWITCH_TYPES; i++) + for (int i = 0; i < SND_JACK_SWITCH_TYPES; i++) if (type & (1 << i)) input_set_capability(jack->input_dev, EV_SW, jack_switch_types[i]); +#endif + jack->type = type; } err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops); - if (err < 0) - goto fail_input; + if (err < 0) { +#ifdef CONFIG_INPUT + input_free_device(jack->input_dev); +#endif + goto error; + } jack->card = card; INIT_LIST_HEAD(&jack->kctl_list); @@ -261,8 +272,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, return 0; -fail_input: - input_free_device(jack->input_dev); +error: kfree(jack->id); kfree(jack); return err; @@ -281,11 +291,13 @@ EXPORT_SYMBOL(snd_jack_new); */ void snd_jack_set_parent(struct snd_jack *jack, struct device *parent) { +#ifdef CONFIG_INPUT WARN_ON(jack->registered); if (!jack->input_dev) return; jack->input_dev->dev.parent = parent; +#endif } EXPORT_SYMBOL(snd_jack_set_parent); @@ -340,7 +352,6 @@ EXPORT_SYMBOL(snd_jack_set_key); void snd_jack_report(struct snd_jack *jack, int status) { struct snd_jack_kctl *jack_kctl; - int i; if (!jack) return; @@ -349,10 +360,11 @@ void snd_jack_report(struct snd_jack *jack, int status) snd_kctl_jack_report(jack->card, jack_kctl->kctl, status & jack_kctl->mask_bits); +#ifdef CONFIG_INPUT if (!jack->input_dev) return; - for (i = 0; i < ARRAY_SIZE(jack->key); i++) { + for (int i = 0; i < ARRAY_SIZE(jack->key); i++) { int testbit = SND_JACK_BTN_0 >> i; if (jack->type & testbit) @@ -369,7 +381,7 @@ void snd_jack_report(struct snd_jack *jack, int status) } input_sync(jack->input_dev); - +#endif } EXPORT_SYMBOL(snd_jack_report); -- 1.9.1

3 6

Re: [alsa-devel] [PATCH 1/3] ASoC: Add gtm601 codec driver
by Mark Brown 01 May '15

01 May '15

On Thu, Apr 30, 2015 at 11:28:01PM +0200, Marek Belisko wrote: > select SND_SOC_WM9705 if SND_SOC_AC97_BUS > select SND_SOC_WM9712 if SND_SOC_AC97_BUS > select SND_SOC_WM9713 if SND_SOC_AC97_BUS > + select SND_SOC_GTM601 > help > +config SND_SOC_GTM601 > + tristate 'GTM601 UMTS modem audio codec' > + Keep Makefile and Kconfig sorted. > +/* > + * Note this is a simple chip with no configuration interface, sample rate is > + * determined automatically by examining the Master clock and Bit clock ratios > + */ > +#define GTM601_RATES (SNDRV_PCM_RATE_8000) Does it or doesn't it support multiple sample rates?

2 3

Re: [alsa-devel] [PATCH 4/4] ASoC: samsung: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:14AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

Re: [alsa-devel] [PATCH 3/4] ASoC: fsl: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:13AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

Re: [alsa-devel] [PATCH 2/4] ASoC: bt-sco: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:12AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

Re: [alsa-devel] [PATCH 1/4] ASoC: au1x: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:11AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

[alsa-devel] [PATCH RFT] ASoC: mc13783: Fix wrong mask value used in mc13xxx_reg_rmw() calls
by Axel Lin 01 May '15

01 May '15

mc13xxx_reg_rmw() won't change any bit if passing 0 to the mask field. Pass AUDIO_SSI_SEL instead of 0 for the mask field to set AUDIO_SSI_SEL bit. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- Hi, I don't have this h/w for test, so please help review and test this patch. Thanks. sound/soc/codecs/mc13783.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 2ffb9a0..3d44fc5 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -623,14 +623,14 @@ static int mc13783_probe(struct snd_soc_codec *codec) AUDIO_SSI_SEL, 0); else mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_CODEC, - 0, AUDIO_SSI_SEL); + AUDIO_SSI_SEL, AUDIO_SSI_SEL); if (priv->dac_ssi_port == MC13783_SSI1_PORT) mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC, AUDIO_SSI_SEL, 0); else mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC, - 0, AUDIO_SSI_SEL); + AUDIO_SSI_SEL, AUDIO_SSI_SEL); return 0; } -- 2.1.0

3 2

[alsa-devel] [PATCH 1/3] ALSA: hda: add hdac_adsp_enable module flag
by Vinod Koul 01 May '15

01 May '15

Some Intel HDA controllers sport a DSP. These systems can also be enabled with ASoC HDA driver as well. So add a flag in hda-core to enable/disable aDSP This flag for now is false, and should be true once the ASoC based systems mature. The integrators/OS vendors can configure this flag based on system preference. Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- include/sound/hdaudio.h | 11 +++++++++++ sound/hda/hda_bus_type.c | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index b97c59eab7ab..015bec1079f9 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -12,6 +12,17 @@ #include <sound/memalloc.h> #include <sound/hda_verbs.h> +/* + * hdac_adsp_enable: exported HD-A aDSP enable configuration. + * + * Some Intel HDA controllers sport a DSP, for these platform we can bypass + * aDSP and use as regular HDA controller or enable aDSP and use aDSP + * along with I2S codecs etc. + * hdac_adsp_enable would enable the aDSP based HDA controller if the + * platform supports it + */ +extern bool hdac_adsp_enable; + /* codec node id */ typedef u16 hda_nid_t; diff --git a/sound/hda/hda_bus_type.c b/sound/hda/hda_bus_type.c index 519914a12e8a..80e0570ffbf4 100644 --- a/sound/hda/hda_bus_type.c +++ b/sound/hda/hda_bus_type.c @@ -10,6 +10,10 @@ MODULE_DESCRIPTION("HD-audio bus"); MODULE_LICENSE("GPL"); +bool hdac_adsp_enable = false; +module_param(hdac_adsp_enable, bool, 0444); +MODULE_PARM_DESC(hdac_adsp_enable, "Enable aDSP on Intel HDA based systems"); + static int hda_bus_match(struct device *dev, struct device_driver *drv) { struct hdac_device *hdev = dev_to_hdac_dev(dev); -- 1.9.1

4 14

Re: [alsa-devel] [PATCH 1/3] ASoC: Add gtm601 codec driver
by Paul Bolle 01 May '15

01 May '15

Just a nit: a license mismatch. On Thu, 2015-04-30 at 23:28 +0200, Marek Belisko wrote: > --- /dev/null > +++ b/sound/soc/codecs/gtm601.c > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2 of the License, or (at your > + * option) any later version. This states the license is GPL v2 or later. > +MODULE_LICENSE("GPL v2"); And, according to include/linux/module.h, this states the license is (just) GPL v2. So I think either the comment at the top of this file or the ident used in the MODULE_LICESE() macro should change. Paul Bolle

2 1