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

Re: [alsa-devel] [PATCH 2/2] ASoC: fix pxa-ssp compiling issue under mach-mmp
by Mark Brown 23 May '12

23 May '12

On Tue, May 22, 2012 at 02:58:26PM +0800, Qiao Zhou wrote: > +#if defined(CONFIG_ARCH_PXA) > if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP) { > sscr0 &= ~0x0000ff00; > sscr0 |= ((div - 2)/2) << 8; /* 2..512 */ > } else { > +#endif > sscr0 &= ~0x000fff00; > sscr0 |= (div - 1) << 8; /* 1..4096 */ > +#if defined(CONFIG_ARCH_PXA) > } > +#endif This is pretty large and fiddly, especially code like the above. Would it not be simpler to just define always false versions of these when on MMP, either in this driver or in the arch headers (where it'd help other drivers too)? Right now it doesn't make the code look nice.

1 0

[alsa-devel] [PATCH] ASoC: tegra+wm8903: remove non-DT support for Seaboard
by Stephen Warren 23 May '12

23 May '12

From: Stephen Warren <swarren(a)nvidia.com> In kernel 3.6, Seaboard will only be supported when booting using device tree; the board files are being removed. Hence, remove the non-DT support for Seaboard and derivatives Kaen and Aebl from the audio driver. Harmony is the only remaining board supported by this driver when not using DT. This support is currently scheduled for removal in 3.7. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- This is pretty independent from anything else, but is based on the previous 5-long series I posted in terms of context. sound/soc/tegra/tegra_wm8903.c | 48 +-------------------------------------- 1 files changed, 2 insertions(+), 46 deletions(-) diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 1fd6a41..b75e0e8 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -28,8 +28,6 @@ * */ -#include <asm/mach-types.h> - #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -196,37 +194,6 @@ static const struct snd_soc_dapm_route harmony_audio_map[] = { {"IN1L", NULL, "Mic Jack"}, }; -static const struct snd_soc_dapm_route seaboard_audio_map[] = { - {"Headphone Jack", NULL, "HPOUTR"}, - {"Headphone Jack", NULL, "HPOUTL"}, - {"Int Spk", NULL, "ROP"}, - {"Int Spk", NULL, "RON"}, - {"Int Spk", NULL, "LOP"}, - {"Int Spk", NULL, "LON"}, - {"Mic Jack", NULL, "MICBIAS"}, - {"IN1R", NULL, "Mic Jack"}, -}; - -static const struct snd_soc_dapm_route kaen_audio_map[] = { - {"Headphone Jack", NULL, "HPOUTR"}, - {"Headphone Jack", NULL, "HPOUTL"}, - {"Int Spk", NULL, "ROP"}, - {"Int Spk", NULL, "RON"}, - {"Int Spk", NULL, "LOP"}, - {"Int Spk", NULL, "LON"}, - {"Mic Jack", NULL, "MICBIAS"}, - {"IN2R", NULL, "Mic Jack"}, -}; - -static const struct snd_soc_dapm_route aebl_audio_map[] = { - {"Headphone Jack", NULL, "HPOUTR"}, - {"Headphone Jack", NULL, "HPOUTL"}, - {"Int Spk", NULL, "LINEOUTR"}, - {"Int Spk", NULL, "LINEOUTL"}, - {"Mic Jack", NULL, "MICBIAS"}, - {"IN1R", NULL, "Mic Jack"}, -}; - static const struct snd_kcontrol_new tegra_wm8903_controls[] = { SOC_DAPM_PIN_SWITCH("Int Spk"), }; @@ -377,19 +344,8 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) tegra_wm8903_dai.platform_of_node = tegra_wm8903_dai.cpu_dai_of_node; } else { - if (machine_is_harmony()) { - card->dapm_routes = harmony_audio_map; - card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map); - } else if (machine_is_seaboard()) { - card->dapm_routes = seaboard_audio_map; - card->num_dapm_routes = ARRAY_SIZE(seaboard_audio_map); - } else if (machine_is_kaen()) { - card->dapm_routes = kaen_audio_map; - card->num_dapm_routes = ARRAY_SIZE(kaen_audio_map); - } else { - card->dapm_routes = aebl_audio_map; - card->num_dapm_routes = ARRAY_SIZE(aebl_audio_map); - } + card->dapm_routes = harmony_audio_map; + card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map); } if (gpio_is_valid(pdata->gpio_spkr_en)) { -- 1.7.0.4

2 1

