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

[alsa-devel] [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
by Elimar Riesebieter 30 May '13

30 May '13

Hi all, [0] tells: alsactl: remove 90-alsa-restore.rules from the tar ball but it still ships 90-alsa-restore.rules.in and installs the file as 90-alsa-restore.rules [0] http://www.alsa-project.org/main/index.php/Changes_v1.0.27_v1.0.27.1 Thanks Signed-off-by: Elimar Riesebieter <riesebie(a)lxtec.de> --- alsactl/90-alsa-restore.rules.in | 8 -------- alsactl/Makefile.am | 5 ----- 2 files changed, 13 deletions(-) diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in deleted file mode 100644 index 88e12e0..0000000 --- a/alsactl/90-alsa-restore.rules.in +++ /dev/null @@ -1,8 +0,0 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" -GOTO="alsa_restore_end" - -LABEL="alsa_restore_go" -TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{number}" -TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{number}" - -LABEL="alsa_restore_end" diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index bac84eb..3bf8eca 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -11,8 +11,6 @@ alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c -udevrules_DATA = \ - 90-alsa-restore.rules if HAVE_SYSTEMD @@ -49,20 +47,17 @@ alsa-restore.service: alsa-restore.service.in alsa-store.service: alsa-store.service.in $(edit) -90-alsa-restore.rules: 90-alsa-restore.rules.in $(edit) EXTRA_DIST += \ alsa-state.service.in \ alsa-restore.service.in \ alsa-store.service.in \ - 90-alsa-restore.rules.in CLEANFILES = \ alsa-state.service \ alsa-restore.service \ alsa-store.service \ - 90-alsa-restore.rules %.7: %.xml xmlto man $?

2 5

[alsa-devel] [PATCH 1/5] ASoC: wm8994: Add digital loopback paths
by Mark Brown 30 May '13

30 May '13

There is loopback control within the audio interfaces, provide control of this as there are some obscure scenarios where this could be used in production. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 561c2f9..2081fa1 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1499,6 +1499,24 @@ static const char *aif1dac_text[] = { "AIF1DACDAT", "AIF3DACDAT", }; +static const char *loopback_text[] = { + "None", "ADCDAT", +}; + +static const struct soc_enum aif1_loopback_enum = + SOC_ENUM_SINGLE(WM8994_AIF1_CONTROL_2, WM8994_AIF1_LOOPBACK_SHIFT, 2, + loopback_text); + +static const struct snd_kcontrol_new aif1_loopback = + SOC_DAPM_ENUM("AIF1 Loopback", aif1_loopback_enum); + +static const struct soc_enum aif2_loopback_enum = + SOC_ENUM_SINGLE(WM8994_AIF2_CONTROL_2, WM8994_AIF2_LOOPBACK_SHIFT, 2, + loopback_text); + +static const struct snd_kcontrol_new aif2_loopback = + SOC_DAPM_ENUM("AIF2 Loopback", aif2_loopback_enum); + static const struct soc_enum aif1dac_enum = SOC_ENUM_SINGLE(WM8994_POWER_MANAGEMENT_6, 0, 2, aif1dac_text); @@ -1745,6 +1763,9 @@ SND_SOC_DAPM_ADC("DMIC1R", NULL, WM8994_POWER_MANAGEMENT_4, 2, 0), SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 1, 0), SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0), +SND_SOC_DAPM_MUX("AIF1 Loopback", SND_SOC_NOPM, 0, 0, &aif1_loopback), +SND_SOC_DAPM_MUX("AIF2 Loopback", SND_SOC_NOPM, 0, 0, &aif2_loopback), + SND_SOC_DAPM_POST("Debug log", post_ev), }; @@ -1876,9 +1897,9 @@ static const struct snd_soc_dapm_route intercon[] = { { "AIF1DAC2L", NULL, "AIF1DAC Mux" }, { "AIF1DAC2R", NULL, "AIF1DAC Mux" }, - { "AIF1DAC Mux", "AIF1DACDAT", "AIF1DACDAT" }, + { "AIF1DAC Mux", "AIF1DACDAT", "AIF1 Loopback" }, { "AIF1DAC Mux", "AIF3DACDAT", "AIF3DACDAT" }, - { "AIF2DAC Mux", "AIF2DACDAT", "AIF2DACDAT" }, + { "AIF2DAC Mux", "AIF2DACDAT", "AIF2 Loopback" }, { "AIF2DAC Mux", "AIF3DACDAT", "AIF3DACDAT" }, { "AIF2ADC Mux", "AIF2ADCDAT", "AIF2ADCL" }, { "AIF2ADC Mux", "AIF2ADCDAT", "AIF2ADCR" }, @@ -1929,6 +1950,12 @@ static const struct snd_soc_dapm_route intercon[] = { { "AIF3ADCDAT", "AIF2DACDAT", "AIF2DACL" }, { "AIF3ADCDAT", "AIF2DACDAT", "AIF2DACR" }, + /* Loopback */ + { "AIF1 Loopback", "ADCDAT", "AIF1ADCDAT" }, + { "AIF1 Loopback", "None", "AIF1DACDAT" }, + { "AIF2 Loopback", "ADCDAT", "AIF2ADCDAT" }, + { "AIF2 Loopback", "None", "AIF2DACDAT" }, + /* Sidetone */ { "Left Sidetone", "ADC/DMIC1", "ADCL Mux" }, { "Left Sidetone", "DMIC2", "DMIC2L" }, -- 1.7.10.4

2 5

[alsa-devel] [PATCH] hda_analyzer: don't fail to display audio selector if caps variables aren't available
by Anisse Astier 30 May '13

30 May '13

In particular, when an audio selector node has Amp-In caps: N/A, it allows to still interact with the selector, and not have TypeError traceback throwns because of NoneType variables. Signed-off-by: Anisse Astier <anisse(a)astier.eu> --- Hi Jared, I'm not sure if this is the proper way to fix this, so please consider this a formal report for the error thrown while parsing this node: Node 0x22 [Audio Selector] wcaps 0x30010b: Stereo Amp-In Amp-In caps: N/A Amp-In vals: [0x00 0x00] [0x00 0x00] [0x00 0x00] [0x00 0x00] [0x00 0x00] [0x00 0x00] [0x00 0x00] Connection: 7 0x18* 0x19 0x1a 0x1b 0x1d 0x0b 0x12 Regards, Anisse -- hda-analyzer/hda_guilib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hda-analyzer/hda_guilib.py b/hda-analyzer/hda_guilib.py index 93c85e1..62eddab 100644 --- a/hda-analyzer/hda_guilib.py +++ b/hda-analyzer/hda_guilib.py @@ -285,9 +285,9 @@ class NodeGui(gtk.ScrolledWindow): frame.set_border_width(4) vbox = gtk.VBox(False, 0) if caps: - str = 'Offset: %d\n' % caps.ofs - str += 'Number of steps: %d\n' % caps.nsteps - str += 'Step size: %d\n' % caps.stepsize + str = 'Offset: %s\n' % (caps.ofs if caps.ofs else "N/A") + str += 'Number of steps: %s\n' % (caps.nsteps if caps.nsteps else "N/A") + str += 'Step size: %s\n' % (caps.stepsize if caps.stepsize else "N/A") str += 'Mute: %s\n' % (caps.mute and "True" or "False") vbox.pack_start(self.__new_text_view(text=str), True, True, 0) idx = 0 -- 1.8.3.rc1

2 2

[alsa-devel] [PATCH 01/10] ASoC: blackfin: Remove unused bf5xx-{i2s, tdm, ac97}-pcm.h
by Lars-Peter Clausen 30 May '13

30 May '13

The structs defined in these files are completely unused, so remove both the structs and the files. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/blackfin/bf5xx-ac97-pcm.c | 1 - sound/soc/blackfin/bf5xx-ac97-pcm.h | 26 -------------------------- sound/soc/blackfin/bf5xx-ad1836.c | 1 - sound/soc/blackfin/bf5xx-ad193x.c | 1 - sound/soc/blackfin/bf5xx-ad1980.c | 1 - sound/soc/blackfin/bf5xx-ad73311.c | 1 - sound/soc/blackfin/bf5xx-i2s-pcm.c | 1 - sound/soc/blackfin/bf5xx-i2s-pcm.h | 26 -------------------------- sound/soc/blackfin/bf5xx-ssm2602.c | 1 - sound/soc/blackfin/bf5xx-tdm-pcm.c | 1 - sound/soc/blackfin/bf5xx-tdm-pcm.h | 18 ------------------ 11 files changed, 78 deletions(-) delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c index 7e2f360..53f8408 100644 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.c +++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c @@ -39,7 +39,6 @@ #include <asm/dma.h> -#include "bf5xx-ac97-pcm.h" #include "bf5xx-ac97.h" #include "bf5xx-sport.h" diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.h b/sound/soc/blackfin/bf5xx-ac97-pcm.h deleted file mode 100644 index d324d58..0000000 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * linux/sound/arm/bf5xx-ac97-pcm.h -- ALSA PCM interface for the Blackfin - * - * Copyright 2007 Analog Device Inc. - * - * 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 _BF5XX_AC97_PCM_H -#define _BF5XX_AC97_PCM_H - -struct bf5xx_pcm_dma_params { - char *name; /* stream identifier */ -}; - -struct bf5xx_gpio { - u32 sys; - u32 rx; - u32 tx; - u32 clk; - u32 frm; -}; - -#endif diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c index d23f4b0..1528176 100644 --- a/sound/soc/blackfin/bf5xx-ad1836.c +++ b/sound/soc/blackfin/bf5xx-ad1836.c @@ -30,7 +30,6 @@ #include "../codecs/ad1836.h" -#include "bf5xx-tdm-pcm.h" #include "bf5xx-tdm.h" static struct snd_soc_card bf5xx_ad1836; diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c index 0e55e9f..ce773b3 100644 --- a/sound/soc/blackfin/bf5xx-ad193x.c +++ b/sound/soc/blackfin/bf5xx-ad193x.c @@ -39,7 +39,6 @@ #include "../codecs/ad193x.h" -#include "bf5xx-tdm-pcm.h" #include "bf5xx-tdm.h" static struct snd_soc_card bf5xx_ad193x; diff --git a/sound/soc/blackfin/bf5xx-ad1980.c b/sound/soc/blackfin/bf5xx-ad1980.c index b30f88b..3450e8f 100644 --- a/sound/soc/blackfin/bf5xx-ad1980.c +++ b/sound/soc/blackfin/bf5xx-ad1980.c @@ -48,7 +48,6 @@ #include "../codecs/ad1980.h" -#include "bf5xx-ac97-pcm.h" #include "bf5xx-ac97.h" static struct snd_soc_card bf5xx_board; diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c index 61cc91d..786bbdd 100644 --- a/sound/soc/blackfin/bf5xx-ad73311.c +++ b/sound/soc/blackfin/bf5xx-ad73311.c @@ -45,7 +45,6 @@ #include "../codecs/ad73311.h" #include "bf5xx-sport.h" -#include "bf5xx-i2s-pcm.h" #if CONFIG_SND_BF5XX_SPORT_NUM == 0 #define bfin_write_SPORT_TCR1 bfin_write_SPORT0_TCR1 diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c index 262c1de..8726c3a 100644 --- a/sound/soc/blackfin/bf5xx-i2s-pcm.c +++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c @@ -39,7 +39,6 @@ #include <asm/dma.h> -#include "bf5xx-i2s-pcm.h" #include "bf5xx-sport.h" static void bf5xx_dma_irq(void *data) diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.h b/sound/soc/blackfin/bf5xx-i2s-pcm.h deleted file mode 100644 index 0c2c5a6..0000000 --- a/sound/soc/blackfin/bf5xx-i2s-pcm.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * linux/sound/arm/bf5xx-i2s-pcm.h -- ALSA PCM interface for the Blackfin - * - * Copyright 2007 Analog Device Inc. - * - * 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 _BF5XX_I2S_PCM_H -#define _BF5XX_I2S_PCM_H - -struct bf5xx_pcm_dma_params { - char *name; /* stream identifier */ -}; - -struct bf5xx_gpio { - u32 sys; - u32 rx; - u32 tx; - u32 clk; - u32 frm; -}; - -#endif diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c index 7dbeef1..9c19ccc 100644 --- a/sound/soc/blackfin/bf5xx-ssm2602.c +++ b/sound/soc/blackfin/bf5xx-ssm2602.c @@ -40,7 +40,6 @@ #include <linux/gpio.h> #include "../codecs/ssm2602.h" #include "bf5xx-sport.h" -#include "bf5xx-i2s-pcm.h" static struct snd_soc_card bf5xx_ssm2602; diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.c b/sound/soc/blackfin/bf5xx-tdm-pcm.c index 19e855d..a6b5457 100644 --- a/sound/soc/blackfin/bf5xx-tdm-pcm.c +++ b/sound/soc/blackfin/bf5xx-tdm-pcm.c @@ -39,7 +39,6 @@ #include <asm/dma.h> -#include "bf5xx-tdm-pcm.h" #include "bf5xx-tdm.h" #include "bf5xx-sport.h" diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.h b/sound/soc/blackfin/bf5xx-tdm-pcm.h deleted file mode 100644 index 7f8cc01..0000000 --- a/sound/soc/blackfin/bf5xx-tdm-pcm.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * sound/soc/blackfin/bf5xx-tdm-pcm.h -- ALSA PCM interface for the Blackfin - * - * Copyright 2009 Analog Device Inc. - * - * 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 _BF5XX_TDM_PCM_H -#define _BF5XX_TDM_PCM_H - -struct bf5xx_pcm_dma_params { - char *name; /* stream identifier */ -}; - -#endif -- 1.8.0

2 14

[alsa-devel] [PATCH 0/4 V6] Power-well API implementation for Haswell
by Wang Xingchao 30 May '13

30 May '13

Hi all, This is V6 and here're some changes notes: change from V5-->V6: - Remove duplication code in new introduced probe work - move duplication code in azx_probe_continue - remove unused #ifdef - replace request_module with symbol_request - replace spin_lock_irq with spin_lock_irqsave in gfx side - other typo fixes (review by Takashi) change from V4-->V5: - fix reference count bug - new patch on general runtime pm support for audio pci device - new patch to avoid request_module() deadlock change between V3-->V4: - add new structure i915_power_well - initialize drm_device pointer at module init time - change function name change between V2-->V3: - make SND_HDA_I915 selectable - use snd_printdd to output message - add return error code check - use symbol_request to replace symbol_get - release power_well at azx_free - some typo fixes changes between V1-->V2: - use reference count to track power-well usage - remove external module, compiled into snd-hda-intel instead - manage symbols and module loading properly - remove IS_HSW macro, use flag instead - remove audio callback for gfx driver to avoid dependency - split whole patch into two pieces for easy review - more typo fixes Takashi Iwai (1): ALSA: hda - Move azx_first_init() into azx_probe_continue() Wang Xingchao (3): ALSA: hda - Fix runtime PM check ALSA: hda - Add power-welll support for haswell HDA i915/drm: Add private api for power well usage drivers/gpu/drm/i915/i915_dma.c | 6 +++ drivers/gpu/drm/i915/i915_drv.h | 12 +++++ drivers/gpu/drm/i915/intel_drv.h | 4 ++ drivers/gpu/drm/i915/intel_pm.c | 92 +++++++++++++++++++++++++++++++++++--- include/drm/i915_powerwell.h | 36 +++++++++++++++ sound/pci/hda/Kconfig | 10 +++++ sound/pci/hda/Makefile | 2 + sound/pci/hda/hda_i915.c | 75 +++++++++++++++++++++++++++++++ sound/pci/hda/hda_i915.h | 35 +++++++++++++++ sound/pci/hda/hda_intel.c | 87 ++++++++++++++++++++++++++++------- 10 files changed, 335 insertions(+), 24 deletions(-) create mode 100644 include/drm/i915_powerwell.h create mode 100644 sound/pci/hda/hda_i915.c create mode 100644 sound/pci/hda/hda_i915.h -- 1.7.9.5

3 6

[alsa-devel] [PATCH] ASoC: OMAP: Remove obsolete Makefile line
by Paul Bolle 30 May '13

30 May '13

Support for omap2evm was removed in v3.0. But only one of its two lines in this Makefile was removed. Remove the second line too. Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl> --- Eyeball tested only. sound/soc/omap/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 2b22594..a725905 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -26,7 +26,6 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o -obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o -- 1.7.11.7

3 2

[alsa-devel] [PATCH] ASoC: wm0010: Set IRQ as a wake source
by Charles Keepax 30 May '13

30 May '13

The DSPs IRQ should be a wake source as several of the possible algorithms may run whilst the AP is asleepi and require to wake the AP to push or pull more data, such as compressed playback. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm0010.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 370af0c..b6df319 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -972,6 +972,13 @@ static int wm0010_spi_probe(struct spi_device *spi) } wm0010->irq = irq; + ret = irq_set_irq_wake(irq, 1); + if (ret) { + dev_err(wm0010->dev, "Failed to set IRQ %d as wake source: %d\n", + irq, ret); + return ret; + } + if (spi->max_speed_hz) wm0010->board_max_spi_speed = spi->max_speed_hz; else -- 1.7.2.5

2 1

[alsa-devel] [PATCH v6 00/10] ASoC: fsl-ssi: ac97-slave support
by Markus Pargmann 30 May '13

30 May '13

Hi, This series adds DT support for phycore-ac97. Beside ac97 support, the series adds imx-pcm-fiq and generic DMA bindings to fsl-ssi. Regards, Markus Changes in v6: - Rebased onto 3.10-rc3 with Shawn's pcm cleanup patches - Setup of reset functions moved to phycore-ac97.c Changes in v5: - Pass of_node via parent device to imx-pcm-dma. Changes in v4: - phycore-ac97 uses the iomux functions based on audmux phandle now. - fsl-ssi imx-pcm-fiq got some new comments about problems with imx-ssi and incompatible codecs Changes in v3: - Rebased onto pcm dma cleanup patches - A lot of cleanups for the fsl-ssi ac97 integration - Some small changes which are listed in the notes of the patches. Markus Pargmann (10): ASoC: phycore-ac97: Add DT support ASoC: imx-pcm-dma: DT support ASoC: imx-pcm-fiq: Introduce pcm-fiq-params ASoC: fsl-ssi: Add support for imx-pcm-fiq ASoC: fsl-ssi: Use generic DMA bindings if possible ARM: imx: Export ac97 reset functions ASoC: fsl-ssi: imx ac97 support ASoC: fsl: Kconfig: Use fsl-ssi for phycore-ac97 ASoC: fsl: Move fsl-ssi binding doc to sound/ ASoC: fsl: Update fsl-ssi binding doc .../{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 10 + .../bindings/sound/phytec,phycore-ac97.txt | 14 + arch/arm/mach-imx/mach-pca100.c | 7 +- arch/arm/mach-imx/mach-pcm043.c | 7 +- sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl_ssi.c | 441 +++++++++++++++++---- sound/soc/fsl/fsl_ssi.h | 7 + sound/soc/fsl/imx-pcm-dma.c | 1 - sound/soc/fsl/imx-pcm-fiq.c | 18 +- sound/soc/fsl/imx-pcm.h | 12 +- sound/soc/fsl/imx-ssi.c | 7 +- sound/soc/fsl/imx-ssi.h | 1 + sound/soc/fsl/phycore-ac97.c | 241 +++++++++-- 13 files changed, 643 insertions(+), 125 deletions(-) rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (88%) create mode 100644 Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt

4 20

[alsa-devel] [PATCH 0/2] ASoC: cs42l52: HP gain enum and PCM Mixer dB scale fixes.
by Nicolas Schichan 29 May '13

29 May '13

Hi, The two patches in the serie contains the following fixes: - Use the correct shift value in hp_gain_enum, effectively allowing the higher gain values to be effective and the correct gain value to be reported to userland wrt what is written to the register. - Fix the PCM Mixer dB scale so that userland can report the correct dB gain values. Note that in its current form, the PCM Mixer control will only allow the range [-0.5 dB (0x7f), +12 dB (0x18)] to be programmed to the hardware. I don't know if it is intentional or not. Regards, Nicolas Schichan (2): ASoC: cs42l52: use correct PCM mixer TLV dB scale to match datasheet. ASoC: cs42l52: fix hp_gain_enum shift value. sound/soc/codecs/cs42l52.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 1.7.10.4

3 6

[alsa-devel] [PATCH] ASoC: wm8994: Avoid leaking pm_runtime reference on removed jack race
by Mark Brown 29 May '13

29 May '13

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 1ddb067..4aaa8a0 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3886,7 +3886,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) ret); } else if (!(ret & WM1811_JACKDET_LVL)) { dev_dbg(codec->dev, "Ignoring removed jack\n"); - return IRQ_HANDLED; + goto out; } } else if (!(reg & WM8958_MICD_STS)) { snd_soc_jack_report(wm8994->micdet[0].jack, 0, -- 1.7.10.4

1 0

[alsa-devel] UCM {Supported,Conflicting}Device confusion
by Juho Hämäläinen 29 May '13

29 May '13

Hello, Firstly as a sidenote, Supported/Conflicting is checked only one-way, if say devices A and B are enabled and say B has ConflictingDevice "C", and device C doesn't list anything, enabling of C is possible (and after that disabling C is not possible before B is disabled first). Now, looking at the way SupportedDevice and ConflictingDevice are implemented in ucm and I came to following conclusion: If no SupportedDevice or ConflictingDevice: All devices and combinations are compatible, so implicit "SupportedDevice ALL". If SupportedDevice is listed: Device can be enabled as long as at least one enabled device is in SupportedDevice list. If ConflictingDevice is listed: Device can be enabled if none of active devices are in ConflictingDevice list (noting aforementioned limit in checking this) This is at least how I figured all combinations of multiple devices can be defined with only zero or one either SupportedDevice or ConflictingDevice entry per device. Did I understand this right? -- juho

2 1

[alsa-devel] [PATCH 1/3] lx6464es: remove useles pci_set_drvdata(pdev, NULL)
by Andy Shevchenko 29 May '13

29 May '13

The driver core handles this. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- sound/pci/lx6464es/lx6464es.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index 298bc9b..3230e57 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -1139,7 +1139,6 @@ out_free: static void snd_lx6464es_remove(struct pci_dev *pci) { snd_card_free(pci_get_drvdata(pci)); - pci_set_drvdata(pci, NULL); } -- 1.8.2.rc0.22.gb3600c3

2 10

[alsa-devel] ASoC updates for v3.10
by Mark Brown 29 May '13

29 May '13

The following changes since commit e6135fe960bba1d1a3a6b6818839e6d8d3f21293: ALSA: usb-audio: proc: use found syncmaxsize to determine feedback format (2013-05-17 08:05:34 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.10-rc3 for you to fetch changes up to 1ab9ecc24819a8cf8ee982aaf6fb83298f094b0d: Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus (2013-05-28 15:41:37 +0100) The diffstat and so on being rather obscured by the fact that I've got a newer -rc merged in here than you do in your branch, sorry. ---------------------------------------------------------------- ASoC: Updates for v3.10 A series of driver specific updates, none particularly critical, plus one fix to the compressed API code to handle capture streams properly which is very safe for mainline as there's no current users. ---------------------------------------------------------------- Alan Stern (6): USB: xHCI: override bogus bulk wMaxPacketSize values USB: fix Kconfig logic for USB_UHCI_HCD USB: UHCI: fix for suspend of virtual HP controller USB: fix latency in uhci-hcd and ohci-hcd USB: OHCI: fix logic for scheduling isochronous URBs USB: remove remaining instances of USB_SUSPEND Alasdair G Kergon (1): dm thin: fix metadata dev resize detection Albert Pool (1): rtlwifi: rtl8192cu: Add new USB ID Alex Deucher (10): drm/radeon/dce2: use 10khz units for audio dto calculation drm/radeon: add chip family for Hainan drm/radeon: fill in GPU init for Hainan (v2) drm/radeon: don't touch DCE or VGA regs on Hainan (v3) drm/radeon: fill in ucode loading support for Hainan drm/radeon: radeon-asic updates for Hainan drm/radeon: track which asics have UVD drm/radeon: sun/hainan chips do not have UVD (v2) drm/radeon: add golden register settings for Hainan (v2) drm/radeon: add Hainan pci ids Alex Elder (33): rbd: fix leak of format 2 snapshot context rbd: revalidate only for mapping size changes rbd: update capacity in rbd_dev_refresh() rbd: kill rbd_update_mapping_size() rbd: don't print warning if not mapping a parent rbd: don't look up snapshot id in rbd_dev_mapping_set() rbd: kill rbd_dev_clear_mapping() rbd: always set read-only flag in rbd_add() rbd: set the mapping size and features later rbd: zero format 1 header structure earlier rbd: refactor rbd_header_from_disk() rbd: update in-core header directly rbd: simplify rbd_dev_v1_probe() rbd: get rid of trivial v1 header wrappers rbd: define rbd_dev_v2_header_info() rbd: fix an incorrect assertion condition rbd: support reading parent page data rbd: set mapping read-only flag in rbd_add() rbd: only set up watch for mapped images rbd: kill rbd_img_request_get() libceph: init sent and completed when starting rbd: fix parent request size assumption rbd: support reading parent page data for writes rbd: ignore zero-overlap parent rbd: get parent info on refresh rbd: don't release write request until necessary rbd: define rbd_dev_unparent() rbd: define parent image request routines rbd: reference count parent requests rbd: detect when clone image is flattened rbd: re-submit read request for flattened clone rbd: re-submit write request for flattened clone rbd: re-submit flattened write request (part 2) Alex Hung (1): ACPI video: ignore BIOS initial backlight value for HP 1000 Alexander Bondar (1): iwlwifi: mvm: Prevent setting assoc flag in MAC_CONTEXT_CMD Alexander Gordeev (1): powerpc: Fix irq_set_affinity() return values Alexander Shiyan (2): s390: remove non existent reference to GENERIC_KERNEL_THREAD cpufreq: Fix incorrect dependecies for ARM SA11xx drivers Alexander Sverdlin (1): i2c: suppress lockdep warning on delete_device Alexandre Bounine (4): rapidio: make enumeration/discovery configurable rapidio: add enumeration/discovery start from user space rapidio: documentation update for enumeration changes rapidio/tsi721: fix bug in MSI interrupt handling Alexandre Courbot (1): ARM: tegra: defconfig fixes Alexandre Oliva (1): btrfs: do away with non-whole_page extent I/O Alexandru Gheorghiu (1): drivers: char: ipmi: Replaced kmalloc and strcpy with kstrdup Alistair Popple (1): powerpc: Add an in memory udbg console Amerigo Wang (2): virtio_net: use default napi weight by default ipv6,gre: do not leak info to user-space Amitkumar Karwar (1): mwifiex: fix memory leak issue when driver unload Andreas Larsson (2): spi: Initialize cs_gpio and cs_gpios with -ENOENT spi: Return error from of_spi_register_master on bad "cs-gpios" property Andreas Philipp (1): Correct allowed raid levels on balance. Andrew Bresticker (1): ASoC: max98090: request IRQF_ONESHOT interrupt Andrew Lunn (2): ARM: Orion: Remove redundant init_dma_coherent_pool_size() mv643xx_eth: fix NAPI weight being > 64 Andrew Morton (1): revert "selftest: add simple test for soft-dirty bit" Andy Adamson (1): NFSv4.1 Fix a pNFS session draining deadlock Andy Grover (3): target: Remove unused struct members in se_dev_entry target: Use FD_MAX_SECTORS/FD_BLOCKSIZE for blockdevs using fileio target: Have dev/enable show if TCM device is configured Andy Shevchenko (1): dma: acpi-dma: parse CSRT to extract additional resources Aneesh Kumar K.V (3): powerpc/mm: Use the correct mask value when looking at pgtable address powerpc: Fix build errors STRICT_MM_TYPECHECKS mm/THP: use pmd_populate() to update the pmd with pgtable_t pointer Anton Blanchard (1): powerpc/kexec: Fix kexec when using VMX optimised memcpy Antonio Quartulli (2): batman-adv: make DAT drop ARP requests targeting local clients batman-adv: reorder clean up routine in order to avoid race conditions Ard Biesheuvel (1): ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling Arend van Spriel (1): brcmfmac: announce P2P_DEVICE support in wiphy structure Arnd Bergmann (4): staging/drm: imx: add missing dependencies staging/solo6x10: depend on CONFIG_FONTS mfd: ab8500: Debugfs code depends on gpadc USB: EHCI: remove bogus #error Aron Xu (1): MIPS: N64: Wire getdents64(2) Axel Lin (7): wm831x_backup: Fix wrong kfree call for devdata->backup.name pm2301_charger: Fix module alias prefix hwmon: (iio_hwmon) Fix missing iio_channel_release_all call if devm_kzalloc fail hwmon: (iio_hwmon) Fix null pointer dereference gpio: mcp23s08: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m gpio: Don't override the error code in probe error handling iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m Bastian Triller (1): ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist Ben Hutchings (7): sfc: Delete EFX_PAGE_IP_ALIGN, equivalent to NET_IP_ALIGN sfc: Reduce RX scatter buffer size, and reduce alignment if appropriate perf: net_dropmonitor: Fix trace parameter order perf: net_dropmonitor: Fix symbol-relative addresses perf: net_dropmonitor: Do not assume ordering of dictionaries perf: net_dropmonitor: Use bisection in symbol lookup perf: net_dropmonitor: Remove progress indicator Ben Skeggs (9): drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode drm/nvc0/ce: disable ce1 on a number of chipsets drm/nvc0/ltcg: fix handling of disabled partitions drm/nve0/ltcg: poke the partition count into yet another register drm/nve0/fifo: prevent races between clients updating playlists drm/nvc0/fifo: prevent races between clients updating playlists drm/nvc0/fifo: prevent CHAN_TABLE_ERROR:CHANNEL_PENDING on fifo fini drm/nv50/fifo: prevent races between clients updating playlists drm/nouveau: ensure channels are stopped before saving fences for suspend Ben Widawsky (1): Revert "drm/i915: Calculate correct stolen size for GEN7+" Benjamin Herrenschmidt (10): powerpc/powernv: Properly drop characters if console is closed powerpc/powernv: Improve kexec reliability powerpc/powernv: Detect OPAL v3 API version powerpc/powernv: Fix starting of secondary CPUs on OPALv2 and v3 powerpc: Set show_unhandled_signals to 1 by default powerpc: Fix TLB cleanup at boot on POWER8 powerpc/pci: Fix bogus message at boot about empty memory resources powerpc/powernv: Fix condition for when to invalidate the TCE cache powerpc: Make radeon 32-bit MSI quirk work on powernv powerpc/powernv: Build a zImage.epapr Benjamin LaHaise (2): ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex aio: fix kioctx not being freed after cancellation at exit time Bing Zhao (1): mwifiex: clear is_suspended flag when interrupt is received early Bjorn Helgaas (1): Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0" Bob Peterson (2): GFS2: two minor quota fixups GFS2: Use single-block reservations for directories Boris BREZILLON (1): ARM: at91/dt: fix macb pinctrl_macb_rmii_mii_alt definition Borislav Petkov (3): cpufreq, ondemand: Remove leftover debug line PM / hibernate: Correct documentation amd64_edac: Fix bogus sysfs file permissions Brian Behlendorf (1): drivers/block/brd.c: fix brd_lookup_page() race Brian King (1): powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware support Catalin Marinas (3): arm64: Invoke the of_platform_populate() at arch_initcall() level arm64: Do not source kernel/time/Kconfig explicitly ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path Charles Keepax (2): ASoC: soc-compress: Send correct stream event for capture start ASoC: wm5110: Correct DSP4R Mixer control name Chen Gang (3): arm64: Fix duplicate definition of early_console drivers/char/ipmi: memcpy, need additional 2 bytes to avoid memory overflow net: irda: using kzalloc() instead of kmalloc() to avoid strncpy() issue. Chris Cummins (1): drm: Use names of ioctls in debug traces Chris Mason (2): Btrfs: use a btrfs bioset instead of abusing bio internals Merge branch 'for-chris' of git://git.kernel.org/.../josef/btrfs-next Chris Wilson (1): drm/i915: Always normalize return timeout for wait_timeout_ioctl Christian Borntraeger (4): s390: disable pfmf for clear page instruction s390: fix gmap_ipte_notifier vs. software dirty pages s390/xpram: mark xpram as non-rotational s390/pgtable: fix ipte notify bit Christian Gmeiner (1): drivers/leds/leds-ot200.c: fix error caused by shifted mask Christian Ruppert (1): ARC: [TB10x] Remove redundant abilis,simple-pinctrl mechanism Christopher Harvey (4): drm/mgag200: Don't change unrelated registers during modeset drm/mgag200: Fix writes into MGA1064_PIX_CLK_CTL register drm/mgag200: Convert counter delays to jiffies drm/mgag200: Fix framebuffer base address programming Chuck Lever (1): NFS: Fix SETCLIENTID fallback if GSS is not available Cliff Wickman (1): mm/pagewalk.c: walk_page_range should avoid VM_PFNMAP areas Cong Wang (1): xfrm6: release dev before returning error Corey Minyard (1): ipmi: Improve error messages on failed irq enable Damien Lespiau (2): drm: Add missing break in the command line mode parsing code drm: Don't prune modes loudly when a connector is disconnected Dan Carpenter (6): xen/privcmd: fix condition in privcmd_close() ntb: off by one sanity checks NTB: fix pointer math issues ipg: fix an unsigned widening cast of '~' truncation issue USB: cxacru: potential underflow in cxacru_cm_get_array() isdn/kcapi: fix a small underflow Dan Magenheimer (1): staging: ramster: add how-to document Dan Williams (1): USB: option: add device IDs for Dell 5804 (Novatel E371) WWAN card Daniel Drake (1): mwifiex: fix setting of multicast filter Daniel Mack (1): ASoC: davinci: fix sample rotation Daniel Tang (1): ARM: 7712/1: Remove trailing whitespace in arch/arm/Makefile Daniel Vetter (3): drm/mm: fix dump table BUG drm: don't check modeset locks in panic handler Revert "drm/i915: revert eDP bpp clamping code changes" Darrick J. Wong (1): ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port Dave Airlie (11): Merge branch 'for-linux-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-next drm: remove unused wrapper macros drm/qxl: fix ioport interactions for kernel submitted commands. qxl: drop unused variable. drm/qxl: drop active_user_framebuffer as its unneeded qxl: fix bug with object eviction and update area drm/radeon: restore nomodeset operation (v2) drm/nouveau: fix build with nv50->nvc0 Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-next Merge branch 'drm-fixes-3.10-sun' of git://people.freedesktop.org/~agd5f/linux into drm-next Dave Chinner (7): xfs: fix sub-page blocksize data integrity writes xfs: fix rounding in xfs_free_file_space xfs: Don't reference the EFI after it is freed xfs: fix missing KM_NOFS tags to keep lockdep happy xfs: xfs_da3_node_read_verify() doesn't handle XFS_ATTR3_LEAF_MAGIC xfs: xfs_attr_shortform_allfit() does not handle attr3 format. xfs: remote attribute lookups require the value length Dave Jones (1): Add missing module license tag to vring helpers. David Cohen (1): gpio-langwell: fix irq conflicts when DT is not used David Daney (3): Revert "MIPS: microMIPS: Support dynamic ASID sizing." Revert "MIPS: Allow ASID size to be determined at boot time." MIPS: Make virt_to_phys() work for all unmapped addresses. David Rientjes (2): mfd: tps65912: Select MFD_CORE usb, chipidea: fix link error when USB_EHCI_HCD is a module David S. Miller (9): Merge branch 'wireless' Merge branch 'qlcnic' Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'master' of git://git.kernel.org/.../pablo/nf Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless Merge branch 'perf_net_dropmonitor' Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge net: Revert unused variable changes. David Sterba (1): btrfs: annotate quota tree for lockdep David Woodhouse (1): powerpc: Provide __bswapdi2 Denis CIOCCA (1): iio:common:st: added disable function after read info raw data Denis Efremov (4): ipv4: ip_output: remove inline marking of EXPORT_SYMBOL functions staging: nvec: remove inline marking of EXPORT_SYMBOL functions iwlegacy: remove inline marking of EXPORT_SYMBOL functions MIPS: MSP71xx: remove inline marking of EXPORT_SYMBOL functions Dirk Behme (1): ARM i.MX6: correct MLB clock configuration Dirk Brandewie (6): cpufreq / intel_pstate: remove idle time and duration from sample and calculations cpufreq / intel_pstate: use lowest requested max performance cpufreq / intel_pstate: fix ffmpeg regression cpufreq / intel_pstate: Remove idle mode PID cpufreq / intel_pstate: remove #ifdef MODULE compile fence cpufreq / intel_pstate: Add additional supported CPU ID Emilio López (4): ARM: ux500: select REGULATOR net: ethernet: apple: drop unused variable net: ethernet: korina: drop unused variable net: ethernet: sun: drop unused variable Emmanuel Grumbach (2): iwlwifi: mvm: tell firmware to let multicast frames in iwlwifi: mvm: fix aggregation drain flow Eric Dumazet (8): ipv6: do not clear pinet6 field tcp: fix tcp_md5_hash_skb_data() net/802/mrp: fix lockdep splat tcp: gso: do not generate out of order packets bonding: allow TSO being set on bonding master ipv6: fix possible crashes in ip6_cork_release() ip_gre: fix a possible crash in ipgre_err() tcp: xps: fix reordering issues EunBong Song (1): MIPS: Fix build error for crash_dump.c in 3.10-rc1 Ezequiel Garcia (3): ARM: mvebu: Add a ranges entry to translate devbus childs ARM: mvebu: Fix ranges entry on XP GP board serial: 8250_dw: Add valid clk pointer check Fabio Baltieri (5): mfd: abx500-core: Fix sparse warning mfd: ab8500-sysctrl: Fix sparse warning mfd: ab8500-sysctrl: Set sysctrl_dev during probe mfd: ab8500-sysctrl: Always enable pm_power_off handler mfd: ab8500-sysctrl: Let sysctrl driver work without pdata Fabio Estevam (3): fec: Fix inconsistent lock state fec: Invert the order of function calls in fec_restart() staging: imx-drm: imx-tve: Check the return value of 'regulator_enable()' Felix Fietkau (5): ath9k: fix key allocation error handling for powersave keys mac80211: fix spurious RCU warning and update documentation ath9k: fix aggregation stop/flush handling ath9k: fix rate handling/reporting ath9k: fix draining aggregation tid buffers Florian Fainelli (1): broadcom: add include guards to include/linux/brcmphy.h Gabriel de Perthuis (1): btrfs: don't stop searching after encountering the wrong item Geert Uytterhoeven (14): iscsi-target: Make buf param of iscsit_do_crypto_hash_buf() const void * net/ethernet: NET_CALXEDA_XGMAC should depend on HAS_DMA net/ethernet: STMMAC_ETH should depend on HAS_DMA net/wireless: ATH9K should depend on HAS_DMA net/ethernet: ARM_AT91_ETHER should depend on HAS_DMA net/ethernet: MACB should depend on HAS_DMA caif: CAIF_VIRTIO should depend on HAS_DMA mfd: si476x: Do not use binary constants mfd: cros_ec_spi: Use %z to format pointer differences mfd: si476x: Use get_unaligned_be16() for unaligned be16 loads staging: zcache: Fix incorrect module_param_array types net/wireless: ATH9K should depend on HAS_DMA uio: UIO_DMEM_GENIRQ should depend on HAS_DMA fbdev: FB_GOLDFISH should depend on HAS_DMA Gernot Vormayr (1): drivers/block/xsysace.c: fix id with missing port-number Gomella, Andrew (NIH/NHLBI) [F] (1): USB: ftdi_sio: Add support for Newport CONEX motor drivers Grant Likely (1): Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD Greg Kroah-Hartman (3): Merge tag 'fixes-for-v3.10-rc2' of git://git.kernel.org/.../balbi/usb into usb-linus driver core: export subsys_virtual_register Merge tag 'iio-fixes-for-3.10a' of git://git.kernel.org/.../jic23/iio into staging-linus Gregory CLEMENT (3): ARM: mvebu: select ARCH_REQUIRE_GPIOLIB for mvebu platform ARM: plat-orion: Fix num_resources and id for ge10 and ge11 ARM: dts: mvebu: Fix wrong the address reg value for the L2-cache node Guenter Roeck (2): hwmon: (nct6775) Do not create non-existing attributes MAINTAINERS: Add myself as maintainer for LM95234 and TMP401 drivers H Hartley Sweeten (1): staging: comedi: ni_labpc: fix build when VIRT_TO_BUS is not defined Haiyang Zhang (1): MAINTAINERS: update Hyper-V file list Hans Schillstrom (1): netfilter: log: netns NULL ptr bug when calling from conntrack Hans-Christian Egtvedt (2): avr32: move NODES_SHIFT into Kconfig and delete numnodes.h avr32: fix relocation check for signed 18-bit offset Hans-Christoph Schemmel (1): qmi_wwan: Added support for Cinterion's PLxx WWAN Interface Heikki Krogerus (1): serial: 8250_dw: add ACPI ID for Intel BayTrail Heiko Abraham (1): Input: egalax_ts - ABS_MT_POSITION_Y not reported well Heiko Carstens (2): s390/disassembler: prevent endless loop in print_fn_code() s390/ftrace: fix mcount adjustment Helge Deller (8): parisc: implement irq stacks - part 2 (v2) parisc: make default cross compiler search more robust (v3) MPILIB: disable usage of floating point registers on parisc parisc: add rp5470 entry to machine database parisc: use PAGE_SHIFT instead of hardcoded value 12 in pacache.S parisc: add additional parisc git tree to MAINTAINERS file parisc: show number of FPE and unaligned access handler calls in /proc/interrupts parisc: fix irq stack on UP and SMP Hema Prathaban (1): staging: vt6656: use free_netdev instead of kfree Himanshu Madhani (2): qlcnic: Fix missing bracket in module parameter. qlcnic: Fix ethtool supported port status for 83xx Ian Abbott (4): staging: comedi: allow buffer resize if previous resize failed staging: comedi: work without HAS_DMA staging: comedi: ni_mio_common: only do counter commands for ni_pcimio staging: comedi: complain if dma buffer allocation not supported Ilan Peer (2): nl80211: Add wdev identifier to some nl80211 notifications iwlwifi: mvm: Always use SCAN_TYPE_FORCED Imre Deak (2): drm/i915: hsw: fix link training for eDP on port-A wait: fix false timeouts when using wait_event_timeout() Ingo Molnar (1): Merge branch 'rcu/doc' of git://git.kernel.org/.../paulmck/linux-rcu into core/urgent Jaccon Bastiaansen (1): ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn't clear upper 32 bits of the old/new value Jan Kara (1): jbd,jbd2: fix oops in jbd2_journal_put_journal_head() Jan-Simon Möller (1): ACPI: Fix section to __init. Align with usage in acpixf.h Jani Nikula (1): drm/i915: clear the stolen fb before resuming Jarod Wilson (1): drivers/char/random.c: fix priming of last_data Jason Wang (1): virtio_net: enable napi for all possible queues during open Jean Delvare (3): staging: Swap zram and zsmalloc in Kconfig i2c: i801: Document feature bits in modinfo hwmon: (tmp401) Drop redundant safety on cache lifetime Jean-Christophe PLAGNIOL-VILLARD (3): ARM: at91/trivial: fix model name for SAM9X25-EK ARM: at91: rm9200 fix time support ARM: at91: at91sam9n12: move external irq declatation to DT Jeff Layton (1): cifs: only set ops for inodes in I_NEW state Jeff Mahoney (1): hfs: avoid crash in hfs_bnode_create Jeff Moyer (1): aio: fix io_getevents documentation Jiang Liu (1): avr32: fix building warnings caused by redefinitions of HZ Jingoo Han (1): usb: gadget: s3c-hsotg: pass 'struct usb_request *' to usb_gadget_unmap_request() Jiri Kosina (1): random: fix accounting race condition with lockless irq entropy_count update Jiri Olsa (2): perf: Fix EXIT event notification perf: Factor out auxiliary events notification Jiri Pirko (1): macvlan: fix passthru mode race between dev removal and rx path Jiri Slaby (1): TTY: rocket, fix more no-PCI warnings Joachim Eastwood (1): spi/atmel: fix speed_hz check in atmel_spi_transfer() Joern Engel (2): target: removed unused transport_state flag target: close target_put_sess_cmd() vs. core_tmr_abort_task() race Johan Hovold (7): USB: serial: add wait_until_sent operation USB: serial: add generic wait_until_sent implementation USB: ftdi_sio: clean up get_modem_status USB: ftdi_sio: fix chars_in_buffer overhead USB: io_ti: fix chars_in_buffer overhead USB: ti_usb_3410_5052: fix chars_in_buffer overhead USB: serial: clean up chars_in_buffer Johannes Berg (9): cfg80211: fix wiphy_register error path cfg80211: fix WoWLAN wakeup tracing mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME mac80211: fix HT beacon-based channel switch handling mac80211: use just spin_lock() in ieee80211_get_tkip_p2k() mac80211: fix AP-mode frame matching cfg80211: fix interface down/disconnect state handling mac80211: report deauth to cfg80211 for local state change cfg80211: fix sending WoWLAN TCP wakeup settings Johannes Weiner (1): mm: memcg: remove incorrect VM_BUG_ON for swap cache pages in uncharge John David Anglin (2): parisc: fix SMP races when updating PTE and TLB entries in entry.S parisc: make interrupt and interruption stack allocation reentrant John Stultz (1): time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitons John W. Linville (3): Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Jon Hunter (1): gpio/omap: ensure gpio context is initialised Jon Mason (8): NTB: variable dereferenced before check NTB: Handle 64bit BAR sizes NTB: Link toggle memory leak NTB: reset tx_index on link toggle NTB: Correctly handle receive buffers of the minimal size NTB: memcpy lockup workaround ntb_netdev: remove from list on exit NTB: Multiple NTB client fix Jonathan Corbet (1): dummy-irq: require the user to specify an IRQ number Joonsoo Kim (1): workqueue: correct handling of the pool spin_lock Josef Ahmad (1): i2c: designware: fix RX FIFO overrun Josef Bacik (4): Btrfs: don't null pointer deref on abort Btrfs: remove warn on in free space cache writeout Btrfs: handle running extent ops with skinny metadata Btrfs: make sure roots are assigned before freeing their nodes Joseph Qi (2): ocfs2: unlock rw lock if inode lock failed ocfs2: goto out_unlock if ocfs2_get_clusters_nocache() failed in ocfs2_fiemap() Josh Wu (1): ARM: at91/sama5: fix incorrect PMC pcr div definition K. Y. Srinivasan (1): Drivers: hv: Fix a bug in get_vp_index() Kees Cook (2): drm: refactor call to request_module drm/radeon: check incoming cliprects pointer Kent Yoder (1): drivers/crypto/nx: Fixes for multiple races and issues Kevin Hilman (1): idle: Fix hlt/nohlt command-line handling in new generic idle Konrad Rzeszutek Wilk (11): x86/microcode: Add local mutex to fix physical CPU hot-add deadlock Merge tag 'v3.10-rc1' into stable/for-linus-3.10 xen/tmem: Cleanup. Remove the parts that say temporary. xen/tmem: Move all of the boot and module parameters to the top of the file. xen/tmem: Split out the different module/boot options. xen/tmem: Fix compile warning. xen/tmem: s/disable_// and change the logic. xen/tmem: Remove the boot options and fold them in the tmem.X parameters. xen/tmem: Remove the usage of 'noselfshrink' and use 'tmem.selfshrink' bool instead. xen/tmem: Remove the usage of '[no|]selfballoon' and use 'tmem.selfballooning' bool instead. xen/tmem: Don't use self[ballooning|shrinking] if frontswap is off. Kyle McMartin (1): score: remove redundant kcore_list entries Lachlan McIlroy (1): ext4: limit group search loop for non-extent files Lan Tianyu (2): ACPI / EC: Restart transaction even when the IBF flag set ACPI / AC: Add sleep quirk for Thinkpad e530 Larry Finger (1): rtlwifi: rtl8188ee: Fix warning when building on big-endian systems Lars-Peter Clausen (2): tty: nwpserial: Pass correct pointer to free_irq() drivers/rtc/rtc-pl031.c: pass correct pointer to free_irq() Laurent Pinchart (2): pinctrl: generic: Fix typos and clarify comments pinctrl/lantiq: Free mapping configs for both pin and groups Lee Jones (12): ARM: 7714/1: mmc: mmci: Ensure return value of regulator_enable() is checked ARM: ux500: Remove duplicated assignment of ab8500_platdata ARM: ux500: Fix incorrect DEBUG UART virtual addresses ARM: ux500: Provide device enumeration number suffix for SMSC911x pinctrl: abx500: Specify failed sub-driver by ID instead of driver_data pinctrl: abx500: Rejiggle platform data and DT initialisation staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning mfd: ab8500-gpadc: Suppress 'ignoring regulator_enable() return value' warning mfd: ab8500-core: Use the correct driver name when enabling gpio/pinctrl mfd: db8500-prcmu: Supply the pdata_size attribute for db8500-thermal mfd: ab8500-core: Pass GPADC compatible string to MFD core serial: pl011: protect attribute read from NULL platform data struct Leonid Yegoshin (1): mm compaction: fix of improper cache flush in migration code Lespiau, Damien (2): drm: Make the HPD status updates debug logs more readable drm: Only print a debug message when the polled connector has changed Li Zhong (6): powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning again powerpc: Syscall hooks for context tracking subsystem powerpc: Exception hooks for context tracking subsystem powerpc: Exit user context on notify resume powerpc: Use the new schedule_user API on userspace preemption powerpc: select HAVE_CONTEXT_TRACKING for pSeries Libo Chen (4): usb: ehci-s5p: fix memleak when fallback to pdata usb: isp1760-if: fix memleak when platform_get_resource fail usb: ohci: fix goto wrong tag in err case MIPS: Xway: Fix clk leak Linus Lüssing (1): batman-adv: Fix rcu_barrier() miss due to double call_rcu() in TT code Linus Torvalds (72): Merge tag 'fixes-for-linus' of git://git.kernel.org/.../rusty/linux Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux Merge tag 'spi-v3.10-rc1' of git://git.kernel.org/.../broonie/spi Merge git://git.kernel.org/.../davem/net Merge branch 'parisc-for-3.10' of git://git.kernel.org/.../deller/parisc-linux Merge tag 'fixes-for-3.10-rc2-tag' of git://git.kernel.org/.../sstabellini/xen Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc Merge branch 'for-3.10-fixes' of git://git.kernel.org/.../tj/wq Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/.../tytso/ext4 Merge branch 'for-linus' of git://git.kernel.org/.../sage/ceph-client Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm Merge branch 'core-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/.../rostedt/linux-trace Merge branch 'queue' of git://git.kernel.org/.../nab/target-pending Merge branch 'rcu/urgent' of git://git.kernel.org/.../paulmck/linux-rcu Merge branch 'for-3.10-fixes' of git://git.kernel.org/.../tj/wq Merge branch 'ipmi' (minor ipmi fixes from Corey) Merge tag 'ntb-bugfixes-3.10' of git://github.com/jonmason/ntb Merge tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/.../rafael/linux-pm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux Merge tag 'sound-3.10' of git://git.kernel.org/.../tiwai/sound Merge tag 'arm64-fixes' of git://git.kernel.org/.../cmarinas/linux-aarch64 Merge tag 'kmemleak-fixes' of git://git.kernel.org/.../cmarinas/linux-aarch64 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux Merge branch 'devm_no_resource_check' of git://git.kernel.org/.../wsa/linux Merge branch 'for-linus' of git://git.kernel.org/.../mason/linux-btrfs Merge tag 'dm-3.10-fixes' of git://git.kernel.org/.../agk/linux-dm Merge branch 'rc-fixes' of git://git.kernel.org/.../mmarek/kbuild Merge tag 'pinctrl-fixes-v3.10-2' of git://git.kernel.org/.../linusw/linux-pinctrl x86: Fix bit corruption at CPU resume time Merge tag 'hwmon-for-linus' of git://git.kernel.org/.../groeck/linux-staging Merge tag 'stable/for-linus-3.10-rc1-tag' of git://git.kernel.org/.../konrad/xen Linux 3.10-rc2 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux Merge branch 'for-linus' of git://git.kernel.org/.../s390/linux Merge branch 'i2c/for-current' of git://git.kernel.org/.../wsa/linux Merge branch 'leds-fixes-3.10' of git://git.kernel.org/.../cooloney/linux-leds Merge tag 'fixes-for-linus' of git://git.kernel.org/.../rusty/linux Merge tag 'mfd-fixes-3.10-1' of git://git.kernel.org/.../sameo/mfd-fixes Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Merge branch 'for-linus' of git://git.kernel.org/.../egtvedt/linux-avr32 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm Merge tag 'usb-3.10-rc2' of git://git.kernel.org/.../gregkh/usb Merge tag 'char-misc-3.10-rc2' of git://git.kernel.org/.../gregkh/char-misc Merge tag 'driver-core-3.10-rc2' of git://git.kernel.org/.../gregkh/driver-core Merge tag 'staging-3.10-rc2' of git://git.kernel.org/.../gregkh/staging Merge tag 'tty-3.10-rc2' of git://git.kernel.org/.../gregkh/tty Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/.../helgaas/pci Merge tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/.../linusw/linux-gpio Merge git://git.kernel.org/.../davem/net Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc Merge git://git.kernel.org/.../steve/gfs2-3.0-fixes Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Merge tag 'trace-fixes-v3.10-rc2' of git://git.kernel.org/.../rostedt/linux-trace Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc Merge branch 'akpm' (incoming from Andrew Morton) Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm Merge tag 'arc-v3.10-fixes' of git://git.kernel.org/.../vgupta/arc Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Merge tag 'pm+acpi-3.10-rc3' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6 Merge tag 'for-linus-v3.10-rc3' of git://oss.sgi.com/xfs/xfs Merge branch 'parisc-for-3.10' of git://git.kernel.org/.../deller/parisc-linux Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/.../bp/bp Merge tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs Linux 3.10-rc3 Linus Walleij (2): mfd: ab8500: Pass AB8500 IRQ to debugfs code by resource ARM: nomadik: fix IRQ assignment for SMC ethernet Lisa Nguyen (3): xen/xenbus: Fixed indentation error in switch case xen/xenbus: Fixed over 80 character limit issue xen: Fixed assignment error in if statement Liu Bo (2): Btrfs: fix off-by-one in fiemap Btrfs: return errno if possible when we fail to allocate memory Lucas Stach (2): clk: tegra: remove USB from clk init table clk: tegra: add ac97 controller clock Ludovic Desroches (1): ARM: at91: dts: request only spi cs-gpios used on sama5d3x cpu module Luiz Capitulino (1): package: Makefile: unbreak binrpm-pkg target Malcolm Priestley (1): staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower. Manfred Spraul (1): ipc/sem.c: Fix missing wakeups in do_smart_update_queue() Manish Chopra (2): qlcnic: Fix setting MAC address qlcnic: Fix bug in diagnostics test reset recovery path Manjunathappa, Prakash (1): spi/davinci: fix module build error Marc Dietrich (3): staging: nvec: add missing module aliases staging: nvec: implement unregistering of notifiers staging: nvec: cleanup childs on remove Marc Dionne (1): workqueue: Make schedule_work() available again to non GPL modules Marek Lindner (2): batman-adv: check proto length before accessing proto string buffer batman-adv: check return value of pskb_trim_rcsum() Marek Vasut (1): staging: video: imx: Select VIDEOMODE_HELPERS for parallel display Mark Brown (11): Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant Merge remote-tracking branch 'spi/fix/atmel' into spi-linus Merge remote-tracking branch 'spi/fix/grant' into spi-linus ASoC: wm5110: Add missing speaker initialisation ASoC: wm8994: Fix reporting of accessory removal on WM8958 Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus Merge remote-tracking branch 'asoc/fix/compress' into asoc-linus Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linus Merge remote-tracking branch 'asoc/fix/davinci' into asoc-linus Merge remote-tracking branch 'asoc/fix/max98090' into asoc-linus Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus Martin Hundebøll (1): batman-adv: Avoid double freeing of bat_counters Martin Michlmayr (1): Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x Martin Schwidefsky (1): s390/smp: fix cpu re-scan vs. cpu state Masami Hiramatsu (5): tracing/kprobes: Use rcu_dereference_raw for tp->files tracing/kprobes: Fix a sparse warning for incorrect type in assignment tracing/kprobes: Make print_*probe_event static tracing: Return -EBUSY when event_enable_func() fails to get module kprobes/mips: Fix to check double free of insn slot Matthijs Kooijman (2): MIPS: ralink: use the dwc2 driver for the rt305x USB controller staging: dwc2: Fix dma-enabled platform devices using a default dma_mask Matwey V. Kornilov (2): tty: mxser: fix usage of opmode_ioaddr tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree) Maxime Ripard (3): ARM: sunxi: Fix Mini X-plus device tree build ARM: sunxi: select ARCH_REQUIRE_GPIOLIB gpio: mxs: Use set and clear capabilities of the gpio controller Miao Xie (10): Btrfs: don't abort the current transaction if there is no enough space for inode cache Btrfs: don't use global block reservation for inode cache truncation Btrfs: optimize the error handle of use_block_rsv() Btrfs: don't steal the reserved space from the global reserve if their space type is different Btrfs: update the global reserve if it is empty Btrfs: fix accessing a freed tree root Btrfs: fix unprotected root node of the subvolume's inode rb-tree Btrfs: pause the space balance when remounting to R/O Btrfs: remove BUG_ON() in btrfs_read_fs_tree_no_radix() Btrfs: don't invoke btrfs_invalidate_inodes() in the spin lock context Michael Chan (1): tg3: Fix data corruption on 5725 with TSO Michael Ellerman (2): powerpc: Make CONFIG_RTAS_PROC depend on CONFIG_PROC_FS powerpc: Context switch more PMU related SPRs Michael Grzeschik (1): usb: otg: mxs-phy: add missing type to usb_phy Michael Neuling (3): powerpc/perf: Move BHRB code into CONFIG_PPC64 region powerpc/pmu: Fix order of interpreting BHRB target entries powerpc/perf: Fix setting of "to" addresses for BHRB Michael S. Tsirkin (1): virtio_console: fix uapi header Michał Mirosław (1): staging/iio/mxs-lradc: fix preenable for multiple buffers Mika Westerberg (2): i2c: designware: always clear interrupts before enabling them i2c: designware: add Intel BayTrail ACPI ID Nandita Dukkipati (1): tcp: bug fix in proportional rate reduction. Naveen Krishna Chatradhi (1): iio: exynos_adc: fix wrong structure extration in suspend and resume Nicholas Bellinger (5): iscsi-target: Fix NULL pointer dereference in iscsit_send_reject target/rd: Add ramdisk bit for NULLIO operation iscsi-target: Fix typos in RDMAEXTENSIONS macro usage MAINTAINERS: Update target git tree URL target/iblock: Fix WCE=1 + DPOFUA=1 backend WRITE regression Nicolas Ferre (2): ARM: at91/trivial: typo in GEM compatible string net/macb: fix ISR clear-on-write behavior only for some SoC Nicolas Pitre (1): ARM: 7715/1: MCPM: adapt to GIC changes after upstream merge Nicolas Schichan (4): ASoC: cs42l52: microphone bias is controlled by IFACE_CTL2 register. ASoC: cs42l52: fix bogus shifts in "Speaker Volume" and "PCM Mixer Volume" controls. ASoC: cs42l52: fix master playback mute mask. ASoC: cs42l52: fix default value for MASTERA_VOL. Niels Ole Salscheider (2): drm/radeon: Remove superfluous variable drm/radeon: Fix VRAM size calculation for VRAM >= 4GB Nishanth Menon (1): cpufreq: cpufreq-cpu0: defer probe when regulator is not ready Nithin Sujir (3): tg3: Skip powering down function 0 on certain serdes devices tg3: Ensure boot code has completed initialization before accessing hardware tg3: Update version to 3.132 OGAWA Hirofumi (1): fat: fix possible overflow for fat_clusters Oleg Nesterov (1): usermodehelper: check subprocess_info->path != NULL Oliver Neukum (1): USB: reset resume quirk needed by a hub Olof Johansson (10): Merge tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux into fixes Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes Merge tag 'omap-for-v3.10-rc1/fixes' of git://git.kernel.org/.../tmlind/linux-omap into fixes Merge tag 'fixes-3.10-2' of git://git.infradead.org/users/jcooper/linux into fixes Merge tag 'imx-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes Merge tag 'ux500-arm-soc-v3.10-fixes' of git://git.kernel.org/.../linusw/linux-stericsson into fixes Merge tag 'omap-fixes-a-for-3.10-rc' of git://git.kernel.org/.../pjw/omap-pending into fixes Merge tag 'renesas-boards-marzen-fixes-for-v3.10' of git://git.kernel.org/.../horms/renesas into fixes Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes Merge tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux into fixes Or Gerlitz (1): net/mlx4_core: Add missing report on VST and spoof-checking dev caps Pablo Neira Ayuso (3): netfilter: nf_{log,queue}: fix compilation without CONFIG_PROC_FS netfilter: update MAINTAINERS file netfilter: xt_TCPOPTSTRIP: fix possible mangling beyond packet boundary Paolo Bonzini (1): KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry Paul Bolle (1): usb: phy: remove CONFIG_USB_OTG_UTILS once more Paul E. McKenney (2): kthread: Document ways of reducing OS jitter due to per-CPU kthreads rcu: Fix comparison sense in rcu_needs_cpu() Paul Moore (1): netlabel: improve domain mapping validation Paul Walmsley (1): ARM: OMAP2+: Add missing CONFIG_ARCH_MULTI_V6=y to omap2plus_defconfig Paul Zimmerman (1): staging: dwc2: remove compile warning for USB_DWC2_TRACK_MISSED_SOFS Peter Huewe (1): parisc/superio: Use module_pci_driver to register driver Peter Hurley (1): tty/vt: Fix vc_deallocate() lock order Peter Oberparleiter (1): s390/cio: add channel ID sysfs attribute Petko Manolov (1): drivers: net: usb: rtl8150: concurrent URB bugfix Petri Gynther (1): emac: Fix EMAC soft reset on 460EX/GT Philipp Zabel (1): ARM i.MX6q: Fix periph_clk2_sel and periph2_clk2_sel clocks Ping Cheng (3): Input: wacom - add three new display tablets Input: wacom - add a few new styli for Cintiq series Input: wacom - add an eraser to DTH2242/DTK2241 Rafael J. Wysocki (10): ACPI / PM: Move processor suspend/resume to syscore_ops ACPI / LPSS: register clock device for Lynxpoint DMA properly Merge branch 'pm-cpufreq' Merge branch 'acpi-fixes' Merge branch 'pm-fixes' Merge branch 'pm-cpufreq' Merge branch 'acpi-fixes' ACPI / PM: Allow device power states to be used for CONFIG_PM unset Merge branch 'acpi-fixes' Merge branch 'pm-cpufreq' Rafał Bilski (1): cpufreq / e_powersaver: Fix linker error when ACPI processor is a module Rafał Miłecki (1): bcma: add more core IDs Rahul Sharma (1): of/documentation: move video device bindings to a common place Rajendra Nayak (2): ARM: OMAP2+: hwmod: Fix sidle programming in _enable_sysc()/_idle_sysc() ARM: OMAP2+: hwmod: Add a new flag to handle SIDLE in SWSUP only in active Rajesh Borundia (2): qlcnic: Fix mailbox response handling. qlcnic: Fix validation of link event command. Ralf Baechle (13): MIPS: Rewrite pfn_valid to work in modules, too. Add include dependencies to <linux/printk.h>. MIPS: clock.h: Remove declaration of cpu_wait. MIPS: Consolidate idle loop / WAIT instruction support in a single file. MIPS: Idle: cleaup SMTC idle hook as per Linux coding style. MIPS: Idle: Consistently reformat inline assembler. MIPS: Idle: Make call of function pointer readable. MIPS: Idle: Re-enable irqs at the end of r3081, au1k and loongson2 cpu_wait. MIPS: Idle: Don't call local_irq_disable() in cpu_wait() implementations. MIPS: Idle: Consolidate all declarations in <asm/idle.h>. MIPS: Idle: Do address fiddlery in helper functions. MIPS: Idle: Break r4k_wait into two functions and fix it. mm: Fix virt_to_page() warning Randy Dunlap (7): lp8788-charger: Fix kconfig dependency staging: sep: fix driver build and kconfig lib: make iovec obj instead of lib GFS2: fix DLM depends to fix build errors linux/kernel.h: fix kernel-doc warning auditfilter.c: fix kernel-doc warnings mm/memory_hotplug.c: fix printk format warnings Richard Genoud (1): spi/spi-atmel: BUG: fix doesn' support 16 bits transfers using PIO Rob Herring (1): Merge tag 'tegra-for-3.10-dtc-cpp-chroot-std-headers' of git://git.kernel.org/.../swarren/linux-tegra into for-next Robert Jarzmik (1): usb: phy: Fix NULL pointer exception during usb_get_phy Robert Jennings (1): powerpc: Bring all threads online prior to migration/hibernation Robert P. J. Day (2): Correct typo "supperspeed" to "superspeed". Add a couple kernel-doc lines to prevent warnings. Rony Efraim (1): net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode Russell King (3): ARM: finally enable IRQ time accounting config NET: mv643xx_eth: avoid lockdep dump on interface down i2c: mv64xxx: work around signals causing I2C transactions to be aborted Rusty Russell (2): lguest: clear cached last cpu when guest_set_pgd() called. Hoist memcpy_fromiovec/memcpy_toiovec into lib/ Ryusuke Konishi (1): nilfs2: fix issue of nilfs_set_page_dirty() for page at EOF boundary Sachin Kamat (12): usb: gadget: atmel_usba_udc: Remove redundant platform_set_drvdata() usb: gadget: bcm63xx_udc: Remove redundant platform_set_drvdata() usb: gadget: dummy_hcd: Remove redundant platform_set_drvdata() usb: gadget: f_uac2: Remove redundant platform_set_drvdata() usb: gadget: imx_udc: Remove redundant platform_set_drvdata() usb: gadget: pxa25x_udc: Remove redundant platform_set_drvdata() usb: gadget: s3c2410_udc: Remove redundant platform_set_drvdata() usb: phy: ab8500-usb: Remove redundant platform_set_drvdata() usb: phy: gpio-vbus-usb: Remove redundant platform_set_drvdata() usb: phy: mv-usb: Remove redundant platform_set_drvdata() usb: phy: mxs-usb: Remove redundant platform_set_drvdata() usb: phy: nop: Remove redundant platform_set_drvdata() Samuel Ortiz (1): mei: bus: Reset event_cb when disabling a device Sanjay Lal (2): KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API. KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock() Santosh Shilimkar (4): ARM: OMAP2+: hwmod-data: UART IP needs software control to manage sidle modes ARM: OMAP2+: serial: Remove the un-used slave idle hooks SERIAL: OMAP: Remove the slave idle handling from the driver ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apis Sarveshwar Bandi (1): be2net: Avoid double insertion of vlan tags. Sasha Levin (2): rcu: Don't allocate bootmem from rcu_init() mac80211_hwsim: correctly register the platform driver Schemmel Hans-Christoph (1): USB: Blacklisted Cinterion's PLxx WWAN Interface Scott Wood (2): powerpc: hard_irq_disable(): Call trace_hardirqs_off after disabling powerpc/booke64: Fix kernel hangs at kernel_dbg_exc Sebastian Hesselbarth (2): ARM: 7711/1: dove: fix Dove cpu type from V7 to PJ4 ARM: plat-orion: add missing ehci include to common.h Sergei Shtylyov (2): <linux/of_platform.h>: fix compilation warnings with DT disabled 3c59x: fix PCI resource management Shahed Shaikh (2): qlcnic: Fix ethtool strings qlcnic: Fix updating netdev->features Shawn Guo (4): net: fec: enable hardware checksum only on imx6q-fec ARM: imx: replicate the diagnostic register of boot cpu into secondary cores ARM: imx: fix typo in gpu3d_shader_sels net: fec: use a more proper compatible string for MVF type device Shlomo Pongratz (1): iscsi-target: Fix processing of OOO commands Shuah Khan (1): PM: Avoid calling kfree() under spinlock in dev_pm_put_subsys_data() Simon Horman (1): ARM: shmobile: marzen: Use error values in usb_power_* Sony Chacko (3): qlcnic: Fix reset recovery after transmit timeout qlcnic: Return proper error codes from probe failure paths qlcnic: remove netdev->trans_start updates within the driver Sridhar Samudrala (1): vxlan: Update vxlan fdb 'used' field after each usage Srinivas Kandagatla (1): ARM: vt8500: Add missing NULL terminator in dt_compat Srivatsa S. Bhat (2): rcu/idle: Wrap cpu-idle poll mode within rcu_idle_enter/exit cpufreq: Preserve sysfs files across suspend/resume Stanislaw Gruszka (2): ath5k: do not reschedule tx_complete_work on stop iwl4965: workaround connection regression on passive channel Stefan Behrens (3): Btrfs: don't allow device replace on RAID5/RAID6 Btrfs: fix possible memory leak in replace_path() Btrfs: explicitly use global_block_rsv for quota_tree Stefano Stabellini (3): xen/arm: initialize pm functions later xen/arm: do not handle VCPUOP_register_vcpu_info failures xen/arm: rename xen_secondary_init and run it on every online cpu Stephen Boyd (1): ARM: smp: Drop RCU_NONIDLE usage in cpu_die() Stephen Warren (2): USB: set device dma_mask without reference to global data drivers/video: implement a simple framebuffer driver Steven Capper (1): ARM: 7727/1: remove the .vm_mm value from gate_vma Steven Rostedt (2): kmemleak: Scan all allocated, writeable and not executable module sections kmemleak: No need for scanning specific module sections Steven Rostedt (Red Hat) (1): tracing: Fix leaks of filter preds Steven Whitehouse (1): GFS2: Fix typo in gfs2_log_end_write loop Sujith Manoharan (4): ath9k: Fix beacon reconfiguration ath9k: Update initvals for AR9565 ath9k: Fix crash on module unload ath9k_hw: Enable manual peak calibration for AR9485 Sukanto Ghosh (1): arm64: mm: Fix operands of clz in __flush_dcache_all Tang Yuantian (1): of/base: release the node correctly in of_parse_phandle_with_args() Tejun Heo (2): workqueue: workqueue_congested() shouldn't translate WORK_CPU_UNBOUND into node number workqueue: don't perform NUMA-aware allocations on offline nodes in wq_numa_init() Teppo Kotilainen (1): usb: option: Add Telewell TW-LTE 4G Thadeu Lima de Souza Cascardo (1): qlge: fix dma map leak when the last chunk is not allocated Theodore Ts'o (1): ext4: revert "ext4: use io_end for multiple bios" Thomas Gleixner (5): Merge branch 'linus' into core/urgent tick: Use zalloc_cpumask_var for allocating offstack cpumasks x86: Fix idle consolidation fallout tick: Cleanup NOHZ per cpu data on cpu down tick: Don't invoke tick_nohz_stop_sched_tick() if the cpu is offline Thomas Petazzoni (2): ARM: mvebu: do not duplicate the mpic alias arm: mvebu: fix the 'ranges' property to handle PCIe Thommy Jakobsson (1): B43: Handle DMA RX descriptor underrun Timo Teräs (2): leds: leds-gpio: reserve gpio before using it xfrm: properly handle invalid states as an error Tirupathi Reddy (1): timer: Don't reinitialize the cpu base lock during CPU_UP_PREPARE Tomas Winkler (1): mei: fix out of array access to me clients array Tomasz Figa (1): drivers/rtc/rtc-max8998.c: check for pdata presence before dereferencing Tony Lindgren (1): ARM: dts: Fix musb interrupt for device tree booting Tony Prisk (1): pinctrl: vt8500: Fix incorrect data in WM8750 pinctrl table Tony Wu (2): MIPS: Fix sibling call handling in get_frame_info MIPS: Extract schedule_mfi info from __schedule Trond Myklebust (4): SUNRPC: Fix a bug in gss_create_upcall SUNRPC: Faster detection if gssd is actually running SUNRPC: Convert auth_gss pipe detection to work in namespaces SUNRPC: Prevent an rpc_task wakeup race Ulf Hansson (1): mfd: db8500-prcmu: Update stored DSI PLL divider value Uwe Kleine-König (1): Documentation/devicetree: make semantic of initrd-end more explicit Vaibhav Hiremath (1): ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock Vasant Hegde (1): powerpc/rtas_flash: Fix validate_flash buffer overflow issue Ville Syrjälä (3): drm/i915: Fix pipe enabled mask for pipe C in WM calculations drm: Add kernel-doc for drm_fb_helper_funcs->initial_config drm: Remove pointless '-' characters from drm_fb_helper documentation Vineet Gupta (5): ARC: [mm] Prevent stray dcache lines after__sync_icache_dcach() ARC: copy_(to|from)_user() to honor usermode-access permissions ARC: Brown paper bag bug in macro for checking cache color ARC: Use enough bits for determining page's cache color ARC: lazy dcache flush broke gdb in non-aliasing configs Vinod Koul (2): ASoC: wm8994: use the correct pointer to get the control value ASoC: wm8994: check for array index returned Viresh Kumar (12): cpufreq: ARM big LITTLE: Select PM_OPP cpufreq: ARM big LITTLE DT: Return correct transition latency cpufreq: ARM big LITTLE DT: Return CPUFREQ_ETERNAL if clock-latency isn't found cpufreq: ARM big LITTLE: Move cpu_to_cluster() to arm_big_little.h cpufreq: ARM big LITTLE: Improve print message cpufreq: governors: Fix CPUFREQ_GOV_POLICY_{INIT|EXIT} notifiers cpufreq: Issue CPUFREQ_GOV_POLICY_EXIT notifier before dropping policy refcount cpufreq: cpufreq-cpu0: Free parent node for error cases cpufreq: ARM big LITTLE: Fix Kconfig entries cpufreq: Drop rwsem lock around CPUFREQ_GOV_POLICY_EXIT cpufreq: arm_big_little_dt: Register driver only if DT has valid data cpufreq: arm_big_little_dt: Instantiate as platform_driver Vivek Gautam (1): usb: dwc3: Fix compilation break when building with USB_DWC3_DUAL_ROLE=y Wang Shilong (1): Btrfs: fix possible memory leak in the find_parent_nodes() Wang YanQing (1): TTY: Fix tty miss restart after we turn off flow-control Wei WANG (1): USB: usb-stor: realtek_cr: Fix compile error Wei Yang (1): be2net: bug fix on returning an invalid nic descriptor Wei Yongjun (20): hwmon: fix error return code in abituguru_probe() bna: add missing iounmap() on error in bnad_init() cpufreq / intel_pstate: use vzalloc() instead of vmalloc()/memset(0) pinctrl: single: fix error return code in pcs_parse_one_pinctrl_entry() usb: gadget: zero: fix error return code in zero_bind() usb: musb: omap2430: add missing platform_device_put() on error in omap2430_probe() usb: musb: dsps: fix error return code in dsps_create_musb_pdev() usb: gadget: s3c2410_udc: fix error return code in s3c2410_udc_probe() usb: gadget: r8a66597-udc: fix error return code in r8a66597_probe() usb: gadget: m66592-udc: fix error return code in m66592_probe() usb: gadget: fusb300_udc: fix error return code in fusb300_probe() usb: gadget: dummy_hcd: fix error return code in init() usb: gadget: fix error return code in configfs_composite_bind() ARM: OMAP: fix error return code in omap1_system_dma_init() gianfar: add missing iounmap() on error in gianfar_ptp_probe() serial: samsung: add missing platform_driver_unregister() when module exit tty: serial: mpc5xxx: fix error handing in mpc52xx_uart_init() serial: mcf: missing uart_unregister_driver() on error in mcf_init() TTY: ehv_bytechan: add missing platform_driver_unregister() when module exit staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe() Will Deacon (3): arm64: debug: clear mdscr_el1 instead of taking the OS lock arm64: debug: fix mdscr.ss check when enabling debug exceptions ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported Wolfram Sang (36): cpufreq / kirkwood: don't check resource with devm_ioremap_resource drivers/ata: don't check resource with devm_ioremap_resource drivers/char/hw_random: don't check resource with devm_ioremap_resource usb: gadget: don't check resource with devm_ioremap_resource usb: phy: don't check resource with devm_ioremap_resource drivers/cpufreq: don't check resource with devm_ioremap_resource drivers/dma: don't check resource with devm_ioremap_resource drivers/gpio: don't check resource with devm_ioremap_resource drivers/gpu/drm/exynos: don't check resource with devm_ioremap_resource drivers/gpu/host1x/drm: don't check resource with devm_ioremap_resource drivers/i2c/busses: don't check resource with devm_ioremap_resource drivers/memory: don't check resource with devm_ioremap_resource drivers/mfd: don't check resource with devm_ioremap_resource drivers/misc: don't check resource with devm_ioremap_resource drivers/mtd/nand: don't check resource with devm_ioremap_resource drivers/net/ethernet/renesas: don't check resource with devm_ioremap_resource drivers/pinctrl: don't check resource with devm_ioremap_resource drivers/pwm: don't check resource with devm_ioremap_resource drivers/rtc: don't check resource with devm_ioremap_resource drivers/spi: don't check resource with devm_ioremap_resource drivers/staging/dwc2: don't check resource with devm_ioremap_resource drivers/staging/nvec: don't check resource with devm_ioremap_resource drivers/thermal: don't check resource with devm_ioremap_resource drivers/usb/chipidea: don't check resource with devm_ioremap_resource drivers/usb/gadget: don't check resource with devm_ioremap_resource drivers/usb/host: don't check resource with devm_ioremap_resource drivers/usb/phy: don't check resource with devm_ioremap_resource drivers/video/omap2: don't check resource with devm_ioremap_resource drivers/video/omap2/dss: don't check resource with devm_ioremap_resource drivers/w1/masters: don't check resource with devm_ioremap_resource drivers/watchdog: don't check resource with devm_ioremap_resource arch/arm/mach-tegra: don't check resource with devm_ioremap_resource arch/arm/plat-samsung: don't check resource with devm_ioremap_resource arch/mips/lantiq/xway: don't check resource with devm_ioremap_resource sound/soc/fsl: don't check resource with devm_ioremap_resource sound/soc/kirkwood: don't check resource with devm_ioremap_resource Xiao Guangrong (1): mm: mmu_notifier: re-fix freed page still mapped in secondary MMU Xiong Zhou (2): bq27x00: Fix I2C dependency in KConfig staging: android: logger: use kuid_t instead of uid_t Yan, Zheng (1): ext4: fix fio regression Yinghai Lu (1): PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check Yuval Mintz (1): bnx2x: Fix GSO for 57710/57711 chips Zhang Rui (2): PM: Documentation update for freeze state PM / Documentation: remove inaccurate suspend/hibernate transition lantency statement Zhang Yanfei (1): x86/mm: Add missing comments for initial kernel direct mapping dyoung(a)redhat.com (1): driver core: print sysfs attribute name when warning about bogus permissions françois romieu (1): r8169: fix offloaded tx checksum for small packets. jean-philippe francois (1): ARM: OMAP: fix __init section mismatch for _enable_preprogram nikolay(a)redhat.com (4): bonding: fix set mode race conditions bonding: replace %x with %pI4 for IPv4 addresses bonding: arp_ip_count and arp_targets can be wrong bonding: fix multiple 3ad mode sysfs race conditions salina(a)us.ibm.com (1): Char: lp, protect LPGETSTATUS with port_mutex stephen hemminger (1): 8139cp: reset BQL when ring tx ring cleared wang, biao (1): klist: del waiter from klist_remove_waiters before wakeup waitting process Documentation/devicetree/bindings/net/macb.txt | 2 +- .../{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} | 0 .../hdmiddc.txt => video/exynos_hdmiddc.txt} | 0 .../hdmiphy.txt => video/exynos_hdmiphy.txt} | 0 .../exynos/mixer.txt => video/exynos_mixer.txt} | 0 .../bindings/video/simple-framebuffer.txt | 25 + Documentation/devicetree/usage-model.txt | 8 +- Documentation/kernel-parameters.txt | 21 + Documentation/kernel-per-CPU-kthreads.txt | 202 +++++ Documentation/power/devices.txt | 15 +- Documentation/power/interface.txt | 4 +- Documentation/power/notifiers.txt | 6 +- Documentation/power/states.txt | 30 +- Documentation/rapidio/rapidio.txt | 128 ++- Documentation/rapidio/sysfs.txt | 17 + MAINTAINERS | 43 +- Makefile | 2 +- arch/Kconfig | 3 + arch/arc/boot/dts/abilis_tb100_dvk.dts | 2 +- arch/arc/boot/dts/abilis_tb101_dvk.dts | 2 +- arch/arc/boot/dts/abilis_tb10x.dtsi | 6 +- arch/arc/include/asm/cacheflush.h | 6 +- arch/arc/include/asm/page.h | 9 - arch/arc/include/asm/pgtable.h | 26 +- arch/arc/include/asm/tlb.h | 2 +- arch/arc/mm/cache_arc700.c | 23 +- arch/arc/mm/tlb.c | 3 +- arch/arc/mm/tlbex.S | 6 +- arch/arc/plat-tb10x/tb10x.c | 26 - arch/arm/Kconfig | 3 +- arch/arm/Makefile | 2 +- arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/armada-370-xp.dtsi | 3 +- arch/arm/boot/dts/armada-370.dtsi | 7 +- arch/arm/boot/dts/armada-xp-gp.dts | 3 + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 + arch/arm/boot/dts/armada-xp.dtsi | 2 +- arch/arm/boot/dts/at91sam9260.dtsi | 2 +- arch/arm/boot/dts/at91sam9n12.dtsi | 1 + arch/arm/boot/dts/at91sam9x25ek.dts | 2 +- arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/boot/dts/sama5d3.dtsi | 12 +- arch/arm/boot/dts/sama5d3xcm.dtsi | 4 + arch/arm/boot/dts/ste-nomadik-s8815.dts | 12 +- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 4 +- arch/arm/common/mcpm_platsmp.c | 3 - arch/arm/configs/omap1_defconfig | 1 - arch/arm/configs/omap2plus_defconfig | 2 +- arch/arm/configs/tegra_defconfig | 3 +- arch/arm/crypto/sha1-armv4-large.S | 2 +- arch/arm/include/asm/cmpxchg.h | 8 +- arch/arm/include/debug/ux500.S | 6 +- arch/arm/kernel/process.c | 1 - arch/arm/kernel/smp.c | 2 +- arch/arm/mach-at91/at91rm9200_time.c | 7 +- arch/arm/mach-at91/at91sam9n12.c | 6 - arch/arm/mach-at91/include/mach/at91_pmc.h | 6 +- arch/arm/mach-imx/clk-imx6q.c | 11 +- arch/arm/mach-imx/headsmp.S | 12 + arch/arm/mach-imx/platsmp.c | 14 + arch/arm/mach-kirkwood/common.c | 6 - arch/arm/mach-kirkwood/ts219-setup.c | 2 +- arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/armada-370-xp.c | 7 - arch/arm/mach-omap1/dma.c | 1 + arch/arm/mach-omap2/cclock33xx_data.c | 26 +- arch/arm/mach-omap2/omap_hwmod.c | 113 +-- arch/arm/mach-omap2/omap_hwmod.h | 7 +- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 3 + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 6 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 +- arch/arm/mach-omap2/serial.c | 31 - arch/arm/mach-orion5x/common.c | 7 - arch/arm/mach-shmobile/board-marzen.c | 6 +- arch/arm/mach-sunxi/Kconfig | 1 + arch/arm/mach-tegra/tegra2_emc.c | 5 - arch/arm/mach-ux500/Kconfig | 1 + arch/arm/mach-ux500/board-mop500.c | 6 +- arch/arm/mach-ux500/cpu-db8500.c | 6 +- arch/arm/mach-ux500/setup.h | 2 +- arch/arm/mach-vt8500/vt8500.c | 1 + arch/arm/plat-orion/common.c | 12 +- arch/arm/plat-orion/include/plat/common.h | 1 + arch/arm/plat-samsung/adc.c | 5 - arch/arm/vfp/entry.S | 2 +- arch/arm/xen/enlighten.c | 33 +- arch/arm64/Kconfig | 2 - arch/arm64/include/asm/assembler.h | 2 +- arch/arm64/kernel/debug-monitors.c | 2 - arch/arm64/kernel/early_printk.c | 5 +- arch/arm64/kernel/setup.c | 12 +- arch/arm64/mm/cache.S | 2 +- arch/arm64/mm/proc.S | 3 +- arch/avr32/Kconfig | 5 + arch/avr32/include/asm/Kbuild | 1 + arch/avr32/include/asm/numnodes.h | 7 - arch/avr32/include/asm/param.h | 9 - arch/avr32/include/uapi/asm/Kbuild | 1 + arch/avr32/include/uapi/asm/param.h | 18 - arch/avr32/kernel/module.c | 2 +- arch/mips/alchemy/board-gpr.c | 1 + arch/mips/alchemy/common/time.c | 1 + arch/mips/ath79/setup.c | 1 + arch/mips/cobalt/reset.c | 1 + arch/mips/configs/db1000_defconfig | 1 - arch/mips/configs/db1235_defconfig | 1 - arch/mips/configs/lemote2f_defconfig | 1 - arch/mips/include/asm/clock.h | 2 - arch/mips/include/asm/idle.h | 23 + arch/mips/include/asm/io.h | 2 +- arch/mips/include/asm/kvm_host.h | 2 +- arch/mips/include/asm/mmu_context.h | 95 +- arch/mips/include/asm/page.h | 17 +- arch/mips/include/asm/processor.h | 1 - arch/mips/include/{ => uapi}/asm/kvm.h | 0 arch/mips/include/uapi/asm/unistd.h | 5 +- arch/mips/kernel/Makefile | 2 +- arch/mips/kernel/cpu-probe.c | 198 ----- arch/mips/kernel/crash_dump.c | 1 + arch/mips/kernel/genex.S | 8 +- arch/mips/kernel/idle.c | 244 +++++ arch/mips/kernel/kprobes.c | 5 +- arch/mips/kernel/proc.c | 1 + arch/mips/kernel/process.c | 53 +- arch/mips/kernel/scall64-64.S | 1 + arch/mips/kernel/smp.c | 1 + arch/mips/kernel/smtc.c | 15 +- arch/mips/kernel/traps.c | 15 +- arch/mips/kvm/kvm_mips_emul.c | 29 +- arch/mips/kvm/kvm_tlb.c | 61 +- arch/mips/lantiq/xway/gptu.c | 6 +- arch/mips/lib/dump_tlb.c | 5 +- arch/mips/lib/r3k_dump_tlb.c | 7 +- arch/mips/loongson/common/reset.c | 1 + arch/mips/loongson1/common/reset.c | 1 + arch/mips/mm/tlb-r3k.c | 20 +- arch/mips/mm/tlb-r4k.c | 2 +- arch/mips/mm/tlb-r8k.c | 2 +- arch/mips/mm/tlbex.c | 79 -- arch/mips/netlogic/xlp/setup.c | 1 + arch/mips/netlogic/xlr/setup.c | 1 + arch/mips/pmcs-msp71xx/msp_prom.c | 2 +- arch/mips/pmcs-msp71xx/msp_setup.c | 1 + arch/mips/ralink/dts/rt3050.dtsi | 10 + arch/mips/ralink/dts/rt3052_eval.dts | 4 + arch/mips/txx9/generic/setup.c | 1 + arch/mips/vr41xx/common/pmu.c | 1 + arch/mips/wrppmc/reset.c | 1 + arch/parisc/Kconfig | 2 +- arch/parisc/Makefile | 21 +- arch/parisc/include/asm/assembly.h | 1 - arch/parisc/include/asm/hardirq.h | 10 +- arch/parisc/include/asm/processor.h | 18 - arch/parisc/kernel/entry.S | 174 ++-- arch/parisc/kernel/hardware.c | 1 + arch/parisc/kernel/irq.c | 122 ++- arch/parisc/kernel/pacache.S | 12 +- arch/parisc/kernel/traps.c | 1 + arch/parisc/kernel/unaligned.c | 3 + arch/parisc/mm/init.c | 4 +- arch/powerpc/Kconfig.debug | 23 + arch/powerpc/configs/ps3_defconfig | 1 - arch/powerpc/include/asm/context_tracking.h | 10 + arch/powerpc/include/asm/firmware.h | 4 +- arch/powerpc/include/asm/hw_irq.h | 5 +- arch/powerpc/include/asm/opal.h | 5 +- arch/powerpc/include/asm/pci-bridge.h | 2 + arch/powerpc/include/asm/pgalloc-64.h | 2 +- arch/powerpc/include/asm/processor.h | 6 + arch/powerpc/include/asm/pte-hash64-64k.h | 2 +- arch/powerpc/include/asm/rtas.h | 2 + arch/powerpc/include/asm/thread_info.h | 7 +- arch/powerpc/include/asm/udbg.h | 1 + arch/powerpc/kernel/asm-offsets.c | 6 + arch/powerpc/kernel/cpu_setup_power.S | 8 +- arch/powerpc/kernel/entry_32.S | 2 - arch/powerpc/kernel/entry_64.S | 33 +- arch/powerpc/kernel/exceptions-64e.S | 8 +- arch/powerpc/kernel/machine_kexec_64.c | 4 + arch/powerpc/kernel/misc_32.S | 11 + arch/powerpc/kernel/misc_64.S | 11 + arch/powerpc/kernel/pci-common.c | 12 +- arch/powerpc/kernel/pci_64.c | 10 + arch/powerpc/kernel/pci_dn.c | 8 + arch/powerpc/kernel/ppc_ksyms.c | 3 +- arch/powerpc/kernel/process.c | 8 + arch/powerpc/kernel/ptrace.c | 5 + arch/powerpc/kernel/rtas.c | 113 +++ arch/powerpc/kernel/rtas_flash.c | 10 +- arch/powerpc/kernel/signal.c | 7 +- arch/powerpc/kernel/traps.c | 80 +- arch/powerpc/kernel/udbg.c | 3 + arch/powerpc/mm/fault.c | 41 +- arch/powerpc/mm/hash_utils_64.c | 36 +- arch/powerpc/mm/init_64.c | 3 +- arch/powerpc/perf/core-book3s.c | 280 +++--- arch/powerpc/platforms/Kconfig | 2 +- arch/powerpc/platforms/powernv/Kconfig | 1 + arch/powerpc/platforms/powernv/opal.c | 30 +- arch/powerpc/platforms/powernv/pci-ioda.c | 36 +- arch/powerpc/platforms/powernv/pci.c | 18 +- arch/powerpc/platforms/powernv/pci.h | 2 + arch/powerpc/platforms/powernv/powernv.h | 2 + arch/powerpc/platforms/powernv/setup.c | 16 +- arch/powerpc/platforms/powernv/smp.c | 62 +- arch/powerpc/platforms/pseries/Kconfig | 1 + arch/powerpc/platforms/pseries/msi.c | 75 +- arch/powerpc/platforms/pseries/suspend.c | 22 + arch/powerpc/platforms/wsp/ics.c | 2 +- arch/powerpc/sysdev/Makefile | 2 + arch/powerpc/sysdev/ehv_pic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/udbg_memcons.c | 105 +++ arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/s390/Kconfig | 1 - arch/s390/include/asm/ftrace.h | 12 +- arch/s390/include/asm/page.h | 20 +- arch/s390/include/asm/pgtable.h | 4 +- arch/s390/kernel/dis.c | 2 + arch/s390/kernel/ftrace.c | 9 +- arch/s390/kernel/mcount.S | 2 + arch/s390/kernel/mcount64.S | 2 + arch/s390/kernel/smp.c | 2 +- arch/s390/mm/pgtable.c | 3 +- arch/score/mm/init.c | 2 - arch/x86/Kconfig | 1 - arch/x86/kernel/head64.c | 2 +- arch/x86/kernel/microcode_intel_early.c | 5 +- arch/x86/kernel/process.c | 5 +- arch/x86/mm/init.c | 19 +- arch/x86/pci/mrst.c | 10 +- drivers/acpi/Makefile | 3 +- drivers/acpi/ac.c | 33 + drivers/acpi/acpi_lpss.c | 26 +- drivers/acpi/csrt.c | 159 ---- drivers/acpi/device_pm.c | 126 +-- drivers/acpi/ec.c | 4 +- drivers/acpi/internal.h | 1 - drivers/acpi/pci_root.c | 4 +- drivers/acpi/processor_driver.c | 8 +- drivers/acpi/processor_idle.c | 29 +- drivers/acpi/scan.c | 4 +- drivers/acpi/video.c | 8 + drivers/acpi/video_detect.c | 8 + drivers/ata/pata_ep93xx.c | 5 - drivers/base/bus.c | 1 + drivers/base/core.c | 6 +- drivers/base/power/common.c | 12 +- drivers/bcma/scan.c | 2 + drivers/block/brd.c | 4 +- drivers/block/rbd.c | 935 ++++++++++++-------- drivers/block/xsysace.c | 3 +- drivers/char/hw_random/mxc-rnga.c | 6 - drivers/char/hw_random/omap-rng.c | 5 - drivers/char/ipmi/ipmi_bt_sm.c | 4 +- drivers/char/ipmi/ipmi_devintf.c | 14 +- drivers/char/ipmi/ipmi_msghandler.c | 3 +- drivers/char/ipmi/ipmi_si_intf.c | 16 +- drivers/char/lp.c | 3 + drivers/char/random.c | 54 +- drivers/char/ttyprintk.c | 2 +- drivers/clk/tegra/clk-tegra20.c | 11 +- drivers/clk/x86/clk-lpt.c | 15 +- drivers/cpufreq/Kconfig | 2 +- drivers/cpufreq/Kconfig.arm | 15 +- drivers/cpufreq/Kconfig.x86 | 2 +- drivers/cpufreq/arm_big_little.c | 7 +- drivers/cpufreq/arm_big_little.h | 5 + drivers/cpufreq/arm_big_little_dt.c | 94 +- drivers/cpufreq/cpufreq-cpu0.c | 27 +- drivers/cpufreq/cpufreq.c | 19 +- drivers/cpufreq/cpufreq_governor.c | 11 +- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpufreq/cpufreq_ondemand.c | 1 - drivers/cpufreq/cpufreq_stats.c | 7 +- drivers/cpufreq/intel_pstate.c | 123 +-- drivers/cpufreq/kirkwood-cpufreq.c | 4 - drivers/cpufreq/loongson2_cpufreq.c | 2 + drivers/crypto/nx/nx-aes-cbc.c | 1 + drivers/crypto/nx/nx-aes-ecb.c | 1 + drivers/crypto/nx/nx-aes-gcm.c | 2 +- drivers/crypto/nx/nx-sha256.c | 8 +- drivers/crypto/nx/nx-sha512.c | 7 +- drivers/crypto/nx/nx.c | 38 +- drivers/dma/acpi-dma.c | 172 +++- drivers/dma/tegra20-apb-dma.c | 5 - drivers/edac/amd64_edac_inj.c | 4 +- drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-langwell.c | 17 +- drivers/gpio/gpio-ml-ioh.c | 3 +- drivers/gpio/gpio-mvebu.c | 5 - drivers/gpio/gpio-mxs.c | 3 +- drivers/gpio/gpio-omap.c | 48 +- drivers/gpio/gpio-pch.c | 3 +- drivers/gpio/gpio-sch.c | 6 +- drivers/gpio/gpio-tegra.c | 5 - drivers/gpio/gpio-viperboard.c | 3 +- drivers/gpu/drm/drm_crtc.c | 5 + drivers/gpu/drm/drm_crtc_helper.c | 27 +- drivers/gpu/drm/drm_drv.c | 20 +- drivers/gpu/drm/drm_encoder_slave.c | 6 +- drivers/gpu/drm/drm_mm.c | 34 +- drivers/gpu/drm/drm_modes.c | 1 + drivers/gpu/drm/exynos/exynos_hdmi.c | 5 - drivers/gpu/drm/i915/i915_gem.c | 8 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 15 +- drivers/gpu/drm/i915/i915_reg.h | 2 - drivers/gpu/drm/i915/intel_ddi.c | 5 + drivers/gpu/drm/i915/intel_dp.c | 77 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_fb.c | 16 +- drivers/gpu/drm/i915/intel_pm.c | 44 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 90 +- drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 2 - drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 2 + drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 10 + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 3 + drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 4 +- drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c | 17 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 25 +- drivers/gpu/drm/qxl/qxl_cmd.c | 29 +- drivers/gpu/drm/qxl/qxl_display.c | 17 +- drivers/gpu/drm/qxl/qxl_drv.h | 7 - drivers/gpu/drm/qxl/qxl_ioctl.c | 1 + drivers/gpu/drm/radeon/atombios_crtc.c | 6 - drivers/gpu/drm/radeon/evergreen.c | 31 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 7 +- drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- drivers/gpu/drm/radeon/r600_hdmi.c | 9 +- drivers/gpu/drm/radeon/radeon.h | 2 + drivers/gpu/drm/radeon/radeon_asic.c | 22 +- drivers/gpu/drm/radeon/radeon_bios.c | 28 +- drivers/gpu/drm/radeon/radeon_device.c | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 12 +- drivers/gpu/drm/radeon/radeon_family.h | 1 + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 - drivers/gpu/drm/radeon/radeon_mode.h | 1 - drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/radeon/si.c | 370 ++++++-- drivers/gpu/drm/radeon/sid.h | 1 + drivers/gpu/host1x/drm/dc.c | 5 - drivers/hv/channel_mgmt.c | 2 +- drivers/hwmon/abituguru.c | 16 +- drivers/hwmon/iio_hwmon.c | 8 +- drivers/hwmon/nct6775.c | 6 +- drivers/hwmon/tmp401.c | 2 +- drivers/i2c/busses/i2c-designware-core.c | 14 +- drivers/i2c/busses/i2c-designware-core.h | 2 + drivers/i2c/busses/i2c-designware-platdrv.c | 1 + drivers/i2c/busses/i2c-i801.c | 6 +- drivers/i2c/busses/i2c-mv64xxx.c | 8 +- drivers/i2c/busses/i2c-s3c2410.c | 5 - drivers/i2c/busses/i2c-sirf.c | 6 - drivers/i2c/busses/i2c-tegra.c | 5 - drivers/i2c/i2c-core.c | 3 +- drivers/iio/adc/exynos_adc.c | 8 +- drivers/iio/common/st_sensors/st_sensors_core.c | 2 + drivers/iio/dac/Kconfig | 6 +- drivers/input/tablet/wacom_wac.c | 89 +- drivers/input/tablet/wacom_wac.h | 1 + drivers/input/touchscreen/egalax_ts.c | 2 +- drivers/isdn/capi/kcapi.c | 6 +- drivers/leds/leds-gpio.c | 9 +- drivers/leds/leds-ot200.c | 14 +- drivers/lguest/page_tables.c | 1 + drivers/md/dm-thin.c | 4 +- drivers/memory/emif.c | 6 - drivers/mfd/Kconfig | 3 +- drivers/mfd/ab8500-core.c | 24 +- drivers/mfd/ab8500-debugfs.c | 16 +- drivers/mfd/ab8500-gpadc.c | 7 +- drivers/mfd/ab8500-sysctrl.c | 15 +- drivers/mfd/abx500-core.c | 2 +- drivers/mfd/cros_ec_spi.c | 6 +- drivers/mfd/db8500-prcmu.c | 3 + drivers/mfd/intel_msic.c | 5 - drivers/mfd/si476x-cmd.c | 152 ++-- drivers/misc/atmel-ssc.c | 5 - drivers/misc/dummy-irq.c | 6 +- drivers/misc/mei/bus.c | 2 + drivers/misc/mei/main.c | 17 +- drivers/misc/vmw_vmci/Kconfig | 2 +- drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +- drivers/mmc/host/mmci.c | 9 +- drivers/mtd/nand/lpc32xx_mlc.c | 5 - drivers/net/bonding/bond_3ad.c | 21 +- drivers/net/bonding/bond_3ad.h | 2 + drivers/net/bonding/bond_main.c | 26 +- drivers/net/bonding/bond_procfs.c | 2 +- drivers/net/bonding/bond_sysfs.c | 13 +- drivers/net/caif/Kconfig | 2 +- drivers/net/ethernet/3com/3c59x.c | 25 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 9 +- drivers/net/ethernet/broadcom/tg3.c | 61 +- drivers/net/ethernet/brocade/bna/bnad.c | 5 +- drivers/net/ethernet/cadence/Kconfig | 3 +- drivers/net/ethernet/cadence/macb.c | 18 +- drivers/net/ethernet/cadence/macb.h | 7 + drivers/net/ethernet/calxeda/Kconfig | 2 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 13 +- drivers/net/ethernet/emulex/benet/be_main.c | 18 +- drivers/net/ethernet/freescale/fec_main.c | 34 +- drivers/net/ethernet/freescale/gianfar_ptp.c | 1 + drivers/net/ethernet/ibm/emac/core.c | 36 +- drivers/net/ethernet/icplus/ipg.h | 86 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 4 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 29 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 8 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 95 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 4 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 24 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 54 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 49 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 111 ++- .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 9 +- .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 3 - drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 3 + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 7 + drivers/net/ethernet/realtek/8139cp.c | 1 + drivers/net/ethernet/realtek/r8169.c | 41 +- drivers/net/ethernet/renesas/sh_eth.c | 5 - drivers/net/ethernet/sfc/efx.c | 8 +- drivers/net/ethernet/sfc/net_driver.h | 31 +- drivers/net/ethernet/sfc/rx.c | 8 +- drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- drivers/net/macvlan.c | 7 +- drivers/net/ntb_netdev.c | 2 + drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/rtl8150.c | 100 +-- drivers/net/usb/usbnet.c | 2 +- drivers/net/virtio_net.c | 11 +- drivers/net/vxlan.c | 17 +- drivers/net/wireless/ath/ath5k/base.c | 5 + drivers/net/wireless/ath/ath9k/Kconfig | 2 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 2 +- .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 138 +-- drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- drivers/net/wireless/ath/ath9k/debug.c | 8 + drivers/net/wireless/ath/ath9k/debug.h | 5 + drivers/net/wireless/ath/ath9k/init.c | 10 +- drivers/net/wireless/ath/ath9k/main.c | 18 +- drivers/net/wireless/ath/ath9k/xmit.c | 74 +- drivers/net/wireless/b43/dma.c | 19 + drivers/net/wireless/b43/dma.h | 4 +- drivers/net/wireless/b43/main.c | 43 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +- drivers/net/wireless/iwlegacy/4965-mac.c | 3 +- drivers/net/wireless/iwlegacy/common.c | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 27 + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 12 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 17 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 + drivers/net/wireless/iwlwifi/mvm/ops.c | 1 + drivers/net/wireless/iwlwifi/mvm/scan.c | 6 + drivers/net/wireless/iwlwifi/mvm/sta.c | 13 +- drivers/net/wireless/iwlwifi/mvm/sta.h | 2 - drivers/net/wireless/iwlwifi/mvm/tx.c | 48 +- drivers/net/wireless/mac80211_hwsim.c | 18 +- drivers/net/wireless/mwifiex/cfg80211.c | 3 - drivers/net/wireless/mwifiex/cmdevt.c | 1 + drivers/net/wireless/mwifiex/main.c | 1 + drivers/net/wireless/mwifiex/sta_ioctl.c | 21 +- drivers/net/wireless/rtlwifi/rtl8188ee/trx.h | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + drivers/ntb/ntb_hw.c | 10 +- drivers/ntb/ntb_transport.c | 175 ++-- drivers/of/base.c | 4 +- drivers/parisc/superio.c | 13 +- drivers/pci/hotplug/acpiphp_glue.c | 14 + drivers/pinctrl/pinctrl-abx500.c | 30 +- drivers/pinctrl/pinctrl-coh901.c | 5 - drivers/pinctrl/pinctrl-exynos5440.c | 5 - drivers/pinctrl/pinctrl-lantiq.c | 3 +- drivers/pinctrl/pinctrl-samsung.c | 5 - drivers/pinctrl/pinctrl-single.c | 3 +- drivers/pinctrl/pinctrl-xway.c | 4 - drivers/pinctrl/vt8500/pinctrl-wm8750.c | 2 +- drivers/power/Kconfig | 2 + drivers/power/pm2301_charger.c | 2 +- drivers/power/wm831x_backup.c | 1 - drivers/pwm/pwm-imx.c | 5 - drivers/pwm/pwm-puv3.c | 5 - drivers/pwm/pwm-pxa.c | 5 - drivers/pwm/pwm-tegra.c | 5 - drivers/pwm/pwm-tiecap.c | 5 - drivers/pwm/pwm-tiehrpwm.c | 5 - drivers/pwm/pwm-tipwmss.c | 5 - drivers/pwm/pwm-vt8500.c | 5 - drivers/rapidio/Kconfig | 20 + drivers/rapidio/Makefile | 3 +- drivers/rapidio/devices/tsi721.c | 12 + drivers/rapidio/rio-driver.c | 8 + drivers/rapidio/rio-scan.c | 190 ++-- drivers/rapidio/rio-sysfs.c | 45 + drivers/rapidio/rio.c | 246 ++++- drivers/rapidio/rio.h | 13 +- drivers/rtc/Kconfig | 2 - drivers/rtc/rtc-max8998.c | 2 +- drivers/rtc/rtc-nuc900.c | 5 - drivers/rtc/rtc-omap.c | 5 - drivers/rtc/rtc-pl031.c | 2 +- drivers/rtc/rtc-s3c.c | 5 - drivers/rtc/rtc-tegra.c | 6 - drivers/s390/block/xpram.c | 1 + drivers/s390/cio/chp.c | 36 + drivers/s390/cio/chsc.h | 4 +- drivers/spi/spi-atmel.c | 51 +- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi-tegra20-sflash.c | 5 - drivers/spi/spi.c | 9 +- drivers/staging/Kconfig | 4 +- drivers/staging/android/logger.c | 4 +- drivers/staging/android/logger.h | 2 +- drivers/staging/comedi/Kconfig | 9 + drivers/staging/comedi/comedi_buf.c | 12 + drivers/staging/comedi/comedi_fops.c | 3 - drivers/staging/comedi/drivers/ni_labpc.c | 8 +- drivers/staging/comedi/drivers/ni_labpc.h | 1 + drivers/staging/comedi/drivers/ni_mio_common.c | 20 +- drivers/staging/dwc2/Kconfig | 2 +- drivers/staging/dwc2/hcd_intr.c | 2 - drivers/staging/dwc2/platform.c | 13 +- drivers/staging/gdm72xx/Kconfig | 2 +- drivers/staging/iio/adc/mxs-lradc.c | 5 +- drivers/staging/iio/light/tsl2x7x_core.c | 9 +- drivers/staging/imx-drm/Kconfig | 5 + drivers/staging/imx-drm/imx-tve.c | 4 +- drivers/staging/media/solo6x10/Kconfig | 1 + drivers/staging/nvec/nvec.c | 26 +- drivers/staging/nvec/nvec.h | 5 +- drivers/staging/nvec/nvec_kbd.c | 10 +- drivers/staging/nvec/nvec_power.c | 1 + drivers/staging/nvec/nvec_ps2.c | 8 +- drivers/staging/sep/Kconfig | 2 +- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 6 +- drivers/staging/vt6656/hostap.c | 2 +- drivers/staging/vt6656/iwctl.c | 6 + drivers/staging/zcache/ramster/ramster-howto.txt | 366 ++++++++ drivers/staging/zcache/zcache-main.c | 8 +- drivers/target/iscsi/iscsi_target.c | 63 +- drivers/target/iscsi/iscsi_target_erl1.c | 7 +- drivers/target/iscsi/iscsi_target_parameters.c | 8 +- drivers/target/iscsi/iscsi_target_parameters.h | 4 +- drivers/target/target_core_configfs.c | 11 +- drivers/target/target_core_device.c | 14 - drivers/target/target_core_file.c | 9 +- drivers/target/target_core_iblock.c | 2 + drivers/target/target_core_internal.h | 1 - drivers/target/target_core_rd.c | 21 +- drivers/target/target_core_rd.h | 1 + drivers/target/target_core_transport.c | 13 +- drivers/thermal/armada_thermal.c | 10 - drivers/thermal/dove_thermal.c | 4 - drivers/thermal/exynos_thermal.c | 5 - drivers/tty/ehv_bytechan.c | 1 + drivers/tty/mxser.c | 11 +- drivers/tty/n_tty.c | 8 + drivers/tty/rocket.c | 288 +++--- drivers/tty/serial/8250/8250_dw.c | 7 +- drivers/tty/serial/amba-pl011.c | 2 +- drivers/tty/serial/mcf.c | 4 +- drivers/tty/serial/mpc52xx_uart.c | 11 +- drivers/tty/serial/nwpserial.c | 2 +- drivers/tty/serial/omap-serial.c | 23 - drivers/tty/serial/samsung.c | 1 + drivers/tty/vt/vt.c | 14 +- drivers/tty/vt/vt_ioctl.c | 67 +- drivers/uio/Kconfig | 1 + drivers/usb/atm/cxacru.c | 3 +- drivers/usb/chipidea/Kconfig | 2 +- drivers/usb/chipidea/ci13xxx_imx.c | 15 +- drivers/usb/chipidea/core.c | 5 - drivers/usb/core/Kconfig | 2 +- drivers/usb/core/quirks.c | 3 + drivers/usb/dwc3/Kconfig | 6 +- drivers/usb/dwc3/dwc3-exynos.c | 6 +- drivers/usb/gadget/Kconfig | 1 - drivers/usb/gadget/atmel_usba_udc.c | 2 - drivers/usb/gadget/bcm63xx_udc.c | 11 - drivers/usb/gadget/configfs.c | 8 +- drivers/usb/gadget/dummy_hcd.c | 5 +- drivers/usb/gadget/f_ecm.c | 1 + drivers/usb/gadget/f_subset.c | 1 + drivers/usb/gadget/f_uac2.c | 2 - drivers/usb/gadget/fusb300_udc.c | 4 +- drivers/usb/gadget/imx_udc.c | 2 - drivers/usb/gadget/m66592-udc.c | 4 +- drivers/usb/gadget/pxa25x_udc.c | 1 - drivers/usb/gadget/r8a66597-udc.c | 4 +- drivers/usb/gadget/s3c-hsotg.c | 2 +- drivers/usb/gadget/s3c2410_udc.c | 3 +- drivers/usb/gadget/zero.c | 8 +- drivers/usb/host/Kconfig | 17 +- drivers/usb/host/ehci-atmel.c | 6 +- drivers/usb/host/ehci-hcd.c | 17 - drivers/usb/host/ehci-omap.c | 8 +- drivers/usb/host/ehci-orion.c | 6 +- drivers/usb/host/ehci-s5p.c | 5 +- drivers/usb/host/ehci-spear.c | 6 +- drivers/usb/host/ehci-tegra.c | 6 +- drivers/usb/host/isp1760-hcd.c | 2 +- drivers/usb/host/isp1760-if.c | 4 +- drivers/usb/host/ohci-at91.c | 6 +- drivers/usb/host/ohci-exynos.c | 4 +- drivers/usb/host/ohci-hcd.c | 34 +- drivers/usb/host/ohci-nxp.c | 50 +- drivers/usb/host/ohci-omap3.c | 8 +- drivers/usb/host/ohci-pxa27x.c | 6 +- drivers/usb/host/ohci-spear.c | 6 +- drivers/usb/host/oxu210hp-hcd.c | 2 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/host/uhci-hub.c | 3 +- drivers/usb/host/uhci-platform.c | 6 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/host/xhci-mem.c | 17 +- drivers/usb/musb/musb_dsps.c | 1 + drivers/usb/musb/omap2430.c | 3 +- drivers/usb/phy/Kconfig | 5 +- drivers/usb/phy/phy-ab8500-usb.c | 2 - drivers/usb/phy/phy-fsl-usb.c | 1 + drivers/usb/phy/phy-gpio-vbus-usb.c | 3 +- drivers/usb/phy/phy-isp1301.c | 1 + drivers/usb/phy/phy-mv-u3d-usb.c | 5 - drivers/usb/phy/phy-mv-usb.c | 3 - drivers/usb/phy/phy-mxs-usb.c | 8 +- drivers/usb/phy/phy-nop.c | 2 - drivers/usb/phy/phy-samsung-usb2.c | 5 - drivers/usb/phy/phy-samsung-usb3.c | 5 - drivers/usb/serial/ftdi_sio.c | 30 +- drivers/usb/serial/ftdi_sio_ids.h | 2 + drivers/usb/serial/generic.c | 31 + drivers/usb/serial/io_ti.c | 22 +- drivers/usb/serial/option.c | 13 +- drivers/usb/serial/ti_usb_3410_5052.c | 23 +- drivers/usb/serial/usb-serial.c | 30 +- drivers/usb/storage/realtek_cr.c | 8 +- drivers/vhost/vringh.c | 3 + drivers/video/Kconfig | 19 +- drivers/video/Makefile | 1 + drivers/video/console/Makefile | 2 + drivers/video/omap2/dss/hdmi.c | 4 - drivers/video/omap2/vrfb.c | 5 - drivers/video/simplefb.c | 234 +++++ drivers/w1/masters/omap_hdq.c | 5 - drivers/watchdog/ath79_wdt.c | 5 - drivers/watchdog/davinci_wdt.c | 5 - drivers/watchdog/imx2_wdt.c | 5 - drivers/xen/Kconfig | 7 +- drivers/xen/balloon.c | 3 +- drivers/xen/privcmd.c | 2 +- drivers/xen/tmem.c | 87 +- drivers/xen/xen-selfballoon.c | 47 +- drivers/xen/xenbus/xenbus_dev_backend.c | 21 +- fs/aio.c | 7 +- fs/btrfs/backref.c | 3 +- fs/btrfs/check-integrity.c | 2 +- fs/btrfs/ctree.c | 4 +- fs/btrfs/ctree.h | 8 +- fs/btrfs/delayed-ref.h | 1 + fs/btrfs/dev-replace.c | 5 + fs/btrfs/disk-io.c | 52 +- fs/btrfs/extent-tree.c | 94 +- fs/btrfs/extent_io.c | 138 +-- fs/btrfs/extent_io.h | 2 + fs/btrfs/free-space-cache.c | 43 +- fs/btrfs/free-space-cache.h | 2 + fs/btrfs/inode-map.c | 8 +- fs/btrfs/inode.c | 81 +- fs/btrfs/ioctl.c | 10 +- fs/btrfs/raid56.c | 2 +- fs/btrfs/relocation.c | 7 +- fs/btrfs/scrub.c | 10 +- fs/btrfs/super.c | 1 + fs/btrfs/volumes.c | 54 +- fs/btrfs/volumes.h | 20 + fs/cifs/inode.c | 3 +- fs/ext4/ext4.h | 8 +- fs/ext4/extents.c | 9 +- fs/ext4/extents_status.c | 17 +- fs/ext4/extents_status.h | 3 +- fs/ext4/file.c | 4 +- fs/ext4/inode.c | 85 +- fs/ext4/mballoc.c | 6 +- fs/ext4/page-io.c | 121 +-- fs/fat/inode.c | 15 +- fs/gfs2/Kconfig | 2 +- fs/gfs2/lops.c | 2 +- fs/gfs2/quota.c | 4 +- fs/gfs2/rgrp.c | 9 +- fs/hfs/bnode.c | 6 +- fs/nfs/callback_proc.c | 2 +- fs/nfs/callback_xdr.c | 2 +- fs/nfs/nfs4client.c | 2 +- fs/nfs/nfs4proc.c | 2 +- fs/nfs/nfs4session.c | 4 +- fs/nfs/nfs4session.h | 13 +- fs/nfs/nfs4state.c | 15 +- fs/nilfs2/inode.c | 27 +- fs/ocfs2/extent_map.c | 2 +- fs/ocfs2/file.c | 2 +- fs/xfs/xfs_aops.c | 19 + fs/xfs/xfs_attr_leaf.c | 27 +- fs/xfs/xfs_buf.c | 2 +- fs/xfs/xfs_da_btree.c | 7 +- fs/xfs/xfs_dir2_leaf.c | 2 +- fs/xfs/xfs_extfree_item.c | 5 +- fs/xfs/xfs_log_cil.c | 2 +- fs/xfs/xfs_vnodeops.c | 4 +- include/acpi/acpi_bus.h | 40 +- include/acpi/acpiosxf.h | 2 +- include/acpi/processor.h | 10 +- include/drm/drmP.h | 3 +- include/drm/drm_fb_helper.h | 15 +- include/drm/drm_os_linux.h | 9 - include/drm/drm_pciids.h | 6 + include/linux/acpi_dma.h | 4 + include/linux/bcma/bcma.h | 5 +- include/linux/brcmphy.h | 5 + include/linux/journal-head.h | 8 +- include/linux/kernel.h | 5 +- include/linux/kref.h | 33 + include/linux/mfd/abx500/ab8500.h | 2 - include/linux/mlx4/qp.h | 29 +- include/linux/netdevice.h | 11 + include/linux/of_platform.h | 5 +- include/linux/pci-acpi.h | 2 + include/linux/pinctrl/pinconf-generic.h | 12 +- include/linux/platform_data/clk-lpss.h | 5 + include/linux/platform_data/serial-omap.h | 2 - include/linux/printk.h | 1 + include/linux/rio.h | 18 +- include/linux/rio_drv.h | 1 + include/linux/socket.h | 2 - include/linux/spi/spi.h | 4 +- include/linux/time.h | 4 - include/linux/uio.h | 3 + include/linux/usb/gadget.h | 5 +- include/linux/usb/serial.h | 4 + include/linux/vt_kern.h | 2 +- include/linux/wait.h | 16 +- include/net/mac80211.h | 12 +- include/net/netfilter/nf_log.h | 3 +- include/net/netfilter/nfnetlink_log.h | 3 +- include/net/sock.h | 12 + include/target/target_core_base.h | 5 - include/trace/events/ext4.h | 4 +- include/uapi/linux/virtio_console.h | 2 +- ipc/sem.c | 27 +- kernel/auditfilter.c | 3 - kernel/cpu/idle.c | 2 + kernel/events/core.c | 240 ++--- kernel/kmod.c | 5 + kernel/module.c | 21 +- kernel/rcutree_plugin.h | 4 +- kernel/time/Kconfig | 5 - kernel/time/tick-broadcast.c | 10 +- kernel/time/tick-sched.c | 3 +- kernel/timer.c | 2 +- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_events_filter.c | 4 + kernel/trace/trace_kprobe.c | 53 +- kernel/workqueue.c | 19 +- lib/Makefile | 2 +- lib/iovec.c | 53 ++ lib/klist.c | 2 +- lib/mpi/longlong.h | 5 +- mm/huge_memory.c | 7 +- mm/memcontrol.c | 14 +- mm/memory_hotplug.c | 9 +- mm/migrate.c | 2 +- mm/mmu_notifier.c | 79 +- mm/page_alloc.c | 2 +- mm/pagewalk.c | 70 +- net/802/mrp.c | 4 +- net/batman-adv/distributed-arp-table.c | 13 + net/batman-adv/main.c | 19 +- net/batman-adv/network-coding.c | 8 +- net/batman-adv/originator.c | 16 + net/batman-adv/originator.h | 1 + net/batman-adv/soft-interface.c | 1 + net/batman-adv/translation-table.c | 7 +- net/bridge/netfilter/ebt_log.c | 11 +- net/bridge/netfilter/ebt_ulog.c | 18 +- net/ceph/osd_client.c | 5 +- net/core/iovec.c | 50 -- net/core/sock.c | 12 - net/ipv4/ip_gre.c | 3 +- net/ipv4/ip_output.c | 2 +- net/ipv4/netfilter/ipt_ULOG.c | 13 +- net/ipv4/tcp.c | 29 +- net/ipv4/tcp_input.c | 23 +- net/ipv4/tcp_output.c | 10 +- net/ipv6/ip6_gre.c | 2 + net/ipv6/ip6_output.c | 2 +- net/ipv6/tcp_ipv6.c | 12 + net/ipv6/udp.c | 13 +- net/ipv6/udp_impl.h | 2 + net/ipv6/udplite.c | 2 +- net/ipv6/xfrm6_policy.c | 4 +- net/irda/irlap_frame.c | 2 +- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 61 +- net/mac80211/rate.c | 9 +- net/mac80211/rx.c | 3 + net/mac80211/tkip.c | 4 +- net/mac80211/util.c | 7 + net/netfilter/nf_log.c | 7 +- net/netfilter/nfnetlink_log.c | 6 +- net/netfilter/nfnetlink_queue_core.c | 2 + net/netfilter/xt_LOG.c | 13 +- net/netfilter/xt_NFLOG.c | 3 +- net/netfilter/xt_TCPOPTSTRIP.c | 17 +- net/netlabel/netlabel_domainhash.c | 69 ++ net/sunrpc/auth_gss/auth_gss.c | 62 +- net/sunrpc/netns.h | 4 + net/sunrpc/rpc_pipe.c | 5 + net/sunrpc/sched.c | 8 +- net/wireless/core.c | 17 +- net/wireless/nl80211.c | 4 + net/wireless/sme.c | 3 +- net/wireless/trace.h | 23 +- net/xfrm/xfrm_output.c | 1 + scripts/package/Makefile | 2 +- sound/soc/codecs/cs42l52.c | 8 +- sound/soc/codecs/cs42l52.h | 2 +- sound/soc/codecs/max98090.c | 2 +- sound/soc/codecs/wm5110.c | 4 +- sound/soc/codecs/wm8994.c | 12 +- sound/soc/davinci/davinci-mcasp.c | 7 +- sound/soc/fsl/imx-ssi.c | 6 - sound/soc/kirkwood/kirkwood-i2s.c | 5 - sound/soc/soc-compress.c | 8 +- tools/perf/scripts/python/net_dropmonitor.py | 39 +- tools/testing/selftests/Makefile | 1 - tools/testing/selftests/soft-dirty/Makefile | 10 - tools/testing/selftests/soft-dirty/soft-dirty.c | 114 --- 841 files changed, 9100 insertions(+), 5717 deletions(-) rename Documentation/devicetree/bindings/{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/hdmiddc.txt => video/exynos_hdmiddc.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/hdmiphy.txt => video/exynos_hdmiphy.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/mixer.txt => video/exynos_mixer.txt} (100%) create mode 100644 Documentation/devicetree/bindings/video/simple-framebuffer.txt create mode 100644 Documentation/kernel-per-CPU-kthreads.txt delete mode 100644 arch/avr32/include/asm/numnodes.h delete mode 100644 arch/avr32/include/asm/param.h delete mode 100644 arch/avr32/include/uapi/asm/param.h create mode 100644 arch/mips/include/asm/idle.h rename arch/mips/include/{ => uapi}/asm/kvm.h (100%) create mode 100644 arch/mips/kernel/idle.c create mode 100644 arch/powerpc/include/asm/context_tracking.h create mode 100644 arch/powerpc/sysdev/udbg_memcons.c delete mode 100644 drivers/acpi/csrt.c create mode 100644 drivers/staging/zcache/ramster/ramster-howto.txt create mode 100644 drivers/video/simplefb.c create mode 100644 lib/iovec.c delete mode 100644 tools/testing/selftests/soft-dirty/Makefile delete mode 100644 tools/testing/selftests/soft-dirty/soft-dirty.c

2 1

[alsa-devel] [PATCH 0/6] Convert JZ4740 to dmaengine
by Lars-Peter Clausen 29 May '13

29 May '13

Hi, This series replaces the custom JZ4740 DMA API with a dmaengine driver. This is done in 3 steps: 1) Add a dmaengine driver which wraps the custom JZ4740 DMA API 2) Update all users of the JZ4740 DMA API to use dmaengine instead 3) Remove the custom API and move all direct hardware access to the dmaengine driver. The first two patches in the series also make sure that the clock of the DMA core is enabled. Since the patches in this series depend on each other I'd prefer if they could all go through the DMA tree. - Lars Lars-Peter Clausen (4): dma: Add a jz4740 dmaengine driver MIPS: jz4740: Register jz4740 DMA device ASoC: jz4740: Use the generic dmaengine PCM driver MIPS: jz4740: Remove custom DMA API Maarten ter Huurne (2): MIPS: jz4740: Correct clock gate bit for DMA controller MIPS: jz4740: Acquire and enable DMA controller clock arch/mips/include/asm/mach-jz4740/dma.h | 56 --- arch/mips/include/asm/mach-jz4740/platform.h | 1 + arch/mips/jz4740/Makefile | 2 +- arch/mips/jz4740/board-qi_lb60.c | 1 + arch/mips/jz4740/clock.c | 2 +- arch/mips/jz4740/dma.c | 287 ------------- arch/mips/jz4740/platform.c | 21 + drivers/dma/Kconfig | 6 + drivers/dma/Makefile | 1 + drivers/dma/dma-jz4740.c | 616 +++++++++++++++++++++++++++ sound/soc/jz4740/Kconfig | 1 + sound/soc/jz4740/jz4740-i2s.c | 48 +-- sound/soc/jz4740/jz4740-pcm.c | 310 +------------- sound/soc/jz4740/jz4740-pcm.h | 20 - 14 files changed, 675 insertions(+), 697 deletions(-) delete mode 100644 arch/mips/jz4740/dma.c create mode 100644 drivers/dma/dma-jz4740.c delete mode 100644 sound/soc/jz4740/jz4740-pcm.h -- 1.8.2.1

