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

[alsa-devel] [PATCH 1/1] ALSA: ASoc: DaVinci Delay start of ASP to trigger
by martin＠ti.com 05 Oct '10

05 Oct '10

From: Troy Kisky <troy.kisky(a)boundarydevices.com> Since only 4 mainline ASoC codecs support the trigger callback, we cannot rely upon them stopping the frame clock if they are master and must assume it is running even if the sound is paused. Thus we cannot start the ASP until the trigger method. Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> Signed-off-by: Martin Ambrose <martin(a)ti.com> --- sound/soc/davinci/davinci-i2s.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 9e8932a..a66c237 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -572,10 +572,6 @@ static int davinci_i2s_prepare(struct snd_pcm_substream *substream, struct davinci_mcbsp_dev *dev = dai->private_data; int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); davinci_mcbsp_stop(dev, playback); - if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) { - /* codec is master */ - davinci_mcbsp_start(dev, substream); - } return 0; } @@ -585,8 +581,6 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct davinci_mcbsp_dev *dev = dai->private_data; int ret = 0; int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); - if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) - return 0; /* return if codec is master */ switch (cmd) { case SNDRV_PCM_TRIGGER_START: -- 1.7.0.4

3 2

[alsa-devel] EPIPE and underruns
by Andrew Bell 05 Oct '10

05 Oct '10

Hi, Can somebody explain precisely the circumstances leading to an EPIPE as the result of a pcm_snd_writei()? What buffer has been underrun that leads to this error? Does providing more data to pcn_snd_writei() help alleviate the issue? Thanks, -- Andrew Bell andrew.bell.ia(a)gmail.com

2 3

[alsa-devel] [GIT PULL] Merge fix for next
by Liam Girdwood 04 Oct '10

04 Oct '10

Hi Takashi, Thought I'd better not sit on this one. Thanks Liam --- The following changes since commit 0b452f2efa35c48219d1ad3cbebdd786ec39ef06: Takashi Iwai (1): Merge branch 'for-2.6.37' of git://git.kernel.org/.../lrg/asoc-2.6 into topic/asoc are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.37 Jarkko Nikula (1): omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes arch/arm/mach-omap2/devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

[alsa-devel] [PATCH] omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
by Jarkko Nikula 04 Oct '10

04 Oct '10

Upcoming ASoC multi-component and OMAP hwmod changes will conflict in arch/arm/mach-omap2/devices.c. Avoid this by moving a little bit include statement introduced by ASoC Multi-Component Support patch. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> Cc: Paul Walmsley <paul(a)pwsan.com> Cc: Tony Lindgren <tony(a)atomide.com> --- This is intended to be merged with "ASoC: multi-component - ASoC Multi-Component Support" patch via ASoC tree. --- arch/arm/mach-omap2/devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 08e1ad5..512ae46 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -25,10 +25,10 @@ #include <plat/control.h> #include <plat/tc.h> #include <plat/board.h> +#include <plat/mcbsp.h> #include <mach/gpio.h> #include <plat/mmc.h> #include <plat/dma.h> -#include <plat/mcbsp.h> #include "mux.h" -- 1.7.1

3 2

[alsa-devel] [PATCH] ASoC: WM8804: Retrieve the device revision and print it
by Dimitris Papastamos 04 Oct '10

04 Oct '10

Be verbose and print out the device revision. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8804.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 2657f5c..90c24ae 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -643,6 +643,14 @@ static int wm8804_probe(struct snd_soc_codec *codec) goto err_reg_enable; } + ret = snd_soc_read(codec, WM8804_DEVREV); + if (ret < 0) { + dev_err(codec->dev, "Failed to read device revision: %d\n", + ret); + goto err_reg_enable; + } + dev_info(codec->dev, "revision %d\n", ret); + ret = wm8804_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset: %d\n", ret); -- 1.7.3.1

2 1

[alsa-devel] [PATCH] ASoC: WM8804: Power down the PLL correctly
by Dimitris Papastamos 04 Oct '10

04 Oct '10

The PLL is disabled when the corresponding bit is set not the other way around. This commit depends on my other commit with Subject "ASoC: WM8804: Refactor set_pll code to avoid GCC warnings". Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8804.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index b23c57c..2657f5c 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -395,7 +395,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, codec = dai->codec; if (!freq_in || !freq_out) { /* disable the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); return 0; } else { int ret; @@ -406,7 +406,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, return ret; /* power down the PLL before reprogramming it */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); if (!freq_in || !freq_out) return 0; @@ -423,7 +423,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); /* power up the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); } return 0; -- 1.7.3.1

3 2

[alsa-devel] [PATCH] ASoC: WM8804: Refactor set_pll code to avoid GCC warnings
by Dimitris Papastamos 04 Oct '10

04 Oct '10

Ensure that no uninitialised variable warnings are generated by GCC. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8804.c | 47 ++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 40e5067..b23c57c 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -390,36 +390,41 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, int source, unsigned int freq_in, unsigned int freq_out) { - int ret; struct snd_soc_codec *codec; - struct pll_div pll_div = { 0 }; codec = dai->codec; - if (freq_in && freq_out) { + if (!freq_in || !freq_out) { + /* disable the PLL */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + return 0; + } else { + int ret; + struct pll_div pll_div; + ret = pll_factors(&pll_div, freq_out, freq_in); if (ret) return ret; - } - /* power down the PLL before reprogramming it */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + /* power down the PLL before reprogramming it */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); - if (!freq_in || !freq_out) - return 0; + if (!freq_in || !freq_out) + return 0; - /* set PLLN and PRESCALE */ - snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10, - pll_div.n | (pll_div.prescale << 4)); - /* set mclkdiv and freqmode */ - snd_soc_update_bits(codec, WM8804_PLL5, 0x3 | 0x8, - pll_div.freqmode | (pll_div.mclkdiv << 3)); - /* set PLLK */ - snd_soc_write(codec, WM8804_PLL1, pll_div.k & 0xff); - snd_soc_write(codec, WM8804_PLL2, (pll_div.k >> 8) & 0xff); - snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); - - /* power up the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + /* set PLLN and PRESCALE */ + snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10, + pll_div.n | (pll_div.prescale << 4)); + /* set mclkdiv and freqmode */ + snd_soc_update_bits(codec, WM8804_PLL5, 0x3 | 0x8, + pll_div.freqmode | (pll_div.mclkdiv << 3)); + /* set PLLK */ + snd_soc_write(codec, WM8804_PLL1, pll_div.k & 0xff); + snd_soc_write(codec, WM8804_PLL2, (pll_div.k >> 8) & 0xff); + snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); + + /* power up the PLL */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + } return 0; } -- 1.7.3.1

3 2

[PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers
by David Henningsson 04 Oct '10

04 Oct '10

BugLink: http://launchpad.net/bugs/465942 BugLink: http://launchpad.net/bugs/580749 BugLink: http://launchpad.net/bugs/587546 Position_fix quirks for specific machines now override the default position_fix behavior for all HDA controllers. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_intel.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 741ad32..51b088e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2264,12 +2264,24 @@ static int __devinit check_position_fix(struct azx *chip, int fix) { const struct snd_pci_quirk *q; + chip->via_dmapos_patch = 0; + switch (fix) { case POS_FIX_LPIB: case POS_FIX_POSBUF: return fix; } + q = snd_pci_quirk_lookup(chip->pci, position_fix_list); + if (q) { + /* Note that this implicitly sets via_dmapos_patch to zero */ + printk(KERN_INFO + "hda_intel: position_fix set to %d " + "for device %04x:%04x\n", + q->value, q->subvendor, q->subdevice); + return q->value; + } + /* Check VIA/ATI HD Audio Controller exist */ switch (chip->driver_type) { case AZX_DRIVER_VIA: @@ -2278,16 +2290,7 @@ static int __devinit check_position_fix(struct azx *chip, int fix) /* Use link position directly, avoid any transfer problem. */ return POS_FIX_LPIB; } - chip->via_dmapos_patch = 0; - q = snd_pci_quirk_lookup(chip->pci, position_fix_list); - if (q) { - printk(KERN_INFO - "hda_intel: position_fix set to %d " - "for device %04x:%04x\n", - q->value, q->subvendor, q->subdevice); - return q->value; - } return POS_FIX_AUTO; } -- 1.7.1 --------------090100040709030507040104--

1 0

[alsa-devel] sound card problem
by mohit verma 04 Oct '10

04 Oct '10

hello all, i am having dell inspiron 1440 and using ubuntu 10.04. sound card is not getting detedted in my system . can someone please guide me or any proper link with which i can fix this? any insight appreciated.

2 1

[PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers
by David Henningsson 04 Oct '10

04 Oct '10

Position_fix quirks for specific machines now override the default position_fix behavior for all HDA controllers. BugLink: http://launchpad.net/bugs/465942 BugLink: http://launchpad.net/bugs/580749 BugLink: http://launchpad.net/bugs/587546 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_intel.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 38b063e..5cbea85 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2315,14 +2315,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix) return fix; } - /* Check VIA/ATI HD Audio Controller exist */ - switch (chip->driver_type) { - case AZX_DRIVER_VIA: - case AZX_DRIVER_ATI: - /* Use link position directly, avoid any transfer problem. */ - return POS_FIX_VIACOMBO; - } - q = snd_pci_quirk_lookup(chip->pci, position_fix_list); if (q) { printk(KERN_INFO @@ -2331,6 +2323,15 @@ static int __devinit check_position_fix(struct azx *chip, int fix) q->value, q->subvendor, q->subdevice); return q->value; } + + /* Check VIA/ATI HD Audio Controller exist */ + switch (chip->driver_type) { + case AZX_DRIVER_VIA: + case AZX_DRIVER_ATI: + /* Use link position directly, avoid any transfer problem. */ + return POS_FIX_VIACOMBO; + } + return POS_FIX_AUTO; } -- 1.7.1 --------------030003000506090905050009--

1 0

[PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers
by David Henningsson 04 Oct '10

04 Oct '10

Position_fix quirks for specific machines now override the default position_fix behavior for all HDA controllers. BugLink: http://launchpad.net/bugs/465942 BugLink: http://launchpad.net/bugs/580749 BugLink: http://launchpad.net/bugs/587546 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_intel.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 38b063e..5cbea85 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2315,14 +2315,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix) return fix; } - /* Check VIA/ATI HD Audio Controller exist */ - switch (chip->driver_type) { - case AZX_DRIVER_VIA: - case AZX_DRIVER_ATI: - /* Use link position directly, avoid any transfer problem. */ - return POS_FIX_VIACOMBO; - } - q = snd_pci_quirk_lookup(chip->pci, position_fix_list); if (q) { printk(KERN_INFO @@ -2331,6 +2323,15 @@ static int __devinit check_position_fix(struct azx *chip, int fix) q->value, q->subvendor, q->subdevice); return q->value; } + + /* Check VIA/ATI HD Audio Controller exist */ + switch (chip->driver_type) { + case AZX_DRIVER_VIA: + case AZX_DRIVER_ATI: + /* Use link position directly, avoid any transfer problem. */ + return POS_FIX_VIACOMBO; + } + return POS_FIX_AUTO; } -- 1.7.1 --------------090607090605080508040608--

1 0

[alsa-devel] [PATCH] ASoC: WM8804: Initial driver
by Dimitris Papastamos 04 Oct '10

04 Oct '10

The WM8804 is a high performance consumer mode S/PDIF transceiver with support for 1 received channel and 1 transmitted channel. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wm8804.c | 820 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8804.h | 61 ++++ 4 files changed, 887 insertions(+), 0 deletions(-) create mode 100644 sound/soc/codecs/wm8804.c create mode 100644 sound/soc/codecs/wm8804.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 4ccc2b7..ff7b922 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -56,6 +56,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8776 if SND_SOC_I2C_AND_SPI + select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8900 if I2C select SND_SOC_WM8903 if I2C select SND_SOC_WM8904 if I2C @@ -237,6 +238,9 @@ config SND_SOC_WM8753 config SND_SOC_WM8776 tristate +config SND_SOC_WM8804 + tristate + config SND_SOC_WM8900 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 23e7e2c..0c5f329 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -41,6 +41,7 @@ snd-soc-wm8741-objs := wm8741.o snd-soc-wm8750-objs := wm8750.o snd-soc-wm8753-objs := wm8753.o snd-soc-wm8776-objs := wm8776.o +snd-soc-wm8804-objs := wm8804.o snd-soc-wm8900-objs := wm8900.o snd-soc-wm8903-objs := wm8903.o snd-soc-wm8904-objs := wm8904.o @@ -114,6 +115,7 @@ obj-$(CONFIG_SND_SOC_WM8741) += snd-soc-wm8741.o obj-$(CONFIG_SND_SOC_WM8750) += snd-soc-wm8750.o obj-$(CONFIG_SND_SOC_WM8753) += snd-soc-wm8753.o obj-$(CONFIG_SND_SOC_WM8776) += snd-soc-wm8776.o +obj-$(CONFIG_SND_SOC_WM8804) += snd-soc-wm8804.o obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o obj-$(CONFIG_SND_SOC_WM8904) += snd-soc-wm8904.o diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c new file mode 100644 index 0000000..ca7d9ee --- /dev/null +++ b/sound/soc/codecs/wm8804.c @@ -0,0 +1,820 @@ +/* + * wm8804.c -- WM8804 S/PDIF transceiver driver + * + * Copyright 2010 Wolfson Microelectronics plc + * + * Author: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> + * + * 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. + */ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/spi/spi.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/initval.h> +#include <sound/tlv.h> + +#include "wm8804.h" + +#define WM8804_NUM_SUPPLIES 2 +static const char *wm8804_supply_names[WM8804_NUM_SUPPLIES] = { + "PVDD", + "DVDD" +}; + +static const u8 wm8804_reg_defs[] = { + 0x05, /* R0 - RST/DEVID1 */ + 0x88, /* R1 - DEVID2 */ + 0x04, /* R2 - DEVREV */ + 0x21, /* R3 - PLL1 */ + 0xFD, /* R4 - PLL2 */ + 0x36, /* R5 - PLL3 */ + 0x07, /* R6 - PLL4 */ + 0x16, /* R7 - PLL5 */ + 0x18, /* R8 - PLL6 */ + 0xFF, /* R9 - SPDMODE */ + 0x00, /* R10 - INTMASK */ + 0x00, /* R11 - INTSTAT */ + 0x00, /* R12 - SPDSTAT */ + 0x00, /* R13 - RXCHAN1 */ + 0x00, /* R14 - RXCHAN2 */ + 0x00, /* R15 - RXCHAN3 */ + 0x00, /* R16 - RXCHAN4 */ + 0x00, /* R17 - RXCHAN5 */ + 0x00, /* R18 - SPDTX1 */ + 0x00, /* R19 - SPDTX2 */ + 0x00, /* R20 - SPDTX3 */ + 0x71, /* R21 - SPDTX4 */ + 0x0B, /* R22 - SPDTX5 */ + 0x70, /* R23 - GPO0 */ + 0x57, /* R24 - GPO1 */ + 0x00, /* R25 */ + 0x42, /* R26 - GPO2 */ + 0x06, /* R27 - AIFTX */ + 0x06, /* R28 - AIFRX */ + 0x80, /* R29 - SPDRX1 */ + 0x07, /* R30 - PWRDN */ +}; + +struct wm8804_priv { + enum snd_soc_control_type control_type; + struct regulator_bulk_data supplies[WM8804_NUM_SUPPLIES]; + struct notifier_block disable_nb[WM8804_NUM_SUPPLIES]; + struct snd_soc_codec *codec; +}; + +static int txsrc_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol); + +static int txsrc_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol); + +/* + * We can't use the same notifier block for more than one supply and + * there's no way I can see to get from a callback to the caller + * except container_of(). + */ +#define WM8804_REGULATOR_EVENT(n) \ +static int wm8804_regulator_event_##n(struct notifier_block *nb, \ + unsigned long event, void *data) \ +{ \ + struct wm8804_priv *wm8804 = container_of(nb, struct wm8804_priv, \ + disable_nb[n]); \ + if (event & REGULATOR_EVENT_DISABLE) { \ + wm8804->codec->cache_sync = 1; \ + } \ + return 0; \ +} + +WM8804_REGULATOR_EVENT(0) +WM8804_REGULATOR_EVENT(1) + +static const char *txsrc_text[] = { "S/PDIF RX", "AIF" }; +static const SOC_ENUM_SINGLE_EXT_DECL(txsrc, txsrc_text); + +static const struct snd_kcontrol_new wm8804_snd_controls[] = { + SOC_ENUM_EXT("Input Source", txsrc, txsrc_get, txsrc_put), + SOC_SINGLE("TX Playback Switch", WM8804_PWRDN, 2, 1, 1), + SOC_SINGLE("AIF Playback Switch", WM8804_PWRDN, 4, 1, 1) +}; + +static int txsrc_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec; + unsigned int src; + + codec = snd_kcontrol_chip(kcontrol); + src = snd_soc_read(codec, WM8804_SPDTX4); + if (src & 0x40) + ucontrol->value.integer.value[0] = 1; + else + ucontrol->value.integer.value[0] = 0; + + return 0; +} + +static int txsrc_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec; + unsigned int src, txpwr; + + codec = snd_kcontrol_chip(kcontrol); + + if (ucontrol->value.integer.value[0] != 0 + && ucontrol->value.integer.value[0] != 1) + return -EINVAL; + + src = snd_soc_read(codec, WM8804_SPDTX4); + switch ((src & 0x40) >> 6) { + case 0: + if (!ucontrol->value.integer.value[0]) + return 0; + break; + case 1: + if (ucontrol->value.integer.value[1]) + return 0; + break; + } + + /* save the current power state of the transmitter */ + txpwr = snd_soc_read(codec, WM8804_PWRDN) & 0x4; + /* power down the transmitter */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, 0x4); + /* set the tx source */ + snd_soc_update_bits(codec, WM8804_SPDTX4, 0x40, + ucontrol->value.integer.value[0] << 6); + + if (ucontrol->value.integer.value[0]) { + /* power down the receiver */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x2, 0x2); + /* power up the AIF */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x10, 0); + } else { + /* don't power down the AIF -- may be used as an output */ + /* power up the receiver */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x2, 0); + } + + /* restore the transmitter's configuration */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, txpwr); + + return 0; +} + +static int wm8804_volatile(unsigned int reg) +{ + switch (reg) { + case WM8804_RST_DEVID1: + case WM8804_DEVID2: + case WM8804_DEVREV: + case WM8804_INTSTAT: + case WM8804_SPDSTAT: + case WM8804_RXCHAN1: + case WM8804_RXCHAN2: + case WM8804_RXCHAN3: + case WM8804_RXCHAN4: + case WM8804_RXCHAN5: + return 1; + default: + break; + } + + return 0; +} + +static int wm8804_reset(struct snd_soc_codec *codec) +{ + return snd_soc_write(codec, WM8804_RST_DEVID1, 0x0); +} + +static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) +{ + struct snd_soc_codec *codec; + u16 format, master, bcp, lrp; + + codec = dai->codec; + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + format = 0x2; + break; + case SND_SOC_DAIFMT_RIGHT_J: + format = 0x0; + break; + case SND_SOC_DAIFMT_LEFT_J: + format = 0x1; + break; + case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: + format = 0x3; + break; + default: + dev_err(dai->dev, "Unknown dai format\n"); + return -EINVAL; + } + + /* set data format */ + snd_soc_update_bits(codec, WM8804_AIFTX, 0x3, format); + snd_soc_update_bits(codec, WM8804_AIFRX, 0x3, format); + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + master = 1; + break; + case SND_SOC_DAIFMT_CBS_CFS: + master = 0; + break; + default: + dev_err(dai->dev, "Unknown master/slave configuration\n"); + return -EINVAL; + } + + /* set master/slave mode */ + snd_soc_update_bits(codec, WM8804_AIFRX, 0x40, master << 6); + + bcp = lrp = 0; + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_IB_IF: + bcp = lrp = 1; + break; + case SND_SOC_DAIFMT_IB_NF: + bcp = 1; + break; + case SND_SOC_DAIFMT_NB_IF: + lrp = 1; + break; + default: + dev_err(dai->dev, "Unknown polarity configuration\n"); + return -EINVAL; + } + + /* set frame inversion */ + snd_soc_update_bits(codec, WM8804_AIFTX, 0x10 | 0x20, + (bcp << 4) | (lrp << 5)); + snd_soc_update_bits(codec, WM8804_AIFRX, 0x10 | 0x20, + (bcp << 4) | (lrp << 5)); + return 0; +} + +static int wm8804_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec; + u16 blen; + + codec = dai->codec; + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + blen = 0x0; + break; + case SNDRV_PCM_FORMAT_S20_3LE: + blen = 0x1; + break; + case SNDRV_PCM_FORMAT_S24_LE: + blen = 0x2; + break; + default: + dev_err(dai->dev, "Unsupported word length: %u\n", + params_format(params)); + return -EINVAL; + } + + /* set word length */ + snd_soc_update_bits(codec, WM8804_AIFTX, 0xc, blen << 2); + snd_soc_update_bits(codec, WM8804_AIFRX, 0xc, blen << 2); + + return 0; +} + +struct pll_div { + u32 prescale:1; + u32 mclkdiv:1; + u32 freqmode:2; + u32 n:4; + u32 k:22; +}; + +/* PLL rate to output rate divisions */ +static struct { + unsigned int div; + unsigned int freqmode; + unsigned int mclkdiv; +} post_table[] = { + { 2, 0, 0 }, + { 4, 0, 1 }, + { 4, 1, 0 }, + { 8, 1, 1 }, + { 8, 2, 0 }, + { 16, 2, 1 }, + { 12, 3, 0 }, + { 24, 3, 1 } +}; + +#define FIXED_PLL_SIZE ((1ULL << 22) * 10) +static int pll_factors(struct pll_div *pll_div, unsigned int target, + unsigned int source) +{ + u64 Kpart; + unsigned long int K, Ndiv, Nmod, tmp; + int i; + + /* + * Scale the output frequency up; the PLL should run in the + * region of 90-100MHz. + */ + for (i = 0; i < ARRAY_SIZE(post_table); i++) { + tmp = target * post_table[i].div; + if (tmp >= 90000000 && tmp <= 100000000) { + pll_div->freqmode = post_table[i].freqmode; + pll_div->mclkdiv = post_table[i].mclkdiv; + target *= post_table[i].div; + break; + } + } + + if (i == ARRAY_SIZE(post_table)) { + pr_err("%s: Unable to scale output frequency: %uHz\n", + __func__, target); + return -EINVAL; + } + + pll_div->prescale = 0; + Ndiv = target / source; + if (Ndiv < 5) { + source >>= 1; + pll_div->prescale = 1; + Ndiv = target / source; + } + + if (Ndiv < 5 || Ndiv > 13) { + pr_err("%s: WM8804 N value is not within the recommended range: %lu\n", + __func__, Ndiv); + return -EINVAL; + } + pll_div->n = Ndiv; + + Nmod = target % source; + Kpart = FIXED_PLL_SIZE * (u64)Nmod; + + do_div(Kpart, source); + + K = Kpart & 0xffffffff; + if ((K % 10) >= 5) + K += 5; + K /= 10; + pll_div->k = K; + + return 0; +} + +static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, + int source, unsigned int freq_in, + unsigned int freq_out) +{ + int ret; + struct snd_soc_codec *codec; + struct pll_div pll_div = { 0 }; + + codec = dai->codec; + if (freq_in && freq_out) { + ret = pll_factors(&pll_div, freq_out, freq_in); + if (ret) + return ret; + } + + /* power down the PLL before reprogramming it */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + + if (!freq_in || !freq_out) + return 0; + + /* set PLLN and PRESCALE */ + snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10, + pll_div.n | (pll_div.prescale << 4)); + /* set mclkdiv and freqmode */ + snd_soc_update_bits(codec, WM8804_PLL5, 0x3 | 0x8, + pll_div.freqmode | (pll_div.mclkdiv << 3)); + /* set PLLK */ + snd_soc_write(codec, WM8804_PLL1, pll_div.k & 0xff); + snd_soc_write(codec, WM8804_PLL2, (pll_div.k >> 8) & 0xff); + snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); + + /* power up the PLL */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + + return 0; +} + +static int wm8804_set_sysclk(struct snd_soc_dai *dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec; + + codec = dai->codec; + + switch (clk_id) { + case WM8804_TX_CLKSRC_MCLK: + if ((freq >= 10000000 && freq <= 14400000) + || (freq >= 16280000 && freq <= 27000000)) + snd_soc_update_bits(codec, WM8804_PLL6, 0x80, 0x80); + else { + dev_err(dai->dev, "OSCCLOCK is not within the " + "recommended range: %uHz\n", freq); + return -EINVAL; + } + break; + case WM8804_TX_CLKSRC_PLL: + snd_soc_update_bits(codec, WM8804_PLL6, 0x80, 0); + break; + case WM8804_CLKOUT_SRC_CLK1: + snd_soc_update_bits(codec, WM8804_PLL6, 0x8, 0); + break; + case WM8804_CLKOUT_SRC_OSCCLK: + snd_soc_update_bits(codec, WM8804_PLL6, 0x8, 0x8); + break; + default: + dev_err(dai->dev, "Unknown clock source: %d\n", clk_id); + return -EINVAL; + } + + return 0; +} + +static int wm8804_set_clkdiv(struct snd_soc_dai *dai, + int div_id, int div) +{ + struct snd_soc_codec *codec; + + codec = dai->codec; + switch (div_id) { + case WM8804_CLKOUT_DIV: + snd_soc_update_bits(codec, WM8804_PLL5, 0x30, + (div & 0x3) << 4); + break; + default: + dev_err(dai->dev, "Unknown clock divider: %d\n", div_id); + return -EINVAL; + } + return 0; +} + +static void wm8804_sync_cache(struct snd_soc_codec *codec) +{ + short i; + u8 *cache; + + if (!codec->cache_sync) + return; + + codec->cache_only = 0; + cache = codec->reg_cache; + for (i = 0; i < codec->driver->reg_cache_size; i++) { + if (i == WM8804_RST_DEVID1 || cache[i] == wm8804_reg_defs[i]) + continue; + snd_soc_write(codec, i, cache[i]); + } + codec->cache_sync = 0; +} + +static int wm8804_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + int ret; + struct wm8804_priv *wm8804; + + wm8804 = snd_soc_codec_get_drvdata(codec); + switch (level) { + case SND_SOC_BIAS_ON: + break; + case SND_SOC_BIAS_PREPARE: + /* power up the OSC and the PLL */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0); + break; + case SND_SOC_BIAS_STANDBY: + if (codec->bias_level == SND_SOC_BIAS_OFF) { + ret = regulator_bulk_enable(ARRAY_SIZE(wm8804->supplies), + wm8804->supplies); + if (ret) { + dev_err(codec->dev, + "Failed to enable supplies: %d\n", + ret); + return ret; + } + wm8804_sync_cache(codec); + } + /* power down the OSC and the PLL */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0x9); + break; + case SND_SOC_BIAS_OFF: + /* power down the OSC and the PLL */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0x9); + regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies), + wm8804->supplies); + break; + } + + codec->bias_level = level; + return 0; +} + +#ifdef CONFIG_PM +static int wm8804_suspend(struct snd_soc_codec *codec, pm_message_t state) +{ + wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF); + return 0; +} + +static int wm8804_resume(struct snd_soc_codec *codec) +{ + wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + return 0; +} +#else +#define wm8804_suspend NULL +#define wm8804_resume NULL +#endif + +static int wm8804_remove(struct snd_soc_codec *codec) +{ + struct wm8804_priv *wm8804; + int i; + + wm8804 = snd_soc_codec_get_drvdata(codec); + wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF); + + for (i = 0; i < ARRAY_SIZE(wm8804->supplies); ++i) + regulator_unregister_notifier(wm8804->supplies[i].consumer, + &wm8804->disable_nb[i]); + regulator_bulk_free(ARRAY_SIZE(wm8804->supplies), wm8804->supplies); + return 0; +} + +static int wm8804_probe(struct snd_soc_codec *codec) +{ + struct wm8804_priv *wm8804; + int i, id1, id2, ret; + + wm8804 = snd_soc_codec_get_drvdata(codec); + wm8804->codec = codec; + + codec->idle_bias_off = 1; + + ret = snd_soc_codec_set_cache_io(codec, 8, 8, wm8804->control_type); + if (ret < 0) { + dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret); + return ret; + } + + for (i = 0; i < ARRAY_SIZE(wm8804->supplies); i++) + wm8804->supplies[i].supply = wm8804_supply_names[i]; + + ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8804->supplies), + wm8804->supplies); + if (ret) { + dev_err(codec->dev, "Failed to request supplies: %d\n", ret); + return ret; + } + + wm8804->disable_nb[0].notifier_call = wm8804_regulator_event_0; + wm8804->disable_nb[1].notifier_call = wm8804_regulator_event_1; + + /* This should really be moved into the regulator core */ + for (i = 0; i < ARRAY_SIZE(wm8804->supplies); i++) { + ret = regulator_register_notifier(wm8804->supplies[i].consumer, + &wm8804->disable_nb[i]); + if (ret != 0) { + dev_err(codec->dev, + "Failed to register regulator notifier: %d\n", + ret); + } + } + + ret = regulator_bulk_enable(ARRAY_SIZE(wm8804->supplies), + wm8804->supplies); + if (ret) { + dev_err(codec->dev, "Failed to enable supplies: %d\n", ret); + goto err_reg_get; + } + + id1 = snd_soc_read(codec, WM8804_RST_DEVID1); + if (id1 < 0) { + dev_err(codec->dev, "Failed to read device ID: %d\n", id1); + ret = id1; + goto err_reg_enable; + } + + id2 = snd_soc_read(codec, WM8804_DEVID2); + if (id2 < 0) { + dev_err(codec->dev, "Failed to read device ID: %d\n", id2); + ret = id2; + goto err_reg_enable; + } + + id2 = (id2 << 8) | id1; + + if (id2 != ((wm8804_reg_defs[WM8804_DEVID2] << 8) + | wm8804_reg_defs[WM8804_RST_DEVID1])) { + dev_err(codec->dev, "Invalid device ID: %#x\n", id2); + ret = -EINVAL; + goto err_reg_enable; + } + + ret = wm8804_reset(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + goto err_reg_enable; + } + + wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + + snd_soc_add_controls(codec, wm8804_snd_controls, + ARRAY_SIZE(wm8804_snd_controls)); + return 0; + +err_reg_enable: + regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies), wm8804->supplies); +err_reg_get: + regulator_bulk_free(ARRAY_SIZE(wm8804->supplies), wm8804->supplies); + return ret; +} + +static struct snd_soc_dai_ops wm8804_dai_ops = { + .hw_params = wm8804_hw_params, + .set_fmt = wm8804_set_fmt, + .set_sysclk = wm8804_set_sysclk, + .set_clkdiv = wm8804_set_clkdiv, + .set_pll = wm8804_set_pll +}; + +#define WM8804_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ + SNDRV_PCM_FMTBIT_S24_LE) + +static struct snd_soc_dai_driver wm8804_dai = { + .name = "wm8804-s/pdif", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_192000, + .formats = WM8804_FORMATS, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_192000, + .formats = WM8804_FORMATS, + }, + .ops = &wm8804_dai_ops, + .symmetric_rates = 1 +}; + +static struct snd_soc_codec_driver soc_codec_dev_wm8804 = { + .probe = wm8804_probe, + .remove = wm8804_remove, + .suspend = wm8804_suspend, + .resume = wm8804_resume, + .set_bias_level = wm8804_set_bias_level, + .reg_cache_size = ARRAY_SIZE(wm8804_reg_defs), + .reg_word_size = sizeof(u8), + .reg_cache_default = wm8804_reg_defs, + .volatile_register = wm8804_volatile +}; + +#if defined(CONFIG_SPI_MASTER) +static int __devinit wm8804_spi_probe(struct spi_device *spi) +{ + struct wm8804_priv *wm8804; + int ret; + + wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL); + if (IS_ERR(wm8804)) + return PTR_ERR(wm8804); + + wm8804->control_type = SND_SOC_SPI; + spi_set_drvdata(spi, wm8804); + + ret = snd_soc_register_codec(&spi->dev, + &soc_codec_dev_wm8804, &wm8804_dai, 1); + if (ret < 0) + kfree(wm8804); + return ret; +} + +static int __devexit wm8804_spi_remove(struct spi_device *spi) +{ + snd_soc_unregister_codec(&spi->dev); + kfree(spi_get_drvdata(spi)); + return 0; +} + +static struct spi_driver wm8804_spi_driver = { + .driver = { + .name = "wm8804", + .owner = THIS_MODULE, + }, + .probe = wm8804_spi_probe, + .remove = __devexit_p(wm8804_spi_remove) +}; +#endif + +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct wm8804_priv *wm8804; + int ret; + + wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL); + if (IS_ERR(wm8804)) + return PTR_ERR(wm8804); + + wm8804->control_type = SND_SOC_I2C; + i2c_set_clientdata(i2c, wm8804); + + ret = snd_soc_register_codec(&i2c->dev, + &soc_codec_dev_wm8804, &wm8804_dai, 1); + if (ret < 0) + kfree(wm8804); + return ret; +} + +static __devexit int wm8804_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + kfree(i2c_get_clientdata(client)); + return 0; +} + +static const struct i2c_device_id wm8804_i2c_id[] = { + { "wm8804", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, wm8804_i2c_id); + +static struct i2c_driver wm8804_i2c_driver = { + .driver = { + .name = "wm8804", + .owner = THIS_MODULE, + }, + .probe = wm8804_i2c_probe, + .remove = __devexit_p(wm8804_i2c_remove), + .id_table = wm8804_i2c_id +}; +#endif + +static int __init wm8804_modinit(void) +{ + int ret = 0; + +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + ret = i2c_add_driver(&wm8804_i2c_driver); + if (ret) { + printk(KERN_ERR "Failed to register wm8804 I2C driver: %d\n", + ret); + } +#endif +#if defined(CONFIG_SPI_MASTER) + ret = spi_register_driver(&wm8804_spi_driver); + if (ret != 0) { + printk(KERN_ERR "Failed to register wm8804 SPI driver: %d\n", + ret); + } +#endif + return ret; +} +module_init(wm8804_modinit); + +static void __exit wm8804_exit(void) +{ +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + i2c_del_driver(&wm8804_i2c_driver); +#endif +#if defined(CONFIG_SPI_MASTER) + spi_unregister_driver(&wm8804_spi_driver); +#endif +} +module_exit(wm8804_exit); + +MODULE_DESCRIPTION("ASoC WM8804 driver"); +MODULE_AUTHOR("Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com>"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/wm8804.h b/sound/soc/codecs/wm8804.h new file mode 100644 index 0000000..8ec14f5 --- /dev/null +++ b/sound/soc/codecs/wm8804.h @@ -0,0 +1,61 @@ +/* + * wm8804.h -- WM8804 S/PDIF transceiver driver + * + * Copyright 2010 Wolfson Microelectronics plc + * + * Author: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> + * + * 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. + */ + +#ifndef _WM8804_H +#define _WM8804_H + +/* + * Register values. + */ +#define WM8804_RST_DEVID1 0x00 +#define WM8804_DEVID2 0x01 +#define WM8804_DEVREV 0x02 +#define WM8804_PLL1 0x03 +#define WM8804_PLL2 0x04 +#define WM8804_PLL3 0x05 +#define WM8804_PLL4 0x06 +#define WM8804_PLL5 0x07 +#define WM8804_PLL6 0x08 +#define WM8804_SPDMODE 0x09 +#define WM8804_INTMASK 0x0A +#define WM8804_INTSTAT 0x0B +#define WM8804_SPDSTAT 0x0C +#define WM8804_RXCHAN1 0x0D +#define WM8804_RXCHAN2 0x0E +#define WM8804_RXCHAN3 0x0F +#define WM8804_RXCHAN4 0x10 +#define WM8804_RXCHAN5 0x11 +#define WM8804_SPDTX1 0x12 +#define WM8804_SPDTX2 0x13 +#define WM8804_SPDTX3 0x14 +#define WM8804_SPDTX4 0x15 +#define WM8804_SPDTX5 0x16 +#define WM8804_GPO0 0x17 +#define WM8804_GPO1 0x18 +#define WM8804_GPO2 0x1A +#define WM8804_AIFTX 0x1B +#define WM8804_AIFRX 0x1C +#define WM8804_SPDRX1 0x1D +#define WM8804_PWRDN 0x1E + +#define WM8804_REGISTER_COUNT 30 +#define WM8804_MAX_REGISTER 0x1E + +#define WM8804_TX_CLKSRC_MCLK 1 +#define WM8804_TX_CLKSRC_PLL 2 + +#define WM8804_CLKOUT_SRC_CLK1 3 +#define WM8804_CLKOUT_SRC_OSCCLK 4 + +#define WM8804_CLKOUT_DIV 1 + +#endif /* _WM8804_H */ -- 1.7.3

4 4

[alsa-devel] [PATCH - Realtek HDA Codec 1/1] Added fixup for Lenovo Y550P
by valentine.sinitsyn＠gmail.com 04 Oct '10

04 Oct '10

From: Valentine Sinitsyn <valentine.sinitsyn(a)gmail.com> Signed-off-by: Valentine Sinitsyn <valentine.sinitsyn(a)gmail.com> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3b04087..124d52f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -19074,6 +19074,7 @@ static const struct alc_fixup alc662_fixups[] = { static struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), + SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), {} }; -- 1.7.3.1

2 1

[alsa-devel] sound problem
by mohit verma 04 Oct '10

04 Oct '10

hi all, i am working on ubuntu 10.04 and my kernel verison is 2.6.32.24 sound is not working on my system. i have tried toomany links on web but some while proceeding show error and some does not work. can anyone please help me to fix this bug?

2 1

[alsa-devel] [GIT PULL] ASoC updates for 2.6.37
by Liam Girdwood 03 Oct '10

03 Oct '10

The following changes since commit fc38a8a11d332549e4de0537ba34f197cf42788b: Dimitris Papastamos (1): ASoC: WM8985: Remove unneeded declaration. are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.37 Jarkko Nikula (2): omap: zoom2: Fix ASoC multi-component build breakage by removing dead code omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals arch/arm/mach-omap2/board-zoom-peripherals.c | 12 ++++++ arch/arm/mach-omap2/board-zoom2.c | 56 -------------------------- 2 files changed, 12 insertions(+), 56 deletions(-)

2 1

Re: [alsa-devel] Creative Sound Blaster X-Fi Titanium PCIe support
by nidujay 03 Oct '10

03 Oct '10

That's what I'm using at the moment. But I was hoping to delegate that job to the hardware and let the main CPU concentrate on Ardour and a sequencer. BTW as I mentioned earlier, I'm willing to do any necessary dev work, so if there's anyone from Creative watching, how would I go about getting some info on the EMU20K2? P.S. I'm aware that many a giant may have attempted this before me, but for what it's worth... Thanks D On 3 October 2010 02:49, Thor Kristoffersen <thorkr(a)gmail.com> wrote: > nidujay <nidujay(a)gmail.com> writes: > > Ignore my last post. I got it thanks. > > I'm glad you got it to work. By the way, regarding your first Titanium > issue about soundfont support, I recommend that you install Qsynth. It > provides full soundfont support in software. > > Thor >

1 0

[alsa-devel] [PATCH] ASoC: WM8804: Use a proper DAI name
by Dimitris Papastamos 03 Oct '10

03 Oct '10

Make sure the DAI name does not include a '/' since we might have per DAI debugfs or sysfs entries in the future. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8804.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index ca7d9ee..40e5067 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -669,7 +669,7 @@ static struct snd_soc_dai_ops wm8804_dai_ops = { SNDRV_PCM_FMTBIT_S24_LE) static struct snd_soc_dai_driver wm8804_dai = { - .name = "wm8804-s/pdif", + .name = "wm8804-spdif", .playback = { .stream_name = "Playback", .channels_min = 2, -- 1.7.3.1

3 2

[alsa-devel] [PATCH] ASoC: Put WM8962 GPIO2/3 into GPIO mode when configuring platform data too
by Mark Brown 02 Oct '10

02 Oct '10

GPIO2 and GPIO3 on the WM8962 are MFPs and need to be put into GPIO mode before the GPIO block can be used to control them. We're already doing this when used via gpiolib, factor out the code for use when setting static configurations via platform data as well. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 3a1db4a..6d30f34 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1733,6 +1733,31 @@ static void wm8962_free_beep(struct snd_soc_codec *codec) } #endif +static void wm8962_set_gpio_mode(struct snd_soc_codec *codec, int gpio) +{ + int mask = 0; + int val = 0; + + /* Some of the GPIOs are behind MFP configuration and need to + * be put into GPIO mode. */ + switch (gpio) { + case 2: + mask = WM8962_CLKOUT2_SEL_MASK; + val = 1 << WM8962_CLKOUT2_SEL_SHIFT; + break; + case 3: + mask = WM8962_CLKOUT3_SEL_MASK; + val = 1 << WM8962_CLKOUT3_SEL_SHIFT; + break; + default: + break; + } + + if (mask) + snd_soc_update_bits(codec, WM8962_ANALOGUE_CLOCKING1, + mask, val); +} + #ifdef CONFIG_GPIOLIB static inline struct wm8962_priv *gpio_to_wm8962(struct gpio_chip *chip) { @@ -1743,8 +1768,6 @@ static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset) { struct wm8962_priv *wm8962 = gpio_to_wm8962(chip); struct snd_soc_codec *codec = wm8962->codec; - int mask = 0; - int val; /* The WM8962 GPIOs aren't linearly numbered. For simplicity * we export linear numbers and error out if the unsupported @@ -1752,13 +1775,7 @@ static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset) */ switch (offset + 1) { case 2: - mask = WM8962_CLKOUT2_SEL_MASK; - val = 1 << WM8962_CLKOUT2_SEL_SHIFT; - break; case 3: - mask = WM8962_CLKOUT3_SEL_MASK; - val = 1 << WM8962_CLKOUT3_SEL_SHIFT; - break; case 5: case 6: break; @@ -1766,10 +1783,7 @@ static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset) return -EINVAL; } - /* Some of the GPIOs are behind MFP configuration */ - if (mask) - snd_soc_update_bits(codec, WM8962_ANALOGUE_CLOCKING1, - mask, val); + wm8962_set_gpio_mode(codec, offset + 1); return 0; } @@ -1943,9 +1957,11 @@ static int wm8962_probe(struct snd_soc_codec *codec) if (pdata) { /* Apply static configuration for GPIOs */ for (i = 0; i < ARRAY_SIZE(pdata->gpio_init); i++) - if (pdata->gpio_init[i]) + if (pdata->gpio_init[i]) { + wm8962_set_gpio_mode(codec, i + 1); snd_soc_write(codec, 0x200 + i, pdata->gpio_init[i] & 0xffff); + } /* Put the speakers into mono mode? */ if (pdata->spk_mono) -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: WM8804: Workaround GCC uninitialised variable warning
by Dimitris Papastamos 02 Oct '10

02 Oct '10

GCC 4.4.0 does not seem capable of working out that the variable is never used unless it is initialised. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8804.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 40e5067..e1fc722 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -392,13 +392,20 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, { int ret; struct snd_soc_codec *codec; - struct pll_div pll_div = { 0 }; + struct pll_div pll_div; codec = dai->codec; if (freq_in && freq_out) { ret = pll_factors(&pll_div, freq_out, freq_in); if (ret) return ret; + } else { + /* + * Bodge GCC 4.4.0 uninitialised variable warning - it + * doesn't seem capable of working out that we exit if + * freq_in or freq_out is 0 before any of the uses. + */ + memset(&pll_div, 0, sizeof pll_div); } /* power down the PLL before reprogramming it */ -- 1.7.3.1

2 1

[alsa-devel] [PATCH] ASoC: Implement interrupt based jack detection
by Mark Brown 02 Oct '10

02 Oct '10

Allow microphone detection on WM8962 to be performed using the interrupt signal, allowing the detection of both microphone presence and button presses with a signal singal from the CODEC to CPU. Currently a 250ms debounce time is applied to both short circuit and presence detection, this has not been optimised. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8962.h | 3 ++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index eb66c66..3a1db4a 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -25,6 +25,7 @@ #include <linux/slab.h> #include <linux/workqueue.h> #include <sound/core.h> +#include <sound/jack.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -63,6 +64,9 @@ struct wm8962_priv { int fll_fref; int fll_fout; + struct delayed_work mic_work; + struct snd_soc_jack *jack; + struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES]; struct notifier_block disable_nb[WM8962_NUM_SUPPLIES]; @@ -1462,9 +1466,40 @@ static struct snd_soc_dai_driver wm8962_dai = { .symmetric_rates = 1, }; +static void wm8962_mic_work(struct work_struct *work) +{ + struct wm8962_priv *wm8962 = container_of(work, + struct wm8962_priv, + mic_work.work); + struct snd_soc_codec *codec = wm8962->codec; + int status = 0; + int irq_pol = 0; + int reg; + + reg = snd_soc_read(codec, WM8962_ADDITIONAL_CONTROL_4); + + if (reg & WM8962_MICDET_STS) { + status |= SND_JACK_MICROPHONE; + irq_pol |= WM8962_MICD_IRQ_POL; + } + + if (reg & WM8962_MICSHORT_STS) { + status |= SND_JACK_BTN_0; + irq_pol |= WM8962_MICSCD_IRQ_POL; + } + + snd_soc_jack_report(wm8962->jack, status, + SND_JACK_MICROPHONE | SND_JACK_BTN_0); + + snd_soc_update_bits(codec, WM8962_MICINT_SOURCE_POL, + WM8962_MICSCD_IRQ_POL | + WM8962_MICD_IRQ_POL, irq_pol); +} + static irqreturn_t wm8962_irq(int irq, void *data) { struct snd_soc_codec *codec = data; + struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); int mask; int active; @@ -1479,12 +1514,59 @@ static irqreturn_t wm8962_irq(int irq, void *data) if (active & WM8962_TEMP_SHUT_EINT) dev_crit(codec->dev, "Thermal shutdown\n"); + if (active & (WM8962_MICSCD_EINT | WM8962_MICD_EINT)) { + dev_dbg(codec->dev, "Microphone event detected\n"); + + schedule_delayed_work(&wm8962->mic_work, + msecs_to_jiffies(250)); + } + /* Acknowledge the interrupts */ snd_soc_write(codec, WM8962_INTERRUPT_STATUS_2, active); return IRQ_HANDLED; } +/** + * wm8962_mic_detect - Enable microphone detection via the WM8962 IRQ + * + * @codec: WM8962 codec + * @jack: jack to report detection events on + * + * Enable microphone detection via IRQ on the WM8962. If GPIOs are + * being used to bring out signals to the processor then only platform + * data configuration is needed for WM8962 and processor GPIOs should + * be configured using snd_soc_jack_add_gpios() instead. + * + * If no jack is supplied detection will be disabled. + */ +int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) +{ + struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); + int irq_mask, enable; + + wm8962->jack = jack; + if (jack) { + irq_mask = 0; + enable = WM8962_MICDET_ENA; + } else { + irq_mask = WM8962_MICD_EINT | WM8962_MICSCD_EINT; + enable = 0; + } + + snd_soc_update_bits(codec, WM8962_INTERRUPT_STATUS_2_MASK, + WM8962_MICD_EINT | WM8962_MICSCD_EINT, irq_mask); + snd_soc_update_bits(codec, WM8962_ADDITIONAL_CONTROL_4, + WM8962_MICDET_ENA, enable); + + /* Send an initial empty report */ + snd_soc_jack_report(wm8962->jack, 0, + SND_JACK_MICROPHONE | SND_JACK_BTN_0); + + return 0; +} +EXPORT_SYMBOL_GPL(wm8962_mic_detect); + #ifdef CONFIG_PM static int wm8962_resume(struct snd_soc_codec *codec) { @@ -1773,6 +1855,7 @@ static int wm8962_probe(struct snd_soc_codec *codec) int i, trigger, irq_pol; wm8962->codec = codec; + INIT_DELAYED_WORK(&wm8962->mic_work, wm8962_mic_work); codec->cache_sync = 1; codec->idle_bias_off = 1; @@ -1946,6 +2029,8 @@ static int wm8962_remove(struct snd_soc_codec *codec) if (i2c->irq) free_irq(i2c->irq, codec); + cancel_delayed_work_sync(&wm8962->mic_work); + wm8962_free_gpio(codec); wm8962_free_beep(codec); for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) diff --git a/sound/soc/codecs/wm8962.h b/sound/soc/codecs/wm8962.h index fce1199..2af6c93 100644 --- a/sound/soc/codecs/wm8962.h +++ b/sound/soc/codecs/wm8962.h @@ -14,6 +14,7 @@ #define _WM8962_H #include <asm/types.h> +#include <sound/soc.h> #define WM8962_SYSCLK_MCLK 1 #define WM8962_SYSCLK_FLL 2 @@ -3785,4 +3786,6 @@ struct wm8962_reg_access { extern const struct wm8962_reg_access wm8962_reg_access[WM8962_MAX_REGISTER + 1]; +int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack); + #endif -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Relax restrictions on WM8962 BCLK configuration
by Mark Brown 02 Oct '10

02 Oct '10

The restrictions on configuring BCLK are overly cautious, other constraints in the system should ensure that reconfiguration is not possible when the device is sufficiently active to be unable to support reclocking. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index be34146..38cbf85 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -911,12 +911,6 @@ static void wm8962_configure_bclk(struct snd_soc_codec *codec) int clocking2 = 0; int aif2 = 0; - /* If the CODEC is powered on we can configure BCLK */ - if (codec->bias_level != SND_SOC_BIAS_OFF) { - dev_dbg(codec->dev, "Bias is off, can't configure BCLK\n"); - return; - } - if (!wm8962->bclk) { dev_dbg(codec->dev, "No BCLK rate configured\n"); return; -- 1.7.1

2 2

[alsa-devel] [PATCH] ASoC: Add support for WM8962 GPIO outputs
by Mark Brown 02 Oct '10

02 Oct '10

The WM8962 features five GPIOs, add support for controlling their output state via gpiolib. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/sound/wm8962.h | 1 + sound/soc/codecs/wm8962.c | 119 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8962.h | 1 + 3 files changed, 121 insertions(+), 0 deletions(-) diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h index 9722aac..2b5306c 100644 --- a/include/sound/wm8962.h +++ b/include/sound/wm8962.h @@ -15,6 +15,7 @@ #define WM8962_GPIO_SET 0x10000 struct wm8962_pdata { + int gpio_base; u32 gpio_init[WM8962_MAX_GPIO]; /* Setup for microphone detection, raw value to be written to diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 38cbf85..eb66c66 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -17,6 +17,7 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/gcd.h> +#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/input.h> #include <linux/platform_device.h> @@ -70,6 +71,10 @@ struct wm8962_priv { struct work_struct beep_work; int beep_rate; #endif + +#ifdef CONFIG_GPIOLIB + struct gpio_chip gpio_chip; +#endif }; /* We can't use the same notifier block for more than one supply and @@ -1646,6 +1651,118 @@ static void wm8962_free_beep(struct snd_soc_codec *codec) } #endif +#ifdef CONFIG_GPIOLIB +static inline struct wm8962_priv *gpio_to_wm8962(struct gpio_chip *chip) +{ + return container_of(chip, struct wm8962_priv, gpio_chip); +} + +static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset) +{ + struct wm8962_priv *wm8962 = gpio_to_wm8962(chip); + struct snd_soc_codec *codec = wm8962->codec; + int mask = 0; + int val; + + /* The WM8962 GPIOs aren't linearly numbered. For simplicity + * we export linear numbers and error out if the unsupported + * ones are requsted. + */ + switch (offset + 1) { + case 2: + mask = WM8962_CLKOUT2_SEL_MASK; + val = 1 << WM8962_CLKOUT2_SEL_SHIFT; + break; + case 3: + mask = WM8962_CLKOUT3_SEL_MASK; + val = 1 << WM8962_CLKOUT3_SEL_SHIFT; + break; + case 5: + case 6: + break; + default: + return -EINVAL; + } + + /* Some of the GPIOs are behind MFP configuration */ + if (mask) + snd_soc_update_bits(codec, WM8962_ANALOGUE_CLOCKING1, + mask, val); + + return 0; +} + +static void wm8962_gpio_set(struct gpio_chip *chip, unsigned offset, int value) +{ + struct wm8962_priv *wm8962 = gpio_to_wm8962(chip); + struct snd_soc_codec *codec = wm8962->codec; + + snd_soc_update_bits(codec, WM8962_GPIO_BASE + offset, + WM8962_GP2_LVL, value << WM8962_GP2_LVL_SHIFT); +} + +static int wm8962_gpio_direction_out(struct gpio_chip *chip, + unsigned offset, int value) +{ + struct wm8962_priv *wm8962 = gpio_to_wm8962(chip); + struct snd_soc_codec *codec = wm8962->codec; + int val; + + /* Force function 1 (logic output) */ + val = (1 << WM8962_GP2_FN_SHIFT) | (value << WM8962_GP2_LVL_SHIFT); + + return snd_soc_update_bits(codec, WM8962_GPIO_BASE + offset, + WM8962_GP2_FN_MASK | WM8962_GP2_LVL, val); +} + +static struct gpio_chip wm8962_template_chip = { + .label = "wm8962", + .owner = THIS_MODULE, + .request = wm8962_gpio_request, + .direction_output = wm8962_gpio_direction_out, + .set = wm8962_gpio_set, + .can_sleep = 1, +}; + +static void wm8962_init_gpio(struct snd_soc_codec *codec) +{ + struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); + struct wm8962_pdata *pdata = dev_get_platdata(codec->dev); + int ret; + + wm8962->gpio_chip = wm8962_template_chip; + wm8962->gpio_chip.ngpio = WM8962_MAX_GPIO; + wm8962->gpio_chip.dev = codec->dev; + + if (pdata && pdata->gpio_base) + wm8962->gpio_chip.base = pdata->gpio_base; + else + wm8962->gpio_chip.base = -1; + + ret = gpiochip_add(&wm8962->gpio_chip); + if (ret != 0) + dev_err(codec->dev, "Failed to add GPIOs: %d\n", ret); +} + +static void wm8962_free_gpio(struct snd_soc_codec *codec) +{ + struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); + int ret; + + ret = gpiochip_remove(&wm8962->gpio_chip); + if (ret != 0) + dev_err(codec->dev, "Failed to remove GPIOs: %d\n", ret); +} +#else +static void wm8962_init_gpio(struct snd_soc_codec *codec) +{ +} + +static void wm8962_free_gpio(struct snd_soc_codec *codec) +{ +} +#endif + static int wm8962_probe(struct snd_soc_codec *codec) { int ret; @@ -1778,6 +1895,7 @@ static int wm8962_probe(struct snd_soc_codec *codec) wm8962_add_widgets(codec); wm8962_init_beep(codec); + wm8962_init_gpio(codec); if (i2c->irq) { if (pdata && pdata->irq_active_low) { @@ -1828,6 +1946,7 @@ static int wm8962_remove(struct snd_soc_codec *codec) if (i2c->irq) free_irq(i2c->irq, codec); + wm8962_free_gpio(codec); wm8962_free_beep(codec); for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) regulator_unregister_notifier(wm8962->supplies[i].consumer, diff --git a/sound/soc/codecs/wm8962.h b/sound/soc/codecs/wm8962.h index 6145399..fce1199 100644 --- a/sound/soc/codecs/wm8962.h +++ b/sound/soc/codecs/wm8962.h @@ -181,6 +181,7 @@ #define WM8962_EQ39 0x175 #define WM8962_EQ40 0x176 #define WM8962_EQ41 0x177 +#define WM8962_GPIO_BASE 0x200 #define WM8962_GPIO_2 0x201 #define WM8962_GPIO_3 0x202 #define WM8962_GPIO_5 0x204 -- 1.7.1

2 1

[alsa-devel] Acer Aspire One Volume Low
by Alexander Lam 02 Oct '10

02 Oct '10

Hi all, I have an Acer Aspire one (the original one) with a realtek alc268 codec (intel hda) In windows XP, I would say that the maximum volume is somewhere around 5 times higher than in linux. I am running kernel 2.6.35.6. I actually have the spec sheet for the codec (from a google search) and the mixer ranges that are specified in the kernel seem sane,so I'm clueless as to what's happening. Maybe there's some mystery bit to set, because the windows XP Realtek driver has a "limit output" option that when turned on, makes the output be about as loud as in linux. (or maybe this option just cuts the mixer values in half...) Suggestions? Lacking that, is there a tool already written to read back the codec configuration in windows XP? -- Alexander Lam

1 0

Re: [alsa-devel] [PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals
by Liam Girdwood 02 Oct '10

02 Oct '10

On Fri, 2010-09-24 at 11:31 -0500, Lopez Cruz, Misael wrote: > Hi Jarkko, > > > ASoC Multi-Component Support moves some code from sound/soc/omap/zoom2.c > > into > > arch/arm/mach-omap2/board-zoom2.c. However, that code should go to > > board-zoom-peripherals.c instead as there is common code and registration > > for zoom boards. > > > > Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> > > Cc: Vikram Pandita <vikram.pandita(a)ti.com> > > Cc: Lopez Cruz, Misael <x0052729(a)ti.com> > > Cc: Jorge Eduardo Candelaria <jorge.candelaria(a)ti.com> > > Cc: Tony Lindgren <tony(a)atomide.com> > > --- > > I don't have this HW so not tested. > Tested on zoom2 using the 2 patches of your series, compilation break is > gone and audio works fine. > > Thanks, > -Misael Applied, and manually added your Tested-by: Thanks Liam -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk

3 2

[alsa-devel] [PATCH] omap: zoom2: fix build break due to ASoC changes
by Anand Gadiyar 01 Oct '10

01 Oct '10

Commit f0fba2ad1b6 (ASoC: multi-component - ASoC Multi-Component Support) in linux-next as of 20101001 broke omap builds with the following errors. CC arch/arm/mach-omap2/board-zoom2.o arch/arm/mach-omap2/board-zoom2.c:65: error: 'zoom2_bci_data' undeclared here (not in a function) arch/arm/mach-omap2/board-zoom2.c:67: error: 'zoom2_usb_data' undeclared here (not in a function) arch/arm/mach-omap2/board-zoom2.c:68: error: 'zoom2_gpio_data' undeclared here (not in a function) arch/arm/mach-omap2/board-zoom2.c:69: error: 'zoom2_kp_twl4030_data' undeclared here (not in a function) arch/arm/mach-omap2/board-zoom2.c:71: error: 'zoom2_vmmc1' undeclared here (not in a function) arch/arm/mach-omap2/board-zoom2.c:72: error: 'zoom2_vmmc2' undeclared here (not in a function) arch/arm/mach-omap2/board-zoom2.c:73: error: 'zoom2_vsim' undeclared here (not in a function) make[1]: *** [arch/arm/mach-omap2/board-zoom2.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 For zoom2/3, the i2c peripheral initialization is already done in board-zoom-peripherals.c and should not be done in board-zoom2.c. Revert all of the changes made to board-zoom2.c to fix the build. ASoC-related changes should be done separately if needed. Signed-off-by: Anand Gadiyar <gadiyar(a)ti.com> Cc: Tony Lindgren <tony(a)atomide.com> Cc: Liam Girdwood <lrg(a)slimlogic.co.uk> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Liam, The only functional change I see here is the twl4030_codec_audio_data. That should probably go into board-zoom-peripherals.c. I'll take a deeper look in a while and fix properly there. - Anand arch/arm/mach-omap2/board-zoom2.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) Index: linux-2.6/arch/arm/mach-omap2/board-zoom2.c =================================================================== --- linux-2.6.orig/arch/arm/mach-omap2/board-zoom2.c +++ linux-2.6/arch/arm/mach-omap2/board-zoom2.c @@ -14,7 +14,6 @@ #include <linux/platform_device.h> #include <linux/input.h> #include <linux/gpio.h> -#include <linux/i2c/twl.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -35,11 +34,8 @@ static void __init omap_zoom2_init_irq(v omap_gpio_init(); } -/* EXTMUTE callback function */ -void zoom2_set_hs_extmute(int mute) -{ - gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); -} +/* REVISIT: These audio entries can be removed once MFD code is merged */ +#if 0 static struct twl4030_madc_platform_data zoom2_madc_data = { .irq_line = 1, @@ -47,9 +43,6 @@ static struct twl4030_madc_platform_data static struct twl4030_codec_audio_data zoom2_audio_data = { .audio_mclk = 26000000, - .ramp_delay_value = 3, /* 161 ms */ - .hs_extmute = 1, - .set_hs_extmute = zoom2_set_hs_extmute, }; static struct twl4030_codec_data zoom2_codec_data = { @@ -71,24 +64,10 @@ static struct twl4030_platform_data zoom .vmmc1 = &zoom2_vmmc1, .vmmc2 = &zoom2_vmmc2, .vsim = &zoom2_vsim, -}; -static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = { - { - I2C_BOARD_INFO("twl4030", 0x48), - .flags = I2C_CLIENT_WAKE, - .irq = INT_34XX_SYS_NIRQ, - .platform_data = &zoom2_twldata, - }, }; -static int __init omap3_zoom2_i2c_init(void) -{ - omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo, - ARRAY_SIZE(zoom2_i2c_boardinfo)); - return 0; -} - +#endif #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { @@ -156,7 +135,6 @@ static void __init omap_zoom2_init(void) { omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); zoom_peripherals_init(); - omap3_zoom2_i2c_init(); board_nand_init(zoom_nand_partitions, ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS); zoom_debugboard_init();

2 2

[alsa-devel] question on ADAT S/MUX using snd-ice1712 and Alesis AI4
by Niels Mayer 01 Oct '10

01 Oct '10

Now that I have an ADAT-capable card ($20 ebay ice1712-based terratec ews88d) I'm curious... if I combine it with something like http://www.kellyindustries.com/computer/alesis_ai4.html ( http://www.alesis.com/ai4 ) and use the S/MUX mode built in to the AI4 across eight channels to create four 24/96 channels. //// //// //// //// In order for the AI-4 to operate at the 96 kHz samplerate it has to be run in S/MUX mode or sample split mode which means that you get 4 channels of conversion and not 8. This is standard and perfectly acceptable. The first two channels will be routed out to the ADAT lightpipe outputs 1 through 4 and the 2nd two channels with be routed out ADAT lightpipe outputs 5 through 8. //// //// //// //// Would I be able to "transparently" use these "S/MUX"d channels in a linux DAW, by simply recording/playing-back a higher channel count per track (e.g. 4 for a stereo track, 2 for a mono)? This seems like a good way to achieve "studio quality" 24/96 record&playback at a distance from the computer -- via ADAT cable -- using high quality outboard A/D and D/A or interfacing to external equipment already presenting AES/EBU format I/O. If a device like the AI4 actually does all the bit-splitting and other fu, both for input and output -- wouldn't it not matter that the actual 2-track or 4-track contents are essentially "noise" because nothing in Linux-land would understand the S/MUX format. Next question: to avoid the hack suggested above, is there some kind of ALSA plugin that would reconstitute/create synchronized pairs of S/MUX data on the same soundcard into single 24/96 streams, both for input and output? How is S/Mux handled in Linux & ALSA? Thanks. Niels http://nielsmayer.com PS: The Alesis AI4 seems nicer than the http://www.aphex.com/144.htm -- for one I won't need to make 110 ohm cables with XLR connectors to DB25. The AI4's support for S/MUX mode is especially nice-sounding -- if there was a way for it to work in linux. Any other suggestions for converting ADAT to AES/EBU (or spdif) w/ decent synchronization options for input?

1 0

[alsa-devel] [PATCH] ASoC: WM8940: incorrect mask for BCLKDIV
by Grzegorz Daniluk 01 Oct '10

01 Oct '10

corrected bitmask in BCLKDIV setting (wm8940_set_dai_clkdiv) and bias_level in wm8940 register function. best regards, Grzegorz Daniluk ---- diff -urN a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c --- a/sound/soc/codecs/wm8940.c 2010-04-16 11:10:10.000000000 +0000 +++ b/sound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 @@ -514,7 +514,7 @@ if ((Ndiv < 6) || (Ndiv > 12)) printk(KERN_WARNING - "WM8940 N value %d outwith recommended range!d\n", + "WM8940 N value %d outwith recommended range!\n", Ndiv); pll_div.n = Ndiv; @@ -604,7 +604,7 @@ switch (div_id) { case WM8940_BCLKDIV: - reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFEF3; + reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3; ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2)); break; case WM8940_MCLKDIV: @@ -800,9 +800,10 @@ wm8940_dai.dev = codec->dev; - wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + wm8940_set_bias_level(codec, SND_SOC_BIAS_PREPARE); - ret = snd_soc_write(codec, WM8940_POWER1, 0x180); + reg = snd_soc_read(codec, WM8940_POWER1); + ret = snd_soc_write(codec, WM8940_POWER1, reg | 0x180); if (ret < 0) return ret;

2 1

[alsa-devel] Creative Sound Blaster X-Fi Titanium PCIe support
by nidujay 01 Oct '10

01 Oct '10

Hi all, I've got a Creative Sound Blaster X-Fi Titanium PCIe sound card which I purchased for the following 2 reasons: 1. It supports sound fonts 2. I require an SPDIF optical input My OS is UbuntuStudio 10.04 which I believe uses alsa version 1.0.22. Unfortunately, I haven't been able to get either of the above working (Ok I haven't investigated (2) very deeply yet). Any idea what I can do? P.S. I'm willing to get my hands dirty if there's actual development effort required. Thanks D

3 3

[alsa-devel] namehint: Evaluate more possibilities for hw devices
by Stas Sergeev 01 Oct '10

01 Oct '10

Hi Jaroslav. I updated the alsa-lib from git, and "aplay -L" no longer shows some PCMs it used to list before. I tracked this down to this commit: --- commit 97d25c0766405453d3c298bd51dd4916121a4f6a Author: Jaroslav Kysela <perex(a)perex.cz> Date: Fri Aug 20 10:31:17 2010 +0200 namehint: Evaluate more possibilities for hw devices --- Attached are the outputs before and after the commit. So why some devices are now missing?

3 10

[alsa-devel] refreshing the reg cache in asoc driver
by lin_g 01 Oct '10

01 Oct '10

Hi, I'm writing the driver for wm8804 s/pdif transceiver. However, my problem is that I would like to refresh my register cache inside the driver by periodically reading the values stored in device's registers. There is an interrupt handler fsi_interrupt() (in fsi.c) called when codec receives some data, but I suppose I need to find something closer to the 'codec layer'. Or maybe I'm just thinking wrongly and there is much simpler way of doing this. Appreciate any advice. Thank you very much, best regards, Greg

3 2

[alsa-devel] OSX Core Audio ASYNC OUT with rate feedback format ?
by Alex 01 Oct '10

01 Oct '10

Hi Daniel et al, I have successfully interfaced the sdr-widget with Linux alsa-driver for ASYNC OUT with rate feedback. Found out after much trial and error and reading of the usbaudio alsa-driver source code that you are using 12.13 as the format for the feedback rate !!! I was trying with 10.14 (UAC1 v1.2 specs , I think) in 3 bytes, and 16.16 (USB 2.0) in 4 bytes for quite a number of days with no success !!! However, 12.13 in 4 bytes, whilst working like a charm with Linux, does NOT work with OSX. Would you know the format used by OSX? Thanks. Alex

2 5

[alsa-devel] how many processed frames? + various thoughts
by John John 01 Oct '10

01 Oct '10

Hello all, I'm rather new to ALSA development. I would like to build a little loop-player driven by a beat counter and a good mail exchange from linuxaudio.org gave me a smart solution: to count the beat bars into the audio thread. Knowing the sample rate and the processed samples, I'm able to calculate the clock (what do you think about this approach?). And now my question: is there a good function into alsa API which returns the number of processed frames? Or even better, is it possibile to fire a callback after N frames? Thank you in advance (and sorry for my English)! JJ

2 1

[alsa-devel] [PATCH] ASoC: Remove -dai suffix from i.MX SSI driver
by Mark Brown 01 Oct '10

01 Oct '10

While it is a generic serial port in practice the i.MX SSI is only supported in Linux as an audio port (the i.MX has dedicated SPI controllers and so on). This means we don't need to disambiguate against other uses of the hardware and so can drop the -dai suffix from the driver name which fixes merge issues with the i.MX tree in -next. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- arch/arm/mach-mx3/clock-imx31.c | 4 ++-- arch/arm/mach-mx3/clock-imx35.c | 4 ++-- arch/arm/mach-mx3/devices.c | 4 ++-- arch/arm/plat-mxc/audmux-v2.c | 4 ++-- sound/soc/imx/eukrea-tlv320.c | 2 +- sound/soc/imx/imx-ssi.c | 2 +- sound/soc/imx/phycore-ac97.c | 2 +- sound/soc/imx/wm1133-ev1.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-mx3/clock-imx31.c b/arch/arm/mach-mx3/clock-imx31.c index 9b52a67..9a9eb6d 100644 --- a/arch/arm/mach-mx3/clock-imx31.c +++ b/arch/arm/mach-mx3/clock-imx31.c @@ -558,8 +558,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk) _REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk) _REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk) - _REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk) - _REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) + _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) _REGISTER_CLOCK(NULL, "firi", firi_clk) _REGISTER_CLOCK(NULL, "ata", ata_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c index f29c3e9..d3af0fd 100644 --- a/arch/arm/mach-mx3/clock-imx35.c +++ b/arch/arm/mach-mx3/clock-imx35.c @@ -464,8 +464,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "sdma", sdma_clk) _REGISTER_CLOCK(NULL, "spba", spba_clk) _REGISTER_CLOCK(NULL, "spdif", spdif_clk) - _REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk) - _REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) + _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 90eccba..a4fd1a2 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -327,14 +327,14 @@ static struct resource imx_ssi_resources1[] = { }; struct platform_device imx_ssi_device0 = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .id = 0, .num_resources = ARRAY_SIZE(imx_ssi_resources0), .resource = imx_ssi_resources0, }; struct platform_device imx_ssi_device1 = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .id = 1, .num_resources = ARRAY_SIZE(imx_ssi_resources1), .resource = imx_ssi_resources1, diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c index 910374d..f9e7cdb 100644 --- a/arch/arm/plat-mxc/audmux-v2.c +++ b/arch/arm/plat-mxc/audmux-v2.c @@ -45,9 +45,9 @@ static const char *audmux_port_string(int port) { switch (port) { case MX31_AUDMUX_PORT1_SSI0: - return "imx-ssi-dai.0"; + return "imx-ssi.0"; case MX31_AUDMUX_PORT2_SSI1: - return "imx-ssi-dai.1"; + return "imx-ssi.1"; case MX31_AUDMUX_PORT3_SSI_PINS_3: return "SSI3"; case MX31_AUDMUX_PORT4_SSI_PINS_4: diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c index 807f736..b596752 100644 --- a/sound/soc/imx/eukrea-tlv320.c +++ b/sound/soc/imx/eukrea-tlv320.c @@ -82,7 +82,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { .codec_dai = "tlv320aic23-hifi", .platform_name = "imx-pcm-audio.0", .codec_name = "tlv320aic23-codec.0-001a", - .cpu_dai = "imx-ssi-dai.0", + .cpu_dai = "imx-ssi.0", .ops = &eukrea_tlv320_snd_ops, }; diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 26716e9..d4bd345 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c @@ -734,7 +734,7 @@ static struct platform_driver imx_ssi_driver = { .remove = __devexit_p(imx_ssi_remove), .driver = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .owner = THIS_MODULE, }, }; diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c index 65f0f99..6a65dd7 100644 --- a/sound/soc/imx/phycore-ac97.c +++ b/sound/soc/imx/phycore-ac97.c @@ -34,7 +34,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = { .stream_name = "HiFi", .codec_dai_name = "wm9712-hifi", .codec_name = "wm9712-codec", - .cpu_dai_name = "imx-ssi-dai.0", + .cpu_dai_name = "imx-ssi.0", .platform_name = "imx-fiq-pcm-audio.0", .ops = &imx_phycore_hifi_ops, }, diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c index 7406863..30fdb15 100644 --- a/sound/soc/imx/wm1133-ev1.c +++ b/sound/soc/imx/wm1133-ev1.c @@ -243,7 +243,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link wm1133_ev1_dai = { .name = "WM1133-EV1", .stream_name = "Audio", - .cpu_dai_name = "imx-ssi-dai.0", + .cpu_dai_name = "imx-ssi.0", .codec_dai_name = "wm8350-hifi", .platform_name = "imx-fiq-pcm-audio.0", .codec_name = "wm8350-codec.0-0x1a", -- 1.7.1

3 2

[alsa-devel] unsupported variant of snd_hda_intel
by Alexandre 01 Oct '10

01 Oct '10

Hello, I have an Acer Aspire 4736G laptop. The soundcard that is shipped int his laptop is intel-hda based as shown: cat /proc/asound/cards 0 [Intel ]: HDA-Intel - HDA Intel HDA Intel at 0x9b300000 irq 46 Basic sound output is correct but few feature are missing: - internal mic seems to be found but do not works. - sound output stop working when trying to send it using HDMI output - heads do not work when plugged neither when forcing pulseaudio to use it. I have an ubuntu 10.10 which is shipped with alsa 1.0.23. I have googled around and tried loading the snd-hda-intel with several parameters () as found in HD-Audio-Models.txt to no avail. cat /proc/asound/pcm 00-00: ALC888 Analog : ALC888 Analog : playback 1 : capture 1 00-01: ALC888 Digital : ALC888 Digital : playback 1 00-03: NVIDIA HDMI : NVIDIA HDMI : playback 1 Where can I begin to help implement the support for this sound card? I have very skills in developement in general but am ready to try if it is not to hard (I supose I can use previous code for similar models).. I just need a shepherd. Thanks

1 0

Re: [alsa-devel] ALSA AUDIOj support for PXA320
by Sayiram K N 01 Oct '10

01 Oct '10

when i tried to use the PXA2xx specific driver for PXA3xx there are errors pointing to PXA3xx. i will capture the error and will publish here. thanks On Fri, Oct 1, 2010 at 9:19 AM, Mark Brown < broonie(a)opensource.wolfsonmicro.com> wrote: > On Fri, Oct 01, 2010 at 08:58:45AM +0530, Sayiram K N wrote: > > what i mean is under sound/soc/pxa/ i can see only pxa2xx-ac97 file but > not > > the sound/soc/pxa/pxa3xx-ac97 files which are required for pxa320. > > The IP is the same for both PXA2xx and PXA3xx so the same driver is > used. >

2 1

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 01 Oct '10

01 Oct '10

The following changes since commit 45e655047fd64ba7eb52d14ef5acc41763c8ea34: ASoC: Initial WM8962 IRQ support (2010-09-29 00:32:36 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 Dimitris Papastamos (2): ASoC: Remove unneeded use of spi_bus_type ASoC: WM8804: Initial driver Mark Brown (2): ASoC: Mark WM8962 Additional Control 4 register as volatile ASoC: Provide microphone bias configuration for WM8962 include/sound/wm8962.h | 6 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wm8510.c | 1 - sound/soc/codecs/wm8711.c | 1 - sound/soc/codecs/wm8728.c | 1 - sound/soc/codecs/wm8731.c | 1 - sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 1 - sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8804.c | 820 ++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8804.h | 61 +++ sound/soc/codecs/wm8900.c | 1 - sound/soc/codecs/wm8962-tables.c | 2 +- sound/soc/codecs/wm8962.c | 12 + sound/soc/codecs/wm8985.c | 1 - sound/soc/codecs/wm8988.c | 1 - 17 files changed, 906 insertions(+), 11 deletions(-) create mode 100644 sound/soc/codecs/wm8804.c create mode 100644 sound/soc/codecs/wm8804.h

2 1

[alsa-devel] [PATCH] ASoC: Remove unneeded use of spi_bus_type
by Dimitris Papastamos 30 Sep '10

30 Sep '10

No need to explicitly set the bus type, spi_register_driver does that for us. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8510.c | 1 - sound/soc/codecs/wm8711.c | 1 - sound/soc/codecs/wm8728.c | 1 - sound/soc/codecs/wm8731.c | 1 - sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 1 - sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8900.c | 1 - sound/soc/codecs/wm8985.c | 1 - sound/soc/codecs/wm8988.c | 1 - 10 files changed, 0 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 02ecf54..8f10709 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -627,7 +627,6 @@ static int __devexit wm8510_spi_remove(struct spi_device *spi) static struct spi_driver wm8510_spi_driver = { .driver = { .name = "wm8510", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8510_spi_probe, diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 52a923a..54fbd76 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -453,7 +453,6 @@ static int __devexit wm8711_spi_remove(struct spi_device *spi) static struct spi_driver wm8711_spi_driver = { .driver = { .name = "wm8711-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8711_spi_probe, diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 32eba85..075f35e 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c @@ -307,7 +307,6 @@ static int __devexit wm8728_spi_remove(struct spi_device *spi) static struct spi_driver wm8728_spi_driver = { .driver = { .name = "wm8728-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8728_spi_probe, diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index bdce125..6313858 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -600,7 +600,6 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi) static struct spi_driver wm8731_spi_driver = { .driver = { .name = "wm8731-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8731_spi_probe, diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 4d1ec9d..6c924cd 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -782,7 +782,6 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) static struct spi_driver wm8750_spi_driver = { .driver = { .name = "wm8750-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8750_spi_probe, diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 64ea066..8f679a1 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1651,7 +1651,6 @@ static int __devexit wm8753_spi_remove(struct spi_device *spi) static struct spi_driver wm8753_spi_driver = { .driver = { .name = "wm8753-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8753_spi_probe, diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index c0b6917..04182c4 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -483,7 +483,6 @@ static int __devexit wm8776_spi_remove(struct spi_device *spi) static struct spi_driver wm8776_spi_driver = { .driver = { .name = "wm8776-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8776_spi_probe, diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 25c8ccd..b4f1172 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -1291,7 +1291,6 @@ static int __devexit wm8900_spi_remove(struct spi_device *spi) static struct spi_driver wm8900_spi_driver = { .driver = { .name = "wm8900-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8900_spi_probe, diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index bd109c4..04ec1fe 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -1145,7 +1145,6 @@ static int __devexit wm8985_spi_remove(struct spi_device *spi) static struct spi_driver wm8985_spi_driver = { .driver = { .name = "wm8985", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8985_spi_probe, diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index d08b1fe..d7f2597 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -844,7 +844,6 @@ static int __devexit wm8988_spi_remove(struct spi_device *spi) static struct spi_driver wm8988_spi_driver = { .driver = { .name = "wm8988-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8988_spi_probe, -- 1.7.3

3 2

[alsa-devel] ALC662 NID 0x09 is not unmuted anymore - intentional?
by Valentine Sinitsyn 30 Sep '10

30 Sep '10

Hello, I happened to spend last couple of evenings figuring out what's wrong with microphone on my laptop (Lenovo Y550P, in case you are interested in). It has Intel HDA soundcard with Realtek 272 codec. No, I'm not going to ask for a help on devel mailing list, at the very least because I know what's wrong myself. But this knowledge poses some questions regarding snd-hda-intel kenel driver (more precisely, patch_realtek.c, which is part of it) I want to clarify. Anyway, sorry for the long intro :) It quickly appeared that AUD_IN widget of the codec (NID 0x09) has no way to be unmuted - its input amplifier is muted at the very beginning of alc662_init_verbs and is not connected to any ALSA control (maybe it should). I remembered the mic was working some time ago, so I've skimmed through kernel versions and found the offending commit: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… One can clearly see from it that before it was applied (i.e. Linux 2.6.34), this widget was unmuted in alc662_auto_init_verbs (thus it happened to every auto-configured card, including mine), but it is not unmuted anymore (as far as I can see, for any model except maybe ecs - I haven't dug into this too much). The question is if it is intentional (i.e. there should be some ALSA switch connected to 0x09 input amplifier) or is it a bug? Thanks for the explanations. -- Regards, Valentine Sinitsyn

2 1

[alsa-devel] ALSA AUDIOj support for PXA320
by Sayiram K N 30 Sep '10

30 Sep '10

Hi All I am using PXA320 where it has ALSA . but for Linux 2.6.29 there is no support for PXA320. can i get a patch to support PXA320 . thanks in advance BR Sayiram K N

2 1

[alsa-devel] [PATCH] ASoC: WM8985: Register notifier for the regulator being disabled
by Dimitris Papastamos 30 Sep '10

30 Sep '10

Make sure we get an event when the regulator is disabled so we know we have to sync the cache afterwards. Minor stylistic changes. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8985.c | 51 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index 6116b42..bd109c4 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -126,11 +126,35 @@ static const int volume_update_regs[] = { struct wm8985_priv { enum snd_soc_control_type control_type; + struct snd_soc_codec *codec; struct regulator_bulk_data supplies[WM8985_NUM_SUPPLIES]; + struct notifier_block disable_nb[WM8985_NUM_SUPPLIES]; unsigned int sysclk; unsigned int bclk; }; +/* + * We can't use the same notifier block for more than one supply and + * there's no way I can see to get from a callback to the caller + * except container_of(). + */ +#define WM8985_REGULATOR_EVENT(n) \ +static int wm8985_regulator_event_##n(struct notifier_block *nb, \ + unsigned long event, void *data) \ +{ \ + struct wm8985_priv *wm8985 = container_of(nb, struct wm8985_priv, \ + disable_nb[n]); \ + if (event & REGULATOR_EVENT_DISABLE) { \ + wm8985->codec->cache_sync = 1; \ + } \ + return 0; \ +} + +WM8985_REGULATOR_EVENT(0) +WM8985_REGULATOR_EVENT(1) +WM8985_REGULATOR_EVENT(2) +WM8985_REGULATOR_EVENT(3) + static const struct { int div; int ratio; @@ -782,7 +806,7 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id, { int ret; struct snd_soc_codec *codec; - struct pll_div pll_div; + struct pll_div pll_div = { 0 }; codec = dai->codec; if (freq_in && freq_out) { @@ -794,7 +818,7 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id, /* disable the PLL before reprogramming it */ snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, WM8985_PLLEN_MASK, 0); - + if (!freq_in || !freq_out) return 0; @@ -932,8 +956,6 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec, snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, 0); snd_soc_write(codec, WM8985_POWER_MANAGEMENT_3, 0); - codec->cache_sync = 1; - regulator_bulk_disable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies); break; @@ -963,9 +985,13 @@ static int wm8985_resume(struct snd_soc_codec *codec) static int wm8985_remove(struct snd_soc_codec *codec) { struct wm8985_priv *wm8985; + int i; wm8985 = snd_soc_codec_get_drvdata(codec); wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF); + for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++) + regulator_unregister_notifier(wm8985->supplies[i].consumer, + &wm8985->disable_nb[i]); regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies); return 0; } @@ -978,6 +1004,7 @@ static int wm8985_probe(struct snd_soc_codec *codec) u16 *cache; wm8985 = snd_soc_codec_get_drvdata(codec); + wm8985->codec = codec; ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8985->control_type); if (ret < 0) { @@ -995,6 +1022,22 @@ static int wm8985_probe(struct snd_soc_codec *codec) return ret; } + wm8985->disable_nb[0].notifier_call = wm8985_regulator_event_0; + wm8985->disable_nb[1].notifier_call = wm8985_regulator_event_1; + wm8985->disable_nb[2].notifier_call = wm8985_regulator_event_2; + wm8985->disable_nb[3].notifier_call = wm8985_regulator_event_3; + + /* This should really be moved into the regulator core */ + for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++) { + ret = regulator_register_notifier(wm8985->supplies[i].consumer, + &wm8985->disable_nb[i]); + if (ret != 0) { + dev_err(codec->dev, + "Failed to register regulator notifier: %d\n", + ret); + } + } + ret = regulator_bulk_enable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies); if (ret) { -- 1.7.3

2 3

[alsa-devel] [PATCH 1/2] ASoC: Mark WM8962 Additional Control 4 register as volatile
by Mark Brown 30 Sep '10

30 Sep '10

There are some status bits for microphone detection in here. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962-tables.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8962-tables.c b/sound/soc/codecs/wm8962-tables.c index f21a8c1..6fa98ea 100644 --- a/sound/soc/codecs/wm8962-tables.c +++ b/sound/soc/codecs/wm8962-tables.c @@ -21204,7 +21204,7 @@ const struct wm8962_reg_access wm8962_reg_access[WM8962_MAX_REGISTER + 1] = { { 0x0000, 0x0000, 0x0000 }, /* R45 */ { 0x0000, 0x0000, 0x0000 }, /* R46 */ { 0x000F, 0x0000, 0x0000 }, /* R47 - Thermal Shutdown Status */ - { 0x7EC7, 0x7E07, 0x0000 }, /* R48 - Additional Control (4) */ + { 0x7EC7, 0x7E07, 0xFFFF }, /* R48 - Additional Control (4) */ { 0x00D3, 0x00D7, 0xFFFF }, /* R49 - Class D Control 1 */ { 0x0000, 0x0000, 0x0000 }, /* R50 */ { 0x0047, 0x0047, 0x0000 }, /* R51 - Class D Control 2 */ -- 1.7.1

2 2

[alsa-devel] via_dmapos_patch
by David Henningsson 30 Sep '10

30 Sep '10

I'm researching a few bugs where the user claims position_fix=1 helps the problem, but adding the quirk for that model surprisingly didn't. So looking at the code, I concluded that the difference was via_dmapos_patch, and that they all had via_dmapos_patch=1, and that via_dmapos_patch=0 helped them solve the problem. Three out of five (not all of them have reported back on via_dmapos_patch=0 yet) are VIA controllers rev 10. So we now have VIA controllers that need via_dmapos_patch=0. I can think of a few approaches here: 1) since position_fix=1 implicitly sets via_dmapos_patch to 0 (maybe unintentionally), we should add a position_fix=3 meaning lpib + via_dmapos_patch=1 2) figure if something has changed recently (as in "within the last year"...) that has made via_dmapos_patch=1 work worse than before 3) figure out if there are several ATI/VIA controllers that actually never wants the patch. Any thoughts? -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 3

[PATCH] ALSA: HDA: Add position_fix=3 module option, and refactor related code
by David Henningsson 30 Sep '10

30 Sep '10

What was previously known as via_dmapos_patch, and hard-coded to be used for VIA and ATI controllers, is now configurable through a module option. The background is that some VIA controllers seem to prefer via_dmapos_patch to be turned off. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- Documentation/sound/alsa/HD-Audio.txt | 8 ++++-- sound/pci/hda/hda_intel.c | 41 +++++++++++++++----------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt index 278cc21..7d58e60 100644 --- a/Documentation/sound/alsa/HD-Audio.txt +++ b/Documentation/sound/alsa/HD-Audio.txt @@ -57,9 +57,11 @@ dead. However, this detection isn't perfect on some devices. In such a case, you can change the default method via `position_fix` option. `position_fix=1` means to use LPIB method explicitly. -`position_fix=2` means to use the position-buffer. 0 is the default -value, the automatic check and fallback to LPIB as described in the -above. If you get a problem of repeated sounds, this option might +`position_fix=2` means to use the position-buffer. +`position_fix=3` means to use a combination of both methods, needed +for some VIA and ATI controllers. 0 is the default value for all other +controllers, the automatic check and fallback to LPIB as described in +the above. If you get a problem of repeated sounds, this option might help. In addition to that, every controller is known to be broken regarding diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ec07e47..38b063e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -78,8 +78,8 @@ MODULE_PARM_DESC(enable, "Enable Intel HD audio interface."); module_param_array(model, charp, NULL, 0444); MODULE_PARM_DESC(model, "Use the given board model."); module_param_array(position_fix, int, NULL, 0444); -MODULE_PARM_DESC(position_fix, "Fix DMA pointer " - "(0 = auto, 1 = none, 2 = POSBUF)."); +MODULE_PARM_DESC(position_fix, "DMA pointer read method." + "(0 = auto, 1 = LPIB, 2 = POSBUF, 3 = VIACOMBO)."); module_param_array(bdl_pos_adj, int, NULL, 0644); MODULE_PARM_DESC(bdl_pos_adj, "BDL position adjustment offset."); module_param_array(probe_mask, int, NULL, 0444); @@ -305,6 +305,7 @@ enum { POS_FIX_AUTO, POS_FIX_LPIB, POS_FIX_POSBUF, + POS_FIX_VIACOMBO, }; /* Defines for ATI HD Audio support in SB450 south bridge */ @@ -433,7 +434,6 @@ struct azx { unsigned int polling_mode :1; unsigned int msi :1; unsigned int irq_pending_warned :1; - unsigned int via_dmapos_patch :1; /* enable DMA-position fix for VIA */ unsigned int probing :1; /* codec probing phase */ /* for debugging */ @@ -1309,11 +1309,8 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev) azx_sd_writel(azx_dev, SD_BDLPU, upper_32_bits(azx_dev->bdl.addr)); /* enable the position buffer */ - if (chip->position_fix[0] == POS_FIX_POSBUF || - chip->position_fix[0] == POS_FIX_AUTO || - chip->position_fix[1] == POS_FIX_POSBUF || - chip->position_fix[1] == POS_FIX_AUTO || - chip->via_dmapos_patch) { + if (chip->position_fix[0] != POS_FIX_LPIB || + chip->position_fix[1] != POS_FIX_LPIB) { if (!(azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE)) azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE); @@ -1852,20 +1849,21 @@ static unsigned int azx_get_position(struct azx *chip, struct azx_dev *azx_dev) { unsigned int pos; + int stream = azx_dev->substream->stream; - if (chip->via_dmapos_patch) + switch (chip->position_fix[stream]) { + case POS_FIX_LPIB: + /* read LPIB */ + pos = azx_sd_readl(azx_dev, SD_LPIB); + break; + case POS_FIX_VIACOMBO: pos = azx_via_get_position(chip, azx_dev); - else { - int stream = azx_dev->substream->stream; - if (chip->position_fix[stream] == POS_FIX_POSBUF || - chip->position_fix[stream] == POS_FIX_AUTO) { - /* use the position buffer */ - pos = le32_to_cpu(*azx_dev->posbuf); - } else { - /* read LPIB */ - pos = azx_sd_readl(azx_dev, SD_LPIB); - } + break; + default: + /* use the position buffer */ + pos = le32_to_cpu(*azx_dev->posbuf); } + if (pos >= azx_dev->bufsize) pos = 0; return pos; @@ -2313,6 +2311,7 @@ static int __devinit check_position_fix(struct azx *chip, int fix) switch (fix) { case POS_FIX_LPIB: case POS_FIX_POSBUF: + case POS_FIX_VIACOMBO: return fix; } @@ -2320,11 +2319,9 @@ static int __devinit check_position_fix(struct azx *chip, int fix) switch (chip->driver_type) { case AZX_DRIVER_VIA: case AZX_DRIVER_ATI: - chip->via_dmapos_patch = 1; /* Use link position directly, avoid any transfer problem. */ - return POS_FIX_LPIB; + return POS_FIX_VIACOMBO; } - chip->via_dmapos_patch = 0; q = snd_pci_quirk_lookup(chip->pci, position_fix_list); if (q) { -- 1.7.1 --------------010901080501010700060808--

1 0

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 30 Sep '10

30 Sep '10

The following changes since commit cf1ff5011614cad540fa872b46552d078b510c38: ASoC: Fix a compile warning for printk format (2010-09-27 08:18:13 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 Dimitris Papastamos (1): ASoC: WM8985: Use the correct macro for the kcontrol defined Mark Brown (3): ASoC: Fix masking of WM8962 FLL1 register ASoC: Lowercase WM8962 CODEC name ASoC: Initial WM8962 IRQ support include/sound/wm8962.h | 2 + sound/soc/codecs/wm8962.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- sound/soc/codecs/wm8985.c | 4 +- 3 files changed, 65 insertions(+), 5 deletions(-)

2 1

[alsa-devel] [PATCH 1/2] ASoC: Strip -codec from I2C and SPI driver names
by Mark Brown 30 Sep '10

30 Sep '10

This was the result of cross-tree multi-component changes. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/atmel/playpaq_wm8510.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/atmel/snd-soc-afeb9260.c | 2 +- sound/soc/blackfin/bf5xx-ad1836.c | 2 +- sound/soc/blackfin/bf5xx-ad193x.c | 2 +- sound/soc/blackfin/bf5xx-ssm2602.c | 2 +- sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/ad193x.c | 4 ++-- sound/soc/codecs/ak4104.c | 2 +- sound/soc/codecs/ak4535.c | 2 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 2 +- sound/soc/codecs/cs4270.c | 2 +- sound/soc/codecs/cs42l51.c | 2 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/ssm2602.c | 2 +- sound/soc/codecs/tlv320aic23.c | 2 +- sound/soc/codecs/tlv320aic26.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 2 +- sound/soc/codecs/tlv320dac33.c | 2 +- sound/soc/codecs/uda134x.c | 2 +- sound/soc/codecs/uda1380.c | 2 +- sound/soc/codecs/wm8510.c | 2 +- sound/soc/codecs/wm8523.c | 2 +- sound/soc/codecs/wm8727.c | 2 +- sound/soc/codecs/wm8728.c | 4 ++-- sound/soc/codecs/wm8731.c | 4 ++-- sound/soc/codecs/wm8741.c | 2 +- sound/soc/codecs/wm8750.c | 4 ++-- sound/soc/codecs/wm8753.c | 4 ++-- sound/soc/codecs/wm8776.c | 4 ++-- sound/soc/codecs/wm8900.c | 2 +- sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8940.c | 2 +- sound/soc/codecs/wm8955.c | 2 +- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8961.c | 2 +- sound/soc/codecs/wm8971.c | 2 +- sound/soc/codecs/wm8974.c | 2 +- sound/soc/codecs/wm8988.c | 2 +- sound/soc/codecs/wm8990.c | 2 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm9081.c | 2 +- sound/soc/ep93xx/snappercl15.c | 2 +- sound/soc/fsl/mpc8610_hpcd.c | 4 ++-- sound/soc/fsl/p1022_ds.c | 4 ++-- sound/soc/imx/eukrea-tlv320.c | 2 +- sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/omap/am3517evm.c | 2 +- sound/soc/omap/n810.c | 2 +- sound/soc/omap/osk5912.c | 2 +- sound/soc/omap/rx51.c | 2 +- sound/soc/pxa/imote2.c | 2 +- sound/soc/pxa/magician.c | 4 ++-- sound/soc/pxa/poodle.c | 2 +- sound/soc/pxa/raumfeld.c | 4 ++-- sound/soc/pxa/spitz.c | 2 +- sound/soc/pxa/z2.c | 2 +- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 4 ++-- sound/soc/s3c24xx/neo1973_wm8753.c | 4 ++-- sound/soc/s3c24xx/rx1950_uda1380.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/s3c24xx/smartq_wm8987.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 ++-- sound/soc/s6000/s6105-ipcam.c | 2 +- sound/soc/sh/fsi-ak4642.c | 4 ++-- sound/soc/sh/fsi-da7210.c | 2 +- 70 files changed, 84 insertions(+), 84 deletions(-) diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c index 5f4e59f..9d545f2 100644 --- a/sound/soc/atmel/playpaq_wm8510.c +++ b/sound/soc/atmel/playpaq_wm8510.c @@ -356,7 +356,7 @@ static struct snd_soc_dai_link playpaq_wm8510_dai = { .stream_name = "WM8510 PCM", .cpu_dai_name= "atmel-ssc-dai.0", .platform_name = "atmel-pcm-audio", - .codec_name = "wm8510-codec.0-0x1a", + .codec_name = "wm8510.0-0x1a", .codec_dai_name = "wm8510-hifi", .init = playpaq_wm8510_init, .ops = &playpaq_wm8510_ops, diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 293569d..eaafbfc 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -184,7 +184,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { .codec_dai_name = "wm8731-hifi", .init = at91sam9g20ek_wm8731_init, .platform_name = "atmel-pcm-audio", - .codec_name = "wm8731-codec.0-001b", + .codec_name = "wm8731.0-001b", .ops = &at91sam9g20ek_ops, }; diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c index e3d2835..ff6499b 100644 --- a/sound/soc/atmel/snd-soc-afeb9260.c +++ b/sound/soc/atmel/snd-soc-afeb9260.c @@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = { .cpu_dai_name = "atmel-ssc-dai.0", .codec_dai_name = "tlv320aic23-hifi", .platform_name = "atmel_pcm-audio", - .codec_name = "tlv320aic23-codec.0-0x1a", + .codec_name = "tlv320aic23.0-0x1a", .init = afeb9260_tlv320aic23_init, .ops = &afeb9260_ops, }; diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c index 2394bff..9738269 100644 --- a/sound/soc/blackfin/bf5xx-ad1836.c +++ b/sound/soc/blackfin/bf5xx-ad1836.c @@ -86,7 +86,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai = { .cpu_dai_name = "bf5xx-tdm", .codec_dai_name = "ad1836-hifi", .platform_name = "bf5xx-tdm-pcm-audio", - .codec_name = "ad1836-codec.0", + .codec_name = "ad1836.0", .ops = &bf5xx_ad1836_ops, }; diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c index e4a6253..fd06fee 100644 --- a/sound/soc/blackfin/bf5xx-ad193x.c +++ b/sound/soc/blackfin/bf5xx-ad193x.c @@ -100,7 +100,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai = { .cpu_dai_name = "bf5xx-tdm", .codec_dai_name ="ad193x-hifi", .platform_name = "bf5xx-tdm-pcm-audio", - .codec_name = "ad193x-codec.5", + .codec_name = "ad193x.5", .ops = &bf5xx_ad193x_ops, }; diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c index 36f2769..e1fda9b 100644 --- a/sound/soc/blackfin/bf5xx-ssm2602.c +++ b/sound/soc/blackfin/bf5xx-ssm2602.c @@ -120,7 +120,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = { .cpu_dai_name = "bf5xx-i2s", .codec_dai_name = "ssm2602-hifi", .platform_name = "bf5xx-pcm-audio", - .codec_name = "ssm2602-codec.0-0x1b", + .codec_name = "ssm2602.0-0x1b", .ops = &bf5xx_ssm2602_ops, }; diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index d272534..27b6ed4 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c @@ -307,7 +307,7 @@ static int __devexit ad1836_spi_remove(struct spi_device *spi) static struct spi_driver ad1836_spi_driver = { .driver = { - .name = "ad1836-codec", + .name = "ad1836", .owner = THIS_MODULE, }, .probe = ad1836_spi_probe, diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index fa2834c..28b49de 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -429,7 +429,7 @@ static int __devexit ad193x_spi_remove(struct spi_device *spi) static struct spi_driver ad193x_spi_driver = { .driver = { - .name = "ad193x-codec", + .name = "ad193x", .owner = THIS_MODULE, }, .probe = ad193x_spi_probe, @@ -475,7 +475,7 @@ static int __devexit ad193x_i2c_remove(struct i2c_client *client) static struct i2c_driver ad193x_i2c_driver = { .driver = { - .name = "ad193x-codec", + .name = "ad193x", }, .probe = ad193x_i2c_probe, .remove = __devexit_p(ad193x_i2c_remove), diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index c27f8f5..0cf17b3 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c @@ -43,7 +43,7 @@ #define AK4104_TX_TXE (1 << 0) #define AK4104_TX_V (1 << 1) -#define DRV_NAME "ak4104-codec" +#define DRV_NAME "ak4104" struct ak4104_private { enum snd_soc_control_type control_type; diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index cd88c8f..41e90a9 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c @@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(i2c, ak4535_i2c_id); static struct i2c_driver ak4535_i2c_driver = { .driver = { - .name = "ak4535-codec", + .name = "ak4535", .owner = THIS_MODULE, }, .probe = ak4535_i2c_probe, diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index a95ff4f..775a003 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -478,7 +478,7 @@ MODULE_DEVICE_TABLE(i2c, ak4642_i2c_id); static struct i2c_driver ak4642_i2c_driver = { .driver = { - .name = "ak4642-codec", + .name = "ak4642", .owner = THIS_MODULE, }, .probe = ak4642_i2c_probe, diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index 24f5f49..46e03ec 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c @@ -709,7 +709,7 @@ MODULE_DEVICE_TABLE(i2c, ak4671_i2c_id); static struct i2c_driver ak4671_i2c_driver = { .driver = { - .name = "ak4671-codec", + .name = "ak4671", .owner = THIS_MODULE, }, .probe = ak4671_i2c_probe, diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 5fd8e0d..944124f 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -799,7 +799,7 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id); */ static struct i2c_driver cs4270_i2c_driver = { .driver = { - .name = "cs4270-codec", + .name = "cs4270", .owner = THIS_MODULE, }, .id_table = cs4270_id, diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index cb086ea..fef7383 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -622,7 +622,7 @@ MODULE_DEVICE_TABLE(i2c, cs42l51_id); static struct i2c_driver cs42l51_i2c_driver = { .driver = { - .name = "cs42l51-codec", + .name = "cs42l51", .owner = THIS_MODULE, }, .id_table = cs42l51_id, diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 58bb9b9..cbc6e95 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -594,7 +594,7 @@ MODULE_DEVICE_TABLE(i2c, da7210_i2c_id); /* I2C codec control layer */ static struct i2c_driver da7210_i2c_driver = { .driver = { - .name = "da7210-codec", + .name = "da7210", .owner = THIS_MODULE, }, .probe = da7210_i2c_probe, diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 6f38d61..0d17b6c 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -651,7 +651,7 @@ MODULE_DEVICE_TABLE(i2c, ssm2602_i2c_id); /* corgi i2c codec control layer */ static struct i2c_driver ssm2602_i2c_driver = { .driver = { - .name = "ssm2602-codec", + .name = "ssm2602", .owner = THIS_MODULE, }, .probe = ssm2602_i2c_probe, diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index e8652b1..ddd56c5 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -744,7 +744,7 @@ MODULE_DEVICE_TABLE(i2c, tlv320aic23_id); static struct i2c_driver tlv320aic23_i2c_driver = { .driver = { - .name = "tlv320aic23-codec", + .name = "tlv320aic23", }, .probe = tlv320aic23_codec_probe, .remove = __exit_p(tlv320aic23_i2c_remove), diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 6b7d71e..7b00237 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -439,7 +439,7 @@ static int aic26_spi_remove(struct spi_device *spi) static struct spi_driver aic26_spi = { .driver = { - .name = "tlv320aic26-codec", + .name = "tlv320aic26", .owner = THIS_MODULE, }, .probe = aic26_spi_probe, diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index fc68779..e0ab55d 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1516,7 +1516,7 @@ static int aic3x_i2c_remove(struct i2c_client *client) /* machine i2c codec control layer */ static struct i2c_driver aic3x_i2c_driver = { .driver = { - .name = "tlv320aic3x-codec", + .name = "tlv320aic3x", .owner = THIS_MODULE, }, .probe = aic3x_i2c_probe, diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index bf6d01f..67b3cd7 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -1608,7 +1608,7 @@ static const struct i2c_device_id tlv320dac33_i2c_id[] = { static struct i2c_driver tlv320dac33_i2c_driver = { .driver = { - .name = "tlv320dac33-codec", + .name = "tlv320dac33", .owner = THIS_MODULE, }, .probe = dac33_i2c_probe, diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index 7540a50..51e6568 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -619,7 +619,7 @@ static int __devexit uda134x_codec_remove(struct platform_device *pdev) static struct platform_driver uda134x_codec_driver = { .driver = { - .name = "uda134x-codec", + .name = "uda134x", .owner = THIS_MODULE, }, .probe = uda134x_codec_probe, diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 0c6c725..44adb96 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -853,7 +853,7 @@ MODULE_DEVICE_TABLE(i2c, uda1380_i2c_id); static struct i2c_driver uda1380_i2c_driver = { .driver = { - .name = "uda1380-codec", + .name = "uda1380", .owner = THIS_MODULE, }, .probe = uda1380_i2c_probe, diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 02ecf54..1174ca7 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -670,7 +670,7 @@ MODULE_DEVICE_TABLE(i2c, wm8510_i2c_id); static struct i2c_driver wm8510_i2c_driver = { .driver = { - .name = "wm8510-codec", + .name = "wm8510", .owner = THIS_MODULE, }, .probe = wm8510_i2c_probe, diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c index 712ef7c..14967f7 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c @@ -551,7 +551,7 @@ MODULE_DEVICE_TABLE(i2c, wm8523_i2c_id); static struct i2c_driver wm8523_i2c_driver = { .driver = { - .name = "wm8523-codec", + .name = "wm8523", .owner = THIS_MODULE, }, .probe = wm8523_i2c_probe, diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c index 7488082..27bcb79 100644 --- a/sound/soc/codecs/wm8727.c +++ b/sound/soc/codecs/wm8727.c @@ -59,7 +59,7 @@ static int __devexit wm8727_remove(struct platform_device *pdev) static struct platform_driver wm8727_codec_driver = { .driver = { - .name = "wm8727-codec", + .name = "wm8727", .owner = THIS_MODULE, }, diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 32eba85..f619eba 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c @@ -306,7 +306,7 @@ static int __devexit wm8728_spi_remove(struct spi_device *spi) static struct spi_driver wm8728_spi_driver = { .driver = { - .name = "wm8728-codec", + .name = "wm8728", .bus = &spi_bus_type, .owner = THIS_MODULE, }, @@ -351,7 +351,7 @@ MODULE_DEVICE_TABLE(i2c, wm8728_i2c_id); static struct i2c_driver wm8728_i2c_driver = { .driver = { - .name = "wm8728-codec", + .name = "wm8728", .owner = THIS_MODULE, }, .probe = wm8728_i2c_probe, diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index bdce125..7039b83 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -599,7 +599,7 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi) static struct spi_driver wm8731_spi_driver = { .driver = { - .name = "wm8731-codec", + .name = "wm8731", .bus = &spi_bus_type, .owner = THIS_MODULE, }, @@ -644,7 +644,7 @@ MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id); static struct i2c_driver wm8731_i2c_driver = { .driver = { - .name = "wm8731-codec", + .name = "wm8731", .owner = THIS_MODULE, }, .probe = wm8731_i2c_probe, diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 90e31e9..136c64c 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -523,7 +523,7 @@ MODULE_DEVICE_TABLE(i2c, wm8741_i2c_id); static struct i2c_driver wm8741_i2c_driver = { .driver = { - .name = "wm8741-codec", + .name = "wm8741", .owner = THIS_MODULE, }, .probe = wm8741_i2c_probe, diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 4d1ec9d..75136cc 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -781,7 +781,7 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) static struct spi_driver wm8750_spi_driver = { .driver = { - .name = "wm8750-codec", + .name = "wm8750", .bus = &spi_bus_type, .owner = THIS_MODULE, }, @@ -827,7 +827,7 @@ MODULE_DEVICE_TABLE(i2c, wm8750_i2c_id); static struct i2c_driver wm8750_i2c_driver = { .driver = { - .name = "wm8750-codec", + .name = "wm8750", .owner = THIS_MODULE, }, .probe = wm8750_i2c_probe, diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 64ea066..a59608c 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1650,7 +1650,7 @@ static int __devexit wm8753_spi_remove(struct spi_device *spi) static struct spi_driver wm8753_spi_driver = { .driver = { - .name = "wm8753-codec", + .name = "wm8753", .bus = &spi_bus_type, .owner = THIS_MODULE, }, @@ -1695,7 +1695,7 @@ MODULE_DEVICE_TABLE(i2c, wm8753_i2c_id); static struct i2c_driver wm8753_i2c_driver = { .driver = { - .name = "wm8753-codec", + .name = "wm8753", .owner = THIS_MODULE, }, .probe = wm8753_i2c_probe, diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index c0b6917..7c032ab 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -482,7 +482,7 @@ static int __devexit wm8776_spi_remove(struct spi_device *spi) static struct spi_driver wm8776_spi_driver = { .driver = { - .name = "wm8776-codec", + .name = "wm8776", .bus = &spi_bus_type, .owner = THIS_MODULE, }, @@ -527,7 +527,7 @@ MODULE_DEVICE_TABLE(i2c, wm8776_i2c_id); static struct i2c_driver wm8776_i2c_driver = { .driver = { - .name = "wm8776-codec", + .name = "wm8776", .owner = THIS_MODULE, }, .probe = wm8776_i2c_probe, diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 25c8ccd..f39563a 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -1290,7 +1290,7 @@ static int __devexit wm8900_spi_remove(struct spi_device *spi) static struct spi_driver wm8900_spi_driver = { .driver = { - .name = "wm8900-codec", + .name = "wm8900", .bus = &spi_bus_type, .owner = THIS_MODULE, }, diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 622b602..aab6040 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1801,7 +1801,7 @@ MODULE_DEVICE_TABLE(i2c, wm8903_i2c_id); static struct i2c_driver wm8903_i2c_driver = { .driver = { - .name = "wm8903-codec", + .name = "wm8903", .owner = THIS_MODULE, }, .probe = wm8903_i2c_probe, diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 33be84e..1039d4c 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2553,7 +2553,7 @@ MODULE_DEVICE_TABLE(i2c, wm8904_i2c_id); static struct i2c_driver wm8904_i2c_driver = { .driver = { - .name = "wm8904-codec", + .name = "wm8904", .owner = THIS_MODULE, }, .probe = wm8904_i2c_probe, diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 2cb16f8..380c171 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -791,7 +791,7 @@ MODULE_DEVICE_TABLE(i2c, wm8940_i2c_id); static struct i2c_driver wm8940_i2c_driver = { .driver = { - .name = "wm8940-codec", + .name = "wm8940", .owner = THIS_MODULE, }, .probe = wm8940_i2c_probe, diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index f89ad6c..84dcfb5 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -1025,7 +1025,7 @@ MODULE_DEVICE_TABLE(i2c, wm8955_i2c_id); static struct i2c_driver wm8955_i2c_driver = { .driver = { - .name = "wm8955-codec", + .name = "wm8955", .owner = THIS_MODULE, }, .probe = wm8955_i2c_probe, diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 8d5efb3..ecc50c9 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -1036,7 +1036,7 @@ MODULE_DEVICE_TABLE(i2c, wm8960_i2c_id); static struct i2c_driver wm8960_i2c_driver = { .driver = { - .name = "wm8960-codec", + .name = "wm8960", .owner = THIS_MODULE, }, .probe = wm8960_i2c_probe, diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index 4f326f6..39cd5eb 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c @@ -1116,7 +1116,7 @@ MODULE_DEVICE_TABLE(i2c, wm8961_i2c_id); static struct i2c_driver wm8961_i2c_driver = { .driver = { - .name = "wm8961-codec", + .name = "wm8961", .owner = THIS_MODULE, }, .probe = wm8961_i2c_probe, diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 63f6dbf..86ac400 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -742,7 +742,7 @@ MODULE_DEVICE_TABLE(i2c, wm8971_i2c_id); static struct i2c_driver wm8971_i2c_driver = { .driver = { - .name = "wm8971-codec", + .name = "wm8971", .owner = THIS_MODULE, }, .probe = wm8971_i2c_probe, diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index b4363f6..89d5ba1 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -682,7 +682,7 @@ MODULE_DEVICE_TABLE(i2c, wm8974_i2c_id); static struct i2c_driver wm8974_i2c_driver = { .driver = { - .name = "wm8974-codec", + .name = "wm8974", .owner = THIS_MODULE, }, .probe = wm8974_i2c_probe, diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index d08b1fe..02a5c36 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -843,7 +843,7 @@ static int __devexit wm8988_spi_remove(struct spi_device *spi) static struct spi_driver wm8988_spi_driver = { .driver = { - .name = "wm8988-codec", + .name = "wm8988", .bus = &spi_bus_type, .owner = THIS_MODULE, }, diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 264828e..bd52c24 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c @@ -1429,7 +1429,7 @@ MODULE_DEVICE_TABLE(i2c, wm8990_i2c_id); static struct i2c_driver wm8990_i2c_driver = { .driver = { - .name = "wm8990-codec", + .name = "wm8990", .owner = THIS_MODULE, }, .probe = wm8990_i2c_probe, diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 589e3fa..65563fb 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -1627,7 +1627,7 @@ MODULE_DEVICE_TABLE(i2c, wm8993_i2c_id); static struct i2c_driver wm8993_i2c_driver = { .driver = { - .name = "wm8993-codec", + .name = "wm8993", .owner = THIS_MODULE, }, .probe = wm8993_i2c_probe, diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index ecc7c37..87404fd 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1359,7 +1359,7 @@ MODULE_DEVICE_TABLE(i2c, wm9081_i2c_id); static struct i2c_driver wm9081_i2c_driver = { .driver = { - .name = "wm9081-codec", + .name = "wm9081", .owner = THIS_MODULE, }, .probe = wm9081_i2c_probe, diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c index 28ab5ff..16a8d63 100644 --- a/sound/soc/ep93xx/snappercl15.c +++ b/sound/soc/ep93xx/snappercl15.c @@ -92,7 +92,7 @@ static struct snd_soc_dai_link snappercl15_dai = { .stream_name = "AIC23", .cpu_dai_name = "ep93xx-i2s", .codec_dai_name = "tlv320aic23-hifi", - .codec_name = "tlv320aic23-codec.0-001a", + .codec_name = "tlv320aic23.0-001a", .platform_name = "ep93xx-pcm-audio", .init = snappercl15_tlv320aic23_init, .ops = &snappercl15_ops, diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 0d7dcf1..5a37099 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -246,7 +246,7 @@ static int get_parent_cell_index(struct device_node *np) * 'struct device' It's ugly and hackish, but it works. * * The dev_name for such devices include the bus number and I2C address. For - * example, "cs4270-codec.0-004f". + * example, "cs4270.0-004f". */ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len) { @@ -266,7 +266,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len) if (bus < 0) return bus; - snprintf(buf, len, "%s-codec.%u-%04x", temp, bus, addr); + snprintf(buf, len, "%s.%u-%04x", temp, bus, addr); return 0; } diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 63b9eaa..e855863 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -249,7 +249,7 @@ static int get_parent_cell_index(struct device_node *np) * 'struct device' It's ugly and hackish, but it works. * * The dev_name for such devices include the bus number and I2C address. For - * example, "cs4270-codec.0-004f". + * example, "cs4270.0-004f". */ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len) { @@ -269,7 +269,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len) if (bus < 0) return bus; - snprintf(buf, len, "%s-codec.%u-%04x", temp, bus, addr); + snprintf(buf, len, "%s.%u-%04x", temp, bus, addr); return 0; } diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c index 807f736..09406c9 100644 --- a/sound/soc/imx/eukrea-tlv320.c +++ b/sound/soc/imx/eukrea-tlv320.c @@ -81,7 +81,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { .stream_name = "TLV320AIC23", .codec_dai = "tlv320aic23-hifi", .platform_name = "imx-pcm-audio.0", - .codec_name = "tlv320aic23-codec.0-001a", + .codec_name = "tlv320aic23.0-001a", .cpu_dai = "imx-ssi-dai.0", .ops = &eukrea_tlv320_snd_ops, }; diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c index 9d7c81e..d6d90a6 100644 --- a/sound/soc/kirkwood/kirkwood-openrd.c +++ b/sound/soc/kirkwood/kirkwood-openrd.c @@ -68,7 +68,7 @@ static struct snd_soc_dai_link openrd_client_dai[] = { .cpu_dai_name = "kirkwood-i2s", .platform_name = "kirkwood-pcm-audio", .codec_dai_name = "cs42l51-hifi", - .codec_name = "cs42l51-codec.0-004a", + .codec_name = "cs42l51.0-004a", .ops = &openrd_client_ops, }, }; diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index 68bd902..59f3d10 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c @@ -139,7 +139,7 @@ static struct snd_soc_dai_link am3517evm_dai = { .cpu_dai_name ="omap-mcbsp-dai.0", .codec_dai_name = "tlv320aic23-hifi", .platform_name = "omap-pcm-audio", - .codec_name = "tlv320aic23-codec", + .codec_name = "tlv320aic23", .init = am3517evm_aic23_init, .ops = &am3517evm_ops, }; diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index a3b6d89..f98e8eb 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -310,7 +310,7 @@ static struct snd_soc_dai_link n810_dai = { .stream_name = "AIC33", .cpu_dai_name = "omap-mcbsp-dai.1", .platform_name = "omap-pcm-audio", - .codec_name = "tlv320aic3x-codec.2-0018", + .codec_name = "tlv320aic3x.2-0018", .codec_dai_name = "tlv320aic3x-hifi", .init = n810_aic33_init, .ops = &n810_ops, diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index f0e6625..60bb76a 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c @@ -140,7 +140,7 @@ static struct snd_soc_dai_link osk_dai = { .cpu_dai_name = "omap-mcbsp-dai.0", .codec_dai_name = "tlv320aic23-hifi", .platform_name = "omap-pcm-audio", - .codec_name = "tlv320aic23-codec", + .codec_name = "tlv320aic23", .init = osk_tlv320aic23_init, .ops = &osk_ops, }; diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 04b5723..e3eb0ef 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -286,7 +286,7 @@ static struct snd_soc_dai_link rx51_dai[] = { .cpu_dai_name = "omap-mcbsp-dai.1", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "omap-pcm-audio", - .codec_name = "tlv320aic3x-codec.2-0018", + .codec_name = "tlv320aic3x.2-0018", .init = rx51_aic34_init, .ops = &rx51_ops, }, diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c index 154fc6f..ecac0e3 100644 --- a/sound/soc/pxa/imote2.c +++ b/sound/soc/pxa/imote2.c @@ -66,7 +66,7 @@ static struct snd_soc_dai_link imote2_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8940-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8940-codec.0-0034", + .codec_name = "wm8940.0-0034", .ops = &imote2_asoc_ops, }; diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index b8207ce..06ce144 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -430,7 +430,7 @@ static struct snd_soc_dai_link magician_dai[] = { .cpu_dai_name = "pxa-ssp-dai.0", .codec_dai_name = "uda1380-hifi-playback", .platform_name = "pxa-pcm-audio", - .codec_name = "uda1380-codec.0-0018", + .codec_name = "uda1380.0-0018", .init = magician_uda1380_init, .ops = &magician_playback_ops, }, @@ -440,7 +440,7 @@ static struct snd_soc_dai_link magician_dai[] = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "uda1380-hifi-capture", .platform_name = "pxa-pcm-audio", - .codec_name = "uda1380-codec.0-0018", + .codec_name = "uda1380.0-0018", .ops = &magician_capture_ops, } }; diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index af84ee9..5410f2f 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -269,7 +269,7 @@ static struct snd_soc_dai_link poodle_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8731-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8731-codec.0-001a", + .codec_name = "wm8731.0-001a", .init = poodle_wm8731_init, .ops = &poodle_ops, }; diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c index 2cda82b..d9904b6 100644 --- a/sound/soc/pxa/raumfeld.c +++ b/sound/soc/pxa/raumfeld.c @@ -234,7 +234,7 @@ static struct snd_soc_dai_link raumfeld_dai[] = { .codec_dai_name = "ak4104-hifi", .platform_name = "pxa-pcm-audio", .ops = &raumfeld_ak4104_ops, - .codec_name = "ak4104-codec.0", + .codec_name = "ak4104.0", }, { .name = "CS4270", @@ -242,7 +242,7 @@ static struct snd_soc_dai_link raumfeld_dai[] = { .cpu_dai_name = "pxa-ssp-dai.0", .platform_name = "pxa-pcm-audio", .codec_dai_name = "cs4270-hifi", - .codec_name = "cs4270-codec.0-0048", + .codec_name = "cs4270.0-0048", .ops = &raumfeld_cs4270_ops, },}; diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index f470f36..582cb7e 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -311,7 +311,7 @@ static struct snd_soc_dai_link spitz_dai = { .cpu_dai_name = "pxa-is2", .codec_dai_name = "wm8750-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8750-codec.0-001a", + .codec_name = "wm8750.0-001a", .init = spitz_wm8750_init, .ops = &spitz_ops, }; diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 4cc841b..7dabeb9 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -192,7 +192,7 @@ static struct snd_soc_dai_link z2_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8750-codec.0-001a", + .codec_name = "wm8750.0-001a", .init = z2_wm8750_init, .ops = &z2_ops, }; diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 49605cd..5f3ab8b 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c @@ -142,7 +142,7 @@ static struct snd_soc_dai_link jive_dai = { .cpu_dai_name = "s3c2412-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "s3c24xx-pcm-audio", - .codec_name = "wm8750-codec.0-0x1a", + .codec_name = "wm8750.0-0x1a", .init = jive_wm8750_init, .ops = &jive_ops, }; diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index c457bfd..08b9ef7 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -401,7 +401,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .codec_dai_name = "wm8753-hifi", .init = neo1973_gta02_wm8753_init, .platform_name = "s3c24xx-pcm-audio", - .codec_name = "wm8753-codec.0-0x1a", + .codec_name = "wm8753.0-0x1a", .ops = &neo1973_gta02_hifi_ops, }, { /* Voice via BT */ @@ -410,7 +410,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { .cpu_dai_name = "bluetooth-dai", .codec_dai_name = "wm8753-voice", .ops = &neo1973_gta02_voice_ops, - .codec_name = "wm8753-codec.0-0x1a", + .codec_name = "wm8753.0-0x1a", .platform_name = "s3c24xx-pcm-audio", }, }; diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index d7a39a0..dd3fae2 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -559,7 +559,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { .platform_name = "s3c24xx-pcm-audio", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", - .codec_name = "wm8753-codec.0-0x1a", + .codec_name = "wm8753.0-0x1a", .init = neo1973_wm8753_init, .ops = &neo1973_hifi_ops, }, @@ -569,7 +569,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { .platform_name = "s3c24xx-pcm-audio", .cpu_dai_name = "bluetooth-dai", .codec_dai_name = "wm8753-voice", - .codec_name = "wm8753-codec.0-0x1a", + .codec_name = "wm8753.0-0x1a", .ops = &neo1973_voice_ops, }, }; diff --git a/sound/soc/s3c24xx/rx1950_uda1380.c b/sound/soc/s3c24xx/rx1950_uda1380.c index ffd5cf2..c390907 100644 --- a/sound/soc/s3c24xx/rx1950_uda1380.c +++ b/sound/soc/s3c24xx/rx1950_uda1380.c @@ -97,7 +97,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = { .codec_dai_name = "uda1380-hifi", .init = rx1950_uda1380_init, .platform_name = "s3c24xx-pcm-audio", - .codec_name = "uda1380-codec.0-001a", + .codec_name = "uda1380.0-001a", .ops = &rx1950_ops, }, }; diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c index f884537..6ad2144 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c @@ -96,7 +96,7 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link simtec_dai_aic33 = { .name = "tlv320aic33", .stream_name = "TLV320AIC33", - .codec_name = "tlv320aic3x-codec.0-0x1a", + .codec_name = "tlv320aic3x.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "s3c24xx-pcm-audio", diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c index c096759..7fd1b2a 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c @@ -85,7 +85,7 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link simtec_dai_aic23 = { .name = "tlv320aic23", .stream_name = "TLV320AIC23", - .codec_name = "tlv320aic3x-codec.0-0x1a", + .codec_name = "tlv320aic3x.0-0x1a", .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "s3c24xx-pcm-audio", diff --git a/sound/soc/s3c24xx/smartq_wm8987.c b/sound/soc/s3c24xx/smartq_wm8987.c index dd20ca7..f63dab9 100644 --- a/sound/soc/s3c24xx/smartq_wm8987.c +++ b/sound/soc/s3c24xx/smartq_wm8987.c @@ -214,7 +214,7 @@ static struct snd_soc_dai_link smartq_dai[] = { .cpu_dai_name = "s3c64xx-i2s.0", .codec_dai_name = "wm8750-hifi", .platform_name = "s3c24xx-pcm-audio", - .codec_name = "wm8750-codec.0-0x1a", + .codec_name = "wm8750.0-0x1a", .init = smartq_wm8987_init, .ops = &smartq_hifi_ops, }, diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index 052e499..cd27727 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c @@ -225,7 +225,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-playback", .platform_name = "s3c24xx-pcm-audio", - .codec_name = "wm8580-codec.0-001b", + .codec_name = "wm8580.0-001b", .init = smdk64xx_wm8580_init_paifrx, .ops = &smdk64xx_ops, }, @@ -235,7 +235,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-capture", .platform_name = "s3c24xx-pcm-audio", - .codec_name = "wm8580-codec.0-001b", + .codec_name = "wm8580.0-001b", .init = smdk64xx_wm8580_init_paiftx, .ops = &smdk64xx_ops, }, diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 96c05e1..dd41219 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c @@ -179,7 +179,7 @@ static struct snd_soc_dai_link s6105_dai = { .cpu_dai_name = "s6000-i2s", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "s6000-pcm-audio", - .codec_name = "tlv320aic3x-codec.0-001a", + .codec_name = "tlv320aic3x.0-001a", .init = s6105_aic3x_init, .ops = &s6105_ops, }; diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c index d96602d..2b00eac 100644 --- a/sound/soc/sh/fsi-ak4642.c +++ b/sound/soc/sh/fsi-ak4642.c @@ -33,10 +33,10 @@ static struct snd_soc_dai_link fsi_dai_link = { .codec_dai_name = "ak4642-hifi", #ifdef CONFIG_MACH_AP4EVB .platform_name = "sh_fsi2", - .codec_name = "ak4642-codec.0-0013", + .codec_name = "ak4642.0-0013", #else .platform_name = "sh_fsi.0", - .codec_name = "ak4642-codec.0-0012", + .codec_name = "ak4642.0-0012", #endif .init = fsi_ak4642_dai_init, .ops = NULL, diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c index a6adb6e..29153ba 100644 --- a/sound/soc/sh/fsi-da7210.c +++ b/sound/soc/sh/fsi-da7210.c @@ -28,7 +28,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = { .cpu_dai_name = "fsib-dai", /* FSI B */ .codec_dai_name = "da7210-hifi", .platform_name = "sh_fsi.0", - .codec_name = "da7210-codec.0-001a", + .codec_name = "da7210.0-001a", .init = fsi_da7210_init, }; -- 1.7.1

1 1

[alsa-devel] [PATCH 1/2] ARM: S5PV210: Add audio support to Aquila
by Chanwoo Choi 30 Sep '10

30 Sep '10

This patch the I2C board information for the WM8994 used in the Aquila as audio codec and adds the I2C/I2S platform drivers. Additionlly, to control power consumption have registerd the voltage consumer of WM8994 to the regulator framework. I initialize gpio settting relevant to operation of audio codec. I explain following comment concering gpio setting: - CODEC_XTAL_EN : This gpio enables that the main clock is provided to operate audio codec. - MICBIAS_EN : This gpio enable the microphone to input analog - ADC_EN : This gpio enable the ADC device which is used to detect the kind of jack. (SND_JACK_HEADPHONE/HEADSET/MECHANICAL/AVOUT) According to the kind of jack, an electric current is changed. Signed-off-by : Chanwoo Choi <cw00.choi(a)samsung.com> Signed-off-by : Joonyoung Shim <jy0922.shim(a)samsung.com> Signed-off-by : Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/mach-s5pv210/mach-aquila.c | 177 +++++++++++++++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index f0f960f..d027f9d 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c @@ -17,9 +17,11 @@ #include <linux/i2c-gpio.h> #include <linux/i2c/mcs.h> #include <linux/mfd/max8998.h> +#include <linux/mfd/wm8994/pdata.h> #include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/gpio.h> +#include <linux/regulator/fixed.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -397,6 +399,120 @@ static struct max8998_platform_data aquila_max8998_pdata = { }; #endif +static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = { + { + .dev_name = "5-001a", + .supply = "DBVDD", + }, { + .dev_name = "5-001a", + .supply = "AVDD2", + }, { + .dev_name = "5-001a", + .supply = "CPVDD", + }, + +}; + +static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = { + { + .dev_name = "5-001a", + .supply = "SPKVDD1", + }, { + .dev_name = "5-001a", + .supply = "SPKVDD2", + }, +}; + +static struct regulator_init_data wm8994_fixed_voltage0_init_data = { + .constraints = { + .always_on = 1, + }, + .num_consumer_supplies = ARRAY_SIZE(wm8994_fixed_voltage0_supplies), + .consumer_supplies = wm8994_fixed_voltage0_supplies, +}; + +static struct regulator_init_data wm8994_fixed_voltage1_init_data = { + .constraints = { + .always_on = 1, + }, + .num_consumer_supplies = ARRAY_SIZE(wm8994_fixed_voltage1_supplies), + .consumer_supplies = wm8994_fixed_voltage1_supplies, +}; + +static struct fixed_voltage_config wm8994_fixed_voltage0_config = { + .supply_name = "VCC_1.8V_PDA", + .microvolts = 1800000, + .gpio = -EINVAL, + .init_data = &wm8994_fixed_voltage0_init_data, +}; + +static struct fixed_voltage_config wm8994_fixed_voltage1_config = { + .supply_name = "V_BAT", + .microvolts = 3700000, + .gpio = -EINVAL, + .init_data = &wm8994_fixed_voltage1_init_data, +}; + +static struct platform_device wm8994_fixed_voltage0 = { + .name = "reg-fixed-voltage", + .id = 0, + .dev = { + .platform_data = &wm8994_fixed_voltage0_config, + }, +}; + +static struct platform_device wm8994_fixed_voltage1 = { + .name = "reg-fixed-voltage", + .id = 1, + .dev = { + .platform_data = &wm8994_fixed_voltage1_config, + }, +}; + +static struct regulator_consumer_supply wm8994_avdd1_supply = { + .dev_name = "5-001a", + .supply = "AVDD1", +}; + +static struct regulator_consumer_supply wm8994_dcvdd_supply = { + .dev_name = "5-001a", + .supply = "DCVDD", +}; + +static struct regulator_init_data wm8994_ldo1_data = { + .constraints = { + .name = "AVDD1_3.0V", + .valid_ops_mask = REGULATOR_CHANGE_STATUS, + }, + .num_consumer_supplies = 1, + .consumer_supplies = &wm8994_avdd1_supply, +}; + +static struct regulator_init_data wm8994_ldo2_data = { + .constraints = { + .name = "DCVDD_1.0V", + }, + .num_consumer_supplies = 1, + .consumer_supplies = &wm8994_dcvdd_supply, +}; + +static struct wm8994_pdata wm8994_platform_data = { + /* configure gpio1 function: 0x0001(Logic level input/output) */ + .gpio_defaults[0] = 0x0001, + /* configure gpio3/4/5/7 function for AIF2 voice */ + .gpio_defaults[2] = 0x8100, + .gpio_defaults[3] = 0x8100, + .gpio_defaults[4] = 0x8100, + .gpio_defaults[6] = 0x0100, + /* configure gpio8/9/10/11 function for AIF3 BT */ + .gpio_defaults[7] = 0x8100, + .gpio_defaults[8] = 0x0100, + .gpio_defaults[9] = 0x0100, + .gpio_defaults[10] = 0x0100, + .ldo[0] = { S5PV210_MP03(6), NULL, &wm8994_ldo1_data }, /* XM0FRNB_2 */ + .ldo[1] = { 0, NULL, &wm8994_ldo2_data }, +}; + /* GPIO I2C PMIC */ #define AP_I2C_GPIO_PMIC_BUS_4 4 static struct i2c_gpio_platform_data aquila_i2c_gpio_pmic_data = { @@ -422,6 +538,58 @@ static struct i2c_board_info i2c_gpio_pmic_devs[] __initdata = { #endif }; +/* GPIO I2C AP 1.8V */ +#define AP_I2C_GPIO_BUS_5 5 +static struct i2c_gpio_platform_data i2c_gpio5_data = { + .sda_pin = S5PV210_MP05(3), /* XM0ADDR_11 */ + .scl_pin = S5PV210_MP05(2), /* XM0ADDR_10 */ +}; + +static struct platform_device i2c_gpio5 = { + .name = "i2c-gpio", + .id = AP_I2C_GPIO_BUS_5, + .dev = { + .platform_data = &i2c_gpio5_data, + }, +}; + +static struct i2c_board_info i2c_gpio5_devs[] __initdata = { + { + /* CS/ADDR = low 0x34 (FYI: high = 0x36) */ + I2C_BOARD_INFO("wm8994", 0x34 >> 1), + .platform_data = &wm8994_platform_data, + }, +}; + +static void __init aquila_sound_init(void) +{ + unsigned int gpio; + + /* CODEC_XTAL_EN */ + gpio = S5PV210_GPH3(2); /* XEINT_26 */ + gpio_request(gpio, "CODEC_XTAL_EN"); + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_direction_output(gpio, 1); + + /* CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS) + * for 24MHZ + */ + writel(readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS); + + /* MICBIAS_EN */ + gpio = S5PV210_GPJ4(2); /* XMSMRN */ + gpio_request(gpio, "MICBIAS_EN"); + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + gpio_direction_output(gpio, 1); + + /* ADC_EN */ + gpio = S5PV210_GPJ3(2); + gpio_request(gpio, "ADC_EN"); + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + gpio_direction_output(gpio, 1); +} + /* PMIC Power button */ static struct gpio_keys_button aquila_gpio_keys_table[] = { { @@ -523,6 +691,10 @@ static struct platform_device *aquila_devices[] __initdata = { &s5pc110_device_onenand, &samsung_device_keypad, &i2c_gpio10, + &wm8994_fixed_voltage0, + &wm8994_fixed_voltage1, + &s5pv210_device_iis0, + &i2c_gpio5, }; static void __init aquila_map_io(void) @@ -539,6 +711,11 @@ static void __init aquila_machine_init(void) i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs, ARRAY_SIZE(i2c_gpio_pmic_devs)); + /* SOUND */ + i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs, + ARRAY_SIZE(i2c_gpio5_devs)); + aquila_sound_init(); + /* FB */ s3c_fb_set_platdata(&aquila_lcd_pdata); -- 1.6.3.3

5 10

[alsa-devel] [ANNOUNCE] Git User's Survey 2010 is now up!
by Jakub Narebski 30 Sep '10

30 Sep '10

Hello all, This announcement is sent to this mailing list because yout project uses Git as a version control system. We would like to ask you a few questions about your use of the Git version control system. This survey is mainly to understand who is using Git, how and why. The results will be published to the Git wiki on the GitSurvey2010 page (https://git.wiki.kernel.org/index.php/GitSurvey2010) and discussed on the git mailing list (git(a)vger.kernel.org). The survey would be open from 1 September till 15 October 2010. Please devote a few minutes of your time to fill this simple questionnaire, it will help a lot the git community to understand your needs, what you like of Git, and of course what you don't like of it. The survey can be found here: http://tinyurl.com/GitSurvey2010 https://www.survs.com/survey/MUPYR8UJ4B Git User's Survey 2010 was originally announced on git mailing list in the following mail: http://article.gmane.org/gmane.comp.version-control.git/154986 -- Jakub Narebski on behalf of Git Development Community http://git-scm.com

1 0

[alsa-devel] list-admin: Mails cut off in archive?
by Colin Guthrie 29 Sep '10

29 Sep '10

Hi, I recently sent a message to this list. It was sent via gmane and I can see and read the contents fine via NNTP with gmane. The gmane archive is fine: http://permalink.gmane.org/gmane.linux.alsa.devel/77313 However the official Mailman archive cuts the message off: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-September/032025.… Did people directly subscribed to the list get my mail OK or was it cut off there too? Is there a bug in the archive. Col PS Is it OK to remove geocrawler links on http://mailman.alsa-project.org/main/index.php/Mailing-lists ? They are all broken. Also the mail-archive link for this list isn't updated past 2004... (seems to be based on the sourceforge list). It's probably worth marking as "old" and/or reconfiguring it to point at the new list. -- Colin Guthrie gmane(at)colin.guthr.ie http://colin.guthr.ie/ Day Job: Tribalogic Limited [http://www.tribalogic.net/] Open Source: Mageia Contributor [http://www.mageia.org/] PulseAudio Hacker [http://www.pulseaudio.org/] Trac Hacker [http://trac.edgewall.org/]

3 2

[alsa-devel] Alsamixertest
by David Henningsson 29 Sep '10

29 Sep '10

Here's the tool "one of the Mandriva guys" ;-) was talking about the other day. I should probably have announced it on both lists simultaneously. Anyway, over the previous weeks I've been working on a small script which tests whether the ALSA mixer lives up to PA's expectations. If you are familiar with dbmeasure or dbverify by Lennart Poettering, this application's purpose is very similar, but this one is hopefully easier to set up, more user friendly, and also tests that the names of the volume controls are correct. My hope is that this will aid as a debugging tool for all these "everything below 20% of my speaker is muted, and then 21% blows my speakers" bugs. To use the tool, you'll need some kind of loopback. You can e g use a loopback cable and connect that between line in and line out, or test your laptop's internal speakers with your laptop's internal mic (just stop humming when you do so :-) ). Just set up the recording levels appropriately. Alsamixertest is available for Ubuntu Lucid and Ubuntu Maverick from these PPAs: Lucid: https://launchpad.net/~diwic/+archive/ppa Maverick: https://launchpad.net/~diwic/+archive/maverick For other distributions, download the tarball: https://launchpad.net/~diwic/+archive/ppa/+files/alsamixertest_47.14.tar.gz Unpack and read the readme file for compilation and install instructions. When it is installed, run "alsamixertest -r" for a small tutorial and "alsamixertest -h" for command line options help. Looking forward to your comments about this new little tool! I think it should be considered "beta" quality at this point. -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 2

[alsa-devel] TASCAM US-144mkII Driver
by Michael Niemeck 29 Sep '10

29 Sep '10

Common consensus in the forums seems to be that the mkII versions of the TASCAM 122 and 144 have different hard- and/or software than their respective predecessors, and won't work with the current ALSA drivers. At least the latter I can confirm for my US-144mkII. Lacking the resources to modify the existing driver to work with the above interface, let alone write a new one, I wanted to ask if anyone of the active ALSA developers would be willing to (or is even already in the process of) write or modify a driver for the new TASCAMs. I would be more than willing to contribute to a bounty, if such a thing is common or at least accepted in the ALSA community, and according to this post (http://article.gmane.org/gmane.linux.alsa.user/34586) TASCAM is ready to support such a project with demo units. I would also be willing to function as a tester, of course. Still hoping, Mike ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

1 0

[alsa-devel] [PATCH] ASoC: Lowercase WM8962 CODEC name
by Mark Brown 29 Sep '10

29 Sep '10

For consistency. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 009321b..4fa5de8 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1879,7 +1879,7 @@ MODULE_DEVICE_TABLE(i2c, wm8962_i2c_id); static struct i2c_driver wm8962_i2c_driver = { .driver = { - .name = "WM8962", + .name = "wm8962", .owner = THIS_MODULE, }, .probe = wm8962_i2c_probe, -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Initial WM8962 IRQ support
by Mark Brown 29 Sep '10

29 Sep '10

Provide an initial hookup for interrupts on the WM8962. Currently we simply report error status via log messages if an IRQ is provided for the device. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/sound/wm8962.h | 2 + sound/soc/codecs/wm8962.c | 60 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h index f70258e..cc32aff 100644 --- a/include/sound/wm8962.h +++ b/include/sound/wm8962.h @@ -17,6 +17,8 @@ struct wm8962_pdata { u32 gpio_init[WM8962_MAX_GPIO]; + bool irq_active_low; + bool spk_mono; /* Speaker outputs tied together as mono */ }; diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 12286d6..009321b 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1461,6 +1461,29 @@ static struct snd_soc_dai_driver wm8962_dai = { .symmetric_rates = 1, }; +static irqreturn_t wm8962_irq(int irq, void *data) +{ + struct snd_soc_codec *codec = data; + int mask; + int active; + + mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); + + active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); + active &= ~mask; + + if (active & WM8962_FIFOS_ERR_EINT) + dev_err(codec->dev, "FIFO error\n"); + + if (active & WM8962_TEMP_SHUT_EINT) + dev_crit(codec->dev, "Thermal shutdown\n"); + + /* Acknowledge the interrupts */ + snd_soc_write(codec, WM8962_INTERRUPT_STATUS_2, active); + + return IRQ_HANDLED; +} + #ifdef CONFIG_PM static int wm8962_resume(struct snd_soc_codec *codec) { @@ -1632,7 +1655,9 @@ static int wm8962_probe(struct snd_soc_codec *codec) int ret; struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); struct wm8962_pdata *pdata = dev_get_platdata(codec->dev); - int i; + struct i2c_client *i2c = container_of(codec->dev, struct i2c_client, + dev); + int i, trigger, irq_pol; wm8962->codec = codec; @@ -1748,6 +1773,34 @@ static int wm8962_probe(struct snd_soc_codec *codec) wm8962_init_beep(codec); + if (i2c->irq) { + if (pdata && pdata->irq_active_low) { + trigger = IRQF_TRIGGER_LOW; + irq_pol = WM8962_IRQ_POL; + } else { + trigger = IRQF_TRIGGER_HIGH; + irq_pol = 0; + } + + snd_soc_update_bits(codec, WM8962_INTERRUPT_CONTROL, + WM8962_IRQ_POL, irq_pol); + + ret = request_threaded_irq(i2c->irq, NULL, wm8962_irq, + trigger | IRQF_ONESHOT, + "wm8962", codec); + if (ret != 0) { + dev_err(codec->dev, "Failed to request IRQ %d: %d\n", + i2c->irq, ret); + /* Non-fatal */ + } else { + /* Enable error reporting IRQs by default */ + snd_soc_update_bits(codec, + WM8962_INTERRUPT_STATUS_2_MASK, + WM8962_TEMP_SHUT_EINT | + WM8962_FIFOS_ERR_EINT, 0); + } + } + return 0; err_enable: @@ -1762,8 +1815,13 @@ err: static int wm8962_remove(struct snd_soc_codec *codec) { struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); + struct i2c_client *i2c = container_of(codec->dev, struct i2c_client, + dev); int i; + if (i2c->irq) + free_irq(i2c->irq, codec); + wm8962_free_beep(codec); for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) regulator_unregister_notifier(wm8962->supplies[i].consumer, -- 1.7.1

2 1

[alsa-devel] Band-aid solution for Dell Latitude E6410/E6510 microphone
by Diego Elio Pettenò 29 Sep '10

29 Sep '10

Hi all, I'm sending out a patch that I didn't write (and thus most likely require David's Signed-Off), but which I think might be a good idea to at least have accessible to search. As David already pointed out to me, the proper fix for the issue is Takashi's commit 75e0eb24ee3ec3549c2e53707dcc87e5f7a2c791, but that hasn't made it into .36 RCs and thus seem unlikely to come to users anytime soon. David's patch is a "band aid" solution; it solves most of the problem by adding one more special case to the sigmatel patches; on the other hand it makes the internal microphone to work fine on my laptop, which is a good thing, right? Anyway, if this can be considered for .36 or for some stable branch (*looks toward Greg hoping for pity*), it would probably make me (and other owners of such laptops) probably very happy. Especially given that we have enough trouble with a non-working SDHCI and a not-yet-supported Alps touchpad/trackpoint combination. Thanks in advance, whatever the outcome, -- Diego Elio Pettenò

2 2

[alsa-devel] [PATCH] ASoC: WM8985: Use the correct macro for the kcontrol defined
by Dimitris Papastamos 29 Sep '10

29 Sep '10

Since we are using custom get/put handlers use SOC_ENUM_SINGLE_EXT_DECL instead of the original SOC_ENUM_SINGLE_DECL macro. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8985.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index b94af96..09660b3 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -185,8 +185,8 @@ static const SOC_ENUM_SINGLE_DECL(filter_mode, WM8985_ADC_CONTROL, 7, static const char *eq_bw_text[] = { "Narrow", "Wide" }; static const char *eqmode_text[] = { "Capture", "Playback" }; -static const SOC_ENUM_SINGLE_DECL(eqmode, WM8985_EQ1_LOW_SHELF, 8, - eqmode_text); +static const SOC_ENUM_SINGLE_EXT_DECL(eqmode, eqmode_text); + static const char *eq1_cutoff_text[] = { "80Hz", "105Hz", "135Hz", "175Hz" }; -- 1.7.3

2 1

[alsa-devel] [PATCH 1/2] omap: zoom2: Fix ASoC multi-component build breakage by removing dead code
by Jarkko Nikula 29 Sep '10

29 Sep '10

ASoC Multi-Component Support patch removes #if 0 in board-zoom2.c that was used to protect some uncompiling dead code. Remove that code as it seems to be here quite some time since commit 479f12c. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> Cc: Vikram Pandita <vikram.pandita(a)ti.com> Cc: Tony Lindgren <tony(a)atomide.com> --- Sorry for not noticing this before. Somehow my own test config didn't include zoom2 like omap3_defconfig does. --- arch/arm/mach-omap2/board-zoom2.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index efbcd8f..86d4515 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -41,10 +41,6 @@ void zoom2_set_hs_extmute(int mute) gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); } -static struct twl4030_madc_platform_data zoom2_madc_data = { - .irq_line = 1, -}; - static struct twl4030_codec_audio_data zoom2_audio_data = { .audio_mclk = 26000000, .ramp_delay_value = 3, /* 161 ms */ @@ -62,15 +58,7 @@ static struct twl4030_platform_data zoom2_twldata = { .irq_end = TWL4030_IRQ_END, /* platform_data for children goes here */ - .bci = &zoom2_bci_data, - .madc = &zoom2_madc_data, - .usb = &zoom2_usb_data, - .gpio = &zoom2_gpio_data, - .keypad = &zoom2_kp_twl4030_data, .codec = &zoom2_codec_data, - .vmmc1 = &zoom2_vmmc1, - .vmmc2 = &zoom2_vmmc2, - .vsim = &zoom2_vsim, }; static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = { -- 1.7.1

3 4

Re: [alsa-devel] Microphone not working on PCI ID 8086:3b56
by Jeff Chua 28 Sep '10

28 Sep '10

On Tue, Sep 28, 2010 at 2:18 AM, Takashi Iwai <tiwai(a)suse.de> wrote: > At Tue, 28 Sep 2010 01:56:44 +0800, > Jeff Chua wrote: >> >> On Mon, Sep 27, 2010 at 10:42 PM, Takashi Iwai <tiwai(a)suse.de> wrote: >> > At Wed, 15 Sep 2010 06:32:22 +0800 (SGT), >> > Did you try to play with model option for snd-hda-intel driver? >> > For example, model=lenovo-x200 ? >> >> Didn't know there's such option. But I'll try it now. Is there an >> option to if the driver is not compiled as a module? > > Yes, you can pass via a boot option like MODULENAME.OPTIONNAME=xxx,yyy,... > In this case, snd-hda-intel.model=lenovo-x200 Tried, still no mic. Perhaps I'm not using the right driver. Which one should I enable? CONFIG_SND_HDA_CODEC_CONEXANT CONFIG_SND_HDA_CODEC_INTELHDMI CONFIG_SND_HDA_CODEC_REALTEK Thanks, Jeff

3 2

Re: [alsa-devel] [RFC v5]update broken web addresses in the kernel.
by Finn Thain 28 Sep '10

28 Sep '10

Looks good to me. Finn On Mon, 27 Sep 2010, Justin P. Mattock wrote: > Below is an updated patch to fix broken web addresses in the kernel. > Please let me know if I missed anything, and I'll go back and fix it. > and lastly Thanks for all the help with this... > > Signed-off-by: Justin P. Mattock <justinmattock(a)gmail.com> > Cc: Maciej W. Rozycki <macro(a)linux-mips.org> > Cc: Geert Uytterhoeven <geert(a)linux-m68k.org> > Cc: Finn Thain <fthain(a)telegraphics.com.au> > Cc: Randy Dunlap <rdunlap(a)xenotime.net> > Cc: Matt Turner <mattst88(a)gmail.com> > Cc: Dimitry Torokhov <dmitry.torokhov(a)gmail.com> > Cc: Mike Frysinger <vapier.adi(a)gmail.com> > Acked-by: Ben Pfaff <blp(a)cs.stanford.edu> > Acked-by: Hans J. Koch <hjk(a)linutronix.de> > > --- > drivers/ata/pata_it821x.c | 4 ++-- > drivers/atm/Kconfig | 2 +- > drivers/char/agp/Kconfig | 2 +- > drivers/char/agp/i460-agp.c | 2 +- > drivers/char/apm-emulation.c | 4 ++-- > drivers/char/ipmi/ipmi_bt_sm.c | 2 +- > drivers/char/ipmi/ipmi_si_intf.c | 3 +-- > drivers/char/n_r3964.c | 1 - > drivers/char/pcmcia/Kconfig | 4 ++-- > drivers/char/tpm/Kconfig | 2 +- > drivers/char/tpm/tpm_infineon.c | 2 +- > drivers/edac/edac_device_sysfs.c | 2 +- > drivers/edac/i82443bxgx_edac.c | 2 +- > drivers/firmware/Kconfig | 4 ++-- > drivers/firmware/edd.c | 2 +- > drivers/firmware/pcdp.h | 4 ++-- > drivers/gpu/drm/drm_modes.c | 2 +- > drivers/hwmon/adm1025.c | 2 +- > drivers/hwmon/adm1026.c | 2 +- > drivers/hwmon/f75375s.c | 4 ++-- > drivers/hwmon/g760a.c | 2 +- > drivers/hwmon/hwmon-vid.c | 2 +- > drivers/ide/hpt366.c | 2 +- > drivers/ide/ht6560b.c | 1 - > drivers/infiniband/Kconfig | 4 ++-- > drivers/infiniband/hw/cxgb3/Kconfig | 2 +- > drivers/infiniband/hw/cxgb4/Kconfig | 2 +- > drivers/infiniband/ulp/iser/Kconfig | 2 +- > drivers/input/joystick/gamecon.c | 3 +-- > drivers/input/misc/cm109.c | 2 +- > drivers/input/mouse/Kconfig | 1 + > drivers/input/mouse/touchkit_ps2.c | 4 ++-- > drivers/input/touchscreen/mk712.c | 2 +- > drivers/isdn/i4l/isdn_audio.c | 2 +- > drivers/macintosh/therm_adt746x.c | 6 +++--- > drivers/media/IR/keymaps/rc-manli.c | 1 - > drivers/media/dvb/ttpci/av7110.c | 10 ++-------- > drivers/media/dvb/ttpci/av7110_av.c | 2 +- > drivers/media/dvb/ttpci/av7110_ca.c | 2 +- > drivers/media/dvb/ttpci/av7110_hw.c | 2 +- > drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- > drivers/media/dvb/ttpci/budget-av.c | 2 +- > drivers/media/dvb/ttpci/budget-ci.c | 2 +- > drivers/media/dvb/ttpci/budget-core.c | 2 +- > drivers/media/dvb/ttpci/budget-patch.c | 2 +- > drivers/media/dvb/ttpci/budget.c | 2 +- > drivers/media/radio/radio-maxiradio.c | 2 +- > drivers/media/radio/radio-typhoon.c | 2 -- > drivers/media/video/Kconfig | 2 +- > drivers/media/video/cafe_ccic.c | 2 +- > drivers/media/video/cx18/cx18-cards.c | 2 +- > drivers/media/video/cx23885/cx23885-417.c | 2 +- > drivers/media/video/cx88/cx88-blackbird.c | 2 +- > drivers/media/video/ivtv/ivtv-cards.c | 2 +- > drivers/media/video/mxb.c | 2 +- > drivers/media/video/sn9c102/sn9c102_pas202bcb.c | 1 - > drivers/misc/Kconfig | 4 ++-- > drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++-- > drivers/mtd/devices/lart.c | 2 +- > drivers/mtd/ftl.c | 2 +- > drivers/mtd/maps/Kconfig | 4 ++-- > drivers/mtd/nand/cafe_nand.c | 2 +- > drivers/net/Kconfig | 21 ++++++++++----------- > drivers/net/appletalk/Kconfig | 2 +- > drivers/net/atp.c | 2 +- > drivers/net/epic100.c | 4 ++-- > drivers/net/hamradio/Kconfig | 2 +- > drivers/net/ibmlana.c | 2 +- > drivers/net/irda/donauboe.h | 2 +- > drivers/net/pci-skeleton.c | 2 +- > drivers/net/pcmcia/3c574_cs.c | 2 +- > drivers/net/sc92031.c | 2 +- > drivers/net/tlan.c | 2 +- > drivers/net/tokenring/tms380tr.c | 2 +- > drivers/net/tulip/Kconfig | 2 +- > drivers/net/usb/plusb.c | 2 +- > drivers/net/wan/Kconfig | 2 +- > drivers/net/wireless/ath/ath5k/ath5k.h | 2 +- > drivers/net/wireless/ath/ath5k/reg.h | 1 - > drivers/net/wireless/p54/Kconfig | 6 +++--- > drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- > drivers/parisc/README.dino | 3 +-- > drivers/pci/quirks.c | 3 ++- > drivers/pcmcia/yenta_socket.c | 2 +- > drivers/pnp/pnpbios/proc.c | 1 - > drivers/scsi/Kconfig | 9 +++++---- > drivers/serial/8250.c | 2 +- > drivers/serial/bfin_sport_uart.c | 2 +- > drivers/serial/bfin_sport_uart.h | 2 +- > drivers/serial/uartlite.c | 2 +- > drivers/staging/asus_oled/README | 2 +- > drivers/staging/asus_oled/asus_oled.c | 2 +- > drivers/staging/comedi/drivers/cb_pcimdas.c | 2 +- > drivers/staging/comedi/drivers/daqboard2000.c | 4 ++-- > drivers/staging/comedi/drivers/ni_labpc.c | 2 +- > drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- > drivers/staging/comedi/drivers/plx9080.h | 2 +- > drivers/staging/comedi/drivers/rtd520.c | 2 +- > drivers/staging/quickstart/quickstart.c | 3 +-- > drivers/uio/Kconfig | 6 +++--- > drivers/usb/serial/Kconfig | 4 ++-- > drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++------ > drivers/usb/serial/keyspan.c | 2 +- > drivers/usb/serial/keyspan.h | 2 +- > drivers/usb/serial/mct_u232.h | 9 ++++----- > drivers/usb/storage/Kconfig | 2 +- > drivers/video/Kconfig | 10 +++++----- > drivers/video/arcfb.c | 1 - > drivers/video/epson1355fb.c | 2 +- > drivers/video/fbcvt.c | 2 +- > drivers/video/hecubafb.c | 2 +- > drivers/video/metronomefb.c | 2 +- > firmware/keyspan_pda/keyspan_pda.S | 2 +- > firmware/keyspan_pda/xircom_pgs.S | 2 +- > fs/hostfs/hostfs.h | 7 +------ > fs/partitions/ldm.c | 2 +- > fs/partitions/ldm.h | 2 +- > fs/reiserfs/Kconfig | 6 ++++-- > fs/reiserfs/README | 2 +- > include/crypto/gf128mul.h | 4 ++-- > include/linux/fdreg.h | 2 +- > include/linux/if_infiniband.h | 2 +- > include/linux/n_r3964.h | 1 - > net/ax25/Kconfig | 8 ++++---- > net/ipv4/Kconfig | 4 ++-- > net/ipv4/cipso_ipv4.c | 2 +- > net/ipv4/fib_trie.c | 2 +- > net/ipv4/netfilter/Kconfig | 2 +- > net/ipv4/tcp_illinois.c | 2 +- > net/ipv4/tcp_input.c | 4 ++-- > net/ipv4/tcp_veno.c | 2 +- > net/netfilter/nf_conntrack_proto_tcp.c | 4 ++-- > sound/oss/ac97_codec.c | 7 ++----- > sound/pci/ens1370.c | 2 +- > sound/pci/intel8x0.c | 2 +- > 135 files changed, 184 insertions(+), 209 deletions(-) > > diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c > index bf88f71..aa0e0c5 100644 > --- a/drivers/ata/pata_it821x.c > +++ b/drivers/ata/pata_it821x.c > @@ -15,8 +15,8 @@ > * May be copied or modified under the terms of the GNU General Public License > * Based in part on the ITE vendor provided SCSI driver. > * > - * Documentation available from > - * http://www.ite.com.tw/pc/IT8212F_V04.pdf > + * Documentation available from IT8212F_V04.pdf > + * http://www.ite.com.tw/EN/products_more.aspx?CategoryID=3&ID=5,91 > * Some other documents are NDA. > * > * The ITE8212 isn't exactly a standard IDE controller. It has two > diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig > index be7461c..31c6010 100644 > --- a/drivers/atm/Kconfig > +++ b/drivers/atm/Kconfig > @@ -301,7 +301,7 @@ config ATM_IA > control memory (128K-1KVC, 512K-4KVC), the size of the packet > memory (128K, 512K, 1M), and the PHY type (Single/Multi mode OC3, > UTP155, UTP25, DS3 and E3). Go to: > - <http://www.iphase.com/products/ClassSheet.cfm?ClassID=ATM> > + <http://www.iphase.com/> > for more info about the cards. Say Y (or M to compile as a module > named iphase) here if you have one of these cards. > > diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig > index 4b66c69..c8ad619 100644 > --- a/drivers/char/agp/Kconfig > +++ b/drivers/char/agp/Kconfig > @@ -34,7 +34,7 @@ config AGP_ALI > X on the following ALi chipsets. The supported chipsets > include M1541, M1621, M1631, M1632, M1641,M1647,and M1651. > For the ALi-chipset question, ALi suggests you refer to > - <http://www.ali.com.tw/eng/support/index.shtml>. > + <http://www.ali.com.tw/>. > > The M1541 chipset can do AGP 1x and 2x, but note that there is an > acknowledged incompatibility with Matrox G200 cards. Due to > diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c > index e763d33..75b763c 100644 > --- a/drivers/char/agp/i460-agp.c > +++ b/drivers/char/agp/i460-agp.c > @@ -1,7 +1,7 @@ > /* > * For documentation on the i460 AGP interface, see Chapter 7 (AGP Subsystem) of > * the "Intel 460GTX Chipset Software Developer's Manual": > - * http://developer.intel.com/design/itanium/downloads/24870401s.htm > + * http://www.intel.com/design/archives/itanium/downloads/248704.htm > */ > /* > * 460GX support by Chris Ahna <christopher.j.ahna(a)intel.com> > diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c > index 033e150..0848ca9 100644 > --- a/drivers/char/apm-emulation.c > +++ b/drivers/char/apm-emulation.c > @@ -7,8 +7,8 @@ > * Intel Corporation, Microsoft Corporation. Advanced Power Management > * (APM) BIOS Interface Specification, Revision 1.2, February 1996. > * > - * [This document is available from Microsoft at: > - * http://www.microsoft.com/hwdev/busbios/amp_12.htm] > + * This document is available from Microsoft at: > + * http://www.microsoft.com/whdc/archive/amp_12.mspx > */ > #include <linux/module.h> > #include <linux/poll.h> > diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c > index 7b98c06..3ed20e8 100644 > --- a/drivers/char/ipmi/ipmi_bt_sm.c > +++ b/drivers/char/ipmi/ipmi_bt_sm.c > @@ -2,7 +2,7 @@ > * ipmi_bt_sm.c > * > * The state machine for an Open IPMI BT sub-driver under ipmi_si.c, part > - * of the driver architecture at http://sourceforge.net/project/openipmi > + * of the driver architecture at http://sourceforge.net/projects/openipmi > * > * Author: Rocky Craig <first.last(a)hp.com> > * > diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c > index 7bd7c45..3e94c37 100644 > --- a/drivers/char/ipmi/ipmi_si_intf.c > +++ b/drivers/char/ipmi/ipmi_si_intf.c > @@ -1974,8 +1974,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info) > > /* > * Defined at > - * http://h21007.www2.hp.com/portal/download/files > - * /unprot/hpspmi.pdf > + * http://h21007.www2.hp.com/portal/download/files/unprot/hpspmi.pdf > */ > struct SPMITable { > s8 Signature[4]; > diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c > index a98290d..88dda0c 100644 > --- a/drivers/char/n_r3964.c > +++ b/drivers/char/n_r3964.c > @@ -4,7 +4,6 @@ > * Copyright by > * Philips Automation Projects > * Kassel (Germany) > - * http://www.pap-philips.de > * ----------------------------------------------------------- > * This software may be used and distributed according to the terms of > * the GNU General Public License, incorporated herein by reference. > diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig > index ffa0efc..6614416 100644 > --- a/drivers/char/pcmcia/Kconfig > +++ b/drivers/char/pcmcia/Kconfig > @@ -28,7 +28,7 @@ config CARDMAN_4000 > > This kernel driver requires additional userspace support, either > by the vendor-provided PC/SC ifd_handler (http://www.omnikey.com/), > - or via the cm4000 backend of OpenCT (http://www.opensc.com/). > + or via the cm4000 backend of OpenCT (http://www.opensc-project.org/opensc). > > config CARDMAN_4040 > tristate "Omnikey CardMan 4040 support" > @@ -41,7 +41,7 @@ config CARDMAN_4040 > in I/O space. To use the kernel driver, you will need either the > PC/SC ifdhandler provided from the Omnikey homepage > (http://www.omnikey.com/), or a current development version of OpenCT > - (http://www.opensc.org/). > + (http://www.opensc-project.org/opensc). > > config IPWIRELESS > tristate "IPWireless 3G UMTS PCMCIA card support" > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > index 4dc338f..f6595ab 100644 > --- a/drivers/char/tpm/Kconfig > +++ b/drivers/char/tpm/Kconfig > @@ -58,6 +58,6 @@ config TCG_INFINEON > To compile this driver as a module, choose M here; the module > will be called tpm_infineon. > Further information on this driver and the supported hardware > - can be found at http://www.prosec.rub.de/tpm > + can be found at http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ > > endif # TCG_TPM > diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c > index f584407..76da32e 100644 > --- a/drivers/char/tpm/tpm_infineon.c > +++ b/drivers/char/tpm/tpm_infineon.c > @@ -7,7 +7,7 @@ > * Copyright (C) 2005, Marcel Selhorst <m.selhorst(a)sirrix.com> > * Sirrix AG - security technologies, http://www.sirrix.com and > * Applied Data Security Group, Ruhr-University Bochum, Germany > - * Project-Homepage: http://www.prosec.rub.de/tpm > + * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ > * > * This program is free software; you can redistribute it and/or > * modify it under the terms of the GNU General Public License as > diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c > index 0709681..413f0df 100644 > --- a/drivers/edac/edac_device_sysfs.c > +++ b/drivers/edac/edac_device_sysfs.c > @@ -1,7 +1,7 @@ > /* > * file for managing the edac_device class of devices for EDAC > * > - * (C) 2007 SoftwareBitMaker (http://www.softwarebitmaker.com) > + * (C) 2007 SoftwareBitMaker > * > * This file may be distributed under the terms of the > * GNU General Public License. > diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c > index a2fa1fe..678405a 100644 > --- a/drivers/edac/i82443bxgx_edac.c > +++ b/drivers/edac/i82443bxgx_edac.c > @@ -12,7 +12,7 @@ > * 440GX fix by Jason Uhlenkott <juhlenko(a)akamai.com>. > * > * Written with reference to 82443BX Host Bridge Datasheet: > - * http://www.intel.com/design/chipsets/440/documentation.htm > + * http://download.intel.com/design/chipsets/datashts/29063301.pdf > * references to this document given in []. > * > * This module doesn't support the 440LX, but it may be possible to > diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig > index 280c9b5..32e67a1 100644 > --- a/drivers/firmware/Kconfig > +++ b/drivers/firmware/Kconfig > @@ -73,8 +73,8 @@ config EFI_PCDP > on how the driver discovers devices. > > You must also enable the appropriate drivers (serial, VGA, etc.) > - > - See <http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf> > + See DIG64_HCDPv20_042804.pdf available from > + <http://www.dig64.org/specifications/> > > config DELL_RBU > tristate "BIOS update support for DELL systems via sysfs" > diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c > index f287fe7..96c25d9 100644 > --- a/drivers/firmware/edd.c > +++ b/drivers/firmware/edd.c > @@ -15,7 +15,7 @@ > * made in setup.S, copied to safe structures in setup.c, > * and presents it in sysfs. > * > - * Please see http://linux.dell.com/edd30/results.html for > + * Please see http://linux.dell.com/edd/results.html for > * the list of BIOSs which have been reported to implement EDD. > * > * This program is free software; you can redistribute it and/or modify > diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h > index ce910d6..e098c6e 100644 > --- a/drivers/firmware/pcdp.h > +++ b/drivers/firmware/pcdp.h > @@ -1,8 +1,8 @@ > /* > * Definitions for PCDP-defined console devices > * > - * v1.0a: http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf > - * v2.0: http://www.dig64.org/specifications/DIG64_PCDPv20.pdf > + * For DIG64_HCDPv10a_01.pdf and DIG64_PCDPv20.pdf (v10.a and v2.0 resp.), > + * please see <http://www.dig64.org/specifications/> > * > * (c) Copyright 2002, 2004 Hewlett-Packard Development Company, L.P. > * Khalid Aziz <khalid.aziz(a)hp.com> > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index 949326d..58e65f9 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -76,7 +76,7 @@ EXPORT_SYMBOL(drm_mode_debug_printmodeline); > * according to the hdisplay, vdisplay, vrefresh. > * It is based from the VESA(TM) Coordinated Video Timing Generator by > * Graham Loveridge April 9, 2003 available at > - * http://www.vesa.org/public/CVT/CVTd6r1.xls > + * http://www.elo.utfsm.cl/~elo212/docs/CVTd6r1.xls > * > * And it is copied from xf86CVTmode in xserver/hw/xfree86/modes/xf86cvt.c. > * What I have done is to translate it by using integer calculation. > diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c > index 251b631..60befc0 100644 > --- a/drivers/hwmon/adm1025.c > +++ b/drivers/hwmon/adm1025.c > @@ -12,7 +12,7 @@ > * resolution of about 0.5% of the nominal value). Temperature values are > * reported with a 1 deg resolution and a 3 deg accuracy. Complete > * datasheet can be obtained from Analog's website at: > - * http://www.analog.com/Analog_Root/productPage/productHome/0,2121,ADM1025,00… > + * http://www.onsemi.com/PowerSolutions/product.do?id=ADM1025 > * > * This driver also supports the ADM1025A, which differs from the ADM1025 > * only in that it has "open-drain VID inputs while the ADM1025 has > diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c > index 65335b2..4bf969c 100644 > --- a/drivers/hwmon/adm1026.c > +++ b/drivers/hwmon/adm1026.c > @@ -6,7 +6,7 @@ > > Chip details at: > > - <http://www.analog.com/UploadedFiles/Data_Sheets/779263102ADM1026_a.pdf> > + <http://www.onsemi.com/PowerSolutions/product.do?id=ADM1026> > > 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 > diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c > index 9638d58..95cbfb3 100644 > --- a/drivers/hwmon/f75375s.c > +++ b/drivers/hwmon/f75375s.c > @@ -6,10 +6,10 @@ > * Datasheets available at: > * > * f75375: > - * http://www.fintek.com.tw/files/productfiles/2005111152950.pdf > + * http://www.fintek.com.tw/files/productfiles/F75375_V026P.pdf > * > * f75373: > - * http://www.fintek.com.tw/files/productfiles/2005111153128.pdf > + * http://www.fintek.com.tw/files/productfiles/F75373_V025P.pdf > * > * 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 > diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c > index 1f63d1a..1d6a6fa 100644 > --- a/drivers/hwmon/g760a.c > +++ b/drivers/hwmon/g760a.c > @@ -5,7 +5,7 @@ > Copyright (C) 2007 Herbert Valerio Riedel <hvr(a)gnu.org> > > Complete datasheet is available at GMT's website: > - http://www.gmt.com.tw/datasheet/g760a.pdf > + http://www.gmt.com.tw/product/datasheet/EDS-760A.pdf > > 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 > diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c > index bf0862a..897702d 100644 > --- a/drivers/hwmon/hwmon-vid.c > +++ b/drivers/hwmon/hwmon-vid.c > @@ -38,7 +38,7 @@ > * available at http://developer.intel.com/. > * > * AMD Athlon 64 and AMD Opteron Processors, AMD Publication 26094, > - * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/260… > + * http://developer.amd.com/documentation/articles/pages/1212200690_2.aspx > * Table 74. VID Code Voltages > * This corresponds to an arbitrary VRM code of 24 in the functions below. > * These CPU models (K8 revision <= E) have 5 VID pins. See also: > diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c > index 4516369..97d98fb 100644 > --- a/drivers/ide/hpt366.c > +++ b/drivers/ide/hpt366.c > @@ -12,7 +12,7 @@ > * > * > * HighPoint has its own drivers (open source except for the RAID part) > - * available from http://www.highpoint-tech.com/BIOS%20+%20Driver/. > + * available from http://www.highpoint-tech.com/USA_new/service_support.htm > * This may be useful to anyone wanting to work on this driver, however do not > * trust them too much since the code tends to become less and less meaningful > * as the time passes... :-/ > diff --git a/drivers/ide/ht6560b.c b/drivers/ide/ht6560b.c > index d81e496..808bcdc 100644 > --- a/drivers/ide/ht6560b.c > +++ b/drivers/ide/ht6560b.c > @@ -10,7 +10,6 @@ > * Author: Mikko Ala-Fossi <maf(a)iki.fi> > * Jan Evert van Grootheest <j.e.van.grootheest(a)caiway.nl> > * > - * Try: http://www.maf.iki.fi/~maf/ht6560b/ > */ > > #define DRV_NAME "ht6560b" > diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig > index 89d70de..6e35ecc 100644 > --- a/drivers/infiniband/Kconfig > +++ b/drivers/infiniband/Kconfig > @@ -16,7 +16,7 @@ config INFINIBAND_USER_MAD > Userspace InfiniBand Management Datagram (MAD) support. This > is the kernel side of the userspace MAD support, which allows > userspace processes to send and receive MADs. You will also > - need libibumad from <http://www.openib.org>. > + need libibumad from <http://www.openfabrics.org/downloads/management/>. > > config INFINIBAND_USER_ACCESS > tristate "InfiniBand userspace access (verbs and CM)" > @@ -28,7 +28,7 @@ config INFINIBAND_USER_ACCESS > to set up connections and directly access InfiniBand > hardware for fast-path operations. You will also need > libibverbs, libibcm and a hardware driver library from > - <http://www.openib.org>. > + <http://www.openfabrics.org/git/>. > > config INFINIBAND_USER_MEM > bool > diff --git a/drivers/infiniband/hw/cxgb3/Kconfig b/drivers/infiniband/hw/cxgb3/Kconfig > index 2acec3f..2b6352b 100644 > --- a/drivers/infiniband/hw/cxgb3/Kconfig > +++ b/drivers/infiniband/hw/cxgb3/Kconfig > @@ -10,7 +10,7 @@ config INFINIBAND_CXGB3 > our website at <http://www.chelsio.com>. > > For customer support, please visit our customer support page at > - <http://www.chelsio.com/support.htm>. > + <http://www.chelsio.com/support.html>. > > Please send feedback to <linux-bugs(a)chelsio.com>. > > diff --git a/drivers/infiniband/hw/cxgb4/Kconfig b/drivers/infiniband/hw/cxgb4/Kconfig > index ccb85ea..6b7e6c5 100644 > --- a/drivers/infiniband/hw/cxgb4/Kconfig > +++ b/drivers/infiniband/hw/cxgb4/Kconfig > @@ -10,7 +10,7 @@ config INFINIBAND_CXGB4 > our website at <http://www.chelsio.com>. > > For customer support, please visit our customer support page at > - <http://www.chelsio.com/support.htm>. > + <http://www.chelsio.com/support.html>. > > Please send feedback to <linux-bugs(a)chelsio.com>. > > diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig > index b411c51..d00af71 100644 > --- a/drivers/infiniband/ulp/iser/Kconfig > +++ b/drivers/infiniband/ulp/iser/Kconfig > @@ -9,4 +9,4 @@ config INFINIBAND_ISER > > The iSER protocol is defined by IETF. > See <http://www.ietf.org/rfc/rfc5046.txt> > - and <http://www.infinibandta.org/members/spec/Annex_iSER.PDF> > + and <http://members.infinibandta.org/kwspub/spec/Annex_iSER.PDF> > diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c > index 0ffaf2c..e68e497 100644 > --- a/drivers/input/joystick/gamecon.c > +++ b/drivers/input/joystick/gamecon.c > @@ -521,9 +521,8 @@ static void gc_multi_process_packet(struct gc *gc) > * PSX support > * > * See documentation at: > - * http://www.dim.com/~mackys/psxmemcard/ps-eng2.txt > + * http://www.geocities.co.jp/Playtown/2004/psx/ps_eng.txt > * http://www.gamesx.com/controldata/psxcont/psxcont.htm > - * ftp://milano.usal.es/pablo/ > * > */ > > diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c > index 2b0eba6..b09c7d1 100644 > --- a/drivers/input/misc/cm109.c > +++ b/drivers/input/misc/cm109.c > @@ -259,7 +259,7 @@ static unsigned short keymap_usbph01(int scancode) > > /* > * Keymap for ATCom AU-100 > - * http://www.atcom.cn/En_products_AU100.html > + * http://www.atcom.cn/products.html > * http://www.packetizer.com/products/au100/ > * http://www.voip-info.org/wiki/view/AU-100 > * > diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig > index c714ca2..bf5fd7f 100644 > --- a/drivers/input/mouse/Kconfig > +++ b/drivers/input/mouse/Kconfig > @@ -30,6 +30,7 @@ config MOUSE_PS2 > <http://w1.894.telia.com/~u89404340/touchpad/index.html> > and a new version of GPM at: > <http://www.geocities.com/dt_or/gpm/gpm.html> > + <http://xorg.freedesktop.org/archive/individual/driver/> > to take advantage of the advanced features of the touchpad. > > If unsure, say Y. > diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c > index 88121c5..1fd8f5e 100644 > --- a/drivers/input/mouse/touchkit_ps2.c > +++ b/drivers/input/mouse/touchkit_ps2.c > @@ -21,8 +21,8 @@ > * > * Based upon touchkitusb.c > * > - * Vendor documentation is available in support section of: > - * http://www.egalax.com.tw/ > + * Vendor documentation is available at: > + * http://home.eeti.com.tw/web20/drivers/Software%20Programming%20Guide_v2.0.p… > */ > > #include <linux/kernel.h> > diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c > index efd3aeb..36e57de 100644 > --- a/drivers/input/touchscreen/mk712.c > +++ b/drivers/input/touchscreen/mk712.c > @@ -17,7 +17,7 @@ > * found in Gateway AOL Connected Touchpad computers. > * > * Documentation for ICS MK712 can be found at: > - * http://www.icst.com/pdf/mk712.pdf > + * http://www.idt.com/products/getDoc.cfm?docID=18713923 > */ > > /* > diff --git a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c > index 861bdf3..d501393 100644 > --- a/drivers/isdn/i4l/isdn_audio.c > +++ b/drivers/isdn/i4l/isdn_audio.c > @@ -439,7 +439,7 @@ isdn_audio_xlaw2adpcm(adpcm_state * s, int fmt, unsigned char *in, > > /* > * Goertzel algorithm. > - * See http://ptolemy.eecs.berkeley.edu/~pino/Ptolemy/papers/96/dtmf_ict/ > + * See http://ptolemy.eecs.berkeley.edu/papers/96/dtmf_ict/ > * for more info. > * Result is stored into an sk_buff and queued up for later > * evaluation. > diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c > index d0d2213..9e3e2c5 100644 > --- a/drivers/macintosh/therm_adt746x.c > +++ b/drivers/macintosh/therm_adt746x.c > @@ -3,9 +3,9 @@ > * > * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt > * > - * Documentation from > - * http://www.analog.com/UploadedFiles/Data_Sheets/115254175ADT7467_pra.pdf > - * http://www.analog.com/UploadedFiles/Data_Sheets/3686221171167ADT7460_b.pdf > + * Documentation from 115254175ADT7467_pra.pdf and 3686221171167ADT7460_b.pdf > + * http://www.onsemi.com/PowerSolutions/product.do?id=ADT7467 > + * http://www.onsemi.com/PowerSolutions/product.do?id=ADT7460 > * > */ > > diff --git a/drivers/media/IR/keymaps/rc-manli.c b/drivers/media/IR/keymaps/rc-manli.c > index 1e9fbfa..0f590b3 100644 > --- a/drivers/media/IR/keymaps/rc-manli.c > +++ b/drivers/media/IR/keymaps/rc-manli.c > @@ -13,7 +13,6 @@ > #include <media/rc-map.h> > > /* Michael Tokarev <mjt(a)tls.msk.ru> > - http://www.corpit.ru/mjt/beholdTV/remote_control.jpg > keytable is used by MANLI MTV00[0x0c] and BeholdTV 40[13] at > least, and probably other cards too. > The "ascii-art picture" below (in comments, first row > diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c > index a6be529..87279d9 100644 > --- a/drivers/media/dvb/ttpci/av7110.c > +++ b/drivers/media/dvb/ttpci/av7110.c > @@ -26,7 +26,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > > @@ -2290,13 +2290,7 @@ static int frontend_init(struct av7110 *av7110) > /* Budgetpatch note: > * Original hardware design by Roberto Deza: > * There is a DVB_Wiki at > - * http://212.227.36.83/linuxtv/wiki/index.php/Main_Page > - * where is described this 'DVB TT Budget Patch', on Card Modding: > - * http://212.227.36.83/linuxtv/wiki/index.php/DVB_TT_Budget_Patch > - * On the short description there is also a link to a external file, > - * with more details: > - * http://perso.wanadoo.es/jesussolano/Ttf_tsc1.zip > - * > + * http://www.linuxtv.org/ > * New software triggering design by Emard that works on > * original Roberto Deza's hardware: > * > diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c > index 13efba9..878da6a 100644 > --- a/drivers/media/dvb/ttpci/av7110_av.c > +++ b/drivers/media/dvb/ttpci/av7110_av.c > @@ -25,7 +25,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > #include <linux/types.h> > diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c > index 4eba35a..7564c26 100644 > --- a/drivers/media/dvb/ttpci/av7110_ca.c > +++ b/drivers/media/dvb/ttpci/av7110_ca.c > @@ -25,7 +25,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > #include <linux/kernel.h> > diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c > index e162691..f1cbfe5 100644 > --- a/drivers/media/dvb/ttpci/av7110_hw.c > +++ b/drivers/media/dvb/ttpci/av7110_hw.c > @@ -22,7 +22,7 @@ > * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > /* for debugging ARM communication: */ > diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c > index 8986d96..ac20c5b 100644 > --- a/drivers/media/dvb/ttpci/av7110_v4l.c > +++ b/drivers/media/dvb/ttpci/av7110_v4l.c > @@ -22,7 +22,7 @@ > * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > #include <linux/kernel.h> > diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c > index 983672a..97afc01 100644 > --- a/drivers/media/dvb/ttpci/budget-av.c > +++ b/drivers/media/dvb/ttpci/budget-av.c > @@ -30,7 +30,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > #include "budget.h" > diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c > index 13ac9e3..a9c2c32 100644 > --- a/drivers/media/dvb/ttpci/budget-ci.c > +++ b/drivers/media/dvb/ttpci/budget-ci.c > @@ -26,7 +26,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > #include <linux/module.h> > diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c > index ba18e56..0546613 100644 > --- a/drivers/media/dvb/ttpci/budget-core.c > +++ b/drivers/media/dvb/ttpci/budget-core.c > @@ -31,7 +31,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > > diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c > index 9c92f9d..5798355 100644 > --- a/drivers/media/dvb/ttpci/budget-patch.c > +++ b/drivers/media/dvb/ttpci/budget-patch.c > @@ -27,7 +27,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > #include "av7110.h" > diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c > index 874a10a..d238fb9 100644 > --- a/drivers/media/dvb/ttpci/budget.c > +++ b/drivers/media/dvb/ttpci/budget.c > @@ -31,7 +31,7 @@ > * Or, point your browser to http://www.gnu.org/copyleft/gpl.html > * > * > - * the project's page is at http://www.linuxtv.org/dvb/ > + * the project's page is at http://www.linuxtv.org/ > */ > > #include "budget.h" > diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c > index 4349213..255d40d 100644 > --- a/drivers/media/radio/radio-maxiradio.c > +++ b/drivers/media/radio/radio-maxiradio.c > @@ -13,7 +13,7 @@ > * anybody does please mail me. > * > * For the pdf file see: > - * http://www.semiconductors.philips.com/pip/TEA5757H/V1 > + * http://www.nxp.com/acrobat_download2/expired_datasheets/TEA5757_5759_3.pdf > * > * > * CHANGES: > diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c > index 0343928..a5363ed 100644 > --- a/drivers/media/radio/radio-typhoon.c > +++ b/drivers/media/radio/radio-typhoon.c > @@ -1,8 +1,6 @@ > /* Typhoon Radio Card driver for radio support > * (c) 1999 Dr. Henrik Seidel <Henrik.Seidel(a)gmx.de> > * > - * Card manufacturer: > - * http://194.18.155.92/idc/prod2.idc?nr=50753&lang=e > * > * Notes on the hardware > * > diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig > index f6e4d04..d000522 100644 > --- a/drivers/media/video/Kconfig > +++ b/drivers/media/video/Kconfig > @@ -978,7 +978,7 @@ config USB_STKWEBCAM > Supported devices are typically found in some Asus laptops, > with USB id 174f:a311 and 05e1:0501. Other Syntek cameras > may be supported by the stk11xx driver, from which this is > - derived, see http://stk11xx.sourceforge.net > + derived, see <http://sourceforge.net/projects/syntekdriver/> > > To compile this driver as a module, choose M here: the > module will be called stkwebcam. > diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c > index be35e69..9536f1a 100644 > --- a/drivers/media/video/cafe_ccic.c > +++ b/drivers/media/video/cafe_ccic.c > @@ -4,7 +4,7 @@ > * sensor. > * > * The data sheet for this device can be found at: > - * http://www.marvell.com/products/pcconn/88ALP01.jsp > + * http://www.marvell.com/products/pc_connectivity/88alp01/ > * > * Copyright 2006 One Laptop Per Child Association, Inc. > * Copyright 2006-7 Jonathan Corbet <corbet(a)lwn.net> > diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c > index 6b805af..fe10909 100644 > --- a/drivers/media/video/cx18/cx18-cards.c > +++ b/drivers/media/video/cx18/cx18-cards.c > @@ -39,7 +39,7 @@ static struct cx18_card_tuner_i2c cx18_i2c_std = { > .tv = { 0x61, 0x60, I2C_CLIENT_END }, > }; > > -/* Please add new PCI IDs to: http://pci-ids.ucw.cz/iii > +/* Please add new PCI IDs to: http://pci-ids.ucw.cz/ > This keeps the PCI ID database up to date. Note that the entries > must be added under vendor 0x4444 (Conexant) as subsystem IDs. > New vendor IDs should still be added to the vendor ID list. */ > diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c > index abd64e8..53a6782 100644 > --- a/drivers/media/video/cx23885/cx23885-417.c > +++ b/drivers/media/video/cx23885/cx23885-417.c > @@ -7,7 +7,7 @@ > * (c) 2008 Steven Toth <stoth(a)linuxtv.org> > * - CX23885/7/8 support > * > - * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), > + * Includes parts from the ivtv driver <http://sourceforge.net/projects/ivtv/> > * > * 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 > diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c > index e46e1ce..660b2a9 100644 > --- a/drivers/media/video/cx88/cx88-blackbird.c > +++ b/drivers/media/video/cx88/cx88-blackbird.c > @@ -9,7 +9,7 @@ > * (c) 2005-2006 Mauro Carvalho Chehab <mchehab(a)infradead.org> > * - video_ioctl2 conversion > * > - * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), > + * Includes parts from the ivtv driver <http://sourceforge.net/projects/ivtv/> > * > * 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 > diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c > index ca1fd32..87afbbe 100644 > --- a/drivers/media/video/ivtv/ivtv-cards.c > +++ b/drivers/media/video/ivtv/ivtv-cards.c > @@ -65,7 +65,7 @@ static struct ivtv_card_tuner_i2c ivtv_i2c_tda8290 = { > > /********************** card configuration *******************************/ > > -/* Please add new PCI IDs to: http://pci-ids.ucw.cz/iii > +/* Please add new PCI IDs to: http://pci-ids.ucw.cz/ > This keeps the PCI ID database up to date. Note that the entries > must be added under vendor 0x4444 (Conexant) as subsystem IDs. > New vendor IDs should still be added to the vendor ID list. */ > diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c > index ef0c817..b1dbcf1 100644 > --- a/drivers/media/video/mxb.c > +++ b/drivers/media/video/mxb.c > @@ -3,7 +3,7 @@ > > Copyright (C) 1998-2006 Michael Hunold <michael(a)mihu.de> > > - Visit http://www.mihu.de/linux/saa7146/mxb/ > + Visit http://www.themm.net/~mihu/linux/saa7146/mxb.html > for further details about this card. > > This program is free software; you can redistribute it and/or modify > diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c > index 2782f94..2e86fdc 100644 > --- a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c > +++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c > @@ -4,7 +4,6 @@ > * * > * Copyright (C) 2004 by Carlos Eduardo Medaglia Dyonisio * > * <medaglia(a)undl.org.br> * > - * http://cadu.homelinux.com:8080/ * > * * > * Support for SN9C103, DAC Magnitude, exposure and green gain controls * > * added by Luca Risolia <luca.risolia(a)studio.unibo.it> * > diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig > index b743312..3b28933 100644 > --- a/drivers/misc/Kconfig > +++ b/drivers/misc/Kconfig > @@ -112,8 +112,8 @@ config IBM_ASM > > WARNING: This software may not be supported or function > correctly on your IBM server. Please consult the IBM ServerProven > - website <http://www.pc.ibm.com/ww/eserver/xseries/serverproven> for > - information on the specific driver level and support statement > + website <http://www-03.ibm.com/systems/info/x86servers/serverproven/compat/us/> > + for information on the specific driver level and support statement > for your IBM server. > > config PHANTOM > diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c > index 3e6c47b..ba29d2f 100644 > --- a/drivers/mtd/chips/cfi_cmdset_0002.c > +++ b/drivers/mtd/chips/cfi_cmdset_0002.c > @@ -418,8 +418,8 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) > > /* > * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 > - * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 > - * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_200… > + * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 > + * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf > * http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf > */ > if (extp->MajorVersion != '1' || > diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c > index f4359fe..caf6041 100644 > --- a/drivers/mtd/devices/lart.c > +++ b/drivers/mtd/devices/lart.c > @@ -17,7 +17,7 @@ > * - January 2000 > * > * [2] MTD internal API documentation > - * - http://www.linux-mtd.infradead.org/tech/ > + * - http://www.linux-mtd.infradead.org/ > * > * Limitations: > * > diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c > index 4d6a64c..037b399 100644 > --- a/drivers/mtd/ftl.c > +++ b/drivers/mtd/ftl.c > @@ -51,7 +51,7 @@ > > Use of the FTL format for non-PCMCIA applications may be an > infringement of these patents. For additional information, > - contact M-Systems (http://www.m-sys.com) directly. > + contact M-Systems directly. M-Systems since acquired by Sandisk. > > ======================================================================*/ > #include <linux/mtd/blktrans.h> > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig > index 701d942..9622126 100644 > --- a/drivers/mtd/maps/Kconfig > +++ b/drivers/mtd/maps/Kconfig > @@ -172,7 +172,7 @@ config MTD_OCTAGON > This provides a 'mapping' driver which supports the way in which > the flash chips are connected in the Octagon-5066 Single Board > Computer. More information on the board is available at > - <http://www.octagonsystems.com/CPUpages/5066.html>. > + <http://www.octagonsystems.com/products/5066.aspx>. > > config MTD_VMAX > tristate "JEDEC Flash device mapped on Tempustech VMAX SBC301" > @@ -284,7 +284,7 @@ config MTD_TQM8XXL > chips, currently uses AMD one. This 'mapping' driver supports > that arrangement, allowing the CFI probe and command set driver > code to communicate with the chips on the TQM8xxL board. More at > - <http://www.denx.de/embedded-ppc-en.html>. > + <http://www.denx.de/wiki/PPCEmbedded/>. > > config MTD_RPXLITE > tristate "CFI Flash device mapped on RPX Lite or CLLF" > diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c > index db1dfc5..e06c898 100644 > --- a/drivers/mtd/nand/cafe_nand.c > +++ b/drivers/mtd/nand/cafe_nand.c > @@ -2,7 +2,7 @@ > * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01 > * > * The data sheet for this device can be found at: > - * http://www.marvell.com/products/pcconn/88ALP01.jsp > + * http://wiki.laptop.org/go/Datasheets > * > * Copyright © 2006 Red Hat, Inc. > * Copyright © 2006 David Woodhouse <dwmw2(a)infradead.org> > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig > index 2cc81a5..5b66842 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -921,7 +921,7 @@ config SMC91X > including the SMC91C94 and the SMC91C111. Say Y if you want it > compiled into the kernel, and read the file > <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO, > - available from <http://www.linuxdoc.org/docs.html#howto>. > + available from <http://www.tldp.org/docs.html#howto>. > > This driver is also available as a module ( = code which can be > inserted in and removed from the running kernel whenever you want). > @@ -1031,7 +1031,7 @@ config SMC911X > including the new LAN9115, LAN9116, LAN9117, and LAN9118. > Say Y if you want it compiled into the kernel, > and read the Ethernet-HOWTO, available from > - <http://www.linuxdoc.org/docs.html#howto>. > + <http://www.tldp.org/docs.html#howto>. > > This driver is also available as a module. The module will be > called smc911x. If you want to compile it as a module, say M > @@ -1513,7 +1513,7 @@ config E100 > > For the latest Intel PRO/100 network driver for Linux, see: > > - <http://appsr.intel.com/scripts-df/support_intel.asp> > + <http://www.intel.com/p/en_US/support/highlights/network/pro100plus> > > More specific information on configuring the driver is in > <file:Documentation/networking/e100.txt>. > @@ -1539,9 +1539,8 @@ config FEALNX > select CRC32 > select MII > help > - Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet > - cards. Specifications and data at > - <http://www.myson.com.hk/mtd/datasheet/>. > + Say Y here to support the Myson MTD-800 family of PCI-based Ethernet > + cards. <http://www.myson.com.tw/> > > config NATSEMI > tristate "National Semiconductor DP8381x series PCI Ethernet support" > @@ -1715,7 +1714,7 @@ config SMSC9420 > This is a driver for SMSC's LAN9420 PCI ethernet adapter. > Say Y if you want it compiled into the kernel, > and read the Ethernet-HOWTO, available from > - <http://www.linuxdoc.org/docs.html#howto>. > + <http://www.tldp.org/docs.html#howto>. > > This driver is also available as a module. The module will be > called smsc9420. If you want to compile it as a module, say M > @@ -2550,7 +2549,7 @@ config CHELSIO_T1 > our website at <http://www.chelsio.com>. > > For customer support, please visit our customer support page at > - <http://www.chelsio.com/support.htm>. > + <http://www.chelsio.com/support.html>. > > Please send feedback to <linux-bugs(a)chelsio.com>. > > @@ -2582,7 +2581,7 @@ config CHELSIO_T3 > our website at <http://www.chelsio.com>. > > For customer support, please visit our customer support page at > - <http://www.chelsio.com/support.htm>. > + <http://www.chelsio.com/support.html>. > > Please send feedback to <linux-bugs(a)chelsio.com>. > > @@ -2607,7 +2606,7 @@ config CHELSIO_T4 > our website at <http://www.chelsio.com>. > > For customer support, please visit our customer support page at > - <http://www.chelsio.com/support.htm>. > + <http://www.chelsio.com/support.html>. > > Please send feedback to <linux-bugs(a)chelsio.com>. > > @@ -2630,7 +2629,7 @@ config CHELSIO_T4VF > our website at <http://www.chelsio.com>. > > For customer support, please visit our customer support page at > - <http://www.chelsio.com/support.htm>. > + <http://www.chelsio.com/support.html>. > > Please send feedback to <linux-bugs(a)chelsio.com>. > > diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig > index 0a0e0cd..f5a8916 100644 > --- a/drivers/net/appletalk/Kconfig > +++ b/drivers/net/appletalk/Kconfig > @@ -18,7 +18,7 @@ config ATALK > > General information about how to connect Linux, Windows machines and > Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. The > - NET-3-HOWTO, available from > + NET3-4-HOWTO, available from > <http://www.tldp.org/docs.html#howto>, contains valuable > information as well. > > diff --git a/drivers/net/atp.c b/drivers/net/atp.c > index bd2f9d3..0eee044 100644 > --- a/drivers/net/atp.c > +++ b/drivers/net/atp.c > @@ -68,7 +68,7 @@ static int xcvr[NUM_UNITS]; /* The data transfer mode. */ > > In 1997 Realtek made available the documentation for the second generation > RTL8012 chip, which has lead to several driver improvements. > - http://www.realtek.com.tw/cn/cn.html > + http://www.realtek.com.tw/ > > Theory of Operation > > diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c > index 57c8ac0..c6e2571 100644 > --- a/drivers/net/epic100.c > +++ b/drivers/net/epic100.c > @@ -131,8 +131,8 @@ IIIa. Ring buffers > > IVb. References > > -http://www.smsc.com/main/tools/discontinued/83c171.pdf > -http://www.smsc.com/main/tools/discontinued/83c175.pdf > +http://www.smsc.com/media/Downloads_Public/discontinued/83c171.pdf > +http://www.smsc.com/media/Downloads_Public/discontinued/83c175.pdf > http://scyld.com/expert/NWay.html > http://www.national.com/pf/DP/DP83840A.html > > diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig > index 62d5d5c..95dbcfd 100644 > --- a/drivers/net/hamradio/Kconfig > +++ b/drivers/net/hamradio/Kconfig > @@ -73,7 +73,7 @@ config DMASCC > certain parameters, such as channel access timing, clock mode, and > DMA channel. This is accomplished with a small utility program, > dmascc_cfg, available at > - <http://cacofonix.nt.tuwien.ac.at/~oe1kib/Linux/>. Please be sure to > + <http://www.linux-ax25.org/wiki/Ax25-tools>. Please be sure to > get at least version 1.27 of dmascc_cfg, as older versions will not > work with the current driver. > > diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c > index 294ccfb..8de3273 100644 > --- a/drivers/net/ibmlana.c > +++ b/drivers/net/ibmlana.c > @@ -23,7 +23,7 @@ paper sources: > 'LAN Technical Reference Ethernet Adapter Interface Version 1 Release 1.0 > Document Number SC30-3661-00' by IBM for info on the adapter itself > > - Also see http://www.natsemi.com/ > + Also see http://www.national.com/analog > > special acknowledgements to: > - Bob Eager for helping me out with documentation from IBM > diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h > index 36c3060..4dc39e5 100644 > --- a/drivers/net/irda/donauboe.h > +++ b/drivers/net/irda/donauboe.h > @@ -54,7 +54,7 @@ > /* anyone who has. HOWEVER the chip bears a striking resemblence */ > /* to the IrDA controller in the Toshiba RISC TMPR3922 chip */ > /* the documentation for this is freely available at */ > -/* http://www.toshiba.com/taec/components/Generic/TMPR3922.shtml */ > +/* http://www.madingley.org/james/resources/toshoboe/TMPR3922.pdf */ > /* The mapping between the registers in that document and the */ > /* Registers in the 701 oboe chip are as follows */ > > diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c > index 56f3fc4..627b619 100644 > --- a/drivers/net/pci-skeleton.c > +++ b/drivers/net/pci-skeleton.c > @@ -78,7 +78,7 @@ that almost all frames will need to be copied to an alignment buffer. > > IVb. References > > -http://www.realtek.com.tw/cn/cn.html > +http://www.realtek.com.tw/ > http://www.scyld.com/expert/NWay.html > > IVc. Errata > diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c > index c683f77..e092679 100644 > --- a/drivers/net/pcmcia/3c574_cs.c > +++ b/drivers/net/pcmcia/3c574_cs.c > @@ -62,7 +62,7 @@ invalid ramWidth is Very Bad. > V. References > > http://www.scyld.com/expert/NWay.html > -http://www.national.com/pf/DP/DP83840.html > +http://www.national.com/opf/DP/DP83840A.html > > Thanks to Terry Murphy of 3Com for providing development information for > earlier 3Com products. > diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c > index 8c4067a..12fb560 100644 > --- a/drivers/net/sc92031.c > +++ b/drivers/net/sc92031.c > @@ -15,7 +15,7 @@ > * Rewritten for 2.6 by Cesar Eduardo Barros > * > * A datasheet for this chip can be found at > - * http://www.silan.com.cn/english/products/pdf/SC92031AY.pdf > + * http://www.silan.com.cn/english/product/pdf/SC92031AY.pdf > */ > > /* Note about set_mac_address: I don't know how to change the hardware > diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c > index ccee3ed..ef000b2 100644 > --- a/drivers/net/tlan.c > +++ b/drivers/net/tlan.c > @@ -78,7 +78,7 @@ > * - Updated tlan.txt accordingly. > * - Adjusted minimum/maximum frame length. > * - There is now a TLAN website up at > - * http://tlan.kernel.dk > + * http://hp.sourceforge.net/ > * > * v1.7 April 07, 2000 - Started to implement custom ioctls. Driver now > * reports PHY information when used with Donald > diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c > index 435ef7d..ccc16d6 100644 > --- a/drivers/net/tokenring/tms380tr.c > +++ b/drivers/net/tokenring/tms380tr.c > @@ -5,7 +5,7 @@ > * Originally sktr.c: Written 1997 by Christoph Goos > * > * A fine result of the Linux Systems Network Architecture Project. > - * http://www.linux-sna.org > + * http://www.vanheusden.com/sna/ > * > * This software may be used and distributed according to the terms > * of the GNU General Public License, incorporated herein by reference. > diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig > index 516713f..14c02e1 100644 > --- a/drivers/net/tulip/Kconfig > +++ b/drivers/net/tulip/Kconfig > @@ -151,7 +151,7 @@ config ULI526X > select CRC32 > ---help--- > This driver is for ULi M5261/M5263 10/100M Ethernet Controller > - (<http://www.uli.com.tw/>). > + (<http://www.nvidia.com/page/uli_drivers.html>). > > To compile this driver as a module, choose M here. The module will > be called uli526x. > diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c > index 08555f8..08ad269 100644 > --- a/drivers/net/usb/plusb.c > +++ b/drivers/net/usb/plusb.c > @@ -32,7 +32,7 @@ > > > /* > - * Prolific PL-2301/PL-2302 driver ... http://www.prolifictech.com > + * Prolific PL-2301/PL-2302 driver ... http://www.prolific.com.tw/ > * > * The protocol and handshaking used here should be bug-compatible > * with the Linux 2.2 "plusb" driver, by Deti Fliegl. > diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig > index d08ce6a..423eb26 100644 > --- a/drivers/net/wan/Kconfig > +++ b/drivers/net/wan/Kconfig > @@ -409,7 +409,7 @@ config CYCLADES_SYNC > tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)" > depends on WAN_ROUTER_DRIVERS && (PCI || ISA) > ---help--- > - Cyclom 2X from Cyclades Corporation <http://www.cyclades.com/> is an > + Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an > intelligent multiprotocol WAN adapter with data transfer rates up to > 512 Kbps. These cards support the X.25 and SNA related protocols. > > diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h > index ea6362a..97659a0 100644 > --- a/drivers/net/wireless/ath/ath5k/ath5k.h > +++ b/drivers/net/wireless/ath/ath5k/ath5k.h > @@ -351,7 +351,7 @@ struct ath5k_srev_name { > /* > * Some of this information is based on Documentation from: > * > - * http://madwifi.org/wiki/ChipsetFeatures/SuperAG > + * http://madwifi-project.org/wiki/ChipsetFeatures/SuperAG > * > * Modulation for Atheros' eXtended Range - range enhancing extension that is > * supposed to double the distance an Atheros client device can keep a > diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h > index 55b4ac6..69a9b34 100644 > --- a/drivers/net/wireless/ath/ath5k/reg.h > +++ b/drivers/net/wireless/ath/ath5k/reg.h > @@ -26,7 +26,6 @@ > * Atheros presentations and papers like these: > * > * 5210 - http://nova.stanford.edu/~bbaas/ps/isscc2002_slides.pdf > - * http://www.it.iitb.ac.in/~janak/wifire/01222734.pdf > * > * 5211 - http://www.hotchips.org/archives/hc14/3_Tue/16_mcfarland.pdf > * > diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig > index b0342a5..8e82379 100644 > --- a/drivers/net/wireless/p54/Kconfig > +++ b/drivers/net/wireless/p54/Kconfig > @@ -8,7 +8,7 @@ config P54_COMMON > also need to be enabled in order to support any devices. > > These devices require softmac firmware which can be found at > - http://prism54.org/ > + <http://wireless.kernel.org/en/users/Drivers/p54> > > If you choose to build a module, it'll be called p54common. > > @@ -20,7 +20,7 @@ config P54_USB > This driver is for USB isl38xx based wireless cards. > > These devices require softmac firmware which can be found at > - http://prism54.org/ > + <http://wireless.kernel.org/en/users/Drivers/p54> > > If you choose to build a module, it'll be called p54usb. > > @@ -34,7 +34,7 @@ config P54_PCI > supported by the fullmac driver/firmware. > > This driver requires softmac firmware which can be found at > - http://prism54.org/ > + <http://wireless.kernel.org/en/users/Drivers/p54> > > If you choose to build a module, it'll be called p54pci. > > diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c > index dc14420..b5e64d7 100644 > --- a/drivers/net/wireless/prism54/islpci_hotplug.c > +++ b/drivers/net/wireless/prism54/islpci_hotplug.c > @@ -38,7 +38,7 @@ module_param(init_pcitm, int, 0); > /* In this order: vendor, device, subvendor, subdevice, class, class_mask, > * driver_data > * If you have an update for this please contact prism54-devel(a)prism54.org > - * The latest list can be found at http://prism54.org/supported_cards.php */ > + * The latest list can be found at http://wireless.kernel.org/en/users/Drivers/p54 */ > static DEFINE_PCI_DEVICE_TABLE(prism54_id_tbl) = { > /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ > { > diff --git a/drivers/parisc/README.dino b/drivers/parisc/README.dino > index 097324f..1627426 100644 > --- a/drivers/parisc/README.dino > +++ b/drivers/parisc/README.dino > @@ -10,8 +10,7 @@ > ** PCI bus. HP-supplied graphics cards that utilize the PCI bus are > ** not affected." > ** > -** REVISIT: "go/pci_defect" link below is stale. > -** HP Internal can use <http://hpfcdma.fc.hp.com:80/Dino/> > +** http://h20000.www2.hp.com/bizsupport/TechSupport/Home.jsp?locale=en_US&prod… > ** > ** Product First Good Serial Number > ** C200/C240 (US) US67350000 > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 89ed181..dcc333f 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -206,6 +206,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82439TX, quir > * VIA Apollo KT133 needs PCI latency patch > * Made according to a windows driver based patch by George E. Breese > * see PCI Latency Adjust on http://www.viahardware.com/download/viatweak.shtm > + * and http://www.georgebreese.com/net/software/#PCI > * Also see http://www.au-ja.org/review-kt133a-1-en.phtml for > * the info on which Mr Breese based his work. > * > @@ -996,7 +997,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA, 0x605, quirk_transparent_bridge) > /* > * Common misconfiguration of the MediaGX/Geode PCI master that will > * reduce PCI bandwidth from 70MB/s to 25MB/s. See the GXM/GXLV/GX1 > - * datasheets found at http://www.national.com/ds/GX for info on what > + * datasheets found at http://www.national.com/analog for info on what > * these bits do. <christer(a)weinigel.se> > */ > static void quirk_mediagx_master(struct pci_dev *dev) > diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c > index 414d9a6..91a7225 100644 > --- a/drivers/pcmcia/yenta_socket.c > +++ b/drivers/pcmcia/yenta_socket.c > @@ -1073,7 +1073,7 @@ static void yenta_config_init(struct yenta_socket *socket) > * invisible during PCI scans because of a misconfigured subordinate number > * of the parent brige - some BIOSes seem to be too lazy to set it right. > * Does the fixup carefully by checking how far it can go without conflicts. > - * See http\://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information. > + * See http://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information. > */ > static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) > { > diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c > index 2d8ac43..bc89f39 100644 > --- a/drivers/pnp/pnpbios/proc.c > +++ b/drivers/pnp/pnpbios/proc.c > @@ -11,7 +11,6 @@ > * > * The .../escd file is utilized by the lsescd utility written by > * Gunther Mayer. > - * http://home.t-online.de/home/gunther.mayer/lsescd > * > * The .../legacy_device_resources file is not used yet. > * > diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig > index bbf91ae..03453d4 100644 > --- a/drivers/scsi/Kconfig > +++ b/drivers/scsi/Kconfig > @@ -116,7 +116,7 @@ config CHR_DEV_OSST > <http://www.tldp.org/docs.html#howto> and > <file:Documentation/scsi/osst.txt> in the kernel source. > More info on the OnStream driver may be found on > - <http://linux1.onstream.nl/test/> > + <http://sourceforge.net/projects/osst/> > Please also have a look at the standard st docu, as most of it > applies to osst as well. > > @@ -156,9 +156,9 @@ config CHR_DEV_SG > directly, so you need some additional software which knows how to > talk to these devices using the SCSI protocol: > > - For scanners, look at SANE (<http://www.mostang.com/sane/>). For CD > + For scanners, look at SANE (<http://www.sane-project.org/>). For CD > writer software look at Cdrtools > - (<http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private…>) > + (<http://cdrecord.berlios.de/private/cdrecord.html>) > and for burning a "disk at once": CDRDAO > (<http://cdrdao.sourceforge.net/>). Cdparanoia is a high > quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>). > @@ -950,6 +950,7 @@ config SCSI_IPS > ---help--- > This is support for the IBM ServeRAID hardware RAID controllers. > See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html> > + and <http://www-947.ibm.com/support/entry/portal/docdisplay?brand=5000008&lndoci…> > for more information. If this driver does not work correctly > without modification please contact the author by email at > <ipslinux(a)adaptec.com>. > @@ -1609,7 +1610,7 @@ config SCSI_DEBUG > host adapter with one dummy SCSI disk. Each dummy disk uses kernel > RAM as storage (i.e. it is a ramdisk). To save space when multiple > dummy disks are simulated, they share the same kernel RAM for > - their storage. See <http://www.torque.net/sg/sdebug.html> for more > + their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more > information. This driver is primarily of use to those testing the > SCSI and block subsystems. If unsure, say N. > > diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c > index 24110f6..131c95f 100644 > --- a/drivers/serial/8250.c > +++ b/drivers/serial/8250.c > @@ -924,7 +924,7 @@ static int broken_efr(struct uart_8250_port *up) > /* > * Exar ST16C2550 "A2" devices incorrectly detect as > * having an EFR, and report an ID of 0x0201. See > - * http://www.exar.com/info.php?pdf=dan180_oct2004.pdf > + * http://linux.derkeiler.com/Mailing-Lists/Kernel/2004-11/4812.html > */ > if (autoconfig_read_divisor_id(up) == 0x0201 && size_fifo(up) == 16) > return 1; > diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/serial/bfin_sport_uart.c > index 5318dd3..feb62a8 100644 > --- a/drivers/serial/bfin_sport_uart.c > +++ b/drivers/serial/bfin_sport_uart.c > @@ -10,7 +10,7 @@ > > /* > * This driver and the hardware supported are in term of EE-191 of ADI. > - * http://www.analog.com/UploadedFiles/Application_Notes/399447663EE191.pdf > + * http://www.analog.com/static/imported-files/application_notes/EE191.pdf > * This application note describe how to implement a UART on a Sharc DSP, > * but this driver is implemented on Blackfin Processor. > * Transmit Frame Sync is not used by this driver to transfer data out. > diff --git a/drivers/serial/bfin_sport_uart.h b/drivers/serial/bfin_sport_uart.h > index 9ce253e..6d06ce1 100644 > --- a/drivers/serial/bfin_sport_uart.h > +++ b/drivers/serial/bfin_sport_uart.h > @@ -10,7 +10,7 @@ > > /* > * This driver and the hardware supported are in term of EE-191 of ADI. > - * http://www.analog.com/UploadedFiles/Application_Notes/399447663EE191.pdf > + * http://www.analog.com/static/imported-files/application_notes/EE191.pdf > * This application note describe how to implement a UART on a Sharc DSP, > * but this driver is implemented on Blackfin Processor. > * Transmit Frame Sync is not used by this driver to transfer data out. > diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c > index 9b03d7b..3fa2e16 100644 > --- a/drivers/serial/uartlite.c > +++ b/drivers/serial/uartlite.c > @@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE(of, ulite_of_match); > * Register definitions > * > * For register details see datasheet: > - * http://www.xilinx.com/bvdocs/ipcenter/data_sheet/opb_uartlite.pdf > + * http://www.xilinx.com/support/documentation/ip_documentation/opb_uartlite.p… > */ > > #define ULITE_RX 0x00 > diff --git a/drivers/staging/asus_oled/README b/drivers/staging/asus_oled/README > index 96b9717..0d82a6d 100644 > --- a/drivers/staging/asus_oled/README > +++ b/drivers/staging/asus_oled/README > @@ -2,7 +2,7 @@ > Driver for Asus OLED display present in some Asus laptops. > > The code of this driver is based on 'asusoled' program taken from > - https://launchpad.net/asusoled/. I just wanted to have a simple > + <http://lapsus.berlios.de/asus_oled.html>. I just wanted to have a simple > kernel driver for controlling this device, but I didn't know how > to do that. Now I know ;) Also, that program can not be used > with usbhid loaded, which means no USB mouse/keyboard while > diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c > index 5b279fb..8c95d8c 100644 > --- a/drivers/staging/asus_oled/asus_oled.c > +++ b/drivers/staging/asus_oled/asus_oled.c > @@ -24,7 +24,7 @@ > * > * > * Asus OLED support is based on asusoled program taken from > - * https://launchpad.net/asusoled/. > + * <http://lapsus.berlios.de/asus_oled.html>. > * > * > */ > diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c > index ced346a..78b1410 100644 > --- a/drivers/staging/comedi/drivers/cb_pcimdas.c > +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c > @@ -37,7 +37,7 @@ Configuration Options: > Developed from cb_pcidas and skel by Richard Bytheway (mocelet(a)sucs.org). > Only supports DIO, AO and simple AI in it's present form. > No interrupts, multi channel or FIFO AI, although the card looks like it could support this. > -See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more details. > +See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details. > */ > > #include "../comedidev.h" > diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c > index 6af6c83..82be77d 100644 > --- a/drivers/staging/comedi/drivers/daqboard2000.c > +++ b/drivers/staging/comedi/drivers/daqboard2000.c > @@ -50,8 +50,8 @@ Configuration options: > With some help from our swedish distributor, we got the Windows sourcecode > for the card, and here are the findings so far. > > - 1. A good document that describes the PCI interface chip is found at: > - http://plx.plxtech.com/download/9080/databook/9080db-106.pdf > + 1. A good document that describes the PCI interface chip is 9080db-106.pdf > + available from http://www.plxtech.com/products/io/pci9080 > > 2. The initialization done so far is: > a. program the FPGA (windows code sans a lot of error messages) > diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c > index 3acf7e6..1411dd8 100644 > --- a/drivers/staging/comedi/drivers/ni_labpc.c > +++ b/drivers/staging/comedi/drivers/ni_labpc.c > @@ -37,7 +37,7 @@ boards has not > yet been added to the driver, mainly due to the fact that > I don't know the device id numbers. If you have one > of these boards, > -please file a bug report at https://bugs.comedi.org/ > +please file a bug report at http://comedi.org/ > so I can get the necessary information from you. > > The 1200 series boards have onboard calibration dacs for correcting > diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c > index bd16f91..986ef67 100644 > --- a/drivers/staging/comedi/drivers/ni_mio_common.c > +++ b/drivers/staging/comedi/drivers/ni_mio_common.c > @@ -34,7 +34,7 @@ > 340747b.pdf AT-MIO E series Register Level Programmer Manual > 341079b.pdf PCI E Series RLPM > 340934b.pdf DAQ-STC reference manual > - 67xx and 611x registers (from http://www.ni.com/pdf/daq/us) > + 67xx and 611x registers (from ftp://ftp.ni.com/support/daq/mhddk/documentation/) > release_ni611x.pdf > release_ni67xx.pdf > Other possibly relevant info: > diff --git a/drivers/staging/comedi/drivers/plx9080.h b/drivers/staging/comedi/drivers/plx9080.h > index 485d63f..0d254a1 100644 > --- a/drivers/staging/comedi/drivers/plx9080.h > +++ b/drivers/staging/comedi/drivers/plx9080.h > @@ -13,7 +13,7 @@ > * > ******************************************************************** > * > - * Copyright (C) 1999 RG Studio s.c., http://www.rgstudio.com.pl/ > + * Copyright (C) 1999 RG Studio s.c. > * Written by Krzysztof Halasa <khc(a)rgstudio.com.pl> > * > * Portions (C) SBE Inc., used by permission. > diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c > index 0367d2b..a49a7c5 100644 > --- a/drivers/staging/comedi/drivers/rtd520.c > +++ b/drivers/staging/comedi/drivers/rtd520.c > @@ -59,7 +59,7 @@ Configuration options: > Data sheet: http://www.rtdusa.com/pdf/dm7520.pdf > Example source: http://www.rtdusa.com/examples/dm/dm7520.zip > Call them and ask for the register level manual. > - PCI chip: http://www.plxtech.com/products/toolbox/9080.htm > + PCI chip: http://www.plxtech.com/products/io/pci9080 > > Notes: > This board is memory mapped. There is some IO stuff, but it isn't needed. > diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c > index 6612247..ba8f670 100644 > --- a/drivers/staging/quickstart/quickstart.c > +++ b/drivers/staging/quickstart/quickstart.c > @@ -5,8 +5,7 @@ > * Copyright (C) 2007-2010 Angelo Arrifano <miknix(a)gmail.com> > * > * Information gathered from disassebled dsdt and from here: > - * "http://download.microsoft.com/download/9/c/5/ > - * 9c5b2167-8017-4bae-9fde-d599bac8184a/DirAppLaunch_Vista.doc" > + * <http://www.microsoft.com/whdc/system/platform/firmware/DirAppLaunch.mspx> > * > * 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 > diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig > index 1da73ec..bb44079 100644 > --- a/drivers/uio/Kconfig > +++ b/drivers/uio/Kconfig > @@ -17,9 +17,9 @@ config UIO_CIF > depends on PCI > help > Driver for Hilscher CIF DeviceNet and Profibus cards. This > - driver requires a userspace component that handles all of the > - heavy lifting and can be found at: > - http://www.osadl.org/projects/downloads/UIO/user/cif-* > + driver requires a userspace component called cif that handles > + all of the heavy lifting and can be found at: > + <http://www.osadl.org/projects/downloads/UIO/user/> > > To compile this driver as a module, choose M here: the module > will be called uio_cif. > diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig > index 916b2b6..b71e309 100644 > --- a/drivers/usb/serial/Kconfig > +++ b/drivers/usb/serial/Kconfig > @@ -176,7 +176,7 @@ config USB_SERIAL_VISOR > help > Say Y here if you want to connect to your HandSpring Visor, Palm > m500 or m505 through its USB docking station. See > - <http://usbvisor.sourceforge.net/> for more information on using this > + <http://usbvisor.sourceforge.net/index.php3> for more information on using this > driver. > > To compile this driver as a module, choose M here: the > @@ -289,7 +289,7 @@ config USB_SERIAL_KEYSPAN > and was developed with their support. You must also include > firmware to support your particular device(s). > > - See <http://misc.nu/hugh/keyspan.html> for more information. > + See <http://blemings.org/hugh/keyspan.html> for more information. > > To compile this driver as a module, choose M here: the > module will be called keyspan. > diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h > index 15a4583..28c640d 100644 > --- a/drivers/usb/serial/ftdi_sio_ids.h > +++ b/drivers/usb/serial/ftdi_sio_ids.h > @@ -46,7 +46,7 @@ > #define FTDI_USINT_RS232_PID 0xb812 /* Navigator RS232 and CONFIG lines */ > > /* OOCDlink by Joern Kaipf <joernk(a)web.de> > - * (http://www.joernonline.de/dw/doku.php?id=start&idx=projects:oocdlink) */ > + * (http://www.joernonline.de/) */ > #define FTDI_OOCDLINK_PID 0xbaf8 /* Amontec JTAGkey */ > > /* Luminary Micro Stellaris Boards, VID = FTDI_VID */ > @@ -335,7 +335,7 @@ > #define FTDI_PIEGROUP_PID 0xF208 /* Product Id */ > > /* ACT Solutions HomePro ZWave interface > - (http://www.act-solutions.com/HomePro.htm) */ > + (http://www.act-solutions.com/HomePro-Product-Matrix.html) */ > #define FTDI_ACTZWAVE_PID 0xF2D0 > > /* > @@ -366,7 +366,7 @@ > #define FTDI_SUUNTO_SPORTS_PID 0xF680 /* Suunto Sports instrument */ > > /* USB-UIRT - An infrared receiver and transmitter using the 8U232AM chip */ > -/* http://home.earthlink.net/~jrhees/USBUIRT/index.htm */ > +/* http://www.usbuirt.com/ */ > #define FTDI_USB_UIRT_PID 0xF850 /* Product Id */ > > /* CCS Inc. ICDU/ICDU40 product ID - > @@ -395,7 +395,7 @@ > */ > #define FTDI_HE_TIRA1_PID 0xFA78 /* Tira-1 IR transceiver */ > > -/* Inside Accesso contactless reader (http://www.insidefr.com) */ > +/* Inside Accesso contactless reader (http://www.insidecontactless.com/) */ > #define INSIDE_ACCESSO 0xFAD0 > > /* > @@ -634,14 +634,14 @@ > > /* > * JETI SPECTROMETER SPECBOS 1201 > - * http://www.jeti.com/products/sys/scb/scb1201.php > + * http://www.jeti.com/cms/index.php/instruments/other-instruments/specbos-2101 > */ > #define JETI_VID 0x0c6c > #define JETI_SPC1201_PID 0x04b2 > > /* > * FTDI USB UART chips used in construction projects from the > - * Elektor Electronics magazine (http://elektor-electronics.co.uk) > + * Elektor Electronics magazine (http://www.elektor.com/) > */ > #define ELEKTOR_VID 0x0C7D > #define ELEKTOR_FT323R_PID 0x0005 /* RFID-Reader, issue 09-2006 */ > diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c > index 297163c..0791778 100644 > --- a/drivers/usb/serial/keyspan.c > +++ b/drivers/usb/serial/keyspan.c > @@ -9,7 +9,7 @@ > the Free Software Foundation; either version 2 of the License, or > (at your option) any later version. > > - See http://misc.nu/hugh/keyspan.html for more information. > + See http://blemings.org/hugh/keyspan.html for more information. > > Code in this driver inspired by and in a number of places taken > from Brian Warner's original Keyspan-PDA driver. > diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h > index bf3297d..2d8baf6 100644 > --- a/drivers/usb/serial/keyspan.h > +++ b/drivers/usb/serial/keyspan.h > @@ -9,7 +9,7 @@ > the Free Software Foundation; either version 2 of the License, or > (at your option) any later version. > > - See http://misc.nu/hugh/keyspan.html for more information. > + See http://blemings.org/hugh/keyspan.html for more information. > > Code in this driver inspired by and in a number of places taken > from Brian Warner's original Keyspan-PDA driver. > diff --git a/drivers/usb/serial/mct_u232.h b/drivers/usb/serial/mct_u232.h > index 3a3f5e6..d325bb8 100644 > --- a/drivers/usb/serial/mct_u232.h > +++ b/drivers/usb/serial/mct_u232.h > @@ -10,10 +10,9 @@ > * > * This driver is for the device MCT USB-RS232 Converter (25 pin, Model No. > * U232-P25) from Magic Control Technology Corp. (there is also a 9 pin > - * Model No. U232-P9). See http://www.mct.com.tw/p_u232.html for further > - * information. The properties of this device are listed at the end of this > - * file. This device is available from various distributors. I know Hana, > - * http://www.hana.de and D-Link, http://www.dlink.com/products/usb/dsbs25. > + * Model No. U232-P9). See http://www.mct.com.tw/products/product_us232.html > + * for further information. The properties of this device are listed at the end > + * of this file. This device was used in the Dlink DSB-S25. > * > * All of the information about the device was acquired by using SniffUSB > * on Windows98. The technical details of the reverse engineering are > @@ -458,7 +457,7 @@ static int mct_u232_calculate_baud_rate(struct usb_serial *serial, > * embedded UART. Exhaustive documentation for these is available at: > * > * http://www.semiconductors.philips.com/pip/p87c52ubaa > - * http://www.semiconductors.philips.com/pip/pdiusbd12 > + * http://www.nxp.com/acrobat_download/various/PDIUSBD12_PROGRAMMING_GUIDE.pdf > * > * Thanks to Julian Highfield for the pointer to the Philips database. > * > diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig > index 8a372ba..b356e15 100644 > --- a/drivers/usb/storage/Kconfig > +++ b/drivers/usb/storage/Kconfig > @@ -36,7 +36,7 @@ config USB_STORAGE_DATAFAB > depends on USB_STORAGE > help > Support for certain Datafab CompactFlash readers. > - Datafab has a web page at <http://www.datafabusa.com/>. > + Datafab has a web page at <http://www.datafab.com/>. > > If this driver is compiled as a module, it will be named ums-datafab. > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index 8b31fdf..dc06ff1 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -49,7 +49,7 @@ menuconfig FB > You need an utility program called fbset to make full use of frame > buffer devices. Please read <file:Documentation/fb/framebuffer.txt> > and the Framebuffer-HOWTO at > - <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.2.html> for more > + <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.3.html> for more > information. > > Say Y here and to the driver for your graphics board below if you > @@ -955,7 +955,7 @@ config FB_EPSON1355 > Build in support for the SED1355 Epson Research Embedded RAMDAC > LCD/CRT Controller (since redesignated as the S1D13505) as a > framebuffer. Product specs at > - <http://www.erd.epson.com/vdc/html/products.htm>. > + <http://vdc.epson.com/>. > > config FB_S1D13XXX > tristate "Epson S1D13XXX framebuffer support" > @@ -966,7 +966,7 @@ config FB_S1D13XXX > help > Support for S1D13XXX framebuffer device family (currently only > working with S1D13806). Product specs at > - <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm> > + <http://vdc.epson.com/> > > config FB_ATMEL > tristate "AT91/AT32 LCD Controller support" > @@ -1323,7 +1323,7 @@ config FB_RADEON > don't need to choose this to run the Radeon in plain VGA mode. > > There is a product page at > - http://apps.ati.com/ATIcompare/ > + http://products.amd.com/en-us/GraphicCardResult.aspx > > config FB_RADEON_I2C > bool "DDC/I2C for ATI Radeon support" > @@ -1395,7 +1395,7 @@ config FB_ATY_CT > Say Y here to support use of ATI's 64-bit Rage boards (or other > boards based on the Mach64 CT, VT, GT, and LT chipsets) as a > framebuffer device. The ATI product support page for these boards > - is at <http://support.ati.com/products/pc/mach64/>. > + is at <http://support.ati.com/products/pc/mach64/mach64.html>. > > config FB_ATY_GENERIC_LCD > bool "Mach64 generic LCD support (EXPERIMENTAL)" > diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c > index f3d7440..3ec4923 100644 > --- a/drivers/video/arcfb.c > +++ b/drivers/video/arcfb.c > @@ -2,7 +2,6 @@ > * linux/drivers/video/arcfb.c -- FB driver for Arc monochrome LCD board > * > * Copyright (C) 2005, Jaya Kumar <jayalk(a)intworks.biz> > - * http://www.intworks.biz/arclcd > * > * This file is subject to the terms and conditions of the GNU General Public > * License. See the file COPYING in the main directory of this archive for > diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c > index db9713b..a268cbf 100644 > --- a/drivers/video/epson1355fb.c > +++ b/drivers/video/epson1355fb.c > @@ -4,7 +4,7 @@ > * Epson Research S1D13505 Embedded RAMDAC LCD/CRT Controller > * (previously known as SED1355) > * > - * Cf. http://www.erd.epson.com/vdc/html/S1D13505.html > + * Cf. http://vdc.epson.com/ > * > * > * Copyright (C) Hewlett-Packard Company. All rights reserved. > diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c > index 7293eac..7cb715d 100644 > --- a/drivers/video/fbcvt.c > +++ b/drivers/video/fbcvt.c > @@ -5,7 +5,7 @@ > * > * Based from the VESA(TM) Coordinated Video Timing Generator by > * Graham Loveridge April 9, 2003 available at > - * http://www.vesa.org/public/CVT/CVTd6r1.xls > + * http://www.elo.utfsm.cl/~elo212/docs/CVTd6r1.xls > * > * This file is subject to the terms and conditions of the GNU General Public > * License. See the file COPYING in the main directory of this archive > diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c > index c77bcc6..e225c00 100644 > --- a/drivers/video/hecubafb.c > +++ b/drivers/video/hecubafb.c > @@ -10,7 +10,7 @@ > * > * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. > * This work was possible because of apollo display code from E-Ink's website > - * http://support.eink.com/community > + * http://eink.com/ > * All information used to write this code is from public material made > * available by E-Ink on its support site. Some commands such as 0xA4 > * were found by looping through cmd=0x00 thru 0xFF and supplying random > diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c > index 9b3d6e4..63ed3b7 100644 > --- a/drivers/video/metronomefb.c > +++ b/drivers/video/metronomefb.c > @@ -10,7 +10,7 @@ > * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. > * > * This work was made possible by help and equipment support from E-Ink > - * Corporation. http://support.eink.com/community > + * Corporation. http://www.eink.com/ > * > * This driver is written to be used with the Metronome display controller. > * It is intended to be architecture independent. A board specific driver > diff --git a/firmware/keyspan_pda/keyspan_pda.S b/firmware/keyspan_pda/keyspan_pda.S > index 418fe69..f3acc19 100644 > --- a/firmware/keyspan_pda/keyspan_pda.S > +++ b/firmware/keyspan_pda/keyspan_pda.S > @@ -74,7 +74,7 @@ > * recognizes the new device ID and glues it to the real serial driver code. > * > * USEFUL DOCS: > - * EzUSB Technical Reference Manual: <http://www.anchorchips.com> > + * EzUSB Technical Reference Manual: <http://www.cypress.com/> > * 8051 manuals: everywhere, but try www.dalsemi.com because the EzUSB is > * basically the Dallas enhanced 8051 code. Remember that the EzUSB IO ports > * use totally different registers! > diff --git a/firmware/keyspan_pda/xircom_pgs.S b/firmware/keyspan_pda/xircom_pgs.S > index 05d99dd..0b79bbf 100644 > --- a/firmware/keyspan_pda/xircom_pgs.S > +++ b/firmware/keyspan_pda/xircom_pgs.S > @@ -74,7 +74,7 @@ > * recognizes the new device ID and glues it to the real serial driver code. > * > * USEFUL DOCS: > - * EzUSB Technical Reference Manual: <http://www.anchorchips.com> > + * EzUSB Technical Reference Manual: <http://www.cypress.com/> > * 8051 manuals: everywhere, but try www.dalsemi.com because the EzUSB is > * basically the Dallas enhanced 8051 code. Remember that the EzUSB IO ports > * use totally different registers! > diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h > index 6bbd75c..7c232c1 100644 > --- a/fs/hostfs/hostfs.h > +++ b/fs/hostfs/hostfs.h > @@ -28,12 +28,7 @@ > * #define ATTR_KILL_SUID 2048 > * #define ATTR_KILL_SGID 4096 > * > - * and this is because they were added in 2.5 development in this patch: > - * > - * http://linux.bkbits.net:8080/linux-2.5/ > - * cset(a)3caf4a12k4XgDzK7wyK-TGpSZ9u2Ww?nav=index.html > - * |src/.|src/include|src/include/linux|related/include/linux/fs.h > - * > + * and this is because they were added in 2.5 development. > * Actually, they are not needed by most ->setattr() methods - they are set by > * callers of notify_change() to notify that the setuid/setgid bits must be > * dropped. > diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c > index 5bf8a04..789c625 100644 > --- a/fs/partitions/ldm.c > +++ b/fs/partitions/ldm.c > @@ -5,7 +5,7 @@ > * Copyright (c) 2001-2007 Anton Altaparmakov > * Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi(a)telia.com> > * > - * Documentation is available at http://www.linux-ntfs.org/content/view/19/37/ > + * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads > * > * 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 > diff --git a/fs/partitions/ldm.h b/fs/partitions/ldm.h > index d1fb50b..374242c 100644 > --- a/fs/partitions/ldm.h > +++ b/fs/partitions/ldm.h > @@ -5,7 +5,7 @@ > * Copyright (c) 2001-2007 Anton Altaparmakov > * Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi(a)telia.com> > * > - * Documentation is available at http://www.linux-ntfs.org/content/view/19/37/ > + * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads > * > * 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 > diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig > index 513f431..7cd4666 100644 > --- a/fs/reiserfs/Kconfig > +++ b/fs/reiserfs/Kconfig > @@ -10,7 +10,8 @@ config REISERFS_FS > > In general, ReiserFS is as fast as ext2, but is very efficient with > large directories and small files. Additional patches are needed > - for NFS and quotas, please see <http://www.namesys.com/> for links. > + for NFS and quotas, please see > + <https://reiser4.wiki.kernel.org/index.php/Main_Page> for links. > > It is more easily extended to have features currently found in > database and keyword search systems than block allocation based file > @@ -18,7 +19,8 @@ config REISERFS_FS > plugins consistent with our motto ``It takes more than a license to > make source code open.'' > > - Read <http://www.namesys.com/> to learn more about reiserfs. > + Read <https://reiser4.wiki.kernel.org/index.php/Main_Page> > + to learn more about reiserfs. > > Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com. > > diff --git a/fs/reiserfs/README b/fs/reiserfs/README > index 14e8c9d..e2f7a26 100644 > --- a/fs/reiserfs/README > +++ b/fs/reiserfs/README > @@ -43,7 +43,7 @@ to address the fair crediting issue in the next GPL version.) > [END LICENSING] > > Reiserfs is a file system based on balanced tree algorithms, which is > -described at http://devlinux.com/namesys. > +described at https://reiser4.wiki.kernel.org/index.php/Main_Page > > Stop reading here. Go there, then return. > > diff --git a/include/crypto/gf128mul.h b/include/crypto/gf128mul.h > index 4086b8e..da2530e 100644 > --- a/include/crypto/gf128mul.h > +++ b/include/crypto/gf128mul.h > @@ -54,8 +54,8 @@ > > /* Comment by Rik: > * > - * For some background on GF(2^128) see for example: http://- > - * csrc.nist.gov/CryptoToolkit/modes/proposedmodes/gcm/gcm-revised-spec.pdf > + * For some background on GF(2^128) see for example: > + * http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-… > * > * The elements of GF(2^128) := GF(2)[X]/(X^128-X^7-X^2-X^1-1) can > * be mapped to computer memory in a variety of ways. Let's examine > diff --git a/include/linux/fdreg.h b/include/linux/fdreg.h > index c2eeb63..61ce641 100644 > --- a/include/linux/fdreg.h > +++ b/include/linux/fdreg.h > @@ -89,7 +89,7 @@ > /* the following commands are new in the 82078. They are not used in the > * floppy driver, except the first three. These commands may be useful for apps > * which use the FDRAWCMD interface. For doc, get the 82078 spec sheets at > - * http://www-techdoc.intel.com/docs/periph/fd_contr/datasheets/ */ > + * http://www.intel.com/design/archives/periphrl/docs/29046803.htm */ > > #define FD_PARTID 0x18 /* part id ("extended" version cmd) */ > #define FD_SAVE 0x2e /* save fdc regs for later restore */ > diff --git a/include/linux/if_infiniband.h b/include/linux/if_infiniband.h > index 3e659ec..7d95847 100644 > --- a/include/linux/if_infiniband.h > +++ b/include/linux/if_infiniband.h > @@ -5,7 +5,7 @@ > * <http://www.fsf.org/copyleft/gpl.html>, or the OpenIB.org BSD > * license, available in the LICENSE.TXT file accompanying this > * software. These details are also available at > - * <http://openib.org/license.html>. > + * <http://www.openfabrics.org/software_license.htm>. > * > * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > diff --git a/include/linux/n_r3964.h b/include/linux/n_r3964.h > index de24af7..54b8e0d 100644 > --- a/include/linux/n_r3964.h > +++ b/include/linux/n_r3964.h > @@ -4,7 +4,6 @@ > * Copyright by > * Philips Automation Projects > * Kassel (Germany) > - * http://www.pap-philips.de > * ----------------------------------------------------------- > * This software may be used and distributed according to the terms of > * the GNU General Public License, incorporated herein by reference. > diff --git a/net/ax25/Kconfig b/net/ax25/Kconfig > index 2a72aa9..705e53e 100644 > --- a/net/ax25/Kconfig > +++ b/net/ax25/Kconfig > @@ -7,7 +7,7 @@ menuconfig HAMRADIO > bool "Amateur Radio support" > help > If you want to connect your Linux box to an amateur radio, answer Y > - here. You want to read <http://www.tapr.org/tapr/html/pkthome.html> > + here. You want to read <http://www.tapr.org/> > and more specifically about AX.25 on Linux > <http://www.linux-ax25.org/>. > > @@ -42,7 +42,7 @@ config AX25 > check out the file <file:Documentation/networking/ax25.txt> in the > kernel source. More information about digital amateur radio in > general is on the WWW at > - <http://www.tapr.org/tapr/html/pkthome.html>. > + <http://www.tapr.org/>. > > To compile this driver as a module, choose M here: the > module will be called ax25. > @@ -89,7 +89,7 @@ config NETROM > <http://www.linux-ax25.org>. You also might want to check out the > file <file:Documentation/networking/ax25.txt>. More information about > digital amateur radio in general is on the WWW at > - <http://www.tapr.org/tapr/html/pkthome.html>. > + <http://www.tapr.org/>. > > To compile this driver as a module, choose M here: the > module will be called netrom. > @@ -108,7 +108,7 @@ config ROSE > <http://www.linux-ax25.org>. You also might want to check out the > file <file:Documentation/networking/ax25.txt>. More information about > digital amateur radio in general is on the WWW at > - <http://www.tapr.org/tapr/html/pkthome.html>. > + <http://www.tapr.org/>. > > To compile this driver as a module, choose M here: the > module will be called rose. > diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig > index 571f895..4123d5b 100644 > --- a/net/ipv4/Kconfig > +++ b/net/ipv4/Kconfig > @@ -84,7 +84,7 @@ config IP_FIB_TRIE > > An experimental study of compression methods for dynamic tries > Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. > - http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/ > + <http://www.csc.kth.se/~snilsson/software/dyntrie2/> > > endchoice > > @@ -555,7 +555,7 @@ config TCP_CONG_VENO > distinguishing to circumvent the difficult judgment of the packet loss > type. TCP Veno cuts down less congestion window in response to random > loss packets. > - See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf > + See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186> > > config TCP_CONG_YEAH > tristate "YeAH TCP" > diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c > index 3a92a76..094e150 100644 > --- a/net/ipv4/cipso_ipv4.c > +++ b/net/ipv4/cipso_ipv4.c > @@ -9,7 +9,7 @@ > * > * The CIPSO draft specification can be found in the kernel's Documentation > * directory as well as the following URL: > - * http://netlabel.sourceforge.net/files/draft-ietf-cipso-ipsecurity-01.txt > + * http://tools.ietf.org/id/draft-ietf-cipso-ipsecurity-01.txt > * The FIPS-188 specification can be found at the following URL: > * http://www.itl.nist.gov/fipspubs/fip188.htm > * > diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c > index 4a8e370..d9818c5 100644 > --- a/net/ipv4/fib_trie.c > +++ b/net/ipv4/fib_trie.c > @@ -16,7 +16,7 @@ > * > * An experimental study of compression methods for dynamic tries > * Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. > - * http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/ > + * http://www.csc.kth.se/~snilsson/software/dyntrie2/ > * > * > * IP-address lookup using LC-tries. Stefan Nilsson and Gunnar Karlsson > diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig > index 1833bdb..d048275 100644 > --- a/net/ipv4/netfilter/Kconfig > +++ b/net/ipv4/netfilter/Kconfig > @@ -147,7 +147,7 @@ config IP_NF_TARGET_ULOG > which can only be viewed through syslog. > > The appropriate userspace logging daemon (ulogd) may be obtained from > - <http://www.gnumonks.org/projects/ulogd/> > + <http://www.netfilter.org/projects/ulogd/index.html> > > To compile it as a module, choose M here. If unsure, say N. > > diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c > index 1eba160..00ca688 100644 > --- a/net/ipv4/tcp_illinois.c > +++ b/net/ipv4/tcp_illinois.c > @@ -6,7 +6,7 @@ > * The algorithm is described in: > * "TCP-Illinois: A Loss and Delay-Based Congestion Control Algorithm > * for High-Speed Networks" > - * http://www.ews.uiuc.edu/~shaoliu/papersandslides/liubassri06perf.pdf > + * http://www.ifp.illinois.edu/~srikant/Papers/liubassri06perf.pdf > * > * Implemented from description in paper and ns-2 simulation. > * Copyright (C) 2007 Stephen Hemminger <shemminger(a)linux-foundation.org> > diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c > index e663b78..bccce34 100644 > --- a/net/ipv4/tcp_input.c > +++ b/net/ipv4/tcp_input.c > @@ -428,10 +428,10 @@ EXPORT_SYMBOL(tcp_initialize_rcv_mss); > * > * The algorithm for RTT estimation w/o timestamps is based on > * Dynamic Right-Sizing (DRS) by Wu Feng and Mike Fisk of LANL. > - * <http://www.lanl.gov/radiant/website/pubs/drs/lacsi2001.ps> > + * <http://public.lanl.gov/radiant/pubs.html#DRS> > * > * More detail on this code can be found at > - * <http://www.psc.edu/~jheffner/senior_thesis.ps>, > + * <http://staff.psc.edu/jheffner/>, > * though this reference is out of date. A new paper > * is pending. > */ > diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c > index b612acf..38bc0b5 100644 > --- a/net/ipv4/tcp_veno.c > +++ b/net/ipv4/tcp_veno.c > @@ -6,7 +6,7 @@ > * "TCP Veno: TCP Enhancement for Transmission over Wireless Access Networks." > * IEEE Journal on Selected Areas in Communication, > * Feb. 2003. > - * See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf > + * See http://www.ie.cuhk.edu.hk/fileadmin/staff_upload/soung/Journal/J3.pdf > */ > > #include <linux/mm.h> > diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c > index c4c885d..3fb2b73 100644 > --- a/net/netfilter/nf_conntrack_proto_tcp.c > +++ b/net/netfilter/nf_conntrack_proto_tcp.c > @@ -329,8 +329,8 @@ static unsigned int get_conntrack_index(const struct tcphdr *tcph) > /* TCP connection tracking based on 'Real Stateful TCP Packet Filtering > in IP Filter' by Guido van Rooij. > > - http://www.nluug.nl/events/sane2000/papers.html > - http://www.iae.nl/users/guido/papers/tcp_filtering.ps.gz > + http://www.sane.nl/events/sane2000/papers.html > + http://www.darkart.com/mirrors/www.obfuscation.org/ipf/ > > The boundaries and the conditions are changed according to RFC793: > the packet must intersect the window (i.e. segments may be > diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c > index 456a1b4..854c303 100644 > --- a/sound/oss/ac97_codec.c > +++ b/sound/oss/ac97_codec.c > @@ -21,11 +21,8 @@ > * > ************************************************************************** > * > - * The Intel Audio Codec '97 specification is available at the Intel > - * audio homepage: http://developer.intel.com/ial/scalableplatforms/audio/ > - * > - * The specification itself is currently available at: > - * ftp://download.intel.com/ial/scalableplatforms/ac97r22.pdf > + * The Intel Audio Codec '97 specification is available at: > + * http://download.intel.com/support/motherboards/desktop/sb/ac97_r23.pdf > * > ************************************************************************** > * > diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c > index c7fba53..537cfba 100644 > --- a/sound/pci/ens1370.c > +++ b/sound/pci/ens1370.c > @@ -22,7 +22,7 @@ > /* Power-Management-Code ( CONFIG_PM ) > * for ens1371 only ( FIXME ) > * derived from cs4281.c, atiixp.c and via82xx.c > - * using http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c1540.htm > + * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ > * by Kurt J. Bosch > */ > > diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c > index 4677492..400f9eb 100644 > --- a/sound/pci/intel8x0.c > +++ b/sound/pci/intel8x0.c > @@ -716,7 +716,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich > * Intel 82443MX running a 100MHz processor system bus has a hardware bug, > * which aborts PCI busmaster for audio transfer. A workaround is to set > * the pages as non-cached. For details, see the errata in > - * http://www.intel.com/design/chipsets/specupdt/245051.htm > + * http://download.intel.com/design/chipsets/specupdt/24505108.pdf > */ > static void fill_nocache(void *buf, int size, int nocache) > { >

2 3

[alsa-devel] TASCAM US-144mkII Driver
by Michael Niemeck 28 Sep '10

28 Sep '10

Common consensus in the forums seems to be that the mkII versions of the TASCAM 122 and 144 have different hard- and/or software than their respective predecessors, and won't work with the current ALSA drivers. At least the latter I can confirm for my US-144mkII. Lacking the resources to modify the existing driver to work with the above interface, let alone write a new one, I wanted to ask if anyone of the active ALSA developers would be willing to (or is even already in the process of) write or modify a driver for the new TASCAMs. I would be more than willing to contribute to a bounty, if such a thing is common or at least accepted in the ALSA community, and according to this post (http://article.gmane.org/gmane.linux.alsa.user/34586) TASCAM is ready to support such a project with demo units. I would also be willing to function as a tester, of course. Still hoping, Mike ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

1 0

[alsa-devel] MIDI utility amidicat and alsa-utils
by Josh Lehan 28 Sep '10

28 Sep '10

Hello. Back at the start of this year, I was looking for a way to send arbitrary data into or out of the ALSA MIDI subsystem from the command line. Upon failing to find a solution, I wrote a little utility program to do just that, called "amidicat": http://krellan.com/amidicat/ When the idea was first talked about, Takashi Iwai mentioned that it might be useful to have in alsa-utils. I'm wondering if this is still the case? If so, what would be necessary to adapt my program to fit in and become a well-behaved member of alsa-utils? Does it need to compile on other platforms besides Linux, be internationalized, etc.? Josh

1 0

Re: [alsa-devel] [RFC v4]update broken web addresses in the kernel.
by Justin P. Mattock 28 Sep '10

28 Sep '10

On 09/27/2010 09:15 PM, Finn Thain wrote: > > On Mon, 27 Sep 2010, Justin P. Mattock wrote: > >> alright.. I'll redu this... remove the brackets, and fix up the rest.. >> one note is: >> http://dri.freedesktop.org/wiki/Documentation >> this address is already there.. > > Right you are. > >> probably best to just leave the sourceforge >> address and use the webarchive and/or if theirs a >> proper address for the sourceforge dri.. > > I didn't find a sensible address for the sourceforge stuff now that > indexes are turned off for /doc/. > > I agree, best just to leave it as is, since it is in the archive. > > Finn > >> >> Justin P. Mattock >> >> > alright... resent, hopefully I didnt miss any of them... eyes are going out of whack over here.. Justin P. Mattock

1 0

Re: [alsa-devel] [RFC v4]update broken web addresses in the kernel.
by Justin P. Mattock 28 Sep '10

28 Sep '10

On 09/27/2010 07:59 PM, Finn Thain wrote: > > On Sun, 26 Sep 2010, Justin P. Mattock wrote: > >> diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c >> index 033e150..d7d9a78 100644 >> --- a/drivers/char/apm-emulation.c >> +++ b/drivers/char/apm-emulation.c >> @@ -8,7 +8,7 @@ >> * (APM) BIOS Interface Specification, Revision 1.2, February 1996. >> * >> * [This document is available from Microsoft at: >> - * http://www.microsoft.com/hwdev/busbios/amp_12.htm] >> + * http://www.microsoft.com/whdc/archive/amp_12.mspx] >> */ > > > Can we lose the brackets? > > >> #include<linux/module.h> >> #include<linux/poll.h> > >> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig >> index 280c9b5..b2bd5fb 100644 >> --- a/drivers/firmware/Kconfig >> +++ b/drivers/firmware/Kconfig >> @@ -73,8 +73,8 @@ config EFI_PCDP >> on how the driver discovers devices. >> >> You must also enable the appropriate drivers (serial, VGA, etc.) >> - >> - See<http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf> >> + See [DIG64_HCDPv20_042804.pdf] available from > > > What are the square brackets for? > > >> + <http://www.dig64.org/specifications/> >> >> config DELL_RBU >> tristate "BIOS update support for DELL systems via sysfs" > >> diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h >> index ce910d6..777d928 100644 >> --- a/drivers/firmware/pcdp.h >> +++ b/drivers/firmware/pcdp.h >> @@ -1,8 +1,8 @@ >> /* >> * Definitions for PCDP-defined console devices >> * >> - * v1.0a: http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf >> - * v2.0: http://www.dig64.org/specifications/DIG64_PCDPv20.pdf >> + * For [v1.0a: DIG64_HCDPv10a_01.pdf] [v2.0: DIG64_PCDPv20.pdf] > > > For DIG64_HCDPv10a_01.pdf and DIG64_PCDPv20.pdf (v10.a and v2.0 resp.), > > >> + * Please see<http://www.dig64.org/specifications/> > > > please see<http://www.dig64.org/specifications/> > > >> * >> * (c) Copyright 2002, 2004 Hewlett-Packard Development Company, L.P. >> * Khalid Aziz<khalid.aziz(a)hp.com> >> diff --git a/drivers/gpu/drm/README.drm b/drivers/gpu/drm/README.drm >> index b5b3327..bf29068 100644 >> --- a/drivers/gpu/drm/README.drm >> +++ b/drivers/gpu/drm/README.drm >> @@ -28,7 +28,7 @@ ways: >> Documentation on the DRI is available from: >> http://dri.freedesktop.org/wiki/Documentation >> http://sourceforge.net/project/showfiles.php?group_id=387 >> - http://dri.sourceforge.net/doc/ >> + http://dri.sourceforge.net/doc/DRIuserguide.html > > > http://dri.freedesktop.org/wiki/Documentation > > >> >> For specific information about kernel-level support, see: >> > >> diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c >> index 88121c5..e74753e 100644 >> --- a/drivers/input/mouse/touchkit_ps2.c >> +++ b/drivers/input/mouse/touchkit_ps2.c >> @@ -22,7 +22,7 @@ >> * Based upon touchkitusb.c >> * >> * Vendor documentation is available in support section of: >> - * http://www.egalax.com.tw/ >> + * http://home.eeti.com.tw/web20/drivers/Software%20Programming%20Guide_v2.0.p… > > > The comment text needs to be fixed also. > > >> */ >> >> #include<linux/kernel.h> > >> diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c >> index 472907d..08023f1 100644 >> --- a/drivers/media/dvb/frontends/mt312.c >> +++ b/drivers/media/dvb/frontends/mt312.c >> @@ -20,8 +20,9 @@ >> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. >> >> References: >> - http://products.zarlink.com/product_profiles/MT312.htm >> - http://products.zarlink.com/product_profiles/SL1935.htm >> + http://www.zarlink.com/zarlink/hs/71.htm >> + http://www.chipcatalog.com/Zarlink/MT312.htm >> + http://www.chipcatalog.com/Zarlink/SL1935.htm > > > There's no need for links to chipcatalog.com. As I said in the previous > review, we have search engines for finding datasheets. Besides, the old > links are in the web archive (complete with PDFs) so there's no need to > remove them. > > >> */ >> >> #include<linux/delay.h> >> diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h >> index 29e3bb5..6d32e3f 100644 >> --- a/drivers/media/dvb/frontends/mt312.h >> +++ b/drivers/media/dvb/frontends/mt312.h >> @@ -19,8 +19,9 @@ >> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. >> >> References: >> - http://products.zarlink.com/product_profiles/MT312.htm >> - http://products.zarlink.com/product_profiles/SL1935.htm >> + http://www.zarlink.com/zarlink/hs/71.htm >> + http://www.chipcatalog.com/Zarlink/MT312.htm >> + http://www.chipcatalog.com/Zarlink/SL1935.htm > > > Same here. > > >> */ >> >> #ifndef MT312_H > >> --- a/drivers/media/video/gspca/gspca.c >> +++ b/drivers/media/video/gspca/gspca.c >> @@ -2338,7 +2338,7 @@ EXPORT_SYMBOL(gspca_resume); >> >> /* auto gain and exposure algorithm based on the knee algorithm described here: >> http://ytse.tricolour.net/docs/LowLightOptimization.html >> - >> + http://81.209.78.62:8080/docs/LowLightOptimization.html > > > This is in the web archive. > > >> Returns 0 if no changes were made, 1 if the gain and or exposure settings >> where changed. */ >> int gspca_auto_gain_n_exposure(struct gspca_dev *gspca_dev, int avg_lum, > >> index 701d942..142efd2 100644 >> --- a/drivers/mtd/maps/Kconfig >> +++ b/drivers/mtd/maps/Kconfig >> @@ -256,8 +256,7 @@ config MTD_DILNETPC >> depends on X86&& MTD_CONCAT&& MTD_PARTITIONS&& MTD_CFI_INTELEXT&& BROKEN >> help >> MTD map driver for SSV DIL/Net PC Boards "DNP" and "ADNP". >> - For details, see<http://www.ssv-embedded.de/ssv/pc104/p169.htm> >> - and<http://www.ssv-embedded.de/ssv/pc104/p170.htm> >> + For details, see<http://www.dilnetpc.com/> > > > This is in the web archive. This removes information. > > >> >> config MTD_DILNETPC_BOOTSIZE >> hex "Size of DIL/Net PC flash boot partition" > >> diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c >> index 0713e3a..114899b 100644 >> --- a/drivers/mtd/maps/dilnetpc.c >> +++ b/drivers/mtd/maps/dilnetpc.c >> @@ -19,8 +19,7 @@ >> * board: DNP/1486 and ADNP/1486. The DNP version has 2 megs of flash >> * ROM (Intel 28F016S3) and 8 megs of DRAM, the ADNP version has 4 megs >> * flash and 16 megs of RAM. >> - * For details, see http://www.ssv-embedded.de/ssv/pc104/p169.htm >> - * and http://www.ssv-embedded.de/ssv/pc104/p170.htm >> + * For details, see http://www.dilnetpc.com/ > > > Same. > > >> */ >> >> #include<linux/module.h> > >> index 49aac70..f4523cd 100644 >> --- a/drivers/net/hamachi.c >> +++ b/drivers/net/hamachi.c >> @@ -20,9 +20,6 @@ >> >> Support and updates available at >> http://www.scyld.com/network/hamachi.html >> - [link no longer provides useful info -jgarzik] >> - or >> - http://www.parl.clemson.edu/~keithu/hamachi.html > > > Why? > > >> >> */ >> > >> index 6af6c83..0723c9f 100644 >> --- a/drivers/staging/comedi/drivers/daqboard2000.c >> +++ b/drivers/staging/comedi/drivers/daqboard2000.c >> @@ -51,7 +51,7 @@ Configuration options: >> for the card, and here are the findings so far. >> >> 1. A good document that describes the PCI interface chip is found at: >> - http://plx.plxtech.com/download/9080/databook/9080db-106.pdf >> + [9080db-106.pdf] http://www.plxtech.com/products/io/pci9080 > > > Comments are supposed to be human readable text. Square brackets don't > quote filenames by any convention I'm aware of (?) > I'd suggest: > > A good document that describes the PCI interface chip is 9080db-106.pdf > available from http://www.plxtech.com/products/io/pci9080 > > >> >> 2. The initialization done so far is: >> a. program the FPGA (windows code sans a lot of error messages) > >> diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c >> index 28ccab4..fc853a5 100644 >> --- a/drivers/video/vga16fb.c >> +++ b/drivers/video/vga16fb.c >> @@ -2,7 +2,7 @@ >> * linux/drivers/video/vga16.c -- VGA 16-color framebuffer driver >> * >> * Copyright 1999 Ben Pfaff<pfaffben(a)debian.org> and Petr Vandrovec<VANDROVE(a)vc.cvut.cz> >> - * Based on VGA info at http://www.goodnet.com/~tinara/FreeVGA/home.htm >> + * Based on VGA info at http://www.osdever.net/FreeVGA/home.htm > > > The old link is in the web archive, you needn't remove it. Add the new one > if you wish. > > >> * Based on VESA framebuffer (c) 1998 Gerd Knorr<kraxel(a)goldbach.in-berlin.de> >> * >> * This file is subject to the terms and conditions of the GNU General >> diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c >> index b91c466..f4043f8 100644 >> --- a/drivers/video/vgastate.c >> +++ b/drivers/video/vgastate.c >> @@ -5,7 +5,7 @@ >> * >> * Copyright history from vga16fb.c: >> * Copyright 1999 Ben Pfaff and Petr Vandrovec >> - * Based on VGA info at http://www.goodnet.com/~tinara/FreeVGA/home.htm >> + * Based on VGA info at http://www.osdever.net/FreeVGA/home.htm > > > Same. > > >> * Based on VESA framebuffer (c) 1998 Gerd Knorr >> * >> * This file is subject to the terms and conditions of the GNU General >> diff --git a/include/linux/ixjuser.h b/include/linux/ixjuser.h >> index 88b4589..39ef699 100644 >> --- a/include/linux/ixjuser.h >> +++ b/include/linux/ixjuser.h >> @@ -25,7 +25,7 @@ >> * Mike Preston,<mpreston(a)quicknet.net> >> * >> * More information about the hardware related to this driver can be found >> - * at our website: http://www.quicknet.net >> + * at our website: http://blemings.org/hugh/keyspan.html > > > This appears to have been fat-fingered. No patch needed. > > >> * >> * Fixes: >> * > >> diff --git a/include/video/vga.h b/include/video/vga.h >> index b49a512..2b8691f 100644 >> --- a/include/video/vga.h >> +++ b/include/video/vga.h >> @@ -5,7 +5,7 @@ >> * >> * Copyright history from vga16fb.c: >> * Copyright 1999 Ben Pfaff and Petr Vandrovec >> - * Based on VGA info at http://www.goodnet.com/~tinara/FreeVGA/home.htm >> + * Based on VGA info at http://www.osdever.net/FreeVGA/home.htm > > > See above. > > Thanks. > > Finn > alright.. I'll redu this... remove the brackets, and fix up the rest.. one note is: http://dri.freedesktop.org/wiki/Documentation this address is already there.. probably best to just leave the sourceforge address and use the webarchive and/or if theirs a proper address for the sourceforge dri.. Justin P. Mattock

1 0

Re: [alsa-devel] [RFC v4]update broken web addresses in the kernel.
by Justin P. Mattock 28 Sep '10

28 Sep '10

On 09/27/2010 06:37 PM, Finn Thain wrote: > > On Mon, 27 Sep 2010, Justin P. Mattock wrote: > >> On 09/27/2010 09:03 AM, Joe Perches wrote: >>> On Mon, 2010-09-27 at 11:10 -0400, John W. Linville wrote: >>>> On Sun, Sep 26, 2010 at 11:31:15AM -0700, Justin P. Mattock wrote: >>>>> Below is an updated patch from the original fixing broken web >>>>> addresses in the kernel. Thanks for all the help and info on this >>>>> to everybody.. Hopefully I didnt miss any of them(if so let me >>>>> know, and I'll resend). >>>> Changing a URL for a relocated page is one thing, but removing links >>>> isn't necessarily a great idea. Even if the site is technically >>>> gone, it may be possible to find information e.g through the >>>> Internet Archive Wayback Machine. >>> >>> Perhaps it'd be better to scrape the contents of the various web >>> pages, collect them somewhere like wiki.kernel.org and encourage >>> others to put new contributions in that site. > > The copyright problem aside, this might be a good idea for material not > already archived but I don't think it makes sense to start a new > archive when archive.org (or other) has the information. > > And which version(s) do you scrape? I discussed some problems with > changing URLs in another thread: http://lkml.org/lkml/2010/9/22/22 > > Anyway, without knowing what future archive(s) would be available or > relevant to any given URL in the future, I think the best we might do is a > "Retrieved on YYYY-MM-DD" qualification for new URLs. > >> >> >> yeah I think somebody was saying something about having a separate file, >> with all the web addresses in them or something...In any case, up to you >> guys.. > > I don't see how moving the addresses would help. > And would it not make the information harder to find? > > Finn > depends on how the setup is.. I was thinking of having some kind of letter/number scheme i.e. (A-13) in the comment, then in the file with all the addresses under article "A" 13th address down you would have the web address.(but keep in mind that's just speculation..) Justin P. Mattock

1 0

[alsa-devel] [PATCH] ALSA: hda - Add quirk for another Acer laptop with a CX20585 codec
by Luke Yelavich 28 Sep '10

28 Sep '10

From: Luke Yelavich <luke.yelavich(a)canonical.com> BugLink: https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/647374 Set another Acer laptop (SSID 1025:043d) to use CXT5066_IDEAPAD Cc: stable(a)kernel.org Signed-off-by: Luke Yelavich <luke.yelavich(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index a6c68cb..80cc74b 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3094,6 +3094,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = { static struct snd_pci_quirk cxt5066_cfg_tbl[] = { SND_PCI_QUIRK(0x1025, 0x040a, "Acer", CXT5066_IDEAPAD), + SND_PCI_QUIRK(0x1025, 0x043d, "Acer", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO), SND_PCI_QUIRK(0x1028, 0x02f5, "Dell", CXT5066_DELL_LAPTOP), -- 1.7.1

1 0

[alsa-devel] [PATCH] ASoC: Fix masking of WM8962 FLL1 register
by Mark Brown 28 Sep '10

28 Sep '10

When configuring the FLL we preserve the FLL enable configuration in order to allow us to reenable the FLL after configuration but we do not clear the other bits in the register, causing old configuration to be preserved. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 7de5194..12286d6 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1342,7 +1342,7 @@ static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source, struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); struct _fll_div fll_div; int ret; - int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1); + int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA; /* Any change? */ if (source == wm8962->fll_src && Fref == wm8962->fll_fref && -- 1.7.1

1 0

[alsa-devel] davinci-i2c,pcm updates
by Troy Kisky 27 Sep '10

27 Sep '10

This patch set is against git://git.alsa-project.org/alsa-kernel.git but the last patch in series won't compile until the sram allocator patch is available.

8 44

[alsa-devel] mic on macbook air
by Reimundo 27 Sep '10

27 Sep '10

Hello list, from time to time I spend some time trying to get the mic working on a Macbook air 2,1. I tried looking at the relevant info from the corresponding kernel extensions on mac os X. The codec has "Vendor Id: 0x10ec0885" so the relevant part of the info.plist on mac os X reads <dict> <key>MicAttributes</key> <integer>28</integer> <key>MicInfo</key> <string>Sampled on rising edge</string> <key>NodeID</key> <integer>39</integer> <key>PinConfigDefault</key> <integer>2426405136</integer> </dict> Which tells me nothing. In particular I don't have a node 0x27=39 (at least not that hda-analyzer sees) so it's not surprising that if I send the corresponding verbs to set_config_default I don't get anything. Also, I don't see how setting the pinconfigdefault could affect my not having the mic working (anyway I tried setting those pinconfigdefaults that put the node as a fixed mic on all nids 0x19-0x1c to no avail) As for the sampled on rising edge, I don't know how to use this info. any ideas? Thanks, R.

4 6

Re: [alsa-devel] [RFC v4]update broken web addresses in the kernel.
by Justin P. Mattock 27 Sep '10

27 Sep '10

On 09/27/2010 09:03 AM, Joe Perches wrote: > On Mon, 2010-09-27 at 11:10 -0400, John W. Linville wrote: >> On Sun, Sep 26, 2010 at 11:31:15AM -0700, Justin P. Mattock wrote: >>> Below is an updated patch from the original fixing broken web addresses in the kernel. >>> Thanks for all the help and info on this to everybody.. >>> Hopefully I didnt miss any of them(if so let me know, and I'll resend). >> Changing a URL for a relocated page is one thing, but removing links >> isn't necessarily a great idea. Even if the site is technically >> gone, it may be possible to find information e.g through the Internet >> Archive Wayback Machine. > > Perhaps it'd be better to scrape the contents of the various > web pages, collect them somewhere like wiki.kernel.org and > encourage others to put new contributions in that site. > > > > yeah I think somebody was saying something about having a separate file, with all the web addresses in them or something...In any case, up to you guys.. Justin P. Mattock

1 0

Re: [alsa-devel] [RFC v4]update broken web addresses in the kernel.
by Justin P. Mattock 27 Sep '10

27 Sep '10

On 09/27/2010 08:10 AM, John W. Linville wrote: > On Sun, Sep 26, 2010 at 11:31:15AM -0700, Justin P. Mattock wrote: >> Below is an updated patch from the original fixing broken web addresses in the kernel. >> Thanks for all the help and info on this to everybody.. >> Hopefully I didnt miss any of them(if so let me know, and I'll resend). > > Changing a URL for a relocated page is one thing, but removing links > isn't necessarily a great idea. Even if the site is technically > gone, it may be possible to find information e.g through the Internet > Archive Wayback Machine. > >> diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c >> index e8e2d0f..ba10b07 100644 >> --- a/drivers/net/wireless/orinoco/main.c >> +++ b/drivers/net/wireless/orinoco/main.c >> @@ -17,7 +17,6 @@ >> * >> * Portions based on wvlan_cs.c 1.0.6, Copyright Andreas Neuhaus<andy >> * AT fasta.fh-dortmund.de> >> - * http://www.stud.fh-dortmund.de/~andy/wvlan/ >> * >> * The contents of this file are subject to the Mozilla Public License >> * Version 1.1 (the "License"); you may not use this file except in > > http://web.archive.org/web/20070716051348/http://www.stud.fh-dortmund.de/~a… > most of the urls that are not removed that are still broken work with the wayback machine..(from what I remember this one would give me a server error(reason for removing), but it doesn't look so). Thanks for this, I'll change that up. Justin P. Mattock

1 0

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 27 Sep '10

27 Sep '10

The following changes since commit 3e13f65e3aa51fc7009afc554683a0b182c057f5: ASoC: adapt multi-componentism again (2010-09-23 07:41:37 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 Dimitris Papastamos (3): ASoC: Delegate to hw specific read for volatile registers ASoC: Fix incorrect parameter to snd_soc_codec_volatile_register ASoC: WM8985: Remove unneeded declaration. Mark Brown (8): ASoC: Remove unneeded WM9713 header include from SMDK WM9713 driver ASoC: Clarify naming for SMDK WM9713 driver ASoC: Clean up the CODEC device as well as the board for SMDK WM9713 ASoC: Convert s3c-ac97 to pr_() macros ASoC: Add debug logging for s3c-ac97 resets ASoC: Clean up AC'97 glue driver ASoC: Add Jassi Brar as Samsung maintainer Merge branch 'for-2.6.36' into for-2.6.37 MAINTAINERS | 6 +++ sound/soc/codecs/ac97.c | 14 +++----- sound/soc/codecs/wm8985.c | 2 - sound/soc/s3c24xx/s3c-ac97.c | 14 +++++--- sound/soc/s3c24xx/smdk_wm9713.c | 4 +- sound/soc/soc-cache.c | 76 +++++++++++++++++++++++++------------- 6 files changed, 72 insertions(+), 44 deletions(-)

3 5

[alsa-devel] ASoC update for 2.6.36
by Mark Brown 27 Sep '10

27 Sep '10

The following changes since commit 0077ca0b5c986477e33451b797b6e7dc92a8bbc0: ASoC: Fix multi-componentism (2010-09-22 18:47:40 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.36 Mark Brown (1): ASoC: Add Jassi Brar as Samsung maintainer MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)

2 1

[alsa-devel] [PATCH] ASoC: Add Jassi Brar as Samsung maintainer
by Mark Brown 27 Sep '10

27 Sep '10

Since Jassi is doing so much good work and can offer such good review for the Samsung CPU support add an entry for the Samsung ASoC drivers to MAINTAINERS listing him. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg(a)slimlogic.co.uk> --- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b5b8baa..f51409b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4965,6 +4965,12 @@ F: drivers/media/common/saa7146* F: drivers/media/video/*7146* F: include/media/*7146* +SAMSUNG AUDIO (ASoC) DRIVERS +M: Jassi Brar <jassi.brar(a)samsung.com> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Supported +F: sound/soc/s3c24xx + TLG2300 VIDEO4LINUX-2 DRIVER M: Huang Shijie <shijie8(a)gmail.com> M: Kang Yong <kangyong(a)telegent.com> -- 1.7.1

3 8

Re: [alsa-devel] [RFC 1/3 v3]update web addresses in the kernel
by Justin P. Mattock 26 Sep '10

26 Sep '10

alright(going to top post because of how long this is). I will go and make the changes and resend it out... On 09/26/2010 02:43 AM, Finn Thain wrote: > > Hi Justin, > > Some comments on your latest patch follow. > > > On Fri, 24 Sep 2010, Justin P. Mattock wrote: > >> --- a/drivers/ata/pata_it821x.c >> +++ b/drivers/ata/pata_it821x.c >> @@ -16,7 +16,7 @@ >> * Based in part on the ITE vendor provided SCSI driver. >> * >> * Documentation available from >> - * http://www.ite.com.tw/pc/IT8212F_V04.pdf >> + * http://www.ite.com.tw/EN/products_more.aspx?CategoryID=3&ID=5,91 > > The existence of the pdf could be useful information when one needs to > locate a copy. I think the filename needs to be retained. > > > >> * Some other documents are NDA. >> * >> * The ITE8212 isn't exactly a standard IDE controller. It has two > >> diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c >> index a2fa1fe..adb6574 100644 >> --- a/drivers/edac/i82443bxgx_edac.c >> +++ b/drivers/edac/i82443bxgx_edac.c >> @@ -12,7 +12,7 @@ >> * 440GX fix by Jason Uhlenkott<juhlenko(a)akamai.com>. >> * >> * Written with reference to 82443BX Host Bridge Datasheet: >> - * http://www.intel.com/design/chipsets/440/documentation.htm >> + * http://ark.intel.com/Product.aspx?id=27151 > > That's the wrong document. It refers to processor number 440 not the *440 > chipsets. > > Google offers this link: > http://download.intel.com/design/chipsets/datashts/29063301.pdf > > >> * references to this document given in []. >> * >> * This module doesn't support the 440LX, but it may be possible to >> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig >> index 280c9b5..aec5691 100644 >> --- a/drivers/firmware/Kconfig >> +++ b/drivers/firmware/Kconfig >> @@ -74,7 +74,8 @@ config EFI_PCDP >> >> You must also enable the appropriate drivers (serial, VGA, etc.) >> >> - See<http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf> >> + See DIG64_HCDPv20_042804.pdf available from >> + <http://www.dig64.org/specifications/> > > Can you do the same for IT8212F_V04.pdf above? > > >> >> config DELL_RBU >> tristate "BIOS update support for DELL systems via sysfs" > >> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c >> index 949326d..f3e9d45 100644 >> --- a/drivers/gpu/drm/drm_modes.c >> +++ b/drivers/gpu/drm/drm_modes.c >> @@ -76,7 +76,7 @@ EXPORT_SYMBOL(drm_mode_debug_printmodeline); >> * according to the hdisplay, vdisplay, vrefresh. >> * It is based from the VESA(TM) Coordinated Video Timing Generator by >> * Graham Loveridge April 9, 2003 available at >> - * http://www.vesa.org/public/CVT/CVTd6r1.xls >> + * http://www.elo.utfsm.cl/~elo212/docs/CVTd6r1.xls >> * >> * And it is copied from xf86CVTmode in xserver/hw/xfree86/modes/xf86cvt.c. >> * What I have done is to translate it by using integer calculation. > >> /* >> * Keymap for ATCom AU-100 >> - * http://www.atcom.cn/En_products_AU100.html >> + * http://www.atcom.cn/products.html >> * http://www.packetizer.com/products/au100/ >> * http://www.voip-info.org/wiki/view/AU-100 >> * >> diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig >> index c714ca2..5e98430 100644 >> --- a/drivers/input/mouse/Kconfig >> +++ b/drivers/input/mouse/Kconfig >> @@ -27,10 +27,7 @@ config MOUSE_PS2 >> >> Synaptics, ALPS or Elantech TouchPad users might be interested >> in a specialized Xorg/XFree86 driver at: >> - <http://w1.894.telia.com/~u89404340/touchpad/index.html> >> - and a new version of GPM at: >> - <http://www.geocities.com/dt_or/gpm/gpm.html> > > > This one is in the web archive so it might be a good idea to keep the URL? > > >> - to take advantage of the advanced features of the touchpad. >> + <http://xorg.freedesktop.org/archive/individual/driver/> >> >> If unsure, say Y. >> > >> diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c >> index abd64e8..43eea3a 100644 >> --- a/drivers/media/video/cx23885/cx23885-417.c >> +++ b/drivers/media/video/cx23885/cx23885-417.c >> @@ -7,7 +7,7 @@ >> * (c) 2008 Steven Toth<stoth(a)linuxtv.org> >> * - CX23885/7/8 support >> * >> - * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), >> + * Includes parts from the ivtv driver(http://sourceforge.net/projects/ivtv/), > > How about, > > + * Includes parts from the ivtv driver<http://sourceforge.net/projects/ivtv/> > > >> * >> * 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 >> diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c >> index e46e1ce..821766e 100644 >> --- a/drivers/media/video/cx88/cx88-blackbird.c >> +++ b/drivers/media/video/cx88/cx88-blackbird.c >> @@ -9,7 +9,7 @@ >> * (c) 2005-2006 Mauro Carvalho Chehab<mchehab(a)infradead.org> >> * - video_ioctl2 conversion >> * >> - * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), >> + * Includes parts from the ivtv driver(http://sourceforge.net/projects/ivtv/), > > > Same here. > > >> * >> * 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 > >> diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c >> index 4d6a64c..8e201b8 100644 >> --- a/drivers/mtd/ftl.c >> +++ b/drivers/mtd/ftl.c >> @@ -51,7 +51,7 @@ >> >> Use of the FTL format for non-PCMCIA applications may be an >> infringement of these patents. For additional information, >> - contact M-Systems (http://www.m-sys.com) directly. >> + contact M-Systems directly. [M-Systems since acquired by Sandisk.]. > > > An entire sentence within parentheses is usually written like this: > > + contact M-Systems directly. [M-Systems since acquired by Sandisk.] > > >> >> ======================================================================*/ >> #include<linux/mtd/blktrans.h> > >> diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c >> index db1dfc5..48894dc 100644 >> --- a/drivers/mtd/nand/cafe_nand.c >> +++ b/drivers/mtd/nand/cafe_nand.c >> @@ -2,7 +2,7 @@ >> * Driver for One Laptop Per Child ?CAF?? controller, aka Marvell 88ALP01 >> * >> * The data sheet for this device can be found at: >> - * http://www.marvell.com/products/pcconn/88ALP01.jsp >> + * http://www.marvell.com/products/pc_connectivity/88alp01/ > > No, it isn't there any longer. It is here though: > > http://wiki.laptop.org/go/Datasheets > > >> * >> * Copyright ? 2006 Red Hat, Inc. >> * Copyright ? 2006 David Woodhouse<dwmw2(a)infradead.org> >> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig >> index 2cc81a5..99fb1f6 100644 >> --- a/drivers/net/Kconfig >> +++ b/drivers/net/Kconfig > >> @@ -1541,7 +1541,7 @@ config FEALNX >> help >> Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet >> cards. Specifications and data at >> - <http://www.myson.com.hk/mtd/datasheet/>. >> + <http://www.datasheetarchive.com/datasheet-pdf/022/DSA00384882.html>. > > Links to the datasheetarchive are probably redundant. We have search > engines for that. Also, there are three devices supported by this driver > and your link is only good for one of them, so searching is likely to be > needed anyway. > > The site is actually http://www.myson.com.tw/ but there's no product > information there any longer. I'd suggest this (also correcting the typo): > > - Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet > - cards. Specifications and data at > -<http://www.myson.com.hk/mtd/datasheet/>. > + Say Y here to support the Myson MTD-800 family of PCI-based Ethernet > + cards.<http://www.myson.com.tw/> > > > >> >> config NATSEMI >> tristate "National Semiconductor DP8381x series PCI Ethernet support" > >> http://www.national.com/pf/DP/DP83840A.html >> > >> index c683f77..230158b 100644 >> --- a/drivers/net/pcmcia/3c574_cs.c >> +++ b/drivers/net/pcmcia/3c574_cs.c >> @@ -62,7 +62,7 @@ invalid ramWidth is Very Bad. >> V. References >> >> http://www.scyld.com/expert/NWay.html >> -http://www.national.com/pf/DP/DP83840.html >> +http://www.national.com/opf/DP/DP83840A.html#Overview > > No need for the "#Overview" anchor. > > >> >> Thanks to Terry Murphy of 3Com for providing development information for >> earlier 3Com products. > >> diff --git a/drivers/net/sis900.h b/drivers/net/sis900.h >> index 150511a..45f5323 100644 >> --- a/drivers/net/sis900.h >> +++ b/drivers/net/sis900.h >> @@ -7,7 +7,7 @@ >> * preliminary Rev. 1.0 Nov. 10, 1998 >> * SiS 7014 Single Chip 100BASE-TX/10BASE-T Physical Layer Solution, >> * preliminary Rev. 1.0 Jan. 18, 1998 >> - * http://www.sis.com.tw/support/databook.htm >> + * http://www.sis.com/elibrary/elibrary_index00.htm > > The old URL is in the web archive, complete with the relevant datasheets. > But if I follow your URL, I get nothing useful. > > >> */ >> >> /* > >> index b0342a5..024fccc 100644 >> --- a/drivers/net/wireless/p54/Kconfig >> +++ b/drivers/net/wireless/p54/Kconfig >> @@ -8,7 +8,7 @@ config P54_COMMON >> also need to be enabled in order to support any devices. >> >> These devices require softmac firmware which can be found at >> - http://prism54.org/ >> + http://wireless.kernel.org/en/users/Drivers/p54 > > > The convention seems to be angle brackets around URLS in Kconfig. > > >> >> If you choose to build a module, it'll be called p54common. >> >> @@ -20,7 +20,7 @@ config P54_USB >> This driver is for USB isl38xx based wireless cards. >> >> These devices require softmac firmware which can be found at >> - http://prism54.org/ >> + http://wireless.kernel.org/en/users/Drivers/p54 > > > Same. > >> >> If you choose to build a module, it'll be called p54usb. >> >> @@ -34,7 +34,7 @@ config P54_PCI >> supported by the fullmac driver/firmware. >> >> This driver requires softmac firmware which can be found at >> - http://prism54.org/ >> + http://wireless.kernel.org/en/users/Drivers/p54 >> >> If you choose to build a module, it'll be called p54pci. >> > > Same. > > >> @@ -205,7 +205,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82439TX, quir >> /* >> * VIA Apollo KT133 needs PCI latency patch >> * Made according to a windows driver based patch by George E. Breese >> - * see PCI Latency Adjust on http://www.viahardware.com/download/viatweak.shtm >> + * see PCI Latency Adjust on http://www.georgebreese.com/net/software/#PCI > > > The old link is in the web archive, but yours is also useful. > Can't we have both? > > >> * Also see http://www.au-ja.org/review-kt133a-1-en.phtml for >> * the info on which Mr Breese based his work. >> * > >> --- a/drivers/scsi/Kconfig >> +++ b/drivers/scsi/Kconfig >> @@ -949,7 +949,7 @@ config SCSI_IPS >> depends on PCI&& SCSI >> ---help--- >> This is support for the IBM ServeRAID hardware RAID controllers. >> - See<http://www.developer.ibm.com/welcome/netfinity/serveraid.html> >> + See<http://www-947.ibm.com/support/entry/portal/docdisplay?brand=5000008&lndoci…> > > The old URL is in the web archive, complete with downloads. Please keep > it around as there may be no other way to find that material. > > >> for more information. If this driver does not work correctly >> without modification please contact the author by email at >> <ipslinux(a)adaptec.com>. > >> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c >> index b02bdc6..705f541 100644 >> --- a/drivers/scsi/scsi_debug.c >> +++ b/drivers/scsi/scsi_debug.c >> @@ -555,8 +555,8 @@ static int inquiry_evpd_84(unsigned char * arr) >> static int inquiry_evpd_85(unsigned char * arr) >> { >> int num = 0; >> - const char * na1 = "https://www.kernel.org/config"; >> - const char * na2 = "http://www.kernel.org/log"; >> + const char * na1 = "https://www.kernel.org"; >> + const char * na2 = "http://www.kernel.org"; > > > Why? These are deliberately fake, and deliberately different. > > BTW, a URL like http://www.kernel.org/ is supposed to have the slash at > the end. > > >> int plen, olen; >> >> arr[num++] = 0x1; /* lu, storage config */ >> diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c >> index 24110f6..41a3ed8 100644 >> --- a/drivers/serial/8250.c >> +++ b/drivers/serial/8250.c >> @@ -924,7 +924,7 @@ static int broken_efr(struct uart_8250_port *up) >> /* >> * Exar ST16C2550 "A2" devices incorrectly detect as >> * having an EFR, and report an ID of 0x0201. See >> - * http://www.exar.com/info.php?pdf=dan180_oct2004.pdf >> + * http://linux.derkeiler.com/pdf/Mailing-Lists/Kernel/2004-11/4812.pdf > > > This link is better since it has the entire thread: > http://linux.derkeiler.com/Mailing-Lists/Kernel/2004-11/4812.html > > >> */ >> if (autoconfig_read_divisor_id(up) == 0x0201&& size_fifo(up) == 16) >> return 1; > >> diff --git a/drivers/staging/asus_oled/README b/drivers/staging/asus_oled/README >> index 96b9717..b6f77c5 100644 >> --- a/drivers/staging/asus_oled/README >> +++ b/drivers/staging/asus_oled/README >> @@ -2,7 +2,7 @@ >> Driver for Asus OLED display present in some Asus laptops. >> >> The code of this driver is based on 'asusoled' program taken from >> - https://launchpad.net/asusoled/. I just wanted to have a simple >> + http://lapsus.berlios.de/asus_oled.html. I just wanted to have a simple > > > The trailing "." isn't helping. Put it inside angle brackets. > > >> kernel driver for controlling this device, but I didn't know how >> to do that. Now I know ;) Also, that program can not be used >> with usbhid loaded, which means no USB mouse/keyboard while >> diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c >> index 5b279fb..1cb2116 100644 >> --- a/drivers/staging/asus_oled/asus_oled.c >> +++ b/drivers/staging/asus_oled/asus_oled.c >> @@ -24,7 +24,7 @@ >> * >> * >> * Asus OLED support is based on asusoled program taken from >> - * https://launchpad.net/asusoled/. >> + * http://lapsus.berlios.de/asus_oled.html. > > Same here. > > >> * >> * >> */ >> diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c >> index ced346a..e4cf861 100644 >> --- a/drivers/staging/comedi/drivers/cb_pcimdas.c >> +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c >> @@ -37,7 +37,7 @@ Configuration Options: >> Developed from cb_pcidas and skel by Richard Bytheway (mocelet(a)sucs.org). >> Only supports DIO, AO and simple AI in it's present form. >> No interrupts, multi channel or FIFO AI, although the card looks like it could support this. >> -See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more details. >> +See http://www.mccdaq.com/specs.aspx for more details. > > This loses information. Your patch removes the filename. For example, > Googling that filename gives this: > > http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf > > >> */ >> >> #include "../comedidev.h" >> diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c >> index 6af6c83..ba5a980 100644 >> --- a/drivers/staging/comedi/drivers/daqboard2000.c >> +++ b/drivers/staging/comedi/drivers/daqboard2000.c >> @@ -51,7 +51,7 @@ Configuration options: >> for the card, and here are the findings so far. >> >> 1. A good document that describes the PCI interface chip is found at: >> - http://plx.plxtech.com/download/9080/databook/9080db-106.pdf >> + http://www.plxtech.com/products/io/pci9080 > > > Again, googling "9080db-106.pdf" locates the pdf, but it isn't available > without registration using the link you provided. I suggest that you at > least keep the filename (see above). > >> >> 2. The initialization done so far is: >> a. program the FPGA (windows code sans a lot of error messages) >> diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c >> index bd16f91..a2691db 100644 >> --- a/drivers/staging/comedi/drivers/ni_mio_common.c >> +++ b/drivers/staging/comedi/drivers/ni_mio_common.c >> @@ -34,7 +34,7 @@ >> 340747b.pdf AT-MIO E series Register Level Programmer Manual >> 341079b.pdf PCI E Series RLPM >> 340934b.pdf DAQ-STC reference manual >> - 67xx and 611x registers (from http://www.ni.com/pdf/daq/us) >> + 67xx and 611x registers (from http://www.ni.com/pdf/manuals/340934b.pdf) >> release_ni611x.pdf >> release_ni67xx.pdf > > This is wrong. The URL you provided doesn't offer release_ni611x.pdf or > release_ni67xx.pdf. Those two documents are here: > ftp://ftp.ni.com/support/daq/mhddk/documentation/ > > >> Other possibly relevant info: >> diff --git a/drivers/staging/comedi/drivers/plx9080.h b/drivers/staging/comedi/drivers/plx9080.h >> index 485d63f..6c14b6b 100644 >> --- a/drivers/staging/comedi/drivers/plx9080.h >> +++ b/drivers/staging/comedi/drivers/plx9080.h >> @@ -13,7 +13,7 @@ >> * >> ******************************************************************** >> * >> - * Copyright (C) 1999 RG Studio s.c., http://www.rgstudio.com.pl/ >> + * Copyright (C) 1999 RG Studio s.c., > > > You could lose the trailing comma. > > >> * Written by Krzysztof Halasa<khc(a)rgstudio.com.pl> >> * >> * Portions (C) SBE Inc., used by permission. > >> diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c >> index 6612247..31b0a13 100644 >> --- a/drivers/staging/quickstart/quickstart.c >> +++ b/drivers/staging/quickstart/quickstart.c >> @@ -5,8 +5,7 @@ >> * Copyright (C) 2007-2010 Angelo Arrifano<miknix(a)gmail.com> >> * >> * Information gathered from disassebled dsdt and from here: >> - * "http://download.microsoft.com/download/9/c/5/ >> - * 9c5b2167-8017-4bae-9fde-d599bac8184a/DirAppLaunch_Vista.doc" >> + * "http://www.microsoft.com/whdc/system/platform/firmware/DirAppLaunch.mspx" > > > Angle brackets would be better than quote marks. > > >> * >> * 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 >> diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig >> index b5f78b6..fda68f7 100644 >> --- a/drivers/telephony/Kconfig >> +++ b/drivers/telephony/Kconfig >> @@ -31,7 +31,7 @@ config PHONE_IXJ >> isapnp support. Please read<file:Documentation/telephony/ixj.txt>. >> >> For more information on these cards, see Quicknet's web site at: >> - <http://www.quicknet.net/>. >> + <http://www.qn.net/>. > > > No, Quicknet Technologies (www.quicknet.net in the web archive) is not the > same as Quicknet, Inc. The URL is in the web archive. > > >> >> If you do not have any Quicknet telephony cards, you can safely >> say N here. >> diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c >> index b53deee..872ee40 100644 >> --- a/drivers/telephony/ixj.c >> +++ b/drivers/telephony/ixj.c >> @@ -26,7 +26,7 @@ >> * Daniele Bellucci,<bellucda(a)tiscali.it> >> * >> * More information about the hardware related to this driver can be found >> - * at our website: http://www.quicknet.net >> + * at our website: http://www.qn.net/ > > > Same. > > >> * >> * IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR >> * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT >> diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h >> index 4c32a43..c012193 100644 >> --- a/drivers/telephony/ixj.h >> +++ b/drivers/telephony/ixj.h >> @@ -22,7 +22,7 @@ >> * Mike Preston,<mpreston(a)quicknet.net> >> * >> * More information about the hardware related to this driver can be found >> - * at our website: http://www.quicknet.net >> + * at our website: http://www.qn.net/ > > > Same. > > >> * >> * Fixes: >> * >> diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig >> index 1da73ec..8d3ba1d 100644 >> --- a/drivers/uio/Kconfig >> +++ b/drivers/uio/Kconfig >> @@ -19,7 +19,7 @@ config UIO_CIF >> Driver for Hilscher CIF DeviceNet and Profibus cards. This >> driver requires a userspace component that handles all of the >> heavy lifting and can be found at: >> - http://www.osadl.org/projects/downloads/UIO/user/cif-* >> + http://www.osadl.org/projects/downloads/UIO/user/ > > > The old link is correct. But it can be improved. For example -- > > - driver requires a userspace component that handles all of the > - heavy lifting and can be found at: > - http://www.osadl.org/projects/downloads/UIO/user/cif-* > + driver requires a userspace component called cif that handles > + all of the heavy lifting and can be found at: > + http://www.osadl.org/projects/downloads/UIO/user/ > > > >> >> To compile this driver as a module, choose M here: the module >> will be called uio_cif. >> diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig >> index 916b2b6..fc20f80 100644 >> --- a/drivers/usb/serial/Kconfig >> +++ b/drivers/usb/serial/Kconfig >> @@ -264,7 +264,7 @@ config USB_SERIAL_IUU >> help >> Say Y here if you want to use a IUU in phoenix mode and get >> an extra ttyUSBx device. More information available on >> - http://eczema.ecze.com/iuu_phoenix.html >> + http://www.opensc-project.org/openct/wiki/wbeiuu > > > The old URL is in the web archive. You don't have to use this IUU driver > with OpenSC... > > >> >> To compile this driver as a module, choose M here: the >> module will be called iuu_phoenix.o >> @@ -289,7 +289,8 @@ config USB_SERIAL_KEYSPAN >> and was developed with their support. You must also include >> firmware to support your particular device(s). >> >> - See<http://misc.nu/hugh/keyspan.html> for more information. >> + See<http://www.carnationsoftware.com/carnation/Keyspan.html> > > > I dunno what Carnation Software has to do with it. Hugh's page moved > here: > > http://blemings.org/hugh/keyspan.html > > > >> + for more information. >> >> To compile this driver as a module, choose M here: the >> module will be called keyspan. >> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h >> index 15a4583..2438ae0 100644 >> --- a/drivers/usb/serial/ftdi_sio_ids.h >> +++ b/drivers/usb/serial/ftdi_sio_ids.h >> @@ -335,7 +335,7 @@ >> #define FTDI_PIEGROUP_PID 0xF208 /* Product Id */ >> >> /* ACT Solutions HomePro ZWave interface >> - (http://www.act-solutions.com/HomePro.htm) */ >> + (http://www.act-solutions.com/index.php) */ > > > A better link is, > http://www.act-solutions.com/HomePro-Product-Matrix.html > > >> #define FTDI_ACTZWAVE_PID 0xF2D0 >> >> /* >> @@ -434,7 +434,7 @@ >> >> /* >> * PCDJ use ftdi based dj-controllers. The following PID is >> - * for their DAC-2 device http://www.pcdjhardware.com/DAC2.asp >> + * for their DAC-2 device http://pcdj.com/index.php/support/dex_dac_2/ > > > That's not the same page. The old one is in the web archive, so no patch > needed. > > >> * (the VID is the standard ftdi vid (FTDI_VID), PID sent by Wouter Paesen) >> */ >> #define FTDI_PCDJ_DAC2_PID 0xFA88 > >> @@ -723,7 +723,7 @@ >> >> /* >> * Bayer Ascensia Contour blood glucose meter USB-converter cable. >> - * http://winglucofacts.com/cables/ >> + * http://www.simplewins.com/Default.aspx > > > > The old link is valid. Your URL has this: > http://www.simplewins.com/site/Adults/Monitor/Pages/Bayer-Products/Contour-… > but who's to say whether it has the same PID/VID? I don't know... > >> */ >> #define BAYER_VID 0x1A79 >> #define BAYER_CONTOUR_CABLE_PID 0x6001 > > >> diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c >> index 297163c..9240914 100644 >> --- a/drivers/usb/serial/keyspan.c >> +++ b/drivers/usb/serial/keyspan.c >> @@ -9,7 +9,7 @@ >> the Free Software Foundation; either version 2 of the License, or >> (at your option) any later version. >> >> - See http://misc.nu/hugh/keyspan.html for more information. >> + See http://www.carnationsoftware.com/carnation/Keyspan.html for more information. > > > As above, > http://blemings.org/hugh/keyspan.html > > >> >> Code in this driver inspired by and in a number of places taken >> from Brian Warner's original Keyspan-PDA driver. >> diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h >> index bf3297d..f8b6a41 100644 >> --- a/drivers/usb/serial/keyspan.h >> +++ b/drivers/usb/serial/keyspan.h >> @@ -9,7 +9,7 @@ >> the Free Software Foundation; either version 2 of the License, or >> (at your option) any later version. >> >> - See http://misc.nu/hugh/keyspan.html for more information. >> + See http://www.carnationsoftware.com/carnation/Keyspan.html for more information. > > > http://blemings.org/hugh/keyspan.html > > >> >> Code in this driver inspired by and in a number of places taken >> from Brian Warner's original Keyspan-PDA driver. >> diff --git a/drivers/usb/serial/mct_u232.h b/drivers/usb/serial/mct_u232.h >> index 3a3f5e6..6f773c4 100644 >> --- a/drivers/usb/serial/mct_u232.h >> +++ b/drivers/usb/serial/mct_u232.h >> @@ -10,10 +10,10 @@ >> * >> * This driver is for the device MCT USB-RS232 Converter (25 pin, Model No. >> * U232-P25) from Magic Control Technology Corp. (there is also a 9 pin >> - * Model No. U232-P9). See http://www.mct.com.tw/p_u232.html for further >> - * information. The properties of this device are listed at the end of this >> - * file. This device is available from various distributors. I know Hana, >> - * http://www.hana.de and D-Link, http://www.dlink.com/products/usb/dsbs25. >> + * Model No. U232-P9). See http://www.mct.com.tw/products/product_us232.html >> + * for further information. The properties of this device are listed at the end >> + * of this file. This device is available from various distributors. >> + * D-Link, http://www.dlink.com/products/usb/dsbs25. > > > The trailing "." should go. How about this -- > > + * Model No. U232-P9). See http://www.mct.com.tw/products/product_us232.html > + * for further information. The properties of this device are listed at the end > + * of this file. This device was used in the Dlink DSB-S25. > > >> * >> * All of the information about the device was acquired by using SniffUSB >> * on Windows98. The technical details of the reverse engineering are > >> diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig >> index 8a372ba..b356e15 100644 >> --- a/drivers/usb/storage/Kconfig >> +++ b/drivers/usb/storage/Kconfig >> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >> index 8b31fdf..a07fc57 100644 >> --- a/drivers/video/Kconfig >> +++ b/drivers/video/Kconfig >> @@ -1323,7 +1323,7 @@ config FB_RADEON >> don't need to choose this to run the Radeon in plain VGA mode. >> >> There is a product page at >> - http://apps.ati.com/ATIcompare/ >> + http://www.amd.com/us/products/technologies/ati-catalyst/Pages/catalyst.aspx > > > There's no hardware product information at the URL you gave. It is a > brouchure for AMD's Catalyst software. Here is the URL for the product > specs: > > http://products.amd.com/en-us/GraphicCardResult.aspx > > > >> >> config FB_RADEON_I2C >> bool "DDC/I2C for ATI Radeon support" >> @@ -1395,7 +1395,7 @@ config FB_ATY_CT >> Say Y here to support use of ATI's 64-bit Rage boards (or other >> boards based on the Mach64 CT, VT, GT, and LT chipsets) as a >> framebuffer device. The ATI product support page for these boards >> - is at<http://support.ati.com/products/pc/mach64/>. >> + is at<http://www.amd.com/us/products/technologies/ati-catalyst/Pages/catalyst.aspx>. > > Why? Catalyst is not related to Mach64. Here's the URL you want: > > http://support.ati.com/products/pc/mach64/mach64.html > > You won't find any info at amd.com but at least it works in the web > archive, which is a huge improvement. > > > >> >> config FB_ATY_GENERIC_LCD >> bool "Mach64 generic LCD support (EXPERIMENTAL)" > >> diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c >> index 7424929..d7d5526 100644 >> --- a/fs/nls/nls_euc-jp.c >> +++ b/fs/nls/nls_euc-jp.c >> @@ -3,7 +3,7 @@ >> * >> * Added `OSF/JVC Recommended Code Set Conversion Specification >> * between Japanese EUC and Shift-JIS' support:<hirofumi(a)mail.parknet.co.jp> >> - * (http://www.opengroup.or.jp/jvc/cde/sjis-euc-e.html) >> + * (http://www.opengroup.or.jp/) > > > The document is in the web archive, and not at your URL, so this is > damage. > > >> */ >> >> #include<linux/module.h> > >> diff --git a/include/crypto/b128ops.h b/include/crypto/b128ops.h >> index 0b8e6bc..499741c 100644 >> --- a/include/crypto/b128ops.h >> +++ b/include/crypto/b128ops.h >> @@ -4,7 +4,7 @@ >> * Copyright (c) 2006, Rik Snel<rsnel(a)cube.dyndns.org> >> * >> * Based on Dr Brian Gladman's (GPL'd) work published at >> - * http://fp.gladman.plus.com/cryptography_technology/index.htm >> + * http://www.gladman.me.uk/ > > > Well, it doesn't say "Based on Dr Brian Gladman's latest work". The > original is in the web archive so no patch is needed I think... > > >> * See the original copyright notice below. >> * >> * This program is free software; you can redistribute it and/or modify it >> diff --git a/include/crypto/gf128mul.h b/include/crypto/gf128mul.h >> index 4086b8e..7021c6c 100644 >> --- a/include/crypto/gf128mul.h >> +++ b/include/crypto/gf128mul.h >> @@ -4,7 +4,7 @@ >> * Copyright (c) 2006 Rik Snel<rsnel(a)cube.dyndns.org> >> * >> * Based on Dr Brian Gladman's (GPL'd) work published at >> - * http://fp.gladman.plus.com/cryptography_technology/index.htm >> + * http://www.gladman.me.uk/ > > Same here. > > >> * See the original copyright notice below. >> * >> * This program is free software; you can redistribute it and/or modify it >> @@ -54,8 +54,8 @@ >> >> /* Comment by Rik: >> * >> - * For some background on GF(2^128) see for example: http://- >> - * csrc.nist.gov/CryptoToolkit/modes/proposedmodes/gcm/gcm-revised-spec.pdf >> + * For some background on GF(2^128) see for example: >> + * http://www.cryptobarn.com/papers/gcm-spec.pdf > > > This is the correct URL: > http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-… > > >> * >> * The elements of GF(2^128) := GF(2)[X]/(X^128-X^7-X^2-X^1-1) can >> * be mapped to computer memory in a variety of ways. Let's examine > >> diff --git a/include/linux/ixjuser.h b/include/linux/ixjuser.h >> index 88b4589..594d871 100644 >> --- a/include/linux/ixjuser.h >> +++ b/include/linux/ixjuser.h >> @@ -25,7 +25,7 @@ >> * Mike Preston,<mpreston(a)quicknet.net> >> * >> * More information about the hardware related to this driver can be found >> - * at our website: http://www.quicknet.net >> + * at our website: http://www.qn.net/ > > See above. > > >> * >> * Fixes: >> * >> diff --git a/include/linux/n_r3964.h b/include/linux/n_r3964.h >> index de24af7..60d73a6 100644 >> --- a/include/linux/n_r3964.h >> +++ b/include/linux/n_r3964.h >> @@ -4,7 +4,7 @@ >> * Copyright by >> * Philips Automation Projects >> * Kassel (Germany) >> - * http://www.pap-philips.de >> + * http://www.pronto.philips.com/index.cfm?id=1292 > > > This URL you have provided is certainly pap but otherwise it doesn't > relate. The URL you removed looks like advertising for a division that > doesn't exist any longer, apparently spun off as KH-Automaton Projects > GmbH. I'd remove it too. > > >> * ----------------------------------------------------------- >> * This software may be used and distributed according to the terms of >> * the GNU General Public License, incorporated herein by reference. > >> diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig >> index 571f895..a90050d 100644 >> --- a/net/ipv4/Kconfig >> +++ b/net/ipv4/Kconfig >> @@ -84,7 +84,7 @@ config IP_FIB_TRIE >> >> An experimental study of compression methods for dynamic tries >> Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. >> - http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/ >> + http://www.csc.kth.se/~snilsson/software/dyntrie2/ >> >> endchoice >> >> @@ -555,7 +555,7 @@ config TCP_CONG_VENO >> distinguishing to circumvent the difficult judgment of the packet loss >> type. TCP Veno cuts down less congestion window in response to random >> loss packets. >> - See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf >> + See http://www.ie.cuhk.edu.hk/fileadmin/staff_upload/soung/Journal/J3.pdf > > You wouldn't guess from looking at either of these links, but the > citation is actually this paper: > > C.P. Fu and S.C. Liew. "TCP Veno: TCP Enhancement for Transmission > Over wireless Access Networks," IEEE Journal on Selected Areas in > Communication, February 2003. > > >> >> config TCP_CONG_YEAH >> tristate "YeAH TCP" > >> diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig >> index 1833bdb..d6a784c 100644 >> --- a/net/ipv4/netfilter/Kconfig >> +++ b/net/ipv4/netfilter/Kconfig >> @@ -147,7 +147,7 @@ config IP_NF_TARGET_ULOG >> which can only be viewed through syslog. >> >> The appropriate userspace logging daemon (ulogd) may be obtained from >> - <http://www.gnumonks.org/projects/ulogd/> >> + <http://www.gnumonks.org/projects/> > > > Well I tried to obtain ulogd there but I couldn't find it. > It is available here though: > http://www.netfilter.org/projects/ulogd/index.html > > >> >> To compile it as a module, choose M here. If unsure, say N. >> > >> diff --git a/net/ipv4/tcp_westwood.c b/net/ipv4/tcp_westwood.c >> index 20151d6..bbf0e99 100644 >> --- a/net/ipv4/tcp_westwood.c >> +++ b/net/ipv4/tcp_westwood.c >> @@ -3,7 +3,7 @@ >> * >> * Angelo Dell'Aera: author of the first version of TCP Westwood+ in Linux 2.4 >> * >> - * Support at http://c3lab.poliba.it/index.php/Westwood >> + * Support at http://www.cs.ucla.edu/NRL/hpi/tcpw/ > > I wouldn't think that you'd get support there. It claims to be the > homepage for a BSD based implementation of TCP Westwood. In anycase, > google cached the poliba.it link on 19 Sep 2010, so I don't think this > needs to be patched. Besides, it is also in the web archive. > > >> * Main references in literature: >> * >> * - Mascolo S, Casetti, M. Gerla et al. > >> >> The boundaries and the conditions are changed according to RFC793: >> the packet must intersect the window (i.e. segments may be >> diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c >> index 456a1b4..e2c5fe9 100644 >> --- a/sound/oss/ac97_codec.c >> +++ b/sound/oss/ac97_codec.c >> @@ -22,10 +22,7 @@ >> ************************************************************************** >> * >> * The Intel Audio Codec '97 specification is available at the Intel > > "is available at:" > > >> - * audio homepage: http://developer.intel.com/ial/scalableplatforms/audio/ >> - * >> - * The specification itself is currently available at: >> - * ftp://download.intel.com/ial/scalableplatforms/ac97r22.pdf >> + * http://download.intel.com/support/motherboards/desktop/sb/ac97_r23.pdf >> * >> ************************************************************************** >> * >> diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c >> index c7fba53..deffcc8 100644 >> --- a/sound/pci/ens1370.c >> +++ b/sound/pci/ens1370.c >> @@ -22,7 +22,7 @@ >> /* Power-Management-Code ( CONFIG_PM ) >> * for ens1371 only ( FIXME ) >> * derived from cs4281.c, atiixp.c and via82xx.c >> - * using http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c1540.htm >> + * using http://www.kernel.org/pub/linux/kernel/people/tiwai/docs/writing-an-alsa-dr… > > > I think this is a better choice: > http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ > > >> * by Kurt J. Bosch >> */ >> > > Thanks. > > Finn >

1 0

[alsa-devel] Alsamixer-Qt4 0.4.0 released
by Sebastian H. 26 Sep '10

26 Sep '10

Hello everyone I've been working on Alsamixer-Qt4 lately and compiled the changes into a new release version 0.4.0. Most importantly the cards list can be refreshed now and the style got a little overhaul, too. A more detailed changelog can be found at the xwmw.org page. The new version 0.4.0 is available at the known places. http://xwmw.org/alsamixer-qt4/ http://sourceforge.net/projects/alsamixer-qt4/files/ Any comments are welcome. Cheers, Sebastian

5 18

Re: [alsa-devel] [RFC 2/3 v3]update web addresses in stagging
by Justin P. Mattock 26 Sep '10

26 Sep '10

On 09/25/2010 01:47 PM, Matthew Dharm wrote: > On Fri, Sep 24, 2010 at 05:51:56PM -0700, Justin P. Mattock wrote: >> On 09/24/2010 05:34 PM, Greg KH wrote: >>> On Fri, Sep 24, 2010 at 05:08:56PM -0700, Justin P. Mattock wrote: >>>> The below patch, is a simple fix to a broken web address not using a >>>> period in it's >>>> name. I'll leave this up to you guys if you want to use it... >>>> >>>> Signed-off-by: Justin P. Mattock<justinmattock(a)gmail.com> >>> >>> I'll queue it up, thanks. >>> >>> Oh, it's "staging", not "stagging" as you have up there in the Subject: >>> :) >>> >>> thanks, >>> >>> greg k-h >>> >> >> shoot... and I actually changed it from staging to stagging thinking >> that was correct..(duh).. >> >> Anyways alright.. I'll exclude this one if the other sets get finalized. > > One random suggestion: Perhaps you should include a date here? i.e. "URL > blah blah blah (as of Sept 2010)" > > That way, people have some idea how much they can trust that URL without > having to dig into the kernel history to see when it was last changed. > > Matt > well.. as it stand right now doing grep -Re "http" in all the directories(minus COPYING/MAINTAINERS) gave me a little over 2000 addresses to check(not so bad, only a few days worth of checking(finding the broken address is time consuming)).. so I could go back and do this for all of them except the webarchive addresses that are broken(maybe put a tag on them saying use_webarchive or something). then there is the question of how much more bloated will the kernel get with such a thing(I'm guessing not much, but then again you never know). Justin P. Mattock

1 0

Re: [alsa-devel] [PATCH] sound/pci/rme9652: prevent reading uninitialized stack memory
by Takashi Iwai 25 Sep '10

25 Sep '10

At Sat, 25 Sep 2010 11:07:27 -0400, Dan Rosenberg wrote: > > The SNDRV_HDSP_IOCTL_GET_CONFIG_INFO and > SNDRV_HDSP_IOCTL_GET_CONFIG_INFO ioctls in hdspm.c and hdsp.c allow > unprivileged users to read uninitialized kernel stack memory, because > several fields of the hdsp{m}_config_info structs declared on the stack > are not altered or zeroed before being copied back to the user. This > patch takes care of it. > > Signed-off-by: Dan Rosenberg <dan.j.rosenberg(a)gmail.com> Thanks, applied now with minor optimization (memset outside spinlock). Takashi > diff -urp linux-2.6.35.5.orig/sound/pci/rme9652/hdsp.c linux-2.6.35.5/sound/pci/rme9652/hdsp.c > --- linux-2.6.35.5.orig/sound/pci/rme9652/hdsp.c 2010-09-20 16:59:09.000000000 -0400 > +++ linux-2.6.35.5/sound/pci/rme9652/hdsp.c 2010-09-25 10:59:42.000000000 -0400 > @@ -4601,6 +4601,8 @@ static int snd_hdsp_hwdep_ioctl(struct s > unsigned long flags; > int i; > > + memset(&info, 0, sizeof(info)); > + > err = hdsp_check_for_iobox(hdsp); > if (err < 0) > return err; > diff -urp linux-2.6.35.5.orig/sound/pci/rme9652/hdspm.c linux-2.6.35.5/sound/pci/rme9652/hdspm.c > --- linux-2.6.35.5.orig/sound/pci/rme9652/hdspm.c 2010-09-20 16:59:09.000000000 -0400 > +++ linux-2.6.35.5/sound/pci/rme9652/hdspm.c 2010-09-25 10:58:44.000000000 -0400 > @@ -4128,6 +4128,9 @@ static int snd_hdspm_hwdep_ioctl(struct > case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO: > > spin_lock_irq(&hdspm->lock); > + > + memset(&info, 0, sizeof(info)); > + > info.pref_sync_ref = hdspm_pref_sync_ref(hdspm); > info.wordclock_sync_check = hdspm_wc_sync_check(hdspm); > > >

1 0

Re: [alsa-devel] [PATCH 0/3] alsa-lib: UCM - Use Case Manager
by Jaroslav Kysela 25 Sep '10

25 Sep '10

On Tue, 7 Sep 2010, Liam Girdwood wrote: > Hi Jaroslav, > > Any update on this ? I have someone scheduled to write new use case > files and someone else ready to add PA support. Hi, I'm working on this. Unfortunately, I have other things which interrupts this work. The actual code is at: http://git.alsa-project.org/?p=alsa-lib.git;a=shortlog;h=ucm During coding, it appears that even the handling of controls might be changed. Your code has everything build-in. I'm not sure why to restrict the card/verb/modifier/transition definitions only for the universal control API. I think that it might be more "easy to understand" and universal to define just sequence of commands like: SectionDefaults [ exec "amixer cset name='Master Playback Switch',index=2 1,1" exec "amixer cset name='Master Playback Volume',index=2 25,25" exec "amixer cset name='Master Mono Playback',index=1 0" exec "amixer cset name='Master Mono Playback Volume',index=1 0" msleep 50 # or: exec "usleep 50000" exec "amixer cset name='PCM Switch',index=2 1,1" ........ ] Because "amixer cset" command will be probably most used command, we can eventually move the amixer code to alsa-lib to not create so much processes and speed-up things. It means that the ucm should not track card controls, but commands for transitions. The only thing which might "broke" things is calling fork from a pthread: http://unix.derkeiler.com/Newsgroups/comp.unix.programmer/2003-09/0672.html But it seems that fork/immediate-exec is an acceptable way. Comments? Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project, Red Hat, Inc.

6 23

[alsa-devel] [PATCH - Add mixer support for M-Audio FTU series 1/1]Add basic mixer support for M-Audio FTU (8R)
by linuxaudio＠showlabor.de 25 Sep '10

25 Sep '10

And again, next try (somehow my mail address has not been accepted despite registration) This patch (against alsa-kmirror) adds mixer support for M-Audio Fast Track Ultra (8R) devices. It should be suitable as a blueprint for adding mixer support to other devices with missing/wrong descriptors. I needed to move some enums to header files, raise MAX_CHANNELS, and slightly modify snd_usb_audio_probe(). If this get accepted I will work on the effects unit in the FTU devices. It's straight forward work based on this. Kind regards, Felix

1 1

[alsa-devel] [RFC 2/3 v3]update web addresses in stagging
by Justin P. Mattock 25 Sep '10

25 Sep '10

The below patch, is a simple fix to a broken web address not using a period in it's name. I'll leave this up to you guys if you want to use it... Signed-off-by: Justin P. Mattock <justinmattock(a)gmail.com> --- .../comedi/drivers/addi-data/APCI1710_82x54.c | 2 +- .../comedi/drivers/addi-data/APCI1710_82x54.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 2 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 2 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Pwm.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Pwm.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ssi.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Ttl.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ttl.h | 2 +- .../comedi/drivers/addi-data/addi_amcc_S5920.c | 2 +- .../comedi/drivers/addi-data/addi_amcc_S5920.h | 2 +- .../comedi/drivers/addi-data/addi_amcc_s5933.h | 2 +- .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- .../staging/comedi/drivers/addi-data/addi_common.h | 2 +- .../staging/comedi/drivers/addi-data/addi_eeprom.c | 2 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2016.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2016.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2032.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2200.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.h | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c index 60213d2..b59f2d4 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h index 9698ae1..81346db 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c index fbc26a0..644bda4 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c index a6898e4..07108f9 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h index af1b9cd..cc3973d 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c index 0e498e9..14b13ea 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h index 7b48110..358298b 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c index 204d798..3f9cfa2 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h index 61a21cc..31fbb0b 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c index 148ce6f..8883e66 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h index bf1b4c3..d8ad0b9 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c index 6360de5..0c890a9 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h index eb7f101..ef4d887 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c index 344df94..7361d50 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h index 03a93cb..537d475 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c index de6f772..9e177f4 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h index c4f1134..adcab82 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c index 97c10aa..90e71e1 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h index 622a4ac..9afdb13 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h index 8ed19bc..35a3ea1 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 5ed4b94..93d7c05 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index 1a28169..13621d4 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index e0213a9..0aa11a0 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c index d7d768e..b748efc 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h index 22b3e56..89c99eb 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c index 1369e22..74012e0 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h index 68db9c1..3c700c7 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index faea003..6e06d9d 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h index e29a72a..7114acb 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c index b3b9218..b5d7d98 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h index 0579033..647f9eb 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c index 7948c41..70edc38 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h index 21c09ed..4472829 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index 4299ff5..806f76d 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h index 0780c44..c91594d 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c index 8bc88ad..8ebb254 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c index 89783b1eb..7090c24 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h index 639944c..c42612a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c index d7d2223..73802ab 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h index c971d14..ab145e7 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c index e01889c..ced101f 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h index 63e5f1f..83f42af 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 851f71b..a813fdb 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h index fedfc9c..b3c8197 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h @@ -9,7 +9,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c index 560c848..5fd0303 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h index f3e7ebf..812a9c4 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c index 4ed441a..517e9ab 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h index 743523e..63df635 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c index 2e20bc7..d3c5963 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c @@ -8,7 +8,7 @@ Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. D-77833 Ottersweier Tel: +19(0)7223/9493-0 Fax: +49(0)7223/9493-92 - http://www.addi-data-com + http://www.addi-data.com info(a)addi-data.com 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. diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h index 788d7c1..cce9e12 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h @@ -6,7 +6,7 @@ * D-77833 Ottersweier * Tel: +19(0)7223/9493-0 * Fax: +49(0)7223/9493-92 - * http://www.addi-data-com + * http://www.addi-data.com * info(a)addi-data.com * * This program is free software; you can redistribute it and/or modify it -- 1.7.2.1

2 2

[alsa-devel] [RFC 3/3 v3]update broken web addresses archive dot org
by Justin P. Mattock 25 Sep '10

25 Sep '10

Below is just a patch showing all the archive.org in the kernel so far. up to you if you guys want to use this.. Signed-off-by: Justin P. Mattock <justinmattock(a)gmail.com> --- drivers/block/Kconfig | 2 +- drivers/edac/i82975x_edac.c | 2 +- drivers/hwmon/hwmon-vid.c | 6 +++--- drivers/input/misc/cm109.c | 4 ++-- drivers/media/IR/keymaps/rc-rc5-tv.c | 2 +- drivers/media/dvb/pluto2/pluto2.c | 2 +- drivers/media/radio/Kconfig | 4 ++-- drivers/media/radio/radio-aztech.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 2 +- drivers/media/video/pwc/philips.txt | 2 +- drivers/mtd/maps/Kconfig | 6 +++--- drivers/mtd/maps/pismo.c | 2 +- drivers/mtd/maps/sc520cdp.c | 2 +- drivers/net/8139too.c | 2 +- drivers/net/Kconfig | 18 +++++++++--------- drivers/net/acenic.c | 2 +- drivers/net/fealnx.c | 2 +- drivers/net/hamachi.c | 4 +++- drivers/net/lne390.c | 4 ++-- drivers/net/natsemi.c | 9 ++++----- drivers/net/pci-skeleton.c | 4 ++-- drivers/net/starfire.c | 7 +++---- drivers/net/sundance.c | 6 +++--- drivers/net/tokenring/Kconfig | 2 +- drivers/net/wan/Kconfig | 12 ++++++------ drivers/net/wan/cosa.c | 3 ++- drivers/net/wan/farsync.c | 4 ++-- drivers/net/wan/sbni.c | 2 +- drivers/net/wireless/ath/ath5k/reg.h | 2 +- drivers/net/wireless/hostap/hostap_cs.c | 2 +- drivers/parport/Kconfig | 4 ++-- drivers/scsi/arm/Kconfig | 2 +- drivers/scsi/ibmmca.c | 4 ++-- drivers/serial/altera_uart.c | 2 +- drivers/serial/sn_console.c | 2 +- drivers/staging/comedi/drivers/c6xdigio.c | 4 ++-- drivers/staging/comedi/drivers/pcl711.c | 2 +- drivers/staging/go7007/go7007.txt | 8 ++++---- drivers/usb/serial/cypress_m8.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- drivers/video/macfb.c | 2 +- drivers/video/s3fb.c | 2 +- drivers/video/svgalib.c | 2 +- drivers/video/vt8623fb.c | 2 +- drivers/watchdog/pcwd.c | 2 +- fs/ncpfs/Kconfig | 3 ++- fs/nls/Kconfig | 2 +- fs/nls/nls_base.c | 2 +- fs/reiserfs/procfs.c | 4 ++-- include/linux/edd.h | 5 +++-- include/linux/mtd/pismo.h | 2 +- include/scsi/sg.h | 10 +++++----- net/ipv4/Kconfig | 4 ++-- net/ipv4/tcp_illinois.c | 2 +- net/ipv4/tcp_lp.c | 2 +- sound/isa/Kconfig | 2 +- sound/isa/cmi8330.c | 2 +- sound/oss/Kconfig | 4 ++-- sound/pci/ac97/ac97_patch.c | 2 +- sound/pci/nm256/nm256.c | 2 +- 60 files changed, 108 insertions(+), 105 deletions(-) diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index de27768..645a3f8 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -169,7 +169,7 @@ config BLK_DEV_UMEM ---help--- Saying Y here will include support for the MM5415 family of battery backed (Non-volatile) RAM cards. - <http://www.umem.com/> + <http://web.archive.org/web/%2A/http://www.umem.com/> The cards appear as block devices that can be partitioned into as many as 15 partitions. diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index 3218819..b2e6c21 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c @@ -1,6 +1,6 @@ /* * Intel 82975X Memory Controller kernel module - * (C) 2007 aCarLab (India) Pvt. Ltd. (http://acarlab.com) + * (C) 2007 aCarLab (India) Pvt. Ltd. (http://web.archive.org/web/%2A/http://acarlab.com) * (C) 2007 jetzbroadband (http://jetzbroadband.com) * This file may be distributed under the terms of the * GNU General Public License. diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index 897702d..a26fa3f 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c @@ -43,15 +43,15 @@ * This corresponds to an arbitrary VRM code of 24 in the functions below. * These CPU models (K8 revision <= E) have 5 VID pins. See also: * Revision Guide for AMD Athlon 64 and AMD Opteron Processors, AMD Publication 25759, - * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/257… + * http://web.archive.org/web/%2A/http://www.amd.com/us-en/assets/content_type… * * AMD NPT Family 0Fh Processors, AMD Publication 32559, - * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/325… + * http://web.archive.org/web/%2A/http://www.amd.com/us-en/assets/content_type… * Table 71. VID Code Voltages * This corresponds to an arbitrary VRM code of 25 in the functions below. * These CPU models (K8 revision >= F) have 6 VID pins. See also: * Revision Guide for AMD NPT Family 0Fh Processors, AMD Publication 33610, - * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/336… + * http://web.archive.org/web/%2A/http://www.amd.com/us-en/assets/content_type… * * The 17 specification is in fact Intel Mobile Voltage Positioning - * (IMVP-II). You can find more information in the datasheet of Max1718 diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index b09c7d1..9007600 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c @@ -230,7 +230,7 @@ static unsigned short keymap_gtalk(int scancode) /* * Keymap for Allied-Telesis Corega USBPH01 - * http://www.alliedtelesis-corega.com/2/1344/1437/1360/chprd.html + * http://web.archive.org/web/%2A/http://www.alliedtelesis-corega.com/2/1344/1… * * Contributed by july(a)nat.bg */ @@ -260,7 +260,7 @@ static unsigned short keymap_usbph01(int scancode) /* * Keymap for ATCom AU-100 * http://www.atcom.cn/products.html - * http://www.packetizer.com/products/au100/ + * http://web.archive.org/web/%2A/http://www.packetizer.com/products/au100/ * http://www.voip-info.org/wiki/view/AU-100 * * Contributed by daniel(a)gimpelevich.san-francisco.ca.us diff --git a/drivers/media/IR/keymaps/rc-rc5-tv.c b/drivers/media/IR/keymaps/rc-rc5-tv.c index 73cce2f..61be0bd 100644 --- a/drivers/media/IR/keymaps/rc-rc5-tv.c +++ b/drivers/media/IR/keymaps/rc-rc5-tv.c @@ -13,7 +13,7 @@ #include <media/rc-map.h> /* generic RC5 keytable */ -/* see http://users.pandora.be/nenya/electronics/rc5/codes00.htm */ +/* see http://web.archive.org/web/%2A/http://users.pandora.be/nenya/electronics/rc… */ /* used by old (black) Hauppauge remotes */ static struct ir_scancode rc5_tv[] = { diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index 1c79821..c709289 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c @@ -3,7 +3,7 @@ * * Copyright (C) 2005 Andreas Oberritter <obi(a)linuxtv.org> * - * based on pluto2.c 1.10 - http://instinct-wp8.no-ip.org/pluto/ + * based on pluto2.c 1.10 - http://web.archive.org/web/%2A/http://instinct-wp8.no-ip.org/pluto/ * by Dany Salman <salmandany(a)yahoo.fr> * Copyright (c) 2004 TDF * diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 83567b8..c199ed9 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -24,7 +24,7 @@ config RADIO_CADET <file:Documentation/video4linux/API.html>. Further documentation on this driver can be found on the WWW at - <http://linux.blackhawke.net/cadet/>. + <http://web.archive.org/web/%2A/http://linux.blackhawke.net/cadet/>. To compile this driver as a module, choose M here: the module will be called radio-cadet. @@ -237,7 +237,7 @@ config RADIO_SF16FMR2 In order to control your radio card, you will need to use programs that are compatible with the Video For Linux API. Information on this API and pointers to "v4l" programs may be found on the WWW at - <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. + <http://web.archive.org/web/%2A/http://roadrunner.swansea.uk.linux.org/v4l.s…>. To compile this driver as a module, choose M here: the module will be called radio-sf16fmr2. diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index c223113..24926026 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c @@ -10,7 +10,7 @@ * Scott McGrath (smcgrath(a)twilight.vtc.vsc.edu) * William McGrath (wmcgrath(a)twilight.vtc.vsc.edu) * - * The basis for this code may be found at http://bigbang.vtc.vsc.edu/fmradio/ + * The basis for this code may be found at http://web.archive.org/web/%2A/http://bigbang.vtc.vsc.edu/fmradio/ * along with more information on the card itself. * * History: diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 7af56cd..0c2f677 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c @@ -2290,7 +2290,7 @@ struct tvcard bttv_tvcards[] = { .tuner_addr = ADDR_UNSET, }, [BTTV_BOARD_SPIRIT_TV] = { - /* Spirit TV Tuner from http://spiritmodems.com.au */ + /* Spirit TV Tuner from http://web.archive.org/web/%2A/http://spiritmodems.com.au */ /* Stafford Goodsell <surge(a)goliath.homeunix.org> */ .name = "Spirit TV Tuner", .video_inputs = 3, diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt index d38dd79..751f114 100644 --- a/drivers/media/video/pwc/philips.txt +++ b/drivers/media/video/pwc/philips.txt @@ -1,6 +1,6 @@ This file contains some additional information for the Philips and OEM webcams. E-mail: webcam(a)smcc.demon.nl Last updated: 2004-01-19 -Site: http://www.smcc.demon.nl/webcam/ +Site: http://web.archive.org/web/*/http://www.smcc.demon.nl/webcam/ As of this moment, the following cameras are supported: * Philips PCA645 diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 142efd2..1c3f0ca 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -531,9 +531,9 @@ config MTD_PISMO depends on ARCH_VERSATILE help This driver allows for discovery of PISMO modules - see - <http://www.pismoworld.org/>. These are small modules containing - up to five memory devices (eg, SRAM, flash, DOC) described by an - I2C EEPROM. + <http://web.archive.org/web/%2A/http://www.pismoworld.org/>. + These are small modules containing up to five memory devices + (eg, SRAM, flash, DOC) described by an I2C EEPROM. This driver does not create any MTD maps itself; instead it creates MTD physmap and MTD SRAM platform devices. If you diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index f4ce273..b42eecb 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c @@ -1,5 +1,5 @@ /* - * PISMO memory driver - http://www.pismoworld.org/ + * PISMO memory driver - http://web.archive.org/web/%2A/http://www.pismoworld.org/ * * For ARM Realview and Versatile platforms * diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c index 85c1e56..c3eb3c0 100644 --- a/drivers/mtd/maps/sc520cdp.c +++ b/drivers/mtd/maps/sc520cdp.c @@ -20,7 +20,7 @@ * The SC520CDP is an evaluation board for the Elan SC520 processor available * from AMD. It has two banks of 32-bit Flash ROM, each 8 Megabytes in size, * and up to 512 KiB of 8-bit DIL Flash ROM. - * For details see http://www.amd.com/products/epd/desiging/evalboards/18.elansc520/520_cdp_br… + * For details see http://web.archive.org/web/%2A/http://www.amd.com/products/epd/desiging/eva… */ #include <linux/module.h> diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index f5166dc..721363d 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -28,7 +28,7 @@ MD 21403 Support and updates available at - http://www.scyld.com/network/rtl8139.html + http://web.archive.org/web/%2A/http://www.scyld.com/network/rtl8139.html Twister-tuning table provided by Kinston <shangh(a)realtek.com.tw>. diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 99fb1f6..c287c76 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -169,9 +169,9 @@ config NET_SB1000 a connection. Further documentation and the necessary scripts can be found at: - <http://www.jacksonville.net/~fventuri/> - <http://home.adelphia.net/~siglercm/sb1000.html> - <http://linuxpower.cx/~cable/> + <http://web.archive.org/web/%2A/http://www.jacksonville.net/~fventuri/> + <http://web.archive.org/web/%2A/http://home.adelphia.net/~siglercm/sb1000.ht…> + <http://web.archive.org/web/%2A/http://linuxpower.cx/~cable/> If you don't have this card, of course say N. @@ -1552,7 +1552,7 @@ config NATSEMI which is used in cards from PureData, NetGear, Linksys and others, including the 83815 chip. More specific information and updates are available from - <http://www.scyld.com/network/natsemi.html>. + <http://web.archive.org/web/%2A/http://www.scyld.com/network/natsemi.html>. config NE2K_PCI tristate "PCI NE2000 and clones support (see help)" @@ -1703,7 +1703,7 @@ config EPIC100 This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC, which is based on the SMC83c17x (EPIC/100). More specific information and updates are available from - <http://www.scyld.com/network/epic100.html>. + <http://web.archive.org/web/%2A/http://www.scyld.com/network/epic100.html>. config SMSC9420 tristate "SMSC LAN9420 PCI ethernet adapter support" @@ -1729,7 +1729,7 @@ config SUNDANCE help This driver is for the Sundance "Alta" chip. More specific information and updates are available from - <http://www.scyld.com/network/sundance.html>. + <http://web.archive.org/web/%2A/http://www.scyld.com/network/sundance.html>. config SUNDANCE_MMIO bool "Use MMIO instead of PIO" @@ -2201,8 +2201,8 @@ config YELLOWFIN Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is used by the Beowulf Linux cluster project. See - <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more - information about this driver in particular and Beowulf in general. + <http://web.archive.org/web/%2A/http://cesdis.gsfc.nasa.gov/linux/drivers/ye…> + for more information about this driver in particular and Beowulf in general. To compile this driver as a module, choose M here: the module will be called yellowfin. This is recommended. @@ -3048,7 +3048,7 @@ config PLIP <file:Documentation/networking/PLIP.txt>. The cables can be up to 15m long. Mode 0 works also if one of the machines runs DOS/Windows and has some PLIP software installed, e.g. the Crynwr PLIP packet - driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>) + driver (<http://web.archive.org/web/%2A/http://oak.oakland.edu/simtel.net/msdos/pktd…>) and winsock or NCSA's telnet. If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index b9a5916..ecfa01a 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -440,7 +440,7 @@ MODULE_PARM_DESC(tx_ratio, "AceNIC/3C985/GA620 ratio of NIC memory used for TX/R static const char version[] __devinitconst = "acenic.c: v0.92 08/05/2002 Jes Sorensen, linux-acenic(a)SunSITE.dk\n" - " http://home.cern.ch/~jes/gige/acenic.html\n"; + " http://web.archive.org/web/20071219235833/jes.web.cern.ch/jes/gige/acenic.h…"; static int ace_get_settings(struct net_device *, struct ethtool_cmd *); static int ace_set_settings(struct net_device *, struct ethtool_cmd *); diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index d7e8f6b..6d389c1 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c @@ -14,7 +14,7 @@ Annapolis MD 21403 Support information and updates available at - http://www.scyld.com/network/pci-skeleton.html + http://web.archive.org/web/%2A/http://www.scyld.com/network/pci-skeleton.ht… Linux kernel updates: diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index f4523cd..8883d39 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c @@ -19,7 +19,9 @@ adapter. Support and updates available at - http://www.scyld.com/network/hamachi.html + http://web.archive.org/web/%2A/http://www.scyld.com/network/hamachi.html + or + http://web.archive.org/web/%2A/http://www.parl.clemson.edu/~keithu/hamachi.… */ diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c index 8a1097c..a154ca4 100644 --- a/drivers/net/lne390.c +++ b/drivers/net/lne390.c @@ -23,8 +23,8 @@ The shared memory address selection is also slightly different. Note that shared memory address > 1MB are supported with this driver. - You can try <http://www.mylex.com> if you want more info, as I've - never even seen one of these cards. :) + You can try <http://web.archive.org/web/%2A/http://www.mylex.com> + if you want more info, as I've never even seen one of these cards. :) Arnaldo Carvalho de Melo <acme(a)conectiva.com.br> - 2000/09/01 - get rid of check_region diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index a6033d4..cad37c6 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -19,8 +19,7 @@ Annapolis MD 21403 Support information and updates available at - http://www.scyld.com/network/netsemi.html - [link no longer provides useful info -jgarzik] + http://web.archive.org/web/%2A/http://www.scyld.com/network/netsemi.html TODO: @@ -208,8 +207,8 @@ hardware descriptor ownership, disabling interrupts and NAPI poll scheduling. IVb. References -http://www.scyld.com/expert/100mbps.html -http://www.scyld.com/expert/NWay.html +http://web.archive.org/web/%2A/http://www.scyld.com/expert/100mbps.html +http://web.archive.org/web/%2A/http://www.scyld.com/expert/NWay.html Datasheet is available from: http://www.national.com/pf/DP/DP83815.html @@ -223,7 +222,7 @@ None characterised. /* * Support for fibre connections on Am79C874: * This phy needs a special setup when connected to a fibre cable. - * http://www.amd.com/files/connectivitysolutions/networking/archivednetworkin… + * http://web.archive.org/web/%2A/http://www.amd.com/files/connectivitysolutio… */ #define PHYID_AM79C874 0x0022561b diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 627b619..b5819b7 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c @@ -28,7 +28,7 @@ MD 21403 Support and updates available at - http://www.scyld.com/network/rtl8139.html + http://web.archive.org/web/%2A/http://www.scyld.com/network/rtl8139.html Twister-tuning table provided by Kinston <shangh(a)realtek.com.tw>. @@ -79,7 +79,7 @@ that almost all frames will need to be copied to an alignment buffer. IVb. References http://www.realtek.com.tw/ -http://www.scyld.com/expert/NWay.html +http://web.archive.org/web/%2A/http://www.scyld.com/expert/NWay.html IVc. Errata diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index a42b687..766bb3b 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c @@ -21,8 +21,7 @@ Annapolis MD 21403 Support and updates available at - http://www.scyld.com/network/starfire.html - [link no longer provides useful info -jgarzik] + http://web.archive.org/web/%2A/http://www.scyld.com/network/starfire.html */ @@ -282,8 +281,8 @@ IV. Notes IVb. References The Adaptec Starfire manuals, available only from Adaptec. -http://www.scyld.com/expert/100mbps.html -http://www.scyld.com/expert/NWay.html +http://web.archive.org/web/%2A/http://www.scyld.com/expert/100mbps.html +http://web.archive.org/web/%2A/http://www.scyld.com/expert/NWay.html IVc. Errata diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index 2678588..ee75916 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c @@ -15,7 +15,7 @@ Annapolis MD 21403 Support and updates available at - http://www.scyld.com/network/sundance.html + http://web.archive.org/web/%2A/http://www.scyld.com/network/sundance.html [link no longer provides useful info -jgarzik] Archives of the mailing list are still available at http://www.beowulf.org/pipermail/netdrivers/ @@ -193,8 +193,8 @@ IVb. References The Sundance ST201 datasheet, preliminary version. The Kendin KS8723 datasheet, preliminary version. The ICplus IP100 datasheet, preliminary version. -http://www.scyld.com/expert/100mbps.html -http://www.scyld.com/expert/NWay.html +http://web.archive.org/web/%2A/http://www.scyld.com/expert/100mbps.html +http://web.archive.org/web/%2A/http://www.scyld.com/expert/NWay.html IVc. Errata diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index c4137b0..a196b54 100644 --- a/drivers/net/tokenring/Kconfig +++ b/drivers/net/tokenring/Kconfig @@ -101,7 +101,7 @@ config TMS380TR <http://www.tldp.org/docs.html#howto>. Also read the file <file:Documentation/networking/tms380tr.txt> or - check <http://www.auk.cx/tms380tr/>. + check <http://web.archive.org/web/%2A/http://www.auk.cx/tms380tr/>. To compile this driver as a module, choose M here: the module will be called tms380tr. diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig index 423eb26..7a303e0 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig @@ -305,7 +305,7 @@ config DSCC4 DSCC4 chipset. This is supposed to work with the four port card. Take a look at - <http://www.cogenit.fr/dscc4/> for further information about the + <http://web.archive.org/web/%2A/http://www.cogenit.fr/dscc4/> for further information about the driver. To compile this driver as a module, choose M here: the @@ -415,9 +415,9 @@ config CYCLADES_SYNC While no documentation is available at this time please grab the wanconfig tarball in - <http://www.conectiva.com.br/~acme/cycsyn-devel/> (with minor changes - to make it compile with the current wanrouter include files; efforts - are being made to use the original package available at + <http://web.archive.org/web/%2A/http://www.conectiva.com.br/~acme/cycsyn-dev…> + (with minor changes to make it compile with the current wanrouter include files; + efforts are being made to use the original package available at <ftp://ftp.sangoma.com/>). Feel free to contact me or the cycsyn-devel mailing list at @@ -481,8 +481,8 @@ config SBNI leased line modems. You can find more information and last versions of drivers and - utilities at <http://www.granch.ru/>. If you have any question you - can send email to <sbni(a)granch.ru>. + utilities at <http://web.archive.org/web/%2A/http://www.granch.ru>. + If you have any question you can send email to <sbni(a)granch.ru>. To compile this driver as a module, choose M here: the module will be called sbni. diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 04c6cd4..55cba46 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -28,7 +28,8 @@ * Masaryk University (http://www.ics.muni.cz/). The hardware is * developed by Jiri Novotny <novotny(a)ics.muni.cz>. More information * and the photo of both cards is available at - * http://www.pavoucek.cz/cosa.html. The card documentation, firmwares + * http://web.archive.org/web/20010412025813/http://www.pavoucek.cz/cosa.html + * The card documentation, firmwares * and other goods can be downloaded from ftp://ftp.ics.muni.cz/pub/cosa/. * For Linux-specific utilities, see below in the "Software info" section. * If you want to order the card, contact Jiri Novotny. diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index e050bd6..2abe321 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c @@ -126,8 +126,8 @@ module_param_array(fst_excluded_list, int, NULL, 0); /* The Am186CH/CC processors support a SmartDMA mode using circular pools * of buffer descriptors. The structure is almost identical to that used * in the LANCE Ethernet controllers. Details available as PDF from the - * AMD web site: http://www.amd.com/products/epd/processors/\ - * 2.16bitcont/3.am186cxfa/a21914/21914.pdf + * AMD web site: + * http://web.archive.org/web/%2A/http://www.amd.com/products/epd/processors/2… */ struct txdesc { /* Transmit descriptor */ volatile u16 ladr; /* Low order address of packet. This is a diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index cff13a9..e8e77e9 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c @@ -8,7 +8,7 @@ * Driver supports SBNI12-02,-04,-05,-10,-11 cards, single and * double-channel, PCI and ISA modifications. * More info and useful utilities to work with SBNI12 cards you can find - * at http://www.granch.com (English) or http://www.granch.ru (Russian) + * at http://web.archive.org/web/%2A/http://www.granch.com * * This software may be used and distributed according to the terms * of the GNU General Public License. diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h index 69a9b34..b2e300d 100644 --- a/drivers/net/wireless/ath/ath5k/reg.h +++ b/drivers/net/wireless/ath/ath5k/reg.h @@ -25,7 +25,7 @@ * 802.11 (802.11e mostly) papers and by reading various public available * Atheros presentations and papers like these: * - * 5210 - http://nova.stanford.edu/~bbaas/ps/isscc2002_slides.pdf + * 5210 - http://web.archive.org/web/%2A/http://nova.stanford.edu/~bbaas/ps/isscc2002… * * 5211 - http://www.hotchips.org/archives/hc14/3_Tue/16_mcfarland.pdf * diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index ba54d1b..6ce7d7e 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c @@ -215,7 +215,7 @@ static int prism2_pccard_card_present(local_info_t *local) /* * SanDisk CompactFlash WLAN Flashcard - Product Manual v1.0 * Document No. 20-10-00058, January 2004 - * http://www.sandisk.com/pdf/industrial/ProdManualCFWLANv1.0.pdf + * http://web.archive.org/web/%2A/http://www.sandisk.com/pdf/industrial/ProdMa… */ #define SANDISK_WLAN_ACTIVATION_OFF 0x40 #define SANDISK_HCR_OFF 0x42 diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 855f389..3017185 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -18,8 +18,8 @@ menuconfig PARPORT <file:drivers/parport/BUGS-parport>. For extensive information about drivers for many devices attaching - to the parallel port see <http://www.torque.net/linux-pp.html> on - the WWW. + to the parallel port see + <http://web.archive.org/web/%2A/http://www.torque.net/linux-pp.html> It is possible to share a single parallel port among several devices and it is safe to compile all the corresponding drivers into the diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig index a8587f1..53c645a 100644 --- a/drivers/scsi/arm/Kconfig +++ b/drivers/scsi/arm/Kconfig @@ -39,7 +39,7 @@ config SCSI_ARXESCSI HD discs from the then new A5000 on earlier models. This interface was either sold on its own or with an integral SCSI controller. Technical details on this NCR53c94-based device are available at - <http://www.cryton.demon.co.uk/acornbits/scsi_arxe.html> + <http://web.archive.org/web/%2A/http://www.cryton.demon.co.uk/acornbits/scsi…> Say Y here to compile in support for the SCSI controller. config SCSI_CUMANA_2 diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 9a4b69d..d435686 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c @@ -7,8 +7,8 @@ See the file Documentation/scsi/ibmmca.txt for a detailed description of this driver, the commandline arguments and the history of its development. - See the WWW-page: http://www.uni-mainz.de/~langm000/linux.html for latest - updates, info and ADF-files for adapters supported by this driver. + See the WWW-page: http://web.archive.org/web/%2A/http://www.uni-mainz.de/~langm000/linux.html + for latest updates, info and ADF-files for adapters supported by this driver. Alan Cox <alan(a)lxorguk.ukuu.org.uk> Updated for Linux 2.5.45 to use the new error handler, cleaned up the diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index f8d8a00..8e8ba66 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -30,7 +30,7 @@ /* * Altera UART register definitions according to the Nios UART datasheet: - * http://www.altera.com/literature/ds/ds_nios_uart.pdf + * http://web.archive.org/web/%2A/http://www.altera.com/literature/ds/ds_nios_… */ #define ALTERA_UART_SIZE 32 diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index cff9a30..f7edc78 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c @@ -34,7 +34,7 @@ * * For further information regarding this notice, see: * - * http://oss.sgi.com/projects/GenInfo/NoticeExplan + * http://web.archive.org/web/%2A/http://oss.sgi.com/projects/GenInfo/NoticeEx… */ #include <linux/interrupt.h> diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c index e0ac825..aca9f51 100644 --- a/drivers/staging/comedi/drivers/c6xdigio.c +++ b/drivers/staging/comedi/drivers/c6xdigio.c @@ -2,7 +2,7 @@ comedi/drivers/c6xdigio.c Hardware driver for Mechatronic Systems Inc. C6x_DIGIO DSP daughter card. - (http://robot0.ge.uiuc.edu/~spong/mecha/) + (http://web.archive.org/web/%2A/http://robot0.ge.uiuc.edu/~spong/mecha/) COMEDI - Linux Control and Measurement Device Interface Copyright (C) 1999 Dan Block @@ -31,7 +31,7 @@ Devices: [Mechatronic Systems Inc.] C6x_DIGIO DSP daughter card (c6xdigio) Updated: Sun Nov 20 20:18:34 EST 2005 This driver will not work with a 2.4 kernel. -http://robot0.ge.uiuc.edu/~spong/mecha/ +http://web.archive.org/web/%2A/http://robot0.ge.uiuc.edu/~spong/mecha/ */ diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index b44386a..b86dda1 100644 --- a/drivers/staging/comedi/drivers/pcl711.c +++ b/drivers/staging/comedi/drivers/pcl711.c @@ -41,7 +41,7 @@ supported. driver for the PCL-711. I used a few ideas from his driver here. His driver also has more comments, if you are interested in understanding how this driver works. - http://tech.buffalostate.edu/~dave/driver/ + http://web.archive.org/web/%2A/http://tech.buffalostate.edu/~dave/driver/ The ACL-8112 driver was hacked from the sources of the PCL-711 driver (the 744 chip used on the 8112 is almost the same as diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/go7007/go7007.txt index 06a76da..21a487c 100644 --- a/drivers/staging/go7007/go7007.txt +++ b/drivers/staging/go7007/go7007.txt @@ -415,10 +415,10 @@ in the TDA8290/TDA8275 tuner driver. The following patches must be downloaded from Gerd Knorr's website and applied in the order listed: - http://dl.bytesex.org/patches/2.6.11-2/i2c-tuner - http://dl.bytesex.org/patches/2.6.11-2/i2c-tuner2 - http://dl.bytesex.org/patches/2.6.11-2/v4l2-api-mpeg - http://dl.bytesex.org/patches/2.6.11-2/saa7134-update + http://web.archive.org/web/%2A/http://dl.bytesex.org/patches/2.6.11-2/i2c-t… + http://web.archive.org/web/%2A/http://dl.bytesex.org/patches/2.6.11-2/i2c-t… + http://web.archive.org/web/%2A/http://dl.bytesex.org/patches/2.6.11-2/v4l2-… + http://web.archive.org/web/%2A/http://dl.bytesex.org/patches/2.6.11-2/saa71… The following patches are included with this SDK and can be applied in any order: diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index f5d0674..1eca35d 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c @@ -14,7 +14,7 @@ * See Documentation/usb/usb-serial.txt for more information on using this * driver * - * See http://geocities.com/i0xox0i for information on this driver and the + * See http://web.archive.org/web/%2A/http://geocities.com/i0xox0i for information on this driver and the * earthmate usb device. * * Lonnie Mendez <dignome(a)gmail.com> diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 2c897ee..eac1adf 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -962,7 +962,7 @@ UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100, * Only revision 1.13 tested (same for all of the above devices, * based on the Datafab DF-UG-07 chip). Needed for US_FL_FIX_INQUIRY. * Submitted by Marek Michalkiewicz <marekm(a)amelek.gda.pl>. - * See also http://martin.wilck.bei.t-online.de/#kecf . + * See also http://web.archive.org/web/20030808203106/http://martin.wilck.bei.t-online.… . */ UNUSUAL_DEV( 0x07c4, 0xa400, 0x0000, 0xffff, "Datafab", diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c index 43207cc..6cc8363 100644 --- a/drivers/video/macfb.c +++ b/drivers/video/macfb.c @@ -16,7 +16,7 @@ * Jacobowitz, Paul Mackerras, Fabio Riccardi, and Geert Uytterhoeven. * * The VideoToolbox "Bugs" web page at - * http://rajsky.psych.nyu.edu/Tips/VideoBugs.html + * http://web.archive.org/web/%2A/http://rajsky.psych.nyu.edu/Tips/VideoBugs.h… * * This code is free software. You may copy, modify, and distribute * it subject to the terms and conditions of the GNU General Public diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index dce8c97..fa121b6 100644 --- a/drivers/video/s3fb.c +++ b/drivers/video/s3fb.c @@ -7,7 +7,7 @@ * License. See the file COPYING in the main directory of this archive for * more details. * - * Code is based on David Boucher's viafb (http://davesdomain.org.uk/viafb/) + * Code is based on David Boucher's viafb (http://web.archive.org/web/%2A/http://davesdomain.org.uk/viafb/) * which is based on the code of neofb. */ diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c index fdb4567..b4c87d0 100644 --- a/drivers/video/svgalib.c +++ b/drivers/video/svgalib.c @@ -7,7 +7,7 @@ * License. See the file COPYING in the main directory of this archive for * more details. * - * Some parts are based on David Boucher's viafb (http://davesdomain.org.uk/viafb/) + * Some parts are based on David Boucher's viafb (http://web.archive.org/web/20071125103157/http://davesdomain.org.uk/viafb/) */ #include <linux/module.h> diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 85d76ec..d77d725 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c @@ -9,7 +9,7 @@ * more details. * * Code is based on s3fb, some parts are from David Boucher's viafb - * (http://davesdomain.org.uk/viafb/) + * (http://web.archive.org/web/%2A/http://davesdomain.org.uk/viafb/) */ #include <linux/module.h> diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c index 06f7922..0f8b2d7 100644 --- a/drivers/watchdog/pcwd.c +++ b/drivers/watchdog/pcwd.c @@ -46,7 +46,7 @@ */ /* - * A bells and whistles driver is available from http://www.pcwd.de/ + * A bells and whistles driver is available from http://web.archive.org/web/%2A/http://www.pcwd.de/ * More info available at http://www.berkprod.com/ or * http://www.pcwatchdog.com/ */ diff --git a/fs/ncpfs/Kconfig b/fs/ncpfs/Kconfig index c931cf2..15cf9cf 100644 --- a/fs/ncpfs/Kconfig +++ b/fs/ncpfs/Kconfig @@ -17,7 +17,8 @@ config NCP_FS file *server* for Novell NetWare clients. General information about how to connect Linux, Windows machines and - Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. + Macs is on the WWW at + <http://web.archive.org/web/20011204193118/http://www.eats.com/linux_mac_win…>. To compile this as a module, choose M here: the module will be called ncpfs. Say N unless you are connected to a Novell network. diff --git a/fs/nls/Kconfig b/fs/nls/Kconfig index a39edc4..4322501 100644 --- a/fs/nls/Kconfig +++ b/fs/nls/Kconfig @@ -416,7 +416,7 @@ config NLS_ISO8859_14 input/output character sets. Say Y here for the Latin 8 character set, which adds the last accented vowels for Welsh (aka Cymraeg) (and Manx Gaelic) that were missing in Latin 1. - <http://linux.speech.cymru.org/> has further information. + <http://web.archive.org/web/%2A/http://linux.speech.cymru.org> has further information. config NLS_ISO8859_15 tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)" diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 44a88a9..7ef7118 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c @@ -23,7 +23,7 @@ static DEFINE_SPINLOCK(nls_lock); /* * Sample implementation from Unicode home page. - * http://www.stonehand.com/unicode/standard/fss-utf.html + * http://web.archive.org/web/19970105220809/http://stonehand.com/unicode/stan… */ struct utf8_table { int cmask; diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c index 7a99811..37b40fa 100644 --- a/fs/reiserfs/procfs.c +++ b/fs/reiserfs/procfs.c @@ -555,13 +555,13 @@ int reiserfs_proc_info_global_done(void) * . remove remove_save_link() from reiserfs_do_truncate() * * I accept terms and conditions stated in the Legal Agreement - * (available at http://www.namesys.com/legalese.html) + * (available at http://web.archive.org/web/%2A/http://www.namesys.com/legalese.html) * * Revision 1.1.8.1 2001/07/11 16:48:50 god * proc info support * * I accept terms and conditions stated in the Legal Agreement - * (available at http://www.namesys.com/legalese.html) + * (available at http://web.archive.org/web/%2A/http://www.namesys.com/legalese.html) * */ diff --git a/include/linux/edd.h b/include/linux/edd.h index 4cbd0fe..557227c 100644 --- a/include/linux/edd.h +++ b/include/linux/edd.h @@ -6,8 +6,9 @@ * structures and definitions for the int 13h, ax={41,48}h * BIOS Enhanced Disk Drive Services * This is based on the T13 group document D1572 Revision 0 (August 14 2002) - * available at http://www.t13.org/docs2002/d1572r0.pdf. It is - * very similar to D1484 Revision 3 http://www.t13.org/docs2002/d1484r3.pdf + * available at http://web.archive.org/web/%2A/http://www.t13.org/docs2002/d1572r0.pdf. + * It is very similar to D1484 Revision 3 + * http://web.archive.org/web/%2A/http://www.t13.org/docs2002/d1484r3.pdf * * In a nutshell, arch/{i386,x86_64}/boot/setup.S populates a scratch * table in the boot_params that contains a list of BIOS-enumerated diff --git a/include/linux/mtd/pismo.h b/include/linux/mtd/pismo.h index 8dfb7e1..c2d6e75 100644 --- a/include/linux/mtd/pismo.h +++ b/include/linux/mtd/pismo.h @@ -1,5 +1,5 @@ /* - * PISMO memory driver - http://www.pismoworld.org/ + * PISMO memory driver - http://web.archive.org/web/%2A/http://www.pismoworld.org/ * * 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 diff --git a/include/scsi/sg.h b/include/scsi/sg.h index a9f3c6f..19d4d85 100644 --- a/include/scsi/sg.h +++ b/include/scsi/sg.h @@ -16,7 +16,7 @@ Version 2 and 3 extensions to driver: Version: 3.5.34 (20060920) This version is for 2.6 series kernels. - For a full changelog see http://www.torque.net/sg + For a full changelog see http://web.archive.org/web/%2A/http://www.torque.net/sg Map of SG verions to the Linux kernels in which they appear: ---------- ---------------------------------- @@ -52,17 +52,17 @@ Major new features in SG 3.x driver (cf SG 2.x drivers) Documentation ============= A web site for the SG device driver can be found at: - http://www.torque.net/sg [alternatively check the MAINTAINERS file] + http://web.archive.org/web/%2A/http://www.torque.net/sg The documentation for the sg version 3 driver can be found at: - http://www.torque.net/sg/p/sg_v3_ho.html + http://web.archive.org/web/%2A/http://www.torque.net/sg/p/sg_v3_ho.html This is a rendering from DocBook source [change the extension to "sgml" or "xml"]. There are renderings in "ps", "pdf", "rtf" and "txt" (soon). The SG_IO ioctl is now found in other parts kernel (e.g. the block layer). For more information see http://www.torque.net/sg/sg_io.html The older, version 2 documents discuss the original sg interface in detail: - http://www.torque.net/sg/p/scsi-generic.txt - http://www.torque.net/sg/p/scsi-generic_long.txt + http://web.archive.org/web/%2A/http://www.torque.net/sg/p/scsi-generic.txt + http://web.archive.org/web/%2A/http://www.torque.net/sg/p/scsi-generic_long… Also available: <kernel_source>/Documentation/scsi/scsi-generic.txt Utility and test programs are available at the sg web site. They are diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index a90050d..7defdc3 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -271,8 +271,8 @@ config IP_PIMSM_V1 Kernel side support for Sparse Mode PIM (Protocol Independent Multicast) version 1. This multicast routing protocol is used widely because Cisco supports it. You need special software to use it - (pimd-v1). Please see <http://netweb.usc.edu/pim/> for more - information about PIM. + (pimd-v1). Please see <http://web.archive.org/web/%2A/http://netweb.usc.edu/pim/> + for more information about PIM. Say Y if you want to use PIM-SM v1. Note that you can say N here if you just want to use Dense Mode PIM. diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c index d84140c..e8448e3 100644 --- a/net/ipv4/tcp_illinois.c +++ b/net/ipv4/tcp_illinois.c @@ -1,7 +1,7 @@ /* * TCP Illinois congestion control. * Home page: - * http://www.ews.uiuc.edu/~shaoliu/tcpillinois/index.html + * http://web.archive.org/web/%2A/http://www.ews.uiuc.edu/~shaoliu/tcpillinois… * * The algorithm is described in: * "TCP-Illinois: A Loss and Delay-Based Congestion Control Algorithm diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c index de87037..b88c17b 100644 --- a/net/ipv4/tcp_lp.c +++ b/net/ipv4/tcp_lp.c @@ -22,7 +22,7 @@ * Original Author: * Aleksandar Kuzmanovic <akuzma(a)northwestern.edu> * Available from: - * http://www.ece.rice.edu/~akuzma/Doc/akuzma/TCP-LP.pdf + * http://web.archive.org/web/%2A/http://www.ece.rice.edu/~akuzma/Doc/akuzma/T… * Original implementation for 2.4.19: * http://www-ece.rice.edu/networks/TCP-LP/ * diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index c6990c6..1f41e97 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -421,7 +421,7 @@ config SND_MSND_CLASSIC See <file:Documentation/sound/oss/MultiSound> for important information about this driver. Note that it has been discontinued, but the Voyetra Turtle Beach knowledge base entry for it is still available - at <http://www.turtlebeach.com/site/kb_ftp/790.asp>. + at <http://web.archive.org/web/20050407083114/http://www.turtlebeach.com/site/k…>. To compile this driver as a module, choose M here: the module will be called snd-msnd-classic. diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index fe79a16..64c936c 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -1,7 +1,7 @@ /* * Driver for C-Media's CMI8330 and CMI8329 soundcards. * Copyright (c) by George Talusan <gstalusan(a)uwaterloo.ca> - * http://www.undergrad.math.uwaterloo.ca/~gstalusa + * http://web.archive.org/web/%2A/http://www.undergrad.math.uwaterloo.ca/~gsta… * * 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 diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index a513651..3db52d3 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -36,7 +36,7 @@ config SOUND_MSNDCLAS See <file:Documentation/sound/oss/MultiSound> for important information about this driver. Note that it has been discontinued, but the Voyetra Turtle Beach knowledge base entry for it is still available - at <http://www.turtlebeach.com/site/kb_ftp/790.asp>. + at <http://web.archive.org/web/%2A/http://www.undergrad.math.uwaterloo.ca/~gsta…>. comment "Compiled-in MSND Classic support requires firmware during compilation." depends on SOUND_PRIME && SOUND_MSNDCLAS=y @@ -98,7 +98,7 @@ config SOUND_MSNDPIN See <file:Documentation/sound/oss/MultiSound> for important information about this driver. Note that it has been discontinued, but the Voyetra Turtle Beach knowledge base entry for it is still available - at <http://www.turtlebeach.com/site/kb_ftp/600.asp>. + at <http://web.archive.org/web/%2A/http://www.turtlebeach.com/site/kb_ftp/600.a…>. comment "Compiled-in MSND Pinnacle support requires firmware during compilation." depends on SOUND_PRIME && SOUND_MSNDPIN=y diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index e68c98e..de4641c 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -3874,7 +3874,7 @@ static int patch_lm4550(struct snd_ac97 *ac97) } /* - * UCB1400 codec (http://www.semiconductors.philips.com/acrobat_download/datasheets/UCB1400-0…) + * UCB1400 codec (http://web.archive.org/web/%2A/http://www.semiconductors.philips.com/acroba…) */ static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = { /* enable/disable headphone driver which allows direct connection to diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 5a60492..90c36a4 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -6,7 +6,7 @@ * The original author of OSS nm256 driver wishes to remain anonymous, * so I just put my acknoledgment to him/her here. * The original author's web page is found at - * http://www.uglx.org/sony.html + * http://web.archive.org/web/%2A/http://www.uglx.org/sony.html * * * This program is free software; you can redistribute it and/or modify -- 1.7.2.1

1 0

[alsa-devel] encoded media offload
by Agarwal, Lomesh 24 Sep '10

24 Sep '10

Hi, I am working on board which has audio DSP. DSP can decode MP3 media. Current Linux shipped with the board sends only PCM thru ALSA stack. I wanted to see if I can offload MP3 playback. I heard that present ALSA doesn't support MP3. Wondering if somebody can enumerate the possible problems. Thanks, Lomesh

1 0

[alsa-devel] [PATCH] ASoC: WM8985: Remove unneeded declaration.
by Dimitris Papastamos 24 Sep '10

24 Sep '10

We are not using the private data in this function, so get rid of it. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8985.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index 247585a..b94af96 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -557,12 +557,10 @@ static int wm8985_dac_mute(struct snd_soc_dai *dai, int mute) static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct wm8985_priv *wm8985; struct snd_soc_codec *codec; u16 format, master, bcp, lrp; codec = dai->codec; - wm8985 = snd_soc_codec_get_drvdata(codec); switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: -- 1.7.3

3 2

[alsa-devel] [PATCH 1/3] ASoC: Remove unneeded WM9713 header include from SMDK WM9713 driver
by Mark Brown 24 Sep '10

24 Sep '10

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/s3c24xx/smdk_wm9713.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sound/soc/s3c24xx/smdk_wm9713.c b/sound/soc/s3c24xx/smdk_wm9713.c index 11086f8..8619a9a 100644 --- a/sound/soc/s3c24xx/smdk_wm9713.c +++ b/sound/soc/s3c24xx/smdk_wm9713.c @@ -15,7 +15,6 @@ #include <linux/device.h> #include <sound/soc.h> -#include "../codecs/wm9713.h" #include "s3c-dma.h" #include "s3c-ac97.h" -- 1.7.1

3 13

[alsa-devel] [PATCH] ASoC: Clean up AC'97 glue driver
by Mark Brown 24 Sep '10

24 Sep '10

Remove version number and clean up some indentation. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/ac97.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index 12c87d3..2c824a5 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -22,8 +22,6 @@ #include <sound/initval.h> #include <sound/soc.h> -#define AC97_VERSION "0.6" - static int ac97_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -81,11 +79,9 @@ static int ac97_soc_probe(struct snd_soc_codec *codec) struct snd_ac97_template ac97_template; int ret; - printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION); - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) { - printk(KERN_ERR "ASoC: failed to init gen ac97 glue\n"); + printk(KERN_ERR "ASoC: failed to init generic ac97 glue\n"); return ret; } @@ -127,8 +123,8 @@ static int ac97_soc_resume(struct snd_soc_codec *codec) #endif static struct snd_soc_codec_driver soc_codec_dev_ac97 = { - .write = ac97_write, - .read = ac97_read, + .write = ac97_write, + .read = ac97_read, .probe = ac97_soc_probe, .remove = ac97_soc_remove, .suspend = ac97_soc_suspend, @@ -149,8 +145,8 @@ static int __devexit ac97_remove(struct platform_device *pdev) static struct platform_driver ac97_codec_driver = { .driver = { - .name = "ac97-codec", - .owner = THIS_MODULE, + .name = "ac97-codec", + .owner = THIS_MODULE, }, .probe = ac97_probe, -- 1.7.1

2 1

[alsa-devel] [PATCH 1/2] ASoC: Convert s3c-ac97 to pr_() macros
by Mark Brown 24 Sep '10

24 Sep '10

Could use dev_() but we'd have to remember the struct device somewhere and it wouldn't make the logging clearer. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/s3c24xx/s3c-ac97.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/soc/s3c24xx/s3c-ac97.c b/sound/soc/s3c24xx/s3c-ac97.c index 26f4ed9..31e2b3d 100644 --- a/sound/soc/s3c24xx/s3c-ac97.c +++ b/sound/soc/s3c24xx/s3c-ac97.c @@ -89,7 +89,7 @@ static void s3c_ac97_activate(struct snd_ac97 *ac97) writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) - printk(KERN_ERR "AC97: Unable to activate!"); + pr_err("AC97: Unable to activate!"); } static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, @@ -115,14 +115,15 @@ static unsigned short s3c_ac97_read(struct snd_ac97 *ac97, writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) - printk(KERN_ERR "AC97: Unable to read!"); + pr_err("AC97: Unable to read!"); stat = readl(s3c_ac97.regs + S3C_AC97_STAT); addr = (stat >> 16) & 0x7f; data = (stat & 0xffff); if (addr != reg) - printk(KERN_ERR "s3c-ac97: req addr = %02x, rep addr = %02x\n", reg, addr); + pr_err("s3c-ac97: req addr = %02x, rep addr = %02x\n", + reg, addr); mutex_unlock(&s3c_ac97.lock); @@ -151,7 +152,7 @@ static void s3c_ac97_write(struct snd_ac97 *ac97, unsigned short reg, writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL); if (!wait_for_completion_timeout(&s3c_ac97.done, HZ)) - printk(KERN_ERR "AC97: Unable to write!"); + pr_err("AC97: Unable to write!"); ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD); ac_codec_cmd |= S3C_AC97_CODEC_CMD_READ; @@ -442,7 +443,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) ret = request_irq(irq_res->start, s3c_ac97_irq, IRQF_DISABLED, "AC97", NULL); if (ret < 0) { - printk(KERN_ERR "s3c-ac97: interrupt request failed.\n"); + dev_err(&pdev->dev, "s3c-ac97: interrupt request failed.\n"); goto err4; } -- 1.7.1

3 4

[alsa-devel] SPDIF wave audio broken after BIOS update
by Manuel Lauss 24 Sep '10

24 Sep '10

Hello, I've updated my system BIOS to fix some issues, however since then wave audio over (optical) SPDIF is broken, i.e. I can hear the receiver power up but only silence comes out. Audio on the analog jacks work, as does transmitting AC3/DTS data over spdif. Attached is the codec#0 proc info for the non-working case, as well as a diff of this output between the (old) working and (new) broken bios. Also, since the update, this message has reappeared (it went away after the sound tree merge early in the 2.6.36-rc phase): hda_codec: ALC892: BIOS auto-probing. ALSA hda_codec.c:337: hda_codec: connection list not available for 0x1f Thank you! Manuel Lauss 2.6.36-rc3, BIOS F7/F8b Codec: Realtek ALC892 Address: 0 AFG Function Id: 0x1 (unsol 1) Vendor Id: 0x10ec0892 Subsystem Id: 0x1458a102 Revision Id: 0x100302 No Modem Function Group found Default PCM: rates [0x5f0]: 32000 44100 48000 88200 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Default Amp-In caps: N/A Default Amp-Out caps: N/A GPIO: io=2, o=0, i=0, unsolicited=1, wake=0 IO[0]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 IO[1]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 Node 0x02 [Audio Output] wcaps 0x41d: Stereo Amp-Out Control: name="Front Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Device: name="ALC892 Analog", type="Audio", device=0 Amp-Out caps: ofs=0x40, nsteps=0x40, stepsize=0x03, mute=0 Amp-Out vals: [0x40 0x40] Converter: stream=0, channel=0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x03 [Audio Output] wcaps 0x41d: Stereo Amp-Out Control: name="Surround Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Amp-Out caps: ofs=0x40, nsteps=0x40, stepsize=0x03, mute=0 Amp-Out vals: [0x40 0x40] Converter: stream=0, channel=0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x04 [Audio Output] wcaps 0x41d: Stereo Amp-Out Control: name="Center Playback Volume", index=0, device=0 ControlAmp: chs=1, dir=Out, idx=0, ofs=0 Control: name="LFE Playback Volume", index=0, device=0 ControlAmp: chs=2, dir=Out, idx=0, ofs=0 Amp-Out caps: ofs=0x40, nsteps=0x40, stepsize=0x03, mute=0 Amp-Out vals: [0x40 0x40] Converter: stream=0, channel=0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x05 [Audio Output] wcaps 0x41d: Stereo Amp-Out Amp-Out caps: ofs=0x40, nsteps=0x40, stepsize=0x03, mute=0 Amp-Out vals: [0x40 0x40] Converter: stream=0, channel=0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x06 [Audio Output] wcaps 0x611: Stereo Digital Converter: stream=0, channel=0 Digital: Enabled Non-Audio GenLevel Digital category: 0x2 PCM: rates [0x5f0]: 32000 44100 48000 88200 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x07 [Vendor Defined Widget] wcaps 0xf00000: Mono Node 0x08 [Audio Input] wcaps 0x10051b: Stereo Amp-In Control: name="Capture Switch", index=1, device=0 Control: name="Capture Volume", index=1, device=0 Amp-In caps: ofs=0x10, nsteps=0x2e, stepsize=0x03, mute=1 Amp-In vals: [0x90 0x90] Converter: stream=0, channel=0 SDI-Select: 0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x23 Node 0x09 [Audio Input] wcaps 0x10051b: Stereo Amp-In Control: name="Capture Switch", index=0, device=0 Control: name="Capture Volume", index=0, device=0 Device: name="ALC892 Analog", type="Audio", device=0 Amp-In caps: ofs=0x10, nsteps=0x2e, stepsize=0x03, mute=1 Amp-In vals: [0x9c 0x9c] Converter: stream=0, channel=0 SDI-Select: 0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x22 Node 0x0a [Audio Input] wcaps 0x100711: Stereo Digital Converter: stream=0, channel=0 SDI-Select: 0 Digital: Enabled Digital category: 0x0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x1f Node 0x0b [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Control: name="Mic Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Control: name="Mic Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Control: name="Front Mic Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=1, ofs=0 Control: name="Front Mic Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=1, ofs=0 Control: name="Line Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Control: name="Line Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x17, nsteps=0x1f, stepsize=0x05, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] Connection: 10 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x14 0x15 0x16 0x17 Node 0x0c [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Control: name="Front Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x00 0x00] [0x00 0x00] Connection: 2 0x02 0x0b Node 0x0d [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Control: name="Surround Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x00 0x00] [0x00 0x00] Connection: 2 0x03 0x0b Node 0x0e [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Control: name="Center Playback Switch", index=0, device=0 ControlAmp: chs=1, dir=In, idx=0, ofs=0 Control: name="LFE Playback Switch", index=0, device=0 ControlAmp: chs=2, dir=In, idx=0, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x00 0x00] [0x00 0x00] Connection: 2 0x04 0x0b Node 0x0f [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x05 0x0b Node 0x10 [Audio Output] wcaps 0x611: Stereo Digital Control: name="IEC958 Playback Con Mask", index=0, device=0 Control: name="IEC958 Playback Pro Mask", index=0, device=0 Control: name="IEC958 Playback Default", index=0, device=0 Control: name="IEC958 Playback Switch", index=0, device=0 Control: name="IEC958 Default PCM Playback Switch", index=0, device=0 Device: name="ALC892 Digital", type="SPDIF", device=1 Converter: stream=0, channel=0 Digital: Enabled Non-Audio GenLevel Digital category: 0x2 PCM: rates [0x5f0]: 32000 44100 48000 88200 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x11 [Pin Complex] wcaps 0x400781: Stereo Digital Pincap 0x00000014: OUT Detect Pin Default 0x99430140: [Fixed] SPDIF Out at Int ATAPI Conn = ATAPI, Color = Unknown DefAssociation = 0x4, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x10 Node 0x12 [Pin Complex] wcaps 0x400401: Stereo Pincap 0x00000020: IN Pin Default 0x411111f0: [N/A] Speaker at Ext Rear Conn = 1/8, Color = Black DefAssociation = 0xf, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x00: Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x13 [Vendor Defined Widget] wcaps 0xf00000: Mono Node 0x14 [Pin Complex] wcaps 0x40058d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x0000003e: IN OUT HP Detect Trigger Pin Default 0x01014410: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Green DefAssociation = 0x1, Sequence = 0x0 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x0c Node 0x15 [Pin Complex] wcaps 0x40058d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x00000036: IN OUT Detect Trigger Pin Default 0x01011412: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Black DefAssociation = 0x1, Sequence = 0x2 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x0d Node 0x16 [Pin Complex] wcaps 0x40058d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x00000036: IN OUT Detect Trigger Pin Default 0x01016411: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Orange DefAssociation = 0x1, Sequence = 0x1 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x0e Node 0x17 [Pin Complex] wcaps 0x40058d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x00000036: IN OUT Detect Trigger Pin Default 0x01012414: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Grey DefAssociation = 0x1, Sequence = 0x4 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x0f Node 0x18 [Pin Complex] wcaps 0x40058f: Stereo Amp-In Amp-Out Control: name="Mic Boost", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x80 0x80] Pincap 0x00003736: IN OUT Detect Trigger Vref caps: HIZ 50 GRD 80 100 Pin Default 0x01a19c50: [Jack] Mic at Ext Rear Conn = 1/8, Color = Pink DefAssociation = 0x5, Sequence = 0x0 Pin-ctls: 0x24: IN VREF_80 Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 5 0x0c* 0x0d 0x0e 0x0f 0x26 Node 0x19 [Pin Complex] wcaps 0x40058f: Stereo Amp-In Amp-Out Control: name="Front Mic Boost", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x80 0x80] Pincap 0x0000373e: IN OUT HP Detect Trigger Vref caps: HIZ 50 GRD 80 100 Pin Default 0x02a19c60: [Jack] Mic at Ext Front Conn = 1/8, Color = Pink DefAssociation = 0x6, Sequence = 0x0 Pin-ctls: 0x24: IN VREF_80 Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 5 0x0c* 0x0d 0x0e 0x0f 0x26 Node 0x1a [Pin Complex] wcaps 0x40058f: Stereo Amp-In Amp-Out Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x80 0x80] Pincap 0x00003736: IN OUT Detect Trigger Vref caps: HIZ 50 GRD 80 100 Pin Default 0x0181345f: [Jack] Line In at Ext Rear Conn = 1/8, Color = Blue DefAssociation = 0x5, Sequence = 0xf Pin-ctls: 0x20: IN VREF_HIZ Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 5 0x0c* 0x0d 0x0e 0x0f 0x26 Node 0x1b [Pin Complex] wcaps 0x40058f: Stereo Amp-In Amp-Out Control: name="Headphone Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x0000373e: IN OUT HP Detect Trigger Vref caps: HIZ 50 GRD 80 100 Pin Default 0x02214c20: [Jack] HP Out at Ext Front Conn = 1/8, Color = Green DefAssociation = 0x2, Sequence = 0x0 Pin-ctls: 0xc0: OUT HP VREF_HIZ Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 5 0x0c 0x0d 0x0e 0x0f 0x26* Node 0x1c [Pin Complex] wcaps 0x400481: Stereo Pincap 0x00000024: IN Detect Pin Default 0x593301f0: [N/A] CD at Int ATAPI Conn = ATAPI, Color = Unknown DefAssociation = 0xf, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x20: IN Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x1d [Pin Complex] wcaps 0x400400: Mono Pincap 0x00000020: IN Pin Default 0x4005e601: [N/A] Line Out at Ext N/A Conn = Optical, Color = White DefAssociation = 0x0, Sequence = 0x1 Pin-ctls: 0x20: IN Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x1e [Pin Complex] wcaps 0x400781: Stereo Digital Pincap 0x00000014: OUT Detect Pin Default 0x014b6130: [Jack] SPDIF Out at Ext Rear Conn = Comb, Color = Orange DefAssociation = 0x3, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 1 0x06 Node 0x1f [Pin Complex] wcaps 0x400681: Stereo Digital Pincap 0x00000024: IN Detect Pin Default 0x01cb7170: [Jack] SPDIF In at Ext Rear Conn = Comb, Color = Yellow DefAssociation = 0x7, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x20: IN Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x20 [Vendor Defined Widget] wcaps 0xf00040: Mono Processing caps: benign=0, ncoeff=24 Node 0x21 [Vendor Defined Widget] wcaps 0xf00000: Mono Node 0x22 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Control: name="Input Source", index=0, device=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x00 0x00] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] Connection: 12 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x14 0x15 0x16 0x17 0x0b 0x12 Node 0x23 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Control: name="Input Source", index=1, device=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x00 0x00] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] Connection: 11 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x14 0x15 0x16 0x17 0x0b Node 0x24 [Vendor Defined Widget] wcaps 0xf00000: Mono Node 0x25 [Audio Output] wcaps 0x41d: Stereo Amp-Out Amp-Out caps: ofs=0x40, nsteps=0x40, stepsize=0x03, mute=0 Amp-Out vals: [0x40 0x40] Converter: stream=0, channel=0 PCM: rates [0x560]: 44100 48000 96000 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x26 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x25 0x0b --- alc892-old.txt 2010-09-23 13:20:19.651770502 +0200 +++ alc892-new.txt 2010-09-23 13:20:48.689282001 +0200 @@ -1,8 +1,8 @@ -2.6.35, BIOS F7b working +2.6.36-rc3, BIOS F7/F8b broken SPDIF wave audio Codec: Realtek ALC892 Address: 0 -Function Id: 0x1 +AFG Function Id: 0x1 (unsol 1) Vendor Id: 0x10ec0892 Subsystem Id: 0x1458a102 Revision Id: 0x100302 @@ -15,7 +15,7 @@ Default Amp-In caps: N/A Default Amp-Out caps: N/A GPIO: io=2, o=0, i=0, unsolicited=1, wake=0 IO[0]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 - IO[1]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0f + IO[1]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 Node 0x02 [Audio Output] wcaps 0x41d: Stereo Amp-Out Control: name="Front Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 @@ -66,15 +66,9 @@ Node 0x05 [Audio Output] wcaps 0x41d: St Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x06 [Audio Output] wcaps 0x611: Stereo Digital - Control: name="IEC958 Playback Con Mask", index=0, device=0 - Control: name="IEC958 Playback Pro Mask", index=0, device=0 - Control: name="IEC958 Playback Default", index=0, device=0 - Control: name="IEC958 Playback Switch", index=0, device=0 - Control: name="IEC958 Default PCM Playback Switch", index=0, device=0 - Device: name="ALC892 Digital", type="SPDIF", device=1 Converter: stream=0, channel=0 - Digital: Enabled - Digital category: 0x0 + Digital: Enabled Non-Audio GenLevel + Digital category: 0x2 PCM: rates [0x5f0]: 32000 44100 48000 88200 96000 192000 bits [0xe]: 16 20 24 @@ -116,7 +110,7 @@ Node 0x09 [Audio Input] wcaps 0x10051b: Node 0x0a [Audio Input] wcaps 0x100711: Stereo Digital Converter: stream=0, channel=0 SDI-Select: 0 - Digital: + Digital: Enabled Digital category: 0x0 PCM: rates [0x560]: 44100 48000 96000 192000 @@ -140,7 +134,7 @@ Node 0x0b [Audio Mixer] wcaps 0x20010b: Control: name="Line Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x17, nsteps=0x1f, stepsize=0x05, mute=1 - Amp-In vals: [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] + Amp-In vals: [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] [0x97 0x97] Connection: 10 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x14 0x15 0x16 0x17 Node 0x0c [Audio Mixer] wcaps 0x20010b: Stereo Amp-In @@ -168,13 +162,19 @@ Node 0x0e [Audio Mixer] wcaps 0x20010b: 0x04 0x0b Node 0x0f [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 - Amp-In vals: [0x00 0x00] [0x80 0x80] + Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x05 0x0b Node 0x10 [Audio Output] wcaps 0x611: Stereo Digital + Control: name="IEC958 Playback Con Mask", index=0, device=0 + Control: name="IEC958 Playback Pro Mask", index=0, device=0 + Control: name="IEC958 Playback Default", index=0, device=0 + Control: name="IEC958 Playback Switch", index=0, device=0 + Control: name="IEC958 Default PCM Playback Switch", index=0, device=0 + Device: name="ALC892 Digital", type="SPDIF", device=1 Converter: stream=0, channel=0 - Digital: - Digital category: 0x0 + Digital: Enabled Non-Audio GenLevel + Digital category: 0x2 PCM: rates [0x5f0]: 32000 44100 48000 88200 96000 192000 bits [0xe]: 16 20 24 @@ -187,7 +187,7 @@ Node 0x11 [Pin Complex] wcaps 0x400781: Conn = ATAPI, Color = Unknown DefAssociation = 0x4, Sequence = 0x0 Misc = NO_PRESENCE - Pin-ctls: 0x00: + Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 @@ -324,7 +324,7 @@ Node 0x1b [Pin Complex] wcaps 0x40058f: Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Connection: 5 - 0x0c* 0x0d 0x0e 0x0f 0x26 + 0x0c 0x0d 0x0e 0x0f 0x26* Node 0x1c [Pin Complex] wcaps 0x400481: Stereo Pincap 0x00000024: IN Detect Pin Default 0x593301f0: [N/A] CD at Int ATAPI @@ -340,7 +340,7 @@ Node 0x1d [Pin Complex] wcaps 0x400400: Pin Default 0x4005e601: [N/A] Line Out at Ext N/A Conn = Optical, Color = White DefAssociation = 0x0, Sequence = 0x1 - Pin-ctls: 0x00: + Pin-ctls: 0x20: IN Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 Node 0x1e [Pin Complex] wcaps 0x400781: Stereo Digital @@ -349,7 +349,7 @@ Node 0x1e [Pin Complex] wcaps 0x400781: Conn = Comb, Color = Orange DefAssociation = 0x3, Sequence = 0x0 Misc = NO_PRESENCE - Pin-ctls: 0x00: + Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 @@ -361,7 +361,7 @@ Node 0x1f [Pin Complex] wcaps 0x400681: Conn = Comb, Color = Yellow DefAssociation = 0x7, Sequence = 0x0 Misc = NO_PRESENCE - Pin-ctls: 0x00: + Pin-ctls: 0x20: IN Unsolicited: tag=00, enabled=0 Power states: D0 D1 D2 D3 EPSS Power: setting=D0, actual=D0 @@ -393,6 +393,6 @@ Node 0x25 [Audio Output] wcaps 0x41d: St Power: setting=D0, actual=D0 Node 0x26 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 - Amp-In vals: [0x00 0x00] [0x80 0x80] + Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x25 0x0b

2 3

[PATCH] ALSA: hda - Fix auto-parse of SPDIF input of Realtek codecs
by Takashi Iwai 24 Sep '10

24 Sep '10

The SPDIF in audio widget must be searched through the list as the widget that contains the given pin as the connection source. The current code was implemented in a reverse way. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a1312a6..a432e6e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1594,12 +1594,22 @@ static void alc_auto_parse_digital(struct hda_codec *codec) } if (spec->autocfg.dig_in_pin) { - hda_nid_t dig_nid; - err = snd_hda_get_connections(codec, - spec->autocfg.dig_in_pin, - &dig_nid, 1); - if (err > 0) - spec->dig_in_nid = dig_nid; + dig_nid = codec->start_nid; + for (i = 0; i < codec->num_nodes; i++, dig_nid++) { + unsigned int wcaps = get_wcaps(codec, dig_nid); + if (get_wcaps_type(wcaps) != AC_WID_AUD_IN) + continue; + if (!(wcaps & AC_WCAP_DIGITAL)) + continue; + if (!(wcaps & AC_WCAP_CONN_LIST)) + continue; + err = get_connection_index(codec, dig_nid, + spec->autocfg.dig_in_pin); + if (err >= 0) { + spec->dig_in_nid = dig_nid; + break; + } + } } } -- 1.7.2.2

1 0

[alsa-devel] [PATCH] include/adriver.h: Define pr_warn to allow compilation against older kernels
by Luke Yelavich 24 Sep '10

24 Sep '10

From: Luke Yelavich <luke.yelavich(a)canonical.com> In my testing of the daily tarball, I am unable to build against 2.6.32. I assume that older kernels would be affected in a similar way. Signed-off-by: Luke Yelavich <luke.yelavich(a)canonical.com> --- include/adriver.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/adriver.h b/include/adriver.h index 1c7e87b..495e640 100644 --- a/include/adriver.h +++ b/include/adriver.h @@ -1566,6 +1566,10 @@ XXX_DEFINE_STRTO(ull, unsigned long long); #define pr_warning(fmt, arg...) \ printk(KERN_WARNING fmt, ##arg) #endif +#ifndef pr_warn +#define pr_warn(fmt, arg...) \ + printk(KERN_WARNING fmt, ##arg) +#endif #ifndef pr_notice #define pr_notice(fmt, arg...) \ printk(KERN_NOTICE fmt, ##arg) -- 1.7.1

2 1

[alsa-devel] Spurious "Unable to find definition 'defaults.pcm.dmix.device'"
by Gavin Stark 24 Sep '10

24 Sep '10

I am using ALSA in a gstreamer project. When playing many videos (with audio) in the same application and the same gstreamer instance every once in a while (maybe once every 500 times) I will receive the following errors (in a call chain that passes through snd_pcm_open) confmisc.c:1286:snd_func_refer: alsalib error: Unable to find definition 'defaults.pcm.dmix.device' alsa conf.c:4154:_snd_config_evaluate: alsalib error: function snd_func_refer returned error: No such file or directory alsa conf.c:4633:snd_config_expand: alsalib error: Evaluate error: No such file or directory alsa pcm.c:2211:snd_pcm_open_noupdate: alsalib error: Unknown PCM default The next playback will be fine. Looking through the ALSA code it seems that the configuration data should be cached and re-used unless the number of config files changes, or the files themselves change (name, device, inode. mtime) So I am wonder why on one instance of snd_pcm_open I'd end up with this error but not on most previous or subsequent calls. All the ALSA configuration files are the defaults, I have no ~/.asoundrc, and I'm running version 1.0.23 Thank you, Gavin Stark

3 2

[alsa-devel] Problems with ALSA driver
by Radivoje Jovanovic 24 Sep '10

24 Sep '10

Hi All, I am trying to write ALSA driver for my audio card. I have initial driver version in place. aplay -l gives: **** List of PLAYBACK Hardware Devices **** card 0: default [], device 0: myMonoCard [] Subdevices: 1/1 Subdevice #0: subdevice #0 and aplay -L gives: default:CARD=default Default Audio Device null Discard all samples (playback) or generate zero samples (capture) It seems to me that all looks good here but when I try: aplay 101a.4.wav Calling open method in the mono driver! (Output from my driver open method) Calling hw_free method (Output from my driver hw_free method) Calling close method in the mono driver! (Output from my driver close method) aplay: main:608: audio open error: Invalid argument All my open method does is this: int ret; struct snd_pcm_runtime *runtime = substream->runtime; printk ("Calling open method in the mono driver!\n"); /*Associate the hardware capabilities of this PCM component */ runtime->hw = monocard_playback_mono; return 0; and my struct snd_pcm_hardware monocard_playback_mono = { .info = (SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_PAUSE), .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8, .rates = SNDRV_PCM_RATE_CONTINUOUS, .rate_min = 8000, .rate_min = 48000, .channels_min = 1, .channels_max = 1, .buffer_bytes_max=32768, I am not sure if alsa-lib is saying that one of these arguments is invalid or what? Thank you Ogi

1 0

[alsa-devel] [PATCH] ASoC: Fix incorrect parameter to snd_soc_codec_volatile_register
by Dimitris Papastamos 23 Sep '10

23 Sep '10

We need to pass the register index and not the register value. This patch depends on my previous patch "ASoC: Delegate to hw specific read for volatile registers". Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 5d9d2f8..3e4680b 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -177,7 +177,7 @@ static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg, data[0] = reg; data[1] = value & 0xff; - if (!snd_soc_codec_volatile_register(codec, value) && + if (!snd_soc_codec_volatile_register(codec, reg) && reg < codec->driver->reg_cache_size) cache[reg] = value; -- 1.7.3

3 3

[alsa-devel] [PATCH] ASoC: Delegate to hw specific read for volatile registers
by Dimitris Papastamos 23 Sep '10

23 Sep '10

Ensure that reads on volatile registers will correctly delegate to the bus specific read function. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg(a)slimlogic.co.uk> --- sound/soc/soc-cache.c | 76 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 26 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 6702a3d..5d9d2f8 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -19,8 +19,15 @@ static unsigned int snd_soc_4_12_read(struct snd_soc_codec *codec, unsigned int reg) { u16 *cache = codec->reg_cache; - if (reg >= codec->driver->reg_cache_size) - return -1; + + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -31,13 +38,12 @@ static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg, u8 data[2]; int ret; - BUG_ON(codec->driver->volatile_register); - data[0] = (reg << 4) | ((value >> 8) & 0x000f); data[1] = value & 0x00ff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -89,8 +95,15 @@ static unsigned int snd_soc_7_9_read(struct snd_soc_codec *codec, unsigned int reg) { u16 *cache = codec->reg_cache; - if (reg >= codec->driver->reg_cache_size) - return -1; + + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -101,13 +114,12 @@ static int snd_soc_7_9_write(struct snd_soc_codec *codec, unsigned int reg, u8 data[2]; int ret; - BUG_ON(codec->driver->volatile_register); - data[0] = (reg << 1) | ((value >> 8) & 0x0001); data[1] = value & 0x00ff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -161,14 +173,13 @@ static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg, u8 *cache = codec->reg_cache; u8 data[2]; - BUG_ON(codec->driver->volatile_register); - reg &= 0xff; data[0] = reg; data[1] = value & 0xff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, value) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -187,9 +198,16 @@ static unsigned int snd_soc_8_8_read(struct snd_soc_codec *codec, unsigned int reg) { u8 *cache = codec->reg_cache; + reg &= 0xff; - if (reg >= codec->driver->reg_cache_size) - return -1; + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -344,8 +362,14 @@ static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec, u8 *cache = codec->reg_cache; reg &= 0xff; - if (reg >= codec->driver->reg_cache_size) - return -1; + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -356,15 +380,14 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, u8 data[3]; int ret; - BUG_ON(codec->driver->volatile_register); - data[0] = (reg >> 8) & 0xff; data[1] = reg & 0xff; data[2] = value; reg &= 0xff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -475,8 +498,9 @@ static int snd_soc_16_16_write(struct snd_soc_codec *codec, unsigned int reg, data[2] = (value >> 8) & 0xff; data[3] = value & 0xff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; -- 1.7.3

2 1

[alsa-devel] [PATCH] ASoC: Add max98088 CODEC driver
by Peter Hsiang 23 Sep '10

23 Sep '10

This patch adds the MAX98088 CODEC driver. Signed-off-by: Peter Hsiang <peter.hsiang(a)maxim-ic.com> --- include/sound/max98088.h | 54 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/max98088.c | 2477 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/max98088.h | 193 ++++ 5 files changed, 2730 insertions(+), 0 deletions(-) create mode 100644 include/sound/max98088.h create mode 100644 sound/soc/codecs/max98088.c create mode 100644 sound/soc/codecs/max98088.h diff --git a/include/sound/max98088.h b/include/sound/max98088.h new file mode 100644 index 0000000..30652be --- /dev/null +++ b/include/sound/max98088.h @@ -0,0 +1,54 @@ +/* + * Platform data for MAX98088 + * + * Copyright 2010 Maxim Integrated Products + * + * 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. + * + */ + +#ifndef __SOUND_MAX98088_PDATA_H__ +#define __SOUND_MAX98088_PDATA_H__ + +#define EQ_CFG_MAX 32 + +/* Equalizer filter response configuration */ +struct max98088_eq_cfg { + const char *name; + unsigned int rate; + u16 band1[5]; + u16 band2[5]; + u16 band3[5]; + u16 band4[5]; + u16 band5[5]; +}; + +/* codec platform data */ +struct max98088_pdata { + + /* Equalizers for DAI1 and DAI2 */ + struct max98088_eq_cfg *eq1_cfg; + struct max98088_eq_cfg *eq2_cfg; + unsigned int eq1_cfgcnt; + unsigned int eq2_cfgcnt; + + /* Receiver output can be configured as power amplifier or LINE out */ + /* Set receiver_mode to: + * 0 = amplifier output, or + * 1 = LINE level output + */ + unsigned int receiver_mode:1; + + /* Analog/digital microphone configuration: + * 0 = analog microphone input (normal setting) + * 1 = digital microphone input + */ + unsigned int digmic_left_mode:1; + unsigned int digmic_right_mode:1; + +}; + +#endif diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 4ccc2b7..4e6713c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -27,6 +27,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS4270 if I2C select SND_SOC_DA7210 if I2C select SND_SOC_JZ4740 if SOC_JZ4740 + select SND_SOC_MAX98088 if I2C select SND_SOC_MAX9877 if I2C select SND_SOC_PCM3008 select SND_SOC_SPDIF @@ -157,6 +158,9 @@ config SND_SOC_L3 config SND_SOC_DA7210 tristate +config SND_SOC_MAX98088 + tristate + config SND_SOC_PCM3008 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 23e7e2c..7184611 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -15,6 +15,7 @@ snd-soc-cs4270-objs := cs4270.o snd-soc-cx20442-objs := cx20442.o snd-soc-da7210-objs := da7210.o snd-soc-l3-objs := l3.o +snd-soc-max98088-objs := max98088.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-spdif-objs := spdif_transciever.o snd-soc-ssm2602-objs := ssm2602.o @@ -88,6 +89,7 @@ obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o +obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c new file mode 100644 index 0000000..00319d6 --- /dev/null +++ b/sound/soc/codecs/max98088.c @@ -0,0 +1,2477 @@ +/* + * max98088.c -- MAX98088 ALSA SoC Audio driver + * + * Copyright 2010 Maxim Integrated Products + * + * 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. + */ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/initval.h> +#include <sound/tlv.h> +#include <linux/slab.h> +#include <sound/max98088.h> +#include "max98088.h" + +static struct snd_soc_codec *max98088_codec; +struct snd_soc_codec_device soc_codec_dev_max98088; + +/* Configurations associated with each channel of DAI stream */ +struct max98088_cdata { + unsigned int rate; + unsigned int fmt; + int eq_textcnt; + const char *eq_texts[EQ_CFG_MAX]; + int eq_sel; + struct soc_enum eq_enum; +}; + +/* Codec private data */ +struct max98088_priv { + struct snd_soc_codec codec; + struct max98088_pdata *pdata; + u8 reg_cache[M98088_REG_CNT]; + unsigned int sysclk; + struct max98088_cdata dai[2]; + u8 power_state; + unsigned int ex_mode; + unsigned int digmic; + unsigned int mic1pre; + unsigned int mic2pre; + unsigned int extmic_mode; +}; + +static const u8 max98088_reg[M98088_REG_CNT] = { + 0x00, /* 00 IRQ status */ + 0x00, /* 01 MIC status */ + 0x00, /* 02 jack status */ + 0x00, /* 03 battery voltage */ + 0x00, /* 04 */ + 0x00, /* 05 */ + 0x00, /* 06 */ + 0x00, /* 07 */ + 0x00, /* 08 */ + 0x00, /* 09 */ + 0x00, /* 0A */ + 0x00, /* 0B */ + 0x00, /* 0C */ + 0x00, /* 0D */ + 0x00, /* 0E */ + 0x00, /* 0F interrupt enable */ + + 0x00, /* 10 master clock */ + 0x00, /* 11 DAI1 clock mode */ + 0x00, /* 12 DAI1 clock control */ + 0x00, /* 13 DAI1 clock control */ + 0x00, /* 14 DAI1 format */ + 0x00, /* 15 DAI1 clock */ + 0x00, /* 16 DAI1 config */ + 0x00, /* 17 DAI1 TDM */ + 0x00, /* 18 DAI1 filters */ + 0x00, /* 19 DAI2 clock mode */ + 0x00, /* 1A DAI2 clock control */ + 0x00, /* 1B DAI2 clock control */ + 0x00, /* 1C DAI2 format */ + 0x00, /* 1D DAI2 clock */ + 0x00, /* 1E DAI2 config */ + 0x00, /* 1F DAI2 TDM */ + + 0x00, /* 20 DAI2 filters */ + 0x00, /* 21 data config */ + 0x00, /* 22 DAC mixer */ + 0x00, /* 23 left ADC mixer */ + 0x00, /* 24 right ADC mixer */ + 0x00, /* 25 left HP mixer */ + 0x00, /* 26 right HP mixer */ + 0x00, /* 27 HP control */ + 0x00, /* 28 left REC mixer */ + 0x00, /* 29 right REC mixer */ + 0x00, /* 2A REC control */ + 0x00, /* 2B left SPK mixer */ + 0x00, /* 2C right SPK mixer */ + 0x00, /* 2D SPK control */ + 0x00, /* 2E sidetone */ + 0x00, /* 2F DAI1 playback level */ + + 0x00, /* 30 DAI1 playback level */ + 0x00, /* 31 DAI2 playback level */ + 0x00, /* 32 DAI2 playbakc level */ + 0x00, /* 33 left ADC level */ + 0x00, /* 34 right ADC level */ + 0x00, /* 35 MIC1 level */ + 0x00, /* 36 MIC2 level */ + 0x00, /* 37 INA level */ + 0x00, /* 38 INB level */ + 0x00, /* 39 left HP volume */ + 0x00, /* 3A right HP volume */ + 0x00, /* 3B left REC volume */ + 0x00, /* 3C right REC volume */ + 0x00, /* 3D left SPK volume */ + 0x00, /* 3E right SPK volume */ + 0x00, /* 3F MIC config */ + + 0x00, /* 40 MIC threshold */ + 0x00, /* 41 excursion limiter filter */ + 0x00, /* 42 excursion limiter threshold */ + 0x00, /* 43 ALC */ + 0x00, /* 44 power limiter threshold */ + 0x00, /* 45 power limiter config */ + 0x00, /* 46 distortion limiter config */ + 0x00, /* 47 audio input */ + 0x00, /* 48 microphone */ + 0x00, /* 49 level control */ + 0x00, /* 4A bypass switches */ + 0x00, /* 4B jack detect */ + 0x00, /* 4C input enable */ + 0x00, /* 4D output enable */ + 0xF0, /* 4E bias control */ + 0x00, /* 4F DAC power */ + + 0x0F, /* 50 DAC power */ + 0x00, /* 51 system */ + 0x00, /* 52 DAI1 EQ1 */ + 0x00, /* 53 DAI1 EQ1 */ + 0x00, /* 54 DAI1 EQ1 */ + 0x00, /* 55 DAI1 EQ1 */ + 0x00, /* 56 DAI1 EQ1 */ + 0x00, /* 57 DAI1 EQ1 */ + 0x00, /* 58 DAI1 EQ1 */ + 0x00, /* 59 DAI1 EQ1 */ + 0x00, /* 5A DAI1 EQ1 */ + 0x00, /* 5B DAI1 EQ1 */ + 0x00, /* 5C DAI1 EQ2 */ + 0x00, /* 5D DAI1 EQ2 */ + 0x00, /* 5E DAI1 EQ2 */ + 0x00, /* 5F DAI1 EQ2 */ + + 0x00, /* 60 DAI1 EQ2 */ + 0x00, /* 61 DAI1 EQ2 */ + 0x00, /* 62 DAI1 EQ2 */ + 0x00, /* 63 DAI1 EQ2 */ + 0x00, /* 64 DAI1 EQ2 */ + 0x00, /* 65 DAI1 EQ2 */ + 0x00, /* 66 DAI1 EQ3 */ + 0x00, /* 67 DAI1 EQ3 */ + 0x00, /* 68 DAI1 EQ3 */ + 0x00, /* 69 DAI1 EQ3 */ + 0x00, /* 6A DAI1 EQ3 */ + 0x00, /* 6B DAI1 EQ3 */ + 0x00, /* 6C DAI1 EQ3 */ + 0x00, /* 6D DAI1 EQ3 */ + 0x00, /* 6E DAI1 EQ3 */ + 0x00, /* 6F DAI1 EQ3 */ + + 0x00, /* 70 DAI1 EQ4 */ + 0x00, /* 71 DAI1 EQ4 */ + 0x00, /* 72 DAI1 EQ4 */ + 0x00, /* 73 DAI1 EQ4 */ + 0x00, /* 74 DAI1 EQ4 */ + 0x00, /* 75 DAI1 EQ4 */ + 0x00, /* 76 DAI1 EQ4 */ + 0x00, /* 77 DAI1 EQ4 */ + 0x00, /* 78 DAI1 EQ4 */ + 0x00, /* 79 DAI1 EQ4 */ + 0x00, /* 7A DAI1 EQ5 */ + 0x00, /* 7B DAI1 EQ5 */ + 0x00, /* 7C DAI1 EQ5 */ + 0x00, /* 7D DAI1 EQ5 */ + 0x00, /* 7E DAI1 EQ5 */ + 0x00, /* 7F DAI1 EQ5 */ + + 0x00, /* 80 DAI1 EQ5 */ + 0x00, /* 81 DAI1 EQ5 */ + 0x00, /* 82 DAI1 EQ5 */ + 0x00, /* 83 DAI1 EQ5 */ + 0x00, /* 84 DAI2 EQ1 */ + 0x00, /* 85 DAI2 EQ1 */ + 0x00, /* 86 DAI2 EQ1 */ + 0x00, /* 87 DAI2 EQ1 */ + 0x00, /* 88 DAI2 EQ1 */ + 0x00, /* 89 DAI2 EQ1 */ + 0x00, /* 8A DAI2 EQ1 */ + 0x00, /* 8B DAI2 EQ1 */ + 0x00, /* 8C DAI2 EQ1 */ + 0x00, /* 8D DAI2 EQ1 */ + 0x00, /* 8E DAI2 EQ2 */ + 0x00, /* 8F DAI2 EQ2 */ + + 0x00, /* 90 DAI2 EQ2 */ + 0x00, /* 91 DAI2 EQ2 */ + 0x00, /* 92 DAI2 EQ2 */ + 0x00, /* 93 DAI2 EQ2 */ + 0x00, /* 94 DAI2 EQ2 */ + 0x00, /* 95 DAI2 EQ2 */ + 0x00, /* 96 DAI2 EQ2 */ + 0x00, /* 97 DAI2 EQ2 */ + 0x00, /* 98 DAI2 EQ3 */ + 0x00, /* 99 DAI2 EQ3 */ + 0x00, /* 9A DAI2 EQ3 */ + 0x00, /* 9B DAI2 EQ3 */ + 0x00, /* 9C DAI2 EQ3 */ + 0x00, /* 9D DAI2 EQ3 */ + 0x00, /* 9E DAI2 EQ3 */ + 0x00, /* 9F DAI2 EQ3 */ + + 0x00, /* A0 DAI2 EQ3 */ + 0x00, /* A1 DAI2 EQ3 */ + 0x00, /* A2 DAI2 EQ4 */ + 0x00, /* A3 DAI2 EQ4 */ + 0x00, /* A4 DAI2 EQ4 */ + 0x00, /* A5 DAI2 EQ4 */ + 0x00, /* A6 DAI2 EQ4 */ + 0x00, /* A7 DAI2 EQ4 */ + 0x00, /* A8 DAI2 EQ4 */ + 0x00, /* A9 DAI2 EQ4 */ + 0x00, /* AA DAI2 EQ4 */ + 0x00, /* AB DAI2 EQ4 */ + 0x00, /* AC DAI2 EQ5 */ + 0x00, /* AD DAI2 EQ5 */ + 0x00, /* AE DAI2 EQ5 */ + 0x00, /* AF DAI2 EQ5 */ + + 0x00, /* B0 DAI2 EQ5 */ + 0x00, /* B1 DAI2 EQ5 */ + 0x00, /* B2 DAI2 EQ5 */ + 0x00, /* B3 DAI2 EQ5 */ + 0x00, /* B4 DAI2 EQ5 */ + 0x00, /* B5 DAI2 EQ5 */ + 0x00, /* B6 DAI1 biquad */ + 0x00, /* B7 DAI1 biquad */ + 0x00, /* B8 DAI1 biquad */ + 0x00, /* B9 DAI1 biquad */ + 0x00, /* BA DAI1 biquad */ + 0x00, /* BB DAI1 biquad */ + 0x00, /* BC DAI1 biquad */ + 0x00, /* BD DAI1 biquad */ + 0x00, /* BE DAI1 biquad */ + 0x00, /* BF DAI1 biquad */ + + 0x00, /* C0 DAI2 biquad */ + 0x00, /* C1 DAI2 biquad */ + 0x00, /* C2 DAI2 biquad */ + 0x00, /* C3 DAI2 biquad */ + 0x00, /* C4 DAI2 biquad */ + 0x00, /* C5 DAI2 biquad */ + 0x00, /* C6 DAI2 biquad */ + 0x00, /* C7 DAI2 biquad */ + 0x00, /* C8 DAI2 biquad */ + 0x00, /* C9 DAI2 biquad */ + 0x00, /* CA */ + 0x00, /* CB */ + 0x00, /* CC */ + 0x00, /* CD */ + 0x00, /* CE */ + 0x00, /* CF */ + + 0x00, /* D0 */ + 0x00, /* D1 */ + 0x00, /* D2 */ + 0x00, /* D3 */ + 0x00, /* D4 */ + 0x00, /* D5 */ + 0x00, /* D6 */ + 0x00, /* D7 */ + 0x00, /* D8 */ + 0x00, /* D9 */ + 0x00, /* DA */ + 0x70, /* DB */ + 0x00, /* DC */ + 0x00, /* DD */ + 0x00, /* DE */ + 0x00, /* DF */ + + 0x00, /* E0 */ + 0x00, /* E1 */ + 0x00, /* E2 */ + 0x00, /* E3 */ + 0x00, /* E4 */ + 0x00, /* E5 */ + 0x00, /* E6 */ + 0x00, /* E7 */ + 0x00, /* E8 */ + 0x00, /* E9 */ + 0x00, /* EA */ + 0x00, /* EB */ + 0x00, /* EC */ + 0x00, /* ED */ + 0x00, /* EE */ + 0x00, /* EF */ + + 0x00, /* F0 */ + 0x00, /* F1 */ + 0x00, /* F2 */ + 0x00, /* F3 */ + 0x00, /* F4 */ + 0x00, /* F5 */ + 0x00, /* F6 */ + 0x00, /* F7 */ + 0x00, /* F8 */ + 0x00, /* F9 */ + 0x00, /* FA */ + 0x00, /* FB */ + 0x00, /* FC */ + 0x00, /* FD */ + 0x00, /* FE */ + 0x00, /* FF */ +}; + +static struct { + int readable; + int writable; + int vol; +} max98088_access[M98088_REG_CNT] = { + { 0xFF, 0xFF, 1 }, /* 00 IRQ status */ + { 0xFF, 0x00, 1 }, /* 01 MIC status */ + { 0xFF, 0x00, 1 }, /* 02 jack status */ + { 0x1F, 0x1F, 1 }, /* 03 battery voltage */ + { 0xFF, 0xFF, 0 }, /* 04 */ + { 0xFF, 0xFF, 0 }, /* 05 */ + { 0xFF, 0xFF, 0 }, /* 06 */ + { 0xFF, 0xFF, 0 }, /* 07 */ + { 0xFF, 0xFF, 0 }, /* 08 */ + { 0xFF, 0xFF, 0 }, /* 09 */ + { 0xFF, 0xFF, 0 }, /* 0A */ + { 0xFF, 0xFF, 0 }, /* 0B */ + { 0xFF, 0xFF, 0 }, /* 0C */ + { 0xFF, 0xFF, 0 }, /* 0D */ + { 0xFF, 0xFF, 0 }, /* 0E */ + { 0xFF, 0xFF, 0 }, /* 0F interrupt enable */ + + { 0xFF, 0xFF, 0 }, /* 10 master clock */ + { 0xFF, 0xFF, 0 }, /* 11 DAI1 clock mode */ + { 0xFF, 0xFF, 0 }, /* 12 DAI1 clock control */ + { 0xFF, 0xFF, 0 }, /* 13 DAI1 clock control */ + { 0xFF, 0xFF, 0 }, /* 14 DAI1 format */ + { 0xFF, 0xFF, 0 }, /* 15 DAI1 clock */ + { 0xFF, 0xFF, 0 }, /* 16 DAI1 config */ + { 0xFF, 0xFF, 0 }, /* 17 DAI1 TDM */ + { 0xFF, 0xFF, 0 }, /* 18 DAI1 filters */ + { 0xFF, 0xFF, 0 }, /* 19 DAI2 clock mode */ + { 0xFF, 0xFF, 0 }, /* 1A DAI2 clock control */ + { 0xFF, 0xFF, 0 }, /* 1B DAI2 clock control */ + { 0xFF, 0xFF, 0 }, /* 1C DAI2 format */ + { 0xFF, 0xFF, 0 }, /* 1D DAI2 clock */ + { 0xFF, 0xFF, 0 }, /* 1E DAI2 config */ + { 0xFF, 0xFF, 0 }, /* 1F DAI2 TDM */ + + { 0xFF, 0xFF, 0 }, /* 20 DAI2 filters */ + { 0xFF, 0xFF, 0 }, /* 21 data config */ + { 0xFF, 0xFF, 0 }, /* 22 DAC mixer */ + { 0xFF, 0xFF, 0 }, /* 23 left ADC mixer */ + { 0xFF, 0xFF, 0 }, /* 24 right ADC mixer */ + { 0xFF, 0xFF, 0 }, /* 25 left HP mixer */ + { 0xFF, 0xFF, 0 }, /* 26 right HP mixer */ + { 0xFF, 0xFF, 0 }, /* 27 HP control */ + { 0xFF, 0xFF, 0 }, /* 28 left REC mixer */ + { 0xFF, 0xFF, 0 }, /* 29 right REC mixer */ + { 0xFF, 0xFF, 0 }, /* 2A REC control */ + { 0xFF, 0xFF, 0 }, /* 2B left SPK mixer */ + { 0xFF, 0xFF, 0 }, /* 2C right SPK mixer */ + { 0xFF, 0xFF, 0 }, /* 2D SPK control */ + { 0xFF, 0xFF, 0 }, /* 2E sidetone */ + { 0xFF, 0xFF, 0 }, /* 2F DAI1 playback level */ + + { 0xFF, 0xFF, 0 }, /* 30 DAI1 playback level */ + { 0xFF, 0xFF, 0 }, /* 31 DAI2 playback level */ + { 0xFF, 0xFF, 0 }, /* 32 DAI2 playbakc level */ + { 0xFF, 0xFF, 0 }, /* 33 left ADC level */ + { 0xFF, 0xFF, 0 }, /* 34 right ADC level */ + { 0xFF, 0xFF, 0 }, /* 35 MIC1 level */ + { 0xFF, 0xFF, 0 }, /* 36 MIC2 level */ + { 0xFF, 0xFF, 0 }, /* 37 INA level */ + { 0xFF, 0xFF, 0 }, /* 38 INB level */ + { 0xFF, 0xFF, 0 }, /* 39 left HP volume */ + { 0xFF, 0xFF, 0 }, /* 3A right HP volume */ + { 0xFF, 0xFF, 0 }, /* 3B left REC volume */ + { 0xFF, 0xFF, 0 }, /* 3C right REC volume */ + { 0xFF, 0xFF, 0 }, /* 3D left SPK volume */ + { 0xFF, 0xFF, 0 }, /* 3E right SPK volume */ + { 0xFF, 0xFF, 0 }, /* 3F MIC config */ + + { 0xFF, 0xFF, 0 }, /* 40 MIC threshold */ + { 0xFF, 0xFF, 0 }, /* 41 excursion limiter filter */ + { 0xFF, 0xFF, 0 }, /* 42 excursion limiter threshold */ + { 0xFF, 0xFF, 0 }, /* 43 ALC */ + { 0xFF, 0xFF, 0 }, /* 44 power limiter threshold */ + { 0xFF, 0xFF, 0 }, /* 45 power limiter config */ + { 0xFF, 0xFF, 0 }, /* 46 distortion limiter config */ + { 0xFF, 0xFF, 0 }, /* 47 audio input */ + { 0xFF, 0xFF, 0 }, /* 48 microphone */ + { 0xFF, 0xFF, 0 }, /* 49 level control */ + { 0xFF, 0xFF, 0 }, /* 4A bypass switches */ + { 0xFF, 0xFF, 0 }, /* 4B jack detect */ + { 0xFF, 0xFF, 0 }, /* 4C input enable */ + { 0xFF, 0xFF, 0 }, /* 4D output enable */ + { 0xFF, 0xFF, 0 }, /* 4E bias control */ + { 0xFF, 0xFF, 0 }, /* 4F DAC power */ + + { 0xFF, 0xFF, 0 }, /* 50 DAC power */ + { 0xFF, 0xFF, 0 }, /* 51 system */ + { 0xFF, 0xFF, 0 }, /* 52 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 53 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 54 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 55 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 56 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 57 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 58 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 59 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 5A DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 5B DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 5C DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 5D DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 5E DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 5F DAI1 EQ2 */ + + { 0xFF, 0xFF, 0 }, /* 60 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 61 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 62 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 63 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 64 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 65 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 66 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 67 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 68 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 69 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6A DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6B DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6C DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6D DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6E DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6F DAI1 EQ3 */ + + { 0xFF, 0xFF, 0 }, /* 70 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 71 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 72 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 73 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 74 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 75 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 76 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 77 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 78 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 79 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 7A DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7B DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7C DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7D DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7E DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7F DAI1 EQ5 */ + + { 0xFF, 0xFF, 0 }, /* 80 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 81 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 82 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 83 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 84 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 85 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 86 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 87 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 88 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 89 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8A DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8B DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8C DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8D DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8E DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 8F DAI2 EQ2 */ + + { 0xFF, 0xFF, 0 }, /* 90 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 91 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 92 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 93 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 94 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 95 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 96 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 97 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 98 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 99 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9A DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9B DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9C DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9D DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9E DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9F DAI2 EQ3 */ + + { 0xFF, 0xFF, 0 }, /* A0 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* A1 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* A2 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A3 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A4 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A5 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A6 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A7 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A8 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A9 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* AA DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* AB DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* AC DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* AD DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* AE DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* AF DAI2 EQ5 */ + + { 0xFF, 0xFF, 0 }, /* B0 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B1 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B2 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B3 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B4 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B5 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B6 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* B7 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* B8 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* B9 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BA DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BB DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BC DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BD DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BE DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BF DAI1 biquad */ + + { 0xFF, 0xFF, 0 }, /* C0 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C1 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C2 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C3 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C4 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C5 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C6 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C7 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C8 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C9 DAI2 biquad */ + { 0x00, 0x00, 0 }, /* CA */ + { 0x00, 0x00, 0 }, /* CB */ + { 0x00, 0x00, 0 }, /* CC */ + { 0x00, 0x00, 0 }, /* CD */ + { 0x00, 0x00, 0 }, /* CE */ + { 0x00, 0x00, 0 }, /* CF */ + + { 0x00, 0x00, 0 }, /* D0 */ + { 0x00, 0x00, 0 }, /* D1 */ + { 0x00, 0x00, 0 }, /* D2 */ + { 0x00, 0x00, 0 }, /* D3 */ + { 0x00, 0x00, 0 }, /* D4 */ + { 0x00, 0x00, 0 }, /* D5 */ + { 0x00, 0x00, 0 }, /* D6 */ + { 0x00, 0x00, 0 }, /* D7 */ + { 0x00, 0x00, 0 }, /* D8 */ + { 0x00, 0x00, 0 }, /* D9 */ + { 0x00, 0x00, 0 }, /* DA */ + { 0x00, 0x00, 0 }, /* DB */ + { 0x00, 0x00, 0 }, /* DC */ + { 0x00, 0x00, 0 }, /* DD */ + { 0x00, 0x00, 0 }, /* DE */ + { 0x00, 0x00, 0 }, /* DF */ + + { 0x00, 0x00, 0 }, /* E0 */ + { 0x00, 0x00, 0 }, /* E1 */ + { 0x00, 0x00, 0 }, /* E2 */ + { 0x00, 0x00, 0 }, /* E3 */ + { 0x00, 0x00, 0 }, /* E4 */ + { 0x00, 0x00, 0 }, /* E5 */ + { 0x00, 0x00, 0 }, /* E6 */ + { 0x00, 0x00, 0 }, /* E7 */ + { 0x00, 0x00, 0 }, /* E8 */ + { 0x00, 0x00, 0 }, /* E9 */ + { 0x00, 0x00, 0 }, /* EA */ + { 0x00, 0x00, 0 }, /* EB */ + { 0x00, 0x00, 0 }, /* EC */ + { 0x00, 0x00, 0 }, /* ED */ + { 0x00, 0x00, 0 }, /* EE */ + { 0x00, 0x00, 0 }, /* EF */ + + { 0x00, 0x00, 0 }, /* F0 */ + { 0x00, 0x00, 0 }, /* F1 */ + { 0x00, 0x00, 0 }, /* F2 */ + { 0x00, 0x00, 0 }, /* F3 */ + { 0x00, 0x00, 0 }, /* F4 */ + { 0x00, 0x00, 0 }, /* F5 */ + { 0x00, 0x00, 0 }, /* F6 */ + { 0x00, 0x00, 0 }, /* F7 */ + { 0x00, 0x00, 0 }, /* F8 */ + { 0x00, 0x00, 0 }, /* F9 */ + { 0x00, 0x00, 0 }, /* FA */ + { 0x00, 0x00, 0 }, /* FB */ + { 0x00, 0x00, 0 }, /* FC */ + { 0x00, 0x00, 0 }, /* FD */ + { 0x00, 0x00, 0 }, /* FE */ + { 0xFF, 0x00, 1 }, /* FF */ +}; + +static int max98088_volatile_register(unsigned int reg) +{ + return max98088_access[reg].vol; +} + +static int max98088_hw_write(struct snd_soc_codec *codec, unsigned int reg, + unsigned int value) +{ + u8 data[2]; + + data[0] = reg; + data[1] = value; + if (codec->hw_write(codec->control_data, data, 2) == 2) + return 0; + else + return -EIO; +} + +/* + * For kernels compiled without unsigned long long int division + */ +unsigned long long int ulldiv(unsigned long long int dividend, + unsigned long long int divisor) +{ + unsigned long long int quotient = 0; + int shift = 1; + + BUG_ON(divisor == 0); + + /* Result is 1.0 if divisor and dividend are equal */ + if (divisor == dividend) + return 1; + + /* Normalize divisor */ + while (!(divisor & 0x8000000000000000ULL)) { + divisor <<= 1; + ++shift; + } + + /* Shift and subtract */ + while (shift--) { + quotient <<= 1; + + if (divisor <= dividend) { + dividend -= divisor; + ++quotient; + } + divisor >>= 1; + } + + /* Round up */ + if (dividend > divisor) + ++quotient; + + return quotient; +} + +#define INA1_PGA_BIT 0x01 +#define INA2_PGA_BIT 0x02 +#define INB1_PGA_BIT 0x04 +#define INB2_PGA_BIT 0x08 +/* + * The INx1 and INx2 PGAs share a power control signal. + * This function OR's the two power events to keep an unpowered INx + * from turning off it's counterpart. + * The control names are used to identify the PGA. + */ +static int max98088_pga_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct max98088_priv *max98088 = codec->private_data; + u8 *state = &max98088->power_state; + unsigned int val; + unsigned int pga; + unsigned int mask; + + BUG_ON(w->reg != M98088_REG_4C_PWR_EN_IN); + + if (strncmp(w->name, "INA1", 4) == 0) { + pga = INA1_PGA_BIT; + mask = INA1_PGA_BIT | INA2_PGA_BIT; + } else if (strncmp(w->name, "INA2", 4) == 0) { + pga = INA2_PGA_BIT; + mask = INA1_PGA_BIT | INA2_PGA_BIT; + } else if (strncmp(w->name, "INB1", 4) == 0) { + pga = INB1_PGA_BIT; + mask = INB1_PGA_BIT | INB2_PGA_BIT; + } else if (strncmp(w->name, "INB2", 4) == 0) { + pga = INB2_PGA_BIT; + mask = INB1_PGA_BIT | INB2_PGA_BIT; + } else { + return -EINVAL; + } + + if (event == SND_SOC_DAPM_POST_PMU) { + /* ON */ + *state |= pga; + + /* Turn on, avoiding unnecessary writes */ + val = snd_soc_read(codec, w->reg); + if (!(val & (1 << w->shift))) { + val |= (1 << w->shift); + snd_soc_write(codec, w->reg, val); + } + } else if (event == SND_SOC_DAPM_POST_PMD) { + /* OFF */ + *state &= ~pga; + + /* Turn off if both are off, avoiding unnecessary writes */ + if (!(*state & mask)) { + val = snd_soc_read(codec, w->reg); + if (val & (1 << w->shift)) { + val &= ~(1 << w->shift); + snd_soc_write(codec, w->reg, val); + } + } + } else { + return -EINVAL; + } + + return 0; +} + +/* + * Load equalizer DSP coefficient configurations registers + */ +void m98088_eq_band(struct snd_soc_codec *codec, unsigned int dai, + unsigned int band, u16 *coefs) +{ + unsigned int eq_reg; + unsigned int i; + + BUG_ON(band > 4); + BUG_ON(dai > 1); + + /* Load the base register address */ + eq_reg = dai ? M98088_REG_84_DAI2_EQ_BASE : M98088_REG_52_DAI1_EQ_BASE; + + /* Add the band address offset, note adjustment for word address */ + eq_reg += band * (M98088_COEFS_PER_BAND << 1); + + /* Step through the registers and coefs */ + for (i = 0; i < M98088_COEFS_PER_BAND; i++) { + snd_soc_write(codec, eq_reg++, M98088_BYTE1(coefs[i])); + snd_soc_write(codec, eq_reg++, M98088_BYTE0(coefs[i])); + } + + return; +} + +/* + * Excursion limiter modes + */ +static const char *max98088_ex_mode[] = { + "Off", + "100Hz", + "400Hz", + "600Hz", + "800Hz", + "1000Hz", + "200-400Hz", + "400-600Hz", + "400-800Hz", +}; + +static const unsigned int ex_mode_table[] = { + 0x00, /* disabled */ + (0<<4)|3, /* 100Hz */ + (1<<4)|0, /* 400Hz */ + (2<<4)|0, /* 600Hz */ + (3<<4)|0, /* 800Hz */ + (4<<4)|0, /* 1000Hz */ + (1<<4)|1, /* 200-400Hz */ + (2<<4)|2, /* 400-600Hz */ + (3<<4)|2, /* 400-800Hz */ +}; + +static const struct soc_enum max98088_ex_mode_enum[] = { + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(max98088_ex_mode), max98088_ex_mode), +}; + +static int max98088_ex_mode_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->ex_mode; + int sel = ucontrol->value.integer.value[0]; + + if (sel >= ARRAY_SIZE(ex_mode_table)) + return -EINVAL; + + *mode = ucontrol->value.integer.value[0]; + snd_soc_write(codec, M98088_REG_41_SPKDHP, + ex_mode_table[*mode]); + + return 0; +} + +static int max98088_ex_mode_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->ex_mode; + + ucontrol->value.integer.value[0] = *mode; + return 0; +} + +static const char *max98088_ex_thresh[] = { /* volts PP */ + "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; +static const struct soc_enum max98088_ex_thresh_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_42_SPKDHP_THRESH, 0, 8, + max98088_ex_thresh), +}; + +static const char *max98088_fltr_mode[] = {"Voice", "Music" }; +static const struct soc_enum max98088_filter_mode_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 7, 2, max98088_fltr_mode), +}; + +static const char *max98088_dai1_fltr[] = { + "Off", "fc=258/fs=16k", "fc=500/fs=16k", + "fc=258/fs=8k", "fc=500/fs=8k", "fc=200"}; +static const struct soc_enum max98088_dai1_dac_filter_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 0, 6, max98088_dai1_fltr), +}; +static const struct soc_enum max98088_dai1_adc_filter_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 4, 6, max98088_dai1_fltr), +}; + +static const char *max98088_micpre[] = { + "0dB", + "20dB", + "30dB", +}; + +static const struct soc_enum max98088_micpre_enum[] = { + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(max98088_micpre), max98088_micpre), +}; + +static const char *max98088_extmic[] = { + "Off", + "MIC1", + "MIC2", +}; + +static const struct soc_enum max98088_extmic_enum[] = { + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(max98088_extmic), max98088_extmic), +}; + +static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->mic1pre; + int sel = ucontrol->value.integer.value[0]; + + if (sel >= ARRAY_SIZE(max98088_micpre)) + return -EINVAL; + + *mode = ucontrol->value.integer.value[0]; + return 0; +} + +static int max98088_mic1pre_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->mic1pre; + + ucontrol->value.integer.value[0] = *mode; + return 0; +} + +static int max98088_mic2pre_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->mic2pre; + int sel = ucontrol->value.integer.value[0]; + + if (sel >= ARRAY_SIZE(max98088_micpre)) + return -EINVAL; + + *mode = ucontrol->value.integer.value[0]; + return 0; +} + +static int max98088_mic2pre_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->mic2pre; + + ucontrol->value.integer.value[0] = *mode; + return 0; +} + +static int max98088_extmic_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->extmic_mode; + int sel = ucontrol->value.integer.value[0]; + + if (sel >= ARRAY_SIZE(max98088_extmic)) + return -EINVAL; + + *mode = sel; + snd_soc_update_bits(codec, M98088_REG_48_CFG_MIC, + M98088_EXTMIC_MASK, sel); + + return 0; +} + +static int max98088_extmic_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->extmic_mode; + + ucontrol->value.integer.value[0] = *mode; + return 0; +} + +static const struct snd_kcontrol_new max98088_snd_controls[] = { + + /* Analog outputs */ + + SOC_DOUBLE_R("Headphone Volume", M98088_REG_39_LVL_HP_L, + M98088_REG_3A_LVL_HP_R, 0, 31, 0), + SOC_DOUBLE_R("Speaker Volume", M98088_REG_3D_LVL_SPK_L, + M98088_REG_3E_LVL_SPK_R, 0, 31, 0), + SOC_DOUBLE_R("Receiver Volume", M98088_REG_3B_LVL_REC_L, + M98088_REG_3C_LVL_REC_R, 0, 31, 0), + + SOC_DOUBLE_R("Headphone Switch", M98088_REG_39_LVL_HP_L, + M98088_REG_3A_LVL_HP_R, 7, 1, 1), + SOC_DOUBLE_R("Speaker Switch", M98088_REG_3D_LVL_SPK_L, + M98088_REG_3E_LVL_SPK_R, 7, 1, 1), + SOC_DOUBLE_R("Receiver Switch", M98088_REG_3B_LVL_REC_L, + M98088_REG_3C_LVL_REC_R, 7, 1, 1), + + /* Analog inputs */ + + SOC_SINGLE("MIC1 Volume", M98088_REG_35_LVL_MIC1, 0, 31, 1), + SOC_SINGLE("MIC2 Volume", M98088_REG_36_LVL_MIC2, 0, 31, 1), + + SOC_ENUM_EXT("MIC1 Boost Volume", max98088_micpre_enum, + max98088_mic1pre_get, max98088_mic1pre_set), + + SOC_ENUM_EXT("MIC2 Boost Volume", max98088_micpre_enum, + max98088_mic2pre_get, max98088_mic2pre_set), + + SOC_ENUM_EXT("Ext MIC Switch", max98088_extmic_enum, + max98088_extmic_get, max98088_extmic_set), + + SOC_SINGLE("INA Volume", M98088_REG_37_LVL_INA, 0, 7, 1), + SOC_SINGLE("INB Volume", M98088_REG_38_LVL_INB, 0, 7, 1), + + /* ADC input digital gains and volume controls */ + + SOC_SINGLE("ADCL Volume", M98088_REG_33_LVL_ADC_L, 0, 15, 0), + SOC_SINGLE("ADCR Volume", M98088_REG_34_LVL_ADC_R, 0, 15, 0), + + SOC_SINGLE("ADCL Boost Volume", M98088_REG_33_LVL_ADC_L, 4, 3, 0), + SOC_SINGLE("ADCR Boost Volume", M98088_REG_34_LVL_ADC_R, 4, 3, 0), + + /* Equalizer */ + + SOC_SINGLE("EQ1 Switch", M98088_REG_49_CFG_LEVEL, 0, 1, 0), + SOC_SINGLE("EQ2 Switch", M98088_REG_49_CFG_LEVEL, 1, 1, 0), + + /* Excursion limiter */ + + SOC_ENUM_EXT("EX Limiter Mode", max98088_ex_mode_enum, + max98088_ex_mode_get, max98088_ex_mode_set), + SOC_ENUM("EX Limiter Threshold", max98088_ex_thresh_enum), + + /* Voice/music filters */ + + SOC_ENUM("DAI1 Filter Mode", max98088_filter_mode_enum), + SOC_ENUM("DAI1 DAC Filter", max98088_dai1_dac_filter_enum), + SOC_ENUM("DAI1 ADC Filter", max98088_dai1_adc_filter_enum), + SOC_SINGLE("DAI2 DC Block Switch", M98088_REG_20_DAI2_FILTERS, + 0, 1, 0), + + /* Automatic level control (for both DAI1/DAI2) */ + + SOC_SINGLE("ALC Switch", M98088_REG_43_SPKALC_COMP, 7, 1, 0), + SOC_SINGLE("ALC Threshold", M98088_REG_43_SPKALC_COMP, 0, 7, 0), + SOC_SINGLE("ALC Multiband", M98088_REG_43_SPKALC_COMP, 3, 1, 0), + SOC_SINGLE("ALC Release Time", M98088_REG_43_SPKALC_COMP, 4, 7, 0), + + /* Power limiter */ + + SOC_SINGLE("PWR Limiter Threshold", M98088_REG_44_PWRLMT_CFG, + 4, 15, 0), + SOC_SINGLE("PWR Limiter Weight", M98088_REG_44_PWRLMT_CFG, 0, 7, 0), + SOC_SINGLE("PWR Limiter Time1", M98088_REG_45_PWRLMT_TIME, 0, 15, 0), + SOC_SINGLE("PWR Limiter Time2", M98088_REG_45_PWRLMT_TIME, 4, 15, 0), + + /* THD distortion limiter */ + + SOC_SINGLE("THD Limiter Threshold", M98088_REG_46_THDLMT_CFG, 4, 15, 0), + SOC_SINGLE("THD Limiter Time", M98088_REG_46_THDLMT_CFG, 0, 7, 0), +}; + +/* Left speaker mixer switch */ +static const struct snd_kcontrol_new max98088_left_speaker_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 4, 1, 0), +}; + +/* Right speaker mixer switch */ +static const struct snd_kcontrol_new max98088_right_speaker_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 4, 1, 0), +}; + +/* Left headphone mixer switch */ +static const struct snd_kcontrol_new max98088_left_hp_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_25_MIX_HP_LEFT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_25_MIX_HP_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_25_MIX_HP_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_25_MIX_HP_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_25_MIX_HP_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_25_MIX_HP_LEFT, 4, 1, 0), +}; + +/* Right headphone mixer switch */ +static const struct snd_kcontrol_new max98088_right_hp_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_26_MIX_HP_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_26_MIX_HP_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_26_MIX_HP_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_26_MIX_HP_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_26_MIX_HP_RIGHT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_26_MIX_HP_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_26_MIX_HP_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_26_MIX_HP_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_26_MIX_HP_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_26_MIX_HP_RIGHT, 4, 1, 0), +}; + +/* Left earpiece/receiver mixer switch */ +static const struct snd_kcontrol_new max98088_left_rec_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_28_MIX_REC_LEFT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_28_MIX_REC_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_28_MIX_REC_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_28_MIX_REC_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_28_MIX_REC_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_28_MIX_REC_LEFT, 4, 1, 0), +}; + +/* Right earpiece/receiver mixer switch */ +static const struct snd_kcontrol_new max98088_right_rec_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_29_MIX_REC_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_29_MIX_REC_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_29_MIX_REC_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_29_MIX_REC_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_29_MIX_REC_RIGHT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_29_MIX_REC_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_29_MIX_REC_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_29_MIX_REC_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_29_MIX_REC_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_29_MIX_REC_RIGHT, 4, 1, 0), +}; + +/* Left ADC mixer switch */ +static const struct snd_kcontrol_new max98088_left_ADC_mixer_controls[] = { + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_23_MIX_ADC_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_23_MIX_ADC_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_23_MIX_ADC_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_23_MIX_ADC_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_23_MIX_ADC_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_23_MIX_ADC_LEFT, 0, 1, 0), +}; + +/* Right ADC mixer switch */ +static const struct snd_kcontrol_new max98088_right_ADC_mixer_controls[] = { + SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_24_MIX_ADC_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_24_MIX_ADC_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_24_MIX_ADC_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INA2 Switch", M98088_REG_24_MIX_ADC_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1 Switch", M98088_REG_24_MIX_ADC_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INB2 Switch", M98088_REG_24_MIX_ADC_RIGHT, 0, 1, 0), +}; + +static int max98088_hp_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + u16 status; + + BUG_ON(event != SND_SOC_DAPM_PRE_PMD); + + /* powering down headphone gracefully */ + status = snd_soc_read(codec, M98088_REG_4D_PWR_EN_OUT); + if ((status & M98088_HPEN) == M98088_HPEN) { + max98088_hw_write(codec, M98088_REG_4D_PWR_EN_OUT, + (status & ~M98088_HPEN)); + } + schedule_timeout(msecs_to_jiffies(20)); + + return 0; +} + +static int max98088_mic_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct max98088_priv *max98088 = codec->private_data; + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + if (w->reg == M98088_REG_35_LVL_MIC1) { + snd_soc_update_bits(codec, w->reg, M98088_MICPRE_MASK, + (1+max98088->mic1pre)<<M98088_MICPRE_SHIFT); + } else { + snd_soc_update_bits(codec, w->reg, M98088_MICPRE_MASK, + (1+max98088->mic2pre)<<M98088_MICPRE_SHIFT); + } + break; + case SND_SOC_DAPM_POST_PMD: + snd_soc_update_bits(codec, w->reg, M98088_MICPRE_MASK, 0); + break; + default: + return -EINVAL; + } + + return 0; +} + +/* DAPM widgets top level */ +static const struct snd_soc_dapm_widget max98088_dapm_widgets[] = { + + SND_SOC_DAPM_ADC("ADCL", "HiFi Capture", M98088_REG_4C_PWR_EN_IN, 1, 0), + SND_SOC_DAPM_ADC("ADCR", "HiFi Capture", M98088_REG_4C_PWR_EN_IN, 0, 0), + + SND_SOC_DAPM_DAC("DACL1", "HiFi Playback", + M98088_REG_4D_PWR_EN_OUT, 1, 0), + SND_SOC_DAPM_DAC("DACR1", "HiFi Playback", + M98088_REG_4D_PWR_EN_OUT, 0, 0), + SND_SOC_DAPM_DAC("DACL2", "Aux Playback", + M98088_REG_4D_PWR_EN_OUT, 1, 0), + SND_SOC_DAPM_DAC("DACR2", "Aux Playback", + M98088_REG_4D_PWR_EN_OUT, 0, 0), + + SND_SOC_DAPM_PGA_E("HP Left Out", M98088_REG_4D_PWR_EN_OUT, + 7, 0, NULL, 0, max98088_hp_event, SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_PGA_E("HP Right Out", M98088_REG_4D_PWR_EN_OUT, + 6, 0, NULL, 0, max98088_hp_event, SND_SOC_DAPM_PRE_PMD), + + SND_SOC_DAPM_PGA("SPK Left Out", M98088_REG_4D_PWR_EN_OUT, + 5, 0, NULL, 0), + SND_SOC_DAPM_PGA("SPK Right Out", M98088_REG_4D_PWR_EN_OUT, + 4, 0, NULL, 0), + + SND_SOC_DAPM_PGA("REC Left Out", M98088_REG_4D_PWR_EN_OUT, + 3, 0, NULL, 0), + SND_SOC_DAPM_PGA("REC Right Out", M98088_REG_4D_PWR_EN_OUT, + 2, 0, NULL, 0), + + SND_SOC_DAPM_MIXER("Left HP Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_hp_mixer_controls[0], + ARRAY_SIZE(max98088_left_hp_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right HP Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_hp_mixer_controls[0], + ARRAY_SIZE(max98088_right_hp_mixer_controls)), + + SND_SOC_DAPM_MIXER("Left SPK Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_speaker_mixer_controls[0], + ARRAY_SIZE(max98088_left_speaker_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right SPK Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_speaker_mixer_controls[0], + ARRAY_SIZE(max98088_right_speaker_mixer_controls)), + + SND_SOC_DAPM_MIXER("Left REC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_rec_mixer_controls[0], + ARRAY_SIZE(max98088_left_rec_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right REC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_rec_mixer_controls[0], + ARRAY_SIZE(max98088_right_rec_mixer_controls)), + + SND_SOC_DAPM_MIXER("Left ADC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_ADC_mixer_controls[0], + ARRAY_SIZE(max98088_left_ADC_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right ADC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_ADC_mixer_controls[0], + ARRAY_SIZE(max98088_right_ADC_mixer_controls)), + + SND_SOC_DAPM_PGA_E("MIC1 Input", M98088_REG_35_LVL_MIC1, + 5, 0, NULL, 0, max98088_mic_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("MIC2 Input", M98088_REG_36_LVL_MIC2, + 5, 0, NULL, 0, max98088_mic_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("INA1 Input", M98088_REG_4C_PWR_EN_IN, + 7, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("INA2 Input", M98088_REG_4C_PWR_EN_IN, + 7, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("INB1 Input", M98088_REG_4C_PWR_EN_IN, + 6, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("INB2 Input", M98088_REG_4C_PWR_EN_IN, + 6, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_MICBIAS("MICBIAS", M98088_REG_4C_PWR_EN_IN, 3, 0), + + SND_SOC_DAPM_OUTPUT("HPL"), + SND_SOC_DAPM_OUTPUT("HPR"), + SND_SOC_DAPM_OUTPUT("SPKL"), + SND_SOC_DAPM_OUTPUT("SPKR"), + SND_SOC_DAPM_OUTPUT("RECL"), + SND_SOC_DAPM_OUTPUT("RECR"), + + SND_SOC_DAPM_INPUT("MIC1"), + SND_SOC_DAPM_INPUT("MIC2"), + SND_SOC_DAPM_INPUT("INA1"), + SND_SOC_DAPM_INPUT("INA2"), + SND_SOC_DAPM_INPUT("INB1"), + SND_SOC_DAPM_INPUT("INB2"), +}; + +/* DAPM AUDIO_MAP: */ +static const struct snd_soc_dapm_route audio_map[] = { + /* Left headphone output mixer */ + {"Left HP Mixer", "Left DAC1 Switch", "DACL1"}, + {"Left HP Mixer", "Left DAC2 Switch", "DACL2"}, + {"Left HP Mixer", "Right DAC1 Switch", "DACR1"}, + {"Left HP Mixer", "Right DAC2 Switch", "DACR2"}, + {"Left HP Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Left HP Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Left HP Mixer", "INA1 Switch", "INA1 Input"}, + {"Left HP Mixer", "INA2 Switch", "INA2 Input"}, + {"Left HP Mixer", "INB1 Switch", "INB1 Input"}, + {"Left HP Mixer", "INB2 Switch", "INB2 Input"}, + + /* Right headphone output mixer */ + {"Right HP Mixer", "Left DAC1 Switch", "DACL1"}, + {"Right HP Mixer", "Left DAC2 Switch", "DACL2" }, + {"Right HP Mixer", "Right DAC1 Switch", "DACR1"}, + {"Right HP Mixer", "Right DAC2 Switch", "DACR2"}, + {"Right HP Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Right HP Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Right HP Mixer", "INA1 Switch", "INA1 Input"}, + {"Right HP Mixer", "INA2 Switch", "INA2 Input"}, + {"Right HP Mixer", "INB1 Switch", "INB1 Input"}, + {"Right HP Mixer", "INB2 Switch", "INB2 Input"}, + + /* Left speaker output mixer */ + {"Left SPK Mixer", "Left DAC1 Switch", "DACL1"}, + {"Left SPK Mixer", "Left DAC2 Switch", "DACL2"}, + {"Left SPK Mixer", "Right DAC1 Switch", "DACR1"}, + {"Left SPK Mixer", "Right DAC2 Switch", "DACR2"}, + {"Left SPK Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Left SPK Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Left SPK Mixer", "INA1 Switch", "INA1 Input"}, + {"Left SPK Mixer", "INA2 Switch", "INA2 Input"}, + {"Left SPK Mixer", "INB1 Switch", "INB1 Input"}, + {"Left SPK Mixer", "INB2 Switch", "INB2 Input"}, + + /* Right speaker output mixer */ + {"Right SPK Mixer", "Left DAC1 Switch", "DACL1"}, + {"Right SPK Mixer", "Left DAC2 Switch", "DACL2"}, + {"Right SPK Mixer", "Right DAC1 Switch", "DACR1"}, + {"Right SPK Mixer", "Right DAC2 Switch", "DACR2"}, + {"Right SPK Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Right SPK Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Right SPK Mixer", "INA1 Switch", "INA1 Input"}, + {"Right SPK Mixer", "INA2 Switch", "INA2 Input"}, + {"Right SPK Mixer", "INB1 Switch", "INB1 Input"}, + {"Right SPK Mixer", "INB2 Switch", "INB2 Input"}, + + /* Earpiece/Receiver output mixer */ + {"Left REC Mixer", "Left DAC1 Switch", "DACL1"}, + {"Left REC Mixer", "Left DAC2 Switch", "DACL2"}, + {"Left REC Mixer", "Right DAC1 Switch", "DACR1"}, + {"Left REC Mixer", "Right DAC2 Switch", "DACR2"}, + {"Left REC Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Left REC Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Left REC Mixer", "INA1 Switch", "INA1 Input"}, + {"Left REC Mixer", "INA2 Switch", "INA2 Input"}, + {"Left REC Mixer", "INB1 Switch", "INB1 Input"}, + {"Left REC Mixer", "INB2 Switch", "INB2 Input"}, + + /* Earpiece/Receiver output mixer */ + {"Right REC Mixer", "Left DAC1 Switch", "DACL1"}, + {"Right REC Mixer", "Left DAC2 Switch", "DACL2"}, + {"Right REC Mixer", "Right DAC1 Switch", "DACR1"}, + {"Right REC Mixer", "Right DAC2 Switch", "DACR2"}, + {"Right REC Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Right REC Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Right REC Mixer", "INA1 Switch", "INA1 Input"}, + {"Right REC Mixer", "INA2 Switch", "INA2 Input"}, + {"Right REC Mixer", "INB1 Switch", "INB1 Input"}, + {"Right REC Mixer", "INB2 Switch", "INB2 Input"}, + + {"HP Left Out", NULL, "Left HP Mixer"}, + {"HP Right Out", NULL, "Right HP Mixer"}, + {"SPK Left Out", NULL, "Left SPK Mixer"}, + {"SPK Right Out", NULL, "Right SPK Mixer"}, + {"REC Left Out", NULL, "Left REC Mixer"}, + {"REC Right Out", NULL, "Right REC Mixer"}, + + {"HPL", NULL, "HP Left Out"}, + {"HPR", NULL, "HP Right Out"}, + {"SPKL", NULL, "SPK Left Out"}, + {"SPKR", NULL, "SPK Right Out"}, + {"RECL", NULL, "REC Left Out"}, + {"RECR", NULL, "REC Right Out"}, + + /* Left ADC input mixer */ + {"Left ADC Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Left ADC Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Left ADC Mixer", "INA1 Switch", "INA1 Input"}, + {"Left ADC Mixer", "INA2 Switch", "INA2 Input"}, + {"Left ADC Mixer", "INB1 Switch", "INB1 Input"}, + {"Left ADC Mixer", "INB2 Switch", "INB2 Input"}, + + /* Right ADC input mixer */ + {"Right ADC Mixer", "MIC1 Switch", "MIC1 Input"}, + {"Right ADC Mixer", "MIC2 Switch", "MIC2 Input"}, + {"Right ADC Mixer", "INA1 Switch", "INA1 Input"}, + {"Right ADC Mixer", "INA2 Switch", "INA2 Input"}, + {"Right ADC Mixer", "INB1 Switch", "INB1 Input"}, + {"Right ADC Mixer", "INB2 Switch", "INB2 Input"}, + + /* inputs */ + {"ADCL", NULL, "Left ADC Mixer"}, + {"ADCR", NULL, "Right ADC Mixer"}, + {"INA1 Input", NULL, "INA1"}, + {"INA2 Input", NULL, "INA2"}, + {"INB1 Input", NULL, "INB1"}, + {"INB2 Input", NULL, "INB2"}, + {"MIC1 Input", NULL, "MIC1"}, + {"MIC2 Input", NULL, "MIC2"}, +}; + +static int max98088_add_widgets(struct snd_soc_codec *codec) +{ + snd_soc_dapm_new_controls(codec, max98088_dapm_widgets, + ARRAY_SIZE(max98088_dapm_widgets)); + + /* set up audio path interconnects */ + snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); + + snd_soc_dapm_new_widgets(codec); + return 0; +} + +static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + u8 reg15val; + u8 reg14msk = 0; + u8 reg14val = 0; + + cdata = &max98088->dai[0]; + + if (fmt != cdata->fmt) { + cdata->fmt = fmt; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* mask MAS to select slave mode */ + reg14msk |= M98088_DAI_MAS; + /* slave mode PLL */ + snd_soc_write(codec, M98088_REG_12_DAI1_CLKCFG_HI, + 0x80); + snd_soc_write(codec, M98088_REG_13_DAI1_CLKCFG_LO, + 0x00); + break; + case SND_SOC_DAIFMT_CBM_CFM: + /* set to master mode */ + reg14val |= M98088_DAI_MAS; + break; + case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBM_CFS: + default: + dev_err(codec->dev, "Clock mode unsupported"); + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + reg14val |= M98088_DAI_DLY; + break; + case SND_SOC_DAIFMT_LEFT_J: + reg14msk |= M98088_DAI_DLY; + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + reg14msk |= M98088_DAI_BCI|M98088_DAI_WCI; + break; + case SND_SOC_DAIFMT_NB_IF: + reg14msk |= M98088_DAI_BCI; + reg14val |= M98088_DAI_WCI; + break; + case SND_SOC_DAIFMT_IB_NF: + reg14msk |= M98088_DAI_WCI; + reg14val |= M98088_DAI_BCI; + break; + case SND_SOC_DAIFMT_IB_IF: + reg14val |= M98088_DAI_BCI|M98088_DAI_WCI; + break; + default: + return -EINVAL; + } + + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + reg14msk, reg14val); + + reg15val = M98088_DAI_BSEL64; + if (max98088->digmic) + reg15val |= M98088_DAI_OSR64; + snd_soc_write(codec, M98088_REG_15_DAI1_CLOCK, reg15val); + } + + return 0; +} + +static int max98088_dai2_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + u8 reg1Cmsk = 0; + u8 reg1Cval = 0; + + cdata = &max98088->dai[1]; + + if (fmt != cdata->fmt) { + cdata->fmt = fmt; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* mask MAS to select slave mode */ + reg1Cmsk |= M98088_DAI_MAS; + /* slave mode PLL */ + snd_soc_write(codec, M98088_REG_1A_DAI2_CLKCFG_HI, + 0x80); + snd_soc_write(codec, M98088_REG_1B_DAI2_CLKCFG_LO, + 0x00); + break; + case SND_SOC_DAIFMT_CBM_CFM: + /* set to master mode */ + reg1Cval |= M98088_DAI_MAS; + break; + case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBM_CFS: + default: + dev_err(codec->dev, "Clock mode unsupported"); + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + reg1Cval |= M98088_DAI_DLY; + break; + case SND_SOC_DAIFMT_LEFT_J: + reg1Cmsk |= M98088_DAI_DLY; + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + reg1Cmsk |= M98088_DAI_BCI|M98088_DAI_WCI; + break; + case SND_SOC_DAIFMT_NB_IF: + reg1Cmsk |= M98088_DAI_BCI; + reg1Cval |= M98088_DAI_WCI; + break; + case SND_SOC_DAIFMT_IB_NF: + reg1Cmsk |= M98088_DAI_WCI; + reg1Cval |= M98088_DAI_BCI; + break; + case SND_SOC_DAIFMT_IB_IF: + reg1Cval |= M98088_DAI_BCI|M98088_DAI_WCI; + break; + default: + return -EINVAL; + } + + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + reg1Cmsk, reg1Cval); + + snd_soc_write(codec, M98088_REG_1D_DAI2_CLOCK, + M98088_DAI_BSEL64); + } + + return 0; +} + +static int max98088_dai_set_sysclk(struct snd_soc_dai *dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = dai->codec; + struct max98088_priv *max98088 = codec->private_data; + + /* requested clock frequency is already setup */ + if (freq == max98088->sysclk) + return 0; + + max98088->sysclk = freq; /* remember current sysclk */ + + /* setup clocks for slave mode, and using the PLL + * PSCLK = 0x01 (when master clk is 10MHz to 20MHz) + * 0x02 (when master clk is 20MHz to 30MHz).. + */ + if ((freq >= 10000000) && (freq < 20000000)) { + snd_soc_write(codec, M98088_REG_10_SYS_CLK, 0x10); + } else if ((freq >= 20000000) && (freq < 30000000)) { + snd_soc_write(codec, M98088_REG_10_SYS_CLK, 0x20); + } else { + dev_err(codec->dev, "Invalid master clock frequency\n"); + return -EINVAL; + } + + if (snd_soc_read(codec, M98088_REG_51_PWR_SYS) & M98088_SHDNRUN) { + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, + M98088_SHDNRUN, 0); + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, + 0, M98088_SHDNRUN); + } + + dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq); + + max98088->sysclk = freq; + return 0; +} + +/* codec mclk clock divider coefficients */ +static const struct { + u32 rate; + u8 sr; +} rate_table[] = { + {8000, 0x10}, + {11025, 0x20}, + {16000, 0x30}, + {22050, 0x40}, + {24000, 0x50}, + {32000, 0x60}, + {44100, 0x70}, + {48000, 0x80}, + {88200, 0x90}, + {96000, 0xA0}, +}; + +static inline int rate_value(int rate, u8 *value) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(rate_table); i++) { + if (rate_table[i].rate >= rate) { + *value = rate_table[i].sr; + return 0; + } + } + *value = rate_table[0].sr; + return -EINVAL; +} + +/* Setup hw params and sample rate */ +static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_device *socdev = rtd->socdev; + struct snd_soc_codec *codec = socdev->card->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + unsigned int rate; + u8 regval; + u16 ni; + + cdata = &max98088->dai[0]; + + rate = params_rate(params); + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_WS, 0); + break; + case SNDRV_PCM_FORMAT_S24_LE: + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_WS, M98088_DAI_WS); + break; + default: + return -EINVAL; + } + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); + + if (rate != cdata->rate) { + /* set DAI1 SR1 value for the DSP; FREQ1:0=anyclock */ + if (rate_value(rate, &regval)) + return -EINVAL; + + snd_soc_write(codec, M98088_REG_11_DAI1_CLKMODE, regval); + cdata->rate = rate; + } + + /* Configure NI when operating as master */ + if (snd_soc_read(codec, M98088_REG_14_DAI1_FORMAT) + & M98088_DAI_MAS) { + if (max98088->sysclk == 0) + return -EINVAL; + ni = (u16)ulldiv(65536ULL * (rate < 50000 ? 96ULL : 48ULL) + * (unsigned long long int)rate, + (unsigned long long int)max98088->sysclk); + snd_soc_write(codec, M98088_REG_12_DAI1_CLKCFG_HI, + (ni >> 8) & 0x7f); + snd_soc_write(codec, M98088_REG_13_DAI1_CLKCFG_LO, + ni & 0xff); + } + + /* Update sample rate mode */ + if (rate < 50000) + snd_soc_update_bits(codec, M98088_REG_18_DAI1_FILTERS, + M98088_DAI_DHF, 0); + else + snd_soc_update_bits(codec, M98088_REG_18_DAI1_FILTERS, + M98088_DAI_DHF, M98088_DAI_DHF); + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, 0, M98088_SHDNRUN); + + return 0; +} + +/* Setup hw params and sample rate */ +static int max98088_dai2_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_device *socdev = rtd->socdev; + struct snd_soc_codec *codec = socdev->card->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + unsigned int rate; + u8 regval; + u16 ni; + + cdata = &max98088->dai[1]; + + rate = params_rate(params); + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_WS, 0); + break; + case SNDRV_PCM_FORMAT_S24_LE: + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_WS, M98088_DAI_WS); + break; + default: + return -EINVAL; + } + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); + + if (rate != cdata->rate) { + /* set DAI2 SR2 value for the DSP */ + if (rate_value(rate, &regval)) + return -EINVAL; + + snd_soc_write(codec, M98088_REG_19_DAI2_CLKMODE, regval); + cdata->rate = rate; + } + + /* Configure NI when operating as master */ + if (snd_soc_read(codec, M98088_REG_1C_DAI2_FORMAT) + & M98088_DAI_MAS) { + if (max98088->sysclk == 0) + return -EINVAL; + ni = (u16)ulldiv(65536ULL * (rate < 50000 ? 96ULL : 48ULL) + * (unsigned long long int)rate, + (unsigned long long int)max98088->sysclk); + snd_soc_write(codec, M98088_REG_1A_DAI2_CLKCFG_HI, + (ni >> 8) & 0x7f); + snd_soc_write(codec, M98088_REG_1B_DAI2_CLKCFG_LO, + ni & 0xff); + } + + /* Update sample rate mode */ + if (rate < 50000) + snd_soc_update_bits(codec, M98088_REG_20_DAI2_FILTERS, + M98088_DAI_DHF, 0); + else + snd_soc_update_bits(codec, M98088_REG_20_DAI2_FILTERS, + M98088_DAI_DHF, M98088_DAI_DHF); + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, 0, M98088_SHDNRUN); + + return 0; +} + +static void max98088_sync_cache(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + int i; + + if (!codec->cache_sync) + return; + + codec->cache_only = 0; + + /* write back cached values if they're writeable and + * different from the hardware default. + */ + for (i = 1; i < ARRAY_SIZE(max98088->reg_cache); i++) { + if (!max98088_access[i].writable) + continue; + + if (max98088->reg_cache[i] == max98088_reg[i]) + continue; + + snd_soc_write(codec, i, max98088->reg_cache[i]); + } + + codec->cache_sync = 0; +} + +static int max98088_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + switch (level) { + case SND_SOC_BIAS_ON: + break; + + case SND_SOC_BIAS_PREPARE: + break; + + case SND_SOC_BIAS_STANDBY: + max98088_sync_cache(codec); + snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN, + M98088_MBEN, M98088_MBEN); + break; + + case SND_SOC_BIAS_OFF: + snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN, + M98088_MBEN, 0); +#ifdef CONFIG_REGULATOR + codec->cache_sync = 1; +#endif + break; + } + codec->bias_level = level; + return 0; +} + +#define MAX98088_RATES SNDRV_PCM_RATE_8000_96000 +#define MAX98088_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) + +static struct snd_soc_dai_ops max98088_dai1_ops = { + .set_sysclk = max98088_dai_set_sysclk, + .set_fmt = max98088_dai1_set_fmt, + .hw_params = max98088_dai1_hw_params, +}; + +static struct snd_soc_dai_ops max98088_dai2_ops = { + .set_sysclk = max98088_dai_set_sysclk, + .set_fmt = max98088_dai2_set_fmt, + .hw_params = max98088_dai2_hw_params, +}; + +struct snd_soc_dai max98088_dai[] = { +{ + .name = "HiFi", + .playback = { + .stream_name = "HiFi Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MAX98088_RATES, + .formats = MAX98088_FORMATS, + }, + .capture = { + .stream_name = "HiFi Capture", + .channels_min = 1, + .channels_max = 2, + .rates = MAX98088_RATES, + .formats = MAX98088_FORMATS, + }, + .ops = &max98088_dai1_ops, +}, +{ + .name = "Aux", + .playback = { + .stream_name = "Aux Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MAX98088_RATES, + .formats = MAX98088_FORMATS, + }, + .ops = &max98088_dai2_ops, +} +}; +EXPORT_SYMBOL_GPL(max98088_dai); + + +static void max98088_setup_eq1(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_eq_cfg *coef_set; + int best, best_val, save, i, sel, fs; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[0]; + + if (!pdata || !cdata->eq_textcnt) + return; + + /* Find the selected configuration with nearest sample rate */ + fs = cdata->rate; + sel = cdata->eq_sel; + + best = 0; + best_val = INT_MAX; + for (i = 0; i < pdata->eq1_cfgcnt; i++) { + if (strcmp(pdata->eq1_cfg[i].name, cdata->eq_texts[sel]) == 0 && + abs(pdata->eq1_cfg[i].rate - fs) < best_val) { + best = i; + best_val = abs(pdata->eq1_cfg[i].rate - fs); + } + } + + dev_dbg(codec->dev, "Selected %s/%dHz for %dHz sample rate\n", + pdata->eq1_cfg[best].name, + pdata->eq1_cfg[best].rate, fs); + + /* Disable EQ while configuring, and save current on/off state */ + save = snd_soc_read(codec, M98088_REG_49_CFG_LEVEL); + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ1EN, 0); + + coef_set = &pdata->eq1_cfg[sel]; + + m98088_eq_band(codec, 0, 0, coef_set->band1); + m98088_eq_band(codec, 0, 1, coef_set->band2); + m98088_eq_band(codec, 0, 2, coef_set->band3); + m98088_eq_band(codec, 0, 3, coef_set->band4); + m98088_eq_band(codec, 0, 4, coef_set->band5); + + /* restore original on/off state */ + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ1EN, save); +} + +static void max98088_setup_eq2(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_eq_cfg *coef_set; + int best, best_val, save, i, sel, fs; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[1]; + + if (!pdata || !cdata->eq_textcnt) + return; + + /* Find the selected configuration with nearest sample rate */ + fs = cdata->rate; + + sel = cdata->eq_sel; + best = 0; + best_val = INT_MAX; + for (i = 0; i < pdata->eq2_cfgcnt; i++) { + if (strcmp(pdata->eq2_cfg[i].name, cdata->eq_texts[sel]) == 0 && + abs(pdata->eq2_cfg[i].rate - fs) < best_val) { + best = i; + best_val = abs(pdata->eq2_cfg[i].rate - fs); + } + } + + dev_dbg(codec->dev, "Selected %s/%dHz for %dHz sample rate\n", + pdata->eq2_cfg[best].name, + pdata->eq2_cfg[best].rate, fs); + + /* Disable EQ while configuring, and save current on/off state */ + save = snd_soc_read(codec, M98088_REG_49_CFG_LEVEL); + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ2EN, 0); + + coef_set = &pdata->eq2_cfg[sel]; + + m98088_eq_band(codec, 1, 0, coef_set->band1); + m98088_eq_band(codec, 1, 1, coef_set->band2); + m98088_eq_band(codec, 1, 2, coef_set->band3); + m98088_eq_band(codec, 1, 3, coef_set->band4); + m98088_eq_band(codec, 1, 4, coef_set->band5); + + /* restore original on/off state */ + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ2EN, + save); +} + + +static int max98088_put_eq1_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int sel = ucontrol->value.integer.value[0]; + + cdata = &max98088->dai[0]; + + if (sel >= pdata->eq1_cfgcnt) + return -EINVAL; + + cdata->eq_sel = sel; + max98088_setup_eq1(codec); + return 0; +} + +static int max98088_put_eq2_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int sel = ucontrol->value.integer.value[0]; + + cdata = &max98088->dai[1]; + + if (sel >= pdata->eq2_cfgcnt) + return -EINVAL; + + cdata->eq_sel = sel; + max98088_setup_eq2(codec); + return 0; +} + +static int max98088_get_eq1_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[0]; + + ucontrol->value.enumerated.item[0] = cdata->eq_sel; + return 0; +} + +static int max98088_get_eq2_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[1]; + + ucontrol->value.enumerated.item[0] = cdata->eq_sel; + return 0; +} + +static void max98088_handle_eq1_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int ret, i, j; + + struct snd_kcontrol_new eq1control = + SOC_ENUM_EXT("EQ1 Mode", + max98088->dai[0].eq_enum, + max98088_get_eq1_enum, + max98088_put_eq1_enum); + + cdata = &max98088->dai[0]; + + /* Build an array of texts for the enum API. The number + * of texts is likely fewer than the number of configurations + * due to multiple sample rates for the same text name. */ + cdata->eq_textcnt = 0; + for (i = 0; i < pdata->eq1_cfgcnt; i++) { + for (j = 0; j < cdata->eq_textcnt; j++) { + if (strcmp(pdata->eq1_cfg[i].name, + cdata->eq_texts[j]) == 0) { + break; + } + } + + if (j != cdata->eq_textcnt) + continue; + + /* ...and remember the new version. */ + cdata->eq_texts[i] = pdata->eq1_cfg[i].name; + cdata->eq_textcnt++; + + if (cdata->eq_textcnt >= EQ_CFG_MAX) { + dev_err(codec->dev, "Too many EQ config entries\n"); + cdata->eq_textcnt--; + break; + } + } + + dev_dbg(codec->dev, "Installed %d EQ1 configurations\n", + cdata->eq_textcnt); + + /* now point the soc_enum to .texts array items */ + cdata->eq_enum.texts = cdata->eq_texts; + cdata->eq_enum.max = cdata->eq_textcnt; + + BUG_ON(&max98088->codec == 0); + BUG_ON((max98088->codec).card == 0); + + ret = snd_soc_add_controls(&max98088->codec, &eq1control, 1); + if (ret != 0) + dev_err(codec->dev, "Failed to add EQ control: %d\n", ret); +} + +static void max98088_handle_eq2_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int ret, i, j; + + struct snd_kcontrol_new eq2control = + SOC_ENUM_EXT("EQ2 Mode", + max98088->dai[1].eq_enum, + max98088_get_eq2_enum, + max98088_put_eq2_enum); + + cdata = &max98088->dai[1]; + + /* Build an array of texts for the enum API. The number + * of texts is likely fewer than the number of configurations + * due to multiple sample rates for the same text name. */ + cdata->eq_textcnt = 0; + for (i = 0; i < pdata->eq2_cfgcnt; i++) { + for (j = 0; j < cdata->eq_textcnt; j++) { + if (strcmp(pdata->eq2_cfg[i].name, + cdata->eq_texts[j]) == 0) { + break; + } + } + + if (j != cdata->eq_textcnt) + continue; + + cdata->eq_texts[i] = pdata->eq2_cfg[i].name; + cdata->eq_textcnt++; + + if (cdata->eq_textcnt >= EQ_CFG_MAX) { + dev_err(codec->dev, "Too many EQ config entries\n"); + cdata->eq_textcnt--; + break; + } + } + + dev_dbg(codec->dev, "Installed %d EQ2 configurations\n", + cdata->eq_textcnt); + + /* now point the soc_enum to .texts array items */ + cdata->eq_enum.texts = cdata->eq_texts; + cdata->eq_enum.max = cdata->eq_textcnt; + + ret = snd_soc_add_controls(&max98088->codec, &eq2control, 1); + if (ret != 0) + printk(KERN_ERR "Failed to add EQ control: %d\n", ret); +} + +static void max98088_handle_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + u8 regval = 0; + + if (!pdata) + return; + + /* configure mic for analog/digital mic mode */ + if (pdata->digmic_left_mode) + regval |= M98088_DIGMIC_L; + + if (pdata->digmic_right_mode) + regval |= M98088_DIGMIC_R; + + max98088->digmic = (regval ? 1 : 0); + + snd_soc_write(codec, M98088_REG_48_CFG_MIC, regval); + + /* configure receiver output */ + regval = ((pdata->receiver_mode) ? M98088_REC_LINEMODE : 0); + snd_soc_update_bits(codec, M98088_REG_2A_MIC_REC_CNTL, + M98088_REC_LINEMODE_MASK, regval); + + /* configure equalizers */ + if (pdata->eq1_cfgcnt) + max98088_handle_eq1_pdata(max98088); + + if (pdata->eq2_cfgcnt) + max98088_handle_eq2_pdata(max98088); +} + +static int max98088_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + + return 0; +} + +static int max98088_resume(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + int i; + u8 *cache = codec->reg_cache; + + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + + /* Sync reg_cache with the hardware */ + for (i = 0; i < M98088_REG_CNT; i++) { + if (i == M98088_REG_51_PWR_SYS) + continue; + + if (!max98088_access[i].writable) + continue; + + max98088_hw_write(codec, i, cache[i]); + } + + /* now enter into the resume mode bias level */ + max98088_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + + return 0; +} + +/* + * Make sure that a max98088 is attached to the I2C bus. + */ +static int max98088_probe(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec; + struct max98088_priv *max98088; + int ret = 0; + + dev_printk(KERN_INFO, &pdev->dev, "MAX98088 Audio CODEC\n"); + + if (!max98088_codec) { + dev_err(&pdev->dev, "Codec device is not registered\n"); + return -EINVAL; + } + + socdev->card->codec = max98088_codec; + codec = max98088_codec; + max98088 = codec->private_data; + + /* register pcms */ + ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); + if (ret < 0) { + dev_err(&pdev->dev, "failed to create pcms: %d\n", ret); + goto pcm_err; + } + + snd_soc_add_controls(codec, max98088_snd_controls, + ARRAY_SIZE(max98088_snd_controls)); + + /* install additional amixer controls: EQ and excursion limiter */ + if (max98088->pdata) + max98088_handle_pdata(max98088); + else + dev_err(&pdev->dev, "No platform data\n"); + + max98088_add_widgets(codec); + + ret = snd_soc_init_card(socdev); + if (ret < 0) { + dev_err(&pdev->dev, "failed to register card\n"); + goto card_err; + } + + return 0; + +card_err: + snd_soc_free_pcms(socdev); + snd_soc_dapm_free(socdev); + +pcm_err: + return ret; +} + +static int max98088_remove(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + + if (codec->control_data) + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + + snd_soc_free_pcms(socdev); + snd_soc_dapm_free(socdev); + + return 0; +} + +/* expose to machine driver */ +struct snd_soc_codec_device soc_codec_dev_max98088 = { + .probe = max98088_probe, + .remove = max98088_remove, + .suspend = max98088_suspend, + .resume = max98088_resume, +}; +EXPORT_SYMBOL_GPL(soc_codec_dev_max98088); + + +static int max98088_register(struct max98088_priv *max98088, + enum snd_soc_control_type control) + +{ + int ret, i, version; + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_cdata *cdata; + + if (max98088_codec) { + dev_err(codec->dev, "Another MAX98088 is registered\n"); + ret = -EINVAL; + goto err; + } + + mutex_init(&codec->mutex); + INIT_LIST_HEAD(&codec->dapm_widgets); + INIT_LIST_HEAD(&codec->dapm_paths); + + codec->name = "MAX98088"; + codec->owner = THIS_MODULE; + + /* setup DAPM event bias level and handler function */ + codec->bias_level = SND_SOC_BIAS_STANDBY; + codec->set_bias_level = max98088_set_bias_level; + + codec->dai = max98088_dai; + codec->num_dai = ARRAY_SIZE(max98088_dai); + codec->private_data = max98088; + + codec->reg_cache_size = M98088_REG_CNT; + codec->reg_cache = &max98088->reg_cache; + codec->volatile_register = max98088_volatile_register; + codec->cache_sync = 1; + memcpy(codec->reg_cache, max98088_reg, sizeof(max98088_reg)); + + ret = snd_soc_codec_set_cache_io(codec, 8, 8, control); + if (ret != 0) { + dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); + goto err; + } + + version = snd_soc_read(codec, M98088_REG_FF_REV_ID); + dev_dbg(codec->dev, "MAX98088 revision 0x%02X\n", version); + + /* initalize private data */ + + max98088->sysclk = (unsigned)-1; + + cdata = &max98088->dai[0]; + cdata->rate = (unsigned)-1; + cdata->fmt = (unsigned)-1; + cdata->eq_textcnt = 0; + cdata->eq_sel = 0; + + cdata = &max98088->dai[1]; + cdata->rate = (unsigned)-1; + cdata->fmt = (unsigned)-1; + cdata->eq_textcnt = 0; + cdata->eq_sel = 0; + + max98088->power_state = 0; /* INA INB power enable state */ + max98088->ex_mode = 0; /* excursion limiter mode */ + max98088->digmic = 0; /* 0=analog, 1=digital */ + max98088->mic1pre = 0; + max98088->mic2pre = 0; + + snd_soc_write(codec, M98088_REG_51_PWR_SYS, M98088_PWRSV); + + /* initialize registers cache to hardware default */ + max98088_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + + snd_soc_write(codec, M98088_REG_0F_IRQ_ENABLE, 0x00); + + snd_soc_write(codec, M98088_REG_22_MIX_DAC, + M98088_DAI1L_TO_DACL|M98088_DAI2L_TO_DACL| + M98088_DAI1R_TO_DACR|M98088_DAI2R_TO_DACR); + + snd_soc_write(codec, M98088_REG_4E_BIAS_CNTL, 0xF0); + snd_soc_write(codec, M98088_REG_50_DAC_BIAS2, 0x0F); + + snd_soc_write(codec, M98088_REG_16_DAI1_IOCFG, + M98088_S1NORMAL|M98088_SDATA); + + snd_soc_write(codec, M98088_REG_1E_DAI2_IOCFG, + M98088_S2NORMAL|M98088_SDATA); + + /* power on device */ + max98088_codec = codec; + for (i = 0; i < codec->num_dai; i++) + max98088_dai[i].dev = codec->dev; + + ret = snd_soc_register_codec(codec); + if (ret != 0) { + dev_err(codec->dev, "Failed to register codec: %d\n", ret); + goto err; + } + + ret = snd_soc_register_dais(&max98088_dai[0], codec->num_dai); + if (ret != 0) { + dev_err(codec->dev, "Failed to register DAIs: %d\n", ret); + goto err_codec; + } + + return ret; + +err_codec: + snd_soc_unregister_codec(codec); +err: + kfree(max98088); + + return ret; +} + +static void max98088_unregister(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + snd_soc_unregister_dais(max98088_dai, codec->num_dai); + snd_soc_unregister_codec(codec); + kfree(max98088); + max98088_codec = NULL; +} + +static int max98088_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct snd_soc_codec *codec; + struct max98088_priv *max98088; + + max98088 = kzalloc(sizeof(struct max98088_priv), GFP_KERNEL); + if (max98088 == NULL) + return -ENOMEM; + + /* codec structure is inside the private data */ + codec = &(max98088->codec); + codec->hw_write = (hw_write_t) i2c_master_send; + + codec->private_data = max98088; + i2c_set_clientdata(i2c, max98088); + codec->control_data = i2c; + + max98088->pdata = i2c->dev.platform_data; + + codec->dev = &i2c->dev; + + return max98088_register(max98088, SND_SOC_I2C); +} + +static int max98088_i2c_remove(struct i2c_client *client) +{ + struct max98088_priv *max98088 = i2c_get_clientdata(client); + max98088_unregister(max98088); + return 0; +} + +static const struct i2c_device_id max98088_i2c_id[] = { + { "max98088", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, max98088_i2c_id); + + +static struct i2c_driver max98088_i2c_driver = { + .driver = { + .name = "MAX98088 I2C Codec", + .owner = THIS_MODULE, + }, + .probe = max98088_i2c_probe, + .remove = __devexit_p(max98088_i2c_remove), + .id_table = max98088_i2c_id, +}; + +static int __init max98088_init(void) +{ + int ret; + + ret = i2c_add_driver(&max98088_i2c_driver); + if (ret) + pr_err("Failed to register max98088 I2C driver: %d\n", ret); + + return ret; +} + +static void __exit max98088_exit(void) +{ + i2c_del_driver(&max98088_i2c_driver); +} + +module_init(max98088_init); +module_exit(max98088_exit); + +MODULE_DESCRIPTION("ALSA SoC MAX98088 driver"); +MODULE_AUTHOR("Peter Hsiang, Jesse Marroquin"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/max98088.h b/sound/soc/codecs/max98088.h new file mode 100644 index 0000000..bf6fae9 --- /dev/null +++ b/sound/soc/codecs/max98088.h @@ -0,0 +1,193 @@ +/* + * max98088.h -- MAX98088 ALSA SoC Audio driver + * + * Copyright 2010 Maxim Integrated Products + * + * 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. + */ + +#ifndef _MAX98088_H +#define _MAX98088_H + +/* + * MAX98088 Registers Definition + */ +#define M98088_REG_00_IRQ_STATUS 0x00 +#define M98088_REG_01_MIC_STATUS 0x01 +#define M98088_REG_02_JACK_STAUS 0x02 +#define M98088_REG_03_BATTERY_VOLTAGE 0x03 +#define M98088_REG_0F_IRQ_ENABLE 0x0F +#define M98088_REG_10_SYS_CLK 0x10 +#define M98088_REG_11_DAI1_CLKMODE 0x11 +#define M98088_REG_12_DAI1_CLKCFG_HI 0x12 +#define M98088_REG_13_DAI1_CLKCFG_LO 0x13 +#define M98088_REG_14_DAI1_FORMAT 0x14 +#define M98088_REG_15_DAI1_CLOCK 0x15 +#define M98088_REG_16_DAI1_IOCFG 0x16 +#define M98088_REG_17_DAI1_TDM 0x17 +#define M98088_REG_18_DAI1_FILTERS 0x18 +#define M98088_REG_19_DAI2_CLKMODE 0x19 +#define M98088_REG_1A_DAI2_CLKCFG_HI 0x1A +#define M98088_REG_1B_DAI2_CLKCFG_LO 0x1B +#define M98088_REG_1C_DAI2_FORMAT 0x1C +#define M98088_REG_1D_DAI2_CLOCK 0x1D +#define M98088_REG_1E_DAI2_IOCFG 0x1E +#define M98088_REG_1F_DAI2_TDM 0x1F +#define M98088_REG_20_DAI2_FILTERS 0x20 +#define M98088_REG_21_SRC 0x21 +#define M98088_REG_22_MIX_DAC 0x22 +#define M98088_REG_23_MIX_ADC_LEFT 0x23 +#define M98088_REG_24_MIX_ADC_RIGHT 0x24 +#define M98088_REG_25_MIX_HP_LEFT 0x25 +#define M98088_REG_26_MIX_HP_RIGHT 0x26 +#define M98088_REG_27_MIX_HP_CNTL 0x27 +#define M98088_REG_28_MIX_REC_LEFT 0x28 +#define M98088_REG_29_MIX_REC_RIGHT 0x29 +#define M98088_REG_2A_MIC_REC_CNTL 0x2A +#define M98088_REG_2B_MIX_SPK_LEFT 0x2B +#define M98088_REG_2C_MIX_SPK_RIGHT 0x2C +#define M98088_REG_2D_MIX_SPK_CNTL 0x2D +#define M98088_REG_2E_LVL_SIDETONE 0x2E +#define M98088_REG_2F_LVL_DAI1_PLAY 0x2F +#define M98088_REG_30_LVL_DAI1_PLAY_EQ 0x30 +#define M98088_REG_31_LVL_DAI2_PLAY 0x31 +#define M98088_REG_32_LVL_DAI2_PLAY_EQ 0x32 +#define M98088_REG_33_LVL_ADC_L 0x33 +#define M98088_REG_34_LVL_ADC_R 0x34 +#define M98088_REG_35_LVL_MIC1 0x35 +#define M98088_REG_36_LVL_MIC2 0x36 +#define M98088_REG_37_LVL_INA 0x37 +#define M98088_REG_38_LVL_INB 0x38 +#define M98088_REG_39_LVL_HP_L 0x39 +#define M98088_REG_3A_LVL_HP_R 0x3A +#define M98088_REG_3B_LVL_REC_L 0x3B +#define M98088_REG_3C_LVL_REC_R 0x3C +#define M98088_REG_3D_LVL_SPK_L 0x3D +#define M98088_REG_3E_LVL_SPK_R 0x3E +#define M98088_REG_3F_MICAGC_CFG 0x3F +#define M98088_REG_40_MICAGC_THRESH 0x40 +#define M98088_REG_41_SPKDHP 0x41 +#define M98088_REG_42_SPKDHP_THRESH 0x42 +#define M98088_REG_43_SPKALC_COMP 0x43 +#define M98088_REG_44_PWRLMT_CFG 0x44 +#define M98088_REG_45_PWRLMT_TIME 0x45 +#define M98088_REG_46_THDLMT_CFG 0x46 +#define M98088_REG_47_CFG_AUDIO_IN 0x47 +#define M98088_REG_48_CFG_MIC 0x48 +#define M98088_REG_49_CFG_LEVEL 0x49 +#define M98088_REG_4A_CFG_BYPASS 0x4A +#define M98088_REG_4B_CFG_JACKDET 0x4B +#define M98088_REG_4C_PWR_EN_IN 0x4C +#define M98088_REG_4D_PWR_EN_OUT 0x4D +#define M98088_REG_4E_BIAS_CNTL 0x4E +#define M98088_REG_4F_DAC_BIAS1 0x4F +#define M98088_REG_50_DAC_BIAS2 0x50 +#define M98088_REG_51_PWR_SYS 0x51 +#define M98088_REG_52_DAI1_EQ_BASE 0x52 +#define M98088_REG_84_DAI2_EQ_BASE 0x84 +#define M98088_REG_B6_DAI1_BIQUAD_BASE 0xB6 +#define M98088_REG_C0_DAI2_BIQUAD_BASE 0xC0 +#define M98088_REG_FF_REV_ID 0xFF + +#define M98088_REG_CNT (0xFF+1) + +/* MAX98088 Registers Bit Fields */ + +/* M98088_REG_14_DAI1_FORMAT, M98088_REG_1C_DAI2_FORMAT */ + #define M98088_DAI_MAS (1<<7) + #define M98088_DAI_WCI (1<<6) + #define M98088_DAI_BCI (1<<5) + #define M98088_DAI_DLY (1<<4) + #define M98088_DAI_TDM (1<<2) + #define M98088_DAI_FSW (1<<1) + #define M98088_DAI_WS (1<<0) + +/* M98088_REG_15_DAI1_CLOCK, M98088_REG_1D_DAI2_CLOCK */ + #define M98088_DAI_BSEL64 (1<<0) + #define M98088_DAI_OSR64 (1<<6) + +/* M98088_REG_16_DAI1_IOCFG, M98088_REG_1E_DAI2_IOCFG */ + #define M98088_S1NORMAL (1<<6) + #define M98088_S2NORMAL (2<<6) + #define M98088_SDATA (3<<0) + +/* M98088_REG_18_DAI1_FILTERS, M98088_REG_20_DAI2_FILTERS */ + #define M98088_DAI_DHF (1<<3) + +/* M98088_REG_22_MIX_DAC */ + #define M98088_DAI1L_TO_DACL (1<<7) + #define M98088_DAI1R_TO_DACL (1<<6) + #define M98088_DAI2L_TO_DACL (1<<5) + #define M98088_DAI2R_TO_DACL (1<<4) + #define M98088_DAI1L_TO_DACR (1<<3) + #define M98088_DAI1R_TO_DACR (1<<2) + #define M98088_DAI2L_TO_DACR (1<<1) + #define M98088_DAI2R_TO_DACR (1<<0) + +/* M98088_REG_2A_MIC_REC_CNTL */ + #define M98088_REC_LINEMODE (1<<7) + #define M98088_REC_LINEMODE_MASK (1<<7) + +/* M98088_REG_35_LVL_MIC1, M98088_REG_36_LVL_MIC2 */ + #define M98088_MICPRE_MASK (3<<5) + #define M98088_MICPRE_SHIFT 5 + +/* M98088_REG_3A_LVL_HP_R */ + #define M98088_HP_MUTE (1<<7) + +/* M98088_REG_3C_LVL_REC_R */ + #define M98088_REC_MUTE (1<<7) + +/* M98088_REG_3E_LVL_SPK_R */ + #define M98088_SP_MUTE (1<<7) + +/* M98088_REG_48_CFG_MIC */ + #define M98088_EXTMIC_MASK (3<<0) + #define M98088_DIGMIC_L (1<<5) + #define M98088_DIGMIC_R (1<<4) + +/* M98088_REG_49_CFG_LEVEL */ + #define M98088_VSEN (1<<6) + #define M98088_ZDEN (1<<5) + #define M98088_EQ2EN (1<<1) + #define M98088_EQ1EN (1<<0) + +/* M98088_REG_4C_PWR_EN_IN */ + #define M98088_INAEN (1<<7) + #define M98088_INBEN (1<<6) + #define M98088_MBEN (1<<3) + #define M98088_ADLEN (1<<1) + #define M98088_ADREN (1<<0) + +/* M98088_REG_4D_PWR_EN_OUT */ + #define M98088_HPLEN (1<<7) + #define M98088_HPREN (1<<6) + #define M98088_HPEN ((1<<7)|(1<<6)) + #define M98088_SPLEN (1<<5) + #define M98088_SPREN (1<<4) + #define M98088_RECEN (1<<3) + #define M98088_DALEN (1<<1) + #define M98088_DAREN (1<<0) + +/* M98088_REG_51_PWR_SYS */ + #define M98088_SHDNRUN (1<<7) + #define M98088_PERFMODE (1<<3) + #define M98088_HPPLYBACK (1<<2) + #define M98088_PWRSV8K (1<<1) + #define M98088_PWRSV (1<<0) + +#define M98088_COEFS_PER_BAND 5 + +#define M98088_BYTE1(w) ((w >> 8) & 0xff) +#define M98088_BYTE0(w) (w & 0xff) + +struct max98088_setup_data { + unsigned short i2c_address; +}; + +extern struct snd_soc_dai max98088_dai[]; +extern struct snd_soc_codec_device soc_codec_dev_max98088; + +#endif -- 1.6.3.3

2 3

[alsa-devel] Cross-compiling alsa-lib
by Radivoje Jovanovic 23 Sep '10

23 Sep '10

Hi, I am trying to cross-compile alsa-lib. As a result of building alsa-lib I get libasound.so file. However, if I try using aplay or anything that uses alsa I get: ALSA lib conf.c:2700:(snd_config_hooks_ call) Cannot open shared library libasound_module_conf_pulse.so ALSA lib control.c:909:(snd_ctl_open_noupdate) Invalid CTL hw:0 I am not sure how to build libasound_module_conf_pulse.so. I see that the code for this library is in the alsa-lib folder. Thnak you Ogi

1 0

[alsa-devel] MacBookPro 5,3 line-in support
by Vince Weaver 23 Sep '10

23 Sep '10

Hello I've found the following patch is necessary to enable line-in on my MacBookPro 5,3 machine. With the patch applied I've successfully recorded audio from the line-in jack. This is based on the existing 5,5 support. Below is the patch, plus the codec#0 file. Vince vweaver1(a)eecs.utk.edu Signed-off-by: Vince Weaver <vweaver1(a)eecs.utk.edu> diff -ur alsa-driver/alsa-kernel/pci/hda/patch_cirrus.c alsa-driver-vmw/alsa-kernel/pci/hda/patch_cirrus.c --- alsa-driver/alsa-kernel/pci/hda/patch_cirrus.c 2010-09-17 08:50:05.000000000 -0400 +++ alsa-driver-vmw/alsa-kernel/pci/hda/patch_cirrus.c 2010-09-22 17:23:35.496024032 -0400 @@ -65,6 +65,7 @@ /* available models */ enum { + CS420X_MBP53, CS420X_MBP55, CS420X_IMAC27, CS420X_AUTO, @@ -839,8 +840,9 @@ AC_VERB_SET_PIN_WIDGET_CONTROL, hp_present ? 0 : PIN_OUT); } - if (spec->board_config == CS420X_MBP55 || - spec->board_config == CS420X_IMAC27) { + if (spec->board_config == CS420X_MBP53 || + spec->board_config == CS420X_MBP55 || + spec->board_config == CS420X_IMAC27) { unsigned int gpio = hp_present ? 0x02 : 0x08; snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, gpio); @@ -1128,6 +1130,7 @@ } static const char *cs420x_models[CS420X_MODELS] = { + [CS420X_MBP53] = "mbp53", [CS420X_MBP55] = "mbp55", [CS420X_IMAC27] = "imac27", [CS420X_AUTO] = "auto", @@ -1135,6 +1138,7 @@ static struct snd_pci_quirk cs420x_cfg_tbl[] = { + SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53), SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55), SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27), {} /* terminator */ @@ -1145,6 +1149,20 @@ u32 val; }; +static struct cs_pincfg mbp53_pincfgs[] = { + { 0x09, 0x012b4050 }, + { 0x0a, 0x90100141 }, + { 0x0b, 0x90100140 }, + { 0x0c, 0x018b3020 }, + { 0x0d, 0x90a00110 }, + { 0x0e, 0x400000f0 }, + { 0x0f, 0x01cbe030 }, + { 0x10, 0x014be060 }, + { 0x12, 0x400000f0 }, + { 0x15, 0x400000f0 }, + {} /* terminator */ +}; + static struct cs_pincfg mbp55_pincfgs[] = { { 0x09, 0x012b4030 }, { 0x0a, 0x90100121 }, @@ -1174,6 +1192,7 @@ }; static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = { + [CS420X_MBP53] = mbp53_pincfgs, [CS420X_MBP55] = mbp55_pincfgs, [CS420X_IMAC27] = imac27_pincfgs, }; @@ -1206,6 +1225,7 @@ switch (spec->board_config) { case CS420X_IMAC27: + case CS420X_MBP53: case CS420X_MBP55: /* GPIO1 = headphones */ /* GPIO3 = speakers */ Codec: Cirrus Logic CS4206 Address: 0 Function Id: 0x1 Vendor Id: 0x10134206 Subsystem Id: 0x106b4b00 Revision Id: 0x100301 No Modem Function Group found Default PCM: rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 bits [0x1e]: 16 20 24 32 formats [0x3]: PCM FLOAT Default Amp-In caps: N/A Default Amp-Out caps: N/A GPIO: io=4, o=0, i=0, unsolicited=0, wake=0 IO[0]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 IO[1]: enable=1, dir=1, wake=0, sticky=0, data=0, unsol=0 IO[2]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 IO[3]: enable=1, dir=1, wake=0, sticky=0, data=1, unsol=0 Node 0x02 [Audio Output] wcaps 0xd041d: Stereo Amp-Out Amp-Out caps: ofs=0x73, nsteps=0x7f, stepsize=0x01, mute=1 Amp-Out vals: [0x3c 0x3c] Converter: stream=0, channel=0 PCM: rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 bits [0x1e]: 16 20 24 32 formats [0x3]: PCM FLOAT Power: setting=D0, actual=D0 Delay: 13 samples Node 0x03 [Audio Output] wcaps 0xd041d: Stereo Amp-Out Amp-Out caps: ofs=0x73, nsteps=0x7f, stepsize=0x01, mute=1 Amp-Out vals: [0x3c 0x3c] Converter: stream=0, channel=0 PCM: rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 bits [0x1e]: 16 20 24 32 formats [0x3]: PCM FLOAT Power: setting=D0, actual=D0 Delay: 13 samples Node 0x04 [Audio Output] wcaps 0xd041d: Stereo Amp-Out Amp-Out caps: ofs=0x73, nsteps=0x7f, stepsize=0x01, mute=1 Amp-Out vals: [0x3c 0x3c] Converter: stream=0, channel=0 PCM: rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 bits [0x1e]: 16 20 24 32 formats [0x3]: PCM FLOAT Power: setting=D0, actual=D0 Delay: 13 samples Node 0x05 [Audio Input] wcaps 0x18051b: Stereo Amp-In Amp-In caps: ofs=0x33, nsteps=0x3f, stepsize=0x03, mute=1 Amp-In vals: [0xb3 0xb3] [0xb3 0xb3] Converter: stream=0, channel=0 SDI-Select: 0 PCM: rates [0x1f5]: 8000 16000 32000 44100 48000 88200 96000 bits [0x1e]: 16 20 24 32 formats [0x3]: PCM FLOAT Power: setting=D0, actual=D0 Delay: 8 samples Connection: 2 0x0c* 0x12 Node 0x06 [Audio Input] wcaps 0x18051b: Stereo Amp-In Amp-In caps: ofs=0x33, nsteps=0x3f, stepsize=0x03, mute=1 Amp-In vals: [0x15 0x15] [0x15 0x15] Converter: stream=0, channel=0 SDI-Select: 0 PCM: rates [0x1f5]: 8000 16000 32000 44100 48000 88200 96000 bits [0x1e]: 16 20 24 32 formats [0x3]: PCM FLOAT Power: setting=D0, actual=D0 Delay: 8 samples Connection: 2 0x0d* 0x0e Node 0x07 [Audio Input] wcaps 0x180791: Stereo Digital Converter: stream=0, channel=0 SDI-Select: 0 Digital: Preemphasis Copyright Digital category: 0x0 PCM: rates [0x570]: 32000 44100 48000 96000 192000 bits [0x1e]: 16 20 24 32 formats [0x7]: PCM FLOAT AC3 Unsolicited: tag=00, enabled=0 Power: setting=D0, actual=D0 Delay: 8 samples Connection: 1 0x0f Node 0x08 [Audio Output] wcaps 0x40611: Stereo Digital Converter: stream=0, channel=0 Digital: Enabled Digital category: 0x0 PCM: rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 bits [0x1e]: 16 20 24 32 formats [0x7]: PCM FLOAT AC3 Power: setting=D0, actual=D0 Delay: 4 samples Node 0x09 [Pin Complex] wcaps 0x410581: Stereo Pincap 0x0000001c: OUT HP Detect Pin Default 0x012b4030: [Jack] HP Out at Ext Rear Conn = Comb, Color = Green DefAssociation = 0x3, Sequence = 0x0 Pin-ctls: 0xc0: OUT HP Unsolicited: tag=01, enabled=1 Power: setting=D0, actual=D0 Delay: 1 samples Connection: 1 0x02 Node 0x0a [Pin Complex] wcaps 0x410581: Stereo Pincap 0x00000054: OUT Detect Balanced Pin Default 0x90100121: [Fixed] Speaker at Int N/A Conn = Unknown, Color = Unknown DefAssociation = 0x2, Sequence = 0x1 Misc = NO_PRESENCE Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Power: setting=D0, actual=D0 Delay: 1 samples Connection: 1 0x03 Node 0x0b [Pin Complex] wcaps 0x410101: Stereo Pincap 0x00000050: OUT Balanced Pin Default 0x90100120: [Fixed] Speaker at Int N/A Conn = Unknown, Color = Unknown DefAssociation = 0x2, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x40: OUT Delay: 1 samples Connection: 1 0x04 Node 0x0c [Pin Complex] wcaps 0x41048b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Pincap 0x00000024: IN Detect Pin Default 0x400000f0: [N/A] Line Out at Ext N/A Conn = Unknown, Color = Unknown DefAssociation = 0xf, Sequence = 0x0 Pin-ctls: 0x00: Unsolicited: tag=00, enabled=0 Power: setting=D0, actual=D0 Delay: 1 samples Node 0x0d [Pin Complex] wcaps 0x41048b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Pincap 0x00001764: IN Detect Balanced Vref caps: HIZ 50 GRD 80 Pin Default 0x90a00110: [Fixed] Mic at Int N/A Conn = Unknown, Color = Unknown DefAssociation = 0x1, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x24: IN VREF_80 Unsolicited: tag=00, enabled=0 Power: setting=D0, actual=D0 Delay: 1 samples Node 0x0e [Pin Complex] wcaps 0x41000b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x02, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Pincap 0x00000020: IN Pin Default 0x400000f0: [N/A] Line Out at Ext N/A Conn = Unknown, Color = Unknown DefAssociation = 0xf, Sequence = 0x0 Pin-ctls: 0x00: Delay: 1 samples Node 0x0f [Pin Complex] wcaps 0x410681: Stereo Digital Pincap 0x00000024: IN Detect Pin Default 0x400000f0: [N/A] Line Out at Ext N/A Conn = Unknown, Color = Unknown DefAssociation = 0xf, Sequence = 0x0 Pin-ctls: 0x00: Unsolicited: tag=00, enabled=0 Power: setting=D0, actual=D0 Delay: 1 samples Node 0x10 [Pin Complex] wcaps 0x410301: Stereo Digital Pincap 0x00000010: OUT Pin Default 0x014be040: [Jack] SPDIF Out at Ext Rear Conn = Comb, Color = White DefAssociation = 0x4, Sequence = 0x0 Pin-ctls: 0x00: Delay: 1 samples Connection: 1 0x08 Node 0x11 [Vendor Defined Widget] wcaps 0xf00040: Mono Processing caps: benign=0, ncoeff=22 Node 0x12 [Pin Complex] wcaps 0x41000b: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x02, stepsize=0x27, mute=0 Amp-In vals: [0x00 0x00] Pincap 0x00000020: IN Pin Default 0x400000f0: [N/A] Line Out at Ext N/A Conn = Unknown, Color = Unknown DefAssociation = 0xf, Sequence = 0x0 Pin-ctls: 0x00: Delay: 1 samples Node 0x13 [Beep Generator Widget] wcaps 0x700000: Mono Node 0x14 [Audio Output] wcaps 0x40611: Stereo Digital Converter: stream=0, channel=0 Digital: Digital category: 0x0 PCM: rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 bits [0x1e]: 16 20 24 32 formats [0x7]: PCM FLOAT AC3 Power: setting=D0, actual=D0 Delay: 4 samples Node 0x15 [Pin Complex] wcaps 0x410301: Stereo Digital Pincap 0x00000010: OUT Pin Default 0x400000f0: [N/A] Line Out at Ext N/A Conn = Unknown, Color = Unknown DefAssociation = 0xf, Sequence = 0x0 Pin-ctls: 0x00: Delay: 1 samples Connection: 1 0x14

2 1

[alsa-devel] ASoC how to modify audio IC register values
by Almohanad Fayez 23 Sep '10

23 Sep '10

Hi, I'm running Alsa on an embedded platform, Beagleboard, which uses an OMAP3530 chip. The platform uses the TWL4030 ASoC driver. I'm trying to find a way to modify the audio rate register values to force sampling rates other than 44.1 kHz and 48 kHz. I'm running the Angstrom Linux Distro on the board. Alsa is running fine on the board, I'm trying to avoid using "hw:0,0" to make sure that I'm running the audio chip at the specified rate instead of having ALSA resample my audio. Currently I can see that the audio card supports only 48 kHz and 44.1 kHZ, but I know that it supports 32kHz and 16kHz. I managed to find the Codec_Register listing under the /sys/ directory and I'm trying to set the "codec_reg" register to the proper value to run the chip at 32kHz. Basically when I run "cat /sys/devices/platform/soc-audio/codec_reg" register 0x1 reads 0x91 which from the datasheet means the sampling rate = 44.1kHz. I'm trying to set register 0x1 to 0x81 to force it to run at 32 kHz. but the "echo 1 81 > codec_reg" command is apparently not supported and from the angstrom the register is read-only I even tried chmod +w the register but that didn't work. I tried using debugfs to modify the register value unfortunately the functionality isn't available through that. I found a few listings online of ALSA patches that expose the register during debugfs, after copying and pasting them I still couldn't access the register. When I tried modifying the twl4030.c driver in the openembedded directory linux-omap-2.6.28/git/audio/soc/twl4030.c by basically hardcoding the reigster value to 0x81 it still didn't work. I'm running the 2.6.28 Linux kernel. can anyone share some advice ??? al fayez

3 2

[alsa-devel] ASoC update for 2.6.36
by Mark Brown 22 Sep '10

22 Sep '10

The following changes since commit d47372e852391d0c6553dfbc7c4c56b89b527e13: ASoC: Fix soc-cache buffer overflow bug (2010-09-22 12:01:05 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.36 Sorry, brown paper bag in the last pull request. Should've explicitly checked both branches. Mark Brown (1): ASoC: Fix multi-componentism sound/soc/soc-cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

[alsa-devel] [PATCH] SOUND-OSS: Remove sh_dac_audio
by John Kacur 22 Sep '10

22 Sep '10

Remove the SH DAC oss driver since there is an equivalent alsa driver. oss has been deprecated for years. Furthermore this driver has BKL code which we are trying to remove. Rather than attempt to fix this, simply remove the driver. Signed-off-by: John Kacur <jkacur(a)redhat.com> --- sound/oss/Kconfig | 8 - sound/oss/Makefile | 1 - sound/oss/sh_dac_audio.c | 325 ---------------------------------------------- 3 files changed, 0 insertions(+), 334 deletions(-) delete mode 100644 sound/oss/sh_dac_audio.c diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index a513651..76c0902 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -545,11 +545,3 @@ config SOUND_KAHLUA endif # SOUND_OSS -config SOUND_SH_DAC_AUDIO - tristate "SuperH DAC audio support" - depends on CPU_SH3 && HIGH_RES_TIMERS - -config SOUND_SH_DAC_AUDIO_CHANNEL - int "DAC channel" - default "1" - depends on SOUND_SH_DAC_AUDIO diff --git a/sound/oss/Makefile b/sound/oss/Makefile index 567b8a7..96f14dc 100644 --- a/sound/oss/Makefile +++ b/sound/oss/Makefile @@ -9,7 +9,6 @@ obj-$(CONFIG_SOUND_OSS) += sound.o # Please leave it as is, cause the link order is significant ! -obj-$(CONFIG_SOUND_SH_DAC_AUDIO) += sh_dac_audio.o obj-$(CONFIG_SOUND_AEDSP16) += aedsp16.o obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c deleted file mode 100644 index 479e302..0000000 --- a/sound/oss/sh_dac_audio.c +++ /dev/null @@ -1,325 +0,0 @@ -/* - * sound/oss/sh_dac_audio.c - * - * SH DAC based sound :( - * - * Copyright (C) 2004,2005 Andriy Skulysh - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#include <linux/module.h> -#include <linux/init.h> -#include <linux/sched.h> -#include <linux/linkage.h> -#include <linux/slab.h> -#include <linux/fs.h> -#include <linux/sound.h> -#include <linux/smp_lock.h> -#include <linux/soundcard.h> -#include <linux/interrupt.h> -#include <linux/hrtimer.h> -#include <asm/io.h> -#include <asm/uaccess.h> -#include <asm/irq.h> -#include <asm/delay.h> -#include <asm/clock.h> -#include <cpu/dac.h> -#include <asm/machvec.h> -#include <mach/hp6xx.h> -#include <asm/hd64461.h> - -#define MODNAME "sh_dac_audio" - -#define BUFFER_SIZE 48000 - -static int rate; -static int empty; -static char *data_buffer, *buffer_begin, *buffer_end; -static int in_use, device_major; -static struct hrtimer hrtimer; -static ktime_t wakeups_per_second; - -static void dac_audio_start_timer(void) -{ - hrtimer_start(&hrtimer, wakeups_per_second, HRTIMER_MODE_REL); -} - -static void dac_audio_stop_timer(void) -{ - hrtimer_cancel(&hrtimer); -} - -static void dac_audio_reset(void) -{ - dac_audio_stop_timer(); - buffer_begin = buffer_end = data_buffer; - empty = 1; -} - -static void dac_audio_sync(void) -{ - while (!empty) - schedule(); -} - -static void dac_audio_start(void) -{ - if (mach_is_hp6xx()) { - u16 v = __raw_readw(HD64461_GPADR); - v &= ~HD64461_GPADR_SPEAKER; - __raw_writew(v, HD64461_GPADR); - } - - sh_dac_enable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL); -} -static void dac_audio_stop(void) -{ - dac_audio_stop_timer(); - - if (mach_is_hp6xx()) { - u16 v = __raw_readw(HD64461_GPADR); - v |= HD64461_GPADR_SPEAKER; - __raw_writew(v, HD64461_GPADR); - } - - sh_dac_output(0, CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL); - sh_dac_disable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL); -} - -static void dac_audio_set_rate(void) -{ - wakeups_per_second = ktime_set(0, 1000000000 / rate); -} - -static int dac_audio_ioctl(struct file *file, - unsigned int cmd, unsigned long arg) -{ - int val; - - switch (cmd) { - case OSS_GETVERSION: - return put_user(SOUND_VERSION, (int *)arg); - - case SNDCTL_DSP_SYNC: - dac_audio_sync(); - return 0; - - case SNDCTL_DSP_RESET: - dac_audio_reset(); - return 0; - - case SNDCTL_DSP_GETFMTS: - return put_user(AFMT_U8, (int *)arg); - - case SNDCTL_DSP_SETFMT: - return put_user(AFMT_U8, (int *)arg); - - case SNDCTL_DSP_NONBLOCK: - spin_lock(&file->f_lock); - file->f_flags |= O_NONBLOCK; - spin_unlock(&file->f_lock); - return 0; - - case SNDCTL_DSP_GETCAPS: - return 0; - - case SOUND_PCM_WRITE_RATE: - val = *(int *)arg; - if (val > 0) { - rate = val; - dac_audio_set_rate(); - } - return put_user(rate, (int *)arg); - - case SNDCTL_DSP_STEREO: - return put_user(0, (int *)arg); - - case SOUND_PCM_WRITE_CHANNELS: - return put_user(1, (int *)arg); - - case SNDCTL_DSP_SETDUPLEX: - return -EINVAL; - - case SNDCTL_DSP_PROFILE: - return -EINVAL; - - case SNDCTL_DSP_GETBLKSIZE: - return put_user(BUFFER_SIZE, (int *)arg); - - case SNDCTL_DSP_SETFRAGMENT: - return 0; - - default: - printk(KERN_ERR "sh_dac_audio: unimplemented ioctl=0x%x\n", - cmd); - return -EINVAL; - } - return -EINVAL; -} - -static long dac_audio_unlocked_ioctl(struct file *file, u_int cmd, u_long arg) -{ - int ret; - - lock_kernel(); - ret = dac_audio_ioctl(file, cmd, arg); - unlock_kernel(); - - return ret; -} - -static ssize_t dac_audio_write(struct file *file, const char *buf, size_t count, - loff_t * ppos) -{ - int free; - int nbytes; - - if (!count) { - dac_audio_sync(); - return 0; - } - - free = buffer_begin - buffer_end; - - if (free < 0) - free += BUFFER_SIZE; - if ((free == 0) && (empty)) - free = BUFFER_SIZE; - if (count > free) - count = free; - if (buffer_begin > buffer_end) { - if (copy_from_user((void *)buffer_end, buf, count)) - return -EFAULT; - - buffer_end += count; - } else { - nbytes = data_buffer + BUFFER_SIZE - buffer_end; - if (nbytes > count) { - if (copy_from_user((void *)buffer_end, buf, count)) - return -EFAULT; - buffer_end += count; - } else { - if (copy_from_user((void *)buffer_end, buf, nbytes)) - return -EFAULT; - if (copy_from_user - ((void *)data_buffer, buf + nbytes, count - nbytes)) - return -EFAULT; - buffer_end = data_buffer + count - nbytes; - } - } - - if (empty) { - empty = 0; - dac_audio_start_timer(); - } - - return count; -} - -static ssize_t dac_audio_read(struct file *file, char *buf, size_t count, - loff_t * ppos) -{ - return -EINVAL; -} - -static int dac_audio_open(struct inode *inode, struct file *file) -{ - if (file->f_mode & FMODE_READ) - return -ENODEV; - - lock_kernel(); - if (in_use) { - unlock_kernel(); - return -EBUSY; - } - - in_use = 1; - - dac_audio_start(); - unlock_kernel(); - return 0; -} - -static int dac_audio_release(struct inode *inode, struct file *file) -{ - dac_audio_sync(); - dac_audio_stop(); - in_use = 0; - - return 0; -} - -const struct file_operations dac_audio_fops = { - .read = dac_audio_read, - .write = dac_audio_write, - .unlocked_ioctl = dac_audio_unlocked_ioctl, - .open = dac_audio_open, - .release = dac_audio_release, -}; - -static enum hrtimer_restart sh_dac_audio_timer(struct hrtimer *handle) -{ - if (!empty) { - sh_dac_output(*buffer_begin, CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL); - buffer_begin++; - - if (buffer_begin == data_buffer + BUFFER_SIZE) - buffer_begin = data_buffer; - if (buffer_begin == buffer_end) - empty = 1; - } - - if (!empty) - hrtimer_start(&hrtimer, wakeups_per_second, HRTIMER_MODE_REL); - - return HRTIMER_NORESTART; -} - -static int __init dac_audio_init(void) -{ - if ((device_major = register_sound_dsp(&dac_audio_fops, -1)) < 0) { - printk(KERN_ERR "Cannot register dsp device"); - return device_major; - } - - in_use = 0; - - data_buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL); - if (data_buffer == NULL) - return -ENOMEM; - - dac_audio_reset(); - rate = 8000; - dac_audio_set_rate(); - - /* Today: High Resolution Timer driven DAC playback. - * The timer callback gets called once per sample. Ouch. - * - * Future: A much better approach would be to use the - * SH7720 CMT+DMAC+DAC hardware combination like this: - * - Program sample rate using CMT0 or CMT1 - * - Program DMAC to use CMT for timing and output to DAC - * - Play sound using DMAC, let CPU sleep. - * - While at it, rewrite this driver to use ALSA. - */ - - hrtimer_init(&hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - hrtimer.function = sh_dac_audio_timer; - - return 0; -} - -static void __exit dac_audio_exit(void) -{ - unregister_sound_dsp(device_major); - kfree((void *)data_buffer); -} - -module_init(dac_audio_init); -module_exit(dac_audio_exit); - -MODULE_AUTHOR("Andriy Skulysh, askulysh(a)image.kiev.ua"); -MODULE_DESCRIPTION("SH DAC sound driver"); -MODULE_LICENSE("GPL"); -- 1.7.2.2

6 7

[alsa-devel] [PATCH] ASoC: Return -1 instead of -EINVAL to ensure consistency
by Dimitris Papastamos 22 Sep '10

22 Sep '10

The code can't really cope with I/O errors, so it would be better to be consistent throughout all cache functions and return -1 instead of -EINVAL. The return value of snd_soc_read(...) is mostly checked in the probe function and nowhere else. --- sound/soc/soc-cache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 28bf1ff..6702a3d 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -228,7 +228,7 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec, if (reg >= codec->driver->reg_cache_size || snd_soc_codec_volatile_register(codec, reg)) { if (codec->cache_only) - return -EINVAL; + return -1; return codec->hw_read(codec, reg); } else { @@ -455,7 +455,7 @@ static unsigned int snd_soc_16_16_read(struct snd_soc_codec *codec, if (reg >= codec->driver->reg_cache_size || snd_soc_codec_volatile_register(codec, reg)) { if (codec->cache_only) - return -EINVAL; + return -1; return codec->hw_read(codec, reg); } -- 1.7.3

3 2

Re: [alsa-devel] PROBLEM: snd_intel_hda audio regression in 2.6.36-rc5
by Takashi Iwai 22 Sep '10

22 Sep '10

At Wed, 22 Sep 2010 17:28:15 +0300, Aki Parviainen wrote: > > On Wed, Sep 22, 2010 at 12:31 PM, Takashi Iwai <tiwai(a)suse.de> wrote: > > > At Tue, 21 Sep 2010 20:32:54 +0300, > > Aki Parviainen wrote: > > > > > > I've noticed an audio related problem in 2.6.36-rc5: when using > > 2.6.36-rc5 kernel > > > I don't get normal two channel PCM audio at all on my machine, however > > multichannel audio > > > works just fine. > > > > What does this mean exactly? Could you show your test method? > > > > > Thank you for your answer and sorry for being unclear! This means that > whenever I try to output regular stereo audio from files or DVB for example > I cannot hear anything at all with 2.6.36-rcX kernels. Before 2.6.36-rcX > kernels normal stereo audio works just fine. However with 2.6.36-rcX kernels > and all the previous kernels digital preencoded (like Dolby Digital, DTS) > audio works just fine. I am using Kaffeine 1.0 and VLC 1.1 (both from Debian > unstable) to play audio, both programs work exactly the same. My test method > is basicly this: > -boot with 2.6.36-rc4 or 2.6.36-rc5 > -open kaffeine or vlc > -start playing mp3 file -> nothing comes to the amplifier > -start playing mkv file with 5.1 track -> correct audio comes to the > amplifier So, you are testing only over SPDIF output, right? > > > I'm using snd_hda_intel and I've configured ALSA to send all > > > audio to spdif output. With earlier kernel versions this kind of setup > > works > > > just fine but with 2.6.36-rc5 only audio that works is digital preencoded > > audio (5.1 dolby digital from > > > dvd:s / mkv:s) works. There's no errors or anything but nothing comes to > > my > > > amplifier. I've also tested 2.6.36-rc4 and it has the same problem, in > > the past I've never had any audio problems with mainline kernels. > > > > Which kernel did it work? > > > > 2.6.35.5 and every earlier kernel tested. Unfortunately the first 2.6.36 > based kernel that I tested was 2.6.36-rc4 and there audio doesn't work > anymore. > > > > > > > Booting with earlier kernel solves the problem immediately. > > > > Run alsa-info.sh (with --no-upload option) on both working and > > non-working kernel, and attach two files for compare. This will give > > a more clear sight what is different between them. > > > > > Here's the alsa-info files attached from 2.6.35.5 (works) and 2.6.36-rc5 > (doesn't work). Looks like the SPDIF status bits has been reset by some reason. Try to restore via iecset program included in alsa-utils package, e.g. iecset original on iecset category 0x02 If this doesn't help, try to unload sound driver once, remove (or backup) /etc/asound.state (which might be in a different path depending on the distro), then load sound modules again. This will restore the default SPDIF status. Unmute / adjust mixer setups appropriately after doing this. Takashi

2 2

[alsa-devel] [PATCH] ASoC: Fix incorrect parameter to snd_soc_codec_volatile
by Dimitris Papastamos 22 Sep '10

22 Sep '10

We need to pass the register index and not the register value. This patch depends on my previous patch "ASoC: Delegate to hw specific read for volatile registers". Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 5d9d2f8..3e4680b 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -177,7 +177,7 @@ static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg, data[0] = reg; data[1] = value & 0xff; - if (!snd_soc_codec_volatile_register(codec, value) && + if (!snd_soc_codec_volatile_register(codec, reg) && reg < codec->driver->reg_cache_size) cache[reg] = value; -- 1.7.3

1 0

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 22 Sep '10

22 Sep '10

The following changes since commit da5cabf80e2433131bf0ed8993abc0f7ea618c73: Linux 2.6.36-rc1 (2010-08-15 17:41:37 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 We've now had a reasonable amount of time with the multi-component changes in -next and any cross-tree issues would probably have been resolved by now so it seems like a good time to start pushing this into the main sound tree again. As well as the multi-component changes there's also quite a few new drivers here - it's going to be a busy release for ASoC all round. Arnaud Patard (3): ASoC: OpenRD Client : Fix naming breakage due to multicomponent support ASoC: kirkwood: add alias to pcm module ASoC: Change my mail address Axel Lin (5): ASoC: e740_wm9705 - free gpio in e740_exit() ASoC: remove include of pxa2xx-pcm.h in pxa2xx-ac97.c ASoC: pxa-ssp: fix a memory leak in pxa_ssp_remove() ASoC: soc-core: fix debugfs_pop_time file permissions ASoC: ad1980 - set reg_cache_default to ad1980_reg Chanwoo Choi (2): ASoC: multi-component - Add Aquila sound driver ASoC: multi-component - Add Goni sound driver Dimitris Papastamos (6): ARM: S3C64XX: Fix fallthrough bug in i2sv3 gpio configuration, improve logging ASoC: Fix incorrect register cache size configuration ASoC: Fix off-by-one bug in WM8962 register cache size configuration ASoC: WM8985: Initial driver ASoC: Fix soc-cache buffer overflow bug ASoC: Fix soc-cache buffer overflow bug Dzianis Kahanovich (1): ASoC: Add device table to SH FSI driver G, Manjunath Kondaiah (1): OMAP: McBSP: Fix static function warning Guennadi Liakhovetski (4): ASoC: fix clkdev API usage in sh/migor.c ASoC: fix compile breakage of the sh/siu driver sh: fix an SIU device name mismatch ASoC: fix SIU driver breakage, occurred during the multi-component transition Haojian Zhuang (5): ASoC: fix pxa2xx-pcm.h path ASoC: update setting for pxa ssp slave mode ASoC: add 88pm860x codec driver ASoC: add tavorevb3 machine driver for 88pm860x ASoC: add saarb machine driver for 88pm860x Ian Lartey (6): ASoC: multi-component: Fix reference to moved header file, which was unused anyway. ASoC: pxa2xx-i2s is the proper name of the I2S DAI, not pxa-i2s. ASoC: Make codec dai naming for WM8741 consistent ASoC: Enable autoloading of pxa2xx CPU I2S driver with module alias ASoC: Complete supported clock ratios and rate constraints for wm8741 ASoC: Added a missing 32-bit PCM format, to the wm8994 codec. Janusz Krzysztofik (1): ASoC: Use a more adequate name for the CX20442 codec DAI Jarkko Nikula (21): ASoC: multi-component - Drop board-n8x0.c changes ASoC: Fix tlv320aic3x GPIO initialization ASoC: omap: rx51: Use gpio_set_value_cansleep for speaker amp control omap: rx51: Remove redefinition of rx51_aic3x_data ASoC: tlv320aic3x: Fix remaining output pin switch names ASoC: tlv320aic3x: Sort output pin control registers in header file ASoC: tlv320aic3x: Reimplement output mixers ASoC: tlv320aic3x: Sanitize output controls ASoC: Swap bias level enumeration ASoC: tlv320aic3x: Fix null pointer dereference when pdata is not set ASoC: tlv320aic3x: Optimize PLL programming in aic3x_set_bias_level ASoC: Remove needless codec->bias_level assignment to SND_SOC_BIAS_OFF ASoC: tlv320aic3x: Use snd_soc_read and snd_soc_write ASoC: tlv320aic3x: Switch to soc-cache helpers ASoC: tlv320aic3x: Complete the soc-cache conversion ASoC: tlv320aic3x: Add virtual output pin Detection ASoC: tlv320aic3x: Move regulator management from i2c to soc domain ASoC: tlv320aic3x: Add runtime regulator control to aic3x_set_bias_level ASoC: tlv320aic3x: Use regulator notifiers for optimizing the cache sync ASoC: tlv320aic3x: Let the codec hit SND_SOC_BIAS_OFF when idle ASoC: Remove extra rtd->dev.init_name assignment in soc_probe_dai_link Jassi Brar (3): ASoC: S3C: AC97: Remove the -dai suffix ASoC: Samsung: Debug PCM platform device name ASoC: Samsung: Debug PCM snd_soc_dai_driver registration Jiri Slaby (1): ASoC: wm8753, remove dead code Julia Lawall (1): ASoC: pl022_ds.c: Add of_node_put to avoid memory leak Kuninori Morimoto (22): ASoC: fsi: modify compile error ASoC: fsi-ak4642/fsi-da7210: modify dai link settings for card detect fbdev: sh-mobile: Add HDMI sound type selection ASoC: fsi-codec: Add FSI - HDMI support ASoC: Add sh_mobile_hdmi sound support ASoC: ak4642: Revive ak4642_snd_controls ASoC: fsi-ak4642: modify platform_name ASoC: fsi codecs: modify menu attribute on Kconfig fbdev: sh_mobile_hdmi: modify noisy comment out fbdev: sh_mobile_hdmi: modify flags name to more specific fbdev: sh_mobile_hdmi: modify snd_soc_dai_driver settings fbdev: sh_mobile_hdmi: add new label for sound error path ASoC: fsi-hdmi: remove unneeded header fbdev: sh_mobile_hdmi: Add select SND_SOC to Kconfig ASoC: fsi codecs: Update card name field ASoC: ak4642: code clean up ASoC: da7210: code clean up ASoC: fsi: Add fsi_dma_get_area ASoC: fsi: modify noisy comment out ASoC: fsi: Add fsi_dma_soft_push/pop function ASoC: fsi: modify variable name to easy to understand ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl Lars-Peter Clausen (1): ASoC: Multi-component: JZ4740: QI_LB60 board fixes Liam Girdwood (7): ASoC: multi-component - ASoC Multi-Component Support ASoC: core - fix build warning on x86_64 ASoC: core - fix build warning on x86_64 Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37 Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37 Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37 Merge remote branch 'asoc/for-2.6.37' into for-2.6.37 Manuel Lauss (1): ASoC: fix au1x platform Mark Brown (57): ASoC: Add initial WM8962 CODEC driver ASoC: Remove /s from widget names on SMDK64xx WM8580 ASoC: Document CFG switch settings for SMDK6410 WM8580 usage ASoC: Correct WM8580 Capture control names ASoC: Remove version display from WM8510 driver ASoC: Remove unneeded control_data management from Wolfson drivers ASoC: Remove version display from WM8971 driver ASoC: Add MODULE_ALIAS to Samsung DAI drivers ASoC: Automatically determine control_data for soc-cache users Merge branch 'topic/multi-component' of git://git.kernel.org/.../lrg/asoc-2.6 into for-2.6.37 ASoC: Update WM8962 to build with multi-component ASoC: Staticise WM8727 codec driver structure ASoC: Remove unused driver data from WM8961 probe ASoC: Set up debugfs only once per CODEC ASoC: Remove redundant device name from debugfs directory ASoC: Add a bit of resource unwinding in the S3C IISv4 driver ASoC: Convert WM8580 hw_params to use snd_soc_update_bits() ASoC: Remove unused rate selection bitmasks from WM8580 ASoC: Automatically calculate clock ratio for WM8580 ASoC: Implement BCLK rate selection for WM8580 ASoC: Fix inverted WM8580 capture mute control ASoC: Automatically manage WM8580 DAC OSR Merge branch 'for-2.6.36' of git://git.kernel.org/.../broonie/sound-2.6 into for-2.6.37 ASoC: Remove DSP mode support for WM8776 Merge branch 'for-2.6.36' into for-2.6.37 ASoC: Fix WM8580 CLKSEL mask selection ASoC: Fix argument ordering for snd_soc_update_bits() in WM8580 ASoC: Remove unused WM8974 private data ASoC: Fix a few more PXA build errors ASoC: Support non-crystal master clocks for WM8731 ASoC: Support non-crystal master clocks for WM8731 ASoC: Fix device name for AT91SAM9G20-EK devices ASoC: Add simplfied device registration for Atmel SSC devices ASoC: Don't call DAI registration for CODECs with no DAI Merge branch 'for-2.6.37' of git://git.kernel.org/.../lrg/asoc-2.6 into for-2.6.37 ASoC: Log WM8994 separate ADC LRCLKs every time we configure ASoC: Add build infrastructure for WL1273 Merge branch 'for-2.6.36' into for-2.6.37 Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37 Merge branch 'for-2.6.36' into for-2.6.37 ASoC: Implement WM8994 DAC data source muxes ASoC: Add event variants of the AIF widgets Merge branch 'for-2.6.37' of git://git.kernel.org/.../lrg/asoc-2.6 into for-2.6.37 ASoC: Fix cut'n'paste comment in WM8994 ASoC: Staticise WM9712 DAI list ASoC: Remove export of CS4270 DAI ASoC: Set more meaningful name for SMDK64xx WM8580 audio ASoC: Add debugfs listing of registered CODECs ASoC: Add DAI list to debugfs ASoC: Add platform listing to debugfs Merge branch 'for-2.6.36' into for-2.6.37 ASoC: Fix WM8978/migor driver name conflict ASoC: Prototype s3c64xx_i2s_get_clock() ASoC: Report error code when failing to add controls ASoC: Fix merge issue with WM8962 control addition Merge branch 'for-2.6.36' into for-2.6.37 Merge branch 'for-2.6.37' of git://git.kernel.org/.../lrg/asoc-2.6 into for-2.6.37 Matti J. Aaltonen (2): ASoC: TI WL1273 FM Radio Codec. ASoC: WL1273 FM Radio: Eliminate unnecessary error return value. Peter Ujfalusi (1): ASoC: multi-component: TWL4030: Restore registers on removal Randolph Chung (2): ASoC: Configure symmetric rates for tlv320aic3x ASoC: Add support for tlv320aic3007 to tlv320aic3x codec. Sascha Hauer (1): ASoC: i.MX ssi: use SSI_STCCR in synchronous mode Seungwhan Youn (2): ASoC: S3C: Fix PCM RX FIFO settings ASoC: S3C: Fix PCM TXFIFO_DIPSTICK value Timur Tabi (8): powerpc: rename immap_86xx.h to fsl_guts.h, and add 85xx support asoc/multi-component: fsl: add support for 36-bit physical addresses asoc/multi-component: fsl: fix exit and error paths in DMA and SSI drivers asoc/multi-component: fsl: add support for disabled SSI nodes asoc/multi-component: fsl: add support for variable SSI FIFO depth ASoC: add support for separate codec DAIs to the fsl_dma driver ASoC: add support for the Freescale P1022 DS reference board ASoC: mpc8610: replace of_device with platform_device Uwe Kleine-König (1): ASoC: ad1980: remove unneeded function declaration Vasily Khoruzhick (7): ASoC: uda1380: make driver more powersave-friendly ASoC: Add HP iPAQ RX1950 support ARM: S3C24XX: I2S multi-component-related fixes ASoC: rx1950: check that machine is rx1950 in glue driver ASoC: rx1950: remove unnecessary headers ASoC: UDA1380: Add delay between power on and reset ASoC: rx1950: Fix clkdiv for 16khz and 48khz arch/arm/mach-davinci/devices.c | 13 + arch/arm/mach-ep93xx/core.c | 6 + arch/arm/mach-kirkwood/common.c | 6 + arch/arm/mach-mx3/clock-imx31.c | 4 +- arch/arm/mach-mx3/clock-imx35.c | 4 +- arch/arm/mach-mx3/devices.c | 4 +- arch/arm/mach-omap1/devices.c | 26 + arch/arm/mach-omap2/board-rx51-peripherals.c | 17 +- arch/arm/mach-omap2/board-zoom2.c | 28 +- arch/arm/mach-omap2/devices.c | 39 + arch/arm/mach-omap2/include/mach/board-zoom.h | 2 + arch/arm/mach-pxa/devices.c | 25 + arch/arm/mach-pxa/devices.h | 6 + arch/arm/mach-pxa/pxa27x.c | 4 + arch/arm/mach-pxa/pxa3xx.c | 5 + arch/arm/mach-pxa/zylonite.c | 11 + arch/arm/mach-s3c64xx/dev-audio.c | 20 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + arch/arm/plat-mxc/audmux-v2.c | 4 +- arch/arm/plat-omap/include/plat/mcbsp.h | 7 + arch/arm/plat-s3c24xx/devs.c | 34 +- arch/arm/plat-samsung/include/plat/devs.h | 2 + arch/mips/alchemy/devboards/db1200/platform.c | 6 + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 1 + .../include/asm/{immap_86xx.h => fsl_guts.h} | 111 +- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- drivers/input/misc/twl4030-vibra.c | 4 +- drivers/mfd/twl-core.c | 6 +- drivers/mfd/twl4030-codec.c | 8 +- drivers/staging/xgifb/TODO | 2 +- drivers/video/Kconfig | 1 + drivers/video/sh_mobile_hdmi.c | 84 +- include/linux/i2c/twl.h | 6 +- include/sound/sh_fsi.h | 3 - include/sound/soc-dai.h | 98 +- include/sound/soc-dapm.h | 18 +- include/sound/soc-of-simple.h | 25 - include/sound/soc.h | 242 +- include/sound/tlv320aic3x.h | 43 +- include/sound/wm8962.h | 23 + include/video/sh_mobile_hdmi.h | 16 + sound/soc/atmel/atmel-pcm.c | 59 +- sound/soc/atmel/atmel-pcm.h | 3 - sound/soc/atmel/atmel_ssc_dai.c | 148 +- sound/soc/atmel/atmel_ssc_dai.h | 3 +- sound/soc/atmel/playpaq_wm8510.c | 65 +- sound/soc/atmel/sam9g20_wm8731.c | 59 +- sound/soc/atmel/snd-soc-afeb9260.c | 35 +- sound/soc/au1x/db1200.c | 39 +- sound/soc/au1x/dbdma2.c | 95 +- sound/soc/au1x/psc-ac97.c | 71 +- sound/soc/au1x/psc-i2s.c | 53 +- sound/soc/au1x/psc.h | 10 +- sound/soc/blackfin/bf5xx-ac97-pcm.c | 43 +- sound/soc/blackfin/bf5xx-ac97-pcm.h | 3 - sound/soc/blackfin/bf5xx-ac97.c | 41 +- sound/soc/blackfin/bf5xx-ac97.h | 2 - sound/soc/blackfin/bf5xx-ad1836.c | 23 +- sound/soc/blackfin/bf5xx-ad193x.c | 23 +- sound/soc/blackfin/bf5xx-ad1980.c | 19 +- sound/soc/blackfin/bf5xx-ad73311.c | 22 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 44 +- sound/soc/blackfin/bf5xx-i2s-pcm.h | 3 - sound/soc/blackfin/bf5xx-i2s.c | 45 +- sound/soc/blackfin/bf5xx-i2s.h | 14 - sound/soc/blackfin/bf5xx-ssm2602.c | 38 +- sound/soc/blackfin/bf5xx-tdm-pcm.c | 43 +- sound/soc/blackfin/bf5xx-tdm-pcm.h | 3 - sound/soc/blackfin/bf5xx-tdm.c | 15 +- sound/soc/blackfin/bf5xx-tdm.h | 2 - sound/soc/codecs/88pm860x-codec.c | 1486 + sound/soc/codecs/88pm860x-codec.h | 97 + sound/soc/codecs/Kconfig | 16 + sound/soc/codecs/Makefile | 8 + sound/soc/codecs/ac97.c | 124 +- sound/soc/codecs/ac97.h | 19 - sound/soc/codecs/ad1836.c | 191 +- sound/soc/codecs/ad1836.h | 2 - sound/soc/codecs/ad193x.c | 217 +- sound/soc/codecs/ad193x.h | 3 - sound/soc/codecs/ad1980.c | 113 +- sound/soc/codecs/ad1980.h | 3 - sound/soc/codecs/ad73311.c | 66 +- sound/soc/codecs/ad73311.h | 2 - sound/soc/codecs/ads117x.c | 72 +- sound/soc/codecs/ads117x.h | 4 +- sound/soc/codecs/ak4104.c | 149 +- sound/soc/codecs/ak4104.h | 7 - sound/soc/codecs/ak4535.c | 236 +- sound/soc/codecs/ak4535.h | 8 - sound/soc/codecs/ak4642.c | 171 +- sound/soc/codecs/ak4642.h | 20 - sound/soc/codecs/ak4671.c | 140 +- sound/soc/codecs/ak4671.h | 3 - sound/soc/codecs/cq93vc.c | 132 +- sound/soc/codecs/cq93vc.h | 29 - sound/soc/codecs/cs4270.c | 394 +- sound/soc/codecs/cs4270.h | 28 - sound/soc/codecs/cs42l51.c | 295 +- sound/soc/codecs/cs42l51.h | 2 - sound/soc/codecs/cx20442.c | 173 +- sound/soc/codecs/cx20442.h | 2 - sound/soc/codecs/da7210.c | 163 +- sound/soc/codecs/da7210.h | 24 - sound/soc/codecs/jz4740.c | 116 +- sound/soc/codecs/jz4740.h | 20 - sound/soc/codecs/pcm3008.c | 92 +- sound/soc/codecs/pcm3008.h | 3 - sound/soc/codecs/spdif_transciever.c | 102 +- sound/soc/codecs/spdif_transciever.h | 18 - sound/soc/codecs/ssm2602.c | 218 +- sound/soc/codecs/ssm2602.h | 3 - sound/soc/codecs/stac9766.c | 118 +- sound/soc/codecs/stac9766.h | 4 - sound/soc/codecs/tlv320aic23.c | 182 +- sound/soc/codecs/tlv320aic23.h | 3 - sound/soc/codecs/tlv320aic26.c | 180 +- sound/soc/codecs/tlv320aic26.h | 3 - sound/soc/codecs/tlv320aic3x.c | 1230 +- sound/soc/codecs/tlv320aic3x.h | 100 +- sound/soc/codecs/tlv320dac33.c | 248 +- sound/soc/codecs/tlv320dac33.h | 3 - sound/soc/codecs/twl4030.c | 228 +- sound/soc/codecs/twl4030.h | 55 - sound/soc/codecs/twl6040.c | 170 +- sound/soc/codecs/twl6040.h | 3 - sound/soc/codecs/uda134x.c | 154 +- sound/soc/codecs/uda134x.h | 3 - sound/soc/codecs/uda1380.c | 331 +- sound/soc/codecs/uda1380.h | 3 - sound/soc/codecs/wl1273.c | 528 + sound/soc/codecs/wl1273.h | 101 + sound/soc/codecs/wm2000.h | 3 - sound/soc/codecs/wm8350.c | 231 +- sound/soc/codecs/wm8350.h | 3 - sound/soc/codecs/wm8400.c | 181 +- sound/soc/codecs/wm8400.h | 3 - sound/soc/codecs/wm8510.c | 289 +- sound/soc/codecs/wm8510.h | 3 - sound/soc/codecs/wm8523.c | 177 +- sound/soc/codecs/wm8523.h | 3 - sound/soc/codecs/wm8580.c | 325 +- sound/soc/codecs/wm8580.h | 17 +- sound/soc/codecs/wm8711.c | 202 +- sound/soc/codecs/wm8711.h | 3 - sound/soc/codecs/wm8727.c | 106 +- sound/soc/codecs/wm8727.h | 21 - sound/soc/codecs/wm8728.c | 290 +- sound/soc/codecs/wm8728.h | 9 - sound/soc/codecs/wm8731.c | 244 +- sound/soc/codecs/wm8731.h | 7 +- sound/soc/codecs/wm8741.c | 378 +- sound/soc/codecs/wm8741.h | 3 - sound/soc/codecs/wm8750.c | 265 +- sound/soc/codecs/wm8750.h | 9 - sound/soc/codecs/wm8753.c | 405 +- sound/soc/codecs/wm8753.h | 3 - sound/soc/codecs/wm8776.c | 254 +- sound/soc/codecs/wm8776.h | 3 - sound/soc/codecs/wm8900.c | 247 +- sound/soc/codecs/wm8900.h | 3 - sound/soc/codecs/wm8903.c | 265 +- sound/soc/codecs/wm8903.h | 3 - sound/soc/codecs/wm8904.c | 208 +- sound/soc/codecs/wm8904.h | 3 - sound/soc/codecs/wm8940.c | 199 +- sound/soc/codecs/wm8940.h | 2 - sound/soc/codecs/wm8955.c | 181 +- sound/soc/codecs/wm8955.h | 3 - sound/soc/codecs/wm8960.c | 209 +- sound/soc/codecs/wm8960.h | 3 - sound/soc/codecs/wm8961.c | 237 +- sound/soc/codecs/wm8961.h | 3 - sound/soc/codecs/wm8962-tables.c |42299 ++++++++++++++++++++ sound/soc/codecs/wm8962.c | 1857 + sound/soc/codecs/wm8962.h | 3787 ++ sound/soc/codecs/wm8971.c | 247 +- sound/soc/codecs/wm8971.h | 8 - sound/soc/codecs/wm8974.c | 167 +- sound/soc/codecs/wm8974.h | 3 - sound/soc/codecs/wm8978.c | 190 +- sound/soc/codecs/wm8978.h | 3 - sound/soc/codecs/wm8985.c | 1195 + sound/soc/codecs/wm8985.h | 1045 + sound/soc/codecs/wm8988.c | 262 +- sound/soc/codecs/wm8988.h | 3 - sound/soc/codecs/wm8990.c | 223 +- sound/soc/codecs/wm8990.h | 8 - sound/soc/codecs/wm8993.c | 304 +- sound/soc/codecs/wm8993.h | 3 - sound/soc/codecs/wm8994.c | 266 +- sound/soc/codecs/wm8994.h | 3 - sound/soc/codecs/wm9081.c | 208 +- sound/soc/codecs/wm9081.h | 3 - sound/soc/codecs/wm9090.c | 183 +- sound/soc/codecs/wm9090.h | 2 - sound/soc/codecs/wm9705.c | 116 +- sound/soc/codecs/wm9705.h | 3 - sound/soc/codecs/wm9712.c | 124 +- sound/soc/codecs/wm9712.h | 3 - sound/soc/codecs/wm9713.c | 131 +- sound/soc/codecs/wm9713.h | 3 - sound/soc/davinci/davinci-evm.c | 109 +- sound/soc/davinci/davinci-i2s.c | 44 +- sound/soc/davinci/davinci-i2s.h | 2 - sound/soc/davinci/davinci-mcasp.c | 32 +- sound/soc/davinci/davinci-mcasp.h | 2 - sound/soc/davinci/davinci-pcm.c | 45 +- sound/soc/davinci/davinci-pcm.h | 3 - sound/soc/davinci/davinci-sffsdr.c | 27 +- sound/soc/davinci/davinci-vcif.c | 25 +- sound/soc/davinci/davinci-vcif.h | 28 - sound/soc/ep93xx/ep93xx-i2s.c | 34 +- sound/soc/ep93xx/ep93xx-i2s.h | 18 - sound/soc/ep93xx/ep93xx-pcm.c | 37 +- sound/soc/ep93xx/ep93xx-pcm.h | 2 - sound/soc/ep93xx/snappercl15.c | 24 +- sound/soc/fsl/Kconfig | 27 +- sound/soc/fsl/Makefile | 11 +- sound/soc/fsl/efika-audio-fabric.c | 20 +- sound/soc/fsl/fsl_dma.c | 458 +- sound/soc/fsl/fsl_dma.h | 20 - sound/soc/fsl/fsl_ssi.c | 298 +- sound/soc/fsl/fsl_ssi.h | 26 - sound/soc/fsl/mpc5200_dma.c | 66 +- sound/soc/fsl/mpc5200_dma.h | 5 - sound/soc/fsl/mpc5200_psc_ac97.c | 34 +- sound/soc/fsl/mpc5200_psc_ac97.h | 2 - sound/soc/fsl/mpc5200_psc_i2s.c | 19 +- sound/soc/fsl/mpc8610_hpcd.c | 660 +- sound/soc/fsl/p1022_ds.c | 591 + sound/soc/fsl/pcm030-audio-fabric.c | 21 +- sound/soc/fsl/soc-of-simple.c | 172 - sound/soc/imx/Kconfig | 16 + sound/soc/imx/Makefile | 10 +- sound/soc/imx/eukrea-tlv320.c | 16 +- sound/soc/imx/imx-pcm-dma-mx2.c | 43 +- sound/soc/imx/imx-pcm-fiq.c | 68 +- sound/soc/imx/imx-ssi.c | 151 +- sound/soc/imx/imx-ssi.h | 7 +- sound/soc/imx/phycore-ac97.c | 19 +- sound/soc/imx/wm1133-ev1.c | 27 +- sound/soc/jz4740/jz4740-i2s.c | 104 +- sound/soc/jz4740/jz4740-i2s.h | 2 - sound/soc/jz4740/jz4740-pcm.c | 18 +- sound/soc/jz4740/jz4740-pcm.h | 2 - sound/soc/jz4740/qi_lb60.c | 25 +- sound/soc/kirkwood/kirkwood-dma.c | 69 +- sound/soc/kirkwood/kirkwood-dma.h | 17 - sound/soc/kirkwood/kirkwood-i2s.c | 55 +- sound/soc/kirkwood/kirkwood-i2s.h | 17 - sound/soc/kirkwood/kirkwood-openrd.c | 24 +- sound/soc/nuc900/nuc900-ac97.c | 12 +- sound/soc/nuc900/nuc900-audio.c | 16 +- sound/soc/nuc900/nuc900-audio.h | 4 - sound/soc/nuc900/nuc900-pcm.c | 38 +- sound/soc/omap/am3517evm.c | 25 +- sound/soc/omap/ams-delta.c | 98 +- sound/soc/omap/igep0020.c | 22 +- sound/soc/omap/mcpdm.c | 19 +- sound/soc/omap/mcpdm.h | 2 + sound/soc/omap/n810.c | 42 +- sound/soc/omap/omap-mcbsp.c | 125 +- sound/soc/omap/omap-mcbsp.h | 2 - sound/soc/omap/omap-mcpdm.c | 71 +- sound/soc/omap/omap-mcpdm.h | 29 - sound/soc/omap/omap-pcm.c | 47 +- sound/soc/omap/omap-pcm.h | 2 - sound/soc/omap/omap2evm.c | 25 +- sound/soc/omap/omap3beagle.c | 23 +- sound/soc/omap/omap3evm.c | 30 +- sound/soc/omap/omap3pandora.c | 36 +- sound/soc/omap/osk5912.c | 24 +- sound/soc/omap/overo.c | 22 +- sound/soc/omap/rx51.c | 41 +- sound/soc/omap/sdp3430.c | 56 +- sound/soc/omap/sdp4430.c | 23 +- sound/soc/omap/zoom2.c | 64 +- sound/soc/pxa/Kconfig | 18 + sound/soc/pxa/Makefile | 4 + sound/soc/pxa/corgi.c | 28 +- sound/soc/pxa/e740_wm9705.c | 29 +- sound/soc/pxa/e750_wm9705.c | 26 +- sound/soc/pxa/e800_wm9712.c | 26 +- sound/soc/pxa/em-x270.c | 22 +- sound/soc/pxa/imote2.c | 20 +- sound/soc/pxa/magician.c | 35 +- sound/soc/pxa/mioa701_wm9713.c | 33 +- sound/soc/pxa/palm27x.c | 27 +- sound/soc/pxa/poodle.c | 29 +- sound/soc/pxa/pxa-ssp.c | 174 +- sound/soc/pxa/pxa-ssp.h | 2 - sound/soc/pxa/pxa2xx-ac97.c | 46 +- sound/soc/pxa/pxa2xx-ac97.h | 2 - sound/soc/pxa/pxa2xx-i2s.c | 91 +- sound/soc/pxa/pxa2xx-i2s.h | 2 - sound/soc/pxa/pxa2xx-pcm.c | 46 +- sound/soc/pxa/pxa2xx-pcm.h | 19 - sound/soc/pxa/raumfeld.c | 114 +- sound/soc/pxa/saarb.c | 200 + sound/soc/pxa/spitz.c | 26 +- sound/soc/pxa/tavorevb3.c | 200 + sound/soc/pxa/tosa.c | 27 +- sound/soc/pxa/z2.c | 26 +- sound/soc/pxa/zylonite.c | 40 +- sound/soc/s3c24xx/Kconfig | 26 + sound/soc/s3c24xx/Makefile | 6 + sound/soc/s3c24xx/aquila_wm8994.c | 295 + sound/soc/s3c24xx/goni_wm8994.c | 298 + sound/soc/s3c24xx/jive_wm8750.c | 23 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 17 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 58 +- sound/soc/s3c24xx/neo1973_wm8753.c | 37 +- sound/soc/s3c24xx/rx1950_uda1380.c | 333 + sound/soc/s3c24xx/s3c-ac97.c | 22 +- sound/soc/s3c24xx/s3c-ac97.h | 2 - sound/soc/s3c24xx/s3c-dma.c | 46 +- sound/soc/s3c24xx/s3c-dma.h | 1 - sound/soc/s3c24xx/s3c-i2s-v2.c | 50 +- sound/soc/s3c24xx/s3c-i2s-v2.h | 13 +- sound/soc/s3c24xx/s3c-pcm.c | 54 +- sound/soc/s3c24xx/s3c-pcm.h | 3 +- sound/soc/s3c24xx/s3c2412-i2s.c | 54 +- sound/soc/s3c24xx/s3c2412-i2s.h | 2 - sound/soc/s3c24xx/s3c24xx-i2s.c | 40 +- sound/soc/s3c24xx/s3c24xx-i2s.h | 2 - sound/soc/s3c24xx/s3c24xx_simtec.c | 15 +- sound/soc/s3c24xx/s3c24xx_simtec.h | 4 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 25 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 21 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 21 +- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 135 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 206 +- sound/soc/s3c24xx/s3c64xx-i2s.h | 3 +- sound/soc/s3c24xx/smartq_wm8987.c | 15 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 17 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 68 +- sound/soc/s3c24xx/smdk_wm9713.c | 38 +- sound/soc/s6000/s6000-i2s.c | 56 +- sound/soc/s6000/s6000-i2s.h | 2 - sound/soc/s6000/s6000-pcm.c | 100 +- sound/soc/s6000/s6000-pcm.h | 2 - sound/soc/s6000/s6105-ipcam.c | 31 +- sound/soc/sh/Kconfig | 11 +- sound/soc/sh/Makefile | 2 + sound/soc/sh/dma-sh7760.c | 53 +- sound/soc/sh/fsi-ak4642.c | 31 +- sound/soc/sh/fsi-da7210.c | 24 +- sound/soc/sh/fsi-hdmi.c | 60 + sound/soc/sh/fsi.c | 475 +- sound/soc/sh/hac.c | 46 +- sound/soc/sh/migor.c | 44 +- sound/soc/sh/sh7760-ac97.c | 25 +- sound/soc/sh/siu.h | 6 +- sound/soc/sh/siu_dai.c | 97 +- sound/soc/sh/siu_pcm.c | 32 +- sound/soc/sh/ssi.c | 55 +- sound/soc/soc-cache.c | 47 +- sound/soc/soc-core.c | 1778 +- sound/soc/soc-dapm.c | 88 +- sound/soc/soc-jack.c | 10 +- sound/soc/txx9/txx9aclc-ac97.c | 55 +- sound/soc/txx9/txx9aclc-generic.c | 24 +- sound/soc/txx9/txx9aclc.c | 141 +- sound/soc/txx9/txx9aclc.h | 13 +- 365 files changed, 64892 insertions(+), 14388 deletions(-) rename arch/powerpc/include/asm/{immap_86xx.h => fsl_guts.h} (66%) delete mode 100644 include/sound/soc-of-simple.h create mode 100644 include/sound/wm8962.h delete mode 100644 sound/soc/blackfin/bf5xx-i2s.h create mode 100644 sound/soc/codecs/88pm860x-codec.c create mode 100644 sound/soc/codecs/88pm860x-codec.h delete mode 100644 sound/soc/codecs/ac97.h delete mode 100644 sound/soc/codecs/ak4104.h delete mode 100644 sound/soc/codecs/ak4642.h delete mode 100644 sound/soc/codecs/cq93vc.h delete mode 100644 sound/soc/codecs/cs4270.h delete mode 100644 sound/soc/codecs/da7210.h delete mode 100644 sound/soc/codecs/jz4740.h delete mode 100644 sound/soc/codecs/spdif_transciever.h delete mode 100644 sound/soc/codecs/twl4030.h create mode 100644 sound/soc/codecs/wl1273.c create mode 100644 sound/soc/codecs/wl1273.h delete mode 100644 sound/soc/codecs/wm8727.h create mode 100644 sound/soc/codecs/wm8962-tables.c create mode 100644 sound/soc/codecs/wm8962.c create mode 100644 sound/soc/codecs/wm8962.h create mode 100644 sound/soc/codecs/wm8985.c create mode 100644 sound/soc/codecs/wm8985.h delete mode 100644 sound/soc/davinci/davinci-vcif.h delete mode 100644 sound/soc/ep93xx/ep93xx-i2s.h create mode 100644 sound/soc/fsl/p1022_ds.c delete mode 100644 sound/soc/fsl/soc-of-simple.c delete mode 100644 sound/soc/kirkwood/kirkwood-dma.h delete mode 100644 sound/soc/kirkwood/kirkwood-i2s.h delete mode 100644 sound/soc/omap/omap-mcpdm.h delete mode 100644 sound/soc/pxa/pxa2xx-pcm.h create mode 100644 sound/soc/pxa/saarb.c create mode 100644 sound/soc/pxa/tavorevb3.c create mode 100644 sound/soc/s3c24xx/aquila_wm8994.c create mode 100644 sound/soc/s3c24xx/goni_wm8994.c create mode 100644 sound/soc/s3c24xx/rx1950_uda1380.c create mode 100644 sound/soc/sh/fsi-hdmi.c

2 1

[alsa-devel] ASoC update for 2.6.36
by Mark Brown 22 Sep '10

22 Sep '10

The following changes since commit cbfa5184cc5f58627f08c7fad225424f565b439d: ASoC: fix clkdev API usage in sh/migor.c (2010-09-19 16:02:47 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.36 Dimitris Papastamos (1): ASoC: Fix soc-cache buffer overflow bug sound/soc/soc-cache.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

2 1

Re: [alsa-devel] [PATCH 2/2] ALSA: ca0106: Fix mixer and dac channel assignments.
by Takashi Iwai 22 Sep '10

22 Sep '10

At Thu, 23 Sep 2010 00:09:02 +1000, Andy Owen wrote: > > > Hrm, but you changed the DAC number of the front channel. Doesn't change > > the front channel behavior...? > > The behaviour I get is as follows: > > 0) Without either of my patches: > * Distorted output, however once the soundcard has been initialised by > a working driver, this can only be reproduced by turning off the > computer (I think - I can test this later if it is useful, I'm basing it > off reports on forums about the card working for people after they > booted into windows and then restarted). > * Capture fails (more on this later) > > 1) With the first patch (adding card info to the table): > * "speaker-test -Dsurround51 -c6": silence for rear channels, others ok > * "speaker-test -Drear -c2" : silence > * "speaker-test -Dfront -c2" : silence > * "speaker-test -Dcenter_lfe -c2": ok (sound+mute+volume) > * "speaker-test -Dsurround51 -c6": mute for rear controls front > : volume for front is correct > : volume/mute for C/LFE is correct > * Capture fails (more on this later again) > > To me, this suggested that something was flipped with the front and > rear, hence I ended up changing some registers. The case halfway between > (1) and (2) would be before I modified the 'if' statement below so the > front channel isn't a special case. The results are identical to (2), > except the front channel is always silent. Yes, it sounds so. > 2) With the second patch: > * "speaker-test -Dsurround51 -c6": ok (sound+mute+volume) > * "speaker-test -Drear -c2" : ok (sound+mute+volume) > * "speaker-test -Dfront -c2" : ok (sound+mute+volume) > * "speaker-test -Dcenter_lfe -c2": ok (sound+mute+volume) > * Capture still broken > > I'm using arecord to test capture, and I'm not sure if I'm driving it > wrong, as I can't get it to work for either of my cards (the other card > works slightly better, but I always get silence). The failure I'm > describing here is what I get for every version described above (the > only editing I've done here is remove mentions of the other sound > cards): > > ~% arecord -l > **** List of CAPTURE Hardware Devices **** > card 0: CA0106 [CA0106], device 0: ca0106 [CA0106] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: CA0106 [CA0106], device 1: ca0106 [CA0106] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: CA0106 [CA0106], device 2: ca0106 [CA0106] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: CA0106 [CA0106], device 3: ca0106 [CA0106] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > ~% arecord -D hw:0,0 -f dat out.wav > Recording WAVE 'out.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, > Stereo > arecord: pcm_read:1629: read error: Input/output error > (1)~% arecord -D hw:0,1 -f dat out.wav > Recording WAVE 'out.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, > Stereo > arecord: pcm_read:1629: read error: Input/output error > (1)~% arecord -D hw:0,2 -f dat out.wav > Recording WAVE 'out.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, > Stereo > arecord: pcm_read:1629: read error: Input/output error This usually implies that the DMA doesn't work. So, the DAC/ADC mapping seems wrong. > Note that it fails after 10 seconds of me running arecord, suggesting > some sort of timeout somewhere. If I try to record at 44.1kHz, I get a > warning: > > Warning: rate is not accurate (requested = 44100Hz, got = 48000Hz) > please, try the plug plugin > > followed by the same error. This is no issue. Use plughw:0,x instead hw:0,x. > > No, take a look at git commit 485100706b4b397f8072c756839878f634e21f85: > > > > [ALSA] ca0106: power down SPI DAC channels when not in use > > > > For cards with an SPI DAC (SB Live 24-bit / Audigy SE), power down channels > > 0-2 when not in use. They are powered up on PCM open and down again on PCM > > close. Channel 4 (== Front) is not powered down, as it is used for capture > > feedback. Powering it down would effectively kill line in pass-through. > > > > So, it's the designed behavior. > > Judging by that commit, Trent actually had a datasheet to work with, so > I'm inclined to trust it more. However, I just wonder if the other cards > have had full testing of all their outputs - only the "X-Fi Extreme > Audio" claims to have had all 6 channels tested. Maybe not all boards have been tested. I don't disagree with your change. My suggestion is to apply it only for devices that are known to work with your change. Other can follow later if it suits better. > > Judging from the fact that this mapping hasn't been changed since that > > time, I feel that it's not safe to change the mapping unconditionally > > for your device. That's why I suggest for some new flag. > > So if it is a new flag. I'd be tempted to instead include the mappings > in the chip_details struct, rather than a single purpose flag for one > device (which will surely be difficult to name well). Yeah, I thought of a similar thing later :) We can have a single integer, such as 0x0123, indicating the DAC slot of each channel. > The other change > I'd be tempted to make would be to avoid exposing channels that don't > exist (like the side channels, or spdif for this device). Is that a > sensible step? Do any other drivers have to solve a similar problem? Sounds good. > I've attached the first patch with the sign-off line if you want to put > it in now. Otherwise, I'm happy to wait until everything is sorted out, > and put it all in together. Let's merge all together. thanks, Takashi

1 0

[alsa-devel] [PATCH 1/2] ALSA: ca0106 - add Sound Blaster 5.1vx info.
by andy-alsa＠ultra-premium.com 22 Sep '10

22 Sep '10

From: Andy Owen <andy-alsa(a)ultra-premium.com> --- sound/pci/ca0106/ca0106_main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 8e69620..6dc9a5d 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -239,6 +239,16 @@ static struct snd_ca0106_details ca0106_chip_details[] = { .gpio_type = 1, .i2c_adc = 1, .spi_dac = 1 } , + /* Sound Blaster 5.1vx + * Tested: Playback on front, rear, center/lfe speakers + * Not-Tested: Capture + */ + { .serial = 0x10041102, + .name = "Sound Blaster 5.1vx [SB1070]", + .gpio_type = 1, + .i2c_adc = 0, + .spi_dac = 1 + } , /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */ /* SB0438 * CTRL:CA0106-DAT -- 1.7.0.4

3 6

[alsa-devel] [PATCH 2.6.36] ASoC: Fix soc-cache buffer overflow bug
by Dimitris Papastamos 22 Sep '10

22 Sep '10

Make sure we stay within the cache boundaries when updating the register cache. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-cache.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index adbc68c..15d2779 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -203,8 +203,9 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg, data[1] = (value >> 8) & 0xff; data[2] = value & 0xff; - if (!snd_soc_codec_volatile_register(codec, reg)) - reg_cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) + && reg < codec->driver->reg_cache_size) + reg_cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; -- 1.7.3

2 1

[alsa-devel] [PATCH] ASoC: Add max98088 CODEC driver
by Peter Hsiang 22 Sep '10

22 Sep '10

This patch adds the MAX98088 CODEC driver. Signed-off-by: Peter Hsiang <peter.hsiang at maxim-ic.com> --- include/sound/max98088.h | 87 ++ sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/max98088.c | 2871 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/max98088.h | 161 +++ 5 files changed, 3125 insertions(+), 0 deletions(-) create mode 100644 include/sound/max98088.h create mode 100644 sound/soc/codecs/max98088.c create mode 100644 sound/soc/codecs/max98088.h diff --git a/include/sound/max98088.h b/include/sound/max98088.h new file mode 100644 index 0000000..7a6c53c --- /dev/null +++ b/include/sound/max98088.h @@ -0,0 +1,87 @@ +/* + * Platform data for MAX98088 + * + * Copyright 2010 Maxim Integrated Products + * + * 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. + * + */ + +#ifndef __SOUND_MAX98088_PDATA_H__ +#define __SOUND_MAX98088_PDATA_H__ + +#define EQ_CFG_MAX 32 + +/* Equalizer filter response configuration */ +struct max98088_eq_cfg { + const char *name; + unsigned int rate; + u16 band1[5]; + u16 band2[5]; + u16 band3[5]; + u16 band4[5]; + u16 band5[5]; +}; + +/* Speaker excursion limiter filter response configurations */ +#define EX_CFG_MAX 32 + +struct max98088_excursion_cfg { + const char *name; + unsigned int rate; + u16 resp[5]; +}; + +/* codec platform data */ +struct max98088_pdata { + + /* Equalizers for DAI1 and DAI2 */ + struct max98088_eq_cfg *eq1_cfg; + struct max98088_eq_cfg *eq2_cfg; + unsigned int eq1_cfgcnt; + unsigned int eq2_cfgcnt; + + /* Excursion limiters for DAI1 and DAI2 */ + struct max98088_excursion_cfg *ex1_cfg; + struct max98088_excursion_cfg *ex2_cfg; + unsigned int ex1_cfgcnt; + unsigned int ex2_cfgcnt; + + /* Receiver output can be configured as power amplifier or LINE out */ + /* Set receiver_mode to: + * 0 = amplifier output, or + * 1 = LINE level output + */ + unsigned int receiver_mode; + + /* Analog/digital microphone configuration: + * 0 = analog microphone input (normal setting) + * 1 = digital microhpone input + */ + unsigned int digmic_left_enable; + unsigned int digmic_right_enable; + + /* Normal microphone connection, or external connection through INA + * 0 = normal connection + * 1 = INA1 input + * 2 = INA2 input + */ + unsigned int extmic_mode; + + /* Bypass option for INA to MIC1 connection + * 0 = normal setting + * 1 = bypass enabled + */ + unsigned int ina_to_mic1_bypass; + + /* Bypass option for MIC1 to MIC2 connection + * 0 = normal setting + * 1 = bypass enabled + */ + unsigned int mic1_to_mic2_bypass; +}; + +#endif diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 155c127..e9a3c74 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -28,6 +28,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_DA7210 if I2C select SND_SOC_JZ4740 if SOC_JZ4740 select SND_SOC_MAX9877 if I2C + select SND_SOC_MAX98088 if I2C select SND_SOC_PCM3008 select SND_SOC_SPDIF select SND_SOC_SSM2602 if I2C @@ -156,6 +157,9 @@ config SND_SOC_L3 config SND_SOC_DA7210 tristate +config SND_SOC_MAX98088 + tristate + config SND_SOC_PCM3008 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 10d468e..fe9d104 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -15,6 +15,7 @@ snd-soc-cs4270-objs := cs4270.o snd-soc-cx20442-objs := cx20442.o snd-soc-da7210-objs := da7210.o snd-soc-l3-objs := l3.o +snd-soc-max98088-objs := max98088.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-spdif-objs := spdif_transciever.o snd-soc-ssm2602-objs := ssm2602.o @@ -87,6 +88,7 @@ obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o +obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c new file mode 100644 index 0000000..72f599f --- /dev/null +++ b/sound/soc/codecs/max98088.c @@ -0,0 +1,2871 @@ +/* + * max98088.c -- MAX98088 ALSA SoC Audio driver + * + * Copyright 2010 Maxim Integrated Products + * + * 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. + */ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/initval.h> +#include <sound/tlv.h> +#include <linux/slab.h> +#include <sound/max98088.h> +#include "max98088.h" + +static struct snd_soc_codec *max98088_codec; +struct snd_soc_codec_device soc_codec_dev_max98088; + +/* configurations associated with each channel of DAI stream */ +struct max98088_cdata { + unsigned int rate; + unsigned int fmt; + + /* Equalizer parameters */ + int eq_textcnt; + const char *eq_texts[EQ_CFG_MAX]; + int eq_sel; + struct soc_enum eq_enum; + + /* Excursion limiter parameters */ + int ex_textcnt; + const char *ex_texts[EX_CFG_MAX]; + int ex_sel; + struct soc_enum ex_enum; +}; + +/* codec private data */ +struct max98088_priv { + struct snd_soc_codec codec; + struct max98088_pdata *pdata; + u8 reg_cache[M98088_REG_CNT]; + unsigned int sysclk; + struct max98088_cdata dai[2]; + u8 power_state; + unsigned int ex_mode; + unsigned int digmic_mode; +}; + +static const u8 max98088_reg[M98088_REG_CNT] = { + 0x00, /* 00 IRQ status */ + 0x00, /* 01 MIC status */ + 0x00, /* 02 jack status */ + 0x00, /* 03 battery voltage */ + 0x00, /* 04 */ + 0x00, /* 05 */ + 0x00, /* 06 */ + 0x00, /* 07 */ + 0x00, /* 08 */ + 0x00, /* 09 */ + 0x00, /* 0A */ + 0x00, /* 0B */ + 0x00, /* 0C */ + 0x00, /* 0D */ + 0x00, /* 0E */ + 0x00, /* 0F interrupt enable */ + + 0x00, /* 10 master clock */ + 0x00, /* 11 DAI1 clock mode */ + 0x00, /* 12 DAI1 clock control */ + 0x00, /* 13 DAI1 clock control */ + 0x00, /* 14 DAI1 format */ + 0x00, /* 15 DAI1 clock */ + 0x00, /* 16 DAI1 config */ + 0x00, /* 17 DAI1 TDM */ + 0x00, /* 18 DAI1 filters */ + 0x00, /* 19 DAI2 clock mode */ + 0x00, /* 1A DAI2 clock control */ + 0x00, /* 1B DAI2 clock control */ + 0x00, /* 1C DAI2 format */ + 0x00, /* 1D DAI2 clock */ + 0x00, /* 1E DAI2 config */ + 0x00, /* 1F DAI2 TDM */ + + 0x00, /* 20 DAI2 filters */ + 0x00, /* 21 data config */ + 0x00, /* 22 DAC mixer */ + 0x00, /* 23 left ADC mixer */ + 0x00, /* 24 right ADC mixer */ + 0x00, /* 25 left HP mixer */ + 0x00, /* 26 right HP mixer */ + 0x00, /* 27 HP control */ + 0x00, /* 28 left REC mixer */ + 0x00, /* 29 right REC mixer */ + 0x00, /* 2A REC control */ + 0x00, /* 2B left SPK mixer */ + 0x00, /* 2C right SPK mixer */ + 0x00, /* 2D SPK control */ + 0x00, /* 2E sidetone */ + 0x00, /* 2F DAI1 playback level */ + + 0x00, /* 30 DAI1 playback level */ + 0x00, /* 31 DAI2 playback level */ + 0x00, /* 32 DAI2 playbakc level */ + 0x00, /* 33 left ADC level */ + 0x00, /* 34 right ADC level */ + 0x00, /* 35 MIC1 level */ + 0x00, /* 36 MIC2 level */ + 0x00, /* 37 INA level */ + 0x00, /* 38 INB level */ + 0x00, /* 39 left HP volume */ + 0x00, /* 3A right HP volume */ + 0x00, /* 3B left REC volume */ + 0x00, /* 3C right REC volume */ + 0x00, /* 3D left SPK volume */ + 0x00, /* 3E right SPK volume */ + 0x00, /* 3F MIC config */ + + 0x00, /* 40 MIC threshold */ + 0x00, /* 41 excursion limiter filter */ + 0x00, /* 42 excursion limiter threshold */ + 0x00, /* 43 ALC */ + 0x00, /* 44 power limiter threshold */ + 0x00, /* 45 power limiter config */ + 0x00, /* 46 distortion limiter config */ + 0x00, /* 47 audio input */ + 0x00, /* 48 microphone */ + 0x00, /* 49 level control */ + 0x00, /* 4A bypass switches */ + 0x00, /* 4B jack detect */ + 0x00, /* 4C input enable */ + 0x00, /* 4D output enable */ + 0xF0, /* 4E bias control */ + 0x00, /* 4F DAC power */ + + 0x0F, /* 50 DAC power */ + 0x00, /* 51 system */ + 0x00, /* 52 DAI1 EQ1 */ + 0x00, /* 53 DAI1 EQ1 */ + 0x00, /* 54 DAI1 EQ1 */ + 0x00, /* 55 DAI1 EQ1 */ + 0x00, /* 56 DAI1 EQ1 */ + 0x00, /* 57 DAI1 EQ1 */ + 0x00, /* 58 DAI1 EQ1 */ + 0x00, /* 59 DAI1 EQ1 */ + 0x00, /* 5A DAI1 EQ1 */ + 0x00, /* 5B DAI1 EQ1 */ + 0x00, /* 5C DAI1 EQ2 */ + 0x00, /* 5D DAI1 EQ2 */ + 0x00, /* 5E DAI1 EQ2 */ + 0x00, /* 5F DAI1 EQ2 */ + + 0x00, /* 60 DAI1 EQ2 */ + 0x00, /* 61 DAI1 EQ2 */ + 0x00, /* 62 DAI1 EQ2 */ + 0x00, /* 63 DAI1 EQ2 */ + 0x00, /* 64 DAI1 EQ2 */ + 0x00, /* 65 DAI1 EQ2 */ + 0x00, /* 66 DAI1 EQ3 */ + 0x00, /* 67 DAI1 EQ3 */ + 0x00, /* 68 DAI1 EQ3 */ + 0x00, /* 69 DAI1 EQ3 */ + 0x00, /* 6A DAI1 EQ3 */ + 0x00, /* 6B DAI1 EQ3 */ + 0x00, /* 6C DAI1 EQ3 */ + 0x00, /* 6D DAI1 EQ3 */ + 0x00, /* 6E DAI1 EQ3 */ + 0x00, /* 6F DAI1 EQ3 */ + + 0x00, /* 70 DAI1 EQ4 */ + 0x00, /* 71 DAI1 EQ4 */ + 0x00, /* 72 DAI1 EQ4 */ + 0x00, /* 73 DAI1 EQ4 */ + 0x00, /* 74 DAI1 EQ4 */ + 0x00, /* 75 DAI1 EQ4 */ + 0x00, /* 76 DAI1 EQ4 */ + 0x00, /* 77 DAI1 EQ4 */ + 0x00, /* 78 DAI1 EQ4 */ + 0x00, /* 79 DAI1 EQ4 */ + 0x00, /* 7A DAI1 EQ5 */ + 0x00, /* 7B DAI1 EQ5 */ + 0x00, /* 7C DAI1 EQ5 */ + 0x00, /* 7D DAI1 EQ5 */ + 0x00, /* 7E DAI1 EQ5 */ + 0x00, /* 7F DAI1 EQ5 */ + + 0x00, /* 80 DAI1 EQ5 */ + 0x00, /* 81 DAI1 EQ5 */ + 0x00, /* 82 DAI1 EQ5 */ + 0x00, /* 83 DAI1 EQ5 */ + 0x00, /* 84 DAI2 EQ1 */ + 0x00, /* 85 DAI2 EQ1 */ + 0x00, /* 86 DAI2 EQ1 */ + 0x00, /* 87 DAI2 EQ1 */ + 0x00, /* 88 DAI2 EQ1 */ + 0x00, /* 89 DAI2 EQ1 */ + 0x00, /* 8A DAI2 EQ1 */ + 0x00, /* 8B DAI2 EQ1 */ + 0x00, /* 8C DAI2 EQ1 */ + 0x00, /* 8D DAI2 EQ1 */ + 0x00, /* 8E DAI2 EQ2 */ + 0x00, /* 8F DAI2 EQ2 */ + + 0x00, /* 90 DAI2 EQ2 */ + 0x00, /* 91 DAI2 EQ2 */ + 0x00, /* 92 DAI2 EQ2 */ + 0x00, /* 93 DAI2 EQ2 */ + 0x00, /* 94 DAI2 EQ2 */ + 0x00, /* 95 DAI2 EQ2 */ + 0x00, /* 96 DAI2 EQ2 */ + 0x00, /* 97 DAI2 EQ2 */ + 0x00, /* 98 DAI2 EQ3 */ + 0x00, /* 99 DAI2 EQ3 */ + 0x00, /* 9A DAI2 EQ3 */ + 0x00, /* 9B DAI2 EQ3 */ + 0x00, /* 9C DAI2 EQ3 */ + 0x00, /* 9D DAI2 EQ3 */ + 0x00, /* 9E DAI2 EQ3 */ + 0x00, /* 9F DAI2 EQ3 */ + + 0x00, /* A0 DAI2 EQ3 */ + 0x00, /* A1 DAI2 EQ3 */ + 0x00, /* A2 DAI2 EQ4 */ + 0x00, /* A3 DAI2 EQ4 */ + 0x00, /* A4 DAI2 EQ4 */ + 0x00, /* A5 DAI2 EQ4 */ + 0x00, /* A6 DAI2 EQ4 */ + 0x00, /* A7 DAI2 EQ4 */ + 0x00, /* A8 DAI2 EQ4 */ + 0x00, /* A9 DAI2 EQ4 */ + 0x00, /* AA DAI2 EQ4 */ + 0x00, /* AB DAI2 EQ4 */ + 0x00, /* AC DAI2 EQ5 */ + 0x00, /* AD DAI2 EQ5 */ + 0x00, /* AE DAI2 EQ5 */ + 0x00, /* AF DAI2 EQ5 */ + + 0x00, /* B0 DAI2 EQ5 */ + 0x00, /* B1 DAI2 EQ5 */ + 0x00, /* B2 DAI2 EQ5 */ + 0x00, /* B3 DAI2 EQ5 */ + 0x00, /* B4 DAI2 EQ5 */ + 0x00, /* B5 DAI2 EQ5 */ + 0x00, /* B6 DAI1 biquad */ + 0x00, /* B7 DAI1 biquad */ + 0x00, /* B8 DAI1 biquad */ + 0x00, /* B9 DAI1 biquad */ + 0x00, /* BA DAI1 biquad */ + 0x00, /* BB DAI1 biquad */ + 0x00, /* BC DAI1 biquad */ + 0x00, /* BD DAI1 biquad */ + 0x00, /* BE DAI1 biquad */ + 0x00, /* BF DAI1 biquad */ + + 0x00, /* C0 DAI2 biquad */ + 0x00, /* C1 DAI2 biquad */ + 0x00, /* C2 DAI2 biquad */ + 0x00, /* C3 DAI2 biquad */ + 0x00, /* C4 DAI2 biquad */ + 0x00, /* C5 DAI2 biquad */ + 0x00, /* C6 DAI2 biquad */ + 0x00, /* C7 DAI2 biquad */ + 0x00, /* C8 DAI2 biquad */ + 0x00, /* C9 DAI2 biquad */ + 0x00, /* CA */ + 0x00, /* CB */ + 0x00, /* CC */ + 0x00, /* CD */ + 0x00, /* CE */ + 0x00, /* CF */ + + 0x00, /* D0 */ + 0x00, /* D1 */ + 0x00, /* D2 */ + 0x00, /* D3 */ + 0x00, /* D4 */ + 0x00, /* D5 */ + 0x00, /* D6 */ + 0x00, /* D7 */ + 0x00, /* D8 */ + 0x00, /* D9 */ + 0x00, /* DA */ + 0x70, /* DB */ + 0x00, /* DC */ + 0x00, /* DD */ + 0x00, /* DE */ + 0x00, /* DF */ + + 0x00, /* E0 */ + 0x00, /* E1 */ + 0x00, /* E2 */ + 0x00, /* E3 */ + 0x00, /* E4 */ + 0x00, /* E5 */ + 0x00, /* E6 */ + 0x00, /* E7 */ + 0x00, /* E8 */ + 0x00, /* E9 */ + 0x00, /* EA */ + 0x00, /* EB */ + 0x00, /* EC */ + 0x00, /* ED */ + 0x00, /* EE */ + 0x00, /* EF */ + + 0x00, /* F0 */ + 0x00, /* F1 */ + 0x00, /* F2 */ + 0x00, /* F3 */ + 0x00, /* F4 */ + 0x00, /* F5 */ + 0x00, /* F6 */ + 0x00, /* F7 */ + 0x00, /* F8 */ + 0x00, /* F9 */ + 0x00, /* FA */ + 0x00, /* FB */ + 0x00, /* FC */ + 0x00, /* FD */ + 0x00, /* FE */ + 0x00, /* FF */ +}; + +static struct { + int readable; + int writable; + int vol; +} max98088_access[M98088_REG_CNT] = { + { 0xFF, 0xFF, 1 }, /* 00 IRQ status */ + { 0xFF, 0x00, 1 }, /* 01 MIC status */ + { 0xFF, 0x00, 1 }, /* 02 jack status */ + { 0x1F, 0x1F, 1 }, /* 03 battery voltage */ + { 0xFF, 0xFF, 0 }, /* 04 */ + { 0xFF, 0xFF, 0 }, /* 05 */ + { 0xFF, 0xFF, 0 }, /* 06 */ + { 0xFF, 0xFF, 0 }, /* 07 */ + { 0xFF, 0xFF, 0 }, /* 08 */ + { 0xFF, 0xFF, 0 }, /* 09 */ + { 0xFF, 0xFF, 0 }, /* 0A */ + { 0xFF, 0xFF, 0 }, /* 0B */ + { 0xFF, 0xFF, 0 }, /* 0C */ + { 0xFF, 0xFF, 0 }, /* 0D */ + { 0xFF, 0xFF, 0 }, /* 0E */ + { 0xFF, 0xFF, 0 }, /* 0F interrupt enable */ + + { 0xFF, 0xFF, 0 }, /* 10 master clock */ + { 0xFF, 0xFF, 0 }, /* 11 DAI1 clock mode */ + { 0xFF, 0xFF, 0 }, /* 12 DAI1 clock control */ + { 0xFF, 0xFF, 0 }, /* 13 DAI1 clock control */ + { 0xFF, 0xFF, 0 }, /* 14 DAI1 format */ + { 0xFF, 0xFF, 0 }, /* 15 DAI1 clock */ + { 0xFF, 0xFF, 0 }, /* 16 DAI1 config */ + { 0xFF, 0xFF, 0 }, /* 17 DAI1 TDM */ + { 0xFF, 0xFF, 0 }, /* 18 DAI1 filters */ + { 0xFF, 0xFF, 0 }, /* 19 DAI2 clock mode */ + { 0xFF, 0xFF, 0 }, /* 1A DAI2 clock control */ + { 0xFF, 0xFF, 0 }, /* 1B DAI2 clock control */ + { 0xFF, 0xFF, 0 }, /* 1C DAI2 format */ + { 0xFF, 0xFF, 0 }, /* 1D DAI2 clock */ + { 0xFF, 0xFF, 0 }, /* 1E DAI2 config */ + { 0xFF, 0xFF, 0 }, /* 1F DAI2 TDM */ + + { 0xFF, 0xFF, 0 }, /* 20 DAI2 filters */ + { 0xFF, 0xFF, 0 }, /* 21 data config */ + { 0xFF, 0xFF, 0 }, /* 22 DAC mixer */ + { 0xFF, 0xFF, 0 }, /* 23 left ADC mixer */ + { 0xFF, 0xFF, 0 }, /* 24 right ADC mixer */ + { 0xFF, 0xFF, 0 }, /* 25 left HP mixer */ + { 0xFF, 0xFF, 0 }, /* 26 right HP mixer */ + { 0xFF, 0xFF, 0 }, /* 27 HP control */ + { 0xFF, 0xFF, 0 }, /* 28 left REC mixer */ + { 0xFF, 0xFF, 0 }, /* 29 right REC mixer */ + { 0xFF, 0xFF, 0 }, /* 2A REC control */ + { 0xFF, 0xFF, 0 }, /* 2B left SPK mixer */ + { 0xFF, 0xFF, 0 }, /* 2C right SPK mixer */ + { 0xFF, 0xFF, 0 }, /* 2D SPK control */ + { 0xFF, 0xFF, 0 }, /* 2E sidetone */ + { 0xFF, 0xFF, 0 }, /* 2F DAI1 playback level */ + + { 0xFF, 0xFF, 0 }, /* 30 DAI1 playback level */ + { 0xFF, 0xFF, 0 }, /* 31 DAI2 playback level */ + { 0xFF, 0xFF, 0 }, /* 32 DAI2 playbakc level */ + { 0xFF, 0xFF, 0 }, /* 33 left ADC level */ + { 0xFF, 0xFF, 0 }, /* 34 right ADC level */ + { 0xFF, 0xFF, 0 }, /* 35 MIC1 level */ + { 0xFF, 0xFF, 0 }, /* 36 MIC2 level */ + { 0xFF, 0xFF, 0 }, /* 37 INA level */ + { 0xFF, 0xFF, 0 }, /* 38 INB level */ + { 0xFF, 0xFF, 0 }, /* 39 left HP volume */ + { 0xFF, 0xFF, 0 }, /* 3A right HP volume */ + { 0xFF, 0xFF, 0 }, /* 3B left REC volume */ + { 0xFF, 0xFF, 0 }, /* 3C right REC volume */ + { 0xFF, 0xFF, 0 }, /* 3D left SPK volume */ + { 0xFF, 0xFF, 0 }, /* 3E right SPK volume */ + { 0xFF, 0xFF, 0 }, /* 3F MIC config */ + + { 0xFF, 0xFF, 0 }, /* 40 MIC threshold */ + { 0xFF, 0xFF, 0 }, /* 41 excursion limiter filter */ + { 0xFF, 0xFF, 0 }, /* 42 excursion limiter threshold */ + { 0xFF, 0xFF, 0 }, /* 43 ALC */ + { 0xFF, 0xFF, 0 }, /* 44 power limiter threshold */ + { 0xFF, 0xFF, 0 }, /* 45 power limiter config */ + { 0xFF, 0xFF, 0 }, /* 46 distortion limiter config */ + { 0xFF, 0xFF, 0 }, /* 47 audio input */ + { 0xFF, 0xFF, 0 }, /* 48 microphone */ + { 0xFF, 0xFF, 0 }, /* 49 level control */ + { 0xFF, 0xFF, 0 }, /* 4A bypass switches */ + { 0xFF, 0xFF, 0 }, /* 4B jack detect */ + { 0xFF, 0xFF, 0 }, /* 4C input enable */ + { 0xFF, 0xFF, 0 }, /* 4D output enable */ + { 0xFF, 0xFF, 0 }, /* 4E bias control */ + { 0xFF, 0xFF, 0 }, /* 4F DAC power */ + + { 0xFF, 0xFF, 0 }, /* 50 DAC power */ + { 0xFF, 0xFF, 0 }, /* 51 system */ + { 0xFF, 0xFF, 0 }, /* 52 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 53 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 54 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 55 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 56 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 57 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 58 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 59 DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 5A DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 5B DAI1 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 5C DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 5D DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 5E DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 5F DAI1 EQ2 */ + + { 0xFF, 0xFF, 0 }, /* 60 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 61 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 62 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 63 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 64 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 65 DAI1 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 66 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 67 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 68 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 69 DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6A DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6B DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6C DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6D DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6E DAI1 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 6F DAI1 EQ3 */ + + { 0xFF, 0xFF, 0 }, /* 70 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 71 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 72 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 73 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 74 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 75 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 76 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 77 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 78 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 79 DAI1 EQ4 */ + { 0xFF, 0xFF, 0 }, /* 7A DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7B DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7C DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7D DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7E DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 7F DAI1 EQ5 */ + + { 0xFF, 0xFF, 0 }, /* 80 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 81 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 82 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 83 DAI1 EQ5 */ + { 0xFF, 0xFF, 0 }, /* 84 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 85 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 86 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 87 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 88 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 89 DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8A DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8B DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8C DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8D DAI2 EQ1 */ + { 0xFF, 0xFF, 0 }, /* 8E DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 8F DAI2 EQ2 */ + + { 0xFF, 0xFF, 0 }, /* 90 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 91 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 92 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 93 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 94 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 95 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 96 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 97 DAI2 EQ2 */ + { 0xFF, 0xFF, 0 }, /* 98 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 99 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9A DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9B DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9C DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9D DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9E DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* 9F DAI2 EQ3 */ + + { 0xFF, 0xFF, 0 }, /* A0 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* A1 DAI2 EQ3 */ + { 0xFF, 0xFF, 0 }, /* A2 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A3 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A4 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A5 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A6 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A7 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A8 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* A9 DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* AA DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* AB DAI2 EQ4 */ + { 0xFF, 0xFF, 0 }, /* AC DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* AD DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* AE DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* AF DAI2 EQ5 */ + + { 0xFF, 0xFF, 0 }, /* B0 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B1 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B2 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B3 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B4 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B5 DAI2 EQ5 */ + { 0xFF, 0xFF, 0 }, /* B6 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* B7 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* B8 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* B9 DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BA DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BB DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BC DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BD DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BE DAI1 biquad */ + { 0xFF, 0xFF, 0 }, /* BF DAI1 biquad */ + + { 0xFF, 0xFF, 0 }, /* C0 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C1 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C2 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C3 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C4 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C5 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C6 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C7 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C8 DAI2 biquad */ + { 0xFF, 0xFF, 0 }, /* C9 DAI2 biquad */ + { 0x00, 0x00, 0 }, /* CA */ + { 0x00, 0x00, 0 }, /* CB */ + { 0x00, 0x00, 0 }, /* CC */ + { 0x00, 0x00, 0 }, /* CD */ + { 0x00, 0x00, 0 }, /* CE */ + { 0x00, 0x00, 0 }, /* CF */ + + { 0x00, 0x00, 0 }, /* D0 */ + { 0x00, 0x00, 0 }, /* D1 */ + { 0x00, 0x00, 0 }, /* D2 */ + { 0x00, 0x00, 0 }, /* D3 */ + { 0x00, 0x00, 0 }, /* D4 */ + { 0x00, 0x00, 0 }, /* D5 */ + { 0x00, 0x00, 0 }, /* D6 */ + { 0x00, 0x00, 0 }, /* D7 */ + { 0x00, 0x00, 0 }, /* D8 */ + { 0x00, 0x00, 0 }, /* D9 */ + { 0x00, 0x00, 0 }, /* DA */ + { 0x70, 0x70, 0 }, /* DB */ + { 0x00, 0x00, 0 }, /* DC */ + { 0x00, 0x00, 0 }, /* DD */ + { 0x00, 0x00, 0 }, /* DE */ + { 0x00, 0x00, 0 }, /* DF */ + + { 0x00, 0x00, 0 }, /* E0 */ + { 0x00, 0x00, 0 }, /* E1 */ + { 0x00, 0x00, 0 }, /* E2 */ + { 0x00, 0x00, 0 }, /* E3 */ + { 0x00, 0x00, 0 }, /* E4 */ + { 0x00, 0x00, 0 }, /* E5 */ + { 0x00, 0x00, 0 }, /* E6 */ + { 0x00, 0x00, 0 }, /* E7 */ + { 0x00, 0x00, 0 }, /* E8 */ + { 0x00, 0x00, 0 }, /* E9 */ + { 0x00, 0x00, 0 }, /* EA */ + { 0x00, 0x00, 0 }, /* EB */ + { 0x00, 0x00, 0 }, /* EC */ + { 0x00, 0x00, 0 }, /* ED */ + { 0x00, 0x00, 0 }, /* EE */ + { 0x00, 0x00, 0 }, /* EF */ + + { 0x00, 0x00, 0 }, /* F0 */ + { 0x00, 0x00, 0 }, /* F1 */ + { 0x00, 0x00, 0 }, /* F2 */ + { 0x00, 0x00, 0 }, /* F3 */ + { 0x00, 0x00, 0 }, /* F4 */ + { 0x00, 0x00, 0 }, /* F5 */ + { 0x00, 0x00, 0 }, /* F6 */ + { 0x00, 0x00, 0 }, /* F7 */ + { 0x00, 0x00, 0 }, /* F8 */ + { 0x00, 0x00, 0 }, /* F9 */ + { 0x00, 0x00, 0 }, /* FA */ + { 0x00, 0x00, 0 }, /* FB */ + { 0x00, 0x00, 0 }, /* FC */ + { 0x00, 0x00, 0 }, /* FD */ + { 0x00, 0x00, 0 }, /* FE */ + { 0xFF, 0x00, 1 }, /* FF */ +}; + + +static int max98088_volatile_register(unsigned int reg) +{ + return max98088_access[reg].vol; +} + +/* + * Read the MAX98088 I2C register space + * Note: this driver source code is backward compatible to kernel + * version 2.6.32. + */ +static unsigned int max98088_read(struct snd_soc_codec *codec, + unsigned int reg) +{ + struct max98088_priv *max98088 = codec->private_data; + struct i2c_msg msg[2]; + struct i2c_client *client; + u8 data[2]; + int ret; + + client = (struct i2c_client *)codec->control_data; + + if (max98088_volatile_register(reg)) { + data[0] = reg; + msg[0].addr = client->addr; + msg[0].flags = 0; + msg[0].buf = &data[0]; + msg[0].len = 1; + + msg[1].addr = client->addr; + msg[1].flags = I2C_M_RD; + msg[1].buf = &data[1]; + msg[1].len = 1; + + ret = i2c_transfer(client->adapter, &msg[0], 2); + return (ret == 2) ? data[1] : -EIO; + } else { + if (reg > (ARRAY_SIZE(max98088_reg))) + return -EIO; + return max98088->reg_cache[reg]; + } +} + +/* Write to the MAX98088 register space (cached) */ +static int max98088_write(struct snd_soc_codec *codec, unsigned int reg, + unsigned int value) +{ + u8 data[2]; + struct max98088_priv *max98088 = codec->private_data; + + data[0] = reg; + data[1] = value; + if (codec->hw_write(codec->control_data, data, 2) == 2) { + max98088->reg_cache[reg] = + (value & max98088_access[reg].writable); + return 0; + } else { + return -EIO; + } +} + +/* Write to the MAX98088 I2C register space */ +static int max98088_hw_write(struct snd_soc_codec *codec, unsigned int reg, + unsigned int value) +{ + u8 data[2]; + + data[0] = reg; + data[1] = value; + if (codec->hw_write(codec->control_data, data, 2) == 2) + return 0; + else + return -EIO; +} + +/* + * For kernels compiled without unsigned long long int division + */ +unsigned long long int ulldiv(unsigned long long int dividend, + unsigned long long int divisor) +{ + unsigned long long int quotient = 0; + int shift = 1; + + if (divisor == 0) + return 0; + + /* result is 1.0 if divisor and dividend are equal */ + if (divisor == dividend) + return 1; + + /* Normalize divisor */ + while (!(divisor & 0x8000000000000000ULL)) { + divisor <<= 1; + ++shift; + } + + /* Shift and subtract */ + while (shift--) { + quotient <<= 1; + + if (divisor <= dividend) { + dividend -= divisor; + ++quotient; + } + divisor >>= 1; + } + + /* Round up */ + if (dividend > divisor) + ++quotient; + + return quotient; +} + +#define INA1_PGA_BIT 0x01 +#define INA2_PGA_BIT 0x02 +#define INB1_PGA_BIT 0x04 +#define INB2_PGA_BIT 0x08 +/* + * The INx1 and INx2 PGAs share a power control signal. + * This function OR's the two power events to keep an unpowered INx + * from turning off it's counterpart. + * The control names are used to identify the PGA. + */ +static int max98088_pga_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct max98088_priv *max98088 = codec->private_data; + u8 *state = &max98088->power_state; + unsigned int val; + unsigned int pga; + unsigned int mask; + + BUG_ON(w->reg != M98088_REG_4C_PWR_EN_IN); + + if (strncmp(w->name, "INA1", 4) == 0) { + pga = INA1_PGA_BIT; + mask = INA1_PGA_BIT | INA2_PGA_BIT; + } else if (strncmp(w->name, "INA2", 4) == 0) { + pga = INA2_PGA_BIT; + mask = INA1_PGA_BIT | INA2_PGA_BIT; + } else if (strncmp(w->name, "INB1", 4) == 0) { + pga = INB1_PGA_BIT; + mask = INB1_PGA_BIT | INB2_PGA_BIT; + } else if (strncmp(w->name, "INB2", 4) == 0) { + pga = INB2_PGA_BIT; + mask = INB1_PGA_BIT | INB2_PGA_BIT; + } else { + return -EINVAL; + } + + if (event == SND_SOC_DAPM_POST_PMU) { + /* ON */ + *state |= pga; + + /* Turn on, avoiding unnecessary writes */ + val = max98088_read(codec, w->reg); + if (!(val & (1 << w->shift))) { + val |= (1 << w->shift); + max98088_write(codec, w->reg, val); + } + } else if (event == SND_SOC_DAPM_POST_PMD) { + /* OFF */ + *state &= ~pga; + + /* Turn off if both are off, avoiding unnecessary writes */ + if (!(*state & mask)) { + val = max98088_read(codec, w->reg); + if (val & (1 << w->shift)) { + val &= ~(1 << w->shift); + max98088_write(codec, w->reg, val); + } + } + } else { + return -EINVAL; + } + + return 0; +} + +/* + * Load equalizer DSP coefficient configurations registers + */ +void m98088_eq_band(struct snd_soc_codec *codec, unsigned int dai, + unsigned int band, u16 *coefs) +{ + unsigned int eq_reg; + unsigned int i; + + if (band > 4) + return; + + if (dai > 1) + return; + + /* Load the base register address */ + eq_reg = dai ? M98088_REG_84_DAI2_EQ_BASE : M98088_REG_52_DAI1_EQ_BASE; + + /* Add the band address offset, note adjustment for word address */ + eq_reg += band * (M98088_COEFS_PER_BAND << 1); + + /* Step through the registers and coefs */ + for (i = 0; i < M98088_COEFS_PER_BAND; i++) { + max98088_write(codec, eq_reg++, M98088_BYTE1(coefs[i])); + max98088_write(codec, eq_reg++, M98088_BYTE0(coefs[i])); + } + + return; +} + +/* + * Excursion limiter modes + */ +static const char *max98088_ex_mode[] = { + "Off", + "100Hz", + "400Hz", + "600Hz", + "800Hz", + "1000Hz", + "200-400Hz", + "400-600Hz", + "400-800Hz", + "user-400Hz", + "user-600Hz", + "user-800Hz", + "user-1000Hz" +}; + +static const unsigned int ex_mode_table[] = { + 0x00, /* disabled */ + (0<<4)|3, /* 100Hz */ + (1<<4)|0, /* 400Hz */ + (2<<4)|0, /* 600Hz */ + (3<<4)|0, /* 800Hz */ + (4<<4)|0, /* 1000Hz */ + (1<<4)|1, /* 200-400Hz */ + (2<<4)|2, /* 400-600Hz */ + (3<<4)|2, /* 400-800Hz */ + (1<<4)|3, /* user-400Hz */ + (2<<4)|3, /* user-600Hz */ + (3<<4)|3, /* user-800Hz */ + (4<<4)|3 /* user-1000Hz */ +}; + +static const struct soc_enum max98088_ex_mode_enum[] = { + SOC_ENUM_SINGLE_EXT(13, max98088_ex_mode), +}; + +/* + * Excursion limiter mode - set mode + */ +static int max98088_ex_mode_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->ex_mode; + + *mode = ucontrol->value.integer.value[0]; + + if (*mode <= ARRAY_SIZE(ex_mode_table)) + max98088_write(codec, M98088_REG_41_SPKDHP, + ex_mode_table[*mode]); + + return 0; +} + +/* + * Excursion limiter mode - get mode + */ +static int max98088_ex_mode_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + unsigned int *mode = &max98088->ex_mode; + + ucontrol->value.integer.value[0] = *mode; + return 0; +} + +/* + * Load user programmable mode excursion limiter filter coefficients + */ +static void max98088_ex_resp_control(struct snd_soc_codec *codec, + int reg, u16 *param) +{ + max98088_write(codec, reg, M98088_BYTE1(param[0])); + max98088_write(codec, ++reg, M98088_BYTE0(param[0])); + max98088_write(codec, ++reg, M98088_BYTE1(param[1])); + max98088_write(codec, ++reg, M98088_BYTE0(param[1])); + max98088_write(codec, ++reg, M98088_BYTE1(param[2])); + max98088_write(codec, ++reg, M98088_BYTE0(param[2])); + max98088_write(codec, ++reg, M98088_BYTE1(param[3])); + max98088_write(codec, ++reg, M98088_BYTE0(param[3])); + max98088_write(codec, ++reg, M98088_BYTE1(param[4])); + max98088_write(codec, ++reg, M98088_BYTE0(param[4])); +} + +static const char *max98088_hp_spk_mute[] = {"disable", "enable"}; +static const struct soc_enum max98088_hp_spk_mute_enum[] = { + SOC_ENUM_SINGLE_EXT(2, max98088_hp_spk_mute), +}; +/* These defines correlate to the position of the like named value in + * max98088_hp_spk_mute[] */ +#define MAX98088_HP_SPK_MUTE_DISABLE 0 +#define MAX98088_HP_SPK_MUTE_ENABLE 1 + +/* + * Mute the speaker + */ +static int max98088_spk_mute_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + u8 lReg = max98088_read(codec, M98088_REG_3D_LVL_SPK_L); + u8 rReg = max98088_read(codec, M98088_REG_3E_LVL_SPK_R); + + if (MAX98088_HP_SPK_MUTE_ENABLE == ucontrol->value.integer.value[0]) { + lReg |= M98088_SP_MUTE; + rReg |= M98088_SP_MUTE; + } else { + lReg &= ~M98088_SP_MUTE; + rReg &= ~M98088_SP_MUTE; + } + + max98088_write(codec, M98088_REG_3D_LVL_SPK_L, lReg); + max98088_write(codec, M98088_REG_3E_LVL_SPK_R, rReg); + + return 0; +} + +/* + * Get speaker mute status + */ +static int max98088_spk_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + u8 reg = max98088_read(codec, M98088_REG_3D_LVL_SPK_L); + + ucontrol->value.integer.value[0] = (reg & M98088_SP_MUTE) ? 1 : 0; + + return 0; +} + +/* + * Mute the headphone + */ +static int max98088_hp_mute_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + u8 lReg = max98088_read(codec, M98088_REG_39_LVL_HP_L); + u8 rReg = max98088_read(codec, M98088_REG_3A_LVL_HP_R); + + if (MAX98088_HP_SPK_MUTE_ENABLE == ucontrol->value.integer.value[0]) { + lReg |= M98088_HP_MUTE; + rReg |= M98088_HP_MUTE; + } else { + lReg &= ~M98088_HP_MUTE; + rReg &= ~M98088_HP_MUTE; + } + + max98088_write(codec, M98088_REG_39_LVL_HP_L, lReg); + max98088_write(codec, M98088_REG_3A_LVL_HP_R, rReg); + + return 0; +} + +/* + * Get current headphone mute status + */ +static int max98088_hp_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + u8 reg = max98088_read(codec, M98088_REG_39_LVL_HP_L); + + ucontrol->value.integer.value[0] = (reg & M98088_HP_MUTE) ? 1 : 0; + + return 0; +} + +/* + * Mute the receiver + */ +static int max98088_rec_mute_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + u8 lReg = max98088_read(codec, M98088_REG_3B_LVL_REC_L); + u8 rReg = max98088_read(codec, M98088_REG_3C_LVL_REC_R); + + if (MAX98088_HP_SPK_MUTE_ENABLE == ucontrol->value.integer.value[0]) { + lReg |= M98088_REC_MUTE; + rReg |= M98088_REC_MUTE; + } else { + lReg &= ~M98088_REC_MUTE; + rReg &= ~M98088_REC_MUTE; + } + + max98088_write(codec, M98088_REG_3B_LVL_REC_L, lReg); + max98088_write(codec, M98088_REG_3C_LVL_REC_R, rReg); + + return 0; +} + +/* + * Get current receiver mute status + */ +static int max98088_rec_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + u8 reg = max98088_read(codec, M98088_REG_3B_LVL_REC_L); + + ucontrol->value.integer.value[0] = (reg & M98088_REC_MUTE) ? 1 : 0; + return 0; +} + +static const char *max98088_ex_thresh[] = { /* volts PP */ + "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; +static const struct soc_enum max98088_ex_thresh_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_42_SPKDHP_THRESH, 0, 8, + max98088_ex_thresh), +}; + +static const char *max98088_fltr_mode[] = {"Voice", "Music" }; +static const struct soc_enum max98088_filter_mode_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 7, 2, max98088_fltr_mode), +}; + +static const char *max98088_dai1_fltr[] = { + "Off", "fc=258/fs=16k", "fc=500/fs=16k", + "fc=258/fs=8k", "fc=500/fs=8k", "fc=200"}; +static const struct soc_enum max98088_dai1_dac_filter_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 0, 6, max98088_dai1_fltr), +}; +static const struct soc_enum max98088_dai1_adc_filter_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 4, 6, max98088_dai1_fltr), +}; + +static const char *max98088_dcblk[] = {"Off", "On"}; +static const struct soc_enum max98088_dcblk_enum[] = { + SOC_ENUM_SINGLE(M98088_REG_20_DAI2_FILTERS, 0, 2, max98088_dcblk), +}; + +/* amixer controls (non-dapm) */ +static const struct snd_kcontrol_new max98088_snd_controls[] = { + + /* analog output levels */ + + SOC_DOUBLE_R("Headphone volume", M98088_REG_39_LVL_HP_L, + M98088_REG_3A_LVL_HP_R, 0, 31, 0), + SOC_DOUBLE_R("Speaker volume", M98088_REG_3D_LVL_SPK_L, + M98088_REG_3E_LVL_SPK_R, 0, 31, 0), + SOC_DOUBLE_R("Receiver volume", M98088_REG_3B_LVL_REC_L, + M98088_REG_3C_LVL_REC_R, 0, 31, 0), + + SOC_ENUM_EXT("Headphone mute", max98088_hp_spk_mute_enum, + max98088_hp_mute_get, max98088_hp_mute_set), + SOC_ENUM_EXT("Speaker mute", max98088_hp_spk_mute_enum, + max98088_spk_mute_get, max98088_spk_mute_set), + SOC_ENUM_EXT("Receiver mute", max98088_hp_spk_mute_enum, + max98088_rec_mute_get, max98088_rec_mute_set), + + /* analog input levels */ + + SOC_SINGLE("MIC1 gain", M98088_REG_35_LVL_MIC1, 0, 31, 1), + SOC_SINGLE("MIC2 gain", M98088_REG_36_LVL_MIC2, 0, 31, 1), + + SOC_SINGLE("MIC1 pre", M98088_REG_35_LVL_MIC1, 5, 3, 0), + SOC_SINGLE("MIC2 pre", M98088_REG_36_LVL_MIC2, 5, 3, 0), + + SOC_SINGLE("INA gain", M98088_REG_37_LVL_INA, 0, 7, 1), + SOC_SINGLE("INB gain", M98088_REG_38_LVL_INB, 0, 7, 1), + + /* ADC input digital gains and volume control */ + + SOC_SINGLE("ADCL volume", M98088_REG_33_LVL_ADC_L, 0, 15, 0), + SOC_SINGLE("ADCR volume", M98088_REG_34_LVL_ADC_R, 0, 15, 0), + + SOC_SINGLE("ADCL gain", M98088_REG_33_LVL_ADC_L, 4, 3, 0), + SOC_SINGLE("ADCR gain", M98088_REG_34_LVL_ADC_R, 4, 3, 0), + + /* equalizer */ + + SOC_SINGLE("EQ1 switch", M98088_REG_49_CFG_LEVEL, 0, 1, 0), + SOC_SINGLE("EQ2 switch", M98088_REG_49_CFG_LEVEL, 1, 1, 0), + + /* excursion limiter */ + + SOC_ENUM_EXT("EX limiter mode", max98088_ex_mode_enum, + max98088_ex_mode_get, max98088_ex_mode_set), + SOC_ENUM("EX limiter threshold", max98088_ex_thresh_enum), + + /* voice/music filters */ + + SOC_ENUM("DAI1 filter mode", max98088_filter_mode_enum), + SOC_ENUM("DAI1 DAC filter", max98088_dai1_dac_filter_enum), + SOC_ENUM("DAI1 ADC filter", max98088_dai1_adc_filter_enum), + SOC_ENUM("DAI2 DC block", max98088_dcblk_enum), + + /* automatic level control (for both DAI1/DAI2) */ + + SOC_SINGLE("ALC switch", M98088_REG_43_SPKALC_COMP, 7, 1, 0), + SOC_SINGLE("ALC threshold", M98088_REG_43_SPKALC_COMP, 0, 7, 0), + SOC_SINGLE("ALC multiband", M98088_REG_43_SPKALC_COMP, 3, 1, 0), + SOC_SINGLE("ALC release time", M98088_REG_43_SPKALC_COMP, 4, 7, 0), + + /* power limiter */ + + SOC_SINGLE("PWR limiter threshold", M98088_REG_44_PWRLMT_CFG, + 4, 15, 0), + SOC_SINGLE("PWR limiter weight", M98088_REG_44_PWRLMT_CFG, 0, 7, 0), + SOC_SINGLE("PWR limiter time1", M98088_REG_45_PWRLMT_TIME, 0, 15, 0), + SOC_SINGLE("PWR limiter time2", M98088_REG_45_PWRLMT_TIME, 4, 15, 0), + + /* THD distortion limiter */ + + SOC_SINGLE("THD limiter thresh", M98088_REG_46_THDLMT_CFG, 4, 15, 0), + SOC_SINGLE("THD limiter time", M98088_REG_46_THDLMT_CFG, 0, 7, 0), +}; + +/* DAPM sub-tables of the main dapm_widgets */ + +/* Left speaker mixer switch */ +static const struct snd_kcontrol_new max98088_left_speaker_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1", M98088_REG_2B_MIX_SPK_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1", M98088_REG_2B_MIX_SPK_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2", M98088_REG_2B_MIX_SPK_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2", M98088_REG_2B_MIX_SPK_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1", M98088_REG_2B_MIX_SPK_LEFT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_2B_MIX_SPK_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_2B_MIX_SPK_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_2B_MIX_SPK_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_2B_MIX_SPK_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_2B_MIX_SPK_LEFT, 4, 1, 0), +}; + +/* Right speaker mixer switch */ +static const struct snd_kcontrol_new max98088_right_speaker_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1", M98088_REG_2C_MIX_SPK_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1", M98088_REG_2C_MIX_SPK_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2", M98088_REG_2C_MIX_SPK_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2", M98088_REG_2C_MIX_SPK_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1", M98088_REG_2C_MIX_SPK_RIGHT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_2C_MIX_SPK_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_2C_MIX_SPK_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_2C_MIX_SPK_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_2C_MIX_SPK_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_2C_MIX_SPK_RIGHT, 4, 1, 0), +}; + +/* Left headphone mixer switch */ +static const struct snd_kcontrol_new max98088_left_hp_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1", M98088_REG_25_MIX_HP_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1", M98088_REG_25_MIX_HP_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2", M98088_REG_25_MIX_HP_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2", M98088_REG_25_MIX_HP_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1", M98088_REG_25_MIX_HP_LEFT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_25_MIX_HP_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_25_MIX_HP_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_25_MIX_HP_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_25_MIX_HP_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_25_MIX_HP_LEFT, 4, 1, 0), +}; + +/* Right headphone mixer switch */ +static const struct snd_kcontrol_new max98088_right_hp_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1", M98088_REG_26_MIX_HP_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1", M98088_REG_26_MIX_HP_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2", M98088_REG_26_MIX_HP_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2", M98088_REG_26_MIX_HP_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1", M98088_REG_26_MIX_HP_RIGHT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_26_MIX_HP_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_26_MIX_HP_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_26_MIX_HP_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_26_MIX_HP_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_26_MIX_HP_RIGHT, 4, 1, 0), +}; + +/* Left earpiece/receiver mixer switch */ +static const struct snd_kcontrol_new max98088_left_receiver_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1", M98088_REG_28_MIX_REC_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1", M98088_REG_28_MIX_REC_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2", M98088_REG_28_MIX_REC_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2", M98088_REG_28_MIX_REC_LEFT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1", M98088_REG_28_MIX_REC_LEFT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_28_MIX_REC_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_28_MIX_REC_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_28_MIX_REC_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_28_MIX_REC_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_28_MIX_REC_LEFT, 4, 1, 0), +}; + +/* Right earpiece/receiver mixer switch */ +static const struct snd_kcontrol_new max98088_right_rec_mixer_controls[] = { + SOC_DAPM_SINGLE("Left DAC1", M98088_REG_29_MIX_REC_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC1", M98088_REG_29_MIX_REC_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC2", M98088_REG_29_MIX_REC_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("Right DAC2", M98088_REG_29_MIX_REC_RIGHT, 0, 1, 0), + SOC_DAPM_SINGLE("MIC1", M98088_REG_29_MIX_REC_RIGHT, 5, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_29_MIX_REC_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_29_MIX_REC_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_29_MIX_REC_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_29_MIX_REC_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_29_MIX_REC_RIGHT, 4, 1, 0), +}; + +/* Left ADC mixer switch */ +static const struct snd_kcontrol_new max98088_left_ADC_mixer_controls[] = { + SOC_DAPM_SINGLE("MIC1", M98088_REG_23_MIX_ADC_LEFT, 7, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_23_MIX_ADC_LEFT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_23_MIX_ADC_LEFT, 3, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_23_MIX_ADC_LEFT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_23_MIX_ADC_LEFT, 1, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_23_MIX_ADC_LEFT, 0, 1, 0), +}; + +/* Right ADC mixer switch */ +static const struct snd_kcontrol_new max98088_right_ADC_mixer_controls[] = { + SOC_DAPM_SINGLE("MIC1", M98088_REG_24_MIX_ADC_RIGHT, 7, 1, 0), + SOC_DAPM_SINGLE("MIC2", M98088_REG_24_MIX_ADC_RIGHT, 6, 1, 0), + SOC_DAPM_SINGLE("INA1", M98088_REG_24_MIX_ADC_RIGHT, 3, 1, 0), + SOC_DAPM_SINGLE("INA2", M98088_REG_24_MIX_ADC_RIGHT, 2, 1, 0), + SOC_DAPM_SINGLE("INB1", M98088_REG_24_MIX_ADC_RIGHT, 1, 1, 0), + SOC_DAPM_SINGLE("INB2", M98088_REG_24_MIX_ADC_RIGHT, 0, 1, 0), +}; + +static int max98088_hp_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + u16 status; + + BUG_ON(event != SND_SOC_DAPM_PRE_PMD); + + /* powering down headphone gracefully */ + status = max98088_read(codec, M98088_REG_4D_PWR_EN_OUT); + if ((status & M98088_HPEN) == M98088_HPEN) { + max98088_hw_write(codec, M98088_REG_4D_PWR_EN_OUT, + (status & ~M98088_HPEN)); + } + schedule_timeout_interruptible(msecs_to_jiffies(20)); + + return 0; +} + +/* DAPM widgets top level */ +static const struct snd_soc_dapm_widget max98088_dapm_widgets[] = { + + SND_SOC_DAPM_ADC("ADCL", "HiFi Capture", M98088_REG_4C_PWR_EN_IN, 1, 0), + SND_SOC_DAPM_ADC("ADCR", "HiFi Capture", M98088_REG_4C_PWR_EN_IN, 0, 0), + + SND_SOC_DAPM_DAC("DACL1", "HiFi Playback", + M98088_REG_4D_PWR_EN_OUT, 1, 0), + SND_SOC_DAPM_DAC("DACR1", "HiFi Playback", + M98088_REG_4D_PWR_EN_OUT, 0, 0), + SND_SOC_DAPM_DAC("DACL2", "Aux Playback", + M98088_REG_4D_PWR_EN_OUT, 1, 0), + SND_SOC_DAPM_DAC("DACR2", "Aux Playback", + M98088_REG_4D_PWR_EN_OUT, 0, 0), + + SND_SOC_DAPM_PGA_E("HP Left Out", M98088_REG_4D_PWR_EN_OUT, + 7, 0, NULL, 0, max98088_hp_event, SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_PGA_E("HP Right Out", M98088_REG_4D_PWR_EN_OUT, + 6, 0, NULL, 0, max98088_hp_event, SND_SOC_DAPM_PRE_PMD), + + SND_SOC_DAPM_PGA("SPK Left Out", M98088_REG_4D_PWR_EN_OUT, + 5, 0, NULL, 0), + SND_SOC_DAPM_PGA("SPK Right Out", M98088_REG_4D_PWR_EN_OUT, + 4, 0, NULL, 0), + + SND_SOC_DAPM_PGA("REC Left Out", M98088_REG_4D_PWR_EN_OUT, + 3, 0, NULL, 0), + SND_SOC_DAPM_PGA("REC Right Out", M98088_REG_4D_PWR_EN_OUT, + 2, 0, NULL, 0), + + SND_SOC_DAPM_MIXER("Left HP Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_hp_mixer_controls[0], + ARRAY_SIZE(max98088_left_hp_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right HP Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_hp_mixer_controls[0], + ARRAY_SIZE(max98088_right_hp_mixer_controls)), + + SND_SOC_DAPM_MIXER("Left SPK Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_speaker_mixer_controls[0], + ARRAY_SIZE(max98088_left_speaker_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right SPK Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_speaker_mixer_controls[0], + ARRAY_SIZE(max98088_right_speaker_mixer_controls)), + + SND_SOC_DAPM_MIXER("Left REC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_receiver_mixer_controls[0], + ARRAY_SIZE(max98088_left_receiver_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right REC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_rec_mixer_controls[0], + ARRAY_SIZE(max98088_right_rec_mixer_controls)), + + SND_SOC_DAPM_MIXER("Left ADC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_left_ADC_mixer_controls[0], + ARRAY_SIZE(max98088_left_ADC_mixer_controls)), + + SND_SOC_DAPM_MIXER("Right ADC Mixer", SND_SOC_NOPM, 0, 0, + &max98088_right_ADC_mixer_controls[0], + ARRAY_SIZE(max98088_right_ADC_mixer_controls)), + + SND_SOC_DAPM_PGA_E("INA1 Input", M98088_REG_4C_PWR_EN_IN, + 7, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("INA2 Input", M98088_REG_4C_PWR_EN_IN, + 7, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("INB1 Input", M98088_REG_4C_PWR_EN_IN, + 6, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_PGA_E("INB2 Input", M98088_REG_4C_PWR_EN_IN, + 6, 0, NULL, 0, max98088_pga_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_MICBIAS("Mic Bias", M98088_REG_4C_PWR_EN_IN, 3, 0), + + SND_SOC_DAPM_OUTPUT("HPL"), + SND_SOC_DAPM_OUTPUT("HPR"), + SND_SOC_DAPM_OUTPUT("SPKL"), + SND_SOC_DAPM_OUTPUT("SPKR"), + SND_SOC_DAPM_OUTPUT("RECL"), + SND_SOC_DAPM_OUTPUT("RECR"), + + SND_SOC_DAPM_INPUT("MIC1"), + SND_SOC_DAPM_INPUT("MIC2"), + SND_SOC_DAPM_INPUT("INA1"), + SND_SOC_DAPM_INPUT("INA2"), + SND_SOC_DAPM_INPUT("INB1"), + SND_SOC_DAPM_INPUT("INB2"), +}; + +/* DAPM AUDIO_MAP: */ +static const struct snd_soc_dapm_route audio_map[] = { + /* Left headphone output mixer */ + {"Left HP Mixer", "Left DAC1", "DACL1"}, + {"Left HP Mixer", "Left DAC2", "DACL2"}, + {"Left HP Mixer", "Right DAC1", "DACR1"}, + {"Left HP Mixer", "Right DAC2", "DACR2"}, + {"Left HP Mixer", "MIC1", "Mic Bias"}, + {"Left HP Mixer", "MIC2", "Mic Bias"}, + {"Left HP Mixer", "INA1", "INA1 Input"}, + {"Left HP Mixer", "INA2", "INA2 Input"}, + {"Left HP Mixer", "INB1", "INB1 Input"}, + {"Left HP Mixer", "INB2", "INB2 Input"}, + + /* Right headphone output mixer */ + {"Right HP Mixer", "Left DAC1", "DACL1"}, + {"Right HP Mixer", "Left DAC2", "DACL2" }, + {"Right HP Mixer", "Right DAC1", "DACR1"}, + {"Right HP Mixer", "Right DAC2", "DACR2"}, + {"Right HP Mixer", "MIC1", "Mic Bias"}, + {"Right HP Mixer", "MIC2", "Mic Bias"}, + {"Right HP Mixer", "INA1", "INA1 Input"}, + {"Right HP Mixer", "INA2", "INA2 Input"}, + {"Right HP Mixer", "INB1", "INB1 Input"}, + {"Right HP Mixer", "INB2", "INB2 Input"}, + + /* Left speaker output mixer */ + {"Left SPK Mixer", "Left DAC1", "DACL1"}, + {"Left SPK Mixer", "Left DAC2", "DACL2"}, + {"Left SPK Mixer", "Right DAC1", "DACR1"}, + {"Left SPK Mixer", "Right DAC2", "DACR2"}, + {"Left SPK Mixer", "MIC1", "Mic Bias"}, + {"Left SPK Mixer", "MIC2", "Mic Bias"}, + {"Left SPK Mixer", "INA1", "INA1 Input"}, + {"Left SPK Mixer", "INA2", "INA2 Input"}, + {"Left SPK Mixer", "INB1", "INB1 Input"}, + {"Left SPK Mixer", "INB2", "INB2 Input"}, + + /* Right speaker output mixer */ + {"Right SPK Mixer", "Left DAC1", "DACL1"}, + {"Right SPK Mixer", "Left DAC2", "DACL2"}, + {"Right SPK Mixer", "Right DAC1", "DACR1"}, + {"Right SPK Mixer", "Right DAC2", "DACR2"}, + {"Right SPK Mixer", "MIC1", "Mic Bias"}, + {"Right SPK Mixer", "MIC2", "Mic Bias"}, + {"Right SPK Mixer", "INA1", "INA1 Input"}, + {"Right SPK Mixer", "INA2", "INA2 Input"}, + {"Right SPK Mixer", "INB1", "INB1 Input"}, + {"Right SPK Mixer", "INB2", "INB2 Input"}, + + /* Earpiece/Receiver output mixer */ + {"Left REC Mixer", "Left DAC1", "DACL1"}, + {"Left REC Mixer", "Left DAC2", "DACL2"}, + {"Left REC Mixer", "Right DAC1", "DACR1"}, + {"Left REC Mixer", "Right DAC2", "DACR2"}, + {"Left REC Mixer", "MIC1", "Mic Bias"}, + {"Left REC Mixer", "MIC2", "Mic Bias"}, + {"Left REC Mixer", "INA1", "INA1 Input"}, + {"Left REC Mixer", "INA2", "INA2 Input"}, + {"Left REC Mixer", "INB1", "INB1 Input"}, + {"Left REC Mixer", "INB2", "INB2 Input"}, + + /* Earpiece/Receiver output mixer */ + {"Right REC Mixer", "Left DAC1", "DACL1"}, + {"Right REC Mixer", "Left DAC2", "DACL2"}, + {"Right REC Mixer", "Right DAC1", "DACR1"}, + {"Right REC Mixer", "Right DAC2", "DACR2"}, + {"Right REC Mixer", "MIC1", "Mic Bias"}, + {"Right REC Mixer", "MIC2", "Mic Bias"}, + {"Right REC Mixer", "INA1", "INA1 Input"}, + {"Right REC Mixer", "INA2", "INA2 Input"}, + {"Right REC Mixer", "INB1", "INB1 Input"}, + {"Right REC Mixer", "INB2", "INB2 Input"}, + + {"HP Left Out", NULL, "Left HP Mixer"}, + {"HP Right Out", NULL, "Right HP Mixer"}, + {"SPK Left Out", NULL, "Left SPK Mixer"}, + {"SPK Right Out", NULL, "Right SPK Mixer"}, + {"REC Left Out", NULL, "Left REC Mixer"}, + {"REC Right Out", NULL, "Right REC Mixer"}, + + {"HPL", NULL, "HP Left Out"}, + {"HPR", NULL, "HP Right Out"}, + {"SPKL", NULL, "SPK Left Out"}, + {"SPKR", NULL, "SPK Right Out"}, + {"RECL", NULL, "REC Left Out"}, + {"RECR", NULL, "REC Right Out"}, + + /* Left ADC input mixer */ + {"Left ADC Mixer", "MIC1", "Mic Bias"}, + {"Left ADC Mixer", "MIC2", "Mic Bias"}, + {"Left ADC Mixer", "INA1", "INA1 Input"}, + {"Left ADC Mixer", "INA2", "INA2 Input"}, + {"Left ADC Mixer", "INB1", "INB1 Input"}, + {"Left ADC Mixer", "INB2", "INB2 Input"}, + + /* Right ADC input mixer */ + {"Right ADC Mixer", "MIC1", "Mic Bias"}, + {"Right ADC Mixer", "MIC2", "Mic Bias"}, + {"Right ADC Mixer", "INA1", "INA1 Input"}, + {"Right ADC Mixer", "INA2", "INA2 Input"}, + {"Right ADC Mixer", "INB1", "INB1 Input"}, + {"Right ADC Mixer", "INB2", "INB2 Input"}, + + /* inputs */ + {"ADCL", NULL, "Left ADC Mixer"}, + {"ADCR", NULL, "Right ADC Mixer"}, + + {"INA1 Input", NULL, "INA1"}, + {"INA2 Input", NULL, "INA2"}, + {"INB1 Input", NULL, "INB1"}, + {"INB2 Input", NULL, "INB2"}, + + {"Mic Bias", NULL, "MIC1"}, + {"Mic Bias", NULL, "MIC2"}, +}; + +/* + * Add widgets + */ +static int max98088_add_widgets(struct snd_soc_codec *codec) +{ + snd_soc_dapm_new_controls(codec, max98088_dapm_widgets, + ARRAY_SIZE(max98088_dapm_widgets)); + + /* set up audio path interconnects */ + snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); + + snd_soc_dapm_new_widgets(codec); + return 0; +} + +/* + * Setup DAI1 format + */ +static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + u8 regval; + + cdata = &max98088->dai[0]; + + if (fmt != cdata->fmt) { + cdata->fmt = fmt; + + /* DAI clock master/slave wrt the codec */ + switch (fmt & SND_SOC_DAIFMT_CBS_CFS) { + case SND_SOC_DAIFMT_CBS_CFS: /* codec clk & frm slave */ + /* MAS: slave */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_MAS, 0); + /* slave mode PLL */ + max98088_write(codec, M98088_REG_12_DAI1_CLKCFG_HI, + 0x80); + max98088_write(codec, M98088_REG_13_DAI1_CLKCFG_LO, + 0x00); + break; + case SND_SOC_DAIFMT_CBM_CFM: /* codec clk, frm master */ + /* MAS: master */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + 0, M98088_DAI_MAS); + break; + case SND_SOC_DAIFMT_CBS_CFM: /* codec clk slv, frm mas */ + case SND_SOC_DAIFMT_CBM_CFS: /* codec clk mas, frm slv */ + dev_err(codec->dev, "Clock mode unsupported"); + return -EINVAL;; + } + + /* I2S or TDM */ + if ((fmt & SND_SOC_DAIFMT_I2S) == SND_SOC_DAIFMT_I2S) { + /* TDM: I2S */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_TDM, 0); + } else { + /* TDM: PCM/TDM */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + 0, M98088_DAI_TDM); + } + + /* DAI hardware signal inversions */ + switch (fmt & SND_SOC_DAIFMT_NB_NF) { + case SND_SOC_DAIFMT_NB_NF: + /* BCI: normal bclk (rise) */ + /* WCI: normal frame */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_BCI|M98088_DAI_WCI, 0); + break; + case SND_SOC_DAIFMT_NB_IF: + /* BCI: normal bclk (rise) */ + /* WCI: invert frame */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_BCI, M98088_DAI_WCI); + break; + case SND_SOC_DAIFMT_IB_NF: + /* BCI: invert bclk (fall) */ + /* WCI: normal frame */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_WCI, M98088_DAI_BCI); + break; + case SND_SOC_DAIFMT_IB_IF: + /* BCI: invert bclk (fall) */ + /* WCI: invert frame */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + 0, M98088_DAI_BCI|M98088_DAI_WCI); + break; + } + + regval = (1<<0); /* BSEL : 64*LRCLK (for master mode only) */ + if (max98088->digmic_mode) + regval |= (1<<6); /* OSR : oversample ratio */ + max98088_write(codec, M98088_REG_15_DAI1_CLOCK, regval); + + max98088_write(codec, M98088_REG_16_DAI1_IOCFG, + (1<<6) | /* SEL : map DAI1 to S1 */ + (0<<5) | /* LTEN : ADC->DAC loop-through enable */ + (0<<4) | /* LBEN : loopback (0=disable, 1=enable) */ + (0<<3) | /* DMONO : DAC SDIN (0=stereo, 1=mono) */ + (0<<2) | /* HIZOFF : ADC SDOUT (0=HiZ, 1=Drive) */ + (1<<1) | /* SDOEN : serial data out ENABLE */ + (1<<0)); /* SDIEN : serial data in ENABLE */ + + max98088_write(codec, M98088_REG_17_DAI1_TDM, + (0<<6) | /* SLOTL : L in 1st slot */ + (1<<4) | /* SLOTR : R in 2nd slot */ + (0<<0)); /* SLOTDLY : no delay */ + } + + return 0; +} + +/* + * Setup DAI2 format + */ +static int max98088_dai2_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[1]; + + if (fmt != cdata->fmt) { + cdata->fmt = fmt; + + /* DAI clock master/slave wrt the codec */ + switch (fmt & SND_SOC_DAIFMT_CBS_CFS) { + case SND_SOC_DAIFMT_CBS_CFS: /* codec clk & frm slave */ + /* MAS: slave */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_MAS, 0); + /* slave mode PLL */ + max98088_write(codec, M98088_REG_1A_DAI2_CLKCFG_HI, + 0x80); + max98088_write(codec, M98088_REG_1B_DAI2_CLKCFG_LO, + 0x00); + break; + case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & frm master */ + /* MAS: master */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + 0, M98088_DAI_MAS); + break; + case SND_SOC_DAIFMT_CBS_CFM: /* codec clk slv & frm mas */ + case SND_SOC_DAIFMT_CBM_CFS: /* codec clk mas & frm slv */ + dev_err(codec->dev, "Clock mode unsupported"); + return -EINVAL;; + } + + /* I2S or TDM */ + if ((fmt & SND_SOC_DAIFMT_I2S) == SND_SOC_DAIFMT_I2S) { + /* TDM: I2S */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_TDM, 0); + } else { + /* TDM: PCM/TDM */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + 0, M98088_DAI_TDM); + } + + /* DAI hardware signal inversions */ + switch (fmt & SND_SOC_DAIFMT_NB_NF) { + case SND_SOC_DAIFMT_NB_NF: + /* BCI: normal bclk (rise) */ + /* WCI: normal frame */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_BCI|M98088_DAI_WCI, 0); + break; + case SND_SOC_DAIFMT_NB_IF: + /* BCI: normal bclk (rise) */ + /* WCI: invert frame */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_BCI, M98088_DAI_WCI); + break; + case SND_SOC_DAIFMT_IB_NF: + /* BCI: invert bclk (fall) */ + /* WCI: normal frame */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_WCI, M98088_DAI_BCI); + break; + case SND_SOC_DAIFMT_IB_IF: + /* BCI: invert bclk (fall) */ + /* WCI: invert frame */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + 0, M98088_DAI_BCI|M98088_DAI_WCI); + break; + } + + max98088_write(codec, M98088_REG_1D_DAI2_CLOCK, + (1<<0)); /* BSEL: 64*LRCLK (for master mode only) */ + + max98088_write(codec, M98088_REG_1E_DAI2_IOCFG, + (2<<6) | /* SEL : map DAI2 to S2 */ + (0<<4) | /* LBEN : loopback (0=disable) */ + (0<<3) | /* DMONO : DAC SDIN input */ + (0<<2) | /* HIZOFF : ADC SDOUT (0=HiZ, 1=Drive) */ + (1<<1) | /* SDOEN : serial data out ENABLE */ + (1<<0)); /* SDIEN : serial data in ENABLE */ + + max98088_write(codec, M98088_REG_1F_DAI2_TDM, + (0<<6) | /* SLOTL : L in 1st slot */ + (1<<4) | /* SLOTR : R in 2nd slot */ + (0<<0)); /* SLOTDLY : no delay */ + } + + return 0; +} + +static int max98088_dai_set_sysclk(struct snd_soc_dai *dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = dai->codec; + struct max98088_priv *max98088 = codec->private_data; + + if (freq != max98088->sysclk) { + max98088->sysclk = freq; /* remember current sysclk */ + + /* setup clocks for slave mode, and using the PLL + * PSCLK = 0x01 (when master clk is 10MHz to 20MHz) + * 0x02 (when master clk is 20MHz to 30MHz).. + */ + if ((freq >= 10000000) && (freq < 20000000)) { + max98088_write(codec, M98088_REG_10_SYS_CLK, 0x10); + } else if ((freq >= 20000000) && (freq < 30000000)) { + max98088_write(codec, M98088_REG_10_SYS_CLK, 0x20); + } else { + dev_err(codec->dev, "Invalid master clock frequency\n"); + return -EINVAL; + } + + /* If codec is currently running, toggle reset */ + if (max98088_read(codec, M98088_REG_51_PWR_SYS) + & M98088_SHDNRUN) { + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, + M98088_SHDNRUN, 0); + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, + 0, M98088_SHDNRUN); + } + } + + dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq); + + max98088->sysclk = freq; + return 0; +} + + +struct rate_table_struct { + u32 rate; + u8 sr1; +}; + +/* codec mclk clock divider coefficients */ +static const struct rate_table_struct rate_table[] = { + {8000, 0x1}, + {11025, 0x2}, + {16000, 0x3}, + {22050, 0x4}, + {24000, 0x5}, + {32000, 0x6}, + {44100, 0x7}, + {48000, 0x8}, + {88200, 0x9}, + {96000, 0xA}, +}; + +static inline int rate_index(int rate) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(rate_table); i++) { + if (rate_table[i].rate >= rate) + return i; + } + return 0; +} + +/* Setup hw params and sample rate */ +static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_device *socdev = rtd->socdev; + struct snd_soc_codec *codec = socdev->card->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + unsigned int rate; + u8 reg11val; + u16 ni; + + cdata = &max98088->dai[0]; + + rate = params_rate(params); + + /* data 16/24 bit width */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + /* WS: 16bit */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + M98088_DAI_WS, 0); + break; + case SNDRV_PCM_FORMAT_S24_LE: + /* WS: 24bit */ + snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + 0, M98088_DAI_WS); + break; + } + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); + + if (rate != cdata->rate) { + /* set DAI1 SR1 value for the DSP; FREQ1:0=anyclock */ + reg11val = (rate_table[rate_index(rate)].sr1 << 4) | 0; + max98088_write(codec, M98088_REG_11_DAI1_CLKMODE, reg11val); + cdata->rate = rate; + } + + /* Configure NI when operating as master */ + if (max98088_read(codec, M98088_REG_14_DAI1_FORMAT) + & M98088_DAI_MAS) { + BUG_ON(max98088->sysclk == 0); + ni = (u16)ulldiv(65536ULL * (rate < 50000 ? 96ULL : 48ULL) + * (unsigned long long int)rate, + (unsigned long long int)max98088->sysclk); + max98088_write(codec, M98088_REG_12_DAI1_CLKCFG_HI, + (ni >> 8) & 0x7f); + max98088_write(codec, M98088_REG_13_DAI1_CLKCFG_LO, + ni & 0xff); + } + + /* Update sample rate mode */ + if (rate < 50000) + snd_soc_update_bits(codec, M98088_REG_18_DAI1_FILTERS, + (1<<3), 0); + else + snd_soc_update_bits(codec, M98088_REG_18_DAI1_FILTERS, + 0, (1<<3)); + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, 0, M98088_SHDNRUN); + + return 0; +} + +/* Setup hw params and sample rate */ +static int max98088_dai2_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_device *socdev = rtd->socdev; + struct snd_soc_codec *codec = socdev->card->codec; + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + unsigned int rate; + u8 reg19val; + u16 ni; + + cdata = &max98088->dai[1]; + + rate = params_rate(params); + + /* data 16/24 bit width */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + /* WS: 16bit */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + M98088_DAI_WS, 0); + break; + case SNDRV_PCM_FORMAT_S24_LE: + /* WS: 24bit */ + snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, + 0, M98088_DAI_WS); + break; + } + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); + + if (rate != cdata->rate) { + /* set DAI2 SR2 value for the DSP; FREQ1:0=anyclock */ + reg19val = (rate_table[rate_index(rate)].sr1 << 4) | 0; + max98088_write(codec, M98088_REG_19_DAI2_CLKMODE, reg19val); + cdata->rate = rate; + } + + /* Configure NI when operating as master */ + if (max98088_read(codec, M98088_REG_1C_DAI2_FORMAT) + & M98088_DAI_MAS) { + BUG_ON(max98088->sysclk == 0); + ni = (u16)ulldiv(65536ULL * (rate < 50000 ? 96ULL : 48ULL) + * (unsigned long long int)rate, + (unsigned long long int)max98088->sysclk); + max98088_write(codec, M98088_REG_1A_DAI2_CLKCFG_HI, + (ni >> 8) & 0x7f); + max98088_write(codec, M98088_REG_1B_DAI2_CLKCFG_LO, + ni & 0xff); + } + + /* Update sample rate mode */ + if (rate < 50000) + snd_soc_update_bits(codec, M98088_REG_20_DAI2_FILTERS, + (1<<3), 0); + else + snd_soc_update_bits(codec, M98088_REG_20_DAI2_FILTERS, + 0, (1<<3)); + + snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, 0, M98088_SHDNRUN); + + return 0; +} + +static void max98088_sync_cache(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + int i; + + /* write back cached values if they're writeable and + * different from the hardware default. + */ + for (i = 1; i < ARRAY_SIZE(max98088->reg_cache); i++) { + if (!max98088_access[i].writable) + continue; + + if (max98088->reg_cache[i] == max98088_reg[i]) + continue; + + snd_soc_write(codec, i, max98088->reg_cache[i]); + } +} + +static int max98088_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + switch (level) { + case SND_SOC_BIAS_ON: + max98088_write(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN); + break; + + case SND_SOC_BIAS_PREPARE: + max98088_write(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN); + break; + + case SND_SOC_BIAS_STANDBY: + max98088_sync_cache(codec); + max98088_write(codec, M98088_REG_51_PWR_SYS, + M98088_SHDNRUN|M98088_PWRSV); + break; + case SND_SOC_BIAS_OFF: + max98088_write(codec, M98088_REG_51_PWR_SYS, M98088_PWRSV); + break; + } + codec->bias_level = level; + return 0; +} + +#define MAX98088_RATES SNDRV_PCM_RATE_8000_96000 +#define MAX98088_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) + +static struct snd_soc_dai_ops max98088_dai1_ops = { + .set_sysclk = max98088_dai_set_sysclk, + .set_fmt = max98088_dai1_set_fmt, + .hw_params = max98088_dai1_hw_params, +}; + +static struct snd_soc_dai_ops max98088_dai2_ops = { + .set_sysclk = max98088_dai_set_sysclk, + .set_fmt = max98088_dai2_set_fmt, + .hw_params = max98088_dai2_hw_params, +}; + +struct snd_soc_dai max98088_dai[] = { +{ + .name = "HiFi", + .playback = { + .stream_name = "HiFi Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MAX98088_RATES, + .formats = MAX98088_FORMATS, + }, + .capture = { + .stream_name = "HiFi Capture", + .channels_min = 1, + .channels_max = 2, + .rates = MAX98088_RATES, + .formats = MAX98088_FORMATS, + }, + .ops = &max98088_dai1_ops, +}, +{ + .name = "Aux", + .playback = { + .stream_name = "Aux Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MAX98088_RATES, + .formats = MAX98088_FORMATS, + }, + .ops = &max98088_dai2_ops, +} +}; +EXPORT_SYMBOL_GPL(max98088_dai); + + +static void max98088_setup_eq1(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_eq_cfg *coef_set; + int best, best_val, save, i, sel, fs; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[0]; + + if (!pdata || !cdata->eq_textcnt) + return; + + /* Find the selected configuration with nearest sample rate */ + fs = cdata->rate; + sel = cdata->eq_sel; + + best = 0; + best_val = INT_MAX; + for (i = 0; i < pdata->eq1_cfgcnt; i++) { + if (strcmp(pdata->eq1_cfg[i].name, cdata->eq_texts[sel]) == 0 && + abs(pdata->eq1_cfg[i].rate - fs) < best_val) { + best = i; + best_val = abs(pdata->eq1_cfg[i].rate - fs); + } + } + + dev_dbg(codec->dev, "Selected %s/%dHz for %dHz sample rate\n", + pdata->eq1_cfg[best].name, + pdata->eq1_cfg[best].rate, fs); + + /* Disable EQ while configuring, and save current on/off state */ + save = snd_soc_read(codec, M98088_REG_49_CFG_LEVEL); + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ1EN, 0); + + coef_set = &pdata->eq1_cfg[sel]; + + m98088_eq_band(codec, 0, 0, coef_set->band1); + m98088_eq_band(codec, 0, 1, coef_set->band2); + m98088_eq_band(codec, 0, 2, coef_set->band3); + m98088_eq_band(codec, 0, 3, coef_set->band4); + m98088_eq_band(codec, 0, 4, coef_set->band5); + + /* restore original on/off state */ + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ1EN, save); +} + +static void max98088_setup_eq2(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_eq_cfg *coef_set; + int best, best_val, save, i, sel, fs; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[1]; + + if (!pdata || !cdata->eq_textcnt) + return; + + /* Find the selected configuration with nearest sample rate */ + fs = cdata->rate; + + sel = cdata->eq_sel; + best = 0; + best_val = INT_MAX; + for (i = 0; i < pdata->eq2_cfgcnt; i++) { + if (strcmp(pdata->eq2_cfg[i].name, cdata->eq_texts[sel]) == 0 && + abs(pdata->eq2_cfg[i].rate - fs) < best_val) { + best = i; + best_val = abs(pdata->eq2_cfg[i].rate - fs); + } + } + + dev_dbg(codec->dev, "Selected %s/%dHz for %dHz sample rate\n", + pdata->eq2_cfg[best].name, + pdata->eq2_cfg[best].rate, fs); + + /* Disable EQ while configuring, and save current on/off state */ + save = snd_soc_read(codec, M98088_REG_49_CFG_LEVEL); + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ2EN, 0); + + coef_set = &pdata->eq2_cfg[sel]; + + m98088_eq_band(codec, 1, 0, coef_set->band1); + m98088_eq_band(codec, 1, 1, coef_set->band2); + m98088_eq_band(codec, 1, 2, coef_set->band3); + m98088_eq_band(codec, 1, 3, coef_set->band4); + m98088_eq_band(codec, 1, 4, coef_set->band5); + + /* restore original on/off state */ + snd_soc_update_bits(codec, M98088_REG_49_CFG_LEVEL, M98088_EQ2EN, + save); +} + + +static int max98088_put_eq1_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int sel = ucontrol->value.integer.value[0]; + + cdata = &max98088->dai[0]; + + if (sel >= pdata->eq1_cfgcnt) + return -EINVAL; + + cdata->eq_sel = sel; + max98088_setup_eq1(codec); + return 0; +} + +static int max98088_put_eq2_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int sel = ucontrol->value.integer.value[0]; + + cdata = &max98088->dai[1]; + + if (sel >= pdata->eq2_cfgcnt) + return -EINVAL; + + cdata->eq_sel = sel; + max98088_setup_eq2(codec); + return 0; +} + +static int max98088_get_eq1_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[0]; + + ucontrol->value.enumerated.item[0] = cdata->eq_sel; + return 0; +} + +static int max98088_get_eq2_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[1]; + + ucontrol->value.enumerated.item[0] = cdata->eq_sel; + return 0; +} + +static void max98088_handle_eq1_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int ret, i, j; + + struct snd_kcontrol_new eq1control = + SOC_ENUM_EXT("EQ1 Mode", + max98088->dai[0].eq_enum, + max98088_get_eq1_enum, + max98088_put_eq1_enum); + + cdata = &max98088->dai[0]; + + /* Build an array of texts for the enum API. The number + * of texts is likely fewer than the number of configurations + * due to multiple sample rates for the same text name. */ + cdata->eq_textcnt = 0; + for (i = 0; i < pdata->eq1_cfgcnt; i++) { + for (j = 0; j < cdata->eq_textcnt; j++) { + if (strcmp(pdata->eq1_cfg[i].name, + cdata->eq_texts[j]) == 0) { + break; + } + } + + if (j != cdata->eq_textcnt) + continue; + + /* ...and remember the new version. */ + cdata->eq_texts[i] = pdata->eq1_cfg[i].name; + cdata->eq_textcnt++; + + if (cdata->eq_textcnt >= EQ_CFG_MAX) { + dev_err(codec->dev, "Too many EQ config entries\n"); + cdata->eq_textcnt--; + break; + } + } + + dev_dbg(codec->dev, "Installed %d EQ1 configurations\n", + cdata->eq_textcnt); + + /* now point the soc_enum to .texts array items */ + cdata->eq_enum.texts = cdata->eq_texts; + cdata->eq_enum.max = cdata->eq_textcnt; + + BUG_ON(&max98088->codec == 0); + BUG_ON((max98088->codec).card == 0); + + ret = snd_soc_add_controls(&max98088->codec, &eq1control, 1); + if (ret != 0) + dev_err(codec->dev, "Failed to add EQ control: %d\n", ret); +} + +static void max98088_handle_eq2_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int ret, i, j; + + struct snd_kcontrol_new eq2control = + SOC_ENUM_EXT("EQ2 Mode", + max98088->dai[1].eq_enum, + max98088_get_eq2_enum, + max98088_put_eq2_enum); + + cdata = &max98088->dai[1]; + + /* Build an array of texts for the enum API. The number + * of texts is likely fewer than the number of configurations + * due to multiple sample rates for the same text name. */ + cdata->eq_textcnt = 0; + for (i = 0; i < pdata->eq2_cfgcnt; i++) { + for (j = 0; j < cdata->eq_textcnt; j++) { + if (strcmp(pdata->eq2_cfg[i].name, + cdata->eq_texts[j]) == 0) { + break; + } + } + + if (j != cdata->eq_textcnt) + continue; + + cdata->eq_texts[i] = pdata->eq2_cfg[i].name; + cdata->eq_textcnt++; + + if (cdata->eq_textcnt >= EQ_CFG_MAX) { + dev_err(codec->dev, "Too many EQ config entries\n"); + cdata->eq_textcnt--; + break; + } + } + + dev_dbg(codec->dev, "Installed %d EQ2 configurations\n", + cdata->eq_textcnt); + + /* now point the soc_enum to .texts array items */ + cdata->eq_enum.texts = cdata->eq_texts; + cdata->eq_enum.max = cdata->eq_textcnt; + + ret = snd_soc_add_controls(&max98088->codec, &eq2control, 1); + if (ret != 0) + printk(KERN_ERR "Failed to add EQ control: %d\n", ret); +} + + +static void max98088_setup_ex1(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + struct max98088_excursion_cfg *coef_set; + int best, best_val, i, sel, fs; + + cdata = &max98088->dai[0]; + + if (!pdata || !cdata->ex_textcnt) + return; + + /* Find the selected configuration with nearest sample rate */ + fs = cdata->rate; + + sel = cdata->ex_sel; + best = 0; + best_val = INT_MAX; + for (i = 0; i < pdata->ex1_cfgcnt; i++) { + if (strcmp(pdata->ex1_cfg[i].name, + cdata->ex_texts[sel]) == 0 && + abs(pdata->ex1_cfg[i].rate - fs) < best_val) { + best = i; + best_val = abs(pdata->ex1_cfg[i].rate - fs); + } + } + + dev_dbg(codec->dev, "Selected %s/%dHz for %dHz sample rate\n", + pdata->ex1_cfg[best].name, + pdata->ex1_cfg[best].rate, fs); + + coef_set = &pdata->ex1_cfg[sel]; + + max98088_ex_resp_control(codec, M98088_REG_B6_DAI1_BIQUAD_BASE, + coef_set->resp); +} + +static int max98088_put_ex1_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int sel = ucontrol->value.integer.value[0]; + + cdata = &max98088->dai[0]; + + if (sel >= pdata->ex1_cfgcnt) + return -EINVAL; + + cdata->ex_sel = sel; + max98088_setup_ex1(codec); + return 0; +} + + +static int max98088_get_ex1_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[0]; + ucontrol->value.enumerated.item[0] = cdata->ex_sel; + + return 0; +} + +static void max98088_handle_ex1_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int ret, i, j; + + struct snd_kcontrol_new ex1control = + SOC_ENUM_EXT("EX1 Limiter Config", + max98088->dai[0].ex_enum, + max98088_get_ex1_enum, + max98088_put_ex1_enum); + + cdata = &max98088->dai[0]; + + /* Build an array of texts for the enum API. The number + * of texts is likely fewer than the number of configurations + * due to multiple sample rates for the same text name. */ + cdata->ex_textcnt = 0; + for (i = 0; i < pdata->ex1_cfgcnt; i++) { + for (j = 0; j < cdata->ex_textcnt; j++) { + if (strcmp(pdata->ex1_cfg[i].name, + cdata->ex_texts[j]) == 0) { + break; + } + } + + if (j != cdata->ex_textcnt) + continue; + + /* ...and remember the new version. */ + cdata->ex_texts[i] = pdata->ex1_cfg[i].name; + cdata->ex_textcnt++; + + if (cdata->ex_textcnt >= EX_CFG_MAX) { + dev_err(codec->dev, "Too many limiter configs\n"); + cdata->ex_textcnt--; + break; + } + } + + dev_dbg(codec->dev, "Installed %d EX1 configurations\n", + cdata->ex_textcnt); + + /* now point the soc_enum to .texts array */ + cdata->ex_enum.texts = cdata->ex_texts; + cdata->ex_enum.max = cdata->ex_textcnt; + ret = snd_soc_add_controls(&max98088->codec, &ex1control, 1); + if (ret != 0) + dev_err(codec->dev, "Failed to add limiter control\n"); +} + + +static void max98088_setup_ex2(struct snd_soc_codec *codec) +{ + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + struct max98088_excursion_cfg *coef_set; + int best, best_val, i, sel, fs; + + cdata = &max98088->dai[1]; + + if (!pdata || !cdata->ex_textcnt) + return; + + /* Find the selected configuration with nearest sample rate */ + fs = cdata->rate; + + sel = cdata->ex_sel; + best = 0; + best_val = INT_MAX; + for (i = 0; i < pdata->ex2_cfgcnt; i++) { + if (strcmp(pdata->ex2_cfg[i].name, + cdata->ex_texts[sel]) == 0 && + abs(pdata->ex2_cfg[i].rate - fs) < best_val) { + best = i; + best_val = abs(pdata->ex2_cfg[i].rate - fs); + } + } + + dev_dbg(codec->dev, "Selected %s/%dHz for %dHz sample rate\n", + pdata->ex2_cfg[best].name, + pdata->ex2_cfg[best].rate, fs); + + coef_set = &pdata->ex2_cfg[sel]; + + max98088_ex_resp_control(codec, M98088_REG_C0_DAI2_BIQUAD_BASE, + coef_set->resp); +} + +static int max98088_put_ex2_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int sel = ucontrol->value.integer.value[0]; + + cdata = &max98088->dai[1]; + + if (sel >= pdata->ex2_cfgcnt) + return -EINVAL; + + cdata->ex_sel = sel; + max98088_setup_ex2(codec); + return 0; +} + +static int max98088_get_ex2_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct max98088_priv *max98088 = codec->private_data; + struct max98088_cdata *cdata; + + cdata = &max98088->dai[1]; + ucontrol->value.enumerated.item[0] = cdata->ex_sel; + + return 0; +} + +static void max98088_handle_ex2_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + struct max98088_cdata *cdata; + int ret, i, j; + + struct snd_kcontrol_new ex2control = + SOC_ENUM_EXT("EX2 Limiter Config", + max98088->dai[1].ex_enum, + max98088_get_ex2_enum, + max98088_put_ex2_enum); + + cdata = &max98088->dai[1]; + + /* Build an array of texts for the enum API. The number + * of texts is likely fewer than the number of configurations + * due to multiple sample rates for the same text name. */ + cdata->ex_textcnt = 0; + for (i = 0; i < pdata->ex2_cfgcnt; i++) { + for (j = 0; j < cdata->ex_textcnt; j++) { + if (strcmp(pdata->ex2_cfg[i].name, + cdata->ex_texts[j]) == 0) { + break; + } + } + + if (j != cdata->ex_textcnt) + continue; + + /* ...and remember the new version. */ + cdata->ex_texts[i] = pdata->ex2_cfg[i].name; + cdata->ex_textcnt++; + + if (cdata->ex_textcnt >= EX_CFG_MAX) { + dev_err(codec->dev, "Too many limiter configs\n"); + cdata->ex_textcnt--; + break; + } + } + + dev_dbg(codec->dev, "Installed %d EX2 configurations\n", + cdata->ex_textcnt); + + /* now point the soc_enum to .texts array items */ + cdata->ex_enum.texts = cdata->ex_texts; + cdata->ex_enum.max = cdata->ex_textcnt; + + ret = snd_soc_add_controls(&max98088->codec, &ex2control, 1); + if (ret != 0) + dev_err(codec->dev, "Failed to add limiter control\n"); +} + +static void max98088_handle_pdata(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_pdata *pdata = max98088->pdata; + u8 regval; + + if (!pdata) + return; + + /* Configure digital mic / external mic */ + /* Digital mic needs REG_15 OSR1=1 */ + regval = ((0<<6) | /* digital mic clock freq = PCLK/8 */ + (0<<5) | /* DIGMICL enable */ + (0<<4) | /* DIGMICR enable */ + (0<<0)); /* external mic enable */ + + if (pdata->digmic_left_enable) + regval |= (1<<5); /* digital left mic enabled */ + + if (pdata->digmic_right_enable) + regval |= (1<<4); /* digital right mic enabled */ + + max98088->digmic_mode = (regval ? 1 : 0); + + if (pdata->extmic_mode < 3) + regval |= (pdata->extmic_mode << 0); /* external mic enabled */ + + max98088_write(codec, M98088_REG_48_CFG_MIC, regval); + + /* configure external mic to mic1 bypass, mic1 to mic2 bypass */ + regval = 0; + + if (pdata->ina_to_mic1_bypass) + regval |= (1<<7); + + if (pdata->mic1_to_mic2_bypass) + regval |= (1<<4); + + max98088_write(codec, M98088_REG_4A_CFG_BYPASS, regval); + + /* configure receiver output */ + regval = ((pdata->receiver_mode) ? (1<<7) : 0); + snd_soc_update_bits(codec, M98088_REG_2A_MIC_REC_CNTL, + (1<<7), regval); + + /* configure equalizers */ + if (pdata->eq1_cfgcnt) + max98088_handle_eq1_pdata(max98088); + + if (pdata->eq2_cfgcnt) + max98088_handle_eq2_pdata(max98088); + + /* configure excursion limiters */ + if (pdata->ex1_cfgcnt) + max98088_handle_ex1_pdata(max98088); + + if (pdata->ex2_cfgcnt) + max98088_handle_ex2_pdata(max98088); +} + +static int max98088_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + + return 0; +} + +static int max98088_resume(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + int i; + u8 *cache = codec->reg_cache; + + /* toggle reset the shutdown bit of the codec hardware */ + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + + /* Sync reg_cache with the hardware */ + for (i = 0; i < M98088_REG_CNT; i++) { + if (i == M98088_REG_51_PWR_SYS) + continue; + + if (!max98088_access[i].writable) + continue; + + max98088_hw_write(codec, i, cache[i]); + } + + /* now enter into the resume mode bias level */ + max98088_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + + return 0; +} + +/* + * Make sure that a max98088 is attached to the I2C bus. + */ +static int max98088_probe(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec; + struct max98088_priv *max98088; + int ret = 0; + + dev_printk(KERN_INFO, &pdev->dev, "MAX98088 Audio CODEC\n"); + + if (!max98088_codec) { + dev_err(&pdev->dev, "Codec device is not registered\n"); + return -EINVAL; + } + + socdev->card->codec = max98088_codec; + codec = max98088_codec; + max98088 = codec->private_data; + + /* register pcms */ + ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); + if (ret < 0) { + dev_err(&pdev->dev, "failed to create pcms: %d\n", ret); + goto pcm_err; + } + + snd_soc_add_controls(codec, max98088_snd_controls, + ARRAY_SIZE(max98088_snd_controls)); + + /* install additional amixer controls: EQ and excursion limiter */ + if (max98088->pdata) + max98088_handle_pdata(max98088); + else + dev_err(&pdev->dev, "No platform data\n"); + + max98088_add_widgets(codec); + + ret = snd_soc_init_card(socdev); + if (ret < 0) { + dev_err(&pdev->dev, "failed to register card\n"); + goto card_err; + } + + return 0; + +card_err: + snd_soc_free_pcms(socdev); + snd_soc_dapm_free(socdev); + +pcm_err: + return ret; +} + +static int max98088_remove(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + + if (codec->control_data) + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + + snd_soc_free_pcms(socdev); + snd_soc_dapm_free(socdev); + + return 0; +} + +/* expose to machine driver */ +struct snd_soc_codec_device soc_codec_dev_max98088 = { + .probe = max98088_probe, + .remove = max98088_remove, + .suspend = max98088_suspend, + .resume = max98088_resume, +}; +EXPORT_SYMBOL_GPL(soc_codec_dev_max98088); + + +static int max98088_register(struct max98088_priv *max98088, + enum snd_soc_control_type control) + +{ + int ret, i, version; + struct snd_soc_codec *codec = &max98088->codec; + struct max98088_cdata *cdata; + + if (max98088_codec) { + dev_err(codec->dev, "Another MAX98088 is registered\n"); + ret = -EINVAL; + goto err; + } + + mutex_init(&codec->mutex); + INIT_LIST_HEAD(&codec->dapm_widgets); + INIT_LIST_HEAD(&codec->dapm_paths); + + codec->name = "MAX98088"; + codec->owner = THIS_MODULE; + codec->read = max98088_read; + codec->write = max98088_write; + + /* setup DAPM event bias level and handler function */ + codec->bias_level = SND_SOC_BIAS_STANDBY; + codec->set_bias_level = max98088_set_bias_level; + + codec->dai = max98088_dai; + codec->num_dai = ARRAY_SIZE(max98088_dai); + codec->private_data = max98088; + + codec->reg_cache_size = M98088_REG_CNT; + codec->reg_cache = &max98088->reg_cache; + codec->volatile_register = max98088_volatile_register; + + memcpy(codec->reg_cache, max98088_reg, sizeof(max98088_reg)); + + version = max98088_read(codec, M98088_REG_FF_REV_ID); + dev_dbg(codec->dev, "MAX98088 revision 0x%02X\n", version); + + /* initalize private data */ + + max98088->sysclk = (unsigned)-1; + + cdata = &max98088->dai[0]; + cdata->rate = (unsigned)-1; + cdata->fmt = (unsigned)-1; + cdata->eq_textcnt = 0; + cdata->eq_sel = 0; + cdata->ex_textcnt = 0; + cdata->ex_sel = 0; + + cdata = &max98088->dai[1]; + cdata->rate = (unsigned)-1; + cdata->fmt = (unsigned)-1; + cdata->eq_textcnt = 0; + cdata->eq_sel = 0; + cdata->ex_textcnt = 0; + cdata->ex_sel = 0; + + max98088_write(codec, M98088_REG_14_DAI1_FORMAT, M98088_DAI_DLY); + max98088_write(codec, M98088_REG_1C_DAI2_FORMAT, M98088_DAI_DLY); + + max98088->power_state = 0; /* INA INB power enable state */ + max98088->ex_mode = 0; /* excursion limiter mode */ + max98088->digmic_mode = 0; /* 0=normal, 1=digital mic used */ + + /* disable device via dapm interface */ + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + + /* initialize registers cache to hardware default */ + max98088_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + + max98088_write(codec, M98088_REG_0F_IRQ_ENABLE, 0x00); + + max98088_write(codec, M98088_REG_22_MIX_DAC, + M98088_DAI1L_TO_DACL|M98088_DAI2L_TO_DACL| + M98088_DAI1R_TO_DACR|M98088_DAI2R_TO_DACR); + + max98088_write(codec, M98088_REG_4E_BIAS_CNTL, 0xF0); + max98088_write(codec, M98088_REG_50_DAC_BIAS2, 0x0F); + + /* power on device */ + max98088_codec = codec; + for (i = 0; i < codec->num_dai; i++) + max98088_dai[i].dev = codec->dev; + + ret = snd_soc_register_codec(codec); + if (ret != 0) { + dev_err(codec->dev, "Failed to register codec: %d\n", ret); + goto err; + } + + ret = snd_soc_register_dais(&max98088_dai[0], codec->num_dai); + if (ret != 0) { + dev_err(codec->dev, "Failed to register DAIs: %d\n", ret); + goto err_codec; + } + + return ret; + +err_codec: + snd_soc_unregister_codec(codec); +err: + kfree(max98088); + + return ret; +} + +static void max98088_unregister(struct max98088_priv *max98088) +{ + struct snd_soc_codec *codec = &max98088->codec; + snd_soc_unregister_dais(max98088_dai, codec->num_dai); + snd_soc_unregister_codec(codec); + kfree(max98088); + max98088_codec = NULL; +} + +static int max98088_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct snd_soc_codec *codec; + struct max98088_priv *max98088; + + max98088 = kzalloc(sizeof(struct max98088_priv), GFP_KERNEL); + if (max98088 == NULL) + return -ENOMEM; + + /* codec structure is inside the private data */ + codec = &(max98088->codec); + + codec->private_data = max98088; + + codec->hw_write = (hw_write_t) i2c_master_send; + i2c_set_clientdata(i2c, max98088); + codec->control_data = i2c; + + max98088->pdata = i2c->dev.platform_data; + + codec->dev = &i2c->dev; + + return max98088_register(max98088, SND_SOC_I2C); +} + +static int max98088_i2c_remove(struct i2c_client *client) +{ + struct max98088_priv *max98088 = i2c_get_clientdata(client); + max98088_unregister(max98088); + return 0; +} + +static const struct i2c_device_id max98088_i2c_id[] = { + { "max98088", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, max98088_i2c_id); + + +static struct i2c_driver max98088_i2c_driver = { + .driver = { + .name = "MAX98088 I2C Codec", + .owner = THIS_MODULE, + }, + .probe = max98088_i2c_probe, + .remove = __devexit_p(max98088_i2c_remove), + .id_table = max98088_i2c_id, +}; + +static int __init max98088_init(void) +{ + int ret; + + ret = i2c_add_driver(&max98088_i2c_driver); + if (ret) + pr_err("Failed to register max98088 I2C driver: %d\n", ret); + + return ret; +} + +static void __exit max98088_exit(void) +{ + i2c_del_driver(&max98088_i2c_driver); +} + +module_init(max98088_init); +module_exit(max98088_exit); + +MODULE_DESCRIPTION("ALSA SoC MAX98088 driver"); +MODULE_AUTHOR("Peter Hsiang <peter.hsiang(a)maxim-ic.com>"); +MODULE_AUTHOR("Jesse Marroquin <jesse.marroquin(a)maxim-ic.com>"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/max98088.h b/sound/soc/codecs/max98088.h new file mode 100644 index 0000000..f7ef4c2 --- /dev/null +++ b/sound/soc/codecs/max98088.h @@ -0,0 +1,161 @@ +/* + * max98088.h -- MAX98088 ALSA SoC Audio driver + * + * Copyright 2010 Maxim Integrated Products + * + * 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. + */ + +#ifndef _MAX98088_H +#define _MAX98088_H + +/* + * MAX98088 Registers Definition + */ +#define M98088_REG_00_IRQ_STATUS 0x00 +#define M98088_REG_01_MIC_STATUS 0x01 +#define M98088_REG_02_JACK_STAUS 0x02 +#define M98088_REG_03_BATTERY_VOLTAGE 0x03 +#define M98088_REG_0F_IRQ_ENABLE 0x0F +#define M98088_REG_10_SYS_CLK 0x10 +#define M98088_REG_11_DAI1_CLKMODE 0x11 +#define M98088_REG_12_DAI1_CLKCFG_HI 0x12 +#define M98088_REG_13_DAI1_CLKCFG_LO 0x13 +#define M98088_REG_14_DAI1_FORMAT 0x14 +#define M98088_REG_15_DAI1_CLOCK 0x15 +#define M98088_REG_16_DAI1_IOCFG 0x16 +#define M98088_REG_17_DAI1_TDM 0x17 +#define M98088_REG_18_DAI1_FILTERS 0x18 +#define M98088_REG_19_DAI2_CLKMODE 0x19 +#define M98088_REG_1A_DAI2_CLKCFG_HI 0x1A +#define M98088_REG_1B_DAI2_CLKCFG_LO 0x1B +#define M98088_REG_1C_DAI2_FORMAT 0x1C +#define M98088_REG_1D_DAI2_CLOCK 0x1D +#define M98088_REG_1E_DAI2_IOCFG 0x1E +#define M98088_REG_1F_DAI2_TDM 0x1F +#define M98088_REG_20_DAI2_FILTERS 0x20 +#define M98088_REG_21_SRC 0x21 +#define M98088_REG_22_MIX_DAC 0x22 +#define M98088_REG_23_MIX_ADC_LEFT 0x23 +#define M98088_REG_24_MIX_ADC_RIGHT 0x24 +#define M98088_REG_25_MIX_HP_LEFT 0x25 +#define M98088_REG_26_MIX_HP_RIGHT 0x26 +#define M98088_REG_27_MIX_HP_CNTL 0x27 +#define M98088_REG_28_MIX_REC_LEFT 0x28 +#define M98088_REG_29_MIX_REC_RIGHT 0x29 +#define M98088_REG_2A_MIC_REC_CNTL 0x2A +#define M98088_REG_2B_MIX_SPK_LEFT 0x2B +#define M98088_REG_2C_MIX_SPK_RIGHT 0x2C +#define M98088_REG_2D_MIX_SPK_CNTL 0x2D +#define M98088_REG_2E_LVL_SIDETONE 0x2E +#define M98088_REG_2F_LVL_DAI1_PLAY 0x2F +#define M98088_REG_30_LVL_DAI1_PLAY_EQ 0x30 +#define M98088_REG_31_LVL_DAI2_PLAY 0x31 +#define M98088_REG_32_LVL_DAI2_PLAY_EQ 0x32 +#define M98088_REG_33_LVL_ADC_L 0x33 +#define M98088_REG_34_LVL_ADC_R 0x34 +#define M98088_REG_35_LVL_MIC1 0x35 +#define M98088_REG_36_LVL_MIC2 0x36 +#define M98088_REG_37_LVL_INA 0x37 +#define M98088_REG_38_LVL_INB 0x38 +#define M98088_REG_39_LVL_HP_L 0x39 +#define M98088_REG_3A_LVL_HP_R 0x3A +#define M98088_REG_3B_LVL_REC_L 0x3B +#define M98088_REG_3C_LVL_REC_R 0x3C +#define M98088_REG_3D_LVL_SPK_L 0x3D +#define M98088_REG_3E_LVL_SPK_R 0x3E +#define M98088_REG_3F_MICAGC_CFG 0x3F +#define M98088_REG_40_MICAGC_THRESH 0x40 +#define M98088_REG_41_SPKDHP 0x41 +#define M98088_REG_42_SPKDHP_THRESH 0x42 +#define M98088_REG_43_SPKALC_COMP 0x43 +#define M98088_REG_44_PWRLMT_CFG 0x44 +#define M98088_REG_45_PWRLMT_TIME 0x45 +#define M98088_REG_46_THDLMT_CFG 0x46 +#define M98088_REG_47_CFG_AUDIO_IN 0x47 +#define M98088_REG_48_CFG_MIC 0x48 +#define M98088_REG_49_CFG_LEVEL 0x49 +#define M98088_REG_4A_CFG_BYPASS 0x4A +#define M98088_REG_4B_CFG_JACKDET 0x4B +#define M98088_REG_4C_PWR_EN_IN 0x4C +#define M98088_REG_4D_PWR_EN_OUT 0x4D +#define M98088_REG_4E_BIAS_CNTL 0x4E +#define M98088_REG_4F_DAC_BIAS1 0x4F +#define M98088_REG_50_DAC_BIAS2 0x50 +#define M98088_REG_51_PWR_SYS 0x51 +#define M98088_REG_52_DAI1_EQ_BASE 0x52 +#define M98088_REG_84_DAI2_EQ_BASE 0x84 +#define M98088_REG_B6_DAI1_BIQUAD_BASE 0xB6 +#define M98088_REG_C0_DAI2_BIQUAD_BASE 0xC0 +#define M98088_REG_FF_REV_ID 0xFF + +#define M98088_REG_CNT (0xFF+1) + +/* MAX98088 Registers Bit Fields */ + +/* M98088_REG_14_DAI1_FORMAT, M98088_REG_1C_DAI2_FORMAT */ + #define M98088_DAI_MAS (1<<7) + #define M98088_DAI_WCI (1<<6) + #define M98088_DAI_BCI (1<<5) + #define M98088_DAI_DLY (1<<4) + #define M98088_DAI_TDM (1<<2) + #define M98088_DAI_FSW (1<<1) + #define M98088_DAI_WS (1<<0) + +/* M98088_REG_22_MIX_DAC */ + #define M98088_DAI1L_TO_DACL (1<<7) + #define M98088_DAI1R_TO_DACL (1<<6) + #define M98088_DAI2L_TO_DACL (1<<5) + #define M98088_DAI2R_TO_DACL (1<<4) + #define M98088_DAI1L_TO_DACR (1<<3) + #define M98088_DAI1R_TO_DACR (1<<2) + #define M98088_DAI2L_TO_DACR (1<<1) + #define M98088_DAI2R_TO_DACR (1<<0) + +/* M98088_REG_3A_LVL_HEADPHONE_R */ + #define M98088_HP_MUTE (1<<7) + +/* M98088_REG_3C_LVL_RECEIVER_R */ + #define M98088_REC_MUTE (1<<7) + +/* M98088_REG_3E_LVL_SPEAKER_R */ + #define M98088_SP_MUTE (1<<7) + +/* M98088_REG_49_CFG_LEVEL */ + #define M98088_VSEN (1<<6) + #define M98088_ZDEN (1<<5) + #define M98088_EQ2EN (1<<1) + #define M98088_EQ1EN (1<<0) + +/* M98088_REG_4D_PWR_EN_OUT */ + #define M98088_HPLEN (1<<7) + #define M98088_HPREN (1<<6) + #define M98088_HPEN ((1<<7)|(1<<6)) + #define M98088_SPLEN (1<<5) + #define M98088_SPREN (1<<4) + #define M98088_RECEN (1<<3) + #define M98088_DALEN (1<<1) + #define M98088_DAREN (1<<0) + +/* M98088_REG_51_PWR_SYS */ + #define M98088_SHDNRUN (1<<7) + #define M98088_PERFMODE (1<<3) + #define M98088_HPPLYBACK (1<<2) + #define M98088_PWRSV8K (1<<1) + #define M98088_PWRSV (1<<0) + +#define M98088_COEFS_PER_BAND 5 + +#define M98088_BYTE1(w) ((w >> 8) & 0xff) +#define M98088_BYTE0(w) (w & 0xff) + +struct max98088_setup_data { + unsigned short i2c_address; +}; + +extern struct snd_soc_dai max98088_dai[]; +extern struct snd_soc_codec_device soc_codec_dev_max98088; + +#endif -- 1.6.3.3

2 5

[alsa-devel] PROBLEM: snd_intel_hda audio regression in 2.6.36-rc5
by Aki Parviainen 22 Sep '10

22 Sep '10

I've noticed an audio related problem in 2.6.36-rc5: when using 2.6.36-rc5 kernel I don't get normal two channel PCM audio at all on my machine, however multichannel audio works just fine. I'm using snd_hda_intel and I've configured ALSA to send all audio to spdif output. With earlier kernel versions this kind of setup works just fine but with 2.6.36-rc5 only audio that works is digital preencoded audio (5.1 dolby digital from dvd:s / mkv:s) works. There's no errors or anything but nothing comes to my amplifier. I've also tested 2.6.36-rc4 and it has the same problem, in the past I've never had any audio problems with mainline kernels. Booting with earlier kernel solves the problem immediately. I'm using the following .asoundrc to forward all audio to spdif: pcm.!default { type plug slave { pcm "iec958" rate 48000 format S16_LE } } Kernel: Self compiled 2.6.36-rc5 Kernel version: Linux version 2.6.36-rc5 (app@ht) (gcc version 4.4.5 20100913 (prerelease) (Debian 4.4.4-15) ) #1 SMP PREEMPT Tue Sep 21 18:10:22 EEST 2010 Kernel .config at end of mail Most recent kernel version which did not have the bug: 2.6.35.5 Environment: Debian unstable x86-64, alsa-version 1.0.23 Software: Linux ht 2.6.36-rc5 #1 SMP PREEMPT Tue Sep 21 18:10:22 EEST 2010 x86_64 GNU/Linux Gnu C 4.4.5 Gnu make 3.81 binutils 2.20.1 util-linux scripts/ver_linux: 23: fdformat: not found mount support module-init-tools found Linux C Library 2.11.2 Dynamic linker (ldd) 2.11.2 Procps 3.2.8 Kbd 1.15.2 Sh-utils 8.5 Modules Loaded isofs udf i915 drm_kms_helper drm i2c_algo_bit video output acpi_cpufreq mperf sco bnep cpufreq_userspace cpufreq_stats rfcomm l2cap kvm_intel kvm fuse nls_iso8859_1 cifs fscache ipv6 hwmon_vid sbs sbshc coretemp ir_lirc_codec lirc_dev ir_sony_decoder ir_jvc_decoder ir_rc6_decoder ir_rc5_decoder ir_nec_decoder mantis mantis_core ir_core tda665x mb86a16 tda10023 zl10353 stv0299 loop snd_hda_codec_analog tda10021 snd_hda_intel snd_hda_codec snd_hwdep snd_pcm_oss snd_mixer_oss snd_pcm snd_seq_dummy snd_seq_oss snd_seq_midi snd_rawmidi snd_seq_midi_event budget_av saa7146_vv snd_seq videodev v4l1_compat v4l2_compat_ioctl32 snd_timer videobuf_dma_sg snd_seq_device videobuf_core budget_core dvb_core saa7146 ttpci_eeprom snd btusb bluetooth rfkill psmouse asus_atk0110 serio_raw intel_agp soundcore snd_page_alloc rtc_cmos rtc_core rtc_lib i2c_i801 i2c_core evdev processor button sg sr_mod cdrom sd_mod ata_generic firewire_ohci pata_acpi usbhid crc_t10dif firewire_core skge ahci libahci uhci_hcd pata_jmicron thermal ehci_hcdLinux ht 2.6.36-rc5 #1 SMP PREEMPT Tue Sep 21 18:10:22 EEST 2010 x86_64 GNU/Linux Gnu C 4.4.5 Gnu make 3.81 binutils 2.20.1 util-linux scripts/ver_linux: 23: fdformat: not found mount support module-init-tools found Linux C Library 2.11.2 Dynamic linker (ldd) 2.11.2 Procps 3.2.8 Kbd 1.15.2 Sh-utils 8.5 Modules Loaded isofs udf i915 drm_kms_helper drm i2c_algo_bit video output acpi_cpufreq mperf sco bnep cpufreq_userspace cpufreq_stats rfcomm l2cap kvm_intel kvm fuse nls_iso8859_1 cifs fscache ipv6 hwmon_vid sbs sbshc coretemp ir_lirc_codec lirc_dev ir_sony_decoder ir_jvc_decoder ir_rc6_decoder ir_rc5_decoder ir_nec_decoder mantis mantis_core ir_core tda665x mb86a16 tda10023 zl10353 stv0299 loop snd_hda_codec_analog tda10021 snd_hda_intel snd_hda_codec snd_hwdep snd_pcm_oss snd_mixer_oss snd_pcm snd_seq_dummy snd_seq_oss snd_seq_midi snd_rawmidi snd_seq_midi_event budget_av saa7146_vv snd_seq videodev v4l1_compat v4l2_compat_ioctl32 snd_timer videobuf_dma_sg snd_seq_device videobuf_core budget_core dvb_core saa7146 ttpci_eeprom snd btusb bluetooth rfkill psmouse asus_atk0110 serio_raw intel_agp soundcore snd_page_alloc rtc_cmos rtc_core rtc_lib i2c_i801 i2c_core evdev processor button sg sr_mod cdrom sd_mod ata_generic firewire_ohci pata_acpi usbhid crc_t10dif firewire_core skge ahci libahci uhci_hcd pata_jmicron thermal ehci_hcd Processor information: processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Core(TM)2 Quad CPU Q6600 @ 2.40GHz stepping : 11 cpu MHz : 2394.000 cache size : 4096 KB Module information: isofs 28121 0 - Live 0xffffffffa0585000 udf 67899 1 - Live 0xffffffffa056c000 i915 259433 2 - Live 0xffffffffa051a000 drm_kms_helper 28230 1 i915, Live 0xffffffffa050b000 drm 181570 3 i915,drm_kms_helper, Live 0xffffffffa04c9000 i2c_algo_bit 4634 1 i915, Live 0xffffffffa04c2000 video 12424 1 i915, Live 0xffffffffa04b7000 output 2119 1 video, Live 0xffffffffa04b1000 acpi_cpufreq 5527 1 - Live 0xffffffffa04a9000 mperf 1347 1 acpi_cpufreq, Live 0xffffffffa04a3000 sco 7675 2 - Live 0xffffffffa049b000 bnep 10100 2 - Live 0xffffffffa048c000 cpufreq_userspace 2080 0 - Live 0xffffffffa0495000 cpufreq_stats 3620 0 - Live 0xffffffffa0486000 rfcomm 30076 8 - Live 0xffffffffa0476000 l2cap 31078 16 bnep,rfcomm, Live 0xffffffffa0458000 kvm_intel 42482 0 - Live 0xffffffffa0445000 kvm 174507 1 kvm_intel, Live 0xffffffffa0409000 fuse 59593 1 - Live 0xffffffffa03f0000 nls_iso8859_1 4489 2 - Live 0xffffffffa03e9000 cifs 229425 3 - Live 0xffffffffa03a4000 fscache 41602 1 cifs, Live 0xffffffffa038f000 ipv6 254704 22 - Live 0xffffffffa033b000 hwmon_vid 2090 0 - Live 0xffffffffa0329000 sbs 6278 0 - Live 0xffffffffa0322000 sbshc 4163 1 sbs, Live 0xffffffffa031b000 coretemp 5052 0 - Live 0xffffffffa0314000 ir_lirc_codec 3440 0 - Live 0xffffffffa030e000 lirc_dev 9041 1 ir_lirc_codec, Live 0xffffffffa0305000 ir_sony_decoder 2069 0 - Live 0xffffffffa02ff000 ir_jvc_decoder 2210 0 - Live 0xffffffffa02f9000 ir_rc6_decoder 2578 0 - Live 0xffffffffa02f3000 ir_rc5_decoder 2066 0 - Live 0xffffffffa02ed000 ir_nec_decoder 2386 0 - Live 0xffffffffa02e7000 mantis 16265 0 - Live 0xffffffffa02dd000 mantis_core 29516 1 mantis, Live 0xffffffffa02ce000 ir_core 16002 7 ir_lirc_codec,ir_sony_decoder,ir_jvc_decoder,ir_rc6_decoder,ir_rc5_decoder,ir_nec_decoder,mantis_core, Live 0xffffffffa02c3000 tda665x 2990 1 mantis, Live 0xffffffffa02bd000 mb86a16 17977 1 mantis, Live 0xffffffffa02b3000 tda10023 5852 1 mantis, Live 0xffffffffa02ac000 zl10353 6529 1 mantis, Live 0xffffffffa02a5000 stv0299 8898 1 mantis, Live 0xffffffffa029d000 loop 13254 0 - Live 0xffffffffa0293000 snd_hda_codec_analog 73369 1 - Live 0xffffffffa0279000 tda10021 5392 2 mantis, Live 0xffffffffa0272000 snd_hda_intel 22412 3 - Live 0xffffffffa0265000 snd_hda_codec 87688 2 snd_hda_codec_analog,snd_hda_intel, Live 0xffffffffa0241000 snd_hwdep 5594 1 snd_hda_codec, Live 0xffffffffa023a000 snd_pcm_oss 30600 0 - Live 0xffffffffa022b000 snd_mixer_oss 12612 1 snd_pcm_oss, Live 0xffffffffa0221000 snd_pcm 67021 4 snd_hda_intel,snd_hda_codec,snd_pcm_oss, Live 0xffffffffa0204000 snd_seq_dummy 1494 0 - Live 0xffffffffa01fe000 snd_seq_oss 24051 0 - Live 0xffffffffa01f1000 snd_seq_midi 4684 0 - Live 0xffffffffa018d000 snd_rawmidi 19154 1 snd_seq_midi, Live 0xffffffffa01ea000 snd_seq_midi_event 6227 2 snd_seq_oss,snd_seq_midi, Live 0xffffffffa016c000 budget_av 22791 8 - Live 0xffffffffa01e2000 saa7146_vv 41408 1 budget_av, Live 0xffffffffa01d5000 snd_seq 45334 6 snd_seq_dummy,snd_seq_oss,snd_seq_midi,snd_seq_midi_event, Live 0xffffffffa01c7000 videodev 65532 1 saa7146_vv, Live 0xffffffffa0141000 v4l1_compat 11823 1 videodev, Live 0xffffffffa013c000 v4l2_compat_ioctl32 8814 1 videodev, Live 0xffffffffa012a000 snd_timer 18556 2 snd_pcm,snd_seq, Live 0xffffffffa011e000 videobuf_dma_sg 8765 1 saa7146_vv, Live 0xffffffffa010f000 snd_seq_device 5888 5 snd_seq_dummy,snd_seq_oss,snd_seq_midi,snd_rawmidi,snd_seq, Live 0xffffffffa00ec000 videobuf_core 17336 2 saa7146_vv,videobuf_dma_sg, Live 0xffffffffa00e3000 budget_core 8310 1 budget_av, Live 0xffffffffa00c9000 dvb_core 88181 4 mantis_core,stv0299,budget_av,budget_core, Live 0xffffffffa01a7000 saa7146 14648 3 budget_av,saa7146_vv,budget_core, Live 0xffffffffa00b6000 ttpci_eeprom 1677 1 budget_core, Live 0xffffffffa009e000 snd 58773 17 snd_hda_codec_analog,snd_hda_intel,snd_hda_codec,snd_hwdep,snd_pcm_oss,snd_mixer_oss,snd_pcm,snd_seq_oss,snd_rawmidi,snd_seq,snd_timer,snd_seq_device, Live 0xffffffffa008a000 btusb 10640 2 - Live 0xffffffffa0048000 bluetooth 51576 9 sco,bnep,rfcomm,l2cap,btusb, Live 0xffffffffa005b000 rfkill 17059 2 bluetooth, Live 0xffffffffa002e000 psmouse 35356 0 - Live 0xffffffffa0018000 asus_atk0110 7194 0 - Live 0xffffffffa0007000 serio_raw 4126 0 - Live 0xffffffffa0000000 intel_agp 27303 2 i915, Live 0xffffffffa0199000 soundcore 6491 1 snd, Live 0xffffffffa0191000 snd_page_alloc 7396 2 snd_hda_intel,snd_pcm, Live 0xffffffffa0189000 rtc_cmos 8551 0 - Live 0xffffffffa0180000 rtc_core 14135 1 rtc_cmos, Live 0xffffffffa0175000 rtc_lib 2502 1 rtc_core, Live 0xffffffffa016f000 i2c_i801 7515 0 - Live 0xffffffffa0168000 i2c_core 22319 17 i915,drm_kms_helper,drm,i2c_algo_bit,mantis,mantis_core,tda665x,mb86a16,tda10023,zl10353,stv0299,tda10021,budget_av,videodev,budget_core,ttpci_eeprom,i2c_i801, Live 0xffffffffa015a000 evdev 7593 12 - Live 0xffffffffa0152000 processor 29022 1 acpi_cpufreq, Live 0xffffffffa0132000 button 5630 1 i915, Live 0xffffffffa011a000 sg 22825 0 - Live 0xffffffffa0107000 sr_mod 12173 1 - Live 0xffffffffa00fe000 cdrom 31777 1 sr_mod, Live 0xffffffffa00ef000 sd_mod 26271 6 - Live 0xffffffffa00cd000 ata_generic 3435 0 - Live 0xffffffffa00e9000 firewire_ohci 22781 0 - Live 0xffffffffa00c1000 pata_acpi 3203 0 - Live 0xffffffffa00bb000 usbhid 23926 0 - Live 0xffffffffa00a1000 crc_t10dif 1443 1 sd_mod, Live 0xffffffffa009b000 firewire_core 47389 1 firewire_ohci, Live 0xffffffffa0075000 skge 33605 0 - Live 0xffffffffa006a000 ahci 19893 0 - Live 0xffffffffa0083000 libahci 19831 5 ahci, Live 0xffffffffa0041000 uhci_hcd 18683 0 - Live 0xffffffffa004d000 pata_jmicron 2523 1 - Live 0xffffffffa0058000 thermal 8345 0 - Live 0xffffffffa0022000 ehci_hcd 30995 0 - Live 0xffffffffa000e000 Loaded driver and hardware information: 0000-0cf7 : PCI Bus 0000:00 0000-001f : dma1 0020-0021 : pic1 0040-0043 : timer0 0050-0053 : timer1 0060-0060 : keyboard 0064-0064 : keyboard 0070-0071 : rtc0 0080-008f : dma page reg 00a0-00a1 : pic2 00c0-00df : dma2 00f0-00ff : fpu 0290-0297 : pnp 00:07 03c0-03df : vesafb 03f8-03ff : serial 0400-041f : 0000:00:1f.3 0480-04bf : 0000:00:1f.0 0480-04bf : pnp 00:08 04d0-04d1 : pnp 00:08 0800-087f : 0000:00:1f.0 0800-087f : pnp 00:08 0800-0803 : ACPI PM1a_EVT_BLK 0804-0805 : ACPI PM1a_CNT_BLK 0808-080b : ACPI PM_TMR 0810-0815 : ACPI CPU throttle 0828-082f : ACPI GPE0_BLK 0cf8-0cff : PCI conf1 0d00-ffff : PCI Bus 0000:00 1000-1fff : PCI Bus 0000:02 b000-bfff : PCI Bus 0000:01 b400-b40f : 0000:01:00.1 b400-b40f : pata_jmicron b480-b483 : 0000:01:00.1 b480-b483 : pata_jmicron b800-b807 : 0000:01:00.1 b800-b807 : pata_jmicron b880-b883 : 0000:01:00.1 b880-b883 : pata_jmicron bc00-bc07 : 0000:01:00.1 bc00-bc07 : pata_jmicron c000-cfff : PCI Bus 0000:03 c000-c0ff : 0000:03:04.0 c000-c0ff : skge c400-c47f : 0000:03:03.0 c480-c4bf : 0000:03:01.0 c800-c80f : 0000:03:01.0 c880-c88f : 0000:03:01.0 cc00-cc1f : 0000:03:01.0 d480-d49f : 0000:00:1d.0 d480-d49f : uhci_hcd d800-d81f : 0000:00:1d.1 d800-d81f : uhci_hcd d880-d89f : 0000:00:1d.2 d880-d89f : uhci_hcd dc00-dc1f : 0000:00:1a.0 dc00-dc1f : uhci_hcd e000-e01f : 0000:00:1a.1 e000-e01f : uhci_hcd e080-e09f : 0000:00:1f.2 e080-e09f : ahci e400-e403 : 0000:00:1f.2 e400-e403 : ahci e480-e487 : 0000:00:1f.2 e480-e487 : ahci e800-e803 : 0000:00:1f.2 e800-e803 : ahci e880-e887 : 0000:00:1f.2 e880-e887 : ahci ec00-ec07 : 0000:00:02.0 00000000-0000ffff : reserved 00010000-0009ebff : System RAM 0009ec00-0009ffff : reserved 000a0000-000bffff : PCI Bus 0000:00 000c0000-000cffff : pnp 00:0c 000d0000-000dffff : PCI Bus 0000:00 000e4000-000fffff : reserved 00100000-7ef8ffff : System RAM 01000000-01357468 : Kernel code 01357469-01530a6f : Kernel data 015ab000-0160f51f : Kernel bss 7ef90000-7ef9dfff : ACPI Tables 7ef9e000-7efdffff : ACPI Non-volatile Storage 7efe0000-7effffff : reserved 7f000000-ffffffff : PCI Bus 0000:00 7f000000-7f3fffff : PCI Bus 0000:02 7f400000-7f5fffff : PCI Bus 0000:01 7f600000-7f6000ff : 0000:00:1f.3 7f601000-7f601fff : Intel Flush Page bfd00000-bfdfffff : PCI Bus 0000:02 bfe00000-bfefffff : PCI Bus 0000:03 bfeff000-bfefffff : 0000:03:00.0 bfeff000-bfefffff : Mantis Core d0000000-dfffffff : 0000:00:02.0 d0000000-d017ffff : vesafb e0000000-efffffff : PCI MMCONFIG 0000 [bus 00-ff] e0000000-efffffff : pnp 00:0b fec00000-fec003ff : IOAPIC 0 fed00000-fed003ff : HPET 0 fed14000-fed19fff : pnp 00:01 fed1c000-fed1ffff : pnp 00:08 fed20000-fed8ffff : pnp 00:08 fee00000-fee00fff : Local APIC fee00000-fee00fff : reserved fee00000-fee00fff : pnp 00:0a ff400000-ff4fffff : PCI Bus 0000:01 ff4e0000-ff4effff : 0000:01:00.0 ff4fe000-ff4fffff : 0000:01:00.0 ff4fe000-ff4fffff : ahci ff500000-ff5fffff : PCI Bus 0000:03 ff5c0000-ff5dffff : 0000:03:04.0 ff5f8000-ff5fbfff : 0000:03:04.0 ff5f8000-ff5fbfff : skge ff5ff000-ff5ff7ff : 0000:03:03.0 ff5ff000-ff5ff7ff : firewire_ohci ff5ffc00-ff5ffdff : 0000:03:02.0 ff5ffc00-ff5ffdff : saa7146 ff800000-ff8fffff : 0000:00:02.1 ff9f4000-ff9f7fff : 0000:00:1b.0 ff9f4000-ff9f7fff : ICH HD audio ff9fac00-ff9fafff : 0000:00:1d.7 ff9fac00-ff9fafff : ehci_hcd ff9fb000-ff9fb3ff : 0000:00:1a.7 ff9fb000-ff9fb3ff : ehci_hcd ff9fb400-ff9fb40f : 0000:00:03.0 ff9fb800-ff9fbfff : 0000:00:1f.2 ff9fb800-ff9fbfff : ahci ffa00000-ffafffff : 0000:00:02.0 ffb00000-ffffffff : reserved fff00000-fffffffe : pnp 00:08 PCI information: 00:00.0 Host bridge: Intel Corporation 82P965/G965 Memory Controller Hub (rev 02) Subsystem: ASUSTeK Computer Inc. Device 820b Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort+ >SERR- <PERR+ INTx- Latency: 0 Capabilities: [e0] Vendor Specific Information: Len=09 <?> Kernel driver in use: agpgart-intel 00:02.0 VGA compatible controller: Intel Corporation 82G965 Integrated Graphics Controller (rev 02) (prog-if 00 [VGA controller]) Subsystem: ASUSTeK Computer Inc. Device 820b Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin A routed to IRQ 42 Region 0: Memory at ffa00000 (32-bit, non-prefetchable) [size=1M] Region 2: Memory at d0000000 (64-bit, prefetchable) [size=256M] Region 4: I/O ports at ec00 [size=8] Expansion ROM at <unassigned> [disabled] Capabilities: [90] MSI: Enable+ Count=1/1 Maskable- 64bit- Address: fee0f00c Data: 4181 Capabilities: [d0] Power Management version 2 Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Kernel driver in use: i915 00:02.1 Display controller: Intel Corporation 82G965 Integrated Graphics Controller (rev 02) Subsystem: ASUSTeK Computer Inc. Device 820b Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Region 0: Memory at ff800000 (32-bit, non-prefetchable) [size=1M] Capabilities: [d0] Power Management version 2 Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- 00:03.0 Communication controller: Intel Corporation 82P965/G965 HECI Controller (rev 02) Subsystem: ASUSTeK Computer Inc. Device 820b Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin A routed to IRQ 10 Region 0: Memory at ff9fb400 (64-bit, non-prefetchable) [size=16] Capabilities: [50] Power Management version 3 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst+ PME-Enable- DSel=0 DScale=0 PME- Capabilities: [8c] MSI: Enable- Count=1/1 Maskable- 64bit+ Address: 0000000000000000 Data: 0000 00:1a.0 USB Controller: Intel Corporation 82801H (ICH8 Family) USB UHCI Controller #4 (rev 02) (prog-if 00 [UHCI]) Subsystem: ASUSTeK Computer Inc. P5B Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin A routed to IRQ 16 Region 4: I/O ports at dc00 [size=32] Kernel driver in use: uhci_hcd 00:1a.1 USB Controller: Intel Corporation 82801H (ICH8 Family) USB UHCI Controller #5 (rev 02) (prog-if 00 [UHCI]) Subsystem: ASUSTeK Computer Inc. P5B Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin B routed to IRQ 17 Region 4: I/O ports at e000 [size=32] Kernel driver in use: uhci_hcd 00:1a.7 USB Controller: Intel Corporation 82801H (ICH8 Family) USB2 EHCI Controller #2 (rev 02) (prog-if 20 [EHCI]) Subsystem: ASUSTeK Computer Inc. P5B Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin C routed to IRQ 18 Region 0: Memory at ff9fb000 (32-bit, non-prefetchable) [size=1K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=375mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [58] Debug port: BAR=1 offset=00a0 Kernel driver in use: ehci_hcd 00:1b.0 Audio device: Intel Corporation 82801H (ICH8 Family) HD Audio Controller (rev 02) Subsystem: ASUSTeK Computer Inc. Device 821a Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 32 bytes Interrupt: pin A routed to IRQ 41 Region 0: Memory at ff9f4000 (64-bit, non-prefetchable) [size=16K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [60] MSI: Enable+ Count=1/1 Maskable- 64bit+ Address: 00000000fee0f00c Data: 4179 Capabilities: [70] Express (v1) Root Complex Integrated Endpoint, MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s <64ns, L1 <1us ExtTag- RBE- FLReset- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop+ MaxPayload 128 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr+ TransPend- LnkCap: Port #0, Speed unknown, Width x0, ASPM unknown, Latency L0 <64ns, L1 <1us ClockPM- Surprise- LLActRep- BwNot- LnkCtl: ASPM Disabled; Disabled- Retrain- CommClk- ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed unknown, Width x0, TrErr- Train- SlotClk- DLActive- BWMgmt- ABWMgmt- Capabilities: [100 v1] Virtual Channel Caps: LPEVC=0 RefClk=100ns PATEntryBits=1 Arb: Fixed- WRR32- WRR64- WRR128- Ctrl: ArbSelect=Fixed Status: InProgress- VC0: Caps: PATOffset=00 MaxTimeSlots=1 RejSnoopTrans- Arb: Fixed- WRR32- WRR64- WRR128- TWRR128- WRR256- Ctrl: Enable+ ID=0 ArbSelect=Fixed TC/VC=01 Status: NegoPending- InProgress- VC1: Caps: PATOffset=00 MaxTimeSlots=1 RejSnoopTrans- Arb: Fixed- WRR32- WRR64- WRR128- TWRR128- WRR256- Ctrl: Enable- ID=0 ArbSelect=Fixed TC/VC=00 Status: NegoPending- InProgress- Capabilities: [130 v1] Root Complex Link Desc: PortNumber=0f ComponentID=00 EltType=Config Link0: Desc: TargetPort=00 TargetComponent=00 AssocRCRB- LinkType=MemMapped LinkValid+ Addr: 00000000fed1c000 Kernel driver in use: HDA Intel 00:1c.0 PCI bridge: Intel Corporation 82801H (ICH8 Family) PCI Express Port 1 (rev 02) (prog-if 00 [Normal decode]) Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR+ FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 32 bytes Bus: primary=00, secondary=02, subordinate=02, sec-latency=0 I/O behind bridge: 00001000-00001fff Memory behind bridge: 7f000000-7f3fffff Prefetchable memory behind bridge: 00000000bfd00000-00000000bfdfffff Secondary status: 66MHz- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- <SERR- <PERR- BridgeCtl: Parity- SERR+ NoISA- VGA- MAbort- >Reset- FastB2B- PriDiscTmr- SecDiscTmr- DiscTmrStat- DiscTmrSERREn- Capabilities: [40] Express (v1) Root Port (Slot+), MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s unlimited, L1 unlimited ExtTag- RBE+ FLReset- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop- MaxPayload 128 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr+ TransPend- LnkCap: Port #1, Speed 2.5GT/s, Width x2, ASPM L0s L1, Latency L0 <1us, L1 <4us ClockPM- Surprise- LLActRep+ BwNot- LnkCtl: ASPM Disabled; RCB 64 bytes Disabled- Retrain- CommClk- ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed 2.5GT/s, Width x0, TrErr- Train- SlotClk+ DLActive- BWMgmt- ABWMgmt- SltCap: AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug+ Surprise+ Slot #0, PowerLimit 0.000W; Interlock- NoCompl- SltCtl: Enable: AttnBtn- PwrFlt- MRL- PresDet- CmdCplt- HPIrq- LinkChg- Control: AttnInd Unknown, PwrInd Unknown, Power- Interlock- SltSta: Status: AttnBtn- PowerFlt- MRL- CmdCplt- PresDet- Interlock- Changed: MRL- PresDet- LinkState- RootCtl: ErrCorrectable- ErrNon-Fatal- ErrFatal- PMEIntEna- CRSVisible- RootCap: CRSVisible- RootSta: PME ReqID 0000, PMEStatus- PMEPending- Capabilities: [80] MSI: Enable- Count=1/1 Maskable- 64bit- Address: 00000000 Data: 0000 Capabilities: [90] Subsystem: ASUSTeK Computer Inc. Device 821a Capabilities: [a0] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [100 v1] Virtual Channel Caps: LPEVC=0 RefClk=100ns PATEntryBits=1 Arb: Fixed+ WRR32- WRR64- WRR128- Ctrl: ArbSelect=Fixed Status: InProgress- VC0: Caps: PATOffset=00 MaxTimeSlots=1 RejSnoopTrans- Arb: Fixed+ WRR32- WRR64- WRR128- TWRR128- WRR256- Ctrl: Enable+ ID=0 ArbSelect=Fixed TC/VC=01 Status: NegoPending- InProgress- Capabilities: [180 v1] Root Complex Link Desc: PortNumber=01 ComponentID=00 EltType=Config Link0: Desc: TargetPort=00 TargetComponent=00 AssocRCRB- LinkType=MemMapped LinkValid+ Addr: 00000000fed1c001 00:1c.4 PCI bridge: Intel Corporation 82801H (ICH8 Family) PCI Express Port 5 (rev 02) (prog-if 00 [Normal decode]) Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR+ FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 32 bytes Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 I/O behind bridge: 0000b000-0000bfff Memory behind bridge: ff400000-ff4fffff Prefetchable memory behind bridge: 000000007f400000-000000007f5fffff Secondary status: 66MHz- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- <SERR- <PERR- BridgeCtl: Parity- SERR+ NoISA- VGA- MAbort- >Reset- FastB2B- PriDiscTmr- SecDiscTmr- DiscTmrStat- DiscTmrSERREn- Capabilities: [40] Express (v1) Root Port (Slot+), MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s unlimited, L1 unlimited ExtTag- RBE+ FLReset- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop- MaxPayload 128 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr+ TransPend- LnkCap: Port #5, Speed 2.5GT/s, Width x1, ASPM L0s L1, Latency L0 <256ns, L1 <4us ClockPM- Surprise- LLActRep+ BwNot- LnkCtl: ASPM Disabled; RCB 64 bytes Disabled- Retrain- CommClk+ ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed 2.5GT/s, Width x1, TrErr- Train- SlotClk+ DLActive+ BWMgmt- ABWMgmt- SltCap: AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug+ Surprise+ Slot #0, PowerLimit 0.000W; Interlock- NoCompl- SltCtl: Enable: AttnBtn- PwrFlt- MRL- PresDet- CmdCplt- HPIrq- LinkChg- Control: AttnInd Unknown, PwrInd Unknown, Power- Interlock- SltSta: Status: AttnBtn- PowerFlt- MRL- CmdCplt- PresDet+ Interlock- Changed: MRL- PresDet+ LinkState+ RootCtl: ErrCorrectable- ErrNon-Fatal- ErrFatal- PMEIntEna- CRSVisible- RootCap: CRSVisible- RootSta: PME ReqID 0000, PMEStatus- PMEPending- Capabilities: [80] MSI: Enable- Count=1/1 Maskable- 64bit- Address: 00000000 Data: 0000 Capabilities: [90] Subsystem: ASUSTeK Computer Inc. Device 821a Capabilities: [a0] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [100 v1] Virtual Channel Caps: LPEVC=0 RefClk=100ns PATEntryBits=1 Arb: Fixed+ WRR32- WRR64- WRR128- Ctrl: ArbSelect=Fixed Status: InProgress- VC0: Caps: PATOffset=00 MaxTimeSlots=1 RejSnoopTrans- Arb: Fixed+ WRR32- WRR64- WRR128- TWRR128- WRR256- Ctrl: Enable+ ID=0 ArbSelect=Fixed TC/VC=01 Status: NegoPending- InProgress- Capabilities: [180 v1] Root Complex Link Desc: PortNumber=05 ComponentID=00 EltType=Config Link0: Desc: TargetPort=00 TargetComponent=00 AssocRCRB- LinkType=MemMapped LinkValid+ Addr: 00000000fed1c001 00:1d.0 USB Controller: Intel Corporation 82801H (ICH8 Family) USB UHCI Controller #1 (rev 02) (prog-if 00 [UHCI]) Subsystem: ASUSTeK Computer Inc. P5B Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin A routed to IRQ 23 Region 4: I/O ports at d480 [size=32] Kernel driver in use: uhci_hcd 00:1d.1 USB Controller: Intel Corporation 82801H (ICH8 Family) USB UHCI Controller #2 (rev 02) (prog-if 00 [UHCI]) Subsystem: ASUSTeK Computer Inc. P5B Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin B routed to IRQ 19 Region 4: I/O ports at d800 [size=32] Kernel driver in use: uhci_hcd 00:1d.2 USB Controller: Intel Corporation 82801H (ICH8 Family) USB UHCI Controller #3 (rev 02) (prog-if 00 [UHCI]) Subsystem: ASUSTeK Computer Inc. P5B Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin C routed to IRQ 18 Region 4: I/O ports at d880 [size=32] Kernel driver in use: uhci_hcd 00:1d.7 USB Controller: Intel Corporation 82801H (ICH8 Family) USB2 EHCI Controller #1 (rev 02) (prog-if 20 [EHCI]) Subsystem: ASUSTeK Computer Inc. P5B Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin A routed to IRQ 23 Region 0: Memory at ff9fac00 (32-bit, non-prefetchable) [size=1K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=375mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [58] Debug port: BAR=1 offset=00a0 Kernel driver in use: ehci_hcd 00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev f2) (prog-if 01 [Subtractive decode]) Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR+ FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Bus: primary=00, secondary=03, subordinate=03, sec-latency=32 I/O behind bridge: 0000c000-0000cfff Memory behind bridge: ff500000-ff5fffff Prefetchable memory behind bridge: 00000000bfe00000-00000000bfefffff Secondary status: 66MHz- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort+ <SERR- <PERR+ BridgeCtl: Parity- SERR+ NoISA- VGA- MAbort- >Reset- FastB2B- PriDiscTmr- SecDiscTmr- DiscTmrStat- DiscTmrSERREn- Capabilities: [50] Subsystem: ASUSTeK Computer Inc. Device 821a 00:1f.0 ISA bridge: Intel Corporation 82801HB/HR (ICH8/R) LPC Interface Controller (rev 02) Subsystem: ASUSTeK Computer Inc. Device 821a Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Capabilities: [e0] Vendor Specific Information: Len=0c <?> 00:1f.2 SATA controller: Intel Corporation 82801HB (ICH8) 4 port SATA AHCI Controller (rev 02) (prog-if 01 [AHCI 1.0]) Subsystem: ASUSTeK Computer Inc. Device 821a Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ Status: Cap+ 66MHz+ UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin B routed to IRQ 40 Region 0: I/O ports at e880 [size=8] Region 1: I/O ports at e800 [size=4] Region 2: I/O ports at e480 [size=8] Region 3: I/O ports at e400 [size=4] Region 4: I/O ports at e080 [size=32] Region 5: Memory at ff9fb800 (32-bit, non-prefetchable) [size=2K] Capabilities: [80] MSI: Enable+ Count=1/16 Maskable- 64bit- Address: fee0f00c Data: 4161 Capabilities: [70] Power Management version 3 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot+,D3cold-) Status: D0 NoSoftRst+ PME-Enable- DSel=0 DScale=0 PME- Capabilities: [a8] SATA HBA v1.0 BAR4 Offset=00000004 Kernel driver in use: ahci 00:1f.3 SMBus: Intel Corporation 82801H (ICH8 Family) SMBus Controller (rev 02) Subsystem: ASUSTeK Computer Inc. Device 821a Control: I/O+ Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Interrupt: pin C routed to IRQ 18 Region 0: Memory at 7f600000 (32-bit, non-prefetchable) [size=256] Region 4: I/O ports at 0400 [size=32] 01:00.0 SATA controller: JMicron Technology Corp. JMB362/JMB363 Serial ATA Controller (rev 03) (prog-if 01 [AHCI 1.0]) Subsystem: ASUSTeK Computer Inc. P5B [JMB363] Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 32 bytes Interrupt: pin A routed to IRQ 16 Region 5: Memory at ff4fe000 (32-bit, non-prefetchable) [size=8K] Expansion ROM at ff4e0000 [disabled] [size=64K] Capabilities: [68] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot+,D3cold-) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [50] Express (v1) Legacy Endpoint, MSI 01 DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s <64ns, L1 <1us ExtTag- AttnBtn- AttnInd- PwrInd- RBE- FLReset- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop- MaxPayload 128 bytes, MaxReadReq 512 bytes DevSta: CorrErr- UncorrErr- FatalErr+ UnsuppReq+ AuxPwr- TransPend- LnkCap: Port #1, Speed 2.5GT/s, Width x1, ASPM L0s, Latency L0 <1us, L1 <16us ClockPM- Surprise- LLActRep- BwNot- LnkCtl: ASPM Disabled; RCB 64 bytes Disabled- Retrain- CommClk+ ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed 2.5GT/s, Width x1, TrErr- Train- SlotClk+ DLActive- BWMgmt- ABWMgmt- Kernel driver in use: ahci 01:00.1 IDE interface: JMicron Technology Corp. JMB362/JMB363 Serial ATA Controller (rev 03) (prog-if 85 [Master SecO PriO]) Subsystem: ASUSTeK Computer Inc. P5B [JMB363] Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 Interrupt: pin B routed to IRQ 17 Region 0: I/O ports at bc00 [size=8] Region 1: I/O ports at b880 [size=4] Region 2: I/O ports at b800 [size=8] Region 3: I/O ports at b480 [size=4] Region 4: I/O ports at b400 [size=16] Capabilities: [68] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Kernel driver in use: pata_jmicron 03:00.0 Multimedia controller: Twinhan Technology Co. Ltd Mantis DTV PCI Bridge Controller [Ver 1.0] (rev 01) Subsystem: TERRATEC Electronic GmbH Device 1178 Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 64 (2000ns min, 63750ns max) Interrupt: pin A routed to IRQ 21 Region 0: Memory at bfeff000 (32-bit, prefetchable) [size=4K] Kernel driver in use: Mantis 03:01.0 Multimedia audio controller: VIA Technologies Inc. ICE1712 [Envy24] PCI Multi-Channel I/O Controller (rev 02) Subsystem: VIA Technologies Inc. Hoontech ST Audio DSP 24 Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 64 Interrupt: pin A routed to IRQ 3 Region 0: I/O ports at cc00 [size=32] Region 1: I/O ports at c880 [size=16] Region 2: I/O ports at c800 [size=16] Region 3: I/O ports at c480 [size=64] Capabilities: [80] Power Management version 1 Flags: PMEClk- DSI- D1- D2+ AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- 03:02.0 Multimedia controller: Philips Semiconductors SAA7146 (rev 01) Subsystem: TERRATEC Electronic GmbH Terratec Cynergy 1200C Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 64 (3750ns min, 9500ns max) Interrupt: pin A routed to IRQ 23 Region 0: Memory at ff5ffc00 (32-bit, non-prefetchable) [size=512] Kernel driver in use: budget_av 03:03.0 FireWire (IEEE 1394): VIA Technologies, Inc. VT6306/7/8 [Fire II(M)] IEEE 1394 OHCI Controller (rev c0) (prog-if 10 [OHCI]) Subsystem: ASUSTeK Computer Inc. M4A series motherboard Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 64 (8000ns max), Cache Line Size: 32 bytes Interrupt: pin A routed to IRQ 21 Region 0: Memory at ff5ff000 (32-bit, non-prefetchable) [size=2K] Region 1: I/O ports at c400 [size=128] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2+ AuxCurrent=0mA PME(D0-,D1-,D2+,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Kernel driver in use: firewire_ohci 03:04.0 Ethernet controller: Marvell Technology Group Ltd. 88E8001 Gigabit Ethernet Controller (rev 14) Subsystem: ASUSTeK Computer Inc. Marvell 88E8001 Gigabit Ethernet Controller (Asus) Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz+ UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 64 (5750ns min, 7750ns max), Cache Line Size: 32 bytes Interrupt: pin A routed to IRQ 19 Region 0: Memory at ff5f8000 (32-bit, non-prefetchable) [size=16K] Region 1: I/O ports at c000 [size=256] Expansion ROM at ff5c0000 [disabled] [size=128K] Capabilities: [48] Power Management version 2 Flags: PMEClk- DSI- D1+ D2+ AuxCurrent=0mA PME(D0+,D1+,D2+,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=1 PME- Capabilities: [50] Vital Product Data Product Name: Marvell Yukon 88E8001 Gigabit Ethernet Controller Read-only fields: [PN] Part number: Yukon 88E8001 [EC] Engineering changes: Rev. 1.4 [MN] Manufacture ID: 4d 61 72 76 65 6c 6c [SN] Serial number: AbCdEfG48C1DF [CP] Extended capability: 01 10 cc 03 [RV] Reserved: checksum good, 9 byte(s) reserved Read/write fields: [RW] Read-write area: 121 byte(s) free End Kernel driver in use: skge SCSI information: Attached devices: Host: scsi0 Channel: 00 Id: 00 Lun: 00 Vendor: HL-DT-ST Model: DVDRAM GSA-4163B Rev: A106 Type: CD-ROM ANSI SCSI revision: 05 Host: scsi2 Channel: 00 Id: 00 Lun: 00 Vendor: ATA Model: WDC WD2500YS-01S Rev: 20.0 Type: Direct-Access ANSI SCSI revision: 05 Host: scsi7 Channel: 00 Id: 00 Lun: 00 Vendor: ATA Model: WDC WD5000AAKS-0 Rev: 01.0 Type: Direct-Access ANSI SCSI revision: 05 Other information: Contents of /proc/asound/card0/codec#0 : Codec: Analog Devices AD1988 Address: 0 AFG Function Id: 0x1 (unsol 0) Vendor Id: 0x11d41988 Subsystem Id: 0x104381e1 Revision Id: 0x100400 No Modem Function Group found Default PCM: rates [0x7ff]: 8000 11025 16000 22050 32000 44100 48000 88200 96000 176400 192000 bits [0xe]: 16 20 24 formats [0x1]: PCM Default Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Default Amp-Out caps: ofs=0x27, nsteps=0x27, stepsize=0x05, mute=0 GPIO: io=2, o=0, i=0, unsolicited=1, wake=0 IO[0]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 IO[1]: enable=0, dir=0, wake=0, sticky=0, data=1, unsol=0 Node 0x02 [Audio Output] wcaps 0x30311: Stereo Digital Control: name="IEC958 Playback Con Mask", index=0, device=0 Control: name="IEC958 Playback Pro Mask", index=0, device=0 Control: name="IEC958 Playback Default", index=0, device=0 Control: name="IEC958 Playback Switch", index=0, device=0 Control: name="IEC958 Default PCM Playback Switch", index=0, device=0 Control: name="IEC958 Playback Source", index=0, device=0 Device: name="AD198x Digital", type="SPDIF", device=1 Converter: stream=8, channel=0 Digital: Enabled GenLevel Digital category: 0x2 PCM: rates [0x7e0]: 44100 48000 88200 96000 176400 192000 bits [0xe]: 16 20 24 formats [0x5]: PCM AC3 Delay: 3 samples Connection: 1 0x1d Node 0x03 [Audio Output] wcaps 0x405: Stereo Amp-Out Amp-Out caps: ofs=0x27, nsteps=0x27, stepsize=0x05, mute=0 Amp-Out vals: [0x27 0x27] Converter: stream=0, channel=0 Power states: D0 D3 Power: setting=D0, actual=D0 Node 0x04 [Audio Output] wcaps 0x405: Stereo Amp-Out Control: name="Front Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Device: name="AD198x Analog", type="Audio", device=0 Amp-Out caps: ofs=0x27, nsteps=0x27, stepsize=0x05, mute=0 Amp-Out vals: [0x23 0x23] Converter: stream=0, channel=0 Power states: D0 D3 Power: setting=D0, actual=D0 Node 0x05 [Audio Output] wcaps 0x405: Stereo Amp-Out Control: name="Center Playback Volume", index=0, device=0 ControlAmp: chs=1, dir=Out, idx=0, ofs=0 Control: name="LFE Playback Volume", index=0, device=0 ControlAmp: chs=2, dir=Out, idx=0, ofs=0 Amp-Out caps: ofs=0x27, nsteps=0x27, stepsize=0x05, mute=0 Amp-Out vals: [0x00 0x00] Converter: stream=0, channel=0 Power states: D0 D3 Power: setting=D0, actual=D0 Node 0x06 [Audio Output] wcaps 0x405: Stereo Amp-Out Control: name="Surround Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Amp-Out caps: ofs=0x27, nsteps=0x27, stepsize=0x05, mute=0 Amp-Out vals: [0x00 0x00] Converter: stream=0, channel=0 Power states: D0 D3 Power: setting=D0, actual=D0 Node 0x07 [Audio Input] wcaps 0x130391: Stereo Digital Converter: stream=0, channel=0 SDI-Select: 0 Digital: Digital category: 0x0 PCM: rates [0x7e0]: 44100 48000 88200 96000 176400 192000 bits [0xe]: 16 20 24 formats [0x5]: PCM AC3 Unsolicited: tag=00, enabled=0 Delay: 3 samples Connection: 1 0x1c Node 0x08 [Audio Input] wcaps 0x100501: Stereo Device: name="AD198x Analog", type="Audio", device=0 Converter: stream=0, channel=0 SDI-Select: 0 Power states: D0 D3 Power: setting=D0, actual=D0 Connection: 1 0x0c Node 0x09 [Audio Input] wcaps 0x100501: Stereo Converter: stream=0, channel=0 SDI-Select: 0 Power states: D0 D3 Power: setting=D0, actual=D0 Connection: 1 0x0d Node 0x0a [Audio Output] wcaps 0x405: Stereo Amp-Out Control: name="Side Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Amp-Out caps: ofs=0x27, nsteps=0x27, stepsize=0x05, mute=0 Amp-Out vals: [0x00 0x00] Converter: stream=0, channel=0 Power states: D0 D3 Power: setting=D0, actual=D0 Node 0x0b [Audio Selector] wcaps 0x300301: Stereo Digital Connection: 3 0x08* 0x09 0x0f Node 0x0c [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Control: name="Capture Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Capture Switch", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Input Source", index=0, device=0 Amp-Out caps: ofs=0x27, nsteps=0x36, stepsize=0x05, mute=1 Amp-Out vals: [0xa7 0xa7] Connection: 10 0x38 0x39 0x3a* 0x3b 0x3c 0x18 0x24 0x25 0x3d 0x20 Node 0x0d [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Control: name="Capture Volume", index=1, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Capture Switch", index=1, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Input Source", index=1, device=0 Amp-Out caps: ofs=0x27, nsteps=0x36, stepsize=0x05, mute=1 Amp-Out vals: [0xa7 0xa7] Connection: 10 0x38 0x39 0x3a* 0x3b 0x3c 0x18 0x24 0x25 0x3d 0x20 Node 0x0e [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Control: name="Capture Volume", index=2, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Capture Switch", index=2, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Input Source", index=2, device=0 Amp-Out caps: ofs=0x27, nsteps=0x36, stepsize=0x05, mute=1 Amp-Out vals: [0xa7 0xa7] Connection: 10 0x38 0x39 0x3a* 0x3b 0x3c 0x18 0x24 0x25 0x3d 0x20 Node 0x0f [Audio Input] wcaps 0x100501: Stereo Converter: stream=0, channel=0 SDI-Select: 0 Power states: D0 D3 Power: setting=D0, actual=D0 Connection: 1 0x0e Node 0x10 [Beep Generator Widget] wcaps 0x70000c: Mono Amp-Out Control: name="Beep Playback Volume", index=0, device=0 ControlAmp: chs=1, dir=Out, idx=0, ofs=0 Control: name="Beep Playback Switch", index=0, device=0 ControlAmp: chs=1, dir=Out, idx=0, ofs=0 Amp-Out caps: ofs=0x0f, nsteps=0x0f, stepsize=0x0b, mute=1 Amp-Out vals: [0x00] Node 0x11 [Pin Complex] wcaps 0x40018d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x0000373f: IN OUT HP Detect Trigger ImpSense Vref caps: HIZ 50 GRD 80 100 Pin Default 0x02214030: [Jack] HP Out at Ext Front Conn = 1/8, Color = Green DefAssociation = 0x3, Sequence = 0x0 Pin-ctls: 0xc0: OUT HP VREF_HIZ Unsolicited: tag=00, enabled=0 Connection: 1 0x22 Node 0x12 [Pin Complex] wcaps 0x40018d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x0000373f: IN OUT HP Detect Trigger ImpSense Vref caps: HIZ 50 GRD 80 100 Pin Default 0x01014010: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Green DefAssociation = 0x1, Sequence = 0x0 Pin-ctls: 0x40: OUT VREF_HIZ Unsolicited: tag=00, enabled=0 Connection: 1 0x29 Node 0x13 [Pin Complex] wcaps 0x40010c: Mono Amp-Out Amp-Out caps: ofs=0x1f, nsteps=0x1f, stepsize=0x05, mute=1 Amp-Out vals: [0x00] Pincap 0x00000010: OUT Pin Default 0x511711f0: [N/A] Speaker at Int Rear Conn = Analog, Color = Black DefAssociation = 0xf, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x40: OUT Connection: 1 0x2d Node 0x14 [Pin Complex] wcaps 0x40018d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x80 0x80] Pincap 0x0000373f: IN OUT HP Detect Trigger ImpSense Vref caps: HIZ 50 GRD 80 100 Pin Default 0x02a19022: [Jack] Mic at Ext Front Conn = 1/8, Color = Pink DefAssociation = 0x2, Sequence = 0x2 Pin-ctls: 0x24: IN VREF_80 Unsolicited: tag=00, enabled=0 Connection: 1 0x2b Node 0x15 [Pin Complex] wcaps 0x40018d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x80 0x80] Pincap 0x00003737: IN OUT Detect Trigger ImpSense Vref caps: HIZ 50 GRD 80 100 Pin Default 0x01813021: [Jack] Line In at Ext Rear Conn = 1/8, Color = Blue DefAssociation = 0x2, Sequence = 0x1 Pin-ctls: 0x20: IN VREF_HIZ Unsolicited: tag=00, enabled=0 Connection: 1 0x2c Node 0x16 [Pin Complex] wcaps 0x40018d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x00003737: IN OUT Detect Trigger ImpSense Vref caps: HIZ 50 GRD 80 100 Pin Default 0x01011012: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Black DefAssociation = 0x1, Sequence = 0x2 Pin-ctls: 0x40: OUT VREF_HIZ Unsolicited: tag=00, enabled=0 Connection: 1 0x2a Node 0x17 [Pin Complex] wcaps 0x40098d: Stereo Amp-Out R/L Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x80 0x80] Pincap 0x00003737: IN OUT Detect Trigger ImpSense Vref caps: HIZ 50 GRD 80 100 Pin Default 0x01a19020: [Jack] Mic at Ext Rear Conn = 1/8, Color = Pink DefAssociation = 0x2, Sequence = 0x0 Pin-ctls: 0x24: IN VREF_80 Unsolicited: tag=00, enabled=0 Connection: 1 0x26 Node 0x18 [Pin Complex] wcaps 0x400001: Stereo Pincap 0x00000020: IN Pin Default 0x9933112e: [Fixed] CD at Int ATAPI Conn = ATAPI, Color = Black DefAssociation = 0x2, Sequence = 0xe Misc = NO_PRESENCE Pin-ctls: 0x20: IN Node 0x19 [Power Widget] wcaps 0x500500: Mono Power states: D0 D3 Power: setting=D0, actual=D0 Connection: 2 0x20 0x21 Node 0x1a [Pin Complex] wcaps 0x400000: Mono Pincap 0x00000020: IN Pin Default 0x99f301f0: [Fixed] Other at Int ATAPI Conn = ATAPI, Color = Unknown DefAssociation = 0xf, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x20: IN Node 0x1b [Pin Complex] wcaps 0x40030d: Stereo Digital Amp-Out Control: name="IEC958 Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="IEC958 Playback Source", index=0, device=0 Amp-Out caps: ofs=0x27, nsteps=0x27, stepsize=0x05, mute=1 Amp-Out vals: [0x25 0x25] Pincap 0x00000010: OUT Pin Default 0x0145f1f0: [Jack] SPDIF Out at Ext Rear Conn = Optical, Color = Other DefAssociation = 0xf, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x40: OUT Connection: 1 0x02 Node 0x1c [Pin Complex] wcaps 0x40020b: Stereo Digital Amp-In Amp-In caps: ofs=0x17, nsteps=0x1f, stepsize=0x05, mute=1 Amp-In vals: [0x97 0x97] Pincap 0x00000020: IN Pin Default 0x41c5f1f0: [N/A] SPDIF In at Ext Rear Conn = Optical, Color = Other DefAssociation = 0xf, Sequence = 0x0 Misc = NO_PRESENCE Pin-ctls: 0x20: IN Node 0x1d [Audio Mixer] wcaps 0x200303: Stereo Digital Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x00 0x00] [0x80 0x80] Connection: 2 0x01 0x0b Node 0x1e [Audio Mixer] wcaps 0x200103: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x36 0x21 Node 0x1f [Volume Knob Widget] wcaps 0x600080: Mono Volume-Knob: delta=1, steps=63, direct=0, val=0 Unsolicited: tag=00, enabled=0 Connection: 0 Node 0x20 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In Control: name="Mic Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=4, ofs=0 Control: name="Mic Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=4, ofs=0 Control: name="Front Mic Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Control: name="Front Mic Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=0, ofs=0 Control: name="Line Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=1, ofs=0 Control: name="Line Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=1, ofs=0 Control: name="Front Line Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Control: name="Front Line Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Control: name="CD Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=6, ofs=0 Control: name="CD Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=6, ofs=0 Control: name="Aux Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Control: name="Aux Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x17, nsteps=0x1f, stepsize=0x05, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] Connection: 8 0x39 0x33 0x38 0x3d 0x34 0x3b 0x18 0x1a Node 0x21 [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Control: name="Analog Mix Playback Volume", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Control: name="Analog Mix Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=0, ofs=0 Amp-Out caps: ofs=0x1f, nsteps=0x1f, stepsize=0x05, mute=1 Amp-Out vals: [0x9f 0x9f] Connection: 1 0x20 Node 0x22 [Audio Mixer] wcaps 0x200103: Stereo Amp-In Control: name="Headphone Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x37 0x21 Node 0x23 [Vendor Defined Widget] wcaps 0xf00100: Mono Connection: 18 0x11* 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x24 0x25 0x38 0x39 0x3a 0x3b 0x3c 0x3d 0x20 0x21 Node 0x24 [Pin Complex] wcaps 0x40098d: Stereo Amp-Out R/L Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x00000037: IN OUT Detect Trigger ImpSense Pin Default 0x01016011: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Orange DefAssociation = 0x1, Sequence = 0x1 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Connection: 1 0x27 Node 0x25 [Pin Complex] wcaps 0x40018d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00] Pincap 0x00000037: IN OUT Detect Trigger ImpSense Pin Default 0x01012013: [Jack] Line Out at Ext Rear Conn = 1/8, Color = Grey DefAssociation = 0x1, Sequence = 0x3 Pin-ctls: 0x40: OUT Unsolicited: tag=00, enabled=0 Connection: 1 0x28 Node 0x26 [Audio Mixer] wcaps 0x200103: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x32 0x21 Node 0x27 [Audio Mixer] wcaps 0x200103: Stereo Amp-In Control: name="Center Playback Switch", index=0, device=0 ControlAmp: chs=1, dir=In, idx=2, ofs=0 Control: name="LFE Playback Switch", index=0, device=0 ControlAmp: chs=2, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x05 0x21 Node 0x28 [Audio Mixer] wcaps 0x200103: Stereo Amp-In Control: name="Side Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x0a 0x21 Node 0x29 [Audio Mixer] wcaps 0x200103: Stereo Amp-In Control: name="Front Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x00 0x00] [0x00 0x00] Connection: 2 0x04 0x21 Node 0x2a [Audio Mixer] wcaps 0x200103: Stereo Amp-In Control: name="Surround Playback Switch", index=0, device=0 ControlAmp: chs=3, dir=In, idx=2, ofs=0 Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x06 0x21 Node 0x2b [Audio Mixer] wcaps 0x200103: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x30 0x21 Node 0x2c [Audio Mixer] wcaps 0x200103: Stereo Amp-In Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-In vals: [0x80 0x80] [0x80 0x80] Connection: 2 0x31 0x21 Node 0x2d [Audio Mixer] wcaps 0x200100: Mono Connection: 1 0x1e Node 0x2e [Vendor Defined Widget] wcaps 0xf00000: Mono Node 0x2f [Vendor Defined Widget] wcaps 0xf00100: Mono Connection: 6 0x11* 0x12 0x14 0x15 0x16 0x17 Node 0x30 [Audio Selector] wcaps 0x300101: Stereo Connection: 3 0x03* 0x04 0x06 Node 0x31 [Audio Selector] wcaps 0x300101: Stereo Connection: 2 0x04* 0x0a Node 0x32 [Audio Selector] wcaps 0x300101: Stereo Connection: 2 0x05* 0x04 Node 0x33 [Audio Selector] wcaps 0x300101: Stereo Connection: 3 0x3a* 0x25 0x24 Node 0x34 [Audio Selector] wcaps 0x300101: Stereo Connection: 3 0x3c* 0x25 0x24 Node 0x35 [Vendor Defined Widget] wcaps 0xf00000: Mono Node 0x36 [Audio Selector] wcaps 0x300101: Stereo Connection: 3 0x03 0x04* 0x06 Node 0x37 [Audio Selector] wcaps 0x300101: Stereo Connection: 3 0x03 0x04* 0x06 Node 0x38 [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-Out vals: [0x00 0x00] Connection: 1 0x11 Node 0x39 [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Control: name="Front Mic Boost", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=1, ofs=0 Amp-Out caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-Out vals: [0x00 0x00] Connection: 1 0x14 Node 0x3a [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-Out vals: [0x00 0x00] Connection: 1 0x15 Node 0x3b [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-Out vals: [0x00 0x00] Connection: 1 0x16 Node 0x3c [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Control: name="Mic Boost", index=0, device=0 ControlAmp: chs=3, dir=Out, idx=4, ofs=0 Amp-Out caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-Out vals: [0x00 0x00] Connection: 1 0x17 Node 0x3d [Audio Selector] wcaps 0x30010d: Stereo Amp-Out Amp-Out caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 Amp-Out vals: [0x00 0x00] Connection: 1 0x12 Kernel .config: # # Automatically generated make config: don't edit # Linux kernel version: 2.6.36-rc5 # Tue Sep 21 18:07:38 2010 # CONFIG_64BIT=y # CONFIG_X86_32 is not set CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_ZONE_DMA=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ZONE_DMA32=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_EARLY_RES=y CONFIG_HAVE_INTEL_TXT=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_X86_64_SMP=y CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" # CONFIG_KTIME_SCALAR is not set CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y # # General setup # CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y # # RCU Subsystem # # CONFIG_TREE_RCU is not set CONFIG_TREE_PREEMPT_RCU=y # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=64 # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_HAVE_PERF_EVENTS=y # # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y # CONFIG_PERF_COUNTERS is not set # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y # # GCOV-based kernel profiling # # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLOCK_COMPAT=y # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_INLINE_SPIN_TRYLOCK is not set # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK is not set # CONFIG_INLINE_SPIN_LOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK_IRQ is not set # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set # CONFIG_INLINE_SPIN_UNLOCK is not set # CONFIG_INLINE_SPIN_UNLOCK_BH is not set # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_READ_TRYLOCK is not set # CONFIG_INLINE_READ_LOCK is not set # CONFIG_INLINE_READ_LOCK_BH is not set # CONFIG_INLINE_READ_LOCK_IRQ is not set # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set # CONFIG_INLINE_READ_UNLOCK is not set # CONFIG_INLINE_READ_UNLOCK_BH is not set # CONFIG_INLINE_READ_UNLOCK_IRQ is not set # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_WRITE_TRYLOCK is not set # CONFIG_INLINE_WRITE_LOCK is not set # CONFIG_INLINE_WRITE_LOCK_BH is not set # CONFIG_INLINE_WRITE_LOCK_IRQ is not set # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set # CONFIG_INLINE_WRITE_UNLOCK is not set # CONFIG_INLINE_WRITE_UNLOCK_BH is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y # # Processor type and features # CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y # CONFIG_X86_X2APIC is not set CONFIG_SPARSE_IRQ=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y # CONFIG_XEN is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_MK8 is not set # CONFIG_MPSC is not set CONFIG_MCORE2=y # CONFIG_MATOM is not set # CONFIG_GENERIC_CPU is not set CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_P6_NOP=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y CONFIG_GART_IOMMU=y # CONFIG_CALGARY_IOMMU is not set CONFIG_AMD_IOMMU=y # CONFIG_AMD_IOMMU_STATS is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_API=y # CONFIG_MAXSMP is not set CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y # CONFIG_I8K is not set CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_DIRECT_GBPAGES=y # CONFIG_NUMA is not set CONFIG_ARCH_PROC_KCORE_TEXT=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y # CONFIG_HWPOISON_INJECT is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW_64K=y CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_EFI is not set # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set CONFIG_HZ_1000=y CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set # CONFIG_KEXEC_JUMP is not set CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # CONFIG_ARCH_HIBERNATION_HEADER=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP_SMP=y CONFIG_PM_SLEEP=y CONFIG_SUSPEND_NVS=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" CONFIG_PM_RUNTIME=y CONFIG_PM_OPS=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_POWER_METER=y CONFIG_ACPI_SYSFS_POWER=y # CONFIG_ACPI_EC_DEBUGFS is not set # CONFIG_ACPI_PROC_EVENT is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=m CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=m CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=m # CONFIG_ACPI_APEI_ERST_DEBUG is not set # CONFIG_SFI is not set # # CPU Frequency scaling # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set # # CPUFreq processor drivers # CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_P4_CLOCKMOD is not set # # shared options # # CONFIG_X86_SPEEDSTEP_LIB is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_INTEL_IDLE=y # # Memory power savings # CONFIG_I7300_IDLE_IOAT_CHANNEL=y CONFIG_I7300_IDLE=y # # Bus options (PCI etc.) # CONFIG_PCI=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_DOMAINS=y # CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_DMAR=y CONFIG_DMAR_DEFAULT_ON=y CONFIG_DMAR_FLOPPY_WA=y CONFIG_INTR_REMAP=y CONFIG_PCIEPORTBUS=y CONFIG_PCIEAER=y CONFIG_PCIE_ECRC=y # CONFIG_PCIEAER_INJECT is not set CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIE_PME=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_PCI_IOAPIC=y CONFIG_ISA_DMA_API=y CONFIG_K8_NB=y # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set # # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y CONFIG_COMPAT_BINFMT_ELF=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=m CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y # # Networking options # CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set # CONFIG_XFRM_STATISTICS is not set CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_ASK_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_ARPD=y CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_LRO=y CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=y CONFIG_TCP_CONG_CUBIC=m CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_CONG_HTCP=m CONFIG_TCP_CONG_HSTCP=m CONFIG_TCP_CONG_HYBLA=m CONFIG_TCP_CONG_VEGAS=m CONFIG_TCP_CONG_SCALABLE=m CONFIG_TCP_CONG_LP=m # CONFIG_TCP_CONG_VENO is not set # CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_CONG_ILLINOIS is not set CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y # CONFIG_IPV6_ROUTER_PREF is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m # CONFIG_IPV6_MIP6 is not set CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set CONFIG_IPV6_SIT=m # CONFIG_IPV6_SIT_6RD is not set CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y # CONFIG_IPV6_SUBTREES is not set CONFIG_IPV6_MROUTE=y # CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set # CONFIG_IPV6_PIMSM_V2 is not set CONFIG_NETWORK_SECMARK=y # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration # CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_SCTP=m CONFIG_NF_CT_PROTO_UDPLITE=m # CONFIG_NF_CONNTRACK_AMANDA is not set CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m # CONFIG_NF_CONNTRACK_PPTP is not set # CONFIG_NF_CONNTRACK_SANE is not set CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m # # Xtables combined modules # CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_CONNMARK=m # # Xtables targets # # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HL=m # CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m # CONFIG_NETFILTER_XT_TARGET_TEE is not set CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # # Xtables matches # CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m # CONFIG_NETFILTER_XT_MATCH_CPU is not set CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m # CONFIG_NETFILTER_XT_MATCH_IPVS is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m # CONFIG_NETFILTER_XT_MATCH_OSF is not set CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_IP_VS=m # CONFIG_IP_VS_IPV6 is not set # CONFIG_IP_VS_DEBUG is not set CONFIG_IP_VS_TAB_BITS=12 # # IPVS transport protocol load balancing support # CONFIG_IP_VS_PROTO_TCP=y CONFIG_IP_VS_PROTO_UDP=y CONFIG_IP_VS_PROTO_AH_ESP=y CONFIG_IP_VS_PROTO_ESP=y CONFIG_IP_VS_PROTO_AH=y # CONFIG_IP_VS_PROTO_SCTP is not set # # IPVS scheduler # CONFIG_IP_VS_RR=m CONFIG_IP_VS_WRR=m CONFIG_IP_VS_LC=m CONFIG_IP_VS_WLC=m CONFIG_IP_VS_LBLC=m CONFIG_IP_VS_LBLCR=m CONFIG_IP_VS_DH=m CONFIG_IP_VS_SH=m CONFIG_IP_VS_SED=m CONFIG_IP_VS_NQ=m # # IPVS application helper # CONFIG_IP_VS_FTP=m # # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_NF_NAT=m CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_UDPLITE=m CONFIG_NF_NAT_PROTO_SCTP=m CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_TFTP=m # CONFIG_NF_NAT_AMANDA is not set # CONFIG_NF_NAT_PPTP is not set CONFIG_NF_NAT_H323=m CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m # CONFIG_IP_NF_TARGET_CLUSTERIP is not set CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # CONFIG_NF_CONNTRACK_IPV6=m CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_AH is not set CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_FRAG=m CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_LOG=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m CONFIG_BRIDGE_EBT_T_NAT=m CONFIG_BRIDGE_EBT_802_3=m CONFIG_BRIDGE_EBT_AMONG=m CONFIG_BRIDGE_EBT_ARP=m CONFIG_BRIDGE_EBT_IP=m # CONFIG_BRIDGE_EBT_IP6 is not set CONFIG_BRIDGE_EBT_LIMIT=m CONFIG_BRIDGE_EBT_MARK=m CONFIG_BRIDGE_EBT_PKTTYPE=m CONFIG_BRIDGE_EBT_STP=m CONFIG_BRIDGE_EBT_VLAN=m CONFIG_BRIDGE_EBT_ARPREPLY=m CONFIG_BRIDGE_EBT_DNAT=m CONFIG_BRIDGE_EBT_MARK_T=m CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_ULOG=m # CONFIG_BRIDGE_EBT_NFLOG is not set CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # # DCCP CCIDs Configuration (EXPERIMENTAL) # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y # CONFIG_IP_DCCP_CCID3_DEBUG is not set CONFIG_IP_DCCP_CCID3_RTO=100 CONFIG_IP_DCCP_TFRC_LIB=y # # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y # CONFIG_RDS is not set CONFIG_TIPC=m CONFIG_TIPC_ADVANCED=y CONFIG_TIPC_ZONES=3 CONFIG_TIPC_CLUSTERS=1 CONFIG_TIPC_NODES=255 CONFIG_TIPC_PORTS=8191 CONFIG_TIPC_LOG=0 # CONFIG_TIPC_DEBUG is not set CONFIG_ATM=y CONFIG_ATM_CLIP=y # CONFIG_ATM_CLIP_NO_ICMP is not set CONFIG_ATM_LANE=m CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_L2TP=m # CONFIG_L2TP_V3 is not set CONFIG_STP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_ECONET is not set CONFIG_WAN_ROUTER=m # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set CONFIG_NET_SCHED=y # # Queueing/Scheduling # CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_INGRESS=m # # Classification # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m # CONFIG_CLS_U32_PERF is not set # CONFIG_CLS_U32_MARK is not set CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m # CONFIG_NET_CLS_FLOW is not set CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m CONFIG_NET_EMATCH_TEXT=m CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m # CONFIG_NET_ACT_NAT is not set CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m # CONFIG_NET_ACT_SKBEDIT is not set # CONFIG_NET_CLS_IND is not set CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y CONFIG_RPS=y # # Network testing # CONFIG_NET_PKTGEN=m # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set CONFIG_IRDA=m # # IrDA protocols # CONFIG_IRLAN=m CONFIG_IRCOMM=m # CONFIG_IRDA_ULTRA is not set # # IrDA options # CONFIG_IRDA_CACHE_LAST_LSAP=y CONFIG_IRDA_FAST_RR=y CONFIG_IRDA_DEBUG=y # # Infrared-port device drivers # # # SIR device drivers # CONFIG_IRTTY_SIR=m # # Dongle support # CONFIG_DONGLE=y CONFIG_ESI_DONGLE=m CONFIG_ACTISYS_DONGLE=m CONFIG_TEKRAM_DONGLE=m # CONFIG_TOIM3232_DONGLE is not set CONFIG_LITELINK_DONGLE=m CONFIG_MA600_DONGLE=m CONFIG_GIRBIL_DONGLE=m CONFIG_MCP2120_DONGLE=m CONFIG_OLD_BELKIN_DONGLE=m CONFIG_ACT200L_DONGLE=m # CONFIG_KINGSUN_DONGLE is not set # CONFIG_KSDAZZLE_DONGLE is not set # CONFIG_KS959_DONGLE is not set # # FIR device drivers # CONFIG_USB_IRDA=m CONFIG_SIGMATEL_FIR=m CONFIG_NSC_FIR=m CONFIG_WINBOND_FIR=m CONFIG_SMC_IRCC_FIR=m CONFIG_ALI_FIR=m CONFIG_VLSI_FIR=m CONFIG_VIA_FIR=m # CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m # # Bluetooth device drivers # CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y # CONFIG_BT_HCIUART_ATH3K is not set CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m # CONFIG_BT_MRVL_SDIO is not set CONFIG_BT_ATH3K=m # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL_HT=y CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # # Device Drivers # # # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set CONFIG_CONNECTOR=m # CONFIG_MTD is not set # CONFIG_PARPORT is not set CONFIG_PNP=y CONFIG_PNP_DEBUG_MESSAGES=y # # Protocols # CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=m # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=65536 # CONFIG_BLK_DEV_XIP is not set CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set # CONFIG_MISC_DEVICES is not set CONFIG_EEPROM_93CX6=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set # # SCSI device support # CONFIG_SCSI_MOD=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m # CONFIG_CHR_DEV_SCH is not set CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set # CONFIG_ATA_VERBOSE_ERROR is not set CONFIG_ATA_ACPI=y CONFIG_SATA_PMP=y # # Controllers with non-SFF native interface # CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_INIC162X is not set CONFIG_SATA_SIL24=m CONFIG_ATA_SFF=y # # SFF controllers with custom DMA interface # # CONFIG_PDC_ADMA is not set # CONFIG_SATA_QSTOR is not set # CONFIG_SATA_SX4 is not set CONFIG_ATA_BMDMA=y # # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m # CONFIG_SATA_MV is not set CONFIG_SATA_NV=m # CONFIG_SATA_PROMISE is not set CONFIG_SATA_SIL=m # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set # CONFIG_SATA_ULI is not set CONFIG_SATA_VIA=m # CONFIG_SATA_VITESSE is not set # # PATA SFF controllers with BMDMA # CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m # CONFIG_PATA_ARTOP is not set CONFIG_PATA_ATIIXP=m # CONFIG_PATA_ATP867X is not set # CONFIG_PATA_CMD64X is not set CONFIG_PATA_CS5520=m # CONFIG_PATA_CS5530 is not set # CONFIG_PATA_CYPRESS is not set # CONFIG_PATA_EFAR is not set # CONFIG_PATA_HPT366 is not set # CONFIG_PATA_HPT37X is not set # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3 is not set # CONFIG_PATA_IT8213 is not set # CONFIG_PATA_IT821X is not set CONFIG_PATA_JMICRON=m # CONFIG_PATA_MARVELL is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NINJA32 is not set # CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_RADISYS is not set # CONFIG_PATA_RDC is not set # CONFIG_PATA_SC1200 is not set CONFIG_PATA_SCH=m # CONFIG_PATA_SERVERWORKS is not set # CONFIG_PATA_SIL680 is not set CONFIG_PATA_SIS=m # CONFIG_PATA_TOSHIBA is not set # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m # CONFIG_PATA_WINBOND is not set # # PIO-only SFF controllers # # CONFIG_PATA_CMD640_PCI is not set CONFIG_PATA_MPIIX=m # CONFIG_PATA_NS87410 is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_RZ1000 is not set # # Generic fallback / legacy drivers # CONFIG_PATA_ACPI=m CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m # CONFIG_MD_LINEAR is not set CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m # CONFIG_MULTICORE_RAID456 is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_MD_FAULTY is not set CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m # CONFIG_DM_LOG_USERSPACE is not set CONFIG_DM_ZERO=m # CONFIG_DM_MULTIPATH is not set CONFIG_DM_DELAY=m # CONFIG_DM_UEVENT is not set # CONFIG_FUSION is not set # # IEEE 1394 (FireWire) support # # # You can enable one or both FireWire driver stacks. # # # The newer stack is recommended. # CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_NET is not set # CONFIG_IEEE1394 is not set # CONFIG_FIREWIRE_NOSY is not set CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y CONFIG_IFB=m # CONFIG_DUMMY is not set CONFIG_BONDING=m CONFIG_MACVLAN=m # CONFIG_MACVTAP is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set CONFIG_VETH=m # CONFIG_NET_SB1000 is not set # CONFIG_ARCNET is not set CONFIG_PHYLIB=m # # MII PHY device drivers # CONFIG_MARVELL_PHY=m # CONFIG_DAVICOM_PHY is not set # CONFIG_QSEMI_PHY is not set CONFIG_LXT_PHY=m # CONFIG_CICADA_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set CONFIG_BROADCOM_PHY=m # CONFIG_ICPLUS_PHY is not set CONFIG_REALTEK_PHY=m # CONFIG_NATIONAL_PHY is not set # CONFIG_STE10XP is not set # CONFIG_LSI_ET1011C_PHY is not set # CONFIG_MICREL_PHY is not set # CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=m # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set CONFIG_NET_VENDOR_3COM=y CONFIG_VORTEX=m CONFIG_TYPHOON=m # CONFIG_ETHOC is not set # CONFIG_DNET is not set CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 CONFIG_TULIP=m # CONFIG_TULIP_MWI is not set # CONFIG_TULIP_MMIO is not set CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y CONFIG_DE4X5=m CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_HP100=m # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set # CONFIG_IBM_NEW_EMAC_EMAC4 is not set # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set CONFIG_NET_PCI=y # CONFIG_PCNET32 is not set CONFIG_AMD8111_ETH=m # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_KSZ884X_PCI is not set CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y CONFIG_B44_PCICORE_AUTOSELECT=y CONFIG_B44_PCI=y CONFIG_FORCEDETH=m CONFIG_E100=m # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set CONFIG_8139CP=m CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set CONFIG_8139TOO_TUNE_TWISTER=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set # CONFIG_R6040 is not set CONFIG_SIS900=m # CONFIG_EPIC100 is not set # CONFIG_SMSC9420 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_KS8842 is not set # CONFIG_KS8851_MLL is not set CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_SC92031 is not set # CONFIG_ATL2 is not set CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set CONFIG_DL2K=m CONFIG_E1000=m # CONFIG_E1000E is not set # CONFIG_IP1000 is not set CONFIG_IGB=m CONFIG_IGB_DCA=y CONFIG_IGBVF=m # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set CONFIG_R8169=m # CONFIG_R8169_VLAN is not set CONFIG_SIS190=m CONFIG_SKGE=m CONFIG_SKY2=m CONFIG_VIA_VELOCITY=m # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # CONFIG_CNIC is not set # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set # CONFIG_ATL1C is not set CONFIG_JME=m # CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set CONFIG_WLAN=y # CONFIG_LIBERTAS_THINFIRM is not set # CONFIG_AIRO is not set # CONFIG_ATMEL is not set # CONFIG_AT76C50X_USB is not set # CONFIG_PRISM54 is not set # CONFIG_USB_ZD1201 is not set # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_RTL8180 is not set # CONFIG_RTL8187 is not set # CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set # CONFIG_MWL8K is not set # CONFIG_ATH_COMMON is not set CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y # CONFIG_B43_SDIO is not set CONFIG_B43_PIO=y CONFIG_B43_PHY_LP=y CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y # CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_IPW2100=m # CONFIG_IPW2100_MONITOR is not set # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2200=m # CONFIG_IPW2200_MONITOR is not set # CONFIG_IPW2200_QOS is not set # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m # CONFIG_IWM is not set # CONFIG_LIBERTAS is not set # CONFIG_HERMES is not set # CONFIG_P54_COMMON is not set CONFIG_RT2X00=m CONFIG_RT2400PCI=m CONFIG_RT2500PCI=m # CONFIG_RT61PCI is not set CONFIG_RT2800PCI_PCI=y # CONFIG_RT2800PCI is not set # CONFIG_RT2500USB is not set # CONFIG_RT73USB is not set # CONFIG_RT2800USB is not set CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # CONFIG_WL12XX is not set # CONFIG_ZD1211RW is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers # # # USB Network Adapters # CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m # CONFIG_USB_NET_CDC_EEM is not set # CONFIG_USB_NET_DM9601 is not set # CONFIG_USB_NET_SMSC75XX is not set # CONFIG_USB_NET_SMSC95XX is not set CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m # CONFIG_USB_NET_MCS7830 is not set CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y CONFIG_USB_EPSON2888=y # CONFIG_USB_KC2190 is not set CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_HSO is not set # CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set # CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # CONFIG_ATM_DRIVERS is not set # # CAIF transport drivers # # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m # CONFIG_NETCONSOLE_DYNAMIC is not set CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set CONFIG_NET_POLL_CONTROLLER=y CONFIG_VIRTIO_NET=m # CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set # # Input device support # CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m # # Userland interfaces # CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADP5588 is not set CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_TCA6416 is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_MCS is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m # CONFIG_MOUSE_APPLETOUCH is not set # CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOUSE_SYNAPTICS_I2C is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_PCSPKR is not set # CONFIG_INPUT_APANEL is not set # CONFIG_INPUT_ATLAS_BTNS is not set # CONFIG_INPUT_ATI_REMOTE is not set # CONFIG_INPUT_ATI_REMOTE2 is not set # CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_WINBOND_CIR is not set # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_ADXL34X is not set # # Hardware I/O ports # CONFIG_SERIO=y CONFIG_SERIO_I8042=y # CONFIG_SERIO_SERPORT is not set # CONFIG_SERIO_CT82C710 is not set # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=m # CONFIG_SERIO_ALTERA_PS2 is not set # CONFIG_GAMEPORT is not set # # Character devices # CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_N_GSM is not set # CONFIG_NOZOMI is not set # # Serial drivers # CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y # # Non-8250 serial port support # # CONFIG_SERIAL_MFD_HSU is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_HVC_DRIVER=y CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set CONFIG_HW_RANDOM_INTEL=y CONFIG_HW_RANDOM_AMD=y CONFIG_HW_RANDOM_VIA=y CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=m # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_MWAVE is not set CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 CONFIG_HPET=y CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y # CONFIG_RAMOOPS is not set CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX=m # # Multiplexer I2C Chip support # # CONFIG_I2C_MUX_PCA954x is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m # # I2C Hardware Bus support # # # PC SMBus host controller drivers # CONFIG_I2C_ALI1535=m CONFIG_I2C_ALI1563=m CONFIG_I2C_ALI15X3=m CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m # # ACPI drivers # # CONFIG_I2C_SCMI is not set # # I2C system bus drivers (mostly embedded / system-on-chip) # # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_XILINX is not set # # External I2C/SMBus adapter drivers # CONFIG_I2C_PARPORT_LIGHT=m # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_TINY_USB is not set # # Other I2C/SMBus bus drivers # CONFIG_I2C_STUB=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_SPI is not set # # PPS support # # CONFIG_PPS is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set # CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set # # Native drivers # # CONFIG_SENSORS_ABITUGURU is not set # CONFIG_SENSORS_ABITUGURU3 is not set # CONFIG_SENSORS_AD7414 is not set # CONFIG_SENSORS_AD7418 is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m # CONFIG_SENSORS_ADM1029 is not set CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m CONFIG_SENSORS_ADT7411=m # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set # CONFIG_SENSORS_ADT7475 is not set # CONFIG_SENSORS_ASC7621 is not set CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m # CONFIG_SENSORS_I5K_AMB is not set CONFIG_SENSORS_F71805F=m # CONFIG_SENSORS_F71882FG is not set # CONFIG_SENSORS_F75375S is not set # CONFIG_SENSORS_FSCHMD is not set CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_PKGTEMP=m # CONFIG_SENSORS_IBMAEM is not set # CONFIG_SENSORS_IBMPEX is not set CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LM63=m # CONFIG_SENSORS_LM73 is not set CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m CONFIG_SENSORS_LM78=m CONFIG_SENSORS_LM80=m CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m # CONFIG_SENSORS_LM93 is not set CONFIG_SENSORS_LTC4215=m # CONFIG_SENSORS_LTC4245 is not set CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m # CONFIG_SENSORS_PC87427 is not set CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_SIS5595=m # CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_EMC1403 is not set # CONFIG_SENSORS_EMC2103 is not set CONFIG_SENSORS_SMSC47M1=m # CONFIG_SENSORS_SMSC47M192 is not set CONFIG_SENSORS_SMSC47B397=m # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_TMP102 is not set # CONFIG_SENSORS_TMP401 is not set # CONFIG_SENSORS_TMP421 is not set # CONFIG_SENSORS_VIA_CPUTEMP is not set CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m # CONFIG_SENSORS_LIS3_I2C is not set # CONFIG_SENSORS_APPLESMC is not set # # ACPI drivers # CONFIG_SENSORS_ATK0110=m # CONFIG_SENSORS_LIS3LV02D is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set # # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m # CONFIG_F71808E_WDT is not set CONFIG_SC520_WDT=m # CONFIG_SBC_FITPC2_WATCHDOG is not set CONFIG_EUROTECH_WDT=m CONFIG_IB700_WDT=m CONFIG_IBMASR=m CONFIG_WAFER_WDT=m CONFIG_I6300ESB_WDT=m # CONFIG_ITCO_WDT is not set # CONFIG_IT8712F_WDT is not set # CONFIG_IT87_WDT is not set # CONFIG_HP_WATCHDOG is not set CONFIG_SC1200_WDT=m # CONFIG_PC87413_WDT is not set CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m CONFIG_CPU5_WDT=m # CONFIG_SMSC_SCH311X_WDT is not set # CONFIG_SMSC37B787_WDT is not set CONFIG_W83627HF_WDT=m # CONFIG_W83697HF_WDT is not set # CONFIG_W83697UG_WDT is not set CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m # # PCI-based Watchdog Cards # CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m # # USB-based Watchdog Cards # CONFIG_USBPCWATCHDOG=m CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # CONFIG_SSB=m CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y CONFIG_SSB_SDIOHOST_POSSIBLE=y # CONFIG_SSB_SDIOHOST is not set # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_MFD_SUPPORT=y CONFIG_MFD_CORE=m # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_TPS6507X is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_ABX500_CORE is not set CONFIG_LPC_SCH=m # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set # CONFIG_REGULATOR_DUMMY is not set CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_VIRTUAL_CONSUMER=m CONFIG_REGULATOR_USERSPACE_CONSUMER=m # CONFIG_REGULATOR_BQ24022 is not set # CONFIG_REGULATOR_MAX1586 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_LP3971 is not set # CONFIG_REGULATOR_TPS65023 is not set # CONFIG_REGULATOR_TPS6507X is not set # CONFIG_REGULATOR_ISL6271A is not set # CONFIG_REGULATOR_AD5398 is not set CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m # CONFIG_VIDEO_ALLOW_V4L1 is not set CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_DVB_CORE=m CONFIG_VIDEO_MEDIA=m # # Multimedia drivers # CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_IR_CORE=m CONFIG_VIDEO_IR=m CONFIG_LIRC=m CONFIG_RC_MAP=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m CONFIG_IR_LIRC_CODEC=m CONFIG_IR_IMON=m # CONFIG_IR_MCEUSB is not set CONFIG_IR_ENE=m CONFIG_IR_STREAMZAP=m CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m # CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA827X=m CONFIG_MEDIA_TUNER_TDA18271=m CONFIG_MEDIA_TUNER_TDA9887=m CONFIG_MEDIA_TUNER_TEA5761=m CONFIG_MEDIA_TUNER_TEA5767=m CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_DVB=m CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_SAA6588=m # CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_BT848 is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_VIDEO_ZORAN is not set CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m # CONFIG_VIDEO_MXB is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_CX88 is not set # CONFIG_VIDEO_CX23885 is not set # CONFIG_VIDEO_AU0828 is not set # CONFIG_VIDEO_IVTV is not set # CONFIG_VIDEO_CX18 is not set # CONFIG_VIDEO_SAA7164 is not set # CONFIG_VIDEO_CAFE_CCIC is not set # CONFIG_SOC_CAMERA is not set # CONFIG_V4L_USB_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set # CONFIG_RADIO_ADAPTERS is not set CONFIG_DVB_MAX_ADAPTERS=8 CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_CAPTURE_DRIVERS=y # # Supported SAA7146 based PCI Adapters # CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_BUDGET_PATCH=m # # Supported USB Adapters # CONFIG_DVB_USB=m # CONFIG_DVB_USB_DEBUG is not set # CONFIG_DVB_USB_A800 is not set # CONFIG_DVB_USB_DIBUSB_MB is not set # CONFIG_DVB_USB_DIBUSB_MC is not set # CONFIG_DVB_USB_DIB0700 is not set # CONFIG_DVB_USB_UMT_010 is not set # CONFIG_DVB_USB_CXUSB is not set # CONFIG_DVB_USB_M920X is not set # CONFIG_DVB_USB_GL861 is not set # CONFIG_DVB_USB_AU6610 is not set # CONFIG_DVB_USB_DIGITV is not set # CONFIG_DVB_USB_VP7045 is not set # CONFIG_DVB_USB_VP702X is not set # CONFIG_DVB_USB_GP8PSK is not set # CONFIG_DVB_USB_NOVA_T_USB2 is not set # CONFIG_DVB_USB_TTUSB2 is not set # CONFIG_DVB_USB_DTT200U is not set # CONFIG_DVB_USB_OPERA1 is not set # CONFIG_DVB_USB_AF9005 is not set # CONFIG_DVB_USB_DW2102 is not set # CONFIG_DVB_USB_CINERGY_T2 is not set # CONFIG_DVB_USB_ANYSEE is not set # CONFIG_DVB_USB_DTV5100 is not set # CONFIG_DVB_USB_AF9015 is not set # CONFIG_DVB_USB_CE6230 is not set # CONFIG_DVB_USB_FRIIO is not set # CONFIG_DVB_USB_EC168 is not set # CONFIG_DVB_USB_AZ6027 is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_SMS_SIANO_MDTV is not set # # Supported FlexCopII (B2C2) Adapters # # CONFIG_DVB_B2C2_FLEXCOP is not set # # Supported BT878 Adapters # # # Supported Pluto2 Adapters # # CONFIG_DVB_PLUTO2 is not set # # Supported SDMC DM1105 Adapters # # CONFIG_DVB_DM1105 is not set # CONFIG_DVB_FIREDTV is not set # # Supported Earthsoft PT1 Adapters # # CONFIG_DVB_PT1 is not set # # Supported Mantis Adapters # CONFIG_MANTIS_CORE=m CONFIG_DVB_MANTIS=m CONFIG_DVB_HOPPER=m # # Supported nGene Adapters # # CONFIG_DVB_NGENE is not set # # Supported DVB Frontends # CONFIG_DVB_FE_CUSTOMISE=y # # Customise DVB Frontends # # # Multistandard (satellite) frontends # # CONFIG_DVB_STB0899 is not set # CONFIG_DVB_STB6100 is not set CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m # # DVB-S (satellite) frontends # CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m # CONFIG_DVB_ZL10036 is not set # CONFIG_DVB_ZL10039 is not set CONFIG_DVB_S5H1420=m # CONFIG_DVB_STV0288 is not set # CONFIG_DVB_STB6000 is not set CONFIG_DVB_STV0299=m CONFIG_DVB_STV6110=m # CONFIG_DVB_STV0900 is not set CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m # CONFIG_DVB_TDA8261 is not set CONFIG_DVB_VES1X93=m # CONFIG_DVB_TUNER_ITD1000 is not set # CONFIG_DVB_TUNER_CX24113 is not set CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m # CONFIG_DVB_CX24116 is not set # CONFIG_DVB_SI21XX is not set CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m # # DVB-T (terrestrial) frontends # CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m # CONFIG_DVB_DRX397XD is not set CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m CONFIG_DVB_MT352=m CONFIG_DVB_ZL10353=m CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m # CONFIG_DVB_TDA10048 is not set CONFIG_DVB_AF9013=m # CONFIG_DVB_EC100 is not set # # DVB-C (cable) frontends # CONFIG_DVB_VES1820=m CONFIG_DVB_TDA10021=m CONFIG_DVB_TDA10023=m CONFIG_DVB_STV0297=m # # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # CONFIG_DVB_NXT200X=m CONFIG_DVB_OR51211=m CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m # CONFIG_DVB_LGDT3304 is not set # CONFIG_DVB_LGDT3305 is not set # CONFIG_DVB_S5H1409 is not set # CONFIG_DVB_AU8522 is not set # CONFIG_DVB_S5H1411 is not set # # ISDB-T (terrestrial) frontends # # CONFIG_DVB_S921 is not set # CONFIG_DVB_DIB8000 is not set # # Digital terrestrial only tuners/PLL # CONFIG_DVB_PLL=m # CONFIG_DVB_TUNER_DIB0070 is not set # CONFIG_DVB_TUNER_DIB0090 is not set # # SEC control devices for DVB-S # CONFIG_DVB_LNBP21=m # CONFIG_DVB_ISL6405 is not set CONFIG_DVB_ISL6421=m CONFIG_DVB_ISL6423=m # CONFIG_DVB_LGS8GL5 is not set # CONFIG_DVB_LGS8GXX is not set # CONFIG_DVB_ATBM8830 is not set CONFIG_DVB_TDA665x=m # # Tools to develop new frontends # # CONFIG_DVB_DUMMY_FE is not set # CONFIG_DAB is not set # # Graphics support # CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=m # CONFIG_AGP_SIS is not set # CONFIG_AGP_VIA is not set CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_VGA_SWITCHEROO is not set CONFIG_DRM=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_I810=m CONFIG_DRM_I830=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y # CONFIG_DRM_MGA is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_VIA is not set # CONFIG_DRM_SAVAGE is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set # CONFIG_FB_SYS_FILLRECT is not set # CONFIG_FB_SYS_COPYAREA is not set # CONFIG_FB_SYS_IMAGEBLIT is not set # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set CONFIG_FB_SVGALIB=m # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_NVIDIA=m CONFIG_FB_NVIDIA_I2C=y # CONFIG_FB_NVIDIA_DEBUG is not set CONFIG_FB_NVIDIA_BACKLIGHT=y # CONFIG_FB_RIVA is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m # CONFIG_FB_MATROX is not set CONFIG_FB_RADEON=m CONFIG_FB_RADEON_I2C=y CONFIG_FB_RADEON_BACKLIGHT=y # CONFIG_FB_RADEON_DEBUG is not set CONFIG_FB_ATY128=m CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY=m CONFIG_FB_ATY_CT=y # CONFIG_FB_ATY_GENERIC_LCD is not set CONFIG_FB_ATY_GX=y CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_S3 is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set # CONFIG_FB_VIA is not set # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y # CONFIG_BACKLIGHT_PROGEAR is not set # CONFIG_BACKLIGHT_CARILLO_RANCH is not set # CONFIG_BACKLIGHT_MBP_NVIDIA is not set # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # # Display device support # CONFIG_DISPLAY_SUPPORT=m # # Display hardware drivers # # # Console display driver support # CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set CONFIG_FONT_8x16=y # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set # CONFIG_FONT_MINI_4x6 is not set # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set # CONFIG_LOGO is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_HRTIMER=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set CONFIG_SND_VMASTER=y CONFIG_SND_DMA_SGBUF=y CONFIG_SND_RAWMIDI_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_MPU401_UART=m CONFIG_SND_OPL3_LIB=m CONFIG_SND_AC97_CODEC=m CONFIG_SND_DRIVERS=y # CONFIG_SND_PCSP is not set CONFIG_SND_DUMMY=m CONFIG_SND_VIRMIDI=m # CONFIG_SND_MTPAV is not set CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5 CONFIG_SND_PCI=y # CONFIG_SND_AD1889 is not set # CONFIG_SND_ALS300 is not set # CONFIG_SND_ALS4000 is not set # CONFIG_SND_ALI5451 is not set # CONFIG_SND_ASIHPI is not set # CONFIG_SND_ATIIXP is not set # CONFIG_SND_ATIIXP_MODEM is not set # CONFIG_SND_AU8810 is not set # CONFIG_SND_AU8820 is not set # CONFIG_SND_AU8830 is not set # CONFIG_SND_AW2 is not set # CONFIG_SND_AZT3328 is not set # CONFIG_SND_BT87X is not set CONFIG_SND_CA0106=m CONFIG_SND_CMIPCI=m # CONFIG_SND_OXYGEN is not set # CONFIG_SND_CS4281 is not set # CONFIG_SND_CS46XX is not set # CONFIG_SND_CS5530 is not set # CONFIG_SND_CS5535AUDIO is not set # CONFIG_SND_CTXFI is not set # CONFIG_SND_DARLA20 is not set # CONFIG_SND_GINA20 is not set # CONFIG_SND_LAYLA20 is not set # CONFIG_SND_DARLA24 is not set # CONFIG_SND_GINA24 is not set # CONFIG_SND_LAYLA24 is not set # CONFIG_SND_MONA is not set # CONFIG_SND_MIA is not set # CONFIG_SND_ECHO3G is not set # CONFIG_SND_INDIGO is not set # CONFIG_SND_INDIGOIO is not set # CONFIG_SND_INDIGODJ is not set # CONFIG_SND_INDIGOIOX is not set # CONFIG_SND_INDIGODJX is not set CONFIG_SND_EMU10K1=m CONFIG_SND_EMU10K1X=m CONFIG_SND_ENS1370=m CONFIG_SND_ENS1371=m # CONFIG_SND_ES1938 is not set # CONFIG_SND_ES1968 is not set # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_JACK=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_ATIHDMI=y # CONFIG_SND_HDA_CODEC_NVHDMI is not set CONFIG_SND_HDA_CODEC_INTELHDMI=y CONFIG_SND_HDA_ELD=y CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CMEDIA=y # CONFIG_SND_HDA_CODEC_SI3054 is not set CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=10 # CONFIG_SND_HDSP is not set CONFIG_SND_HDSPM=m # CONFIG_SND_HIFIER is not set CONFIG_SND_ICE1712=m CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_KORG1212 is not set # CONFIG_SND_LX6464ES is not set # CONFIG_SND_MAESTRO3 is not set # CONFIG_SND_MIXART is not set # CONFIG_SND_NM256 is not set # CONFIG_SND_PCXHR is not set # CONFIG_SND_RIPTIDE is not set # CONFIG_SND_RME32 is not set # CONFIG_SND_RME96 is not set # CONFIG_SND_RME9652 is not set # CONFIG_SND_SONICVIBES is not set # CONFIG_SND_TRIDENT is not set CONFIG_SND_VIA82XX=m # CONFIG_SND_VIA82XX_MODEM is not set # CONFIG_SND_VIRTUOSO is not set # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set CONFIG_SND_USB=y # CONFIG_SND_USB_AUDIO is not set CONFIG_SND_USB_UA101=m # CONFIG_SND_USB_USX2Y is not set # CONFIG_SND_USB_CAIAQ is not set # CONFIG_SND_USB_US122L is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HIDRAW is not set # # USB Input Devices # CONFIG_USB_HID=m # CONFIG_HID_PID is not set CONFIG_USB_HIDDEV=y # # Special HID drivers # # CONFIG_HID_3M_PCT is not set CONFIG_HID_A4TECH=m # CONFIG_HID_ACRUX_FF is not set CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m # CONFIG_HID_CANDO is not set CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m # CONFIG_HID_PRODIKEYS is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m # CONFIG_DRAGONRISE_FF is not set # CONFIG_HID_EGALAX is not set # CONFIG_HID_ELECOM is not set CONFIG_HID_EZKEY=m CONFIG_HID_KYE=m CONFIG_HID_GYRATION=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LOGITECH=m # CONFIG_LOGITECH_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set # CONFIG_LOGIG940_FF is not set CONFIG_HID_MAGICMOUSE=m CONFIG_HID_MICROSOFT=m # CONFIG_HID_MOSART is not set CONFIG_HID_MONTEREY=m CONFIG_HID_NTRIG=m CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m # CONFIG_PANTHERLORD_FF is not set CONFIG_HID_PETALYNX=m # CONFIG_HID_PICOLCD is not set # CONFIG_HID_QUANTA is not set # CONFIG_HID_ROCCAT is not set # CONFIG_HID_ROCCAT_KONE is not set CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m # CONFIG_HID_STANTUM is not set CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m # CONFIG_GREENASIA_FF is not set CONFIG_HID_SMARTJOYPLUS=m # CONFIG_SMARTJOYPLUS_FF is not set CONFIG_HID_TOPSEED=m CONFIG_HID_THRUSTMASTER=m # CONFIG_THRUSTMASTER_FF is not set CONFIG_HID_WACOM=m # CONFIG_HID_WACOM_POWER_SUPPLY is not set CONFIG_HID_ZEROPLUS=m # CONFIG_ZEROPLUS_FF is not set # CONFIG_HID_ZYDACRON is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=y # CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y # CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set CONFIG_USB_MON=y # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set # CONFIG_USB_XHCI_HCD is not set CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_OXU210HP_HCD is not set CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_WHCI_HCD is not set # CONFIG_USB_HWA_HCD is not set # # USB Device Class drivers # CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m CONFIG_USB_WDM=m # CONFIG_USB_TMC is not set # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # # also be needed; see USB_STORAGE Help for more info # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m # CONFIG_USB_STORAGE_ISD200 is not set CONFIG_USB_STORAGE_USBAT=m CONFIG_USB_STORAGE_SDDR09=m CONFIG_USB_STORAGE_SDDR55=m CONFIG_USB_STORAGE_JUMPSHOT=m CONFIG_USB_STORAGE_ALAUDA=m # CONFIG_USB_STORAGE_ONETOUCH is not set # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m # # USB port drivers # CONFIG_USB_SERIAL=m CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRCABLE is not set # CONFIG_USB_SERIAL_ARK3116 is not set CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_FUNSOFT is not set CONFIG_USB_SERIAL_VISOR=m CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IR=m CONFIG_USB_SERIAL_EDGEPORT=m CONFIG_USB_SERIAL_EDGEPORT_TI=m CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_IPW=m # CONFIG_USB_SERIAL_IUU is not set # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set # CONFIG_USB_SERIAL_KEYSPAN is not set CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m # CONFIG_USB_SERIAL_MOS7720 is not set # CONFIG_USB_SERIAL_MOS7840 is not set # CONFIG_USB_SERIAL_MOTOROLA is not set # CONFIG_USB_SERIAL_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_SERIAL_OTI6858 is not set # CONFIG_USB_SERIAL_QCAUX is not set # CONFIG_USB_SERIAL_QUALCOMM is not set # CONFIG_USB_SERIAL_SPCP8X5 is not set CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set # CONFIG_USB_SERIAL_SIEMENS_MPI is not set # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set # CONFIG_USB_SERIAL_SYMBOL is not set CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m # CONFIG_USB_SERIAL_OPTICON is not set # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set # CONFIG_USB_SERIAL_ZIO is not set # CONFIG_USB_SERIAL_SSU100 is not set # CONFIG_USB_SERIAL_DEBUG is not set # # USB Miscellaneous drivers # # CONFIG_USB_EMI62 is not set CONFIG_USB_EMI26=m # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m CONFIG_USB_LED=m # CONFIG_USB_CYPRESS_CY7C63 is not set CONFIG_USB_CYTHERM=m CONFIG_USB_IDMOUSE=m # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y CONFIG_USB_LD=m # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set CONFIG_USB_TEST=m # CONFIG_USB_ISIGHTFW is not set CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_R8A66597 is not set # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_AMD5536UDC is not set # CONFIG_USB_GADGET_CI13XXX is not set CONFIG_USB_GADGET_NET2280=y CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LANGWELL is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m CONFIG_USB_AUDIO=m CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_ETH_EEM is not set CONFIG_USB_GADGETFS=m # CONFIG_USB_FUNCTIONFS is not set CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set CONFIG_USB_G_MULTI=m CONFIG_USB_G_MULTI_RNDIS=y # CONFIG_USB_G_MULTI_CDC is not set CONFIG_USB_G_HID=m # CONFIG_USB_G_DBGP is not set CONFIG_USB_G_WEBCAM=m # # OTG and related infrastructure # # CONFIG_NOP_USB_XCEIV is not set # CONFIG_UWB is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set # # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_SDIO_UART=m # CONFIG_MMC_TEST is not set # # MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m # CONFIG_MMC_RICOH_MMC is not set CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m # CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_CB710 is not set # CONFIG_MMC_VIA_SDMMC is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m # # LED drivers # # CONFIG_LEDS_ALIX2 is not set # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_LEDS_PCA955X is not set CONFIG_LEDS_REGULATOR=m # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_INTEL_SS4200 is not set # CONFIG_LEDS_DELL_NETBOOKS is not set CONFIG_LEDS_TRIGGERS=y # # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set # # iptables trigger is under Netfilter config (LED target) # # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC=y # # Reporting subsystems # # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=y CONFIG_EDAC_MM_EDAC=y CONFIG_EDAC_AMD64=m # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set CONFIG_EDAC_E752X=m CONFIG_EDAC_I82975X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I3200=m CONFIG_EDAC_X38=m CONFIG_EDAC_I5400=m # CONFIG_EDAC_I7CORE is not set CONFIG_EDAC_I5000=m CONFIG_EDAC_I5100=m CONFIG_RTC_LIB=m CONFIG_RTC_CLASS=m # # RTC interfaces # CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # CONFIG_RTC_DRV_TEST is not set # # I2C RTC drivers # # CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1374 is not set # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS3232 is not set # CONFIG_RTC_DRV_MAX6900 is not set # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set # CONFIG_RTC_DRV_X1205 is not set # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set # CONFIG_RTC_DRV_BQ32K is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set # # SPI RTC drivers # # # Platform RTC drivers # CONFIG_RTC_DRV_CMOS=m # CONFIG_RTC_DRV_DS1286 is not set # CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T35 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_MSM6242 is not set # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_V3020 is not set # # on-CPU RTC drivers # CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set # # DMA Devices # CONFIG_INTEL_MID_DMAC=m CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y CONFIG_INTEL_IOATDMA=m # CONFIG_TIMB_DMA is not set CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y # # DMA Clients # CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_UIO=m # CONFIG_UIO_CIF is not set # CONFIG_UIO_PDRV is not set # CONFIG_UIO_PDRV_GENIRQ is not set # CONFIG_UIO_AEC is not set # CONFIG_UIO_SERCOS3 is not set CONFIG_UIO_PCI_GENERIC=m # CONFIG_UIO_NETX is not set CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set # CONFIG_ET131X is not set # CONFIG_SLICOSS is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_VIDEO_CX25821 is not set # CONFIG_VIDEO_TM6000 is not set # CONFIG_USB_IP_COMMON is not set # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_OTUS is not set # CONFIG_RT2860 is not set # CONFIG_RT2870 is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set # CONFIG_R8187SE is not set # CONFIG_RTL8192SU is not set # CONFIG_RTL8192U is not set # CONFIG_RTL8192E is not set # CONFIG_TRANZPORT is not set # CONFIG_POHMELFS is not set # CONFIG_IDE_PHISON is not set # CONFIG_LINE6_USB is not set # CONFIG_DRM_VMWGFX is not set CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y # # I2C encoder or helper chips # # CONFIG_DRM_I2C_CH7006 is not set CONFIG_DRM_I2C_SIL164=m # CONFIG_USB_SERIAL_QUATECH2 is not set # CONFIG_USB_SERIAL_QUATECH_USB2 is not set # CONFIG_VT6655 is not set # CONFIG_VT6656 is not set # CONFIG_FB_UDL is not set # CONFIG_HYPERV is not set # CONFIG_VME_BUS is not set # CONFIG_IIO is not set CONFIG_ZRAM=m CONFIG_ZRAM_STATS=y # CONFIG_BATMAN_ADV is not set # CONFIG_SAMSUNG_LAPTOP is not set # CONFIG_FB_SM7XX is not set # CONFIG_VIDEO_DT3155 is not set # CONFIG_CRYSTALHD is not set # # Texas Instruments shared transport line discipline # # CONFIG_TI_ST is not set # CONFIG_ST_BT is not set # CONFIG_FB_XGI is not set CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_I2C=m # CONFIG_LIRC_IGORPLUGUSB is not set # CONFIG_LIRC_IMON is not set CONFIG_LIRC_IT87=m CONFIG_LIRC_ITE8709=m # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_SIR=m # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set # CONFIG_EASYCAP is not set # CONFIG_SOLO6X10 is not set # CONFIG_ACPI_QUICKSTART is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WMI is not set # CONFIG_ACERHDF is not set CONFIG_ASUS_LAPTOP=m # CONFIG_DELL_WMI is not set # CONFIG_FUJITSU_LAPTOP is not set CONFIG_HP_WMI=m # CONFIG_MSI_LAPTOP is not set # CONFIG_PANASONIC_LAPTOP is not set # CONFIG_COMPAL_LAPTOP is not set # CONFIG_SONY_LAPTOP is not set # CONFIG_IDEAPAD_ACPI is not set # CONFIG_THINKPAD_ACPI is not set # CONFIG_INTEL_MENLOW is not set # CONFIG_EEEPC_WMI is not set CONFIG_ACPI_WMI=m # CONFIG_MSI_WMI is not set CONFIG_ACPI_ASUS=m # CONFIG_TOPSTAR_LAPTOP is not set # CONFIG_ACPI_TOSHIBA is not set # CONFIG_TOSHIBA_BT_RFKILL is not set # CONFIG_ACPI_CMPC is not set CONFIG_INTEL_IPS=m # # Firmware Drivers # CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y # CONFIG_DELL_RBU is not set # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_ISCSI_IBFT_FIND is not set # # File systems # CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y CONFIG_JBD2=y CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_NILFS2_FS is not set CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y CONFIG_QUOTA=y # CONFIG_QUOTA_NETLINK_INTERFACE is not set CONFIG_PRINT_QUOTA_WARNING=y # CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_TREE=m # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y CONFIG_QUOTACTL_COMPAT=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m # # Caches # CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y # CONFIG_FSCACHE_HISTOGRAM is not set # CONFIG_FSCACHE_DEBUG is not set # CONFIG_FSCACHE_OBJECT_LIST is not set CONFIG_CACHEFILES=m # CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_HISTOGRAM is not set # # CD-ROM/DVD Filesystems # CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_RW=y # # Pseudo filesystems # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_ECRYPT_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set CONFIG_LOGFS=m # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_XATTR is not set # CONFIG_SQUASHFS_LZO is not set # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y # CONFIG_NFS_V4_1 is not set # CONFIG_NFS_FSCACHE is not set # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_SMB_FS is not set # CONFIG_CEPH_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set # CONFIG_CIFS_WEAK_PW_HASH is not set CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_EXPERIMENTAL=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set # # Partition Types # CONFIG_PARTITION_ADVANCED=y CONFIG_ACORN_PARTITION=y # CONFIG_ACORN_PARTITION_CUMANA is not set # CONFIG_ACORN_PARTITION_EESOX is not set CONFIG_ACORN_PARTITION_ICS=y # CONFIG_ACORN_PARTITION_ADFS is not set # CONFIG_ACORN_PARTITION_POWERTEC is not set CONFIG_ACORN_PARTITION_RISCIX=y CONFIG_OSF_PARTITION=y CONFIG_AMIGA_PARTITION=y CONFIG_ATARI_PARTITION=y CONFIG_MAC_PARTITION=y CONFIG_MSDOS_PARTITION=y CONFIG_BSD_DISKLABEL=y CONFIG_MINIX_SUBPARTITION=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_LDM_PARTITION=y # CONFIG_LDM_DEBUG is not set CONFIG_SGI_PARTITION=y CONFIG_ULTRIX_PARTITION=y CONFIG_SUN_PARTITION=y CONFIG_KARMA_PARTITION=y CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m CONFIG_NLS_CODEPAGE_852=m CONFIG_NLS_CODEPAGE_855=m CONFIG_NLS_CODEPAGE_857=m CONFIG_NLS_CODEPAGE_860=m CONFIG_NLS_CODEPAGE_861=m CONFIG_NLS_CODEPAGE_862=m CONFIG_NLS_CODEPAGE_863=m CONFIG_NLS_CODEPAGE_864=m CONFIG_NLS_CODEPAGE_865=m CONFIG_NLS_CODEPAGE_866=m CONFIG_NLS_CODEPAGE_869=m CONFIG_NLS_CODEPAGE_936=m CONFIG_NLS_CODEPAGE_950=m CONFIG_NLS_CODEPAGE_932=m CONFIG_NLS_CODEPAGE_949=m CONFIG_NLS_CODEPAGE_874=m CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m CONFIG_NLS_ISO8859_5=m CONFIG_NLS_ISO8859_6=m CONFIG_NLS_ISO8859_7=m CONFIG_NLS_ISO8859_9=m CONFIG_NLS_ISO8859_13=m CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set # # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y # CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=2048 CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_LOCKUP_DETECTOR is not set # CONFIG_HARDLOCKUP_DETECTOR is not set CONFIG_DETECT_HUNG_TASK=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_WRITECOUNT is not set CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set # CONFIG_FAULT_INJECTION is not set CONFIG_LATENCYTOP=y # CONFIG_SYSCTL_SYSCALL_CHECK is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y # CONFIG_FUNCTION_TRACER is not set # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_ENABLE_DEFAULT_TRACERS is not set # CONFIG_FTRACE_SYSCALLS is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_STACK_TRACER is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_MMIOTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_STRICT_DEVMEM is not set # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set # CONFIG_DEBUG_RODATA is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 CONFIG_IO_DELAY_TYPE_NONE=3 CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # # Security options # CONFIG_KEYS=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set # CONFIG_INTEL_TXT is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m CONFIG_ASYNC_CORE=m CONFIG_ASYNC_MEMCPY=m CONFIG_ASYNC_XOR=m CONFIG_ASYNC_PQ=m CONFIG_ASYNC_RAID6_RECOV=m # CONFIG_ASYNC_RAID6_TEST is not set CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y CONFIG_CRYPTO=y # # Crypto core or helper # CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_NULL=m # CONFIG_CRYPTO_PCRYPT is not set CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_AUTHENC=m # CONFIG_CRYPTO_TEST is not set # # Authenticated Encryption with Associated Data # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set # CONFIG_CRYPTO_SEQIV is not set # # Block modes # CONFIG_CRYPTO_CBC=m # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_XTS is not set # # Hash modes # CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_VMAC is not set # # Digest # CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m # CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set # # Ciphers # CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_X86_64=m # CONFIG_CRYPTO_AES_NI_INTEL is not set # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m # CONFIG_CRYPTO_CAMELLIA is not set CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set # CONFIG_CRYPTO_SALSA20_X86_64 is not set # CONFIG_CRYPTO_SEED is not set CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m # CONFIG_CRYPTO_TWOFISH_X86_64 is not set # # Compression # CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_LZO=m # # Random Number Generation # # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m # CONFIG_KVM_AMD is not set CONFIG_VHOST_NET=m CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m # CONFIG_BINARY_PRINTF is not set # # Library routines # CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC_CCITT=m CONFIG_CRC16=y CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=m CONFIG_LZO_DECOMPRESS=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DECOMPRESS_LZO=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y Yours, Aki

2 1

[alsa-devel] [PATCH] ASoC: Delegate to hw specific read for volatile registers
by Dimitris Papastamos 22 Sep '10

22 Sep '10

Ensure that reads on volatile registers will correctly delegate to the bus specific read function. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-cache.c | 76 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 26 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 6702a3d..c4f31b8 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -19,8 +19,15 @@ static unsigned int snd_soc_4_12_read(struct snd_soc_codec *codec, unsigned int reg) { u16 *cache = codec->reg_cache; - if (reg >= codec->driver->reg_cache_size) - return -1; + + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -31,13 +38,12 @@ static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg, u8 data[2]; int ret; - BUG_ON(codec->driver->volatile_register); - data[0] = (reg << 4) | ((value >> 8) & 0x000f); data[1] = value & 0x00ff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -89,8 +95,15 @@ static unsigned int snd_soc_7_9_read(struct snd_soc_codec *codec, unsigned int reg) { u16 *cache = codec->reg_cache; - if (reg >= codec->driver->reg_cache_size) - return -1; + + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -101,13 +114,12 @@ static int snd_soc_7_9_write(struct snd_soc_codec *codec, unsigned int reg, u8 data[2]; int ret; - BUG_ON(codec->driver->volatile_register); - data[0] = (reg << 1) | ((value >> 8) & 0x0001); data[1] = value & 0x00ff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -161,14 +173,13 @@ static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg, u8 *cache = codec->reg_cache; u8 data[2]; - BUG_ON(codec->driver->volatile_register); - reg &= 0xff; data[0] = reg; data[1] = value & 0xff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, value) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -187,9 +198,16 @@ static unsigned int snd_soc_8_8_read(struct snd_soc_codec *codec, unsigned int reg) { u8 *cache = codec->reg_cache; + reg &= 0xff; - if (reg >= codec->driver->reg_cache_size) - return -1; + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -344,8 +362,14 @@ static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec, u8 *cache = codec->reg_cache; reg &= 0xff; - if (reg >= codec->driver->reg_cache_size) - return -1; + if (reg >= codec->driver->reg_cache_size || + snd_soc_codec_volatile_register(codec, reg)) { + if (codec->cache_only) + return -1; + + return codec->hw_read(codec, reg); + } + return cache[reg]; } @@ -356,15 +380,14 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, u8 data[3]; int ret; - BUG_ON(codec->driver->volatile_register); - data[0] = (reg >> 8) & 0xff; data[1] = reg & 0xff; data[2] = value; reg &= 0xff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; @@ -475,8 +498,9 @@ static int snd_soc_16_16_write(struct snd_soc_codec *codec, unsigned int reg, data[2] = (value >> 8) & 0xff; data[3] = value & 0xff; - if (reg < codec->driver->reg_cache_size) - cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) && + reg < codec->driver->reg_cache_size) + cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; -- 1.7.3

2 1

[alsa-devel] [PATCH] ASoC: Report error codes for card DAI instantiation failures
by Mark Brown 22 Sep '10

22 Sep '10

Also clean up the error print a bit. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7c64e03..5c58651 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1568,7 +1568,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) for (i = 0; i < card->num_links; i++) { ret = soc_probe_dai_link(card, i); if (ret < 0) { - printk(KERN_ERR "asoc: failed to instanciate card %s\n", card->name); + pr_err("asoc: failed to instantiate card %s: %d\n", + card->name, ret); goto probe_dai_err; } } -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Select DMA driver for Samsung DAIs
by Mark Brown 22 Sep '10

22 Sep '10

Kconfig got smart enough to do dependencies through selects so let's make use of that. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/s3c24xx/Kconfig | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index 7d8235d..1142d3e 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -10,6 +10,7 @@ config SND_S3C24XX_SOC config SND_S3C24XX_SOC_I2S tristate select S3C2410_DMA + select SND_S3C_SOC_PCM config SND_S3C_I2SV2_SOC tristate @@ -18,16 +19,19 @@ config SND_S3C2412_SOC_I2S tristate select SND_S3C_I2SV2_SOC select S3C2410_DMA + select SND_S3C_SOC_PCM config SND_S3C64XX_SOC_I2S tristate select SND_S3C_I2SV2_SOC select S3C64XX_DMA + select SND_S3C_SOC_PCM config SND_S3C64XX_SOC_I2S_V4 tristate select SND_S3C_I2SV2_SOC select S3C64XX_DMA + select SND_S3C_SOC_PCM config SND_S3C_SOC_PCM tristate -- 1.7.1

4 4

Re: [alsa-devel] Spurious "Unable to find definition 'defaults.pcm.dmix.device'"
by Gavin Stark 21 Sep '10

21 Sep '10

Colin, thanks for the suggestion. I tried building and running from the current git HEAD version and still had the same problem. I also noticed that my app has been causing a core dump due to an infinite recursion in snd_config_searcha_hooks. I'm not sure what would cause both of these problems. I'm trying going back to stock packages on my system (Ubuntu 9.04) to see if a version incompatibility. Gavin Stark On Sep 20, 2010, at 1:41 PM, alsa-devel-request(a)alsa-project.org wrote: > Date: Mon, 20 Sep 2010 16:22:02 +0100 > From: Colin Guthrie <gmane(a)colin.guthr.ie> > Subject: Re: [alsa-devel] Spurious "Unable to find definition > 'defaults.pcm.dmix.device'" > To: alsa-devel(a)alsa-project.org > Message-ID: <i77u6q$2ma$1(a)dough.gmane.org> > Content-Type: text/plain; charset=UTF-8 > > 'Twas brillig, and Gavin Stark at 20/09/10 16:05 did gyre and gimble: >> I am using ALSA in a gstreamer project. When playing many videos >> (with audio) in the same application and the same gstreamer instance >> every once in a while (maybe once every 500 times) I will receive the >> following errors (in a call chain that passes through snd_pcm_open) >> >> confmisc.c:1286:snd_func_refer: alsalib error: Unable to find >> definition 'defaults.pcm.dmix.device' alsa >> conf.c:4154:_snd_config_evaluate: alsalib error: function >> snd_func_refer returned error: No such file or directory alsa >> conf.c:4633:snd_config_expand: alsalib error: Evaluate error: No such >> file or directory alsa pcm.c:2211:snd_pcm_open_noupdate: alsalib >> error: Unknown PCM default >> >> The next playback will be fine. Looking through the ALSA code it >> seems that the configuration data should be cached and re-used unless >> the number of config files changes, or the files themselves change >> (name, device, inode. mtime) So I am wonder why on one instance of >> snd_pcm_open I'd end up with this error but not on most previous or >> subsequent calls. >> >> All the ALSA configuration files are the defaults, I have no >> ~/.asoundrc, and I'm running version 1.0.23 > > I guess there is an outside chance that this could be some threading > race condition in the config stuff. > > Jaroslav recently fixed some threading issues in libalsa2 and config > stuff. Perhaps it's worth pulling across those changes to your alsa lib > to see if this is related? > > Can't remember the git commit #'s off hand, but git master of libalsa2 > is probably fine. > > > Long shot maybe but an relatively easy one to test. > > Col > > -- > > Colin Guthrie > gmane(at)colin.guthr.ie > http://colin.guthr.ie/ > > Day Job: > Tribalogic Limited [http://www.tribalogic.net/] > Open Source: > Mageia Contributor [http://www.mageia.org/] > PulseAudio Hacker [http://www.pulseaudio.org/] > Trac Hacker [http://trac.edgewall.org/] > > >

1 0

[alsa-devel] [PATCH] ASoC: Fix soc-cache buffer overflow bug
by Dimitris Papastamos 21 Sep '10

21 Sep '10

Make sure we stay within the cache boundaries when updating the register cache. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-cache.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 1228111..28bf1ff 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -203,8 +203,9 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg, data[1] = (value >> 8) & 0xff; data[2] = value & 0xff; - if (!snd_soc_codec_volatile_register(codec, reg)) - reg_cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) + && reg < codec->driver->reg_cache_size) + reg_cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1; -- 1.7.3

3 3

[alsa-devel] [PATCH] ASoC: Remove extra rtd->dev.init_name assignment in soc_probe_dai_link
by Jarkko Nikula 21 Sep '10

21 Sep '10

rtd->dev.init_name is set twice in soc_probe_dai_link. I removed the first assignement from dai_link->stream_name since then there won't be sysfs name changes and usually dai_link->name seems to fit anyway better for a sysfs directory name. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- sound/soc/soc-core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6001b7f..c8d1596 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1451,7 +1451,6 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num) snd_soc_dapm_sync(codec); /* register the rtd device */ - rtd->dev.init_name = rtd->dai_link->stream_name; rtd->dev.release = rtd_release; rtd->dev.init_name = dai_link->name; ret = device_register(&rtd->dev); -- 1.7.1

3 2

[alsa-devel] alsa-kernel repository corrupted?
by Andy Owen 21 Sep '10

21 Sep '10

Hi, I'm trying to put together a patch for the ca0106 driver, and I'm having trouble cloning the alsa-kernel repository. I've tried it a few times from different places and while it is downloading I get "fatal: delta size changed" when it is partially through. Here are two runs of git clone with slightly different output (consecutive runs on the same computer): % git clone git://git.alsa-project.org/alsa-kernel.git alsa-kernel Initialized empty Git repository in /home/andy/src/alsa-kernel/.git/ remote: Counting objects: 1708307, done. remote: Compressing objects: 100% (313659/313659), done. remote: fatal: delta size changed remote: aborting due to possible repository corruption on the remote side. fatal: early EOF fatal: index-pack failed % git clone git://git.alsa-project.org/alsa-kernel.git alsa-kernel Initialized empty Git repository in /home/andy/src/alsa-kernel/.git/ remote: Counting objects: 1708307, done. remote: Compressing objects: 100% (313659/313659), done. remote: fatal: delta size changed remote: aborting due to possible repository corruption on the remote side. fatal: early EOFs: 15% (260156/1708307), 157.79 MiB | 47 KiB/s fatal: index-pack failed Does anyone else have any luck getting the repo? Andy

2 1

[PATCH] ALSA: ca0106 - add Sound Blaster 5.1vx info.
by Andy Owen 21 Sep '10

21 Sep '10

Signed-off-by: Andy Owen <andy-alsa(a)ultra-premium.com> --- sound/pci/ca0106/ca0106_main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 8e69620..6dc9a5d 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -239,6 +239,16 @@ static struct snd_ca0106_details ca0106_chip_details[] = { .gpio_type = 1, .i2c_adc = 1, .spi_dac = 1 } , + /* Sound Blaster 5.1vx + * Tested: Playback on front, rear, center/lfe speakers + * Not-Tested: Capture + */ + { .serial = 0x10041102, + .name = "Sound Blaster 5.1vx [SB1070]", + .gpio_type = 1, + .i2c_adc = 0, + .spi_dac = 1 + } , /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */ /* SB0438 * CTRL:CA0106-DAT -- 1.7.0.4 --=-g8ouaCT8rh3B1kCcOO9M--

1 0

[alsa-devel] [PATCH] ASoC: Fix merge issue with WM8962 control addition
by Mark Brown 21 Sep '10

21 Sep '10

Let's not add the core controls twice. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 28adc6c..c4deea1 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1845,8 +1845,6 @@ static int wm8962_probe(struct snd_soc_codec *codec) wm8962->reg_cache[WM8962_HPOUTL_VOLUME] |= WM8962_HPOUT_VU; wm8962->reg_cache[WM8962_HPOUTR_VOLUME] |= WM8962_HPOUT_VU; - snd_soc_add_controls(codec, wm8962_snd_controls, - ARRAY_SIZE(wm8962_snd_controls)); wm8962_add_widgets(codec); wm8962_init_beep(codec); -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Report error code when failing to add controls
by Mark Brown 21 Sep '10

21 Sep '10

Helps with diagnostics. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8d8c5cd..7c64e03 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1983,8 +1983,8 @@ int snd_soc_add_controls(struct snd_soc_codec *codec, const struct snd_kcontrol_new *control = &controls[i]; err = snd_ctl_add(card, snd_soc_cnew(control, codec, NULL)); if (err < 0) { - dev_err(codec->dev, "%s: Failed to add %s\n", - codec->name, control->name); + dev_err(codec->dev, "%s: Failed to add %s: %d\n", + codec->name, control->name, err); return err; } } -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Prototype s3c64xx_i2s_get_clock()
by Mark Brown 21 Sep '10

21 Sep '10

So machine drivers can see the declaration. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/s3c24xx/s3c64xx-i2s.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h index 19bd444..de4075d 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.h +++ b/sound/soc/s3c24xx/s3c64xx-i2s.h @@ -36,5 +36,6 @@ struct clk; (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\ SNDRV_PCM_FMTBIT_S24_LE) +struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai); #endif /* __SND_SOC_S3C24XX_S3C64XX_I2S_H */ -- 1.7.1

3 3

[alsa-devel] proposed MPD16 latency workaround
by Krzysztof Foltman 21 Sep '10

21 Sep '10

Hi all, I've played with USB MIDI driver and MPD16 a bit more. The problem is definitely triggered by submitting URBs on the configuration input endpoint - when these are killed, the latency disappears. Disabling the configuration port works, but is a bit heavy-handed, so I've implemented a workaround: initially, the URBs for the input configuration endpoint are not submitted until two conditions are met: i) the control port is actually open (I check that using input_triggered bitmask) ii) the driver is switched into config mode by sending a special SysEx message to the output port (which is intercepted by the driver and used to set a flag). This is to prevent programs that open all the MIDI ports in the system (JACK daemon with ALSA MIDI driver, a2jmidid etc.) from starting unwanted communication with configuration endpoints. Any time one of these conditions is changed, the driver may either submit the URBs or kill them or do nothing - depending on the difference between expected and current "queuing state" of the URBs. This logic is only used for MPD16, for all the other devices the driver always submit their input URBs, no matter if any input is actually wanted or not. The attached diff is relative to the Ubuntu 2.6.35 kernel, but I'm mostly interested in the review of the general approach - I have some doubts about thread-safety of calling snd_usbmidi_input_update_ep from send function and about the elegance of the SysEx approach (vs. ioctl or something else). If the approach is not too icky and doesn't have hidden flaws, I can try to create a diff relative to alsa-kernel or some other tree. Any comments? Krzysztof

2 5

[alsa-devel] [PATCH] ALSA: hda - Add Dell Latitude E6400 model quirk
by Luke Yelavich 21 Sep '10

21 Sep '10

From: Luke Yelavich <luke.yelavich(a)canonical.com> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/643891 Set the Dell Latitude E6400 (1028:0233) SSID to use AD1984_DELL_DESKTOP Cc: stable(a)kernel.org Signed-off-by: Luke Yelavich <luke.yelavich(a)canonical.com> --- sound/pci/hda/patch_analog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 05db1cf..507523d 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -3642,6 +3642,7 @@ static struct snd_pci_quirk ad1984_cfg_tbl[] = { /* Lenovo Thinkpad T61/X61 */ SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD), SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP), + SND_PCI_QUIRK(0x1028, 0x0233, "Dell Latitude E6400", AD1984_DELL_DESKTOP), {} }; -- 1.7.1

2 1

[alsa-devel] [PATCH] hdmi - fix surround41 channel mapping
by Wu Fengguang 21 Sep '10

21 Sep '10

From: Jerry Zhou <jerry.zhou(a)intel.com> Channel 2 and channel 3 were all wrongly mapped to HDMI slot 4. This shows up as a bug that one channel is "lost" when playing in surround41 mode. Signed-off-by: Jerry Zhou <jerry.zhou(a)intel.com> Signed-off-by: Wu Fengguang <fengguang.wu(a)intel.com> --- sound/pci/hda/patch_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- sound-2.6.orig/sound/pci/hda/patch_hdmi.c 2010-09-21 11:20:59.000000000 +0800 +++ sound-2.6/sound/pci/hda/patch_hdmi.c 2010-09-21 14:26:55.000000000 +0800 @@ -191,11 +191,11 @@ static int hdmi_channel_mapping[0x32][8] /* surround40 */ [0x08] = { 0x00, 0x11, 0x24, 0x35, 0xf3, 0xf2, 0xf6, 0xf7 }, /* 4ch */ [0x03] = { 0x00, 0x11, 0x23, 0x32, 0x44, 0xf5, 0xf6, 0xf7 }, /* surround41 */ - [0x09] = { 0x00, 0x11, 0x24, 0x34, 0x43, 0xf2, 0xf6, 0xf7 }, + [0x09] = { 0x00, 0x11, 0x24, 0x35, 0x42, 0xf3, 0xf6, 0xf7 }, /* surround50 */ [0x0a] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0xf2, 0xf6, 0xf7 }, /* surround51 */ [0x0b] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0x52, 0xf6, 0xf7 }, /* 7.1 */

2 1

[alsa-devel] [PATCH] alsa: hdmi - support infoframe for DisplayPort
by Wu Fengguang 21 Sep '10

21 Sep '10

DisplayPort works mostly in the same way as HDMI, except that it expects a slightly different audio infoframe format. Citations from "HDA036-A: Display Port Support and HDMI Miscellaneous Corrections": The HDMI specification defines a data island packet with a header of 4 bytes (3 bytes content + 1 byte ECC) and packet body of 32 bytes (28 bytes content and 4 bytes ECC). Display Port specification on the other hand defines a data island packet (secondary data packet) with header of 4 bytes protected by 4 bytes of parity, and data of theoretically up to 1024 bytes with each 16 bytes chunk of data protected by 4 bytes of parity. Note that the ECC or parity bytes are not present in the DIP content populated by software and are hardware generated. It tests DP connection based on the ELD conn_type field, which will be set by the graphics driver and can be overriden manually by users through the /proc/asound/card0/eld* interface. The DP infoframe is tested OK on Intel SandyBridge/CougarPoint platform. Signed-off-by: Wu Fengguang <fengguang.wu(a)intel.com> --- sound/pci/hda/patch_hdmi.c | 110 +++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 37 deletions(-) Takashi: half of the patch is harmless code refactor. The real changes happen in the first and last chunks. --- sound-2.6.orig/sound/pci/hda/patch_hdmi.c 2010-09-21 09:41:46.000000000 +0800 +++ sound-2.6/sound/pci/hda/patch_hdmi.c 2010-09-21 11:20:59.000000000 +0800 @@ -82,17 +82,29 @@ struct hdmi_spec { struct hdmi_audio_infoframe { u8 type; /* 0x84 */ u8 ver; /* 0x01 */ u8 len; /* 0x0a */ - u8 checksum; /* PB0 */ + u8 checksum; + u8 CC02_CT47; /* CC in bits 0:2, CT in 4:7 */ u8 SS01_SF24; u8 CXT04; u8 CA; u8 LFEPBL01_LSV36_DM_INH7; - u8 reserved[5]; /* PB6 - PB10 */ +}; + +struct dp_audio_infoframe { + u8 type; /* 0x84 */ + u8 len; /* 0x1b */ + u8 ver; /* 0x11 << 2 */ + + u8 CC02_CT47; /* match with HDMI infoframe from this on */ + u8 SS01_SF24; + u8 CXT04; + u8 CA; + u8 LFEPBL01_LSV36_DM_INH7; }; /* * CEA speaker placement: * @@ -192,11 +204,11 @@ static int hdmi_channel_mapping[0x32][8] /* * This is an ordered list! * * The preceding ones have better chances to be selected by - * hdmi_setup_channel_allocation(). + * hdmi_channel_allocation(). */ static struct cea_channel_speaker_allocation channel_allocations[] = { /* channel: 7 6 5 4 3 2 1 0 */ { .ca_index = 0x00, .speakers = { 0, 0, 0, 0, 0, 0, FR, FL } }, /* 2.1 */ @@ -369,18 +381,18 @@ static void init_channel_allocations(voi * eld->spk_alloc => (eld_speaker_allocation_bits[]) => spk_mask * spk_mask => (channel_allocations[]) => ai->CA * * TODO: it could select the wrong CA from multiple candidates. */ -static int hdmi_setup_channel_allocation(struct hda_codec *codec, hda_nid_t nid, - struct hdmi_audio_infoframe *ai) +static int hdmi_channel_allocation(struct hda_codec *codec, hda_nid_t nid, + int channels) { struct hdmi_spec *spec = codec->spec; struct hdmi_eld *eld; int i; + int ca = 0; int spk_mask = 0; - int channels = 1 + (ai->CC02_CT47 & 0x7); char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; /* * CA defaults to 0 for basic stereo audio */ @@ -414,20 +426,20 @@ static int hdmi_setup_channel_allocation /* search for the first working match in the CA table */ for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) { if (channels == channel_allocations[i].channels && (spk_mask & channel_allocations[i].spk_mask) == channel_allocations[i].spk_mask) { - ai->CA = channel_allocations[i].ca_index; + ca = channel_allocations[i].ca_index; break; } } snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf)); snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n", - ai->CA, channels, buf); + ca, channels, buf); - return ai->CA; + return ca; } static void hdmi_debug_channel_mapping(struct hda_codec *codec, hda_nid_t pin_nid) { @@ -445,14 +457,13 @@ static void hdmi_debug_channel_mapping(s } static void hdmi_setup_channel_mapping(struct hda_codec *codec, hda_nid_t pin_nid, - struct hdmi_audio_infoframe *ai) + int ca) { int i; - int ca = ai->CA; int err; if (hdmi_channel_mapping[ca][1] == 0) { for (i = 0; i < channel_allocations[ca].channels; i++) hdmi_channel_mapping[ca][i] = i | (i << 4); @@ -545,57 +556,53 @@ static void hdmi_clear_dip_buffers(struc i, size, j); } #endif } -static void hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *ai) +static void hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *hdmi_ai) { - u8 *bytes = (u8 *)ai; + u8 *bytes = (u8 *)hdmi_ai; u8 sum = 0; int i; - ai->checksum = 0; + hdmi_ai->checksum = 0; - for (i = 0; i < sizeof(*ai); i++) + for (i = 0; i < sizeof(*hdmi_ai); i++) sum += bytes[i]; - ai->checksum = -sum; + hdmi_ai->checksum = -sum; } static void hdmi_fill_audio_infoframe(struct hda_codec *codec, hda_nid_t pin_nid, - struct hdmi_audio_infoframe *ai) + u8 *dip, int size) { - u8 *bytes = (u8 *)ai; int i; hdmi_debug_dip_size(codec, pin_nid); hdmi_clear_dip_buffers(codec, pin_nid); /* be paranoid */ - hdmi_checksum_audio_infoframe(ai); - hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0); - for (i = 0; i < sizeof(*ai); i++) - hdmi_write_dip_byte(codec, pin_nid, bytes[i]); + for (i = 0; i < size; i++) + hdmi_write_dip_byte(codec, pin_nid, dip[i]); } static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid, - struct hdmi_audio_infoframe *ai) + u8 *dip, int size) { - u8 *bytes = (u8 *)ai; u8 val; int i; if (snd_hda_codec_read(codec, pin_nid, 0, AC_VERB_GET_HDMI_DIP_XMIT, 0) != AC_DIPXMIT_BEST) return false; hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0); - for (i = 0; i < sizeof(*ai); i++) { + for (i = 0; i < size; i++) { val = snd_hda_codec_read(codec, pin_nid, 0, AC_VERB_GET_HDMI_DIP_DATA, 0); - if (val != bytes[i]) + if (val != dip[i]) return false; } return true; } @@ -603,35 +610,64 @@ static bool hdmi_infoframe_uptodate(stru static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid, struct snd_pcm_substream *substream) { struct hdmi_spec *spec = codec->spec; hda_nid_t pin_nid; + int channels = substream->runtime->channels; + int ca; int i; - struct hdmi_audio_infoframe ai = { - .type = 0x84, - .ver = 0x01, - .len = 0x0a, - .CC02_CT47 = substream->runtime->channels - 1, - }; + u8 ai[max(sizeof(struct hdmi_audio_infoframe), + sizeof(struct dp_audio_infoframe))]; - hdmi_setup_channel_allocation(codec, nid, &ai); + ca = hdmi_channel_allocation(codec, nid, channels); for (i = 0; i < spec->num_pins; i++) { if (spec->pin_cvt[i] != nid) continue; if (!spec->sink_eld[i].monitor_present) continue; pin_nid = spec->pin[i]; - if (!hdmi_infoframe_uptodate(codec, pin_nid, &ai)) { + + memset(ai, 0, sizeof(ai)); + if (spec->sink_eld[i].conn_type == 0) { /* HDMI */ + struct hdmi_audio_infoframe *hdmi_ai; + + hdmi_ai = (struct hdmi_audio_infoframe *)ai; + hdmi_ai->type = 0x84; + hdmi_ai->ver = 0x01; + hdmi_ai->len = 0x0a; + hdmi_ai->CC02_CT47 = channels - 1; + hdmi_checksum_audio_infoframe(hdmi_ai); + } else if (spec->sink_eld[i].conn_type == 1) { /* DisplayPort */ + struct dp_audio_infoframe *dp_ai; + + dp_ai = (struct dp_audio_infoframe *)ai; + dp_ai->type = 0x84; + dp_ai->len = 0x1b; + dp_ai->ver = 0x11 << 2; + dp_ai->CC02_CT47 = channels - 1; + } else { + snd_printd("HDMI: unknown connection type at pin %d\n", + pin_nid); + continue; + } + + /* + * sizeof(ai) is used instead of sizeof(*hdmi_ai) or + * sizeof(*dp_ai) to avoid partial match/update problems when + * the user switches between HDMI/DP monitors. + */ + if (!hdmi_infoframe_uptodate(codec, pin_nid, ai, sizeof(ai))) { snd_printdd("hdmi_setup_audio_infoframe: " "cvt=%d pin=%d channels=%d\n", nid, pin_nid, - substream->runtime->channels); - hdmi_setup_channel_mapping(codec, pin_nid, &ai); + channels); + hdmi_setup_channel_mapping(codec, pin_nid, ca); hdmi_stop_infoframe_trans(codec, pin_nid); - hdmi_fill_audio_infoframe(codec, pin_nid, &ai); + hdmi_fill_audio_infoframe(codec, pin_nid, + ai, sizeof(ai)); hdmi_start_infoframe_trans(codec, pin_nid); } } }

2 1

[alsa-devel] [PATCH 0/5 v2] ASoC: fsi: DMA support 1st step
by Kuninori Morimoto 20 Sep '10

20 Sep '10

Dear Mark, Liam These patches are v2 of 1st step for DMA support of FSI driver Kuninori Morimoto (5): ASoC: fsi: Add fsi_dma_get_area ASoC: fsi: modify noisy comment out ASoC: fsi: Add fsi_dma_soft_push/pop function ASoC: fsi: modify variable name to easy to understand ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl 2nd patch modify noisy comment out which Liam said. Best regards -- Kuninori Morimoto

2 7

[alsa-devel] [PATCH] ASoC: Fix WM8978/migor driver name conflict
by Mark Brown 20 Sep '10

20 Sep '10

Standardise on 'wm8978' as the name for the CODEC. Reported-by: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8978.c | 2 +- sound/soc/sh/migor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 676a430..13b979a 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -1038,7 +1038,7 @@ MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id); static struct i2c_driver wm8978_i2c_driver = { .driver = { - .name = "WM8978-codec", + .name = "wm8978", .owner = THIS_MODULE, }, .probe = wm8978_i2c_probe, diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index f462017..ac6c49c 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -156,7 +156,7 @@ static struct snd_soc_dai_link migor_dai = { .cpu_dai_name = "siu-i2s-dai", .codec_dai_name = "wm8978-hifi", .platform_name = "siu-pcm-audio", - .codec_name = "wm8978-codec.0-001a", + .codec_name = "wm8978.0-001a", .ops = &migor_dai_ops, .init = migor_dai_init, }; -- 1.7.1

2 1

[alsa-devel] [PATCHv2 0/4] ASoC: tlv320aic3x: Add dynamic regulator control
by Jarkko Nikula 20 Sep '10

20 Sep '10

Hi I named this set as v2 since aic3x soc-cache conversion was done between v1 and this. Set goes on top of my previous aic3x one liner: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-September/031749.… -- Jarkko

3 9

[alsa-devel] Creative XFi not working CA0110 IBG
by Hans-Juergen Lange 20 Sep '10

20 Sep '10

Hello, I did make the failure to not check before buy, but because the last problem reports are from about a year ago, I think the card should work. -- from lspci 86:00.0 Audio device [0403]: Creative Labs [SB X-Fi Xtreme Audio] CA0110-IBG [1102:0009] Subsystem: Creative Labs Device [1102:0018] Control: I/O- Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B+ DisINTx- Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Interrupt: pin A routed to IRQ 18 Region 0: Memory at d0100000 (32-bit, non-prefetchable) [size=16K] Capabilities: [dc] Power Management version 3 Flags: PMEClk- DSI+ D1+ D2+ AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst+ PME-Enable- DSel=0 DScale=0 PME- Kernel modules: snd-hda-intel -- The kernel is a 64-Bit linux-2.6.33.2 original unpatched from kernel.org The mainboard is a Tyan S4985E. I dont want to fill up the message with boot log and all that stuff before there is a need. I am willing to help to find the problem in nearly any way because this is my workstation and I do need the PCI slot for some other purpose so I do want to get this card working. the alsa driver snd-hda-intel gives the following messages. [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 3361.622125] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 and with a quick look into the kernel I would think that the driver has a wrong idea about the interrupts received and the work that has to be done. More Infos infos if needed. Any help would be great. BR Hans-Juergen Lange

1 0

[alsa-devel] [PATCH 0/5] fix SIU and Migo-R sound for 2.6.37
by Guennadi Liakhovetski 20 Sep '10

20 Sep '10

Conversion to the multi-component design has broken the SIU driver and its users. This patch series fixes the breakages. All patches against next/master, but one of them (#4) shall also go into 2.6.36. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/

3 18

[alsa-devel] [PATCH] ASoC: tlv320aic3x: Add virtual output pin Detection
by Jarkko Nikula 20 Sep '10

20 Sep '10

Purpose of this virtual Detection pin is to keep codec bias on whenever the GPIO or jack detection features are needed. Jack detection needs a mic bias so machine drivers can construct a following route for instance for keeping the path and codec bias on: "Input Jack" -> "Mic Bias xV" -> "Detection" -> detection block inside codec. For the GPIO the machine driver can force the pin on with snd_soc_dapm_force_enable_pin. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- PLL is activated when in SND_SOC_BIAS_PREPARE or _ON so it could be running but I have a vague impression that it's active only when ADC or DAC is on. I don't have at the moment possibility to measure it and don't want to move it to DAPM either before doing some oscilloscope and pop & clicks measurements. Current consumption anyway doesn't differ between standby and on when there is no active stream and other widgets are off. --- sound/soc/codecs/tlv320aic3x.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 7b5f159..6190351 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -605,6 +605,14 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = { SND_SOC_DAPM_INPUT("LINE1R"), SND_SOC_DAPM_INPUT("LINE2L"), SND_SOC_DAPM_INPUT("LINE2R"), + + /* + * Virtual output pin to detection block inside codec. This can be + * used to keep codec bias on if gpio or detection features are needed. + * Force pin on or construct a path with an input jack and mic bias + * widgets. + */ + SND_SOC_DAPM_OUTPUT("Detection"), }; static const struct snd_soc_dapm_widget aic3007_dapm_widgets[] = { -- 1.7.1

3 2

[alsa-devel] ASoC update for 2.6.36
by Mark Brown 20 Sep '10

20 Sep '10

The following changes since commit 708fafb3c54039caa5dadc8e9d2dfd999f88f190: ASoC: soc-core: fix debugfs_pop_time file permissions (2010-08-27 19:58:40 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.36 Guennadi Liakhovetski (1): ASoC: fix clkdev API usage in sh/migor.c sound/soc/sh/migor.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-)

2 1

[alsa-devel] Unifying sound/pci/hda/patch_*hdmi.c
by Takashi Iwai 19 Sep '10

19 Sep '10

Hi, the below is a patch for unifying three patch_*hdmi.c into a single file. I'd like to push this to 2.6.37, so please review, especially whether it can break Nvidia hardware (since I have no h/w available). In future, we can reduce ATI- and Nvidia-specific codes gradually after confirming the generic parser works. The patch is found in sound-unstable git tree, too. The corresponding alsa-driver-unstable tarball can be used for external builds. thanks, Takashi

3 7

Re: [alsa-devel] cmipci CMI8738-MC6 - left channel no sound
by Clemens Ladisch 17 Sep '10

17 Sep '10

Tom Corner wrote: > Simple mixer control 'Line-In Mode',0 > Items: 'Line-In' 'Rear Output' 'Bass Output' > Item0: 'Line-In' OK. > Simple mixer control 'Mic-In Mode',0 > Items: 'Mic-In' 'Center/LFE Output' > Item0: 'Center/LFE Output' This should be Min-In (I guess your card doesn't have shared mic-in jack). > Simple mixer control 'Phone',0 > Mono: Playback 7 [100%] [on] I'd guess you don't need this. > Simple mixer control 'Four Channel Mode',0 > Mono: Playback [off] This might have some effect, but I don't know which setting should be the correct one. Regards, Clemens

2 2

[alsa-devel] Emulated IEC958 Card
by Jassi Brar 17 Sep '10

17 Sep '10

Hi, Ok, so there is already the iec958 plugin, but wouldn't it be nice to have an 'Emulated IEC958-Card' driver that implements implements all the possible components of the IEC958-cum-AES/EBU specification. The user could have the look and feel of a real card via ALSA control and audio i/f .... User Data can be provided too (which lacks in the iec958 plugin ?) This driver might be boon for low-end embedded devices which have neither IEC958 controller in the SoC nor a codec chip that supports it. In fact the SPDIF controller of one SoC that I know implements only a subset of the standard with limitations. The only requirement for the emulated-iec958 card would be a shifter with deep enough fifo, that can shift out bits at around 6Mbps (for 48KHz Stereo). And most SoCs have such a resource available that can be put to the use -- OMAP has McBSP, Samsung's and other SoCs can leverage a SPI controller. Any suggestions welcome. Regards, Jassi PS: I start the topic upon insistence from Angat <yadi.brar01(a)gmail.com>, a grad student who wanted to implement the feature for his univ project on his beagle board.

2 5

[alsa-devel] Realtek ALC888 recognized as having 2 channels instead of 8
by Munzir Taha (منذر طه) 17 Sep '10

17 Sep '10

Hi, A new laptop and as usual I need your help. I cannot see the controls for the 7.1 channels supported by the laptop. I tried to compile a new alsa snapshot just in case it's fixed but I lost the audio device altogether after rebooting. I also tried https://launchpad.net/~ubuntu-audio-dev/+archive/ppa which should be the proper way to update alsa in ubuntu but again the audio device disappears altogether. I tried to use options snd-hda-intel model=targa-8ch-dig and though I can see alsa controls now for the surround system but only 1 jack is working and the sound is coming from the wrong jack (rear instead of front/headphone) beside other problems. Attached is alsa-info -- Munzir Taha Telecommunications and Electronics Engineer Maintainer of Fedora Arabic Translation Project https://listman.redhat.com/mailman/listinfo/fedora-trans-ar Master CIW Designer, ICDL, MOUS, Linux+, LPI, SCSA Riyadh, SA

1 0

[alsa-devel] [PATCH] Two cleanup patches
by David Henningsson 17 Sep '10

17 Sep '10

It's just a boring day today. -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[PATCH 2/2] ALSA: HDA: Sort CXT5066 quirk table
by David Henningsson 17 Sep '10

17 Sep '10

It was just a boring day. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index a12a9f6..e501a85 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3093,19 +3093,19 @@ static const char *cxt5066_models[CXT5066_MODELS] = { }; static struct snd_pci_quirk cxt5066_cfg_tbl[] = { - SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board", - CXT5066_LAPTOP), - SND_PCI_QUIRK(0x1028, 0x02f5, "Dell", - CXT5066_DELL_LAPTOP), - SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x1025, 0x040a, "Acer", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO), + SND_PCI_QUIRK(0x1028, 0x02f5, "Dell", + CXT5066_DELL_LAPTOP), SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO), SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP), SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5), + SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board", + CXT5066_LAPTOP), + SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x17aa, 0x21b3, "Thinkpad Edge 13 (197)", CXT5066_IDEAPAD), -- 1.7.1 --------------080203050801010400030502--

1 0

[PATCH 1/2] ALSA: HDA: Fix spelling (change VOSTO to VOSTRO)
by David Henningsson 17 Sep '10

17 Sep '10

It was just a boring day. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 7e22ed1..a12a9f6 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3075,7 +3075,7 @@ enum { CXT5066_LAPTOP, /* Laptops w/ EAPD support */ CXT5066_DELL_LAPTOP, /* Dell Laptop */ CXT5066_OLPC_XO_1_5, /* OLPC XO 1.5 */ - CXT5066_DELL_VOSTO, /* Dell Vostro 1015i */ + CXT5066_DELL_VOSTRO, /* Dell Vostro 1015i */ CXT5066_IDEAPAD, /* Lenovo IdeaPad U150 */ CXT5066_THINKPAD, /* Lenovo ThinkPad T410s, others? */ CXT5066_HP_LAPTOP, /* HP Laptop */ @@ -3086,7 +3086,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = { [CXT5066_LAPTOP] = "laptop", [CXT5066_DELL_LAPTOP] = "dell-laptop", [CXT5066_OLPC_XO_1_5] = "olpc-xo-1_5", - [CXT5066_DELL_VOSTO] = "dell-vostro", + [CXT5066_DELL_VOSTRO] = "dell-vostro", [CXT5066_IDEAPAD] = "ideapad", [CXT5066_THINKPAD] = "thinkpad", [CXT5066_HP_LAPTOP] = "hp-laptop", @@ -3099,8 +3099,8 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { CXT5066_DELL_LAPTOP), SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x1025, 0x040a, "Acer", CXT5066_IDEAPAD), - SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTO), - SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO), + SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO), + SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO), SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP), SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD), @@ -3207,7 +3207,7 @@ static int patch_cxt5066(struct hda_codec *codec) spec->capture_prepare = cxt5066_olpc_capture_prepare; spec->capture_cleanup = cxt5066_olpc_capture_cleanup; break; - case CXT5066_DELL_VOSTO: + case CXT5066_DELL_VOSTRO: codec->patch_ops.init = cxt5066_init; codec->patch_ops.unsol_event = cxt5066_vostro_event; spec->init_verbs[0] = cxt5066_init_verbs_vostro; -- 1.7.1 --------------080203050801010400030502 Content-Type: text/x-patch; name="0002-ALSA-HDA-Sort-CXT5066-quirk-table.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-ALSA-HDA-Sort-CXT5066-quirk-table.patch"

1 0

[alsa-devel] Programming ALSA sound device.
by Bankim Bhavsar 17 Sep '10

17 Sep '10

Producer thread writes sound bytes worth 10 ms every 10 ms to a ring buffer. Consumer thread is responsible for writing sound bytes to ALSA sound device in a strictly non-blocking fashion. Consumer thread checks snd_pcm_avail/snd_pcm_avail_update, fetches minimum of sound bytes available in ring buffer and availFrames(returned by snd_pcm_avail_update) and writes to sound device using snd_pcm_writei(). Consumer thread polls every 20 ms. However on consumer thread snd_pcm_avail/snd_pcm_avail_update() returns 0 at least 3-4 times consecutively (total 60-80 ms) and on every 5th-6th poll snd_pcm_avail/snd_pcm_avail_update returns full buffer size occasionally reporting an under-run. On an average, under-run is reported at least 10-15 times a minute which is not desirable. Following are the hardware and software parameter settings. hardware params: 16-bit 44100 stereo buffer time 200 ms period time 25 ms software params: start_threshold: full buffer size no setting for avail_min Alternatively I've tried using wait_for_poll() technique as mentioned in the example. http://www.alsa-project.org/alsa-doc/alsa-lib/_2test_2pcm_8c-example.html However poll() unblocks very rapidly and producer ring buffer doesn't have enough bytes. What's the best technique for PCM playback for such use cases? Is it okay to skip calling snd_pcm_avail/snd_pcm_avail_update and directly attempt writing to ALSA sound device instead? Let me know if more information is required. Thanks, Bankim.

2 1

Re: [alsa-devel] [patch] ALSA: usb/mixer: remove bogus cast
by Takashi Iwai 17 Sep '10

17 Sep '10

At Thu, 16 Sep 2010 20:13:47 +0200, Dan Carpenter wrote: > > "uinfo->value.enumerated.item" is an unsigned int. If it's negative > when we do the comparison: > if ((int)uinfo->value.enumerated.item >= cval->max) > then we would read past the end of the array on the next line. This cast was for the old crappy gcc who spews bogus warnings when compared with signed and unsigned ints. The kernel sets a compile flag for avoiding this since long time ago, so we can get rid of such cast gracefully now, indeed. > I also changed the strcpy() to strlcpy() out of paranoia. > > Signed-off-by: Dan Carpenter <error27(a)gmail.com> Applied now. Thanks. Takashi > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index 3ed3901..93c95c5 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -1642,9 +1642,10 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl > uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; > uinfo->count = 1; > uinfo->value.enumerated.items = cval->max; > - if ((int)uinfo->value.enumerated.item >= cval->max) > + if (uinfo->value.enumerated.item >= cval->max) > uinfo->value.enumerated.item = cval->max - 1; > - strcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item]); > + strlcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item], > + sizeof(uinfo->value.enumerated.name)); > return 0; > } > >

1 0

[alsa-devel] [PATCH 0/4] ASoC: fsi: DMA support 1st step
by Kuninori Morimoto 16 Sep '10

16 Sep '10

Dear Mark, Liam These patches are 1st step for DMA support of FSI driver Kuninori Morimoto (4): ASoC: fsi: Add fsi_dma_get_area ASoC: fsi: Add fsi_dma_soft_push/pop function ASoC: fsi: modify variable name to easy to understand ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl These patches didn't add new feature. FSI driver is still using PIO. And above patches indicate it as "soft dma". I will add DMAEngine support for FSI in future Best regards -- Kuninori Morimoto

2 6

[alsa-devel] [PATCH] ASoC: ak4642: code clean up
by Kuninori Morimoto 16 Sep '10

16 Sep '10

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/ak4642.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index c84cc9c..a95ff4f 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -422,7 +422,7 @@ static int ak4642_probe(struct snd_soc_codec *codec) dev_info(codec->dev, "AK4642 Audio Codec %s", AK4642_VERSION); codec->hw_write = (hw_write_t)i2c_master_send; - codec->control_data = ak4642->control_data; + codec->control_data = ak4642->control_data; snd_soc_add_controls(codec, ak4642_snd_controls, ARRAY_SIZE(ak4642_snd_controls)); @@ -431,12 +431,12 @@ static int ak4642_probe(struct snd_soc_codec *codec) } static struct snd_soc_codec_driver soc_codec_dev_ak4642 = { - .probe = ak4642_probe, - .resume = ak4642_resume, - .read = ak4642_read_reg_cache, - .write = ak4642_write, - .reg_cache_size = ARRAY_SIZE(ak4642_reg), - .reg_word_size = sizeof(u8), + .probe = ak4642_probe, + .resume = ak4642_resume, + .read = ak4642_read_reg_cache, + .write = ak4642_write, + .reg_cache_size = ARRAY_SIZE(ak4642_reg), + .reg_word_size = sizeof(u8), .reg_cache_default = ak4642_reg, }; @@ -448,7 +448,7 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, int ret; ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL); - if (ak4642 == NULL) + if (!ak4642) return -ENOMEM; i2c_set_clientdata(i2c, ak4642); @@ -481,9 +481,9 @@ static struct i2c_driver ak4642_i2c_driver = { .name = "ak4642-codec", .owner = THIS_MODULE, }, - .probe = ak4642_i2c_probe, - .remove = __devexit_p(ak4642_i2c_remove), - .id_table = ak4642_i2c_id, + .probe = ak4642_i2c_probe, + .remove = __devexit_p(ak4642_i2c_remove), + .id_table = ak4642_i2c_id, }; #endif -- 1.7.0.4

3 2

[alsa-devel] [PATCH 1/3] ASoC: Add debugfs listing of registered CODECs
by Mark Brown 16 Sep '10

16 Sep '10

Help with diagnostics for machine driver setup by listing all the registered CODECs in debugfs. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 59b99fb..5e4a1f4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -271,6 +271,33 @@ static void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec) debugfs_remove_recursive(codec->debugfs_codec_root); } +static ssize_t codec_list_read_file(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); + ssize_t ret = 0; + struct snd_soc_codec *codec; + + if (!buf) + return -ENOMEM; + + list_for_each_entry(codec, &codec_list, list) + ret += snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", + codec->name); + + if (ret >= 0) + ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); + + kfree(buf); + + return ret; +} + +static const struct file_operations codec_list_fops = { + .read = codec_list_read_file, + .llseek = default_llseek,/* read accesses f_pos */ +}; + #else static inline void soc_init_codec_debugfs(struct snd_soc_codec *codec) @@ -3192,6 +3219,11 @@ static int __init snd_soc_init(void) "ASoC: Failed to create debugfs directory\n"); debugfs_root = NULL; } + + if (!debugfs_create_file("codecs", 0444, debugfs_root, NULL, + &codec_list_fops)) + pr_warn("ASoC: Failed to create CODEC list debugfs file\n"); + #endif return platform_driver_register(&soc_driver); -- 1.7.1

2 3

Re: [alsa-devel] cmipci surround sound front-left plays on lfe
by Clemens Ladisch 16 Sep '10

16 Sep '10

Tom Corner wrote: > On 09/10/10 09:10, Clemens Ladisch wrote: >> Tom Corner wrote: >>> The surround sound 5.1 is playing fine except channel 0 (front-left) >>> is playing on the woofer. >> >> And the software's front left channel is also playing on the front left >> speaker? And the subwoofer channel isn't playing on any speaker? > > No the subwoofer is playing correctly. The front-left is playing *only* > on the subwoofer. There is no sound at all coming out of the front-left > speaker. In other words, what happens is this? speaker output ---------------------- front L silence front R front R center center bass mix of front L + bass surround L surround L surround R surround R What happens when you run speaker-test with 4 and 2 channels? Regards, Clemens

4 4

[alsa-devel] [PATCH] ALSA: HDA: Enable internal speaker on Dell M101z
by David Henningsson 16 Sep '10

16 Sep '10

BugLink: http://launchpad.net/bugs/640254 In some cases a magic processing coefficient is needed to enable the internal speaker on Dell M101z. According to Realtek, this processing coefficient is only present on ALC269vb. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[alsa-devel] [PATCH] ALSA: core: Allow card id change to the same string
by Peter Ujfalusi 16 Sep '10

16 Sep '10

When user want to change the card id to the same string on the card via /sys/class/sound/cardX/id, do not report error. Instead return with success without doing anything. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- sound/core/init.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/core/init.c b/sound/core/init.c index ec4a50c..2de45fb 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -607,11 +607,16 @@ card_id_store_attr(struct device *dev, struct device_attribute *attr, return -EEXIST; } for (idx = 0; idx < snd_ecards_limit; idx++) { - if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1)) - goto __exist; + if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1)) { + if (card == snd_cards[idx]) + goto __ok; + else + goto __exist; + } } strcpy(card->id, buf1); snd_info_card_id_change(card); +__ok: mutex_unlock(&snd_card_mutex); return count; -- 1.7.2.2

2 1

[alsa-devel] [PATCH] configure.in: Create missing include/pcmcia
by Ozan Çağlayan 16 Sep '10

16 Sep '10

With kernels >= 2.6.36, the include/pcmcia/cs_types.h file can not be created because of the missing parent directory. Signed-off-by: Ozan Çağlayan <ozan(a)pardus.org.tr> --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index c8fefef..82ef3c0 100644 --- a/configure.in +++ b/configure.in @@ -461,7 +461,7 @@ AC_DEFUN([CHECK_KERNEL_HEADER], [ AC_MSG_RESULT(no) if test ! -f include/$1; then mkdir -p include/linux include/asm include/media - mkdir -p include/linux/regulator include/linux/usb + mkdir -p include/linux/regulator include/linux/usb include/pcmcia if test -z "$2" ; then echo "Creating a dummy <$1>..." touch include/$1 -- 1.7.2.1

2 1

[PATCH] ALSA: HDA: Enable internal speaker on Dell M101z
by David Henningsson 16 Sep '10

16 Sep '10

BugLink: http://launchpad.net/bugs/640254 In some cases a magic processing coefficient is needed to enable the internal speaker on Dell M101z. According to Realtek, this processing coefficient is only present on ALC269vb. Cc: stable(a)kernel.org Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index ab2947d..2063d0f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -14671,6 +14671,7 @@ static int alc269_resume(struct hda_codec *codec) enum { ALC269_FIXUP_SONY_VAIO, + ALC269_FIXUP_DELL_M101Z, }; static const struct alc_fixup alc269_fixups[] = { @@ -14680,11 +14681,20 @@ static const struct alc_fixup alc269_fixups[] = { {} } }, + [ALC269_FIXUP_DELL_M101Z] = { + .verbs = (const struct hda_verb[]) { + /* Enables internal speaker */ + {0x20, AC_VERB_SET_COEF_INDEX, 13}, + {0x20, AC_VERB_SET_PROC_COEF, 0x4040}, + {} + } + }, }; static struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), + SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), {} }; -- 1.7.1 --------------000100000009090600000802--

1 0

[alsa-devel] [PATCH] ASoC: da7210: code clean up
by Kuninori Morimoto 16 Sep '10

16 Sep '10

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/da7210.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index eabf3c0..58bb9b9 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -454,7 +454,7 @@ static int da7210_probe(struct snd_soc_codec *codec) dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); - codec->control_data = da7210->control_data; + codec->control_data = da7210->control_data; codec->hw_write = (hw_write_t)i2c_master_send; /* FIXME @@ -547,11 +547,11 @@ static int da7210_probe(struct snd_soc_codec *codec) } static struct snd_soc_codec_driver soc_codec_dev_da7210 = { - .probe = da7210_probe, - .read = da7210_read, - .write = da7210_write, - .reg_cache_size = ARRAY_SIZE(da7210_reg), - .reg_word_size = sizeof(u8), + .probe = da7210_probe, + .read = da7210_read, + .write = da7210_write, + .reg_cache_size = ARRAY_SIZE(da7210_reg), + .reg_word_size = sizeof(u8), .reg_cache_default = da7210_reg, }; @@ -597,9 +597,9 @@ static struct i2c_driver da7210_i2c_driver = { .name = "da7210-codec", .owner = THIS_MODULE, }, - .probe = da7210_i2c_probe, - .remove = __devexit_p(da7210_i2c_remove), - .id_table = da7210_i2c_id, + .probe = da7210_i2c_probe, + .remove = __devexit_p(da7210_i2c_remove), + .id_table = da7210_i2c_id, }; #endif -- 1.7.0.4

1 0

[alsa-devel] [PATCH] ALSA nvhdmi: Add missing codec IDs
by Stephen Warren 15 Sep '10

15 Sep '10

Adds codec IDs for various other NVIDIA GPUs to the NVIDIA HDMI audio driver. This is a backport of 9cf2657d05f9f9e04c3e113d68bf7cef5a942070 suitable for inclusion into 2.6.34 and 2.6.35. ... but subset so that it solely adds new IDs, and doesn't reformat nor rename any existing IDs. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/pci/hda/patch_nvhdmi.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index b0652ac..dccfcf4 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -559,6 +559,21 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { .patch = patch_nvhdmi_8ch_89 }, { .id = 0x10de000d, .name = "GT240 HDMI", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0010, .name = "GPU 10 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0011, .name = "GPU 11 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0012, .name = "GPU 12 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0013, .name = "GPU 13 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0014, .name = "GPU 14 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0018, .name = "GPU 18 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0019, .name = "GPU 19 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0043, .name = "GPU 43 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0044, .name = "GPU 44 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, {} /* terminator */ @@ -573,6 +588,21 @@ MODULE_ALIAS("snd-hda-codec-id:10de000a"); MODULE_ALIAS("snd-hda-codec-id:10de000b"); MODULE_ALIAS("snd-hda-codec-id:10de000c"); MODULE_ALIAS("snd-hda-codec-id:10de000d"); +MODULE_ALIAS("snd-hda-codec-id:10de0010"); +MODULE_ALIAS("snd-hda-codec-id:10de0011"); +MODULE_ALIAS("snd-hda-codec-id:10de0012"); +MODULE_ALIAS("snd-hda-codec-id:10de0013"); +MODULE_ALIAS("snd-hda-codec-id:10de0014"); +MODULE_ALIAS("snd-hda-codec-id:10de0018"); +MODULE_ALIAS("snd-hda-codec-id:10de0019"); +MODULE_ALIAS("snd-hda-codec-id:10de001a"); +MODULE_ALIAS("snd-hda-codec-id:10de001b"); +MODULE_ALIAS("snd-hda-codec-id:10de001c"); +MODULE_ALIAS("snd-hda-codec-id:10de0040"); +MODULE_ALIAS("snd-hda-codec-id:10de0041"); +MODULE_ALIAS("snd-hda-codec-id:10de0042"); +MODULE_ALIAS("snd-hda-codec-id:10de0043"); +MODULE_ALIAS("snd-hda-codec-id:10de0044"); MODULE_ALIAS("snd-hda-codec-id:10de0067"); MODULE_ALIAS("snd-hda-codec-id:10de8001"); -- 1.6.0.6 nvpublic

2 1

Re: [alsa-devel] [PATCH] ASoC: WM8985: Initial driver
by Mark Brown 15 Sep '10

15 Sep '10

On Wed, Sep 15, 2010 at 03:23:20PM +0100, Dimitris Papastamos wrote: > The WM8985 is a low power, high quality, feature-rich stereo > CODEC designed for portable multimedia applications that > require low power consumption and high quality audio. > > Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> Applied, thanks. > sound/soc/codecs/wm8985.c | 1195 +++++++++++++++++++++++++++++++++++++++++++++ > sound/soc/codecs/wm8985.h | 1046 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 2241 insertions(+), 0 deletions(-) As discussed I added the Makefile and Kconfig entries as I did so.

1 0

Re: [alsa-devel] [PATCH] ASoC: WM8985: Initial driver
by Liam Girdwood 15 Sep '10

15 Sep '10

On Wed, 2010-09-15 at 15:23 +0100, Dimitris Papastamos wrote: > The WM8985 is a low power, high quality, feature-rich stereo > CODEC designed for portable multimedia applications that > require low power consumption and high quality audio. > > Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> > --- > sound/soc/codecs/wm8985.c | 1195 +++++++++++++++++++++++++++++++++++++++++++++ > sound/soc/codecs/wm8985.h | 1046 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 2241 insertions(+), 0 deletions(-) > create mode 100644 sound/soc/codecs/wm8985.c > create mode 100644 sound/soc/codecs/wm8985.h Acked-by: Liam Girdwood <lrg(a)slimlogic.co.uk> -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk

1 0

[alsa-devel] [PATCH 1/3] ASoC: tlv320aic3x: Use snd_soc_read and snd_soc_write
by Jarkko Nikula 15 Sep '10

15 Sep '10

Start phasing out aic3x_read_reg_cache, aic3x_write_reg_cache, aic3x_read and aic3x_write calls in order to switch to soc-cache helpers. This patch replaces aic3x_read_reg_cache and aic3x_write with snd_soc_read and snd_soc_write. This is basically null-op since .read and .write in soc_codec_dev_aic3x points to aic3x_read_reg_cache and aic3x_write. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- sound/soc/codecs/tlv320aic3x.c | 194 ++++++++++++++++++++-------------------- 1 files changed, 98 insertions(+), 96 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 94dc707..138165c 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -839,8 +839,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, int clk; /* select data word length */ - data = - aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLB) & (~(0x3 << 4)); + data = snd_soc_read(codec, AIC3X_ASD_INTF_CTRLB) & (~(0x3 << 4)); switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: break; @@ -854,7 +853,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, data |= (0x03 << 4); break; } - aic3x_write(codec, AIC3X_ASD_INTF_CTRLB, data); + snd_soc_write(codec, AIC3X_ASD_INTF_CTRLB, data); /* Fsref can be 44100 or 48000 */ fsref = (params_rate(params) % 11025 == 0) ? 44100 : 48000; @@ -869,17 +868,17 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, if (bypass_pll) { pll_q &= 0xf; - aic3x_write(codec, AIC3X_PLL_PROGA_REG, pll_q << PLLQ_SHIFT); - aic3x_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_CLKDIV); + snd_soc_write(codec, AIC3X_PLL_PROGA_REG, pll_q << PLLQ_SHIFT); + snd_soc_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_CLKDIV); /* disable PLL if it is bypassed */ - reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); - aic3x_write(codec, AIC3X_PLL_PROGA_REG, reg & ~PLL_ENABLE); + reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); + snd_soc_write(codec, AIC3X_PLL_PROGA_REG, reg & ~PLL_ENABLE); } else { - aic3x_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_PLLDIV); + snd_soc_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_PLLDIV); /* enable PLL when it is used */ - reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); - aic3x_write(codec, AIC3X_PLL_PROGA_REG, reg | PLL_ENABLE); + reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); + snd_soc_write(codec, AIC3X_PLL_PROGA_REG, reg | PLL_ENABLE); } /* Route Left DAC to left channel input and @@ -888,7 +887,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, data |= (fsref == 44100) ? FSREF_44100 : FSREF_48000; if (params_rate(params) >= 64000) data |= DUAL_RATE_MODE; - aic3x_write(codec, AIC3X_CODEC_DATAPATH_REG, data); + snd_soc_write(codec, AIC3X_CODEC_DATAPATH_REG, data); /* codec sample rate select */ data = (fsref * 20) / params_rate(params); @@ -897,7 +896,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, data /= 5; data -= 2; data |= (data << 4); - aic3x_write(codec, AIC3X_SAMPLE_RATE_SEL_REG, data); + snd_soc_write(codec, AIC3X_SAMPLE_RATE_SEL_REG, data); if (bypass_pll) return 0; @@ -966,13 +965,16 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, } found: - data = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); - aic3x_write(codec, AIC3X_PLL_PROGA_REG, data | (pll_p << PLLP_SHIFT)); - aic3x_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, pll_r << PLLR_SHIFT); - aic3x_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT); - aic3x_write(codec, AIC3X_PLL_PROGC_REG, (pll_d >> 6) << PLLD_MSB_SHIFT); - aic3x_write(codec, AIC3X_PLL_PROGD_REG, - (pll_d & 0x3F) << PLLD_LSB_SHIFT); + data = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); + snd_soc_write(codec, AIC3X_PLL_PROGA_REG, + data | (pll_p << PLLP_SHIFT)); + snd_soc_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, + pll_r << PLLR_SHIFT); + snd_soc_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT); + snd_soc_write(codec, AIC3X_PLL_PROGC_REG, + (pll_d >> 6) << PLLD_MSB_SHIFT); + snd_soc_write(codec, AIC3X_PLL_PROGD_REG, + (pll_d & 0x3F) << PLLD_LSB_SHIFT); return 0; } @@ -980,15 +982,15 @@ found: static int aic3x_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; - u8 ldac_reg = aic3x_read_reg_cache(codec, LDAC_VOL) & ~MUTE_ON; - u8 rdac_reg = aic3x_read_reg_cache(codec, RDAC_VOL) & ~MUTE_ON; + u8 ldac_reg = snd_soc_read(codec, LDAC_VOL) & ~MUTE_ON; + u8 rdac_reg = snd_soc_read(codec, RDAC_VOL) & ~MUTE_ON; if (mute) { - aic3x_write(codec, LDAC_VOL, ldac_reg | MUTE_ON); - aic3x_write(codec, RDAC_VOL, rdac_reg | MUTE_ON); + snd_soc_write(codec, LDAC_VOL, ldac_reg | MUTE_ON); + snd_soc_write(codec, RDAC_VOL, rdac_reg | MUTE_ON); } else { - aic3x_write(codec, LDAC_VOL, ldac_reg); - aic3x_write(codec, RDAC_VOL, rdac_reg); + snd_soc_write(codec, LDAC_VOL, ldac_reg); + snd_soc_write(codec, RDAC_VOL, rdac_reg); } return 0; @@ -1012,8 +1014,8 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, u8 iface_areg, iface_breg; int delay = 0; - iface_areg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLA) & 0x3f; - iface_breg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLB) & 0x3f; + iface_areg = snd_soc_read(codec, AIC3X_ASD_INTF_CTRLA) & 0x3f; + iface_breg = snd_soc_read(codec, AIC3X_ASD_INTF_CTRLB) & 0x3f; /* set master/slave audio interface */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { @@ -1052,9 +1054,9 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, } /* set iface */ - aic3x_write(codec, AIC3X_ASD_INTF_CTRLA, iface_areg); - aic3x_write(codec, AIC3X_ASD_INTF_CTRLB, iface_breg); - aic3x_write(codec, AIC3X_ASD_INTF_CTRLC, delay); + snd_soc_write(codec, AIC3X_ASD_INTF_CTRLA, iface_areg); + snd_soc_write(codec, AIC3X_ASD_INTF_CTRLB, iface_breg); + snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, delay); return 0; } @@ -1072,18 +1074,18 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, if (codec->bias_level == SND_SOC_BIAS_STANDBY && aic3x->master) { /* enable pll */ - reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); - aic3x_write(codec, AIC3X_PLL_PROGA_REG, - reg | PLL_ENABLE); + reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); + snd_soc_write(codec, AIC3X_PLL_PROGA_REG, + reg | PLL_ENABLE); } break; case SND_SOC_BIAS_STANDBY: if (codec->bias_level == SND_SOC_BIAS_PREPARE && aic3x->master) { /* disable pll */ - reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); - aic3x_write(codec, AIC3X_PLL_PROGA_REG, - reg & ~PLL_ENABLE); + reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); + snd_soc_write(codec, AIC3X_PLL_PROGA_REG, + reg & ~PLL_ENABLE); } break; case SND_SOC_BIAS_OFF: @@ -1098,8 +1100,8 @@ void aic3x_set_gpio(struct snd_soc_codec *codec, int gpio, int state) { u8 reg = gpio ? AIC3X_GPIO2_REG : AIC3X_GPIO1_REG; u8 bit = gpio ? 3: 0; - u8 val = aic3x_read_reg_cache(codec, reg) & ~(1 << bit); - aic3x_write(codec, reg, val | (!!state << bit)); + u8 val = snd_soc_read(codec, reg) & ~(1 << bit); + snd_soc_write(codec, reg, val | (!!state << bit)); } EXPORT_SYMBOL_GPL(aic3x_set_gpio); @@ -1128,7 +1130,7 @@ void aic3x_set_headset_detection(struct snd_soc_codec *codec, int detect, if (detect & AIC3X_HEADSET_DETECT_MASK) val |= AIC3X_HEADSET_DETECT_ENABLED; - aic3x_write(codec, AIC3X_HEADSET_DETECT_CTRL_A, val); + snd_soc_write(codec, AIC3X_HEADSET_DETECT_CTRL_A, val); } EXPORT_SYMBOL_GPL(aic3x_set_headset_detection); @@ -1211,81 +1213,81 @@ static int aic3x_init(struct snd_soc_codec *codec) struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec); int reg; - aic3x_write(codec, AIC3X_PAGE_SELECT, PAGE0_SELECT); - aic3x_write(codec, AIC3X_RESET, SOFT_RESET); + snd_soc_write(codec, AIC3X_PAGE_SELECT, PAGE0_SELECT); + snd_soc_write(codec, AIC3X_RESET, SOFT_RESET); /* DAC default volume and mute */ - aic3x_write(codec, LDAC_VOL, DEFAULT_VOL | MUTE_ON); - aic3x_write(codec, RDAC_VOL, DEFAULT_VOL | MUTE_ON); + snd_soc_write(codec, LDAC_VOL, DEFAULT_VOL | MUTE_ON); + snd_soc_write(codec, RDAC_VOL, DEFAULT_VOL | MUTE_ON); /* DAC to HP default volume and route to Output mixer */ - aic3x_write(codec, DACL1_2_HPLOUT_VOL, DEFAULT_VOL | ROUTE_ON); - aic3x_write(codec, DACR1_2_HPROUT_VOL, DEFAULT_VOL | ROUTE_ON); - aic3x_write(codec, DACL1_2_HPLCOM_VOL, DEFAULT_VOL | ROUTE_ON); - aic3x_write(codec, DACR1_2_HPRCOM_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACL1_2_HPLOUT_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACR1_2_HPROUT_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACL1_2_HPLCOM_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACR1_2_HPRCOM_VOL, DEFAULT_VOL | ROUTE_ON); /* DAC to Line Out default volume and route to Output mixer */ - aic3x_write(codec, DACL1_2_LLOPM_VOL, DEFAULT_VOL | ROUTE_ON); - aic3x_write(codec, DACR1_2_RLOPM_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACL1_2_LLOPM_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACR1_2_RLOPM_VOL, DEFAULT_VOL | ROUTE_ON); /* DAC to Mono Line Out default volume and route to Output mixer */ - aic3x_write(codec, DACL1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON); - aic3x_write(codec, DACR1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACL1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON); + snd_soc_write(codec, DACR1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON); /* unmute all outputs */ - reg = aic3x_read_reg_cache(codec, LLOPM_CTRL); - aic3x_write(codec, LLOPM_CTRL, reg | UNMUTE); - reg = aic3x_read_reg_cache(codec, RLOPM_CTRL); - aic3x_write(codec, RLOPM_CTRL, reg | UNMUTE); - reg = aic3x_read_reg_cache(codec, MONOLOPM_CTRL); - aic3x_write(codec, MONOLOPM_CTRL, reg | UNMUTE); - reg = aic3x_read_reg_cache(codec, HPLOUT_CTRL); - aic3x_write(codec, HPLOUT_CTRL, reg | UNMUTE); - reg = aic3x_read_reg_cache(codec, HPROUT_CTRL); - aic3x_write(codec, HPROUT_CTRL, reg | UNMUTE); - reg = aic3x_read_reg_cache(codec, HPLCOM_CTRL); - aic3x_write(codec, HPLCOM_CTRL, reg | UNMUTE); - reg = aic3x_read_reg_cache(codec, HPRCOM_CTRL); - aic3x_write(codec, HPRCOM_CTRL, reg | UNMUTE); + reg = snd_soc_read(codec, LLOPM_CTRL); + snd_soc_write(codec, LLOPM_CTRL, reg | UNMUTE); + reg = snd_soc_read(codec, RLOPM_CTRL); + snd_soc_write(codec, RLOPM_CTRL, reg | UNMUTE); + reg = snd_soc_read(codec, MONOLOPM_CTRL); + snd_soc_write(codec, MONOLOPM_CTRL, reg | UNMUTE); + reg = snd_soc_read(codec, HPLOUT_CTRL); + snd_soc_write(codec, HPLOUT_CTRL, reg | UNMUTE); + reg = snd_soc_read(codec, HPROUT_CTRL); + snd_soc_write(codec, HPROUT_CTRL, reg | UNMUTE); + reg = snd_soc_read(codec, HPLCOM_CTRL); + snd_soc_write(codec, HPLCOM_CTRL, reg | UNMUTE); + reg = snd_soc_read(codec, HPRCOM_CTRL); + snd_soc_write(codec, HPRCOM_CTRL, reg | UNMUTE); /* ADC default volume and unmute */ - aic3x_write(codec, LADC_VOL, DEFAULT_GAIN); - aic3x_write(codec, RADC_VOL, DEFAULT_GAIN); + snd_soc_write(codec, LADC_VOL, DEFAULT_GAIN); + snd_soc_write(codec, RADC_VOL, DEFAULT_GAIN); /* By default route Line1 to ADC PGA mixer */ - aic3x_write(codec, LINE1L_2_LADC_CTRL, 0x0); - aic3x_write(codec, LINE1R_2_RADC_CTRL, 0x0); + snd_soc_write(codec, LINE1L_2_LADC_CTRL, 0x0); + snd_soc_write(codec, LINE1R_2_RADC_CTRL, 0x0); /* PGA to HP Bypass default volume, disconnect from Output Mixer */ - aic3x_write(codec, PGAL_2_HPLOUT_VOL, DEFAULT_VOL); - aic3x_write(codec, PGAR_2_HPROUT_VOL, DEFAULT_VOL); - aic3x_write(codec, PGAL_2_HPLCOM_VOL, DEFAULT_VOL); - aic3x_write(codec, PGAR_2_HPRCOM_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAL_2_HPLOUT_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAR_2_HPROUT_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAL_2_HPLCOM_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAR_2_HPRCOM_VOL, DEFAULT_VOL); /* PGA to Line Out default volume, disconnect from Output Mixer */ - aic3x_write(codec, PGAL_2_LLOPM_VOL, DEFAULT_VOL); - aic3x_write(codec, PGAR_2_RLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAL_2_LLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAR_2_RLOPM_VOL, DEFAULT_VOL); /* PGA to Mono Line Out default volume, disconnect from Output Mixer */ - aic3x_write(codec, PGAL_2_MONOLOPM_VOL, DEFAULT_VOL); - aic3x_write(codec, PGAR_2_MONOLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAL_2_MONOLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, PGAR_2_MONOLOPM_VOL, DEFAULT_VOL); /* Line2 to HP Bypass default volume, disconnect from Output Mixer */ - aic3x_write(codec, LINE2L_2_HPLOUT_VOL, DEFAULT_VOL); - aic3x_write(codec, LINE2R_2_HPROUT_VOL, DEFAULT_VOL); - aic3x_write(codec, LINE2L_2_HPLCOM_VOL, DEFAULT_VOL); - aic3x_write(codec, LINE2R_2_HPRCOM_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2L_2_HPLOUT_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2R_2_HPROUT_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2L_2_HPLCOM_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2R_2_HPRCOM_VOL, DEFAULT_VOL); /* Line2 Line Out default volume, disconnect from Output Mixer */ - aic3x_write(codec, LINE2L_2_LLOPM_VOL, DEFAULT_VOL); - aic3x_write(codec, LINE2R_2_RLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2L_2_LLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2R_2_RLOPM_VOL, DEFAULT_VOL); /* Line2 to Mono Out default volume, disconnect from Output Mixer */ - aic3x_write(codec, LINE2L_2_MONOLOPM_VOL, DEFAULT_VOL); - aic3x_write(codec, LINE2R_2_MONOLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2L_2_MONOLOPM_VOL, DEFAULT_VOL); + snd_soc_write(codec, LINE2R_2_MONOLOPM_VOL, DEFAULT_VOL); if (aic3x->model == AIC3X_MODEL_3007) { /* Class-D speaker driver init; datasheet p. 46 */ - aic3x_write(codec, AIC3X_PAGE_SELECT, 0x0D); - aic3x_write(codec, 0xD, 0x0D); - aic3x_write(codec, 0x8, 0x5C); - aic3x_write(codec, 0x8, 0x5D); - aic3x_write(codec, 0x8, 0x5C); - aic3x_write(codec, AIC3X_PAGE_SELECT, 0x00); - aic3x_write(codec, CLASSD_CTRL, 0); + snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x0D); + snd_soc_write(codec, 0xD, 0x0D); + snd_soc_write(codec, 0x8, 0x5C); + snd_soc_write(codec, 0x8, 0x5D); + snd_soc_write(codec, 0x8, 0x5C); + snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x00); + snd_soc_write(codec, CLASSD_CTRL, 0); } /* off, with power on */ @@ -1305,10 +1307,10 @@ static int aic3x_probe(struct snd_soc_codec *codec) if (aic3x->setup) { /* setup GPIO functions */ - aic3x_write(codec, AIC3X_GPIO1_REG, - (aic3x->setup->gpio_func[0] & 0xf) << 4); - aic3x_write(codec, AIC3X_GPIO2_REG, - (aic3x->setup->gpio_func[1] & 0xf) << 4); + snd_soc_write(codec, AIC3X_GPIO1_REG, + (aic3x->setup->gpio_func[0] & 0xf) << 4); + snd_soc_write(codec, AIC3X_GPIO2_REG, + (aic3x->setup->gpio_func[1] & 0xf) << 4); } snd_soc_add_controls(codec, aic3x_snd_controls, -- 1.7.1

3 12

[alsa-devel] [PATCH] ASoC: Remove needless codec->bias_level assignment to SND_SOC_BIAS_OFF
by Jarkko Nikula 15 Sep '10

15 Sep '10

This assignment is done by the snd_soc_register_codec so there is no need to redo it in probe function of a codec driver. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- I can separate this patch between TI and other codecs but I think this is trivial enough to be carried either through Mark's or Liam's tree. --- sound/soc/codecs/ak4671.c | 1 - sound/soc/codecs/ssm2602.c | 1 - sound/soc/codecs/tlv320dac33.c | 1 - sound/soc/codecs/twl4030.c | 1 - sound/soc/codecs/wm8510.c | 1 - sound/soc/codecs/wm8731.c | 2 -- sound/soc/codecs/wm8753.c | 1 - sound/soc/codecs/wm8990.c | 1 - 8 files changed, 0 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index 239f056..24f5f49 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c @@ -642,7 +642,6 @@ static int ak4671_probe(struct snd_soc_codec *codec) int ret; codec->hw_write = (hw_write_t)i2c_master_send; - codec->bias_level = SND_SOC_BIAS_OFF; ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4671->control_type); if (ret < 0) { diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 67d8c04..6f38d61 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -560,7 +560,6 @@ static int ssm2602_probe(struct snd_soc_codec *codec) pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION); - codec->bias_level = SND_SOC_BIAS_OFF, codec->control_data = ssm2602->control_data; ssm2602_reset(codec); diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index a3c5b52..bf6d01f 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -1385,7 +1385,6 @@ static int dac33_soc_probe(struct snd_soc_codec *codec) codec->control_data = dac33->control_data; codec->hw_write = (hw_write_t) i2c_master_send; - codec->bias_level = SND_SOC_BIAS_OFF; codec->idle_bias_off = 1; dac33->codec = codec; diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index c7ee1a4..cbebec6 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2245,7 +2245,6 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) snd_soc_codec_set_drvdata(codec, twl4030); /* Set the defaults, and power up the codec */ twl4030->sysclk = twl4030_codec_get_mclk() / 1000; - codec->bias_level = SND_SOC_BIAS_OFF; codec->idle_bias_off = 1; twl4030_init_chip(codec); diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index d00da20..02ecf54 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -569,7 +569,6 @@ static int wm8510_probe(struct snd_soc_codec *codec) wm8510_reset(codec); /* power on device */ - codec->bias_level = SND_SOC_BIAS_OFF; wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY); snd_soc_add_controls(codec, wm8510_snd_controls, ARRAY_SIZE(wm8510_snd_controls)); diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 56f5408..6980ff8 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -488,8 +488,6 @@ static int wm8731_probe(struct snd_soc_codec *codec) struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); int ret = 0, i; - codec->bias_level = SND_SOC_BIAS_OFF, - ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8731->control_type); if (ret < 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 4a945d3..6c0ff35 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1550,7 +1550,6 @@ static int wm8753_probe(struct snd_soc_codec *codec) struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec); int ret = 0, reg; - codec->bias_level = SND_SOC_BIAS_OFF; INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work); ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type); diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 0ffecbd..264828e 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c @@ -1354,7 +1354,6 @@ static int wm8990_probe(struct snd_soc_codec *codec) wm8990_reset(codec); /* charge output caps */ - codec->bias_level = SND_SOC_BIAS_OFF; wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY); reg = snd_soc_read(codec, WM8990_AUDIO_INTERFACE_4); -- 1.7.1

3 2

[alsa-devel] need help diagnosing USB MIDI latency problem with MPD16
by Krzysztof Foltman 15 Sep '10

15 Sep '10

Hello, Some time ago, I wrote the Akai MPD16 protocol handlers (input/output) for the USB MIDI driver. Unfortunately, the kernel driver seems to suffer from a rather embarrassing input latency, it looks like the MIDI event timing granularity is >100ms (so the latency is variable, making the pad practically useless except if a rhythm is played with the rate matching the polling rate!). At the same time, a simple Python based contraption using libusb and bulkRead in a while loop, gets much better results. The same USB MIDI driver in the same kernel and PC doesn't have noticeable problems with class-compliant E-Mu Xboard25 connected to the same USB port. Both devices use endpoints in bulk mode. I've attached the excerpts of lsusb -v output for both devices - the only differences are: 1) the Akai device isn't class compliant, 2) the E-mu device has one pair of inputs/outputs, the Akai has two (control/configuration and MIDI proper) 3) the maximum packet length is 32 for E-mu, 64 for Akai. When I enabled logging in midi.c (#define DUMP_PACKETS), it looks like the device is returning data packets rather infrequently, as a single packet often contains multiple events (up to 3) when two pads are pressed in rapid succession. So, it looks like a problem outside of my snd_usbmidi_akai_input. One thing that *does* help, though, is disabling the 'control' port by adding endpoints[0].in_cables = 0; in Akai quirk handling in snd_usbmidi_create - when input from the control port is not polled, the choppiness disappears completely. I'm guessing that the device itself (or something in between) has some problems having to handle the URBs for both endpoints, and that perhaps the IN/NAK exchange on a "control" endpoint causes the device's microcontroller (or something else?) to stall for a while. However, in that case, a proper solution (one that doesn't involve sacrificing the ability to use control port for configuration) would involve submitting URBs for the control input endpoint only when control port is open on ALSA side, and cancelling them when the port is closed. However, that sounds pretty invasive. Any hints? The device in question is rather uncommon and hasn't been supported for a while, so refactoring the whole USB MIDI driver to accommodate it doesn't sound like a great idea - but still, the latency thing sucks pretty bad for a drumming-oriented device! Thanks in advance, Krzysztof

1 0

[alsa-devel] Fwd: Microphone not working on PCI ID 8086:3b56
by Jeff Chua 15 Sep '10

15 Sep '10

Hi, I'm having problem getting the microphone to work on the Lenovo X201s, but the audio output is working fine. It's showing up as: 00:1b.0 Audio device: Intel Corporation 5 Series/3400 Series Chipset High Definition Audio (rev 06) [00:1b.0 0403: 8086:3b56 (rev 06)] # uname -s Linux boston 2.6.36-rc4 #57 SMP PREEMPT Tue Sep 14 05:12:21 EDT 2010 x86_64 GNU/Linux # cat /proc/asound/devices 0: [ 0] : control 16: [ 0- 0]: digital audio playback 24: [ 0- 0]: digital audio capture 33: : timer 160: [ 5] : control # cat /proc/asound/pcm 00-00: CONEXANT Analog : CONEXANT Analog : playback 1 : capture 1 # dmesg thinkpad_acpi: Console audio control enabled, mode: override (read/write) input: ThinkPad Extra Buttons as /devices/platform/thinkpad_acpi/input/input6 HDA Intel 0000:00:1b.0: PCI INT B -> GSI 17 (level, low) -> IRQ 17 HDA Intel 0000:00:1b.0: irq 45 for MSI/MSI-X HDA Intel 0000:00:1b.0: setting latency timer to 64 hda-codec: No codec parser is available ALSA device list: #0: HDA Intel at 0xf2520000 irq 45 #5: ThinkPad Console Audio Control at EC reg 0x30, fw 6QHT29WW-1.10 I've alsa-plugins-1.0.23, alsa-utils-1.0.23, alsa-lib-1.0.23 installed. alsamixer is showing Capture at 100%, Analog Mic Boost at 40db and Digital at 100, but captured using "arecord" or "rec" and then playback is all just dead silence! Any pointers on how to make this work would be very much appreciated. Thanks, Jeff

1 0

[alsa-devel] [PATCH] patch_nvhdmi.c: Fix supported sample rate list.
by Stephen Warren 15 Sep '10

15 Sep '10

22050 isn't a valid HDMI sample rate. 32000 is. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> Acked-By: Wei Ni <wni(a)nvidia.com> --- sound/pci/hda/patch_nvhdmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index 69b950d..baa108b 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -84,7 +84,7 @@ static struct hda_verb nvhdmi_basic_init_7x[] = { #else /* support all rates and formats */ #define SUPPORTED_RATES \ - (SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\ + (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\ SNDRV_PCM_RATE_192000) #define SUPPORTED_MAXBPS 24 -- 1.7.0.4 nvpublic

2 1

[alsa-devel] Terratec EWS88D (ice1712) optical stuck on ADAT (no IEC958 optical i/o)
by Niels Mayer 14 Sep '10

14 Sep '10

I just scored a nice Terratec EWS88D for $20.00. :-) ( http://nielsmayer.com/envy24control/EWS88D_Board_L.jpg missing midi cable though (*)) It works nicely with Linux and http://mudita24.googlecode.com , although it's missing some important controls to turn off the ADAT parts of the card. Alas, it wouldn't help to support them in mudita24, as I cannot get them to change values through standard ALSA tools like amixer(1) and alsamixer(1). Therefore, the question: is what is it about snd-ice1712 that prevents the mixer control values detailed below from changing, and is there anything I can do to fix it? (sometimes you want to use this card in it's dual IEC958 optical + spdif I/O config, other times, you want to use the optical for ADAT and the spdif for IEC958, which is the only configuration I can get currently.) The results from amixer(1): http://nielsmayer.com/envy24control/terratec-ews88d-amixer.txt Results of "cat /proc/asound/EWS88D/ice1712": http://nielsmayer.com/envy24control/terratec-ews88d-ice1712.txt My attempts at changing optical port from ADAT to IEC958. Nothing happens: ///// ///// ///// ///// ///// ///// ///// ///// coggie-7-~> foreach i ( 'IEC958 Input Optical' 'IEC958 Input Optical' 'ADAT External Master Clock' 'ADAT Output Optical' 'ADAT Through' 'Enable ADAT' ) foreach? amixer cget iface=MIXER,name="$i" foreach? end numid=95,iface=MIXER,name='IEC958 Input Optical' ; type=BOOLEAN,access=rw------,values=1 : values=off numid=95,iface=MIXER,name='IEC958 Input Optical' ; type=BOOLEAN,access=rw------,values=1 : values=off numid=97,iface=MIXER,name='ADAT External Master Clock' ; type=BOOLEAN,access=rw------,values=1 : values=on numid=96,iface=MIXER,name='ADAT Output Optical' ; type=BOOLEAN,access=rw------,values=1 : values=on numid=99,iface=MIXER,name='ADAT Through' ; type=BOOLEAN,access=rw------,values=1 : values=off numid=98,iface=MIXER,name='Enable ADAT' ; type=BOOLEAN,access=rw------,values=1 : values=on coggie-10-~> amixer cset iface=MIXER,name='Enable ADAT' off numid=98,iface=MIXER,name='Enable ADAT' ; type=BOOLEAN,access=rw------,values=1 : values=on coggie-11-~> amixer cset iface=MIXER,name='Enable ADAT' false numid=98,iface=MIXER,name='Enable ADAT' ; type=BOOLEAN,access=rw------,values=1 : values=on coggie-12-~> amixer cset iface=MIXER,name='Enable ADAT' off numid=98,iface=MIXER,name='Enable ADAT' ; type=BOOLEAN,access=rw------,values=1 : values=on coggie-13-~> amixer cset iface=MIXER,name='Enable ADAT' 0 numid=98,iface=MIXER,name='Enable ADAT' ; type=BOOLEAN,access=rw------,values=1 : values=on coggie-14-~> amixer cset iface=MIXER,name='IEC958 Input Optical' on numid=95,iface=MIXER,name='IEC958 Input Optical' ; type=BOOLEAN,access=rw------,values=1 : values=off coggie-15-~> amixer cset iface=MIXER,name='IEC958 Input Optical' true numid=95,iface=MIXER,name='IEC958 Input Optical' ; type=BOOLEAN,access=rw------,values=1 : values=off coggie-16-~> amixer cset iface=MIXER,name='IEC958 Input Optical' 1 numid=95,iface=MIXER,name='IEC958 Input Optical' ; type=BOOLEAN,access=rw------,values=1 : values=off ///// ///// ///// ///// ///// ///// ///// ///// FYI, for more info on this board: ftp://ftp.terratec.de/Audio/EWS/88D/Manual/EWS88D_Manual_GB.pdf ftp://ftp.terratec.de/Audio/EWS/88D/TechnicalData/EWS88D_GB.pdf Relevant snd-ice1712 sources: http://git.alsa-project.org/?p=alsa-kernel.git;a=blob_plain;f=sound/pci/ice… http://git.alsa-project.org/?p=alsa-kernel.git;a=blob_plain;f=sound/pci/ice… Also, I'm running on Fedora12 ( 2.6.32.21-166.fc12.x86_64 ) which seems to have a somewhat odd mix of ALSA drivers and runtime: coggie-17-~> drumstick-sysinfo ALSA Sequencer System Info, version: 0.5.0 Compiled ALSA library: 1.0.23 Runtime ALSA library: 1.0.23 Runtime ALSA drivers: 1.0.21. Numeric ALSA compiled library: 10017 Numeric ALSA runtime library: 10017 Numeric ALSA runtime driver: 10015 Will Fedora13 or "runtime ALSA drivers: 1.0.23" remedy this situation? (Probably not EWS88D is a pretty old card and I don't see any changes related to it recently). The target machine for this card will actually be running Fedora13, however, that machine hasn't been decommissioned, wiped, or setup for that purpose yet.... Niels http://nielsmayer.com PS: (*) Anybody know where to find/build a 9-pin MIDI cable for the EWS88D? Will the RME HDSP9652 cable fit/work? http://www.bananasmusic.com/productdetail.asp/pid_3970/productname_RME-BOHD…

2 4

[alsa-devel] [PATCH] ALSA: emux: Add trivial compat ioctl handler
by Ben Hutchings 14 Sep '10

14 Sep '10

Reported-by: Carmen Cru <carmen.cru(a)belgacom.net> Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk> --- This is compile-tested only. Ben. sound/synth/emux/emux_hwdep.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c index ff0b2a8..5ae1eae 100644 --- a/sound/synth/emux/emux_hwdep.c +++ b/sound/synth/emux/emux_hwdep.c @@ -128,6 +128,9 @@ snd_emux_init_hwdep(struct snd_emux *emu) strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME); hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE; hw->ops.ioctl = snd_emux_hwdep_ioctl; + /* The ioctl parameter types are compatible between 32- and + * 64-bit architectures, so use the same function. */ + hw->ops.ioctl_compat = snd_emux_hwdep_ioctl; hw->exclusive = 1; hw->private_data = emu; if ((err = snd_card_register(emu->card)) < 0) -- 1.7.1

2 1

[alsa-devel] [PATCH] sound/ppc/powermac: remove undefined operations
by Andreas Schwab 14 Sep '10

14 Sep '10

Modifying an object twice without an intervening sequence point is undefined. Signed-off-by: Andreas Schwab <schwab(a)linux-m68k.org> --- sound/ppc/tumbler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 20afdf9..961d982 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -785,7 +785,7 @@ static int snapper_set_capture_source(struct pmac_tumbler *mix) if (! mix->i2c.client) return -ENODEV; if (mix->capture_source) - mix->acs = mix->acs |= 2; + mix->acs |= 2; else mix->acs &= ~2; return i2c_smbus_write_byte_data(mix->i2c.client, TAS_REG_ACS, mix->acs); -- 1.7.2.3 -- Andreas Schwab, schwab(a)linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

2 1

[alsa-devel] [PATCH next 00/16] treewide: Use static const char * const where possible
by Joe Perches 14 Sep '10

14 Sep '10

Convert the uses that should be const of char *foo[] = {"bar", "baz"}; to const char * const foo[] = {"bar", "baz"}; or static const char * const foo[] = {"bar", "baz"}; Joe Perches (16): arch/alpha: Use static const char * const where possible arch/ia64: Use static const char * const where possible arch/microblaze: Use static const char * const where possible arch/x86: Use static const char * const where possible drivers/gpu: Use static const char * const where possible drivers/isdn: Use static const char * const where possible drivers/net: Use static const char * const where possible drivers/net/pcmcia: Use static const char * const where possible drivers/net/wireless: Use static const char * const where possible drivers/scsi: Use static const char * const where possible drivers/staging: Use static const char * const where possible drivers/usb: Use static const char * const where possible drivers/watchdog: Use static const char * const where possible fs: Use static const char * const where possible net/irda: Use static const char * const where possible sound: Use static const char * const where possible arch/alpha/kernel/err_ev6.c | 12 +++++--- arch/alpha/kernel/err_marvel.c | 33 ++++++++++++------------ arch/alpha/kernel/err_titan.c | 35 ++++++++++++++----------- arch/alpha/kernel/osf_sys.c | 4 +- arch/ia64/kernel/palinfo.c | 2 +- arch/microblaze/kernel/heartbeat.c | 10 +++--- arch/microblaze/kernel/timer.c | 12 ++++---- arch/x86/kernel/smpboot.c | 2 +- arch/x86/kvm/mmu.c | 2 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 ++- drivers/isdn/pcbit/edss1.c | 2 +- drivers/isdn/pcbit/edss1.h | 2 +- drivers/net/3c515.c | 4 ++- drivers/net/eth16i.c | 4 ++- drivers/net/pcmcia/3c589_cs.c | 2 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- drivers/scsi/bfa/rport.c | 4 ++- drivers/scsi/pcmcia/nsp_debug.c | 2 +- drivers/scsi/qla2xxx/qla_nx.c | 4 +- drivers/scsi/qla4xxx/ql4_nx.c | 2 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 14 +++++----- drivers/staging/bcm/Debug.c | 5 ++- drivers/usb/host/oxu210hp-hcd.c | 2 +- drivers/watchdog/machzwd.c | 2 +- fs/binfmt_flat.c | 4 ++- include/net/irda/irlan_event.h | 2 +- net/irda/irlan/irlan_event.c | 2 +- sound/core/misc.c | 5 +--- sound/core/pcm_native.c | 2 +- 29 files changed, 99 insertions(+), 83 deletions(-) -- 1.7.3.rc1

2 2

[alsa-devel] snd-aloop PCM Slave Channels
by Raymond Yau 14 Sep '10

14 Sep '10

it seem there is a bug in snd-aloop those IFACE_PCM "PCM Slave Channels" controls return 48000 static int loopback_channels_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct loopback *loopback = snd_kcontrol_chip(kcontrol); - ucontrol->value.integer.value[0] =loopback->setup[kcontrol->id.subdevice][kcontrol->id.device].rate; + ucontrol->value.integer.value[0] =loopback->setup[kcontrol->id.subdevice][kcontrol->id.device].channels; return 0; } BTW , AFAIK dmix/dsnoop only work with subdevice 0 and there are 8 subdevices by default How can the application access Loopback.pcm.default ? http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=72c7260ce624adcb…

1 0

[alsa-devel] [PATCH] ASoC: fsi codecs: Update card name field
by Kuninori Morimoto 14 Sep '10

14 Sep '10

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- I think Mark's advice means this patch sound/soc/sh/fsi-ak4642.c | 2 +- sound/soc/sh/fsi-da7210.c | 2 +- sound/soc/sh/fsi-hdmi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c index a7d2686..d96602d 100644 --- a/sound/soc/sh/fsi-ak4642.c +++ b/sound/soc/sh/fsi-ak4642.c @@ -43,7 +43,7 @@ static struct snd_soc_dai_link fsi_dai_link = { }; static struct snd_soc_card fsi_soc_card = { - .name = "FSI", + .name = "FSI (AK4642)", .dai_link = &fsi_dai_link, .num_links = 1, }; diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c index b527015..a6adb6e 100644 --- a/sound/soc/sh/fsi-da7210.c +++ b/sound/soc/sh/fsi-da7210.c @@ -33,7 +33,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = { }; static struct snd_soc_card fsi_soc_card = { - .name = "FSI", + .name = "FSI (DA7210)", .dai_link = &fsi_da7210_dai, .num_links = 1, }; diff --git a/sound/soc/sh/fsi-hdmi.c b/sound/soc/sh/fsi-hdmi.c index fcda149..a52dd8e 100644 --- a/sound/soc/sh/fsi-hdmi.c +++ b/sound/soc/sh/fsi-hdmi.c @@ -22,7 +22,7 @@ static struct snd_soc_dai_link fsi_dai_link = { }; static struct snd_soc_card fsi_soc_card = { - .name = "FSI", + .name = "FSI (SH MOBILE HDMI)", .dai_link = &fsi_dai_link, .num_links = 1, }; -- 1.7.0.4

2 1

[alsa-devel] [PATCH 2/3] ASoC: Samsung: Debug PCM snd_soc_dai_driver registration
by Jassi Brar 14 Sep '10

14 Sep '10

From: Jassi Brar <jassi.brar(a)samsung.com> Each of the two PCM controllers need to be registered during probe with appropriate 'name' of the dai driver. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/s3c-pcm.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c index 6174e26..d404f80 100644 --- a/sound/soc/s3c24xx/s3c-pcm.c +++ b/sound/soc/s3c24xx/s3c-pcm.c @@ -361,8 +361,6 @@ static struct snd_soc_dai_ops s3c_pcm_dai_ops = { #define S3C_PCM_RATES SNDRV_PCM_RATE_8000_96000 #define S3C_PCM_DAI_DECLARE \ -{ \ - .name = "samsung-dai", \ .symmetric_rates = 1, \ .ops = &s3c_pcm_dai_ops, \ .playback = { \ @@ -376,12 +374,17 @@ static struct snd_soc_dai_ops s3c_pcm_dai_ops = { .channels_max = 2, \ .rates = S3C_PCM_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ - }, \ -} + } struct snd_soc_dai_driver s3c_pcm_dai[] = { - S3C_PCM_DAI_DECLARE, - S3C_PCM_DAI_DECLARE, + [0] = { + .name = "samsung-pcm.0", + S3C_PCM_DAI_DECLARE, + }, + [1] = { + .name = "samsung-pcm.1", + S3C_PCM_DAI_DECLARE, + }, }; EXPORT_SYMBOL_GPL(s3c_pcm_dai); @@ -465,7 +468,7 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) } clk_enable(pcm->pclk); - ret = snd_soc_register_dai(&pdev->dev, s3c_pcm_dai); + ret = snd_soc_register_dai(&pdev->dev, &s3c_pcm_dai[pdev->id]); if (ret != 0) { dev_err(&pdev->dev, "failed to get pcm_clock\n"); goto err5; -- 1.6.2.5

2 6

[alsa-devel] [PATCH 00/11] treewide: Remove pr_<level> uses with KERN_<level>
by Joe Perches 14 Sep '10

14 Sep '10

Most of these are pr_debug(KERN_<foo>. pr_<level>(KERN_<level> is unnecessary. Joe Perches (11): arch/arm: Remove pr_<level> uses of KERN_<level> arch/avr32: Remove pr_<level> uses of KERN_<level> arch/microblaze: Remove pr_<level> uses of KERN_<level> arch/mips: Remove pr_<level> uses of KERN_<level> arch/powerpc: Remove pr_<level> uses of KERN_<level> arch/x86: Remove pr_<level> uses of KERN_<level> drivers/infiniband: Remove pr_<level> uses of KERN_<level> drivers/net/skfp: Remove pr_<level> uses of KERN_<level> drivers/staging/msm: Remove pr_<level> uses of KERN_<level> drivers/usb/gadget: Remove pr_<level> uses of KERN_<level> sound: Remove pr_<level> uses of KERN_<level> arch/arm/mach-pxa/cpufreq-pxa2xx.c | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 4 +- arch/microblaze/kernel/exceptions.c | 16 ++---- arch/mips/kernel/irq-gic.c | 2 +- arch/mips/pci/pci-rc32434.c | 2 +- arch/powerpc/kvm/emulate.c | 4 +- arch/powerpc/sysdev/pmi.c | 2 +- arch/x86/kernel/apb_timer.c | 4 +- drivers/infiniband/hw/amso1100/c2_intr.c | 4 +- drivers/net/skfp/skfddi.c | 84 +++++++++++++++--------------- drivers/staging/msm/staging-devices.c | 2 +- drivers/usb/gadget/r8a66597-udc.c | 2 +- sound/ppc/snd_ps3.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 3 +- 14 files changed, 64 insertions(+), 70 deletions(-) -- 1.7.3.rc1

4 4

[alsa-devel] [PATCH] ALSA: hda - Add quirk for Toshiba C650D using a Conexant CX20585
by Anisse Astier 14 Sep '10

14 Sep '10

Add a quirk for laptop Toshiba Satellite C650D to have proper external HP and external Mic support. Signed-off-by: Anisse Astier <anisse(a)astier.eu> --- Hi, Apparently Greg Alexander did a great job of enhancing suport for CX20585 and CX20582 codecs as a side effect of his CXT5066_IDEAPAD quirk. Maybe we should generalize this to all CX2058x codecs. In attachment, alsa-info output before and after using model=ideapad. I also tried model=olpc-xo-1_5, but Mic didn't work at all with it. Patch is on top of for-next, but should be pretty obvious to apply otherwise. Regards, Anisse --- sound/pci/hda/patch_conexant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 71f9d64..972e7c4 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3092,6 +3092,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO), SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP), + SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD), -- 1.7.0.6

2 1

[alsa-devel] [PATCH 00/25] treewide-next: Use static const char arrays
by Joe Perches 14 Sep '10

14 Sep '10

Using static const char foo[] = "bar" can save some code and text space, so change the places where it's possible. Also change the places that use char foo[] = "barX"; ... foo[3] = value + '0'; where X is typically changed char foo[sizeof("barX")]; ... sprintf(foo, "bar%c", value + '0'); Joe Perches (25): arch/mips: Use static const char arrays arch/powerpc: Use static const char arrays drivers/acpi: Use static const char arrays drivers/char: Use static const char arrays drivers/i2c: Use static const char arrays drivers/isdn: Use static const char arrays drivers/media: Use static const char arrays drivers/net/atl1c: Use static const char arrays drivers/net/atl1e: Use static const char arrays drivers/net/(intel): Use static const char arrays drivers/net/netxen: Use static const char arrays drivers/net/qlcnic: Use static const char arrays drivers/net/spider_net.c: Use static const char arrays drivers/net/vnxnet3: Use static const char arrays drivers/net/wireless/ipw2x00: Use static const char arrays drivers/s390/char: Use static const char arrays drivers/scsi: Use static const char arrays drivers/serial/suncore.c: Use static const char arrays drivers/staging: Use static const char arrays drivers/usb: Use static const char arrays drivers/video: Use static const char arrays net/dsa: Use static const char arrays net/sunrpc: Use static const char arrays sound: Use static const char arrays tools/perf/util: Use static const char arrays arch/mips/pnx8550/common/reset.c | 4 ++-- arch/powerpc/boot/addnote.c | 4 ++-- arch/powerpc/boot/cuboot-c2k.c | 4 ++-- arch/powerpc/kernel/irq.c | 2 +- drivers/acpi/sleep.c | 4 ++-- drivers/char/hvc_vio.c | 2 +- drivers/i2c/busses/i2c-stu300.c | 4 ++-- drivers/isdn/hysdn/hycapi.c | 2 +- drivers/isdn/mISDN/dsp_cmx.c | 2 +- drivers/media/video/zoran/zoran_device.c | 5 ++--- drivers/net/atl1c/atl1c.h | 4 ++-- drivers/net/atl1c/atl1c_main.c | 4 ++-- drivers/net/atl1e/atl1e.h | 4 ++-- drivers/net/atl1e/atl1e_main.c | 4 ++-- drivers/net/e1000/e1000.h | 2 +- drivers/net/e1000/e1000_main.c | 4 ++-- drivers/net/e1000e/e1000.h | 2 +- drivers/net/e1000e/netdev.c | 2 +- drivers/net/igb/igb.h | 4 ++-- drivers/net/igb/igb_main.c | 4 ++-- drivers/net/igbvf/igbvf.h | 2 +- drivers/net/igbvf/netdev.c | 2 +- drivers/net/ixgb/ixgb.h | 2 +- drivers/net/ixgb/ixgb_main.c | 2 +- drivers/net/ixgbe/ixgbe.h | 2 +- drivers/net/ixgbe/ixgbe_main.c | 4 ++-- drivers/net/ixgbevf/ixgbevf.h | 2 +- drivers/net/ixgbevf/ixgbevf_main.c | 2 +- drivers/net/netxen/netxen_nic.h | 2 +- drivers/net/netxen/netxen_nic_main.c | 2 +- drivers/net/qlcnic/qlcnic.h | 2 +- drivers/net/qlcnic/qlcnic_main.c | 2 +- drivers/net/spider_net.c | 2 +- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/net/vmxnet3/vmxnet3_int.h | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- drivers/net/wireless/ipw2x00/libipw_module.c | 2 +- drivers/s390/char/vmlogrdr.c | 4 ++-- drivers/scsi/bnx2i/bnx2i_hwi.c | 6 +++--- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 6 +++--- drivers/serial/suncore.c | 4 ++-- drivers/staging/brcm80211/util/bcmutils.c | 2 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/cxt1e1/ossiRelease.c | 2 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/msm/mdp.c | 2 +- .../staging/rtl8192e/ieee80211/ieee80211_module.c | 2 +- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- drivers/staging/tidspbridge/rmgr/dbdcd.c | 6 +++--- drivers/usb/atm/ueagle-atm.c | 14 +++++--------- drivers/usb/otg/langwell_otg.c | 2 +- drivers/video/sh_mipi_dsi.c | 4 ++-- drivers/video/sis/sis_main.c | 10 +++++----- drivers/video/via/viafbdev.c | 2 +- net/dsa/dsa.c | 2 +- net/dsa/dsa_priv.h | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- sound/core/misc.c | 5 ++++- tools/perf/util/ui/setup.c | 3 ++- tools/perf/util/ui/util.c | 3 ++- 62 files changed, 98 insertions(+), 98 deletions(-) -- 1.7.3.rc1

2 4

[alsa-devel] [PATCH 1/3 v2]sound/oss/ac97_codec.c Update broken web addresses.
by Justin P. Mattock 13 Sep '10

13 Sep '10

This is a resend from the original, due to Clemens Ladisch providing the right locations of the *.pdf's etc.. Signed-off-by: Justin P. Mattock <justinmattock(a)gmail.com> Signed-off-by: Clemens Ladisch <clemens(a)ladisch.de> --- sound/oss/ac97_codec.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index 456a1b4..e2c5fe9 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c @@ -22,10 +22,7 @@ ************************************************************************** * * The Intel Audio Codec '97 specification is available at the Intel - * audio homepage: http://developer.intel.com/ial/scalableplatforms/audio/ - * - * The specification itself is currently available at: - * ftp://download.intel.com/ial/scalableplatforms/ac97r22.pdf + * http://download.intel.com/support/motherboards/desktop/sb/ac97_r23.pdf * ************************************************************************** * -- 1.7.2.1

1 2

Re: [alsa-devel] [PATCH 3, 5, 7/8] sound/* Update broken web addresses.
by Clemens Ladisch 13 Sep '10

13 Sep '10

Justin P. Mattock wrote: > --- a/sound/oss/ac97_codec.c > +++ b/sound/oss/ac97_codec.c > * The Intel Audio Codec '97 specification is available at the Intel >- * audio homepage: http://developer.intel.com/ial/scalableplatforms/audio/ > + * audio homepage: http://developer.intel.com/ drop this link > * The specification itself is currently available at: > - * ftp://download.intel.com/ial/scalableplatforms/ac97r22.pdf > + * ftp://ftp.intel.com/pub/ http://download.intel.com/support/motherboards/desktop/sb/ac97_r23.pdf > --- a/sound/pci/ens1370.c > +++ b/sound/pci/ens1370.c > - * using http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c1540.htm > + * using http://www.alsa-project.org/~iwai/ http://www.kernel.org/pub/linux/kernel/people/tiwai/docs/writing-an-alsa-dr… > --- a/sound/pci/intel8x0.c > +++ b/sound/pci/intel8x0.c > - * http://www.intel.com/design/chipsets/specupdt/245051.htm > + * http://www.intel.com/p/en_US/business/design http://download.intel.com/design/chipsets/specupdt/24505108.pdf

2 1

Re: [alsa-devel] USB Audio device syncpipe error
by 6275 kson 13 Sep '10

13 Sep '10

Well I basically understand what is wrong. Usbaudio is expecting the packet size to be 4 and the value to be encoded as 16.16 because the device is operating at high speed. I made the change and my device now shows up properly as an output device and playback works but the feedback polling interval is incorrect. Since the feedback endpoint descriptor is not class specific I can see why one would expect it to be a usb 2.0 standard endpoint descriptor, however, that would mean I should also change my other audio streaming endpoint descriptors. Unfortunately, I'm not sure the proper way to fix this - any advice would be appreciated. Cheers On Thu, Sep 9, 2010 at 10:04 AM, 6275 kson <6275.kson(a)gmail.com> wrote: > > > On Thu, Sep 9, 2010 at 2:50 AM, Clemens Ladisch <clemens(a)ladisch.de>wrote: > >> 6275 kson wrote: >> > cannot submit syncpipe for urb 0, error -90: internal error >> >> Documentation/usb/error-codes.txt says: >> | -EMSGSIZE (a) endpoint maxpacket size is zero; it is not usable >> | in the current interface altsetting. >> | (b) ISO packet is larger than the endpoint maxpacket. >> | (c) requested data transfer length is invalid: negative >> | or too large for the host controller. >> >> So, what is the sync packet size? >> > >> > The packet size is 3. > > The descriptor used for High Speed is essentially the same as the full > speed descriptor except we have adjusted the endpoint polling rates so they > match the full speed rate (1ms). > > Thanks for your help, > > > >

4 3

[alsa-devel] [PATCH] alsactl init: Add db entry for Compaq nx6110 quirk
by Daniel Chen 13 Sep '10

13 Sep '10

Hi, Attached please find a patch for alsa-utils that adds a necessary control quirk for the Compaq nx6110 (the 'Headphone Jack Sense' control needs to be unmuted). Thanks, Dan

2 2

[alsa-devel] [PATCH] ASoC: Set more meaningful name for SMDK64xx WM8580 audio
by Mark Brown 13 Sep '10

13 Sep '10

Since the SMDK64xx boards have two audio subsystems using the board name as the card name by itself isn't so user friendly as it might be. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index 91367f7..052e499 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c @@ -242,7 +242,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { }; static struct snd_soc_card smdk64xx = { - .name = "smdk64xx", + .name = "SMDK64xx 5.1", .dai_link = smdk64xx_dai, .num_links = ARRAY_SIZE(smdk64xx_dai), }; -- 1.7.1

3 2

[alsa-devel] [PATCH 2.6.32.3] hda_intel: ALSA HD Audio patch for Intel Cougar Point DeviceIDs
by Seth Heasley 13 Sep '10

13 Sep '10

This patch adds the Intel Cougar Point (PCH) HD Audio Controller DeviceIDs. Signed-off-by: Seth Heasley <seth.heasley(a)intel.com> --- linux-2.6.32.3/sound/pci/hda/hda_intel.c.orig 2010-01-06 15:07:45.000000000 -0800 +++ linux-2.6.32.3/sound/pci/hda/hda_intel.c 2010-01-07 13:10:28.000000000 -0800 @@ -116,6 +116,7 @@ "{Intel, ICH9}," "{Intel, ICH10}," "{Intel, PCH}," + "{Intel, CPT}," "{Intel, SCH}," "{ATI, SB450}," "{ATI, SB600}," @@ -2648,6 +2649,8 @@ { PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH }, /* PCH */ { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH }, + /* CPT */ + { PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_ICH }, /* SCH */ { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH }, /* ATI SB 450/600 */

2 5

[alsa-devel] Question about "ALSA device list" on kernel boot
by Kuninori Morimoto 13 Sep '10

13 Sep '10

Dear Mark, Liam I noticed that the "ALSA device list" on kernel boot was changed. # Maybe the turning patch is Liam's # ASoC: multi-component - ASoC Multi-Component Support # But, I have not confirmed it. ex) on AP4 board, FSI-AK4642, FSI-HDMI case, the list is before: ... ALSA device list: #0: FSI (AK4642) #1: FSI (SH MOBILE HDMI) after: ... ALSA device list: #0: FSI #1: FSI Was print policy changed ? If it is strange, where is ? => soc-core side ? or FSI side ? Best regards -- Kuninori Morimoto

2 1

[alsa-devel] Binding multiple registers to an enum
by Stuart Longland 13 Sep '10

13 Sep '10

Hi all, Just working on the TLV320AIC3204 driver again... I've got an issue where we get noise on recording inputs if I don't drive unused inputs to the common mode. Now there's a register which can do exactly this. Each of the inputs can be routed through a difference series resistance... this selection is done by enum controls, with the options being: not-connected, 10k, 20k or 40k. My plan, is that when 'not-selected' is chosen, I set the appropriate bit in the floating input register so it gets connected to common-mode... and when something else is chosen, that bit gets cleared. I've tried lying to DAPM and telling it these bits control PGAs on the inputs themselves... but it gets the wrong idea about which ones need to be turned on. Perhaps I should investigate that ... but the idea of using PGA controls doesn't seem quite right. I've looked at SOC_ENUM_EXT, which would do what I want (I already use this to keep ADC OSR and DAC OSR settings in sync) however, these controls have implications for signal routing, and therefore DAPM needs to know about them, so really it'd be a SOC_DAPM_ENUM_EXT control I'd be after. I can't see such a thing however... how does one go about doing this? Regards, -- Stuart Longland (aka Redhatter, VK4MSL) .'''. Gentoo Linux/MIPS Cobalt and Docs Developer '.'` : . . . . . . . . . . . . . . . . . . . . . . .'.' http://dev.gentoo.org/~redhatter :.' I haven't lost my mind... ...it's backed up on a tape somewhere.

2 1

[alsa-devel] [PATCH] ASoC: S3C: Fix PCM RX FIFO settings
by Seungwhan Youn 11 Sep '10

11 Sep '10

When PCM capture, sound recorded abnormally because of RX FIFO threshold settings are missing. So, This patch modify PCM RX FIFO setting codes same as TX. Signed-off-by: Seungwhan Youn <sw.youn(a)samsung.com> --- sound/soc/s3c24xx/s3c-pcm.c | 3 +++ sound/soc/s3c24xx/s3c-pcm.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c index 43dcc6b..deaa3f2 100644 --- a/sound/soc/s3c24xx/s3c-pcm.c +++ b/sound/soc/s3c24xx/s3c-pcm.c @@ -107,11 +107,14 @@ static void s3c_pcm_snd_rxctrl(struct s3c_pcm_info *pcm, int on) ctl = readl(regs + S3C_PCM_CTL); clkctl = readl(regs + S3C_PCM_CLKCTL); + ctl &= ~(S3C_PCM_CTL_RXDIPSTICK_MASK + << S3C_PCM_CTL_RXDIPSTICK_SHIFT); if (on) { ctl |= S3C_PCM_CTL_RXDMA_EN; ctl |= S3C_PCM_CTL_RXFIFO_EN; ctl |= S3C_PCM_CTL_ENABLE; + ctl |= (0x20<<S3C_PCM_CTL_RXDIPSTICK_SHIFT); clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; } else { ctl &= ~S3C_PCM_CTL_RXDMA_EN; diff --git a/sound/soc/s3c24xx/s3c-pcm.h b/sound/soc/s3c24xx/s3c-pcm.h index 3e9bfc9..b85eaf2 100644 --- a/sound/soc/s3c24xx/s3c-pcm.h +++ b/sound/soc/s3c24xx/s3c-pcm.h @@ -22,7 +22,8 @@ /* PCM_CTL Bit-Fields */ #define S3C_PCM_CTL_TXDIPSTICK_MASK (0x3f) #define S3C_PCM_CTL_TXDIPSTICK_SHIFT (13) -#define S3C_PCM_CTL_RXDIPSTICK_MSK (0x3f<<7) +#define S3C_PCM_CTL_RXDIPSTICK_MASK (0x3f) +#define S3C_PCM_CTL_RXDIPSTICK_SHIFT (7) #define S3C_PCM_CTL_TXDMA_EN (0x1<<6) #define S3C_PCM_CTL_RXDMA_EN (0x1<<5) #define S3C_PCM_CTL_TXMSB_AFTER_FSYNC (0x1<<4) -- 1.6.2.5

5 8

[alsa-devel] [PATCH] ASoC: Fix off-by-one bug in register cache size configuration
by Dimitris Papastamos 11 Sep '10

11 Sep '10

This is a simple off-by-one bug, the size of the register cache is incorrectly set to the maximum register index. Fix it by adding one. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 58ba2d3..30984dd 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1780,7 +1780,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8962 = { .remove = wm8962_remove, .resume = wm8962_resume, .set_bias_level = wm8962_set_bias_level, - .reg_cache_size = WM8962_MAX_REGISTER, + .reg_cache_size = WM8962_MAX_REGISTER + 1, .reg_word_size = sizeof(u16), .reg_cache_default = wm8962_reg, .volatile_register = wm8962_volatile_register, -- 1.7.2.3

3 2

[alsa-devel] [PATCH 1/4] ASoC: tlv320aic3x: Optimize PLL programming in aic3x_set_bias_level
by Jarkko Nikula 11 Sep '10

11 Sep '10

There is only need to enable/disable once the PLL when the bias is going between on, prepare, standby and off states. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- sound/soc/codecs/tlv320aic3x.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index b317586..94dc707 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1069,7 +1069,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_ON: break; case SND_SOC_BIAS_PREPARE: - if (aic3x->master) { + if (codec->bias_level == SND_SOC_BIAS_STANDBY && + aic3x->master) { /* enable pll */ reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); aic3x_write(codec, AIC3X_PLL_PROGA_REG, @@ -1077,15 +1078,16 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, } break; case SND_SOC_BIAS_STANDBY: - /* fall through and disable pll */ - case SND_SOC_BIAS_OFF: - if (aic3x->master) { + if (codec->bias_level == SND_SOC_BIAS_PREPARE && + aic3x->master) { /* disable pll */ reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG); aic3x_write(codec, AIC3X_PLL_PROGA_REG, reg & ~PLL_ENABLE); } break; + case SND_SOC_BIAS_OFF: + break; } codec->bias_level = level; -- 1.7.1

3 11

[alsa-devel] [PATCH RFC 0/1] ASoC: WL1273 FM: Change error handling.
by Matti J. Aaltonen 11 Sep '10

11 Sep '10

Hi. This patch changes the error handling in the FM radio codec so that it's always permissible to set the audio routing to the previous value/ B.R. Matti J. Aaltonen (1): ASoC: WL1273 FM Radio: Eliminate unnecessary error return value. sound/soc/codecs/wl1273.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

3 4

[alsa-devel] Sound Blaster 5.1vx with CA0106
by Andy Owen 11 Sep '10

11 Sep '10

Hi, I recently bought a Sound Blaster 5.1vx (which has a ca0106 chip on it) and found that it didn't quite work properly in ALSA. The fix I made changes a few bits of code which aren't specific to my sound card, and I don't have a way to test it. The code looks to be more correct (I had to change a few spots to get the controls to operate on the correct channels, and also to get the rear channels to work at all). Could someone please review the patch, which I've attached to this bug report: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5108 Thanks for your time. Andy

1 0

[alsa-devel] [PATCH] ASoC: multi-component: SAMSUNG: Modify the name of I2S driver
by Chanwoo Choi 11 Sep '10

11 Sep '10

This patch modify the name of I2S driver(S3C64XX/S3C24xx /S3C2412) from "*-iis-*" to "*-i2s-*". The mismatch of I2S name exist in the following sound driver. These files write the "cpu_dai_name" of I2S as "*-i2s-*". - sound/soc/s3c24xx/aquila_wm8994.c : "s3c64xx-i2s-v4-dai" - sound/soc/s3c24xx/goni_wm8994.c : "s3c64xx-i2s-v4-dai" - sound/soc/s3c24xx/smdk64xx_wm8580.c "s3c64xx-i2s-v4-dai" - sound/soc/s3c24xx/jive_wm8750.c : "s3c2412-i2s-dai" - sound/soc/s3c24xx/neo1973_wm8753.c : "s3c24xx-i2s-dai" - sound/soc/s3c24xx/neo1973_gta02_wm8753.c : "s3c24xx-i2s-dai" - sound/soc/s3c24xx/s3c24xx_simtec_hermes.c : "s3c24xx-i2s-dai" - sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c : "s3c24xx-i2s-dai" - sound/soc/s3c24xx/s3c24xx_uda134x.c : "s3c24xx-i2s-dai" - sound/soc/s3c24xx/smartq_wm8987.c : "s3c64xx-i2s-dai.0" or, It is should modify "cpu_dai_name" of sound drvier files instead of modifying the name of I2S driver. Signed-off-by: Chanwoo Choi <cw00.choi(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index aa116f6..f7c23ae 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -188,7 +188,7 @@ static struct platform_driver s3c2412_iis_driver = { .probe = s3c2412_iis_dev_probe, .remove = s3c2412_iis_dev_remove, .driver = { - .name = "s3c2412-iis-dai", + .name = "s3c2412-i2s-dai", .owner = THIS_MODULE, }, }; diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index a6cbeef..20712ad 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -495,7 +495,7 @@ static struct platform_driver s3c24xx_iis_driver = { .probe = s3c24xx_iis_dev_probe, .remove = s3c24xx_iis_dev_remove, .driver = { - .name = "s3c24xx-iis-dai", + .name = "s3c24xx-i2s-dai", .owner = THIS_MODULE, }, }; diff --git a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c index 885040b..2846ea2 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c @@ -195,7 +195,7 @@ static struct platform_driver s3c64xx_i2sv4_driver = { .probe = s3c64xx_i2sv4_dev_probe, .remove = s3c64xx_i2sv4_dev_remove, .driver = { - .name = "s3c64xx-iis-v4-dai", + .name = "s3c64xx-i2s-v4-dai", .owner = THIS_MODULE, }, }; diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 161189b..2017639 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -218,7 +218,7 @@ static struct platform_driver s3c64xx_iis_driver = { .probe = s3c64xx_iis_dev_probe, .remove = s3c64xx_iis_dev_remove, .driver = { - .name = "s3c64xx-iis-dai", + .name = "s3c64xx-i2s-dai", .owner = THIS_MODULE, }, }; -- 1.6.3.3

7 16

[alsa-devel] crash with assertion (?)
by IOhannes m zmoelnig 11 Sep '10

11 Sep '10

hi all, (just in case: sorry for double posting, i first sent from a non-subscribed address) this might have been discussed already ages ago, but i didn't find much on the web, and i'm a bit confused why it happens, so: i'm developing/bugfixing an application using (well, obviously) alsa, and i get crashes with assertions. my setup: - nvidia CK804 onboard soundcard (this soundcard seems to only be able to run at 48kHz) - debian squeeze/sid (libasound2 1.0.23-1) what i'm trying to do: i'm requesting my "plughw" device with 44100Hz the request is done with something like: rate=44100; err = snd_pcm_hw_params_set_rate_min(handle, params, &rate, 0); [...] err = snd_pcm_hw_params(handle, params); what happens: in the snd_pcm_hw_params(), my program exits with: "interval_inline.h:52: snd_interval_single: Assertion `!snd_interval_empty(i)' failed." sidenotes: if i use the "hw" device, i get away with the wrong samplerate (no crash, though the requested samplerate does not take effect) now i understand, that my soundcard does not accept 44100Hz. what i don't understand is, that alsa-lib crashes with an assertion error. i expect snd_pcm_hw_params() return an error!=0 if it fails to do what it is asked to do. imho, a library should _never ever_ crash the application. is this a bug? in alsa-lib? in the debian-packages? fgmasdr IOhannes

3 9

[alsa-devel] [PATCH] ASoC: Fix incorrect register cache size configuration
by Dimitris Papastamos 11 Sep '10

11 Sep '10

The reg_cache_size is the number of elements in the register cache, not the size of the cache itself. This is not a problem if the size of each element of the cache is 1 byte but it matters in any other case. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8580.c | 2 +- sound/soc/codecs/wm8711.c | 2 +- sound/soc/codecs/wm8728.c | 2 +- sound/soc/codecs/wm8731.c | 2 +- sound/soc/codecs/wm8741.c | 2 +- sound/soc/codecs/wm8750.c | 2 +- sound/soc/codecs/wm8753.c | 2 +- sound/soc/codecs/wm8776.c | 2 +- sound/soc/codecs/wm8900.c | 2 +- sound/soc/codecs/wm8940.c | 2 +- sound/soc/codecs/wm8961.c | 2 +- sound/soc/codecs/wm8988.c | 2 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm9081.c | 2 +- sound/soc/codecs/wm9705.c | 2 +- sound/soc/codecs/wm9712.c | 2 +- sound/soc/codecs/wm9713.c | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 910c62a..ad5987e 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -907,7 +907,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = { .probe = wm8580_probe, .remove = wm8580_remove, .set_bias_level = wm8580_set_bias_level, - .reg_cache_size = sizeof(wm8580_reg), + .reg_cache_size = ARRAY_SIZE(wm8580_reg), .reg_word_size = sizeof(u16), .reg_cache_default = &wm8580_reg, }; diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index f8d9c60..52a923a 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -418,7 +418,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = { .suspend = wm8711_suspend, .resume = wm8711_resume, .set_bias_level = wm8711_set_bias_level, - .reg_cache_size = sizeof(wm8711_reg), + .reg_cache_size = ARRAY_SIZE(wm8711_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8711_reg, }; diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 5e5a162..32eba85 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c @@ -272,7 +272,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8728 = { .suspend = wm8728_suspend, .resume = wm8728_resume, .set_bias_level = wm8728_set_bias_level, - .reg_cache_size = sizeof(wm8728_reg_defaults), + .reg_cache_size = ARRAY_SIZE(wm8728_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8728_reg_defaults, }; diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 56f5408..2827501 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -567,7 +567,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { .suspend = wm8731_suspend, .resume = wm8731_resume, .set_bias_level = wm8731_set_bias_level, - .reg_cache_size = sizeof(wm8731_reg), + .reg_cache_size = ARRAY_SIZE(wm8731_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8731_reg, }; diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index c8e7a26..90e31e9 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -453,7 +453,7 @@ static int wm8741_probe(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_wm8741 = { .probe = wm8741_probe, .resume = wm8741_resume, - .reg_cache_size = sizeof(wm8741_reg_defaults), + .reg_cache_size = ARRAY_SIZE(wm8741_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = &wm8741_reg_defaults, }; diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 92d4b2a..4d1ec9d 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -747,7 +747,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8750 = { .suspend = wm8750_suspend, .resume = wm8750_resume, .set_bias_level = wm8750_set_bias_level, - .reg_cache_size = sizeof(wm8750_reg), + .reg_cache_size = ARRAY_SIZE(wm8750_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8750_reg, }; diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 4a945d3..0b0e3b3 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1617,7 +1617,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8753 = { .suspend = wm8753_suspend, .resume = wm8753_resume, .set_bias_level = wm8753_set_bias_level, - .reg_cache_size = sizeof(wm8753_reg), + .reg_cache_size = ARRAY_SIZE(wm8753_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8753_reg, }; diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 05d98dd..c0b6917 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -448,7 +448,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8776 = { .suspend = wm8776_suspend, .resume = wm8776_resume, .set_bias_level = wm8776_set_bias_level, - .reg_cache_size = sizeof(wm8776_reg), + .reg_cache_size = ARRAY_SIZE(wm8776_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8776_reg, }; diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 1378aab..25c8ccd 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -1256,7 +1256,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8900 = { .resume = wm8900_resume, .set_bias_level = wm8900_set_bias_level, .volatile_register = wm8900_volatile_register, - .reg_cache_size = sizeof(wm8900_reg_defaults), + .reg_cache_size = ARRAY_SIZE(wm8900_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8900_reg_defaults, }; diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index d28bf0d..2cb16f8 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -750,7 +750,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8940 = { .suspend = wm8940_suspend, .resume = wm8940_resume, .set_bias_level = wm8940_set_bias_level, - .reg_cache_size = sizeof(wm8940_reg_defaults), + .reg_cache_size = ARRAY_SIZE(wm8940_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8940_reg_defaults, }; diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index bfc6578..4f326f6 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c @@ -1075,7 +1075,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8961 = { .suspend = wm8961_suspend, .resume = wm8961_resume, .set_bias_level = wm8961_set_bias_level, - .reg_cache_size = sizeof(wm8961_reg_defaults), + .reg_cache_size = ARRAY_SIZE(wm8961_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8961_reg_defaults, .volatile_register = wm8961_volatile_register, diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index d070a58..d08b1fe 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -809,7 +809,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8988 = { .suspend = wm8988_suspend, .resume = wm8988_resume, .set_bias_level = wm8988_set_bias_level, - .reg_cache_size = sizeof(wm8988_reg), + .reg_cache_size = ARRAY_SIZE(wm8988_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8988_reg, }; diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index a3fd6b9..589e3fa 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -1586,7 +1586,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8993 = { .suspend = wm8993_suspend, .resume = wm8993_resume, .set_bias_level = wm8993_set_bias_level, - .reg_cache_size = sizeof(wm8993_reg_defaults), + .reg_cache_size = ARRAY_SIZE(wm8993_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8993_reg_defaults, .volatile_register = wm8993_volatile, diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 00249d5..ecc7c37 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1317,7 +1317,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = { .suspend = wm9081_suspend, .resume = wm9081_resume, .set_bias_level = wm9081_set_bias_level, - .reg_cache_size = sizeof(wm9081_reg_defaults), + .reg_cache_size = ARRAY_SIZE(wm9081_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm9081_reg_defaults, .volatile_register = wm9081_volatile_register, diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index e4d8f53..a144acd 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -385,7 +385,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9705 = { .resume = wm9705_soc_resume, .read = ac97_read, .write = ac97_write, - .reg_cache_size = sizeof(wm9705_reg), + .reg_cache_size = ARRAY_SIZE(wm9705_reg), .reg_word_size = sizeof(u16), .reg_cache_step = 2, .reg_cache_default = wm9705_reg, diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index cebeb93..d2f224d 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -674,7 +674,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = { .read = ac97_read, .write = ac97_write, .set_bias_level = wm9712_set_bias_level, - .reg_cache_size = sizeof(wm9712_reg), + .reg_cache_size = ARRAY_SIZE(wm9712_reg), .reg_word_size = sizeof(u16), .reg_cache_step = 2, .reg_cache_default = wm9712_reg, diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 463917e..7da13b0 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1257,7 +1257,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { .read = ac97_read, .write = ac97_write, .set_bias_level = wm9713_set_bias_level, - .reg_cache_size = sizeof(wm9713_reg), + .reg_cache_size = ARRAY_SIZE(wm9713_reg), .reg_word_size = sizeof(u16), .reg_cache_step = 2, .reg_cache_default = wm9713_reg, -- 1.7.2.3

3 2

[alsa-devel] [PATCH] ALSA: usb-audio: Assume first control interface is for audio
by Daniel Mack 10 Sep '10

10 Sep '10

For devices with more than one control interface, let's assume the first one contains the audio controls. Unfortunately, there is no field in any of the descriptors to tell us whether a control interface is for audio or MIDI controls, so a better check is not easy to implement. On a composite device with audio and MIDI functions, for example, the code currently overwrites chip->ctrl_intf, causing operations on the control interface to fail if they are issued after the device probe. Signed-off-by: Daniel Mack <daniel(a)caiaq.de> --- sound/usb/card.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 9feb00c..b443a33 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -465,7 +465,13 @@ static void *snd_usb_audio_probe(struct usb_device *dev, goto __error; } - chip->ctrl_intf = alts; + /* + * For devices with more than one control interface, we assume the + * first contains the audio controls. We might need a more specific + * check here in the future. + */ + if (!chip->ctrl_intf) + chip->ctrl_intf = alts; if (err > 0) { /* create normal USB audio interfaces */ -- 1.7.0.4

4 4

[alsa-devel] [PATCH - 1/1] patch_nvhdmi.c: Add missing codec IDs, unify names
by Stephen Warren 10 Sep '10

10 Sep '10

* Add missing codec IDs. * Modify some existing codec names for discrete GPUs to match newly added IDs. Note: existing names were a mixture of marketing and engineering GPU names. Equally, there's no reason that codec IDs have to be specific to a particular GPU or board, so identify codecs in a less marketing-oriented fashion. * Reformat codec ID table so it's easier to read, for me at least. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> diff --git a/pci/hda/patch_nvhdmi.c b/pci/hda/patch_nvhdmi.c index a281836..77e2b40 100644 --- a/pci/hda/patch_nvhdmi.c +++ b/pci/hda/patch_nvhdmi.c @@ -540,26 +540,32 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec) * patch entries */ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { - { .id = 0x10de0002, .name = "MCP77/78 HDMI", - .patch = patch_nvhdmi_8ch_7x }, - { .id = 0x10de0003, .name = "MCP77/78 HDMI", - .patch = patch_nvhdmi_8ch_7x }, - { .id = 0x10de0005, .name = "MCP77/78 HDMI", - .patch = patch_nvhdmi_8ch_7x }, - { .id = 0x10de0006, .name = "MCP77/78 HDMI", - .patch = patch_nvhdmi_8ch_7x }, - { .id = 0x10de0007, .name = "MCP79/7A HDMI", - .patch = patch_nvhdmi_8ch_7x }, - { .id = 0x10de000a, .name = "GT220 HDMI", - .patch = patch_nvhdmi_8ch_89 }, - { .id = 0x10de000b, .name = "GT21x HDMI", - .patch = patch_nvhdmi_8ch_89 }, - { .id = 0x10de000c, .name = "MCP89 HDMI", - .patch = patch_nvhdmi_8ch_89 }, - { .id = 0x10de000d, .name = "GT240 HDMI", - .patch = patch_nvhdmi_8ch_89 }, - { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, - { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, + { .id = 0x10de0002, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, + { .id = 0x10de0003, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, + { .id = 0x10de0005, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, + { .id = 0x10de0006, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, + { .id = 0x10de0007, .name = "MCP79/7A HDMI", .patch = patch_nvhdmi_8ch_7x }, + { .id = 0x10de000a, .name = "GPU 0a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de000b, .name = "GPU 0b HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de000c, .name = "MCP89 HDMI", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de000d, .name = "GPU 0d HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0010, .name = "GPU 10 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0011, .name = "GPU 11 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0012, .name = "GPU 12 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0013, .name = "GPU 13 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0014, .name = "GPU 14 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0018, .name = "GPU 18 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0019, .name = "GPU 19 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0043, .name = "GPU 43 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0044, .name = "GPU 44 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, + { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, {} /* terminator */ }; @@ -572,6 +578,21 @@ MODULE_ALIAS("snd-hda-codec-id:10de000a"); MODULE_ALIAS("snd-hda-codec-id:10de000b"); MODULE_ALIAS("snd-hda-codec-id:10de000c"); MODULE_ALIAS("snd-hda-codec-id:10de000d"); +MODULE_ALIAS("snd-hda-codec-id:10de0010"); +MODULE_ALIAS("snd-hda-codec-id:10de0011"); +MODULE_ALIAS("snd-hda-codec-id:10de0012"); +MODULE_ALIAS("snd-hda-codec-id:10de0013"); +MODULE_ALIAS("snd-hda-codec-id:10de0014"); +MODULE_ALIAS("snd-hda-codec-id:10de0018"); +MODULE_ALIAS("snd-hda-codec-id:10de0019"); +MODULE_ALIAS("snd-hda-codec-id:10de001a"); +MODULE_ALIAS("snd-hda-codec-id:10de001b"); +MODULE_ALIAS("snd-hda-codec-id:10de001c"); +MODULE_ALIAS("snd-hda-codec-id:10de0040"); +MODULE_ALIAS("snd-hda-codec-id:10de0041"); +MODULE_ALIAS("snd-hda-codec-id:10de0042"); +MODULE_ALIAS("snd-hda-codec-id:10de0043"); +MODULE_ALIAS("snd-hda-codec-id:10de0044"); MODULE_ALIAS("snd-hda-codec-id:10de0067"); MODULE_ALIAS("snd-hda-codec-id:10de8001"); -- 1.6.0.6 nvpublic

2 5

[alsa-devel] [PATCH 1/1] mfd: add codec resource into 88pm860x driver
by Haojian Zhuang 10 Sep '10

10 Sep '10

3 2

[alsa-devel] [PATCH 0/5 v2] fbdev: sh_mobile_hdmi: bug fix patches V2
by Kuninori Morimoto 10 Sep '10

10 Sep '10

Dear Mark, Liam, Guennadi These are ALSA V2 bug fix patches which are reported by Guennadi. Kuninori Morimoto (5): fbdev: sh_mobile_hdmi: modify noisy comment out fbdev: sh_mobile_hdmi: modify flags name to more specific fbdev: sh_mobile_hdmi: modify snd_soc_dai_driver settings fbdev: sh_mobile_hdmi: add new label for sound error path ASoC: fsi-hdmi: remove unneeded header To Mark. Please care above patch independently from these patches. [alsa-devel] [PATCH 5/5] ASoC: fsi-ak4642: modiry platform_name These series are for ALSA side patches. I will send SH side V2 patches soon. Main diff v1 <==> v2 is I added Guennadi's report mail to log area on each patches, and care more. But these series still didn't care above. I added reasons. -- Guennadi ------------------------------------------ > +config SND_FSI_HDMI > + bool "FSI-HDMI sound support" > + depends on SND_SOC_SH4_FSI && FB_SH_MOBILE_HDMI > + help > + This option enables generic sound support for the > + FSI - HDMI unit > + "bool" means, if someone is linking the whole ASoC into the kernel, they will not be able to build this as a module. Not a big deal, but you're stealing some freedom from the user. ------------------------------------------------------- understand. But the config which use "bool" for FSI-XXX is not only FSI-HDMI. So, I will care your indication as "new function patch" in future. -- Guennadi ------------------------------------------ With this config option you will have 3 SND_SOC_SH4_FSI implementations in the Kconfig, all selectable independently. Do you really think it makes sense and would work, if someone were to select more than one of those options at the same time? ------------------------------------------------------- Yes. I created it for independently. For example, you can select FSI-AK4642 and FSI-HDMI in same time, and both works well for me on AP4 board now. But I guess, if you select FSI-DA7210 and FSI-HDMI, small patch which change FSIA <-> FSIB is needed. FSI-AK4642 : FSI-A FSI-DA7210 : FSI-B FSI-HDMI : FSI-B I think that it should be going to enable the selection of "FSI-A" and "FSI-B" in the future. But now, no way, no idea. It is my task By the way, about HDMI sound, I know that there are some HDMI monitors which can not use sound. Now I'm debuging about it. -- Guennadi ------------------------------------------ > + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE, Again, this I am not sure about. The datasheet says 16 to 32 bit are possible, but then I only see configuration for 16 to 24 bits, but in any case, I think, you'd want to implement .hw_params to support non-default formats. ------------------------------------------------------- Yes. I should modify this .formats. But I can not select, test, support 32bit in current environment. So, please put it to my TODO list. And yes. .hw_params implementation is important for advanced support. But now, current HDMI sound support is still prototype (I didn't indicate though). So. please put it to my TODO list too. Best regards -- Kuninori Morimoto

3 12

[alsa-devel] [PATCH] ASoC: fsi codecs: modify menu attribute on Kconfig
by Kuninori Morimoto 10 Sep '10

10 Sep '10

Current SND_FSI_xxx menu attributes were bool, but it should be tristate. This patch solve below report from Guennadi "bool" means, if someone is linking the whole ASoC into the kernel, they will not be able to build this as a module. Not a big deal, but you're stealing some freedom from the user. Reported-by: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/Kconfig | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 6b224d2..7f0a496 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -47,7 +47,7 @@ config SND_SH7760_AC97 AC97 unit of the SH7760. config SND_FSI_AK4642 - bool "FSI-AK4642 sound support" + tristate "FSI-AK4642 sound support" depends on SND_SOC_SH4_FSI && I2C_SH_MOBILE select SND_SOC_AK4642 help @@ -55,7 +55,7 @@ config SND_FSI_AK4642 FSI - AK4642 unit config SND_FSI_DA7210 - bool "FSI-DA7210 sound support" + tristate "FSI-DA7210 sound support" depends on SND_SOC_SH4_FSI && I2C_SH_MOBILE select SND_SOC_DA7210 help @@ -63,7 +63,7 @@ config SND_FSI_DA7210 FSI - DA7210 unit config SND_FSI_HDMI - bool "FSI-HDMI sound support" + tristate "FSI-HDMI sound support" depends on SND_SOC_SH4_FSI && FB_SH_MOBILE_HDMI help This option enables generic sound support for the -- 1.7.0.4

3 2

[alsa-devel] [PATCH 3/3] ASoC: Samsung: Debug PCM platform device name
by Jassi Brar 10 Sep '10

10 Sep '10

From: Jassi Brar <jassi.brar(a)samsung.com> The PCM controller platform devices are registered by the name 'samsung-pcm', so use the same in the CPU driver. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/s3c-pcm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c index d404f80..6e9139f 100644 --- a/sound/soc/s3c24xx/s3c-pcm.c +++ b/sound/soc/s3c24xx/s3c-pcm.c @@ -525,7 +525,7 @@ static struct platform_driver s3c_pcm_driver = { .probe = s3c_pcm_dev_probe, .remove = s3c_pcm_dev_remove, .driver = { - .name = "samsung-pcm-audio", + .name = "samsung-pcm", .owner = THIS_MODULE, }, }; @@ -546,4 +546,4 @@ module_exit(s3c_pcm_exit); MODULE_AUTHOR("Jaswinder Singh, <jassi.brar(a)samsung.com>"); MODULE_DESCRIPTION("S3C PCM Controller Driver"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:samsung-pcm-audio"); +MODULE_ALIAS("platform:samsung-pcm"); -- 1.6.2.5

3 2

[alsa-devel] [PATCH 1/3] ASoC: S3C: AC97: Remove the -dai suffix
by Jassi Brar 10 Sep '10

10 Sep '10

From: Jassi Brar <jassi.brar(a)samsung.com> Drop the invalid -dai suffix appended to the Samsung AC97 CPU DAI. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index 66f9e22..4613288 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c @@ -28,7 +28,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97-dai", + .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "s3c24xx-pcm-audio", diff --git a/sound/soc/s3c24xx/smdk_wm9713.c b/sound/soc/s3c24xx/smdk_wm9713.c index 90108a7..11086f8 100644 --- a/sound/soc/s3c24xx/smdk_wm9713.c +++ b/sound/soc/s3c24xx/smdk_wm9713.c @@ -47,7 +47,7 @@ static struct snd_soc_dai_link smdk_dai = { .name = "AC97", .stream_name = "AC97 PCM", .platform_name = "s3c24xx-pcm-audio", - .cpu_dai_name = "s3c-ac97-dai", + .cpu_dai_name = "s3c-ac97", .codec_dai_name = "wm9713-hifi", .codec_name = "wm9713-codec", }; -- 1.6.2.5

3 2

[alsa-devel] [PATCH 0/5] ASoC: sh_mobile_hdmi: bug fix patches
by Kuninori Morimoto 10 Sep '10

10 Sep '10

Dear Mark, Liam, Guennadi These are bug fix patches for sh_mobile_hdmi. Kuninori Morimoto (5): fbdev: sh_mobile_hdmi: modify HDMI flags name to more specific fbdev: sh_mobile_hdmi: modify snd_soc_dai_driver settings fbdev: sh_mobile_hdmi: add new label for sound error path ASoC: fsi-hdmi: remove unneeded header ASoC: fsi-ak4642: modiry platform_name 1/5 - 4/5 bugs are reported by Guennadi. And 5/5 is needed if Paul's genesis tree are merged to Mark's "for-2.6.37" Best regards -- Kuninori Morimoto

4 14

[alsa-devel] M-Audio Fast Track Ultra (8r) mixer: How to verify dB information?
by Felix Homann 10 Sep '10

10 Sep '10

Hi list, after some struggle I managed to get the mixer in the M-Audio working. Before I submit a patch I would like to know if there's an way to test the dB information for the controls. I'm using the mixer_vol_tlv TLV callback right now but I'm not sure it produces correct data. Kind regards, Felix

2 3

[alsa-devel] [PATCH 1/2] ALSA: snd-usb-caiaq: drop version number
by Daniel Mack 10 Sep '10

10 Sep '10

Let git do the job. Signed-off-by: Daniel Mack <daniel(a)caiaq.de> --- sound/usb/caiaq/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index cdfb856..da9cb6d 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -36,7 +36,7 @@ #include "input.h" MODULE_AUTHOR("Daniel Mack <daniel(a)caiaq.de>"); -MODULE_DESCRIPTION("caiaq USB audio, version 1.3.21"); +MODULE_DESCRIPTION("caiaq USB audio"); MODULE_LICENSE("GPL"); MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," "{Native Instruments, RigKontrol3}," -- 1.7.0.4

2 5

[alsa-devel] [PATCH 1/3] ALSA: snd-usb-caiaq: drop version number
by Daniel Mack 10 Sep '10

10 Sep '10

Let git do the job. Signed-off-by: Daniel Mack <daniel(a)caiaq.de> --- sound/usb/caiaq/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index cdfb856..da9cb6d 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -36,7 +36,7 @@ #include "input.h" MODULE_AUTHOR("Daniel Mack <daniel(a)caiaq.de>"); -MODULE_DESCRIPTION("caiaq USB audio, version 1.3.21"); +MODULE_DESCRIPTION("caiaq USB audio"); MODULE_LICENSE("GPL"); MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," "{Native Instruments, RigKontrol3}," -- 1.7.0.4

2 4

[alsa-devel] cmipci surround sound front-left plays on lfe
by Tom Corner 10 Sep '10

10 Sep '10

I've been going around and around on this. The surround sound 5.1 is playing fine except channel 0 (front-left) is playing on the woofer. I have a Terratec Aureon fun - CMI8738-MC6. I can redirect the output on 0 to right-front successfully using .asoundrc and "ttable.0.1 1". I have gotten desperate and have tested this card in Windows and was able to get it working right there. I have been using the file www_lynnemusic_com_surround_test.wma through mplayer and speaker-test to to test the setup. I am using pulseaudio, but I reconfigured my system without pulseaudio and get the same result. Any help would be much appreciated. Tom Corner

2 1

[alsa-devel] [PATCH] ALSA: hda - fix cirrus dac/beep coefs setup
by Jan Nikitenko 10 Sep '10

10 Sep '10

Fix copy&paste bug in cirrus coefs setup, that caused bogus value in DAC_CFG that should have gone to BEEP_CFG. The problem could be noticed with 'Headphone' output getting audible volume ramp in the beginning of sound playback. Signed-off-by: Jan Nikitenko <jan.nikitenko(a)gmail.com> --- sound/pci/hda/patch_cirrus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 350ee8a..7d5c074 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -966,7 +966,7 @@ static struct hda_verb cs_coef_init_verbs[] = { | 0x0400 /* Disable Coefficient Auto increment */ )}, /* Beep */ - {0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG}, + {0x11, AC_VERB_SET_COEF_INDEX, IDX_BEEP_CFG}, {0x11, AC_VERB_SET_PROC_COEF, 0x0007}, /* Enable Beep thru DAC1/2/3 */ {} /* terminator */ -- 1.7.1.1

1 0

[alsa-devel] [ANN] Linux.conf.au 2011 multimedia miniconf: call for papers
by Jonathan Woithe 09 Sep '10

09 Sep '10

Continuing the tradition from past conferences, the LCA Multimedia Miniconf is back at Linux.conf.au 2011 (LCA2011). Linux.conf.au 2011 will be hosted in Brisbane, Australia from 24-29 January 2011 with the miniconfs being held over the first two days. For more information about the conference check out http://lca2011.linux.org.au/. Multimedia encapsulates a wide variety of topics: composition and playpack of video, audio and music. Submissions are now invited from those interested in giving presentations or short tutorials at the Multimedia miniconf on any topic related to opensource multimedia software, such as the following: * exciting new additions to existing software * development of new multimedia programs * how to set Linux up for multimedia composition, authoring and/or playback * great user experiences with open source multimedia software * legal issues surrounding multimedia content and its use with open source software * descriptions of multimedia workflows: tools used, process followed, and so forth * upcoming features in low-level infrastructure (JACK, ALSA, PulseAudio, etc) * any other open source multimedia topic we haven't thought of It is expected that most of the miniconf presentation slots will be around 20 minutes with question time to follow. We may be able to accommodate longer 50 minute presentations depending on the number of proposals offered. In addition, time will be allocated for 5 minute "lightning talks". Projection facilities will be available. Please note that in line with linux.conf.au guidelines miniconfs cannot receive funding, nor can they provide travel or accommodation assistance. In general presenters and attendees at miniconfs must be registered for LCA2011 although miniconf-only registration can be arranged - contact the multimedia minconf organisers for more information. To submit a proposal please send the following to lca-mm(a)lists.annodex.net or one of the organisers by Thursday 6 October 2010 00:00 UT: * your name and preferred email address * the title of your talk * a brief abstract describing what you want to talk about (up to about 500 words) * your preferred presentation length For more information about the miniconf please refer to the website http://www.annodex.org/events/lca2011_mmm/ or contact one of the organisers (Jonathan Woithe, Silvia Pfeiffer, Roderick Dornan - addresses are on the website). Regards Jonathan Woithe LCA2011 Multimedia miniconf organiser

1 0

[alsa-devel] [patch] ALSA: rawmidi: cleanup the get next midi device ioctl
by Dan Carpenter 09 Sep '10

09 Sep '10

I'm doing an audit to find integer overflows and my static checker complained that in the original code "device + 1" could overflow. The overflow is harmless, but it's still worth cleaning up. The other thing that I noticed is that if you pass in a device which is higher than SNDRV_RAWMIDI_DEVICES then it doesn't return an error code but just tells you that the next device is "device + 1". I have rewritten it to just return -EINVAL if you pass in a bogus value that's either too high or too low. Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index eb68326..f944180 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -829,8 +829,12 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card, if (get_user(device, (int __user *)argp)) return -EFAULT; + if (device < 0) + return -EINVAL; + if (device > SNDRV_RAWMIDI_DEVICES) + return -EINVAL; mutex_lock(&register_mutex); - device = device < 0 ? 0 : device + 1; + device++; while (device < SNDRV_RAWMIDI_DEVICES) { if (snd_rawmidi_search(card, device)) break;

5 11

[alsa-devel] cmipci surround sound front-left plays on lfe
by Tom Corner 09 Sep '10

09 Sep '10

I've been going around and around on this. The surround sound 5.1 is playing fine except channel 0 (front-left) is playing on the woofer. I have a Terratec Aureon fun - CMI8738-MC6. I can redirect the output on 0 to right-front successfully using .asoundrc and "ttable.0.1 1". I have gotten desperate and have tested this card in Windows and was able to get it working right there. I have been using the file www_lynnemusic_com_surround_test.wma through mplayer and speaker-test to to test the setup. I am using pulseaudio, but I reconfigured my system without pulseaudio and get the same result. Any help would be much appreciated. Tom Corner

1 0

[alsa-devel] USB Audio device syncpipe error
by 6275 kson 09 Sep '10

09 Sep '10

Hello, I am working on a usb audio device and I'm having trouble getting it to show up as an output device in Ubuntu's sound preferences. The device is working well with other OS's. My syslog shows this error. 'cannot submit syncpipe for urb 0, error -90: internal error' If someone could help me diagnose the source of the problem I would appreciate it very much. Here are some more details. The device operates at high speed but uses USB Audio Class 1.0. The output endpoint is Isochronous asynchronous and I am using a feedback endpoint with a 32ms polling interval. The device works with Ubuntu when running at full speed. (Input and Output show up in the sound preferences). At High Speed only the Input shows up in the sound preferences. _From my usb analyzer log I never see a request for the feedback endpoint when running at HS, while I do see the request at FS. Cheers,

3 3

[alsa-devel] [PATCH] ALSA: HDA: Add fixup pins for Ideapad Y550
by David Henningsson 09 Sep '10

09 Sep '10

By adding the subwoofer as a speaker pin, it is treated correctly when auto-muting. I'm a little unsure of whether it should go to stable as well, because it needs yesterday's commit bb35febd to make sense (in fact, I developed parts of that patch in parallel). Any opinions? -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[PATCH] ALSA: HDA: Add fixup pins for Ideapad Y550
by David Henningsson 09 Sep '10

09 Sep '10

By adding the subwoofer as a speaker pin, it is treated correctly when auto-muting. BugLink: https://launchpad.net/bugs/611803 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f11a9ca..0c25d22 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -18963,6 +18963,26 @@ static void alc662_auto_init(struct hda_codec *codec) alc_inithook(codec); } +enum { + ALC662_FIXUP_IDEAPAD, +}; + +static const struct alc_fixup alc662_fixups[] = { + [ALC662_FIXUP_IDEAPAD] = { + .pins = (const struct alc_pincfg[]) { + { 0x17, 0x99130112 }, /* subwoofer */ + { } + } + }, +}; + +static struct snd_pci_quirk alc662_fixup_tbl[] = { + SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), + {} +}; + + + static int patch_alc662(struct hda_codec *codec) { struct alc_spec *spec; @@ -18995,6 +19015,7 @@ static int patch_alc662(struct hda_codec *codec) } if (board_config == ALC662_AUTO) { + alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 1); /* automatic parse from the BIOS config */ err = alc662_parse_auto_config(codec); if (err < 0) { @@ -19053,8 +19074,11 @@ static int patch_alc662(struct hda_codec *codec) spec->vmaster_nid = 0x02; codec->patch_ops = alc_patch_ops; - if (board_config == ALC662_AUTO) + if (board_config == ALC662_AUTO) { spec->init_hook = alc662_auto_init; + alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 0); + } + #ifdef CONFIG_SND_HDA_POWER_SAVE if (!spec->loopback.amplist) spec->loopback.amplist = alc662_loopbacks; -- 1.7.1 --------------090907070406080900090002--

1 0