[alsa-devel] [PATCH 1/2] ASoC: tegra+alc5632: move all GPIO setup into probe
by Stephen Warren 23 May '12

23 May '12

From: Stephen Warren <swarren(a)nvidia.com> Now that deferred probe exists, we can parse device tree and request GPIOs from probe(), rather than deferring this to the DAI link's init(). Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/tegra/tegra_alc5632.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 32de700..facf6f0 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -1,5 +1,5 @@ /* - * tegra_alc5632.c -- Toshiba AC100(PAZ00) machine ASoC driver +* tegra_alc5632.c -- Toshiba AC100(PAZ00) machine ASoC driver * * Copyright (C) 2011 The AC100 Kernel Team <ac100(a)lists.lauchpad.net> * Copyright (C) 2012 - NVIDIA, Inc. @@ -110,7 +110,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - struct device_node *np = codec->card->dev->of_node; struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card); snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, @@ -119,8 +118,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) ARRAY_SIZE(tegra_alc5632_hs_jack_pins), tegra_alc5632_hs_jack_pins); - machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); - if (gpio_is_valid(machine->gpio_hp_det)) { tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det; snd_soc_jack_add_gpios(&tegra_alc5632_hs_jack, @@ -159,6 +156,7 @@ static struct snd_soc_card snd_soc_tegra_alc5632 = { static __devinit int tegra_alc5632_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct snd_soc_card *card = &snd_soc_tegra_alc5632; struct tegra_alc5632 *alc5632; int ret; @@ -181,6 +179,10 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev) goto err; } + alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); + if (alc5632->gpio_hp_det == -ENODEV) + return -EPROBE_DEFER; + ret = snd_soc_of_parse_card_name(card, "nvidia,model"); if (ret) goto err; -- 1.7.0.4

3 3

[alsa-devel] [PATCH 1/5] ASoC: WM8903: init GPIOs during I2C probe not codec probe
by Stephen Warren 23 May '12

23 May '12