4 14

[alsa-devel] [PATCH] ASoC: sgtl5000: Fix VAG_POWER enabling/disabling order
by Marek Vasut 28 May '13

28 May '13

The VAG_POWER must be enabled after all other bits in CHIP_ANA_POWER and disabled before any other bit in CHIP_ANA_POWER. See the SGTL5000 datasheet (Table 31, BIT 7, page 42-43). Failing to follow this order will result in ugly loud "POP" noise at the end of playback. To achieve such order, use the _PRE and _POST DAPM widgets to trigger the power_vag_event, where the event type check has to be fixed accordingly as well. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Dong Aisheng <dong.aisheng(a)linaro.org> Cc: Eric Nelson <eric.nelson(a)boundarydevices.com> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/sgtl5000.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 92bbfec..2068c36 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -151,15 +151,15 @@ static int power_vag_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { switch (event) { - case SND_SOC_DAPM_PRE_PMU: + case SND_SOC_DAPM_POST_PMU: snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER, SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP); break; - case SND_SOC_DAPM_POST_PMD: + case SND_SOC_DAPM_PRE_PMD: snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER, SGTL5000_VAG_POWERUP, 0); - msleep(400); + mdelay(400); break; default: break; @@ -217,12 +217,11 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { 0, SGTL5000_CHIP_DIG_POWER, 1, 0), - SND_SOC_DAPM_SUPPLY("VAG_POWER", SGTL5000_CHIP_ANA_POWER, 7, 0, - power_vag_event, - SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), - SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0), SND_SOC_DAPM_DAC("DAC", "Playback", SGTL5000_CHIP_ANA_POWER, 3, 0), + + SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), + SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), }; /* routes for sgtl5000 */ @@ -230,16 +229,13 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = { {"Capture Mux", "LINE_IN", "LINE_IN"}, /* line_in --> adc_mux */ {"Capture Mux", "MIC_IN", "MIC_IN"}, /* mic_in --> adc_mux */ - {"ADC", NULL, "VAG_POWER"}, {"ADC", NULL, "Capture Mux"}, /* adc_mux --> adc */ {"AIFOUT", NULL, "ADC"}, /* adc --> i2s_out */ - {"DAC", NULL, "VAG_POWER"}, {"DAC", NULL, "AIFIN"}, /* i2s-->dac,skip audio mux */ {"Headphone Mux", "DAC", "DAC"}, /* dac --> hp_mux */ {"LO", NULL, "DAC"}, /* dac --> line_out */ - {"LINE_IN", NULL, "VAG_POWER"}, {"Headphone Mux", "LINE_IN", "LINE_IN"},/* line_in --> hp_mux */ {"HP", NULL, "Headphone Mux"}, /* hp_mux --> hp */ -- 1.7.10.4

3 6

[alsa-devel] [PATCH] ASoC: cs42l52: fix default value for MASTERA_VOL.
by Nicolas Schichan 28 May '13

28 May '13

The default register value for MASTERA_VOL is 0x00, the same as MASTERB_VOL. Signed-off-by: Nicolas Schichan <nschichan(a)freebox.fr> --- sound/soc/codecs/cs42l52.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 8465c1fa..030f53c 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -86,7 +86,7 @@ static const struct reg_default cs42l52_reg_defaults[] = { { CS42L52_BEEP_VOL, 0x00 }, /* r1D Beep Volume off Time */ { CS42L52_BEEP_TONE_CTL, 0x00 }, /* r1E Beep Tone Cfg. */ { CS42L52_TONE_CTL, 0x00 }, /* r1F Tone Ctl */ - { CS42L52_MASTERA_VOL, 0x88 }, /* r20 Master A Volume */ + { CS42L52_MASTERA_VOL, 0x00 }, /* r20 Master A Volume */ { CS42L52_MASTERB_VOL, 0x00 }, /* r21 Master B Volume */ { CS42L52_HPA_VOL, 0x00 }, /* r22 Headphone A Volume */ { CS42L52_HPB_VOL, 0x00 }, /* r23 Headphone B Volume */ -- 1.7.10.4

3 2

Re: [alsa-devel] [PATCH] ASoC: fsi: fixup sparse errors
by Mark Brown 28 May '13

28 May '13

On Fri, May 24, 2013 at 12:30:07AM -0700, Kuninori Morimoto wrote: > > ping ? Don't top post and don't send contentless pings.

3 4

[alsa-devel] [PATCH] ASoC: ux500: Ensure consistent configuration between DAIs
by Fabio Baltieri 28 May '13

28 May '13

Current implementation of mop500_ab8500 allows for inconsistent sample rate and channel count configuration between the playback and recording interfaces, through in the hardware the two MSP controllers share common clock and frame sync signals. This patch adds the necessary code to ensure that the two device are configure consistently. The check is added at machine driver level, as how to lock DAI configuration depend of the actual hardware implementation. Signed-off-by: Fabio Baltieri <fabio.baltieri(a)linaro.org> --- sound/soc/ux500/mop500_ab8500.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 5e0f146..7e923ec 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -16,6 +16,7 @@ #include <linux/device.h> #include <linux/io.h> #include <linux/clk.h> +#include <linux/mutex.h> #include <sound/soc.h> #include <sound/soc-dapm.h> @@ -44,6 +45,12 @@ static unsigned int tx_slots = DEF_TX_SLOTS; static unsigned int rx_slots = DEF_RX_SLOTS; +/* Configuration consistency parameters */ +static DEFINE_MUTEX(mop500_ab8500_params_lock); +static unsigned long mop500_ab8500_usage; +static int mop500_ab8500_rate; +static int mop500_ab8500_channels; + /* Clocks */ static const char * const enum_mclk[] = { "SYSCLK", @@ -231,6 +238,21 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream, substream->name, substream->number); + /* Ensure configuration consistency between DAIs */ + mutex_lock(&mop500_ab8500_params_lock); + if (mop500_ab8500_usage) { + if (mop500_ab8500_rate != params_rate(params) || + mop500_ab8500_channels != params_channels(params)) { + mutex_unlock(&mop500_ab8500_params_lock); + return -EBUSY; + } + } else { + mop500_ab8500_rate = params_rate(params); + mop500_ab8500_channels = params_channels(params); + } + __set_bit(cpu_dai->id, &mop500_ab8500_usage); + mutex_unlock(&mop500_ab8500_params_lock); + channels = params_channels(params); switch (params_format(params)) { @@ -329,9 +351,22 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream, return 0; } +static int mop500_ab8500_hw_free(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + + mutex_lock(&mop500_ab8500_params_lock); + __clear_bit(cpu_dai->id, &mop500_ab8500_usage); + mutex_unlock(&mop500_ab8500_params_lock); + + return 0; +} + struct snd_soc_ops mop500_ab8500_ops[] = { { .hw_params = mop500_ab8500_hw_params, + .hw_free = mop500_ab8500_hw_free, .startup = mop500_ab8500_startup, .shutdown = mop500_ab8500_shutdown, } -- 1.8.2

2 1

[alsa-devel] [PATCH] ARM: dts: wm8994: Add wm8994 regulator support on smdk5250.
by Padmavathi Venna 28 May '13

28 May '13

This patch adds the required regulator supplies and properties for wm8994 codec on smdk5250 board. Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> --- arch/arm/boot/dts/exynos5250-smdk5250.dts | 53 +++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index f2a025e..42fc79e 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -37,6 +37,46 @@ }; }; + avdd2:fixed-regulator@0 { + compatible = "regulator-fixed"; + regulator-name = "avdd2-supply"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + cpvdd:fixed-regulator@1 { + compatible = "regulator-fixed"; + regulator-name = "cpvdd-supply"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + dbvdd:fixed-regulator@2 { + compatible = "regulator-fixed"; + regulator-name = "dbvdd-supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + spkvdd1:fixed-regulator@3 { + compatible = "regulator-fixed"; + regulator-name = "spkvdd1-supply"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + spkvdd2:fixed-regulator@4 { + compatible = "regulator-fixed"; + regulator-name = "spkvdd2-supply"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + i2c@12C70000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <20000>; @@ -47,8 +87,17 @@ }; wm8994: wm8994@1a { - compatible = "wlf,wm8994"; - reg = <0x1a>; + compatible = "wlf,wm8994"; + reg = <0x1a>; + + gpio-controller; + #gpio-cells = <2>; + + AVDD2-supply = <&avdd2>; + CPVDD-supply = <&cpvdd>; + DBVDD-supply = <&dbvdd>; + SPKVDD1-supply = <&spkvdd1>; + SPKVDD2-supply = <&spkvdd2>; }; }; -- 1.7.4.4

2 1

[alsa-devel] [PATCH] ASoC: wm8994: use the correct pointer to get the control value
by Vinod Koul 28 May '13

28 May '13

Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/codecs/wm8994.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index f1c54af..49b2b00 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1032,7 +1032,7 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w, { struct snd_soc_codec *codec = w->codec; struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); - struct wm8994 *control = codec->control_data; + struct wm8994 *control = wm8994->wm8994; int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA; int i; int dac; -- 1.7.0.4

2 1

[alsa-devel] [PATCH] ALSA: hda - Enable mic-mute LED on more HP laptops
by Takashi Iwai 28 May '13

28 May '13

The newer HP laptops have SSID 103c:20xx and 103c:21xx, and these usually have the mic-mute LED on Fn-F8. Let's enable it, too. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_sigmatel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 1d9d642..9b6cb27 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -2233,6 +2233,10 @@ static const struct snd_pci_quirk stac92hd83xxx_fixup_tbl[] = { "HP Folio", STAC_92HD83XXX_HP_MIC_LED), SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x1900, "HP", STAC_92HD83XXX_HP_MIC_LED), + SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x2000, + "HP", STAC_92HD83XXX_HP_MIC_LED), + SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x2100, + "HP", STAC_92HD83XXX_HP_MIC_LED), SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3388, "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD), SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3389, -- 1.8.2.3

1 0

[alsa-devel] [PATCH V3 0/4] clk: Samsung: audss: Register audio subsytem clocks using common clk framework
by Padmavathi Venna 28 May '13

28 May '13

Samsung S5PV210 and Exynos SoC has a separate subsystem for audio. This subsystem has a internal clock controller which controls i2s0 and pcm0 clocks. This patch series adds the Samsung audio subsytem clock to the common clock framework and provides the I2S controllers clock information in the dtsi file. This patch series is made based on Kukjin Kim for-next branch Changes since V2: - Removed s5pv210 compatible name from driver as it is not yet supported which is different from Exynos series audio subsystem clock conroller. - Removed clkdev lookup support and added alias names in the i2s0 controller node. Changes since V1: - Reworked on all review comments by Sylwester Nawrocki - Added a header file for all clock indexes as requested by Sylwester - Added different compatible names for s5pv210, exynos4 and exynos5 - Registered the pcm clocks with common clock framework Padmavathi Venna (4): ARM: samsung: use #include for all device trees clk: samsung: register audio subsystem clocks using common clock framework ARM: dts: add Exynos audio subsystem clock controller node ARM: dts: add clock provider information for i2s controllers in Exynos5250 .../bindings/clock/clk-samsung-audss.txt | 64 ++++++++++ arch/arm/boot/dts/exynos4.dtsi | 2 +- arch/arm/boot/dts/exynos4210-origen.dts | 2 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4210-trats.dts | 2 +- arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- arch/arm/boot/dts/exynos4210.dtsi | 4 +- arch/arm/boot/dts/exynos4212.dtsi | 2 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/exynos4412.dtsi | 2 +- arch/arm/boot/dts/exynos4x12.dtsi | 4 +- arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- arch/arm/boot/dts/exynos5250-snow.dts | 4 +- arch/arm/boot/dts/exynos5250.dtsi | 23 +++- arch/arm/boot/dts/exynos5440-sd5v1.dts | 2 +- arch/arm/boot/dts/exynos5440-ssdk5440.dts | 2 +- arch/arm/boot/dts/exynos5440.dtsi | 2 +- arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +- arch/arm/boot/dts/s3c2416.dtsi | 4 +- arch/arm/boot/dts/s3c24xx.dtsi | 2 +- drivers/clk/samsung/Makefile | 1 + drivers/clk/samsung/clk-samsung-audss.c | 133 ++++++++++++++++++++ include/dt-bindings/clk/samsung-audss-clk.h | 25 ++++ 26 files changed, 269 insertions(+), 27 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/clk-samsung-audss.txt create mode 100644 drivers/clk/samsung/clk-samsung-audss.c create mode 100644 include/dt-bindings/clk/samsung-audss-clk.h -- 1.7.4.4

1 4

[alsa-devel] Problem opening default device in haswell system using aplay
by Stefano Panella 28 May '13

28 May '13

Hi everyone, sorry if this email has been sent twice... ( I sent it once before subscribing) I am working on some haswell systems running Ubuntu 12.04 and I have a problem if I run aplay -D sysdefault. when I do: cat /proc/asound/pcm I get: 00-03: HDMI 0 : HDMI 0 : playback 1 00-07: HDMI 1 : HDMI 1 : playback 1 00-08: HDMI 2 : HDMI 2 : playback 1 01-00: ALC662 rev3 Analog : ALC662 rev3 Analog : playback 1 : capture 1 01-02: ALC662 rev3 Analog : ALC662 rev3 Analog : capture 1 If I do: aplay -L | grep sysdefault I get: sysdefault:CARD=PCH where PCH is card number 1 (id = 1) on most of my systems (non haswell laptops) the default card is number 0 If I run aplay -D sysdefault I get: ALSA lib pcm_dmix.c:1018:(snd_pcm_dmix_open) unable to open slave aplay: main:682: audio open error: No such file or directory if I strace it I get: open("/dev/snd/pcmC0D0p", O_RDWR|O_NONBLOCK|O_CLOEXEC) = -1 ENOENT (No such file or directory) If I run: aplay -D hw:PCH,0 all works fine... Any idea why hw:PCH,0 works and sysdefault does not? I guess there could be a problem in the mapping of devices in hw systems? Has anybody else observed a similar issue? Or has this been a problem in the past already fixed upstream? If so, where was it fixed (kernel, lib, tools, utils, etc.) ? Thanks for all your help on this. In case this is a real problem I am willing to help debugging it and submit patches. Stefano

3 4

[alsa-devel] [PATCH] Remove an obsolete macro in configure.in
by olivier＠trillion01.com 28 May '13

28 May '13

From: Olivier Langlois <olivier(a)trillion01.com> Replaced AM_CONFIG_HEADER with AC_CONFIG_HEADERS lano1106@whippet2 ~/dev/alsa-lib $ ./gitcompile aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' configure.in:56: error: 'AM_CONFIG_HEADER': this macro is obsolete. You should use the 'AC_CONFIG_HEADERS' macro instead. /usr/share/aclocal-1.13/obsolete-err.m4:12: AM_CONFIG_HEADER is expanded from... configure.in:56: the top level autom4te: /usr/bin/m4 failed with exit status: 1 aclocal: error: echo failed with exit status: 1 Signed-off-by: Olivier Langlois <olivier(a)trillion01.com> diff --git a/configure.in b/configure.in index ed3fe04..207e154 100644 --- a/configure.in +++ b/configure.in @@ -53,7 +53,7 @@ CC_NOUNDEFINED dnl Checks for header files. AC_HEADER_STDC -AM_CONFIG_HEADER(include/config.h) +AC_CONFIG_HEADERS(include/config.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -- 1.8.2.3

4 5

[alsa-devel] [PATCH] ASoC: wm8994: Ensure lambda is zeroed for WM8994
by Mark Brown 27 May '13

27 May '13

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 5f51127..f5eb644 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1,3 +1,4 @@ +#define DEBUG /* * wm8994.c -- WM8994 ALSA SoC Audio driver * @@ -2078,6 +2079,7 @@ static int wm8994_get_fll_config(struct wm8994 *control, struct fll_div *fll, /* Move down to proper range now rounding is done */ fll->k = K / 10; + fll->lambda = 0; pr_debug("N=%x K=%x\n", fll->n, fll->k); break; @@ -3129,9 +3131,7 @@ static int wm8994_codec_suspend(struct snd_soc_codec *codec) static int wm8994_codec_resume(struct snd_soc_codec *codec) { struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); - struct wm8994 *control = wm8994->wm8994; int i, ret; - unsigned int val, mask; for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) { if (!wm8994->fll_suspend[i].out) @@ -3986,7 +3986,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) case 0: case 1: wm8994->hubs.no_series_update = 1; - wm8994->hubs.no_runtime_dcs = true; + //wm8994->hubs.no_runtime_dcs = true; break; default: break; -- 1.7.10.4

2 1

[alsa-devel] [PATCH] ASoC: bells: Hookup DMICs for Bells
by Charles Keepax 27 May '13

27 May '13

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/samsung/bells.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index ceed466..29e2468 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -350,8 +350,16 @@ static struct snd_soc_codec_conf bells_codec_conf[] = { }, }; +static struct snd_soc_dapm_widget bells_widgets[] = { + SND_SOC_DAPM_MIC("DMIC", NULL), +}; + static struct snd_soc_dapm_route bells_routes[] = { { "Sub CLK_SYS", NULL, "OPCLK" }, + + { "DMIC", NULL, "MICBIAS2" }, + { "IN2L", NULL, "DMIC" }, + { "IN2R", NULL, "DMIC" }, }; static struct snd_soc_card bells_cards[] = { @@ -365,6 +373,8 @@ static struct snd_soc_card bells_cards[] = { .late_probe = bells_late_probe, + .dapm_widgets = bells_widgets, + .num_dapm_widgets = ARRAY_SIZE(bells_widgets), .dapm_routes = bells_routes, .num_dapm_routes = ARRAY_SIZE(bells_routes), @@ -383,6 +393,8 @@ static struct snd_soc_card bells_cards[] = { .late_probe = bells_late_probe, + .dapm_widgets = bells_widgets, + .num_dapm_widgets = ARRAY_SIZE(bells_widgets), .dapm_routes = bells_routes, .num_dapm_routes = ARRAY_SIZE(bells_routes), @@ -401,6 +413,8 @@ static struct snd_soc_card bells_cards[] = { .late_probe = bells_late_probe, + .dapm_widgets = bells_widgets, + .num_dapm_widgets = ARRAY_SIZE(bells_widgets), .dapm_routes = bells_routes, .num_dapm_routes = ARRAY_SIZE(bells_routes), -- 1.7.2.5

2 1

[alsa-devel] [PATCH] ASoC: wm8994: Fix reporting of accessory removal on WM8958
by Mark Brown 27 May '13

27 May '13

During recent refactoring the code to report removal when MICDET reports an absent microphone was removed, causing problems for systems which rely solely on the MICDET for this functionality. Restore it. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 0bcbd12..5f51127 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3856,6 +3856,11 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) dev_dbg(codec->dev, "Ignoring removed jack\n"); return IRQ_HANDLED; } + } else if (!(reg & WM8958_MICD_STS)) { + snd_soc_jack_report(wm8994->micdet[0].jack, 0, + SND_JACK_MECHANICAL | SND_JACK_HEADSET | + wm8994->btn_mask); + goto out; } if (wm8994->mic_detecting) -- 1.7.10.4

1 0

[alsa-devel] Haswell: Ensuring HDA codec pins refer to physical outputs
by David Henningsson 27 May '13

27 May '13

Hi, I want to take this problem up again, because it's important we get this right. The HDA driver assumes that a codec pin widget node always refers to the same physical output. With Haswell, it seems like this is not guaranteed to be true. I would like to see this fixed on the graphics side. If not, I don't know how to work around it on the audio side. The problems that occur on the audio side are: 1) Some BIOSes set default pin config. E g, if the machine has a single HDMI out, it can set two of the codec pins to "not connected" and let the third remain "jack". As a result, the HDA driver will ignore the two codec pins and only enable the third. As such, HDMI audio will not work correctly, unless it's the third codec pin that is connected to the physical output. 2) Saving and restoring mutes, volumes etc is done on a per-pin basis. E g, imagine that a user has a dual monitor setup and always wants audio output from the left side monitor, and keep the right side monitor silent. If it is not reliable which codec pin refers to which physical output, one day suddenly the sound might come out on the right side monitor instead. -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic

2 2

[alsa-devel] [PATCH] alsactl init: ca0106 file was omitted
by Gabriel M. Beddingfield 27 May '13

27 May '13

The file alsactl/init/00main includes the line: CARDINFO{driver}=="CA0106", INCLUDE="ca0106", GOTO="init_end" However, the file alsactl/init/ca0106 is not making it into the release tarballs (nor to user installations). This patch adds the ca0106 file to the build. Signed-off-by: Gabriel M. Beddingfield <gabrbedd(a)gmail.com> --- CAVEAT EMPTOR: I found this issue while helping someone in the #alsa channel. I have no way to test this patch. alsactl/init/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsactl/init/Makefile.am b/alsactl/init/Makefile.am index 9e2b83d..64dac41 100644 --- a/alsactl/init/Makefile.am +++ b/alsactl/init/Makefile.am @@ -1,7 +1,7 @@ init_files = \ 00main default help info test \ - hda + hda ca0106 EXTRA_DIST = $(init_files) alsainitdir = $(datadir)/alsa/init alsainit_DATA = $(init_files) -- 1.7.9.5

2 1

[alsa-devel] [PATCH: TinyCompress 1/2] add utils file with rate conversion helper
by Vinod Koul 26 May '13

26 May '13

Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- Android.mk | 2 +- include/tinycompress/tinycompress.h | 2 + makefile.linux | 2 +- utils.c | 96 +++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 utils.c diff --git a/Android.mk b/Android.mk index b9c52e2..104dfef 100644 --- a/Android.mk +++ b/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_C_INCLUDES:= $(LOCAL_PATH)/include -LOCAL_SRC_FILES:= compress.c +LOCAL_SRC_FILES:= compress.c utils.c LOCAL_MODULE := libtinycompress LOCAL_SHARED_LIBRARIES:= libcutils libutils LOCAL_MODULE_TAGS := optional diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h index 9867afc..e947322 100644 --- a/include/tinycompress/tinycompress.h +++ b/include/tinycompress/tinycompress.h @@ -267,4 +267,6 @@ const char *compress_get_error(struct compress *compress); #define SNDRV_PCM_RATE_176400 (1<<11) /* 176400Hz */ #define SNDRV_PCM_RATE_192000 (1<<12) /* 192000Hz */ +/* utility functions */ +unsigned int compress_get_alsa_rate(unsigned int rate); #endif diff --git a/makefile.linux b/makefile.linux index 60d6c04..677878d 100644 --- a/makefile.linux +++ b/makefile.linux @@ -2,7 +2,7 @@ LIB = libtinycompress BIN = cplay VER = 0.1 LIBSRC = compress.c -SRC = cplay.c +SRC = cplay.c utils.c LIBOBJ = ${LIBSRC:.c=.o} OBJ = ${SRC:.c=.o} diff --git a/utils.c b/utils.c new file mode 100644 index 0000000..fa37f23 --- /dev/null +++ b/utils.c @@ -0,0 +1,96 @@ +/* + * BSD LICENSE + * + * tinycompress utility functions + * Copyright (c) 2011-2013, Intel Corporation + * All rights reserved. + * + * Author: Vinod Koul <vinod.koul(a)intel.com> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * + * LGPL LICENSE + * + * tinycompress utility functions + * Copyright (c) 2011-2013, Intel Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU Lesser General Public License, + * version 2.1, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to + * the Free Software Foundation, Inc., + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + */ +#include <stdio.h> +#include <stdlib.h> +#include <stdbool.h> +#include <linux/types.h> +#include <sys/time.h> +#define __force +#define __bitwise +#define __user +#include "tinycompress/tinycompress.h" + + +unsigned int compress_get_alsa_rate(unsigned int rate) +{ + switch (rate) { + case 5512: + return SNDRV_PCM_RATE_5512; + case 8000: + return SNDRV_PCM_RATE_8000; + case 11025: + return SNDRV_PCM_RATE_11025; + case 16000: + return SNDRV_PCM_RATE_16000; + case 220500: + return SNDRV_PCM_RATE_22050; + case 32000: + return SNDRV_PCM_RATE_32000; + case 44100: + return SNDRV_PCM_RATE_44100; + case 48000: + return SNDRV_PCM_RATE_48000; + case 64000: + return SNDRV_PCM_RATE_64000; + case 88200: + return SNDRV_PCM_RATE_88200; + case 96000: + return SNDRV_PCM_RATE_96000; + case 176400: + return SNDRV_PCM_RATE_176400; + case 192000: + return SNDRV_PCM_RATE_192000; + default: + return 0; + } +} -- 1.7.0.4

1 2

[alsa-devel] [PATCH: TinyCompress] fix error reporting in tinycompress
by Vinod Koul 26 May '13

26 May '13

From: Lakshmi N Vinnakota <lakshmi.n.vinnakota(a)intel.com> The compress API are expected to return a negative value on an error with errno indicating the type of error. But in some cases, this is not happening. The fix is the oops function always returns -1 and the actual error number is determined by the global variable errno. Signed-off-by: Lakshmi N Vinnakota <lakshmi.n.vinnakota(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- compress.c | 61 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/compress.c b/compress.c index 8753758..7f56c78 100644 --- a/compress.c +++ b/compress.c @@ -102,10 +102,11 @@ static int oops(struct compress *compress, int e, const char *fmt, ...) va_end(ap); sz = strlen(compress->error); - if (errno) - snprintf(compress->error + sz, COMPR_ERR_MAX - sz, - ": %s", strerror(e)); - return e; + snprintf(compress->error + sz, COMPR_ERR_MAX - sz, + ": %s", strerror(e)); + errno = e; + + return -1; } const char *compress_get_error(struct compress *compress) @@ -151,27 +152,27 @@ static bool _is_codec_supported(struct compress *compress, struct compr_config * } } if (codec == false) { - oops(compress, -ENXIO, "this codec is not supported"); + oops(compress, ENXIO, "this codec is not supported"); return false; } if (config->fragment_size < caps->min_fragment_size) { - oops(compress, -EINVAL, "requested fragment size %d is below min supported %d", + oops(compress, EINVAL, "requested fragment size %d is below min supported %d", config->fragment_size, caps->min_fragment_size); return false; } if (config->fragment_size > caps->max_fragment_size) { - oops(compress, -EINVAL, "requested fragment size %d is above max supported %d", + oops(compress, EINVAL, "requested fragment size %d is above max supported %d", config->fragment_size, caps->max_fragment_size); return false; } if (config->fragments < caps->min_fragments) { - oops(compress, -EINVAL, "requested fragments %d are below min supported %d", + oops(compress, EINVAL, "requested fragments %d are below min supported %d", config->fragments, caps->min_fragments); return false; } if (config->fragments > caps->max_fragments) { - oops(compress, -EINVAL, "requested fragments %d are above max supported %d", + oops(compress, EINVAL, "requested fragments %d are above max supported %d", config->fragments, caps->max_fragments); return false; } @@ -219,7 +220,7 @@ struct compress *compress_open(unsigned int card, unsigned int device, char fn[256]; if (!config) { - oops(&bad_compress, -EINVAL, "passed bad config"); + oops(&bad_compress, EINVAL, "passed bad config"); return &bad_compress; } @@ -242,7 +243,7 @@ struct compress *compress_open(unsigned int card, unsigned int device, compress->flags = flags; if (!((flags & COMPRESS_OUT) || (flags & COMPRESS_IN))) { - oops(&bad_compress, -EINVAL, "can't deduce device direction from given flags"); + oops(&bad_compress, EINVAL, "can't deduce device direction from given flags"); goto config_fail; } @@ -315,12 +316,12 @@ int compress_get_hpointer(struct compress *compress, __u64 time; if (!is_compress_ready(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (ioctl(compress->fd, SNDRV_COMPRESS_AVAIL, &kavail)) return oops(compress, errno, "cannot get avail"); if (0 == kavail.tstamp.sampling_rate) - return oops(compress, -ENODATA, "sample rate unknown"); + return oops(compress, ENODATA, "sample rate unknown"); *avail = (unsigned int)kavail.avail; time = kavail.tstamp.pcm_io_frames / kavail.tstamp.sampling_rate; tstamp->tv_sec = time; @@ -335,7 +336,7 @@ int compress_get_tstamp(struct compress *compress, struct snd_compr_tstamp ktstamp; if (!is_compress_ready(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (ioctl(compress->fd, SNDRV_COMPRESS_TSTAMP, &ktstamp)) return oops(compress, errno, "cannot get tstamp"); @@ -355,9 +356,9 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size const unsigned int frag_size = compress->config->fragment_size; if (!(compress->flags & COMPRESS_IN)) - return oops(compress, -EINVAL, "Invalid flag set"); + return oops(compress, EINVAL, "Invalid flag set"); if (!is_compress_ready(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); fds.fd = compress->fd; fds.events = POLLOUT; @@ -383,7 +384,7 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size continue; } if (fds.revents & POLLERR) { - return oops(compress, -EIO, "poll returned error!"); + return oops(compress, EIO, "poll returned error!"); } } /* write avail bytes */ @@ -415,9 +416,9 @@ int compress_read(struct compress *compress, void *buf, unsigned int size) const unsigned int frag_size = compress->config->fragment_size; if (!(compress->flags & COMPRESS_OUT)) - return oops(compress, -EINVAL, "Invalid flag set"); + return oops(compress, EINVAL, "Invalid flag set"); if (!is_compress_ready(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); fds.fd = compress->fd; fds.events = POLLIN; @@ -440,7 +441,7 @@ int compress_read(struct compress *compress, void *buf, unsigned int size) continue; } if (fds.revents & POLLERR) { - return oops(compress, -EIO, "poll returned error!"); + return oops(compress, EIO, "poll returned error!"); } } /* read avail bytes */ @@ -466,7 +467,7 @@ int compress_read(struct compress *compress, void *buf, unsigned int size) int compress_start(struct compress *compress) { if (!is_compress_ready(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (ioctl(compress->fd, SNDRV_COMPRESS_START)) return oops(compress, errno, "cannot start the stream"); compress->running = 1; @@ -477,7 +478,7 @@ int compress_start(struct compress *compress) int compress_stop(struct compress *compress) { if (!is_compress_running(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (ioctl(compress->fd, SNDRV_COMPRESS_STOP)) return oops(compress, errno, "cannot stop the stream"); return 0; @@ -486,7 +487,7 @@ int compress_stop(struct compress *compress) int compress_pause(struct compress *compress) { if (!is_compress_running(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (ioctl(compress->fd, SNDRV_COMPRESS_PAUSE)) return oops(compress, errno, "cannot pause the stream"); return 0; @@ -502,7 +503,7 @@ int compress_resume(struct compress *compress) int compress_drain(struct compress *compress) { if (!is_compress_running(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (ioctl(compress->fd, SNDRV_COMPRESS_DRAIN)) return oops(compress, errno, "cannot drain the stream"); return 0; @@ -511,10 +512,10 @@ int compress_drain(struct compress *compress) int compress_partial_drain(struct compress *compress) { if (!is_compress_running(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (!compress->next_track) - return oops(compress, -EPERM, "next track not signalled"); + return oops(compress, EPERM, "next track not signalled"); if (ioctl(compress->fd, SNDRV_COMPRESS_PARTIAL_DRAIN)) return oops(compress, errno, "cannot drain the stream\n"); compress->next_track = 0; @@ -524,10 +525,10 @@ int compress_partial_drain(struct compress *compress) int compress_next_track(struct compress *compress) { if (!is_compress_running(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); if (!compress->gapless_metadata) - return oops(compress, -EPERM, "metadata not set"); + return oops(compress, EPERM, "metadata not set"); if (ioctl(compress->fd, SNDRV_COMPRESS_NEXT_TRACK)) return oops(compress, errno, "cannot set next track\n"); compress->next_track = 1; @@ -542,14 +543,14 @@ int compress_set_gapless_metadata(struct compress *compress, int version; if (!is_compress_ready(compress)) - return oops(compress, -ENODEV, "device not ready"); + return oops(compress, ENODEV, "device not ready"); version = get_compress_version(compress); if (version <= 0) return -1; if (version < SNDRV_PROTOCOL_VERSION(0, 1, 1)) - return oops(compress, -ENXIO, "gapless apis not supported in kernel"); + return oops(compress, ENXIO, "gapless apis not supported in kernel"); metadata.key = SNDRV_COMPRESS_ENCODER_PADDING; metadata.value[0] = mdata->encoder_padding; -- 1.7.0.4

1 1

[alsa-devel] How to specify data format if playback/capture were different ?
by Kuninori Morimoto 25 May '13

25 May '13

Hi Mark, and ALSA ML Now, I'm creating ak4554 AD/DA. My question is about data format. If my understand is correct, we can specify cpu/codec deivce data format by using snd_soc_dai_set_fmt(dai, SND_SOC_DAIFMT_xxx); But, ak4554 case, data formats are playback : SND_SOC_DAIFMT_RIGHT_J capture : SND_SOC_DAIFMT_LEFT_J and, it can't exchange this data format. CPU driver should set these information for ak4554 when playback/capture. Then, how to specify these data format on ALSA SoC ? Best regards --- Kuninori Morimoto

3 8

[alsa-devel] [PATCH 0/6] More code cleanup for ASoC ux500
by Fabio Baltieri 25 May '13

25 May '13

Hi Mark, this series contains more various code cleanup patches that I put together while working on other stuff this drivers. The first patch is actually a resend, as Linus Walleij agreed to drop that code in the original thread (https://lkml.org/lkml/2013/5/17/487). The others are just a bunch of sparse fixes and generic code cleanup and dead code removal. Thanks, Fabio Fabio Baltieri (6): ASoC: ux500: Drop pinctrl sleep support ASoC: ab8500-codec: Move codec ops on a separate structure ASoC: ux500: Drop dangling struct i2s_controller ASoC: ux500: Drop unused code from msp headers ASoC: ux500: Add missing mop500_ab8500.h include ASoC: ux500: Drop redundant msp id enumerations sound/soc/codecs/ab8500-codec.c | 19 ++++------- sound/soc/ux500/mop500_ab8500.c | 1 + sound/soc/ux500/ux500_msp_dai.h | 2 -- sound/soc/ux500/ux500_msp_i2s.c | 75 ++--------------------------------------- sound/soc/ux500/ux500_msp_i2s.h | 59 ++------------------------------ 5 files changed, 12 insertions(+), 144 deletions(-) -- 1.8.2

3 9

[alsa-devel] hdmi output (switching sample format/rates)
by Sander Jansen 25 May '13

25 May '13

In my audio application when I sometimes need to switch to a different sample format and/or rate, I usually leave the audio device open and merely reconfigure the device to the new parameters. This works with all the regular pcm devices, but it fails when I use the "hdmi" device. It seemed to just silently fail and no audio output is heard. As far as I know, no error condition is triggered (but I'll admit, my knowledge of the alsa api is rather limited). My question, Is this a bug or is it supposed to work this way and if so are there ways to detect whether a devices needs to be reopened or not. Thanks, Sander

2 2

[alsa-devel] [PATCH v2] ASoC: codecs: adau1701: add DT bindings
by Daniel Mack 25 May '13

25 May '13

Apart from pure matching, the bindings also support setting the the reset gpio line. Signed-off-by: Daniel Mack <zonque(a)gmail.com> --- Lars, thanks for the quick review. Here's v2 of that patch. .../devicetree/bindings/sound/adi,adau1701.txt | 23 ++++++++++++++ sound/soc/codecs/adau1701.c | 35 +++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt diff --git a/Documentation/devicetree/bindings/sound/adi,adau1701.txt b/Documentation/devicetree/bindings/sound/adi,adau1701.txt new file mode 100644 index 0000000..3afeda7 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/adi,adau1701.txt @@ -0,0 +1,23 @@ +Analog Devices ADAU1701 + +Required properties: + + - compatible: Should contain "adi,adau1701" + - reg: The i2c address. Value depends on the state of ADDR0 + and ADDR1, as wired in hardware. + +Optional properties: + + - reset-gpio: A GPIO spec to define which pin is connected to the + chip's !RESET pin. If specified, the driver will + assert a hardware reset at probe time. + +Examples: + + i2c_bus { + adau1701@34 { + compatible = "adi,adau1701"; + reg = <0x34>; + reset-gpio = <&gpio 23 0>; + }; + }; diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index 95e1677..3fc1763 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -13,6 +13,9 @@ #include <linux/i2c.h> #include <linux/delay.h> #include <linux/slab.h> +#include <linux/of.h> +#include <linux/of_gpio.h> +#include <linux/of_device.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -452,6 +455,14 @@ static struct snd_soc_dai_driver adau1701_dai = { .symmetric_rates = 1, }; +#ifdef CONFIG_OF +static const struct of_device_id adau1701_dt_ids[] = { + { .compatible = "adi,adau1701", }, + { } +}; +MODULE_DEVICE_TABLE(of, adau1701_dt_ids); +#endif + static int adau1701_probe(struct snd_soc_codec *codec) { int ret; @@ -494,12 +505,33 @@ static int adau1701_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct adau1701 *adau1701; + struct device *dev = &client->dev; + int gpio_nreset = -EINVAL; int ret; - adau1701 = devm_kzalloc(&client->dev, sizeof(*adau1701), GFP_KERNEL); + adau1701 = devm_kzalloc(dev, sizeof(*adau1701), GFP_KERNEL); if (!adau1701) return -ENOMEM; + if (dev->of_node) { + gpio_nreset = of_get_named_gpio(dev->of_node, "reset-gpio", 0); + if (gpio_nreset < 0 && gpio_nreset != -ENOENT) + return gpio_nreset; + } + + if (gpio_is_valid(gpio_nreset)) { + ret = devm_gpio_request_one(dev, gpio_nreset, GPIOF_OUT_INIT_LOW, + "ADAU1701 Reset"); + if (ret < 0) + return ret; + + /* minimum reset time is 20ns */ + udelay(1); + gpio_set_value(gpio_nreset, 1); + /* power-up time may be as long as 85ms */ + mdelay(85); + } + i2c_set_clientdata(client, adau1701); ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv, &adau1701_dai, 1); @@ -522,6 +554,7 @@ static struct i2c_driver adau1701_i2c_driver = { .driver = { .name = "adau1701", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(adau1701_dt_ids), }, .probe = adau1701_i2c_probe, .remove = adau1701_i2c_remove, -- 1.8.1.4

3 2

[alsa-devel] [PATCH v2] ASoC: Add ssm2518 support
by Lars-Peter Clausen 25 May '13

25 May '13

This patch adds a ASoC CODEC driver for the SSM2516. The SSM2516 is a stereo Class-D audio amplifier with an I2S interface for audio in and a built-in dynamic range control processor. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- Changes since v1: * Power off the codec in the I2C probe function * Allow a sysclk of 0 which won't but any constraints on the supported sample rates. This can be used by systems which are able to change the sysclk on demand. * Remove {} around multi-line single statements --- .../devicetree/bindings/sound/ssm2518.txt | 20 + include/linux/platform_data/ssm2518.h | 22 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ssm2518.c | 856 +++++++++++++++++++++ sound/soc/codecs/ssm2518.h | 20 + 6 files changed, 924 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt create mode 100644 include/linux/platform_data/ssm2518.h create mode 100644 sound/soc/codecs/ssm2518.c create mode 100644 sound/soc/codecs/ssm2518.h diff --git a/Documentation/devicetree/bindings/sound/ssm2518.txt b/Documentation/devicetree/bindings/sound/ssm2518.txt new file mode 100644 index 0000000..59381a7 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ssm2518.txt @@ -0,0 +1,20 @@ +SSM2518 audio amplifier + +This device supports I2C only. + +Required properties: + - compatible : Must be "adi,ssm2518" + - reg : the I2C address of the device. This will either be 0x34 (ADDR pin low) + or 0x35 (ADDR pin high) + +Optional properties: + - gpios : GPIO connected to the nSD pin. If the property is not present it is + assumed that the nSD pin is hardwired to always on. + +Example: + + ssm2518: ssm2518@34 { + compatible = "adi,ssm2518"; + reg = <0x34>; + gpios = <&gpio 5 0>; + }; diff --git a/include/linux/platform_data/ssm2518.h b/include/linux/platform_data/ssm2518.h new file mode 100644 index 0000000..9a8e3ea --- /dev/null +++ b/include/linux/platform_data/ssm2518.h @@ -0,0 +1,22 @@ +/* + * SSM2518 amplifier audio driver + * + * Copyright 2013 Analog Devices Inc. + * Author: Lars-Peter Clausen <lars(a)metafoo.de> + * + * Licensed under the GPL-2. + */ + +#ifndef __LINUX_PLATFORM_DATA_SSM2518_H__ +#define __LINUX_PLATFORM_DATA_SSM2518_H__ + +/** + * struct ssm2518_platform_data - Platform data for the ssm2518 driver + * @enable_gpio: GPIO connected to the nSD pin. Set to -1 if the nSD pin is + * hardwired. + */ +struct ssm2518_platform_data { + int enable_gpio; +}; + +#endif diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2f45f00..d76609a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -60,6 +60,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_SI476X if MFD_SI476X_CORE select SND_SOC_SN95031 if INTEL_SCU_IPC select SND_SOC_SPDIF + select SND_SOC_SSM2518 if I2C select SND_SOC_SSM2602 if SND_SOC_I2C_AND_SPI select SND_SOC_STA32X if I2C select SND_SOC_STA529 if I2C @@ -313,6 +314,9 @@ config SND_SOC_SN95031 config SND_SOC_SPDIF tristate +config SND_SOC_SSM2518 + tristate + config SND_SOC_SSM2602 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index dae0aa6..7204c24 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -52,6 +52,7 @@ snd-soc-si476x-objs := si476x.o snd-soc-sn95031-objs := sn95031.o snd-soc-spdif-tx-objs := spdif_transmitter.o snd-soc-spdif-rx-objs := spdif_receiver.o +snd-soc-ssm2518-objs := ssm2518.o snd-soc-ssm2602-objs := ssm2602.o snd-soc-sta32x-objs := sta32x.o snd-soc-sta529-objs := sta529.o @@ -176,6 +177,7 @@ obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o obj-$(CONFIG_SND_SOC_SI476X) += snd-soc-si476x.o obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif-rx.o snd-soc-spdif-tx.o +obj-$(CONFIG_SND_SOC_SSM2518) += snd-soc-ssm2518.o obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o obj-$(CONFIG_SND_SOC_STA32X) += snd-soc-sta32x.o obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c new file mode 100644 index 0000000..3139a1b --- /dev/null +++ b/sound/soc/codecs/ssm2518.c @@ -0,0 +1,856 @@ +/* + * SSM2518 amplifier audio driver + * + * Copyright 2013 Analog Devices Inc. + * Author: Lars-Peter Clausen <lars(a)metafoo.de> + * + * Licensed under the GPL-2. + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/i2c.h> +#include <linux/regmap.h> +#include <linux/slab.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <linux/platform_data/ssm2518.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/initval.h> +#include <sound/tlv.h> + +#include "ssm2518.h" + +#define SSM2518_REG_POWER1 0x00 +#define SSM2518_REG_CLOCK 0x01 +#define SSM2518_REG_SAI_CTRL1 0x02 +#define SSM2518_REG_SAI_CTRL2 0x03 +#define SSM2518_REG_CHAN_MAP 0x04 +#define SSM2518_REG_LEFT_VOL 0x05 +#define SSM2518_REG_RIGHT_VOL 0x06 +#define SSM2518_REG_MUTE_CTRL 0x07 +#define SSM2518_REG_FAULT_CTRL 0x08 +#define SSM2518_REG_POWER2 0x09 +#define SSM2518_REG_DRC_1 0x0a +#define SSM2518_REG_DRC_2 0x0b +#define SSM2518_REG_DRC_3 0x0c +#define SSM2518_REG_DRC_4 0x0d +#define SSM2518_REG_DRC_5 0x0e +#define SSM2518_REG_DRC_6 0x0f +#define SSM2518_REG_DRC_7 0x10 +#define SSM2518_REG_DRC_8 0x11 +#define SSM2518_REG_DRC_9 0x12 + +#define SSM2518_POWER1_RESET BIT(7) +#define SSM2518_POWER1_NO_BCLK BIT(5) +#define SSM2518_POWER1_MCS_MASK (0xf << 1) +#define SSM2518_POWER1_MCS_64FS (0x0 << 1) +#define SSM2518_POWER1_MCS_128FS (0x1 << 1) +#define SSM2518_POWER1_MCS_256FS (0x2 << 1) +#define SSM2518_POWER1_MCS_384FS (0x3 << 1) +#define SSM2518_POWER1_MCS_512FS (0x4 << 1) +#define SSM2518_POWER1_MCS_768FS (0x5 << 1) +#define SSM2518_POWER1_MCS_100FS (0x6 << 1) +#define SSM2518_POWER1_MCS_200FS (0x7 << 1) +#define SSM2518_POWER1_MCS_400FS (0x8 << 1) +#define SSM2518_POWER1_SPWDN BIT(0) + +#define SSM2518_CLOCK_ASR BIT(0) + +#define SSM2518_SAI_CTRL1_FMT_MASK (0x3 << 5) +#define SSM2518_SAI_CTRL1_FMT_I2S (0x0 << 5) +#define SSM2518_SAI_CTRL1_FMT_LJ (0x1 << 5) +#define SSM2518_SAI_CTRL1_FMT_RJ_24BIT (0x2 << 5) +#define SSM2518_SAI_CTRL1_FMT_RJ_16BIT (0x3 << 5) + +#define SSM2518_SAI_CTRL1_SAI_MASK (0x7 << 2) +#define SSM2518_SAI_CTRL1_SAI_I2S (0x0 << 2) +#define SSM2518_SAI_CTRL1_SAI_TDM_2 (0x1 << 2) +#define SSM2518_SAI_CTRL1_SAI_TDM_4 (0x2 << 2) +#define SSM2518_SAI_CTRL1_SAI_TDM_8 (0x3 << 2) +#define SSM2518_SAI_CTRL1_SAI_TDM_16 (0x4 << 2) +#define SSM2518_SAI_CTRL1_SAI_MONO (0x5 << 2) + +#define SSM2518_SAI_CTRL1_FS_MASK (0x3) +#define SSM2518_SAI_CTRL1_FS_8000_12000 (0x0) +#define SSM2518_SAI_CTRL1_FS_16000_24000 (0x1) +#define SSM2518_SAI_CTRL1_FS_32000_48000 (0x2) +#define SSM2518_SAI_CTRL1_FS_64000_96000 (0x3) + +#define SSM2518_SAI_CTRL2_BCLK_INTERAL BIT(7) +#define SSM2518_SAI_CTRL2_LRCLK_PULSE BIT(6) +#define SSM2518_SAI_CTRL2_LRCLK_INVERT BIT(5) +#define SSM2518_SAI_CTRL2_MSB BIT(4) +#define SSM2518_SAI_CTRL2_SLOT_WIDTH_MASK (0x3 << 2) +#define SSM2518_SAI_CTRL2_SLOT_WIDTH_32 (0x0 << 2) +#define SSM2518_SAI_CTRL2_SLOT_WIDTH_24 (0x1 << 2) +#define SSM2518_SAI_CTRL2_SLOT_WIDTH_16 (0x2 << 2) +#define SSM2518_SAI_CTRL2_BCLK_INVERT BIT(1) + +#define SSM2518_CHAN_MAP_RIGHT_SLOT_OFFSET 4 +#define SSM2518_CHAN_MAP_RIGHT_SLOT_MASK 0xf0 +#define SSM2518_CHAN_MAP_LEFT_SLOT_OFFSET 0 +#define SSM2518_CHAN_MAP_LEFT_SLOT_MASK 0x0f + +#define SSM2518_MUTE_CTRL_ANA_GAIN BIT(5) +#define SSM2518_MUTE_CTRL_MUTE_MASTER BIT(0) + +#define SSM2518_POWER2_APWDN BIT(0) + +#define SSM2518_DAC_MUTE BIT(6) +#define SSM2518_DAC_FS_MASK 0x07 +#define SSM2518_DAC_FS_8000 0x00 +#define SSM2518_DAC_FS_16000 0x01 +#define SSM2518_DAC_FS_32000 0x02 +#define SSM2518_DAC_FS_64000 0x03 +#define SSM2518_DAC_FS_128000 0x04 + +struct ssm2518 { + struct regmap *regmap; + bool right_j; + + unsigned int sysclk; + const struct snd_pcm_hw_constraint_list *constraints; + + int enable_gpio; +}; + +static const struct reg_default ssm2518_reg_defaults[] = { + { 0x00, 0x05 }, + { 0x01, 0x00 }, + { 0x02, 0x02 }, + { 0x03, 0x00 }, + { 0x04, 0x10 }, + { 0x05, 0x40 }, + { 0x06, 0x40 }, + { 0x07, 0x81 }, + { 0x08, 0x0c }, + { 0x09, 0x99 }, + { 0x0a, 0x7c }, + { 0x0b, 0x5b }, + { 0x0c, 0x57 }, + { 0x0d, 0x89 }, + { 0x0e, 0x8c }, + { 0x0f, 0x77 }, + { 0x10, 0x26 }, + { 0x11, 0x1c }, + { 0x12, 0x97 }, +}; + +static const DECLARE_TLV_DB_MINMAX_MUTE(ssm2518_vol_tlv, -7125, 2400); +static const DECLARE_TLV_DB_SCALE(ssm2518_compressor_tlv, -3400, 200, 0); +static const DECLARE_TLV_DB_SCALE(ssm2518_expander_tlv, -8100, 300, 0); +static const DECLARE_TLV_DB_SCALE(ssm2518_noise_gate_tlv, -9600, 300, 0); +static const DECLARE_TLV_DB_SCALE(ssm2518_post_drc_tlv, -2400, 300, 0); + +static const DECLARE_TLV_DB_RANGE(ssm2518_limiter_tlv, + 0, 7, TLV_DB_SCALE_ITEM(-2200, 200, 0), + 7, 15, TLV_DB_SCALE_ITEM(-800, 100, 0), +); + +static const char * const ssm2518_drc_peak_detector_attack_time_text[] = { + "0 ms", "0.1 ms", "0.19 ms", "0.37 ms", "0.75 ms", "1.5 ms", "3 ms", + "6 ms", "12 ms", "24 ms", "48 ms", "96 ms", "192 ms", "384 ms", + "768 ms", "1536 ms", +}; + +static const char * const ssm2518_drc_peak_detector_release_time_text[] = { + "0 ms", "1.5 ms", "3 ms", "6 ms", "12 ms", "24 ms", "48 ms", "96 ms", + "192 ms", "384 ms", "768 ms", "1536 ms", "3072 ms", "6144 ms", + "12288 ms", "24576 ms" +}; + +static const char * const ssm2518_drc_hold_time_text[] = { + "0 ms", "0.67 ms", "1.33 ms", "2.67 ms", "5.33 ms", "10.66 ms", + "21.32 ms", "42.64 ms", "85.28 ms", "170.56 ms", "341.12 ms", + "682.24 ms", "1364 ms", +}; + +static const SOC_ENUM_SINGLE_DECL(ssm2518_drc_peak_detector_attack_time_enum, + SSM2518_REG_DRC_2, 4, ssm2518_drc_peak_detector_attack_time_text); +static const SOC_ENUM_SINGLE_DECL(ssm2518_drc_peak_detector_release_time_enum, + SSM2518_REG_DRC_2, 0, ssm2518_drc_peak_detector_release_time_text); +static const SOC_ENUM_SINGLE_DECL(ssm2518_drc_attack_time_enum, + SSM2518_REG_DRC_6, 4, ssm2518_drc_peak_detector_attack_time_text); +static const SOC_ENUM_SINGLE_DECL(ssm2518_drc_decay_time_enum, + SSM2518_REG_DRC_6, 0, ssm2518_drc_peak_detector_release_time_text); +static const SOC_ENUM_SINGLE_DECL(ssm2518_drc_hold_time_enum, + SSM2518_REG_DRC_7, 4, ssm2518_drc_hold_time_text); +static const SOC_ENUM_SINGLE_DECL(ssm2518_drc_noise_gate_hold_time_enum, + SSM2518_REG_DRC_7, 0, ssm2518_drc_hold_time_text); +static const SOC_ENUM_SINGLE_DECL(ssm2518_drc_rms_averaging_time_enum, + SSM2518_REG_DRC_9, 0, ssm2518_drc_peak_detector_release_time_text); + +static const struct snd_kcontrol_new ssm2518_snd_controls[] = { + SOC_SINGLE("Playback De-emphasis Switch", SSM2518_REG_MUTE_CTRL, + 4, 1, 0), + SOC_DOUBLE_R_TLV("Master Playback Volume", SSM2518_REG_LEFT_VOL, + SSM2518_REG_RIGHT_VOL, 0, 0xff, 1, ssm2518_vol_tlv), + SOC_DOUBLE("Master Playback Switch", SSM2518_REG_MUTE_CTRL, 2, 1, 1, 1), + + SOC_SINGLE("Amp Low Power Mode Switch", SSM2518_REG_POWER2, 4, 1, 0), + SOC_SINGLE("DAC Low Power Mode Switch", SSM2518_REG_POWER2, 3, 1, 0), + + SOC_SINGLE("DRC Limiter Switch", SSM2518_REG_DRC_1, 5, 1, 0), + SOC_SINGLE("DRC Compressor Switch", SSM2518_REG_DRC_1, 4, 1, 0), + SOC_SINGLE("DRC Expander Switch", SSM2518_REG_DRC_1, 3, 1, 0), + SOC_SINGLE("DRC Noise Gate Switch", SSM2518_REG_DRC_1, 2, 1, 0), + SOC_DOUBLE("DRC Switch", SSM2518_REG_DRC_1, 0, 1, 1, 0), + + SOC_SINGLE_TLV("DRC Limiter Threshold Volume", + SSM2518_REG_DRC_3, 4, 15, 1, ssm2518_limiter_tlv), + SOC_SINGLE_TLV("DRC Compressor Lower Threshold Volume", + SSM2518_REG_DRC_3, 0, 15, 1, ssm2518_compressor_tlv), + SOC_SINGLE_TLV("DRC Expander Upper Threshold Volume", SSM2518_REG_DRC_4, + 4, 15, 1, ssm2518_expander_tlv), + SOC_SINGLE_TLV("DRC Noise Gate Threshold Volume", + SSM2518_REG_DRC_4, 0, 15, 1, ssm2518_noise_gate_tlv), + SOC_SINGLE_TLV("DRC Upper Output Threshold Volume", + SSM2518_REG_DRC_5, 4, 15, 1, ssm2518_limiter_tlv), + SOC_SINGLE_TLV("DRC Lower Output Threshold Volume", + SSM2518_REG_DRC_5, 0, 15, 1, ssm2518_noise_gate_tlv), + SOC_SINGLE_TLV("DRC Post Volume", SSM2518_REG_DRC_8, + 2, 15, 1, ssm2518_post_drc_tlv), + + SOC_ENUM("DRC Peak Detector Attack Time", + ssm2518_drc_peak_detector_attack_time_enum), + SOC_ENUM("DRC Peak Detector Release Time", + ssm2518_drc_peak_detector_release_time_enum), + SOC_ENUM("DRC Attack Time", ssm2518_drc_attack_time_enum), + SOC_ENUM("DRC Decay Time", ssm2518_drc_decay_time_enum), + SOC_ENUM("DRC Hold Time", ssm2518_drc_hold_time_enum), + SOC_ENUM("DRC Noise Gate Hold Time", + ssm2518_drc_noise_gate_hold_time_enum), + SOC_ENUM("DRC RMS Averaging Time", ssm2518_drc_rms_averaging_time_enum), +}; + +static const struct snd_soc_dapm_widget ssm2518_dapm_widgets[] = { + SND_SOC_DAPM_DAC("DACL", "HiFi Playback", SSM2518_REG_POWER2, 1, 1), + SND_SOC_DAPM_DAC("DACR", "HiFi Playback", SSM2518_REG_POWER2, 2, 1), + + SND_SOC_DAPM_OUTPUT("OUTL"), + SND_SOC_DAPM_OUTPUT("OUTR"), +}; + +static const struct snd_soc_dapm_route ssm2518_routes[] = { + { "OUTL", NULL, "DACL" }, + { "OUTR", NULL, "DACR" }, +}; + +struct ssm2518_mcs_lut { + unsigned int rate; + const unsigned int *sysclks; +}; + +static const unsigned int ssm2518_sysclks_2048000[] = { + 2048000, 4096000, 8192000, 12288000, 16384000, 24576000, + 3200000, 6400000, 12800000, 0 +}; + +static const unsigned int ssm2518_sysclks_2822000[] = { + 2822000, 5644800, 11289600, 16934400, 22579200, 33868800, + 4410000, 8820000, 17640000, 0 +}; + +static const unsigned int ssm2518_sysclks_3072000[] = { + 3072000, 6144000, 12288000, 16384000, 24576000, 38864000, + 4800000, 9600000, 19200000, 0 +}; + +static const struct ssm2518_mcs_lut ssm2518_mcs_lut[] = { + { 8000, ssm2518_sysclks_2048000, }, + { 11025, ssm2518_sysclks_2822000, }, + { 12000, ssm2518_sysclks_3072000, }, + { 16000, ssm2518_sysclks_2048000, }, + { 24000, ssm2518_sysclks_3072000, }, + { 22050, ssm2518_sysclks_2822000, }, + { 32000, ssm2518_sysclks_2048000, }, + { 44100, ssm2518_sysclks_2822000, }, + { 48000, ssm2518_sysclks_3072000, }, + { 96000, ssm2518_sysclks_3072000, }, +}; + +static const unsigned int ssm2518_rates_2048000[] = { + 8000, 16000, 32000, +}; + +static const struct snd_pcm_hw_constraint_list ssm2518_constraints_2048000 = { + .list = ssm2518_rates_2048000, + .count = ARRAY_SIZE(ssm2518_rates_2048000), +}; + +static const unsigned int ssm2518_rates_2822000[] = { + 11025, 22050, 44100, +}; + +static const struct snd_pcm_hw_constraint_list ssm2518_constraints_2822000 = { + .list = ssm2518_rates_2822000, + .count = ARRAY_SIZE(ssm2518_rates_2822000), +}; + +static const unsigned int ssm2518_rates_3072000[] = { + 12000, 24000, 48000, 96000, +}; + +static const struct snd_pcm_hw_constraint_list ssm2518_constraints_3072000 = { + .list = ssm2518_rates_3072000, + .count = ARRAY_SIZE(ssm2518_rates_3072000), +}; + +static const unsigned int ssm2518_rates_12288000[] = { + 8000, 12000, 16000, 24000, 32000, 48000, 96000, +}; + +static const struct snd_pcm_hw_constraint_list ssm2518_constraints_12288000 = { + .list = ssm2518_rates_12288000, + .count = ARRAY_SIZE(ssm2518_rates_12288000), +}; + +static unsigned int ssm2518_lookup_mcs(struct ssm2518 *ssm2518, + unsigned int rate) +{ + const unsigned int *sysclks = NULL; + int i; + + for (i = 0; i < ARRAY_SIZE(ssm2518_mcs_lut); i++) { + if (ssm2518_mcs_lut[i].rate == rate) { + sysclks = ssm2518_mcs_lut[i].sysclks; + break; + } + } + + if (!sysclks) + return -EINVAL; + + for (i = 0; sysclks[i]; i++) { + if (sysclks[i] == ssm2518->sysclk) + return i; + } + + return -EINVAL; +} + +static int ssm2518_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(codec); + unsigned int rate = params_rate(params); + unsigned int ctrl1, ctrl1_mask; + int mcs; + int ret; + + mcs = ssm2518_lookup_mcs(ssm2518, rate); + if (mcs < 0) + return mcs; + + ctrl1_mask = SSM2518_SAI_CTRL1_FS_MASK; + + if (rate >= 8000 && rate <= 12000) + ctrl1 = SSM2518_SAI_CTRL1_FS_8000_12000; + else if (rate >= 16000 && rate <= 24000) + ctrl1 = SSM2518_SAI_CTRL1_FS_16000_24000; + else if (rate >= 32000 && rate <= 48000) + ctrl1 = SSM2518_SAI_CTRL1_FS_32000_48000; + else if (rate >= 64000 && rate <= 96000) + ctrl1 = SSM2518_SAI_CTRL1_FS_64000_96000; + else + return -EINVAL; + + if (ssm2518->right_j) { + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + ctrl1 |= SSM2518_SAI_CTRL1_FMT_RJ_16BIT; + break; + case SNDRV_PCM_FORMAT_S24_LE: + ctrl1 |= SSM2518_SAI_CTRL1_FMT_RJ_24BIT; + break; + default: + return -EINVAL; + } + ctrl1_mask |= SSM2518_SAI_CTRL1_FMT_MASK; + } + + /* Disable auto samplerate detection */ + ret = regmap_update_bits(ssm2518->regmap, SSM2518_REG_CLOCK, + SSM2518_CLOCK_ASR, SSM2518_CLOCK_ASR); + if (ret < 0) + return ret; + + ret = regmap_update_bits(ssm2518->regmap, SSM2518_REG_SAI_CTRL1, + ctrl1_mask, ctrl1); + if (ret < 0) + return ret; + + return regmap_update_bits(ssm2518->regmap, SSM2518_REG_POWER1, + SSM2518_POWER1_MCS_MASK, mcs << 1); +} + +static int ssm2518_mute(struct snd_soc_dai *dai, int mute) +{ + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(dai->codec); + unsigned int val; + + if (mute) + val = SSM2518_MUTE_CTRL_MUTE_MASTER; + else + val = 0; + + return regmap_update_bits(ssm2518->regmap, SSM2518_REG_MUTE_CTRL, + SSM2518_MUTE_CTRL_MUTE_MASTER, val); +} + +static int ssm2518_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) +{ + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(dai->codec); + unsigned int ctrl1 = 0, ctrl2 = 0; + bool invert_fclk; + int ret; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + invert_fclk = false; + break; + case SND_SOC_DAIFMT_IB_NF: + ctrl2 |= SSM2518_SAI_CTRL2_BCLK_INVERT; + invert_fclk = false; + break; + case SND_SOC_DAIFMT_NB_IF: + invert_fclk = true; + break; + case SND_SOC_DAIFMT_IB_IF: + ctrl2 |= SSM2518_SAI_CTRL2_BCLK_INVERT; + invert_fclk = true; + break; + default: + return -EINVAL; + } + + ssm2518->right_j = false; + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + ctrl1 |= SSM2518_SAI_CTRL1_FMT_I2S; + break; + case SND_SOC_DAIFMT_LEFT_J: + ctrl1 |= SSM2518_SAI_CTRL1_FMT_LJ; + invert_fclk = !invert_fclk; + break; + case SND_SOC_DAIFMT_RIGHT_J: + ctrl1 |= SSM2518_SAI_CTRL1_FMT_RJ_24BIT; + ssm2518->right_j = true; + invert_fclk = !invert_fclk; + break; + case SND_SOC_DAIFMT_DSP_A: + ctrl2 |= SSM2518_SAI_CTRL2_LRCLK_PULSE; + ctrl1 |= SSM2518_SAI_CTRL1_FMT_I2S; + invert_fclk = false; + break; + case SND_SOC_DAIFMT_DSP_B: + ctrl2 |= SSM2518_SAI_CTRL2_LRCLK_PULSE; + ctrl1 |= SSM2518_SAI_CTRL1_FMT_LJ; + invert_fclk = false; + break; + default: + return -EINVAL; + } + + if (invert_fclk) + ctrl2 |= SSM2518_SAI_CTRL2_LRCLK_INVERT; + + ret = regmap_write(ssm2518->regmap, SSM2518_REG_SAI_CTRL1, ctrl1); + if (ret) + return ret; + + return regmap_write(ssm2518->regmap, SSM2518_REG_SAI_CTRL2, ctrl2); +} + +static int ssm2518_set_power(struct ssm2518 *ssm2518, bool enable) +{ + int ret = 0; + + if (!enable) { + ret = regmap_update_bits(ssm2518->regmap, SSM2518_REG_POWER1, + SSM2518_POWER1_SPWDN, SSM2518_POWER1_SPWDN); + regcache_mark_dirty(ssm2518->regmap); + } + + if (gpio_is_valid(ssm2518->enable_gpio)) + gpio_set_value(ssm2518->enable_gpio, enable); + + regcache_cache_only(ssm2518->regmap, !enable); + + if (enable) { + ret = regmap_update_bits(ssm2518->regmap, SSM2518_REG_POWER1, + SSM2518_POWER1_SPWDN | SSM2518_POWER1_RESET, 0x00); + regcache_sync(ssm2518->regmap); + } + + return ret; +} + +static int ssm2518_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(codec); + int ret = 0; + + switch (level) { + case SND_SOC_BIAS_ON: + break; + case SND_SOC_BIAS_PREPARE: + break; + case SND_SOC_BIAS_STANDBY: + if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) + ret = ssm2518_set_power(ssm2518, true); + break; + case SND_SOC_BIAS_OFF: + ret = ssm2518_set_power(ssm2518, false); + break; + } + + if (ret) + return ret; + + codec->dapm.bias_level = level; + + return 0; +} + +static int ssm2518_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, + unsigned int rx_mask, int slots, int width) +{ + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(dai->codec); + unsigned int ctrl1, ctrl2; + int left_slot, right_slot; + int ret; + + if (slots == 0) + return regmap_update_bits(ssm2518->regmap, + SSM2518_REG_SAI_CTRL1, SSM2518_SAI_CTRL1_SAI_MASK, + SSM2518_SAI_CTRL1_SAI_I2S); + + if (tx_mask == 0 || tx_mask != 0) + return -EINVAL; + + if (slots == 1) { + if (tx_mask != 1) + return -EINVAL; + left_slot = 0; + right_slot = 0; + } else { + /* We assume the left channel < right channel */ + left_slot = ffs(tx_mask); + tx_mask &= ~(1 << tx_mask); + if (tx_mask == 0) { + right_slot = left_slot; + } else { + right_slot = ffs(tx_mask); + tx_mask &= ~(1 << tx_mask); + } + } + + if (tx_mask != 0 || left_slot >= slots || right_slot >= slots) + return -EINVAL; + + switch (width) { + case 16: + ctrl2 = SSM2518_SAI_CTRL2_SLOT_WIDTH_16; + break; + case 24: + ctrl2 = SSM2518_SAI_CTRL2_SLOT_WIDTH_24; + break; + case 32: + ctrl2 = SSM2518_SAI_CTRL2_SLOT_WIDTH_32; + break; + default: + return -EINVAL; + } + + switch (slots) { + case 1: + ctrl1 = SSM2518_SAI_CTRL1_SAI_MONO; + break; + case 2: + ctrl1 = SSM2518_SAI_CTRL1_SAI_TDM_2; + break; + case 4: + ctrl1 = SSM2518_SAI_CTRL1_SAI_TDM_4; + break; + case 8: + ctrl1 = SSM2518_SAI_CTRL1_SAI_TDM_8; + break; + case 16: + ctrl1 = SSM2518_SAI_CTRL1_SAI_TDM_16; + break; + default: + return -EINVAL; + } + + ret = regmap_write(ssm2518->regmap, SSM2518_REG_CHAN_MAP, + (left_slot << SSM2518_CHAN_MAP_LEFT_SLOT_OFFSET) | + (right_slot << SSM2518_CHAN_MAP_RIGHT_SLOT_OFFSET)); + if (ret) + return ret; + + ret = regmap_update_bits(ssm2518->regmap, SSM2518_REG_SAI_CTRL1, + SSM2518_SAI_CTRL1_SAI_MASK, ctrl1); + if (ret) + return ret; + + return regmap_update_bits(ssm2518->regmap, SSM2518_REG_SAI_CTRL2, + SSM2518_SAI_CTRL2_SLOT_WIDTH_MASK, ctrl2); +} + +static int ssm2518_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(dai->codec); + + if (ssm2518->constraints) + snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, ssm2518->constraints); + + return 0; +} + +#define SSM2518_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32) + +static const struct snd_soc_dai_ops ssm2518_dai_ops = { + .startup = ssm2518_startup, + .hw_params = ssm2518_hw_params, + .digital_mute = ssm2518_mute, + .set_fmt = ssm2518_set_dai_fmt, + .set_tdm_slot = ssm2518_set_tdm_slot, +}; + +static struct snd_soc_dai_driver ssm2518_dai = { + .name = "ssm2518-hifi", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_96000, + .formats = SSM2518_FORMATS, + }, + .ops = &ssm2518_dai_ops, +}; + +static int ssm2518_probe(struct snd_soc_codec *codec) +{ + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(codec); + int ret; + + codec->control_data = ssm2518->regmap; + ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); + if (ret < 0) { + dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); + return ret; + } + + return ssm2518_set_bias_level(codec, SND_SOC_BIAS_OFF); +} + +static int ssm2518_remove(struct snd_soc_codec *codec) +{ + ssm2518_set_bias_level(codec, SND_SOC_BIAS_OFF); + return 0; +} + +static int ssm2518_set_sysclk(struct snd_soc_codec *codec, int clk_id, + int source, unsigned int freq, int dir) +{ + struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(codec); + unsigned int val; + + if (clk_id != SSM2518_SYSCLK) + return -EINVAL; + + switch (source) { + case SSM2518_SYSCLK_SRC_MCLK: + val = 0; + break; + case SSM2518_SYSCLK_SRC_BCLK: + /* In this case the bitclock is used as the system clock, and + * the bitclock signal needs to be connected to the MCLK pin and + * the BCLK pin is left unconnected */ + val = SSM2518_POWER1_NO_BCLK; + break; + default: + return -EINVAL; + } + + switch (freq) { + case 0: + ssm2518->constraints = NULL; + break; + case 2048000: + case 4096000: + case 8192000: + case 3200000: + case 6400000: + case 12800000: + ssm2518->constraints = &ssm2518_constraints_2048000; + break; + case 2822000: + case 5644800: + case 11289600: + case 16934400: + case 22579200: + case 33868800: + case 4410000: + case 8820000: + case 17640000: + ssm2518->constraints = &ssm2518_constraints_2822000; + break; + case 3072000: + case 6144000: + case 38864000: + case 4800000: + case 9600000: + case 19200000: + ssm2518->constraints = &ssm2518_constraints_3072000; + break; + case 12288000: + case 16384000: + case 24576000: + ssm2518->constraints = &ssm2518_constraints_12288000; + break; + default: + return -EINVAL; + } + + ssm2518->sysclk = freq; + + return regmap_update_bits(ssm2518->regmap, SSM2518_REG_POWER1, + SSM2518_POWER1_NO_BCLK, val); +} + +static struct snd_soc_codec_driver ssm2518_codec_driver = { + .probe = ssm2518_probe, + .remove = ssm2518_remove, + .set_bias_level = ssm2518_set_bias_level, + .set_sysclk = ssm2518_set_sysclk, + .idle_bias_off = true, + + .controls = ssm2518_snd_controls, + .num_controls = ARRAY_SIZE(ssm2518_snd_controls), + .dapm_widgets = ssm2518_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ssm2518_dapm_widgets), + .dapm_routes = ssm2518_routes, + .num_dapm_routes = ARRAY_SIZE(ssm2518_routes), +}; + +static bool ssm2518_register_volatile(struct device *dev, unsigned int reg) +{ + return false; +} + +static const struct regmap_config ssm2518_regmap_config = { + .val_bits = 8, + .reg_bits = 8, + + .max_register = SSM2518_REG_DRC_9, + .volatile_reg = ssm2518_register_volatile, + + .cache_type = REGCACHE_RBTREE, + .reg_defaults = ssm2518_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(ssm2518_reg_defaults), +}; + +static int ssm2518_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct ssm2518_platform_data *pdata = i2c->dev.platform_data; + struct ssm2518 *ssm2518; + int ret; + + ssm2518 = devm_kzalloc(&i2c->dev, sizeof(*ssm2518), GFP_KERNEL); + if (ssm2518 == NULL) + return -ENOMEM; + + if (pdata) { + ssm2518->enable_gpio = pdata->enable_gpio; + } else if (i2c->dev.of_node) { + ssm2518->enable_gpio = of_get_gpio(i2c->dev.of_node, 0); + if (ssm2518->enable_gpio < 0 && ssm2518->enable_gpio != -ENOENT) + return ssm2518->enable_gpio; + } else { + ssm2518->enable_gpio = -1; + } + + if (gpio_is_valid(ssm2518->enable_gpio)) { + ret = devm_gpio_request_one(&i2c->dev, ssm2518->enable_gpio, + GPIOF_OUT_INIT_HIGH, "SSM2518 nSD"); + if (ret) + return ret; + } + + i2c_set_clientdata(i2c, ssm2518); + + ssm2518->regmap = devm_regmap_init_i2c(i2c, &ssm2518_regmap_config); + if (IS_ERR(ssm2518->regmap)) + return PTR_ERR(ssm2518->regmap); + + /* + * The reset bit is obviously volatile, but we need to be able to cache + * the other bits in the register, so we can't just mark the whole + * register as volatile. Since this is the only place where we'll ever + * touch the reset bit just bypass the cache for this operation. + */ + regcache_cache_bypass(ssm2518->regmap, true); + ret = regmap_write(ssm2518->regmap, SSM2518_REG_POWER1, + SSM2518_POWER1_RESET); + regcache_cache_bypass(ssm2518->regmap, false); + if (ret) + return ret; + + ret = regmap_update_bits(ssm2518->regmap, SSM2518_REG_POWER2, + SSM2518_POWER2_APWDN, 0x00); + if (ret) + return ret; + + ret = ssm2518_set_power(ssm2518, false); + if (ret) + return ret; + + return snd_soc_register_codec(&i2c->dev, &ssm2518_codec_driver, + &ssm2518_dai, 1); +} + +static int ssm2518_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + return 0; +} + +static const struct i2c_device_id ssm2518_i2c_ids[] = { + { "ssm2518", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, ssm2518_i2c_ids); + +static struct i2c_driver ssm2518_driver = { + .driver = { + .name = "ssm2518", + .owner = THIS_MODULE, + }, + .probe = ssm2518_i2c_probe, + .remove = ssm2518_i2c_remove, + .id_table = ssm2518_i2c_ids, +}; +module_i2c_driver(ssm2518_driver); + +MODULE_DESCRIPTION("ASoC SSM2518 driver"); +MODULE_AUTHOR("Lars-Peter Clausen <lars(a)metafoo.de>"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/ssm2518.h b/sound/soc/codecs/ssm2518.h new file mode 100644 index 0000000..62511d8 --- /dev/null +++ b/sound/soc/codecs/ssm2518.h @@ -0,0 +1,20 @@ +/* + * SSM2518 amplifier audio driver + * + * Copyright 2013 Analog Devices Inc. + * Author: Lars-Peter Clausen <lars(a)metafoo.de> + * + * Licensed under the GPL-2. + */ + +#ifndef __SND_SOC_CODECS_SSM2518_H__ +#define __SND_SOC_CODECS_SSM2518_H__ + +#define SSM2518_SYSCLK 0 + +enum ssm2518_sysclk_src { + SSM2518_SYSCLK_SRC_MCLK = 0, + SSM2518_SYSCLK_SRC_BCLK = 1, +}; + +#endif -- 1.8.0

2 1

[alsa-devel] [PATCH] ASoC: wm5110: Correct DSP4R Mixer control name
by Charles Keepax 25 May '13

25 May '13

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5110.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index c00480b..ba38f06 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -190,7 +190,7 @@ ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE), -ARIZONA_MIXER_CONTROLS("DSP5R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE), +ARIZONA_MIXER_CONTROLS("DSP4R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE), -- 1.7.2.5

2 1

[alsa-devel] Handling HDA FIFO error
by Daniel Drake 25 May '13

25 May '13

Hi, On the OLPC XO-1.5 (VIA VX855 SoC with HDA) we sometimes see a problem where audio playback fails. Easy to reproduce by playing a short wav file in a loop, it will fail after a minute or two. The playback app gets confused here: snd_pcm_wait() returns success, but snd_pcm_writei() returns EAGAIN. Digging into the HDA code, I can see that normally, when the stream gets started, we get interrupts with SD_STS as 0x24. In the failure case, as soon as we start the stream, we get a flood of interrupts with SD_STS 0x8 - which indicates FIFO error. Disabling interrupt generation upon FIFO error does not help much - it avoids the flood of interrupts, but doesn't change the fact that audio playing apps hang or loop infinitely. I have tried the various position_fix options with no luck. Are there any things I could check that would explain why a FIFO error might be occurring? After a quick read of the HDA spec I don't really understand what this FIFO actually is and what it does, how does it relate to the BDL, CORB and RIRB? Failing that... any suggestions for how to improve the hda_intel driver to handle FIFO error gracefully? Right now there is no code to handle that. Thanks Daniel

3 3

[alsa-devel] [PATCH] ASoC: Add support for BCM2708
by Florian Meier 24 May '13

24 May '13

This driver adds support for digital audio (I2S) for the BCM2708 SoC that is used by the Raspberry Pi. External audio codecs can be connected to the Raspberry Pi via P5 header. It relies on cyclic DMA engine support for BCM2708 that is not included in this patch. The currently supported audio codecs are TLV320AIC23 and WM8731. Signed-off-by: Florian Meier <florian.meier(a)koalo.de> --- A Raspberry Pi kernel featuring this driver can be found at https://github.com/koalo/linux rpi-3.8.y-asocdev You can find more information about how to use it at http://blog.koalo.de/2013/05/i2s-support-for-raspberry-pi.html sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/bcm2708/Kconfig | 29 ++ sound/soc/bcm2708/Makefile | 12 + sound/soc/bcm2708/bcm2708-i2s.c | 964 +++++++++++++++++++++++++++++++++++++++ sound/soc/bcm2708/bcm2708-pcm.c | 303 ++++++++++++ sound/soc/bcm2708/bcm2708-pcm.h | 40 ++ sound/soc/bcm2708/rpi-mbed.c | 113 +++++ sound/soc/bcm2708/rpi-proto.c | 131 ++++++ 9 files changed, 1594 insertions(+) create mode 100644 sound/soc/bcm2708/Kconfig create mode 100644 sound/soc/bcm2708/Makefile create mode 100644 sound/soc/bcm2708/bcm2708-i2s.c create mode 100644 sound/soc/bcm2708/bcm2708-pcm.c create mode 100644 sound/soc/bcm2708/bcm2708-pcm.h create mode 100644 sound/soc/bcm2708/rpi-mbed.c create mode 100644 sound/soc/bcm2708/rpi-proto.c diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 9e675c7..d3852f8 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -36,6 +36,7 @@ config SND_SOC_GENERIC_DMAENGINE_PCM # All the supported SoCs source "sound/soc/atmel/Kconfig" source "sound/soc/au1x/Kconfig" +source "sound/soc/bcm2708/Kconfig" source "sound/soc/blackfin/Kconfig" source "sound/soc/cirrus/Kconfig" source "sound/soc/davinci/Kconfig" diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 197b6ae..eef1a7b 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_SND_SOC) += codecs/ obj-$(CONFIG_SND_SOC) += generic/ obj-$(CONFIG_SND_SOC) += atmel/ obj-$(CONFIG_SND_SOC) += au1x/ +obj-$(CONFIG_SND_SOC) += bcm2708/ obj-$(CONFIG_SND_SOC) += blackfin/ obj-$(CONFIG_SND_SOC) += cirrus/ obj-$(CONFIG_SND_SOC) += davinci/ diff --git a/sound/soc/bcm2708/Kconfig b/sound/soc/bcm2708/Kconfig new file mode 100644 index 0000000..f47c2c0 --- /dev/null +++ b/sound/soc/bcm2708/Kconfig @@ -0,0 +1,29 @@ +config SND_BCM2708_SOC_I2S + tristate + +config SND_BCM2708_SOC + tristate "SoC Audio support for the Broadcom BCM2708 I2S module" + depends on MACH_BCM2708 + select SND_SOC_DMAENGINE_PCM + select DMA_BCM2708 + select SND_SOC_GENERIC_DMAENGINE_PCM + help + Say Y or M if you want to add support for codecs attached to + the BCM2708 I2S interface. You will also need + to select the audio interfaces to support below. + +config SND_BCM2708_SOC_RPI_CODEC_MBED + tristate "Support for AudioCODEC for mbed (TLV320AIC32B)" + depends on SND_BCM2708_SOC + select SND_BCM2708_SOC_I2S + select SND_SOC_TLV320AIC3X + help + Say Y if you want to add support for AudioCODEC for mbed (TLV320AIC32B) + +config SND_BCM2708_SOC_RPI_CODEC_PROTO + tristate "Support for Audio Codec Board - PROTO (WM8731)" + depends on SND_BCM2708_SOC + select SND_BCM2708_SOC_I2S + select SND_SOC_WM8731 + help + Say Y if you want to add support for Audio Codec Board - PROTO (WM8731) diff --git a/sound/soc/bcm2708/Makefile b/sound/soc/bcm2708/Makefile new file mode 100644 index 0000000..284d76d --- /dev/null +++ b/sound/soc/bcm2708/Makefile @@ -0,0 +1,12 @@ +# BCM2708 Platform Support +snd-soc-bcm2708-objs := bcm2708-pcm.o +snd-soc-bcm2708-i2s-objs := bcm2708-i2s.o +snd-soc-rpi-mbed-objs := rpi-mbed.o +snd-soc-rpi-proto-objs := rpi-proto.o + +obj-$(CONFIG_SND_BCM2708_SOC) += snd-soc-bcm2708.o +obj-$(CONFIG_SND_BCM2708_SOC_I2S) += snd-soc-bcm2708-i2s.o + +# BCM2708 Machine Support +obj-$(CONFIG_SND_BCM2708_SOC_RPI_CODEC_MBED) += snd-soc-rpi-mbed.o +obj-$(CONFIG_SND_BCM2708_SOC_RPI_CODEC_PROTO) += snd-soc-rpi-proto.o diff --git a/sound/soc/bcm2708/bcm2708-i2s.c b/sound/soc/bcm2708/bcm2708-i2s.c new file mode 100644 index 0000000..a8e995f --- /dev/null +++ b/sound/soc/bcm2708/bcm2708-i2s.c @@ -0,0 +1,964 @@ +/* + * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC + * + * Author: Florian Meier, <florian.meier(a)koalo.de> + * Copyright 2013 + * + * based on + * Raspberry Pi PCM I2S ALSA Driver + * Copyright (c) by Phil Poole 2013 + * + * ALSA SoC I2S (McBSP) Audio Layer for TI DAVINCI processor + * Vladimir Barinov, <vbarinov(a)embeddedalley.com> + * Copyright (C) 2007 MontaVista Software, Inc., <source(a)mvista.com> + * + * OMAP ALSA SoC DAI driver using McBSP port + * Copyright (C) 2008 Nokia Corporation + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> + * Peter Ujfalusi <peter.ujfalusi(a)ti.com> + * + * Freescale SSI ALSA SoC Digital Audio Interface (DAI) driver + * Author: Timur Tabi <timur(a)freescale.com> + * Copyright 2007-2010 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/slab.h> +#include <linux/delay.h> +#include <linux/io.h> +#include <linux/clk.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include "bcm2708-pcm.h" + +/* Clock registers */ +#define BCM2708_CLK_PCMCTL_REG 0x00 +#define BCM2708_CLK_PCMDIV_REG 0x04 + +/* Clock register settings */ +#define BCM2708_CLK_PASSWD (0x5a000000) +#define BCM2708_CLK_MASH(v) ((v) << 9) +#define BCM2708_CLK_FLIP (1 << 8) +#define BCM2708_CLK_BUSY (1 << 7) +#define BCM2708_CLK_KILL (1 << 5) +#define BCM2708_CLK_ENAB (1 << 4) +#define BCM2708_CLK_SRC(v) (v) + +#define BCM2708_CLK_DIVI(v) ((v) << 12) +#define BCM2708_CLK_DIVF(v) (v) + +enum { + BCM2708_CLK_MASH_0 = 0, + BCM2708_CLK_MASH_1, + BCM2708_CLK_MASH_2, + BCM2708_CLK_MASH_3, +}; + +enum { + BCM2708_CLK_SRC_GND = 0, + BCM2708_CLK_SRC_OSC, + BCM2708_CLK_SRC_DBG0, + BCM2708_CLK_SRC_DBG1, + BCM2708_CLK_SRC_PLLA, + BCM2708_CLK_SRC_PLLC, + BCM2708_CLK_SRC_PLLD, + BCM2708_CLK_SRC_HDMI, +}; + +/* Most clocks are not useable (freq = 0) */ +static const unsigned int bcm2708_clk_freq[BCM2708_CLK_SRC_HDMI+1] = { + [BCM2708_CLK_SRC_GND] = 0, + [BCM2708_CLK_SRC_OSC] = 19200000, + [BCM2708_CLK_SRC_DBG0] = 0, + [BCM2708_CLK_SRC_DBG1] = 0, + [BCM2708_CLK_SRC_PLLA] = 0, + [BCM2708_CLK_SRC_PLLC] = 0, + [BCM2708_CLK_SRC_PLLD] = 500000000, + [BCM2708_CLK_SRC_HDMI] = 0, +}; + + +/* I2S registers */ +#define BCM2708_I2S_CS_A_REG 0x00 +#define BCM2708_I2S_FIFO_A_REG 0x04 +#define BCM2708_I2S_MODE_A_REG 0x08 +#define BCM2708_I2S_RXC_A_REG 0x0c +#define BCM2708_I2S_TXC_A_REG 0x10 +#define BCM2708_I2S_DREQ_A_REG 0x14 +#define BCM2708_I2S_INTEN_A_REG 0x18 +#define BCM2708_I2S_INTSTC_A_REG 0x1c +#define BCM2708_I2S_GRAY_REG 0x20 + +/* I2S register settings */ +#define BCM2708_I2S_STBY (1 << 25) +#define BCM2708_I2S_SYNC (1 << 24) +#define BCM2708_I2S_RXSEX (1 << 23) +#define BCM2708_I2S_RXF (1 << 22) +#define BCM2708_I2S_TXE (1 << 21) +#define BCM2708_I2S_RXD (1 << 20) +#define BCM2708_I2S_TXD (1 << 19) +#define BCM2708_I2S_RXR (1 << 18) +#define BCM2708_I2S_TXW (1 << 17) +#define BCM2708_I2S_CS_RXERR (1 << 16) +#define BCM2708_I2S_CS_TXERR (1 << 15) +#define BCM2708_I2S_RXSYNC (1 << 14) +#define BCM2708_I2S_TXSYNC (1 << 13) +#define BCM2708_I2S_DMAEN (1 << 9) +#define BCM2708_I2S_RXTHR(v) ((v) << 7) +#define BCM2708_I2S_TXTHR(v) ((v) << 5) +#define BCM2708_I2S_RXCLR (1 << 4) +#define BCM2708_I2S_TXCLR (1 << 3) +#define BCM2708_I2S_TXON (1 << 2) +#define BCM2708_I2S_RXON (1 << 1) +#define BCM2708_I2S_EN (1) + +#define BCM2708_I2S_CLKDIS (1 << 28) +#define BCM2708_I2S_PDMN (1 << 27) +#define BCM2708_I2S_PDME (1 << 26) +#define BCM2708_I2S_FRXP (1 << 25) +#define BCM2708_I2S_FTXP (1 << 24) +#define BCM2708_I2S_CLKM (1 << 23) +#define BCM2708_I2S_CLKI (1 << 22) +#define BCM2708_I2S_FSM (1 << 21) +#define BCM2708_I2S_FSI (1 << 20) +#define BCM2708_I2S_FLEN(v) ((v) << 10) +#define BCM2708_I2S_FSLEN(v) (v) + +#define BCM2708_I2S_CHWEX (1 << 15) +#define BCM2708_I2S_CHEN (1 << 14) +#define BCM2708_I2S_CHPOS(v) ((v) << 4) +#define BCM2708_I2S_CHWID(v) (v) +#define BCM2708_I2S_CH1(v) ((v) << 16) +#define BCM2708_I2S_CH2(v) (v) + +#define BCM2708_I2S_TX_PANIC(v) ((v) << 24) +#define BCM2708_I2S_RX_PANIC(v) ((v) << 16) +#define BCM2708_I2S_TX(v) ((v) << 8) +#define BCM2708_I2S_RX(v) (v) + +#define BCM2708_I2S_INT_RXERR (1 << 3) +#define BCM2708_I2S_INT_TXERR (1 << 2) +#define BCM2708_I2S_INT_RXR (1 << 1) +#define BCM2708_I2S_INT_TXW (1 << 0) + +/* I2S DMA interface */ +#define BCM2708_I2S_FIFO_PHYSICAL_ADDR 0x7E203004 +#define BCM2708_DMA_DREQ_PCM_TX 2 +#define BCM2708_DMA_DREQ_PCM_RX 3 + +/* General device struct */ +struct bcm2708_i2s_dev { + struct device *dev; + struct bcm2708_pcm_dma_data dma_params[2]; + void __iomem *i2s_base; + void __iomem *clk_base; + unsigned int fmt; + struct snd_pcm_substream *first_stream; + struct snd_pcm_substream *second_stream; +}; + +static inline void bcm2708_i2s_write_reg(struct bcm2708_i2s_dev *dev, + int reg, u32 val) +{ + dev_dbg(dev->dev, "I2S write to register %p = %x\n", + dev->clk_base + reg, val); + __raw_writel(val, dev->i2s_base + reg); +} + +static inline u32 bcm2708_i2s_read_reg(struct bcm2708_i2s_dev *dev, int reg) +{ + return __raw_readl(dev->i2s_base + reg); +} + +static inline void bcm2708_i2s_set_bits(struct bcm2708_i2s_dev *dev, + int reg, u32 val) +{ + u32 oldval = __raw_readl(dev->i2s_base + reg); + bcm2708_i2s_write_reg(dev, reg, oldval | val); +} + +static inline void bcm2708_i2s_clear_bits(struct bcm2708_i2s_dev *dev, + int reg, u32 val) +{ + u32 oldval = __raw_readl(dev->i2s_base + reg); + bcm2708_i2s_write_reg(dev, reg, oldval & ~val); +} + +static inline void bcm2708_clk_write_reg(struct bcm2708_i2s_dev *dev, + int reg, u32 val) +{ + dev_dbg(dev->dev, "PCM clk write to register %p = %x\n", + dev->clk_base + reg, val); + __raw_writel(val, dev->clk_base + reg); +} + +static inline u32 bcm2708_clk_read_reg(struct bcm2708_i2s_dev *dev, int reg) +{ + return __raw_readl(dev->clk_base + reg); +} + +static void bcm2708_i2s_start_clock(struct bcm2708_i2s_dev *dev) +{ + /* + * Start the clock if in master mode. + */ + unsigned int master = dev->fmt & SND_SOC_DAIFMT_MASTER_MASK; + if (master == SND_SOC_DAIFMT_CBS_CFS + || master == SND_SOC_DAIFMT_CBS_CFM) { + unsigned int clkreg = bcm2708_clk_read_reg(dev, + BCM2708_CLK_PCMCTL_REG); + bcm2708_clk_write_reg(dev, BCM2708_CLK_PCMCTL_REG, + BCM2708_CLK_PASSWD | clkreg | BCM2708_CLK_ENAB); + } +} + +static void bcm2708_i2s_stop_clock(struct bcm2708_i2s_dev *dev) +{ + int timeout = 1000; + + /* stop clock */ + unsigned int clkreg = bcm2708_clk_read_reg(dev, BCM2708_CLK_PCMCTL_REG); + bcm2708_clk_write_reg(dev, BCM2708_CLK_PCMCTL_REG, ~(BCM2708_CLK_ENAB) + & (BCM2708_CLK_PASSWD | clkreg)); + + /* wait for the BUSY flag going down */ + while ((bcm2708_clk_read_reg(dev, BCM2708_CLK_PCMCTL_REG) + & BCM2708_CLK_BUSY) + && timeout > 0) { + timeout--; + } + + if (timeout <= 0) { + /* KILL the clock */ + dev_err(dev->dev, "I2S clock didn't stop. Kill the clock!\n"); + bcm2708_clk_write_reg(dev, BCM2708_CLK_PCMCTL_REG, + BCM2708_CLK_KILL | BCM2708_CLK_PASSWD + | clkreg); + } +} + +static void bcm2708_i2s_clear_fifos(struct bcm2708_i2s_dev *dev) +{ + int timeout = 1000; + unsigned int syncval; + + /* Backup the current state */ + unsigned int i2s_active_state = bcm2708_i2s_read_reg(dev, + BCM2708_I2S_CS_A_REG) + & (BCM2708_I2S_RXON | BCM2708_I2S_TXON); + + unsigned int clk_active_state = bcm2708_clk_read_reg(dev, + BCM2708_CLK_PCMCTL_REG) & BCM2708_CLK_ENAB; + + /* Start clock if not running */ + if (!clk_active_state) { + unsigned int clkreg = bcm2708_clk_read_reg(dev, + BCM2708_CLK_PCMCTL_REG); + bcm2708_clk_write_reg(dev, BCM2708_CLK_PCMCTL_REG, + BCM2708_CLK_PASSWD | clkreg | BCM2708_CLK_ENAB); + } + + /* Stop I2S module */ + bcm2708_i2s_clear_bits(dev, BCM2708_I2S_CS_A_REG, BCM2708_I2S_RXON + | BCM2708_I2S_TXON); + + /* + * Clear the FIFOs + * Requires at least 2 PCM clock cycles to take effect + */ + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, BCM2708_I2S_RXCLR + | BCM2708_I2S_TXCLR); + + /* Wait for 2 PCM clock cycles */ + + /* + * Toggle the SYNC flag - after 2 PCM clock cycles it can be read back + * FIXME: This does not seem to work for slave mode! + */ + syncval = bcm2708_i2s_read_reg(dev, BCM2708_I2S_CS_A_REG) + & BCM2708_I2S_SYNC; + if (syncval) + bcm2708_i2s_clear_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_SYNC); + else + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_SYNC); + + /* Wait for the SYNC flag changing it's state */ + while (((bcm2708_i2s_read_reg(dev, BCM2708_I2S_CS_A_REG) + & BCM2708_I2S_SYNC) == syncval) + && timeout > 0) { + timeout--; + } + + if (timeout <= 0) + dev_err(dev->dev, "I2S SYNC error!\n"); + + /* Stop clock if it was not running before */ + if (!clk_active_state) + bcm2708_i2s_stop_clock(dev); + + /* Restore I2S state */ + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, i2s_active_state); +} + +static void bcm2708_i2s_start(struct bcm2708_i2s_dev *dev, + struct snd_pcm_substream *substream) +{ + bcm2708_i2s_start_clock(dev); + + /* + * Enable the stream. + */ + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_RXON); + } else { + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_TXON); + } +} + +static void bcm2708_i2s_stop(struct bcm2708_i2s_dev *dev, + struct snd_pcm_substream *substream) +{ + unsigned int still_running; + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { + bcm2708_i2s_clear_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_RXON); + } else { + bcm2708_i2s_clear_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_TXON); + } + + still_running = bcm2708_i2s_read_reg(dev, BCM2708_I2S_CS_A_REG) + & (BCM2708_I2S_TXON | BCM2708_I2S_RXON); + + /* Stop also the clock when not SND_SOC_DAIFMT_CONT */ + if (!still_running && !(dev->fmt & SND_SOC_DAIFMT_CONT)) + bcm2708_i2s_stop_clock(dev); + +} + +static int bcm2708_i2s_set_dai_fmt(struct snd_soc_dai *dai, + unsigned int fmt) +{ + struct bcm2708_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + dev->fmt = fmt; + return 0; +} + +static bool bcm2708_i2s_check_other_stream(struct bcm2708_i2s_dev *dev, + struct snd_pcm_substream *substream, + struct snd_pcm_substream *other_stream, + struct snd_pcm_hw_params *params) +{ + if (other_stream->runtime->format && + (other_stream->runtime->format != params_format(params))) { + dev_err(dev->dev, + "Sample formats of streams are different. %i (%s) != %i (%s) Initialization failed!\n", + other_stream->runtime->format, + (other_stream->stream == + SNDRV_PCM_STREAM_PLAYBACK ? + "playback" : "capture"), + params_format(params), + (substream->stream == + SNDRV_PCM_STREAM_PLAYBACK ? + "playback" : "capture")); + return false; + } + + if (other_stream->runtime->rate && + (other_stream->runtime->rate != params_rate(params))) { + dev_err(dev->dev, + "Sampling rates of streams are different. %i (%s) != %i (%s) Initialization failed!\n", + other_stream->runtime->rate, + (other_stream->stream == + SNDRV_PCM_STREAM_PLAYBACK ? + "playback" : "capture"), + params_rate(params), + (substream->stream == + SNDRV_PCM_STREAM_PLAYBACK ? + "playback" : "capture")); + return false; + } + + return true; +} + +static int bcm2708_i2s_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct bcm2708_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + + unsigned int sampling_rate = params_rate(params); + unsigned int data_length, data_delay, half_frame; + unsigned int ch1pos, ch2pos, mode, format; + unsigned int mash = BCM2708_CLK_MASH_1; + unsigned int divi, divf, target_frequency; + int clk_src = -1; + unsigned int master = dev->fmt & SND_SOC_DAIFMT_MASTER_MASK; + unsigned int bit_master = (master == SND_SOC_DAIFMT_CBS_CFS + || master == SND_SOC_DAIFMT_CBS_CFM); + + unsigned int frame_master = (master == SND_SOC_DAIFMT_CBS_CFS + || master == SND_SOC_DAIFMT_CBM_CFS); + + /* Ensure, that both streams have the same settings */ + struct snd_pcm_substream *other_stream = dev->first_stream; + if (other_stream == substream) + other_stream = dev->second_stream; + + if (other_stream != NULL + && !bcm2708_i2s_check_other_stream(dev, + substream, other_stream, params)) + return -EINVAL; + + /* + * If a stream is already enabled, + * the registers are already set properly. + */ + if (bcm2708_i2s_read_reg(dev, BCM2708_I2S_CS_A_REG) + & (BCM2708_I2S_TXON | BCM2708_I2S_RXON)) + return 0; + + /* + * Adjust the data length according to the format. + * We prefill the half frame length with an integer + * divider of 2400 as explained at the clock settings. + * Maybe it is overwritten there, if the Integer mode + * does not apply. + */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + data_length = 16; + half_frame = 20; + break; + case SNDRV_PCM_FORMAT_S32_LE: + data_length = 32; + half_frame = 40; + break; + default: + return -EINVAL; + } + + /* + * Clock Settings + * + * The target frequency of the bit clock is + * sampling rate * frame length + * + * Integer mode: + * Sampling rates that are multiples of 8000 kHz + * can be driven by the oscillator of 19.2 MHz + * with an integer divider as long as the frame length + * is an integer divider of 19200000/8000=2400 as set up above. + * This is no longer possible if the sampling rate + * is too high (e.g. 192 kHz), because the oscillator is too slow. + * + * MASH mode: + * For all other sampling rates, it is not possible to + * have an integer divider. Approximate the clock + * with the MASH module that induces a slight frequency + * variance. To minimize that it is best to have the fastest + * clock here. That is PLLD with 500 MHz. + */ + target_frequency = sampling_rate*half_frame*2; + clk_src = BCM2708_CLK_SRC_OSC; + mash = BCM2708_CLK_MASH_0; + + if (bcm2708_clk_freq[clk_src] % target_frequency == 0 + && bit_master && frame_master) { + divi = bcm2708_clk_freq[clk_src]/target_frequency; + divf = 0; + } else { + uint64_t dividend; + + /* + * Overwrite half frame length, because the + * above trick is not needed. + * This is fixed, because a bit clock of 64*fs + * seems to be what most codecs want. + * Is it necessary to have this dynamic? + */ + half_frame = 32; + target_frequency = sampling_rate*half_frame*2; + + clk_src = BCM2708_CLK_SRC_PLLD; + mash = BCM2708_CLK_MASH_1; + + dividend = bcm2708_clk_freq[clk_src]; + dividend *= 1024; + do_div(dividend, target_frequency); + divi = dividend / 1024; + divf = dividend % 1024; + } + + /* Set clock divider */ + bcm2708_clk_write_reg(dev, BCM2708_CLK_PCMDIV_REG, BCM2708_CLK_PASSWD + | BCM2708_CLK_DIVI(divi) + | BCM2708_CLK_DIVF(divf)); + + /* Setup clock, but don't start it yet */ + bcm2708_clk_write_reg(dev, BCM2708_CLK_PCMCTL_REG, BCM2708_CLK_PASSWD + | BCM2708_CLK_MASH(mash) + | BCM2708_CLK_SRC(clk_src)); + + + /* Setup the frame format */ + format = BCM2708_I2S_CHEN; + + if (data_length > 24) + format |= BCM2708_I2S_CHWEX; + + format |= BCM2708_I2S_CHWID((data_length-8)&0xf); + + switch (dev->fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + data_delay = 1; + break; + default: + /* TODO + * Others are possible but are not implemented at the moment. + */ + dev_err(dev->dev, "%s:bad format\n", __func__); + return -EINVAL; + } + + ch1pos = data_delay; + ch2pos = half_frame+data_delay; + + switch (params_channels(params)) { + case 2: + format = BCM2708_I2S_CH1(format) | BCM2708_I2S_CH2(format); + format |= BCM2708_I2S_CH1(BCM2708_I2S_CHPOS(ch1pos)); + format |= BCM2708_I2S_CH2(BCM2708_I2S_CHPOS(ch2pos)); + break; + default: + return -EINVAL; + } + + /* + * Set format for both streams. + * We cannot set another frame length + * (and therefore word length) anyway, + * so the format will be the same. + */ + bcm2708_i2s_write_reg(dev, BCM2708_I2S_RXC_A_REG, format); + bcm2708_i2s_write_reg(dev, BCM2708_I2S_TXC_A_REG, format); + + + /* Setup the I2S mode */ + mode = 0; + + if (data_length <= 16) { + /* + * Use frame packed mode (2 channels per 32 bit word) + * We cannot set another frame length in the second stream + * (and therefore word length) anyway, + * so the format will be the same. + */ + mode |= BCM2708_I2S_FTXP | BCM2708_I2S_FRXP; + } + + mode |= BCM2708_I2S_FLEN(half_frame*2-1); + mode |= BCM2708_I2S_FSLEN(half_frame); + + /* master or slave? */ + switch (dev->fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* cpu is master */ + break; + case SND_SOC_DAIFMT_CBM_CFS: + /* + * codec is bit clock master + * cpu is frame master + */ + mode |= BCM2708_I2S_CLKM; + break; + case SND_SOC_DAIFMT_CBS_CFM: + /* + * codec is frame master + * cpu is bit clock master + */ + mode |= BCM2708_I2S_FSM; + break; + case SND_SOC_DAIFMT_CBM_CFM: + /* codec is master */ + mode |= BCM2708_I2S_CLKM; + mode |= BCM2708_I2S_FSM; + break; + default: + dev_err(dev->dev, "%s:bad master\n", __func__); + return -EINVAL; + } + + /* + * Invert clocks? + * + * The BCM approach seems to be inverted to the classical I2S approach. + */ + switch (dev->fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + /* none - therefore, both for BCM */ + mode |= BCM2708_I2S_CLKI; + mode |= BCM2708_I2S_FSI; + break; + case SND_SOC_DAIFMT_IB_IF: + /* both - therefore, none for BCM*/ + break; + case SND_SOC_DAIFMT_NB_IF: + /* + * invert only frame sync - therefore, + * invert only bit clock for BCM + */ + mode |= BCM2708_I2S_CLKI; + break; + case SND_SOC_DAIFMT_IB_NF: + /* + * invert only bit clock - therefore, + * invert only frame sync for BCM + */ + mode |= BCM2708_I2S_FSI; + break; + default: + return -EINVAL; + } + + bcm2708_i2s_write_reg(dev, BCM2708_I2S_MODE_A_REG, mode); + + + /* Setup the DMA parameters */ + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, BCM2708_I2S_RXTHR(1) + | BCM2708_I2S_TXTHR(1) + | BCM2708_I2S_DMAEN); + + bcm2708_i2s_write_reg(dev, BCM2708_I2S_DREQ_A_REG, + BCM2708_I2S_TX_PANIC(0x10) + | BCM2708_I2S_RX_PANIC(0x30) + | BCM2708_I2S_TX(0x30) + | BCM2708_I2S_RX(0x20)); + + /* Clear FIFOs */ + bcm2708_i2s_clear_fifos(dev); + + return 0; +} + + +static int bcm2708_i2s_prepare(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct bcm2708_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + unsigned int cs_reg; + + bcm2708_i2s_start_clock(dev); + + /* + * Clear both FIFOs if the one that should be started + * is not empty at the moment. This should only happen + * after overrun. Otherwise, hw_params would have cleared + * the FIFO. + */ + cs_reg = bcm2708_i2s_read_reg(dev, BCM2708_I2S_CS_A_REG); + + switch (substream->stream) { + case SNDRV_PCM_STREAM_PLAYBACK: + if (cs_reg & BCM2708_I2S_TXE) + break; + case SNDRV_PCM_STREAM_CAPTURE: + if (!(cs_reg & BCM2708_I2S_RXD)) + break; + + bcm2708_i2s_clear_fifos(dev); + } + + return 0; +} + +static int bcm2708_i2s_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct bcm2708_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + bcm2708_i2s_start(dev, substream); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + bcm2708_i2s_stop(dev, substream); + break; + default: + return -EINVAL; + } + + return 0; +} + +static int bcm2708_i2s_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct bcm2708_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + + if (!dev->first_stream) { + dev->first_stream = substream; + + /* should this still be running stop it */ + bcm2708_i2s_stop_clock(dev); + + /* enable PCM block */ + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, BCM2708_I2S_EN); + + /* + * Disable STBY + * Requires at least 4 PCM clock cycles to take effect + */ + bcm2708_i2s_set_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_STBY); + } else { + struct snd_pcm_runtime *first_runtime = + dev->first_stream->runtime; + + /* + * This is the second stream open, so we need to impose + * sample size and sampling rate constraints. + * This is because frame length and clock cannot be specified + * seperately. + * + * Note that this can cause a race condition if the + * second stream is opened before the first stream is + * fully initialized. We provide some protection by + * checking to make sure the first stream is + * initialized, but it's not perfect. ALSA sometimes + * re-initializes the driver with a different sample + * rate or size. If the second stream is opened + * before the first stream has received its final + * parameters, then the second stream may be + * constrained to the wrong sample rate or size. + * + * We will continue in case of failure and recheck the + * constraint in hw_params. + */ + if (!first_runtime->format) { + dev_err(substream->pcm->card->dev, + "Set format in %s stream first! " + "Initialization may fail.\n", + substream->stream == + SNDRV_PCM_STREAM_PLAYBACK + ? "capture" : "playback"); + } else { + snd_pcm_hw_constraint_minmax(substream->runtime, + SNDRV_PCM_HW_PARAM_FORMAT, + first_runtime->format, + first_runtime->format); + } + + if (!first_runtime->rate) { + dev_err(substream->pcm->card->dev, + "Set sampling rate in %s stream first! " + "Initialization may fail!\n", + substream->stream == + SNDRV_PCM_STREAM_PLAYBACK + ? "capture" : "playback"); + } else { + snd_pcm_hw_constraint_minmax(substream->runtime, + SNDRV_PCM_HW_PARAM_RATE, + first_runtime->rate, + first_runtime->rate); + } + + dev->second_stream = substream; + } + + snd_soc_dai_set_dma_data(dai, substream, + &dev->dma_params[substream->stream]); + + return 0; +} + +static void bcm2708_i2s_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct bcm2708_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); + + bcm2708_i2s_stop(dev, substream); + + if (dev->first_stream == substream) + dev->first_stream = dev->second_stream; + + dev->second_stream = NULL; + + /* If both streams are stopped, disable module and clock */ + if (!dev->first_stream) { + /* Disable the module */ + bcm2708_i2s_clear_bits(dev, BCM2708_I2S_CS_A_REG, + BCM2708_I2S_EN); + + /* + * Stopping clock is necessary, because stop does + * not stop the clock when SND_SOC_DAIFMT_CONT + */ + bcm2708_i2s_stop_clock(dev); + } +} + +static const struct snd_soc_dai_ops bcm2708_i2s_dai_ops = { + .startup = bcm2708_i2s_startup, + .shutdown = bcm2708_i2s_shutdown, + .prepare = bcm2708_i2s_prepare, + .trigger = bcm2708_i2s_trigger, + .hw_params = bcm2708_i2s_hw_params, + .set_fmt = bcm2708_i2s_set_dai_fmt, +}; + +static struct snd_soc_dai_driver bcm2708_i2s_dai = { + .playback = { + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_192000, + .formats = SNDRV_PCM_FMTBIT_S16_LE + | SNDRV_PCM_FMTBIT_S32_LE + }, + .capture = { + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_192000, + .formats = SNDRV_PCM_FMTBIT_S16_LE + | SNDRV_PCM_FMTBIT_S32_LE + }, + .ops = &bcm2708_i2s_dai_ops, + .symmetric_rates = 1 +}; + +static void bcm2708_i2s_setup_gpio(void) +{ + /* + * This is the common way to handle the GPIO pins for + * the Raspberry Pi. + * TODO Better way would be to handle + * this in the device tree! + */ +#define INP_GPIO(g) *(gpio+((g)/10)) &= ~(7<<(((g)%10)*3)) +#define SET_GPIO_ALT(g,a) *(gpio+(((g)/10))) |= (((a)<=3?(a)+4:(a)==4?3:2)<<(((g)%10)*3)) + + unsigned int *gpio; + int pin; + gpio = ioremap(GPIO_BASE, SZ_16K); + + /* SPI is on GPIO 7..11 */ + for (pin = 28; pin <= 31; pin++) { + INP_GPIO(pin); /* set mode to GPIO input first */ + SET_GPIO_ALT(pin, 2); /* set mode to ALT 0 */ + } +#undef INP_GPIO +#undef SET_GPIO_ALT +} + +static int bcm2708_i2s_probe(struct platform_device *pdev) +{ + struct bcm2708_i2s_dev *dev; + int i; + void __iomem *base[2]; + + /* request both ioareas */ + for (i = 0; i <= 1; i++) { + struct resource *mem, *ioarea; + mem = platform_get_resource(pdev, IORESOURCE_MEM, i); + if (!mem) { + dev_err(&pdev->dev, "I2S probe: Memory resource could not be found.\n"); + return -ENODEV; + } + + ioarea = devm_request_mem_region(&pdev->dev, mem->start, + resource_size(mem), + pdev->name); + if (!ioarea) { + dev_err(&pdev->dev, "I2S probe: Memory region already claimed.\n"); + return -EBUSY; + } + + base[i] = devm_ioremap(&pdev->dev, mem->start, + resource_size(mem)); + if (!base[i]) { + dev_err(&pdev->dev, "I2S probe: ioremap failed.\n"); + return -ENOMEM; + } + } + + dev = devm_kzalloc(&pdev->dev, sizeof(struct bcm2708_i2s_dev), + GFP_KERNEL); + if (!dev) { + dev_err(&pdev->dev, "I2S probe: kzalloc failed.\n"); + return -ENOMEM; + } + + dev->i2s_base = base[0]; + dev->clk_base = base[1]; + + bcm2708_i2s_setup_gpio(); + + /* Set the appropriate DMA parameters */ + dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].port_addr = + (dma_addr_t)BCM2708_I2S_FIFO_PHYSICAL_ADDR; + dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].port_addr = + (dma_addr_t)BCM2708_I2S_FIFO_PHYSICAL_ADDR; + + dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].dma_req = + BCM2708_DMA_DREQ_PCM_TX; + dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].dma_req = + BCM2708_DMA_DREQ_PCM_RX; + + /* Store the pdev */ + dev->dev = &pdev->dev; + dev_set_drvdata(&pdev->dev, dev); + + return snd_soc_register_dai(&pdev->dev, &bcm2708_i2s_dai); +} + +static int bcm2708_i2s_remove(struct platform_device *pdev) +{ + snd_soc_unregister_dai(&pdev->dev); + return 0; +} + +static struct platform_driver bcm2708_i2s_driver = { + .probe = bcm2708_i2s_probe, + .remove = bcm2708_i2s_remove, + .driver = { + .name = "bcm2708-i2s", + .owner = THIS_MODULE, + }, +}; + +module_platform_driver(bcm2708_i2s_driver); + +MODULE_AUTHOR("Florian Meier"); +MODULE_DESCRIPTION("BCM2708 I2S Interface"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/bcm2708/bcm2708-pcm.c b/sound/soc/bcm2708/bcm2708-pcm.c new file mode 100644 index 0000000..4b3e688 --- /dev/null +++ b/sound/soc/bcm2708/bcm2708-pcm.c @@ -0,0 +1,303 @@ +/* + * ALSA PCM interface for Broadcom BCM2708 SoC + * + * Author: Florian Meier, <florian.meier(a)koalo.de> + * Copyright 2013 + * + * based on + * ALSA PCM interface for the OMAP SoC + * Copyright (C) 2008 Nokia Corporation + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> + * Peter Ujfalusi <peter.ujfalusi(a)ti.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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * TODO This should be transferred to the generic DMA engine driver + * as soon as the official BCM2708 kernel migrates to 3.10. + * Otherwise, it would be difficult to test. + */ + +#include <linux/dma-mapping.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/bcm2708-dmaengine.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> +#include <sound/soc.h> + +#include "bcm2708-pcm.h" + +static const struct snd_pcm_hardware bcm2708_pcm_hardware = { + .info = SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME | + SNDRV_PCM_INFO_JOINT_DUPLEX | + SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .period_bytes_min = 32, + .period_bytes_max = 64 * 1024, + .periods_min = 2, + .periods_max = 255, + .buffer_bytes_max = 128 * 1024, +}; + +static int bcm2708_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct bcm2708_pcm_dma_data *dma_data; + struct bcm2708_dma_slave_config config; + struct dma_chan *chan; + int err = 0; + + /* get DMA data (e.g. FIFO address and DREQ) */ + dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); + + /* + * There seems to be no use for bufferless + * transfer with this SoC. + */ + if (!dma_data) + return 0; + + snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); + runtime->dma_bytes = params_buffer_bytes(params); + + chan = snd_dmaengine_pcm_get_chan(substream); + if (!chan) + return -EINVAL; + + /* fills in addr_width and direction */ + err = snd_hwparams_to_dma_slave_config(substream, params, &config.cfg); + if (err) + return err; + + /* Override the *_dma addr_width if requested by the DAI driver */ + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + config.cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + else + config.cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + + config.cfg.src_addr = dma_data->port_addr; + config.cfg.dst_addr = dma_data->port_addr; + config.cfg.src_maxburst = dma_data->packet_size; + config.cfg.dst_maxburst = dma_data->packet_size; + config.sync_dreq = dma_data->dma_req; + + return dmaengine_slave_config(chan, &config.cfg); +} + +static int bcm2708_pcm_hw_free(struct snd_pcm_substream *substream) +{ + snd_pcm_set_runtime_buffer(substream, NULL); + return 0; +} + +static int bcm2708_pcm_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct bcm2708_pcm_dma_data *dma_data; + int ret = 0; + + dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + break; + default: + ret = -EINVAL; + } + + if (ret == 0) + ret = snd_dmaengine_pcm_trigger(substream, cmd); + + return ret; +} + +static snd_pcm_uframes_t bcm2708_pcm_pointer( + struct snd_pcm_substream *substream) +{ + return snd_dmaengine_pcm_pointer(substream); +} + +static int bcm2708_pcm_open(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct bcm2708_pcm_dma_data *dma_data; + int ret; + + snd_soc_set_runtime_hwparams(substream, &bcm2708_pcm_hardware); + + /* Ensure that buffer size is a multiple of period size */ + ret = snd_pcm_hw_constraint_integer(runtime, + SNDRV_PCM_HW_PARAM_PERIODS); + if (ret < 0) + return ret; + + dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); + return snd_dmaengine_pcm_open(substream, NULL, NULL); +} + +static int bcm2708_pcm_close(struct snd_pcm_substream *substream) +{ + snd_dmaengine_pcm_close(substream); + return 0; +} + +static int bcm2708_pcm_mmap(struct snd_pcm_substream *substream, + struct vm_area_struct *vma) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + return dma_mmap_writecombine(substream->pcm->card->dev, vma, + runtime->dma_area, + runtime->dma_addr, + runtime->dma_bytes); +} + +static struct snd_pcm_ops bcm2708_pcm_ops = { + .open = bcm2708_pcm_open, + .close = bcm2708_pcm_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = bcm2708_pcm_hw_params, + .hw_free = bcm2708_pcm_hw_free, + .trigger = bcm2708_pcm_trigger, + .pointer = bcm2708_pcm_pointer, + .mmap = bcm2708_pcm_mmap, +}; + +static u64 bcm2708_pcm_dmamask = DMA_BIT_MASK(64); + +static int bcm2708_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, + int stream) +{ + struct snd_pcm_substream *substream = pcm->streams[stream].substream; + struct snd_dma_buffer *buf = &substream->dma_buffer; + size_t size = bcm2708_pcm_hardware.buffer_bytes_max; + + buf->dev.type = SNDRV_DMA_TYPE_DEV; + buf->dev.dev = pcm->card->dev; + buf->private_data = NULL; + buf->area = dma_alloc_writecombine(pcm->card->dev, size, + &buf->addr, GFP_KERNEL); + if (!buf->area) + return -ENOMEM; + + buf->bytes = size; + return 0; +} + +static void bcm2708_pcm_free_dma_buffers(struct snd_pcm *pcm) +{ + struct snd_pcm_substream *substream; + struct snd_dma_buffer *buf; + int stream; + + for (stream = 0; stream < 2; stream++) { + substream = pcm->streams[stream].substream; + if (!substream) + continue; + + buf = &substream->dma_buffer; + if (!buf->area) + continue; + + dma_free_writecombine(pcm->card->dev, buf->bytes, + buf->area, buf->addr); + buf->area = NULL; + } +} + +static int bcm2708_pcm_new(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_card *card = rtd->card->snd_card; + struct snd_pcm *pcm = rtd->pcm; + int ret = 0; + + if (!card->dev->dma_mask) + card->dev->dma_mask = &bcm2708_pcm_dmamask; + if (!card->dev->coherent_dma_mask) + card->dev->coherent_dma_mask = DMA_BIT_MASK(64); + + if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { + ret = bcm2708_pcm_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret) + goto out; + } + + if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { + ret = bcm2708_pcm_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_CAPTURE); + if (ret) + goto out; + } + +out: + /* free preallocated buffers in case of error */ + if (ret) + bcm2708_pcm_free_dma_buffers(pcm); + + return ret; +} + +static struct snd_soc_platform_driver bcm2708_soc_platform = { + .ops = &bcm2708_pcm_ops, + .pcm_new = bcm2708_pcm_new, + .pcm_free = bcm2708_pcm_free_dma_buffers, +}; + +static int bcm2708_pcm_probe(struct platform_device *pdev) +{ + return snd_soc_register_platform(&pdev->dev, + &bcm2708_soc_platform); +} + +static int bcm2708_pcm_remove(struct platform_device *pdev) +{ + snd_soc_unregister_platform(&pdev->dev); + return 0; +} + +static struct platform_driver bcm2708_pcm_driver = { + .driver = { + .name = "bcm2708-pcm-audio", + .owner = THIS_MODULE, + }, + + .probe = bcm2708_pcm_probe, + .remove = bcm2708_pcm_remove, +}; + +module_platform_driver(bcm2708_pcm_driver); + +MODULE_AUTHOR("Florian Meier"); +MODULE_DESCRIPTION("BCM2708 PCM DMA module"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2708-pcm-audio"); diff --git a/sound/soc/bcm2708/bcm2708-pcm.h b/sound/soc/bcm2708/bcm2708-pcm.h new file mode 100644 index 0000000..e6a6acb --- /dev/null +++ b/sound/soc/bcm2708/bcm2708-pcm.h @@ -0,0 +1,40 @@ +/* + * ALSA PCM interface for Broadcom BCM2708 SoC + * + * Author: Florian Meier, <florian.meier(a)koalo.de> + * Copyright 2013 + * + * based on + * ALSA PCM interface for the OMAP SoC + * Copyright (C) 2008 Nokia Corporation + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> + * Peter Ujfalusi <peter.ujfalusi(a)ti.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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __BCM2708_PCM_H__ +#define __BCM2708_PCM_H__ + +struct snd_pcm_substream; + +struct bcm2708_pcm_dma_data { + char *name; /* stream identifier */ + int dma_req; /* DMA request line */ + unsigned long port_addr; /* transmit/receive register */ + int packet_size; +}; + +#endif diff --git a/sound/soc/bcm2708/rpi-mbed.c b/sound/soc/bcm2708/rpi-mbed.c new file mode 100644 index 0000000..cb8d25f --- /dev/null +++ b/sound/soc/bcm2708/rpi-mbed.c @@ -0,0 +1,113 @@ +/* + * ASoC driver for mbed AudioCODEC (with a TLV320AIC23B) + * connected to a Raspberry Pi + * + * Author: Florian Meier, <florian.meier(a)koalo.de> + * Copyright 2013 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/jack.h> + +#include "../codecs/tlv320aic23.h" + +static int snd_rpi_mbed_init(struct snd_soc_pcm_runtime *rtd) +{ + return 0; +} + +static int snd_rpi_mbed_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int sysclk; + + sysclk = 12000000; /* this is fixed on this board */ + + /* set tlv320aic23 sysclk */ + snd_soc_dai_set_sysclk(codec_dai, 0, sysclk, 0); + + return 0; +} + +/* machine stream operations */ +static struct snd_soc_ops snd_rpi_mbed_ops = { + .hw_params = snd_rpi_mbed_hw_params, +}; + +static struct snd_soc_dai_link snd_rpi_mbed_dai[] = { +{ + .name = "TLV320AIC23", + .stream_name = "TLV320AIC23 HiFi", + .cpu_dai_name = "bcm2708-i2s.0", + .codec_dai_name = "tlv320aic23-hifi", + .platform_name = "bcm2708-pcm-audio.0", + .codec_name = "tlv320aic23-codec.1-001b", + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ops = &snd_rpi_mbed_ops, + .init = snd_rpi_mbed_init, +}, +}; + +/* audio machine driver */ +static struct snd_soc_card snd_rpi_mbed = { + .name = "snd_rpi_mbed", + .dai_link = snd_rpi_mbed_dai, + .num_links = ARRAY_SIZE(snd_rpi_mbed_dai), +}; + +static int snd_rpi_mbed_probe(struct platform_device *pdev) +{ + int ret = 0; + + snd_rpi_mbed.dev = &pdev->dev; + ret = snd_soc_register_card(&snd_rpi_mbed); + if (ret) { + dev_err(&pdev->dev, + "snd_soc_register_card() failed: %d\n", ret); + } + + return ret; +} + + +static int snd_rpi_mbed_remove(struct platform_device *pdev) +{ + return snd_soc_unregister_card(&snd_rpi_mbed); +} + +static struct platform_driver snd_rpi_mbed_driver = { + .driver = { + .name = "snd-rpi-mbed", + .owner = THIS_MODULE, + }, + .probe = snd_rpi_mbed_probe, + .remove = snd_rpi_mbed_remove, +}; + +module_platform_driver(snd_rpi_mbed_driver); + +MODULE_AUTHOR("Florian Meier"); +MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to mbed AudioCODEC"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/bcm2708/rpi-proto.c b/sound/soc/bcm2708/rpi-proto.c new file mode 100644 index 0000000..25be85a --- /dev/null +++ b/sound/soc/bcm2708/rpi-proto.c @@ -0,0 +1,131 @@ +/* + * ASoC driver for PROTO AudioCODEC (with a WM8731) + * connected to a Raspberry Pi + * + * Author: Florian Meier, <florian.meier(a)koalo.de> + * Copyright 2013 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/jack.h> + +#include "../codecs/wm8731.h" + +static const unsigned int wm8731_rates_12288000[] = { + 8000, 32000, 48000, 96000, +}; + +static struct snd_pcm_hw_constraint_list wm8731_constraints_12288000 = { + .list = wm8731_rates_12288000, + .count = ARRAY_SIZE(wm8731_rates_12288000), +}; + +static int snd_rpi_proto_startup(struct snd_pcm_substream *substream) +{ + /* Setup constraints, because there is a 12.288 MHz XTAL on the board */ + snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &wm8731_constraints_12288000); + return 0; +} + +static int snd_rpi_proto_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int sysclk = 12288000; /* This is fixed on this board */ + + /* Set proto sysclk */ + int ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, + sysclk, SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(substream->pcm->dev, + "Failed to set WM8731 SYSCLK: %d\n", ret); + return ret; + } + + return 0; +} + +/* machine stream operations */ +static struct snd_soc_ops snd_rpi_proto_ops = { + .startup = snd_rpi_proto_startup, + .hw_params = snd_rpi_proto_hw_params, +}; + +static struct snd_soc_dai_link snd_rpi_proto_dai[] = { +{ + .name = "WM8731", + .stream_name = "WM8731 HiFi", + .cpu_dai_name = "bcm2708-i2s.0", + .codec_dai_name = "wm8731-hifi", + .platform_name = "bcm2708-pcm-audio.0", + .codec_name = "wm8731.1-001a", + .dai_fmt = SND_SOC_DAIFMT_I2S + | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBM_CFM, + .ops = &snd_rpi_proto_ops, +}, +}; + +/* audio machine driver */ +static struct snd_soc_card snd_rpi_proto = { + .name = "snd_rpi_proto", + .dai_link = snd_rpi_proto_dai, + .num_links = ARRAY_SIZE(snd_rpi_proto_dai), +}; + +static int snd_rpi_proto_probe(struct platform_device *pdev) +{ + int ret = 0; + + snd_rpi_proto.dev = &pdev->dev; + ret = snd_soc_register_card(&snd_rpi_proto); + if (ret) { + dev_err(&pdev->dev, + "snd_soc_register_card() failed: %d\n", ret); + } + + return ret; +} + + +static int snd_rpi_proto_remove(struct platform_device *pdev) +{ + return snd_soc_unregister_card(&snd_rpi_proto); +} + +static struct platform_driver snd_rpi_proto_driver = { + .driver = { + .name = "snd-rpi-proto", + .owner = THIS_MODULE, + }, + .probe = snd_rpi_proto_probe, + .remove = snd_rpi_proto_remove, +}; + +module_platform_driver(snd_rpi_proto_driver); + +MODULE_AUTHOR("Florian Meier"); +MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)"); +MODULE_LICENSE("GPL"); -- 1.7.9.5

4 9

[alsa-devel] [PATCH alsa-lib] Allow specifying the max number of cards
by Takashi Iwai 24 May '13

24 May '13

Add --with-max-cards option to specify the max number of cards in configure script, when the support for more than 32 cards is required. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- configure.in | 14 ++++++++++++++ src/confmisc.c | 2 +- src/control/cards.c | 6 +++--- src/control/control_hw.c | 2 +- src/hwdep/hwdep_hw.c | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 35b8e84..3d394fc 100644 --- a/configure.in +++ b/configure.in @@ -632,6 +632,20 @@ for t in $CTL_PLUGIN_LIST; do fi done +dnl Max number of cards +AC_MSG_CHECKING(for max number of cards) +AC_ARG_WITH(max-cards, + AS_HELP_STRING([--with-max-cards], [Specify the max number of cards (default = 32)]), + [ max_cards="$withval" ], [ max_cards="32" ]) +AC_MSG_RESULT([$max_cards]) + +if test "$max_cards" -lt 1; then + AC_ERROR([Invalid max cards $max_cards]) +elif test "$max_cards" -gt 256; then + AC_ERROR([Invalid max cards $max_cards]) +fi +AC_DEFINE_UNQUOTED(SND_MAX_CARDS, $max_cards, [Max number of cards]) + dnl Make a symlink for inclusion of alsa/xxx.h if test ! -L "$srcdir"/include/alsa ; then echo "Making a symlink include/alsa" diff --git a/src/confmisc.c b/src/confmisc.c index 80b0027..af686be 100644 --- a/src/confmisc.c +++ b/src/confmisc.c @@ -668,7 +668,7 @@ int snd_determine_driver(int card, char **driver) char *res = NULL; int err; - assert(card >= 0 && card <= 32); + assert(card >= 0 && card <= SND_MAX_CARDS); err = open_ctl(card, &ctl); if (err < 0) { SNDERR("could not open control for card %i", card); diff --git a/src/control/cards.c b/src/control/cards.c index b528e33..5d7376c 100644 --- a/src/control/cards.c +++ b/src/control/cards.c @@ -103,7 +103,7 @@ int snd_card_next(int *rcard) return -EINVAL; card = *rcard; card = card < 0 ? 0 : card + 1; - for (; card < 32; card++) { + for (; card < SND_MAX_CARDS; card++) { if (snd_card_load(card)) { *rcard = card; return 0; @@ -134,7 +134,7 @@ int snd_card_get_index(const char *string) (isdigit(*string) && isdigit(*(string + 1)) && *(string + 2) == 0)) { if (sscanf(string, "%i", &card) != 1) return -EINVAL; - if (card < 0 || card > 31) + if (card < 0 || card >= SND_MAX_CARDS) return -EINVAL; err = snd_card_load1(card); if (err >= 0) @@ -143,7 +143,7 @@ int snd_card_get_index(const char *string) } if (string[0] == '/') /* device name */ return snd_card_load2(string); - for (card = 0; card < 32; card++) { + for (card = 0; card < SND_MAX_CARDS; card++) { #ifdef SUPPORT_ALOAD if (! snd_card_load(card)) continue; diff --git a/src/control/control_hw.c b/src/control/control_hw.c index 90c4ba7..148097f 100644 --- a/src/control/control_hw.c +++ b/src/control/control_hw.c @@ -382,7 +382,7 @@ int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, int mode) *handle = NULL; - if (CHECK_SANITY(card < 0 || card >= 32)) { + if (CHECK_SANITY(card < 0 || card >= SND_MAX_CARDS)) { SNDMSG("Invalid card index %d", card); return -EINVAL; } diff --git a/src/hwdep/hwdep_hw.c b/src/hwdep/hwdep_hw.c index e4fcdc3..4314e32 100644 --- a/src/hwdep/hwdep_hw.c +++ b/src/hwdep/hwdep_hw.c @@ -112,7 +112,7 @@ int snd_hwdep_hw_open(snd_hwdep_t **handle, const char *name, int card, int devi *handle = NULL; - if (card < 0 || card >= 32) + if (card < 0 || card >= SND_MAX_CARDS) return -EINVAL; sprintf(filename, SNDRV_FILE_HWDEP, card, device); fd = snd_open_device(filename, mode); -- 1.8.2.3

1 0

[alsa-devel] [PATCH 1/2] ALSA: Fix the default suffix string with high card number
by Takashi Iwai 24 May '13

24 May '13

ALSA core tries to add a suffix as "_1" automatically when the given id string conflicts. The current code assumes implicitly that the max card number is 16 so that the single hex "_X" suffix can be put. However, with the dynamic device management, the card can be at most 32, so it can put even a non-hex character there. Also, when the max card number is increased in future, this would result in worse. This patch rewrites the code to add the suffix string in a simpler (thus cleaner) way. It can support up to three digits, so it should suffice for most requirements. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/init.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/sound/core/init.c b/sound/core/init.c index 6ef0640..ed4a481 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -549,7 +549,6 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *src, const char *nid) { int len, loops; - bool with_suffix; bool is_default = false; char *id; @@ -565,26 +564,23 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *src, is_default = true; } - with_suffix = false; + len = strlen(id); for (loops = 0; loops < SNDRV_CARDS; loops++) { + char *spos; + char sfxstr[5]; /* "_012" */ + int sfxlen; + if (card_id_ok(card, id)) return; /* OK */ - len = strlen(id); - if (!with_suffix) { - /* add the "_X" suffix */ - char *spos = id + len; - if (len > sizeof(card->id) - 3) - spos = id + sizeof(card->id) - 3; - strcpy(spos, "_1"); - with_suffix = true; - } else { - /* modify the existing suffix */ - if (id[len - 1] != '9') - id[len - 1]++; - else - id[len - 1] = 'A'; - } + /* Add _XYZ suffix */ + sprintf(sfxstr, "_%X", loops + 1); + sfxlen = strlen(sfxstr); + if (len + sfxlen >= sizeof(card->id)) + spos = id + sizeof(card->id) - sfxlen - 1; + else + spos = id + len; + strcpy(spos, sfxstr); } /* fallback to the default id */ if (!is_default) { -- 1.8.2.3

1 1

[alsa-devel] [PATCH] ALSA: Constify the snd_pcm_substream struct ops field
by Lars-Peter Clausen 24 May '13

24 May '13

The ops field of the snd_pcm_substream struct is never modified inside the ALSA core. Making it const allows drivers to declare their snd_pcm_ops struct as const. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/pcm.h | 5 +++-- sound/core/pcm_lib.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index b48792f..84b10f9 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -384,7 +384,7 @@ struct snd_pcm_substream { unsigned int dma_buf_id; size_t dma_max; /* -- hardware operations -- */ - struct snd_pcm_ops *ops; + const struct snd_pcm_ops *ops; /* -- runtime information -- */ struct snd_pcm_runtime *runtime; /* -- timer section -- */ @@ -871,7 +871,8 @@ const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format); int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames); snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsigned, int big_endian); -void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, struct snd_pcm_ops *ops); +void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, + const struct snd_pcm_ops *ops); void snd_pcm_set_sync(struct snd_pcm_substream *substream); int snd_pcm_lib_interleave_len(struct snd_pcm_substream *substream); int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream, diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 41b3dfe..82bb029 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -568,7 +568,8 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream) * * Sets the given PCM operators to the pcm instance. */ -void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, struct snd_pcm_ops *ops) +void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, + const struct snd_pcm_ops *ops) { struct snd_pcm_str *stream = &pcm->streams[direction]; struct snd_pcm_substream *substream; -- 1.8.0

2 1

[alsa-devel] My ALSA amidicat program
by Josh Lehan 24 May '13

24 May '13

Hello! A few years ago, we talked on the alsa-devel mailing list. I had written a program "amidicat" which was well received. It's been a while, and I just now remembered it again. http://mailman.alsa-project.org/pipermail/alsa-devel/2010-June/028446.html You mentioned that such a program might be useful to have in alsa-utils. Is this still the case? If so, I would be honored to get my program in there. http://mailman.alsa-project.org/pipermail/alsa-devel/2010-January/024413.ht… Thanks! Josh Lehan

2 1

[alsa-devel] [PATCH] ucm: Fix segfault when device argument is missing from _sw{dev, mod}
by Juho Hämäläinen 24 May '13

24 May '13

Signed-off-by: Juho Hämäläinen <juho.hamalainen(a)tieto.com> --- src/ucm/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ucm/main.c b/src/ucm/main.c index d38b7fa..74e1530 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -1649,6 +1649,10 @@ int snd_use_case_set(snd_use_case_mgr_t *uc_mgr, } else { str = NULL; } + if (!str) { + err = -EINVAL; + goto __end; + } if (check_identifier(identifier, "_swdev")) err = switch_device(uc_mgr, str, value); else if (check_identifier(identifier, "_swmod")) -- 1.7.10.4

2 3

[alsa-devel] [PATCH] ASoC: wm5110: Correct DSP4R Mixer control name
by Charles Keepax 24 May '13

24 May '13

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5110.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index c00480b..ba38f06 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -190,7 +190,7 @@ ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE), -ARIZONA_MIXER_CONTROLS("DSP5R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE), +ARIZONA_MIXER_CONTROLS("DSP4R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE), ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE), -- 1.7.2.5

1 0

[alsa-devel] [PATCH 4/4 V2] ALSA: hda - Continue probe in work context to avoid request_module deadlock
by Wang Xingchao 24 May '13

24 May '13

There's deadlock when request_module(i915) in azx_probe. It looks like: device_lock(audio pci device) -> azx_probe -> module_request (or symbol_request) -> modprobe (userspace) -> i915 init -> drm_pci_init -> pci_register_driver -> bus_add_driver -> driver_attach -> which in turn tries all locks on pci bus, and when it tries the one on the audio device, it will deadlock. This patch introduce a work to store remaining probe stuff, and let request_module run in safe work context. Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> --- sound/pci/hda/hda_i915.c | 13 ++++-- sound/pci/hda/hda_intel.c | 105 +++++++++++++++++++++++++++------------------- 2 files changed, 71 insertions(+), 47 deletions(-) diff --git a/sound/pci/hda/hda_i915.c b/sound/pci/hda/hda_i915.c index 76c13d5..7547b20 100644 --- a/sound/pci/hda/hda_i915.c +++ b/sound/pci/hda/hda_i915.c @@ -42,13 +42,18 @@ int hda_i915_init(void) { int err = 0; - get_power = symbol_request(i915_request_power_well); + get_power = symbol_get(i915_request_power_well); if (!get_power) { - snd_printk(KERN_WARNING "hda-i915: get_power symbol get fail\n"); - return -ENODEV; + request_module("i915"); + get_power = symbol_get(i915_request_power_well); + if (!get_power) { + snd_printk(KERN_WARNING "hda-i915: get_power symbol get fail\n"); + return -ENODEV; + } + snd_printdd("hda-i915: get_power symbol get successful\n"); } - put_power = symbol_request(i915_release_power_well); + put_power = symbol_get(i915_release_power_well); if (!put_power) { symbol_put(i915_request_power_well); get_power = NULL; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index f20a88c..1bc7c3b 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -76,6 +76,7 @@ static int probe_only[SNDRV_CARDS]; static int jackpoll_ms[SNDRV_CARDS]; static bool single_cmd; static int enable_msi = -1; +static int dev; #ifdef CONFIG_SND_HDA_PATCH_LOADER static char *patch[SNDRV_CARDS]; #endif @@ -542,6 +543,8 @@ struct azx { /* for pending irqs */ struct work_struct irq_pending_work; + struct delayed_work probe_work; + /* reboot notifier (for mysterious hangup problem at power-down) */ struct notifier_block reboot_notifier; @@ -3670,58 +3673,22 @@ static void azx_firmware_cb(const struct firmware *fw, void *context) } #endif -static int azx_probe(struct pci_dev *pci, - const struct pci_device_id *pci_id) +static void azx_probe_work(struct work_struct *work) { - static int dev; - struct snd_card *card; - struct azx *chip; + struct azx *chip = + container_of(work, struct azx, probe_work.work); + struct snd_card *card = chip->card; + struct pci_dev *pci = chip->pci; bool probe_now; int err; - if (dev >= SNDRV_CARDS) - return -ENODEV; - if (!enable[dev]) { - dev++; - return -ENOENT; - } - - err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); - if (err < 0) { - snd_printk(KERN_ERR "hda-intel: Error creating card!\n"); - return err; - } - - snd_card_set_dev(card, &pci->dev); - - err = azx_create(card, pci, dev, pci_id->driver_data, &chip); - if (err < 0) - goto out_free; - card->private_data = chip; - - pci_set_drvdata(pci, card); - - err = register_vga_switcheroo(chip); - if (err < 0) { - snd_printk(KERN_ERR SFX - "%s: Error registering VGA-switcheroo client\n", pci_name(pci)); - goto out_free; - } - - if (check_hdmi_disabled(pci)) { - snd_printk(KERN_INFO SFX "%s: VGA controller is disabled\n", - pci_name(pci)); - snd_printk(KERN_INFO SFX "%s: Delaying initialization\n", pci_name(pci)); - chip->disabled = true; - } - /* Request power well for Haswell HDA controller and codec */ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { #ifdef CONFIG_SND_HDA_I915 err = hda_i915_init(); if (err < 0) { snd_printk(KERN_ERR SFX "Error request power-well from i915\n"); - return err; + goto out_free; } hda_display_power(true); #else @@ -3760,7 +3727,7 @@ static int azx_probe(struct pci_dev *pci, dev++; complete_all(&chip->probe_wait); - return 0; + return; out_free_power: if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { hda_display_power(false); @@ -3769,6 +3736,58 @@ out_free_power: out_free: snd_card_free(card); pci_set_drvdata(pci, NULL); +} + +static int azx_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) +{ + struct snd_card *card; + struct azx *chip; + int err; + + if (dev >= SNDRV_CARDS) + return -ENODEV; + if (!enable[dev]) { + dev++; + return -ENOENT; + } + + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) { + snd_printk(KERN_ERR "hda-intel: Error creating card!\n"); + return err; + } + + snd_card_set_dev(card, &pci->dev); + + err = azx_create(card, pci, dev, pci_id->driver_data, &chip); + if (err < 0) + goto out_free; + card->private_data = chip; + + pci_set_drvdata(pci, card); + + err = register_vga_switcheroo(chip); + if (err < 0) { + snd_printk(KERN_ERR SFX + "%s: Error registering VGA-switcheroo client\n", pci_name(pci)); + goto out_free; + } + + if (check_hdmi_disabled(pci)) { + snd_printk(KERN_INFO SFX "%s: VGA controller is disabled\n", + pci_name(pci)); + snd_printk(KERN_INFO SFX "%s: Delaying initialization\n", pci_name(pci)); + chip->disabled = true; + } + + /* continue probing in work context as may trigger request module */ + INIT_DELAYED_WORK(&chip->probe_work, azx_probe_work); + schedule_delayed_work(&chip->probe_work, 0); + return 0; +out_free: + snd_card_free(card); + pci_set_drvdata(pci, NULL); return err; } -- 1.8.1.2

4 6

Re: [alsa-devel] [PATCH 00/33] devm improvement series, part 1, take 2
by Thierry Reding 23 May '13

23 May '13

On Thu, May 16, 2013 at 01:15:28PM +0200, Wolfram Sang wrote: > Lately, I have been experimenting how to improve the devm interface to make > writing device drivers easier and less error prone while also getting rid of > its subtle issues. I think it has more potential but still needs work and > definately conistency, especiall in its usage. > > The first thing I come up with is a low hanging fruit regarding > devm_ioremap_resouce(). This function already checks if the passed resource is > valid and gives an error message if not. So, we can remove similar checks from > the drivers and get rid of a bit of code and a number of inconsistent error > strings. Sorry for jumping in so late. I generally like the idea. One small inconvenience is that devm_ioremap_resource() returns -EINVAL if res == NULL, which means that drivers will now also return -EINVAL in cases where no resource was returned. Typically drivers handle this by returning something like -ENODEV, -ENXIO, -ENOENT. Some do return -EINVAL but perhaps having a separate error code (and maybe error message as well) for a missing resource would be helpful. Doing this would be rather easy now that you've paved the way by making devm_ioremap_resource() usage consistent across drivers. Thierry

1 0

[alsa-devel] [PATCH 0/4 V5] Power-well API implementation for Haswell
by Wang Xingchao 23 May '13

23 May '13

Hi all, This is V5 and here're some changes notes: change from V4-->V5: - fix reference count bug - new patch on general runtime pm support for audio pci device - new patch to avoid request_module() deadlock change between V3-->V4: - add new structure i915_power_well - initialize drm_device pointer at module init time - change function name change between V2-->V3: - make SND_HDA_I915 selectable - use snd_printdd to output message - add return error code check - use symbol_request to replace symbol_get - release power_well at azx_free - some typo fixes changes between V1-->V2: - use reference count to track power-well usage - remove external module, compiled into snd-hda-intel instead - manage symbols and module loading properly - remove IS_HSW macro, use flag instead - remove audio callback for gfx driver to avoid dependency - split whole patch into two pieces for easy review - more typo fixes Wang Xingchao (4): i915/drm: Add private api for power well usage ALSA: hda - Add power-welll support for haswell HDA ALSA: hda - Fix runtime PM check ALSA: hda - Continue probe in work context to avoid request_module deadlock drivers/gpu/drm/i915/i915_dma.c | 6 ++ drivers/gpu/drm/i915/i915_drv.h | 12 ++++ drivers/gpu/drm/i915/intel_drv.h | 4 ++ drivers/gpu/drm/i915/intel_pm.c | 92 ++++++++++++++++++++++++--- include/drm/i915_powerwell.h | 36 +++++++++++ sound/pci/hda/Kconfig | 10 +++ sound/pci/hda/Makefile | 3 + sound/pci/hda/hda_i915.c | 75 ++++++++++++++++++++++ sound/pci/hda/hda_i915.h | 35 +++++++++++ sound/pci/hda/hda_intel.c | 132 ++++++++++++++++++++++++++++----------- 10 files changed, 360 insertions(+), 45 deletions(-) create mode 100644 include/drm/i915_powerwell.h create mode 100644 sound/pci/hda/hda_i915.c create mode 100644 sound/pci/hda/hda_i915.h -- 1.8.1.2

4 12

[alsa-devel] [PATCH 1/2] ASoC: codecs: adau1701: refactor firmware loading function
by Daniel Mack 23 May '13

23 May '13

Pass a struct i2c_client * to adau1701_load_firmware directly to make the code more readable. Signed-off-by: Daniel Mack <zonque(a)gmail.com> --- sound/soc/codecs/adau1701.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index dafdbe8..95e1677 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -180,9 +180,9 @@ static unsigned int adau1701_read(struct snd_soc_codec *codec, unsigned int reg) return value; } -static int adau1701_load_firmware(struct snd_soc_codec *codec) +static int adau1701_load_firmware(struct i2c_client *client) { - return process_sigma_firmware(codec->control_data, ADAU1701_FIRMWARE); + return process_sigma_firmware(client, ADAU1701_FIRMWARE); } static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec, @@ -455,10 +455,11 @@ static struct snd_soc_dai_driver adau1701_dai = { static int adau1701_probe(struct snd_soc_codec *codec) { int ret; + struct i2c_client *client = to_i2c_client(codec->dev); - codec->control_data = to_i2c_client(codec->dev); + codec->control_data = client; - ret = adau1701_load_firmware(codec); + ret = adau1701_load_firmware(client); if (ret) dev_warn(codec->dev, "Failed to load firmware\n"); -- 1.8.1.4

3 4

[alsa-devel] [PATCH 0/4] CS42L52 fixes.
by Nicolas Schichan 23 May '13

23 May '13

Hi, In the following emails, you will find the fixes I currently have for the CS42L52 driver. The fixes are: - Set both Master Volume A & B init value to 0x88 (otherwise left channel and right channel master volume would not be the same after init). - Use IFACE_CTL2 register for Microphone Bias enum (IFACE_CTL1 is clearly not controling microphone bias according to the datasheet). - Various controls would use a bogus shift value, resulting in only the high order bits being updated when changing them. - The wrong mask was used when muting/unmuting the codec, resutling in the wrong part of the PB_CTL1 register being cleared, especially the headphone analog gain part. All those patches are against the latest linus tree. Regards, -- Nicolas Schichan

4 15