From: Stephen Warren <swarren(a)nvidia.com> This allows the GPIOs to be available as soon as the I2C device has probed, which in turn enables machine drivers to request the GPIOs in their probe(), rather than deferring this to their ASoC machine init function, i.e. after the whole sound card has been constructed, and hence the WM8903 codec is available. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/codecs/wm8903.c | 48 ++++++++++++++++++++------------------------ 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 86b8a29..f6a3fc5 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -2,7 +2,7 @@ * wm8903.c -- WM8903 ALSA SoC Audio driver * * Copyright 2008 Wolfson Microelectronics - * Copyright 2011 NVIDIA, Inc. + * Copyright 2011-2012 NVIDIA, Inc. * * Author: Mark Brown <broonie(a)opensource.wolfsonmicro.com> * @@ -116,6 +116,7 @@ static const struct reg_default wm8903_reg_defaults[] = { struct wm8903_priv { struct wm8903_platform_data *pdata; + struct device *dev; struct snd_soc_codec *codec; struct regmap *regmap; @@ -1774,7 +1775,6 @@ static int wm8903_gpio_request(struct gpio_chip *chip, unsigned offset) static int wm8903_gpio_direction_in(struct gpio_chip *chip, unsigned offset) { struct wm8903_priv *wm8903 = gpio_to_wm8903(chip); - struct snd_soc_codec *codec = wm8903->codec; unsigned int mask, val; int ret; @@ -1782,8 +1782,8 @@ static int wm8903_gpio_direction_in(struct gpio_chip *chip, unsigned offset) val = (WM8903_GPn_FN_GPIO_INPUT << WM8903_GP1_FN_SHIFT) | WM8903_GP1_DIR; - ret = snd_soc_update_bits(codec, WM8903_GPIO_CONTROL_1 + offset, - mask, val); + ret = regmap_update_bits(wm8903->regmap, + WM8903_GPIO_CONTROL_1 + offset, mask, val); if (ret < 0) return ret; @@ -1793,10 +1793,9 @@ static int wm8903_gpio_direction_in(struct gpio_chip *chip, unsigned offset) static int wm8903_gpio_get(struct gpio_chip *chip, unsigned offset) { struct wm8903_priv *wm8903 = gpio_to_wm8903(chip); - struct snd_soc_codec *codec = wm8903->codec; - int reg; + unsigned int reg; - reg = snd_soc_read(codec, WM8903_GPIO_CONTROL_1 + offset); + regmap_read(wm8903->regmap, WM8903_GPIO_CONTROL_1 + offset, &reg); return (reg & WM8903_GP1_LVL_MASK) >> WM8903_GP1_LVL_SHIFT; } @@ -1805,7 +1804,6 @@ static int wm8903_gpio_direction_out(struct gpio_chip *chip, unsigned offset, int value) { struct wm8903_priv *wm8903 = gpio_to_wm8903(chip); - struct snd_soc_codec *codec = wm8903->codec; unsigned int mask, val; int ret; @@ -1813,8 +1811,8 @@ static int wm8903_gpio_direction_out(struct gpio_chip *chip, val = (WM8903_GPn_FN_GPIO_OUTPUT << WM8903_GP1_FN_SHIFT) | (value << WM8903_GP2_LVL_SHIFT); - ret = snd_soc_update_bits(codec, WM8903_GPIO_CONTROL_1 + offset, - mask, val); + ret = regmap_update_bits(wm8903->regmap, + WM8903_GPIO_CONTROL_1 + offset, mask, val); if (ret < 0) return ret; @@ -1824,11 +1822,10 @@ static int wm8903_gpio_direction_out(struct gpio_chip *chip, static void wm8903_gpio_set(struct gpio_chip *chip, unsigned offset, int value) { struct wm8903_priv *wm8903 = gpio_to_wm8903(chip); - struct snd_soc_codec *codec = wm8903->codec; - snd_soc_update_bits(codec, WM8903_GPIO_CONTROL_1 + offset, - WM8903_GP1_LVL_MASK, - !!value << WM8903_GP1_LVL_SHIFT); + regmap_update_bits(wm8903->regmap, WM8903_GPIO_CONTROL_1 + offset, + WM8903_GP1_LVL_MASK, + !!value << WM8903_GP1_LVL_SHIFT); } static struct gpio_chip wm8903_template_chip = { @@ -1842,15 +1839,14 @@ static struct gpio_chip wm8903_template_chip = { .can_sleep = 1, }; -static void wm8903_init_gpio(struct snd_soc_codec *codec) +static void wm8903_init_gpio(struct wm8903_priv *wm8903) { - struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); struct wm8903_platform_data *pdata = wm8903->pdata; int ret; wm8903->gpio_chip = wm8903_template_chip; wm8903->gpio_chip.ngpio = WM8903_NUM_GPIO; - wm8903->gpio_chip.dev = codec->dev; + wm8903->gpio_chip.dev = wm8903->dev; if (pdata->gpio_base) wm8903->gpio_chip.base = pdata->gpio_base; @@ -1859,24 +1855,23 @@ static void wm8903_init_gpio(struct snd_soc_codec *codec) ret = gpiochip_add(&wm8903->gpio_chip); if (ret != 0) - dev_err(codec->dev, "Failed to add GPIOs: %d\n", ret); + dev_err(wm8903->dev, "Failed to add GPIOs: %d\n", ret); } -static void wm8903_free_gpio(struct snd_soc_codec *codec) +static void wm8903_free_gpio(struct wm8903_priv *wm8903) { - struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); int ret; ret = gpiochip_remove(&wm8903->gpio_chip); if (ret != 0) - dev_err(codec->dev, "Failed to remove GPIOs: %d\n", ret); + dev_err(wm8903->dev, "Failed to remove GPIOs: %d\n", ret); } #else -static void wm8903_init_gpio(struct snd_soc_codec *codec) +static void wm8903_init_gpio(struct wm8903_priv *wm8903) { } -static void wm8903_free_gpio(struct snd_soc_codec *codec) +static void wm8903_free_gpio(struct wm8903_priv *wm8903) { } #endif @@ -2000,8 +1995,6 @@ static int wm8903_probe(struct snd_soc_codec *codec) WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE, WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE); - wm8903_init_gpio(codec); - return ret; } @@ -2010,7 +2003,6 @@ static int wm8903_remove(struct snd_soc_codec *codec) { struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); - wm8903_free_gpio(codec); wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF); if (wm8903->irq) free_irq(wm8903->irq, codec); @@ -2130,6 +2122,7 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, GFP_KERNEL); if (wm8903 == NULL) return -ENOMEM; + wm8903->dev = &i2c->dev; wm8903->regmap = regmap_init_i2c(i2c, &wm8903_regmap); if (IS_ERR(wm8903->regmap)) { @@ -2189,6 +2182,8 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, /* Reset the device */ regmap_write(wm8903->regmap, WM8903_SW_RESET_AND_ID, 0x8903); + wm8903_init_gpio(wm8903); + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8903, &wm8903_dai, 1); if (ret != 0) @@ -2204,6 +2199,7 @@ static __devexit int wm8903_i2c_remove(struct i2c_client *client) { struct wm8903_priv *wm8903 = i2c_get_clientdata(client); + wm8903_free_gpio(wm8903); regmap_exit(wm8903->regmap); snd_soc_unregister_codec(&client->dev); -- 1.7.0.4

2 5

[alsa-devel] UAC2 defaults to max sampling rate
by adelias 23 May '12

23 May '12

Hi, I'm running ALSA 1.0.23 and kernel 2.6.37 on ARM. The UAC2 audio device is the XMOS reference board. This is what I'm observing. As soon as the XMOS board is plugged in to the USB port, the display on my DAC indicates that is has locked at 192kHz which is the maximum sampling rate supported by the XMOS. Is this the expected behavior or can I specify the defualt sampling rate at start up? Thanks

2 1

[alsa-devel] [PATCH] alsa-lib conf: Add more USB devices to S/PDIF blacklist
by David Henningsson 23 May '12

23 May '12

These devices don't have digital in/out, so prevent them from being opened. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- src/conf/cards/USB-Audio.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 0a0e374..177a7af 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -42,6 +42,10 @@ USB-Audio.pcm.iec958_device { "Logitech Speaker Lapdesk N700" 999 "Logitech USB Headset" 999 "Logitech Wireless Headset" 999 + "Plantronics GameCom 780" 999 + "Plantronics USB Headset" 999 + "Plantronics Wireless Audio" 999 + "SB WoW Headset" 999 "Sennheiser USB headset" 999 "USB Device 0x46d:0x992" 999 } -- 1.7.9.5

2 1

[alsa-devel] [PATCH 2/3] sb_mixer: Autodetect optional SB16 mixer controls
by Ondrej Zary 23 May '12

23 May '12

Tone (bass/treble), gain and 3D mixer controls are not present on all SB16 cards. This attempts to detect chip type and enable them only if they're really present. Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c @@ -592,10 +592,6 @@ static struct sbmix_elem snd_sb16_controls[] = { SB_SINGLE("Mic Playback Switch", SB_DSP4_OUTPUT_SW, 0, 1), SB_SINGLE("Mic Volume", SB_DSP4_MIC_DEV, 3, 31), SB_SINGLE("Beep Volume", SB_DSP4_SPEAKER_DEV, 6, 3), - SB_DOUBLE("Gain Capture Volume", - SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3), - SB_DOUBLE("Gain Playback Volume", - SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6, 3), SB16_INPUT_SW("Line Capture Route", SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, 4, 3), SB_DOUBLE("Line Playback Switch", @@ -603,13 +599,25 @@ static struct sbmix_elem snd_sb16_controls[] = { SB_DOUBLE("Line Volume", SB_DSP4_LINE_DEV, (SB_DSP4_LINE_DEV + 1), 3, 3, 31), SB_SINGLE("Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1), - SB_SINGLE("3D Control - Switch", SB_DSP4_3DSE, 0, 1), +}; + +static struct sbmix_elem snd_sb16_tone_ctls[] = { SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15), SB_DOUBLE("Tone Control - Treble", - SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15) + SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15), +}; + +static struct sbmix_elem snd_sb16_gain_ctls[] = { + SB_DOUBLE("Gain Capture Volume", + SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3), + SB_DOUBLE("Gain Playback Volume", + SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6, 3), }; +static struct sbmix_elem snd_sb16_3d_ctl = + SB_SINGLE("3D Control - Switch", SB_DSP4_3DSE, 0, 1); + static unsigned char snd_sb16_init_values[][2] = { { SB_DSP4_MASTER_DEV + 0, 0 }, { SB_DSP4_MASTER_DEV + 1, 0 }, @@ -720,6 +728,71 @@ static unsigned char snd_als4000_init_values[][2] = { { SB_ALS4000_MIC_IN_GAIN, 0 }, }; +static int snd_sbmixer_sb16_opt_init(struct snd_sb *chip) +{ + int idx, err; + enum { CLASSIC, CT2504, CT2505, CT2511, CT8903, CT8920 } sb16_type; + /* + The detection is a mess because some chips have registers that + appear to work (read/write) but don't do anything. This applies + mainly to tone controls which are present on all SB16 cards but + do nothing on all Vibra chips except CT2502. Also CT8903 appears to + have additional switch registers but they have no effect too. + CT8920 has non-working gain. + + This tries to detect chip type. CLASSIC means older non-integrated + cards (CT1746/CT1747/CT1749 + CT1745 mixer). + No detection code for CT2501 Vibra 16, CT2502 Vibra 16Pro, + CT2508 Vibra 16CL and CT2510 Vibra 16X (lack of HW for testing). + */ + sb16_type = CLASSIC; + if (snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS) & 0x40) { + /* read chip ID (only present on newer (PnP?) chips) */ + u16 id = snd_sbmixer_read(chip, 0xfd) | + snd_sbmixer_read(chip, 0xfe) << 8; + printk("sb16 id=0x%04x\n", id); + switch (id) { + case 0xffff: /* No ID? Assume CT2504 Vibra 16S */ + sb16_type = CT2504; + break; + case 0x0721: /* CT2505 Vibra 16C */ + sb16_type = CT2505; + break; + case 0x0810: /* CT2511 Vibra 16XV */ + sb16_type = CT2511; + break; + case 0x1190: /* CT8903 AWE64 */ + sb16_type = CT8903; + break; + case 0x1241: /* CT8920 AWE64 */ + sb16_type = CT8920; + break; + } + } + /* tone controls */ + if (sb16_type == CLASSIC || sb16_type == CT8903 || sb16_type == CT8920) + for (idx = 0; idx < ARRAY_SIZE(snd_sb16_tone_ctls); idx++) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_tone_ctls[idx]); + if (err < 0) + return err; + } + /* gain */ + if (sb16_type == CLASSIC || sb16_type == CT8903) + for (idx = 0; idx < ARRAY_SIZE(snd_sb16_gain_ctls); idx++) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_gain_ctls[idx]); + if (err < 0) + return err; + } + /* 3D Stereo Enhancement */ + if (snd_sbmixer_read(chip, SB_DSP4_3DSE) != 0xff) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_3d_ctl); + if (err < 0) + return err; + } + + return 0; +} + /* */ static int snd_sbmixer_init(struct snd_sb *chip, @@ -750,6 +823,14 @@ static int snd_sbmixer_init(struct snd_sb *chip, if (err < 0) return err; } + + /* detect optional SB16 controls */ + if (controls == snd_sb16_controls) { + err = snd_sbmixer_sb16_opt_init(chip); + if (err < 0) + return err; + } + snd_component_add(card, name); strcpy(card->mixername, name); return 0; -- Ondrej Zary

1 1

[alsa-devel] [GIT PULL] ASoC updates for 3.5
by Liam Girdwood 23 May '12

23 May '12

Hi Takashi, It's mainly OMAP4 HDMI updates from Ricardo using the new DSS audio interface and Device Tree updates from Peter for OMAP. Thanks Liam --- The following changes since commit 766812e6d5e2e23be1e212cf84902d5e834dd865: ASoC: sh: fsi: enable chip specific data transfer mode (2012-05-19 19:41:45 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc.git for-3.5 for you to fetch changes up to ced47a3117ba084b404f3fc28de3ef6eaba1b911: ASoC: OMAP: HDMI: Rename sound card source file (2012-05-22 17:33:24 +0100) ---------------------------------------------------------------- Peter Ujfalusi (9): ASoC: omap-mcbsp: Use DMA packet mode for non mono streams on OMAP3+ ASoC: omap-mcbsp: Remove unused FRAME dma_op_mode ASoC: omap-mcbsp: Use the common interrupt line if supported by the SoC ASoC: omap-mcbsp: buffer size constraint only applies to playback stream ASoC: omap-mcpdm: Add device tree bindings ASoC: omap-dmic: Add device tree bindings ASoC: omap-abe-twl6040: Keep only one snd_soc_dai_link structure ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm table ASoC: omap-abe-twl6040: Introduce driver data for runtime parameters Ricardo Neri (10): ASoC: OMAP: HDMI: Update the platform device names ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI ASoC: OMAP: HDMI: Use the DSS audio interface ASoC: OMAP: HDMI: Expand configuration of hw_params ASoC: OMAP: HDMI: Improve how the display state is verified ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI ASoC: OMAP: HDMI: Make build config options more generic ASoC: OMAP: HDMI: Make sound card naming more generic ASoC: OMAP: HDMI: Rename sound card source file .../devicetree/bindings/sound/omap-dmic.txt | 21 ++ .../devicetree/bindings/sound/omap-mcpdm.txt | 21 ++ sound/soc/omap/Kconfig | 7 +- sound/soc/omap/Makefile | 4 +- sound/soc/omap/mcbsp.c | 115 ++++++++-- sound/soc/omap/mcbsp.h | 8 +- sound/soc/omap/omap-abe-twl6040.c | 68 +++--- sound/soc/omap/omap-dmic.c | 8 + sound/soc/omap/omap-hdmi-card.c | 87 +++++++ sound/soc/omap/omap-hdmi.c | 238 ++++++++++++++++++-- sound/soc/omap/omap-hdmi.h | 4 +- sound/soc/omap/omap-mcbsp.c | 45 ++-- sound/soc/omap/omap-mcpdm.c | 8 + sound/soc/omap/omap4-hdmi-card.c | 121 ---------- 14 files changed, 531 insertions(+), 224 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/omap-dmic.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-mcpdm.txt create mode 100644 sound/soc/omap/omap-hdmi-card.c delete mode 100644 sound/soc/omap/omap4-hdmi-card.c

2 1

Re: [alsa-devel] [PATCH 1/3] of: Add prefix parameter to of_modalias_node().
by Grant Likely 23 May '12

23 May '12

Cool, thanks. g. On Tue, May 22, 2012 at 4:49 PM, David Daney <ddaney.cavm(a)gmail.com> wrote: > On 05/22/2012 01:09 PM, Grant Likely wrote: >> >> On Tue, May 22, 2012 at 1:45 PM, David Daney<ddaney.cavm(a)gmail.com> >> wrote: >>> >>> On 05/19/2012 11:08 PM, Grant Likely wrote: >>>> >>>> >>>> On Sat, 19 May 2012 23:54:36 -0600, Grant >>>> Likely<grant.likely(a)secretlab.ca> wrote: >>>>> >>>>> >>>>> On Fri, 11 May 2012 15:05:21 -0700, David Daney<ddaney.cavm(a)gmail.com> >>>>> wrote: >>>>>> >>>>>> >>>>>> From: David Daney<david.daney(a)cavium.com> >>>>>> >>>>>> When generating MODALIASes, it is convenient to add things like "spi:" >>>>>> or "i2c:" to the front of the strings. This allows the standard >>>>>> modprobe to find the right driver when automatically populating bus >>>>>> children from the device tree structure. >>>>>> >>>>>> Add a prefix parameter, and adjust callers. For >>>>>> of_register_spi_devices() use the "spi:" prefix. >>>>>> >>>>>> Signed-off-by: David Daney<david.daney(a)cavium.com> >>>>> >>>>> >>>>> >>>>> Applied, thanks. Some notes below... >>>> >>>> >>>> >>>> Wait... why is this necessary? >>> >>> >>> >>> Because in of_register_spi_devices() in of_spi.c, you do: >>> >>> request_module(spi->modalias); >>> >>> The string passed to request_module() must have the "spi:" prefix. >> >> >> How about modifying the call to request_module() to include the prefix >> also? I think that would be a simpler change overall. Would that >> work? > > > It seems to. I just sent such a patch in a new thread. > > David Daney -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.

1 0

Re: [alsa-devel] [PATCH 1/3] of: Add prefix parameter to of_modalias_node().
by Grant Likely 22 May '12

22 May '12

On Tue, May 22, 2012 at 1:45 PM, David Daney <ddaney.cavm(a)gmail.com> wrote: > On 05/19/2012 11:08 PM, Grant Likely wrote: >> >> On Sat, 19 May 2012 23:54:36 -0600, Grant >> Likely<grant.likely(a)secretlab.ca> wrote: >>> >>> On Fri, 11 May 2012 15:05:21 -0700, David Daney<ddaney.cavm(a)gmail.com> >>> wrote: >>>> >>>> From: David Daney<david.daney(a)cavium.com> >>>> >>>> When generating MODALIASes, it is convenient to add things like "spi:" >>>> or "i2c:" to the front of the strings. This allows the standard >>>> modprobe to find the right driver when automatically populating bus >>>> children from the device tree structure. >>>> >>>> Add a prefix parameter, and adjust callers. For >>>> of_register_spi_devices() use the "spi:" prefix. >>>> >>>> Signed-off-by: David Daney<david.daney(a)cavium.com> >>> >>> >>> Applied, thanks. Some notes below... >> >> >> Wait... why is this necessary? > > > Because in of_register_spi_devices() in of_spi.c, you do: > > request_module(spi->modalias); > > The string passed to request_module() must have the "spi:" prefix. How about modifying the call to request_module() to include the prefix also? I think that would be a simpler change overall. Would that work? g.

1 0