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

[alsa-devel] [PATCH v2 1/1] ASoC: core: Do not print an actual error when deferring probe
by Alexander Stein 18 May '16

18 May '16

In case there is no DAI (yet), do not print an error, this might happen a lot of times. Print a notice instead. Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> --- Changes in v2: * Add addional change in soc_bind_aux_dev() sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d2e62b15..ce5f835 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1001,7 +1001,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, cpu_dai_component.dai_name = dai_link->cpu_dai_name; rtd->cpu_dai = snd_soc_find_dai(&cpu_dai_component); if (!rtd->cpu_dai) { - dev_err(card->dev, "ASoC: CPU DAI %s not registered\n", + dev_notice(card->dev, "ASoC: CPU DAI %s not registered\n", dai_link->cpu_dai_name); goto _err_defer; } @@ -1013,7 +1013,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, for (i = 0; i < rtd->num_codecs; i++) { codec_dais[i] = snd_soc_find_dai(&codecs[i]); if (!codec_dais[i]) { - dev_err(card->dev, "ASoC: CODEC DAI %s not registered\n", + dev_notice(card->dev, "ASoC: CODEC DAI %s not registered\n", codecs[i].dai_name); goto _err_defer; } @@ -1042,7 +1042,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, rtd->platform = platform; } if (!rtd->platform) { - dev_err(card->dev, "ASoC: platform %s not registered\n", + dev_notice(card->dev, "ASoC: platform %s not registered\n", dai_link->platform_name); return -EPROBE_DEFER; } @@ -1698,7 +1698,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) return 0; err_defer: - dev_err(card->dev, "ASoC: %s not registered\n", name); + dev_notice(card->dev, "ASoC: %s not registered\n", name); return -EPROBE_DEFER; } -- 2.7.3

3 4

[alsa-devel] [PATCH] ASoC: add api to retrieve dmic array info from coreboot nhlt
by Yong Zhi 18 May '16

18 May '16

skylake can be configured with either both 2 and 4 channel DMIC array, or 2 channel DMIC array only, this patch provides an API to retrieve the DMIC info from nhlt. Signed-off-by: Yong Zhi <yong.zhi(a)intel.com> --- sound/soc/intel/skylake/skl-nhlt.c | 37 +++++++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-nhlt.h | 22 ++++++++++++++++++++++ sound/soc/intel/skylake/skl.c | 10 +++++++++- sound/soc/intel/skylake/skl.h | 6 ++++++ 4 files changed, 74 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index 7d73648..5448a48 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -149,6 +149,43 @@ struct nhlt_specific_cfg return NULL; } +int skl_get_ep_dmic(struct skl *skl) +{ + struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt; + struct nhlt_endpoint *epnt; + struct nhlt_dmic_array_config *cfg; + struct hdac_bus *bus = ebus_to_hbus(&skl->ebus); + struct device *dev = bus->dev; + unsigned int dmic_geo = 0; + u8 j; + + epnt = (struct nhlt_endpoint *)nhlt->desc; + + for (j = 0; j < nhlt->endpoint_count; j++) { + if (epnt->linktype == NHLT_LINK_DMIC) { + cfg = (struct nhlt_dmic_array_config *) + (epnt->config.caps); + switch (cfg->array_type) { + case NHLT_MIC_ARRAY_2CH_SMALL: + case NHLT_MIC_ARRAY_2CH_BIG: + dmic_geo |= MIC_ARRAY_2CH; + break; + case NHLT_MIC_ARRAY_4CH_1ST_GEOM: + case NHLT_MIC_ARRAY_4CH_L_SHAPED: + case NHLT_MIC_ARRAY_4CH_2ND_GEOM: + dmic_geo |= MIC_ARRAY_4CH; + break; + default: + dev_warn(dev, "undefined DMIC array_type 0x%0x\n", + cfg->array_type); + } + } + epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length); + } + + return dmic_geo; +} + static void skl_nhlt_trim_space(struct skl *skl) { char *s = skl->tplg_name; diff --git a/sound/soc/intel/skylake/skl-nhlt.h b/sound/soc/intel/skylake/skl-nhlt.h index 3769f9f..8da502b 100644 --- a/sound/soc/intel/skylake/skl-nhlt.h +++ b/sound/soc/intel/skylake/skl-nhlt.h @@ -103,4 +103,26 @@ struct nhlt_resource_desc { u64 length; } __packed; +#define MIC_ARRAY_2CH 2 +#define MIC_ARRAY_4CH 4 + +struct nhlt_tdm_config { + uint8_t virtual_slot; + uint8_t config_type; +} __packed; + +struct nhlt_dmic_array_config { + struct nhlt_tdm_config tdm_config; + uint8_t array_type; +} __packed; + +enum { + NHLT_MIC_ARRAY_2CH_SMALL = 0xa, + NHLT_MIC_ARRAY_2CH_BIG = 0xb, + NHLT_MIC_ARRAY_4CH_1ST_GEOM = 0xc, + NHLT_MIC_ARRAY_4CH_L_SHAPED = 0xd, + NHLT_MIC_ARRAY_4CH_2ND_GEOM = 0xe, + NHLT_MIC_ARRAY_VENDOR_DEFINED = 0xf, +}; + #endif diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 06d8c26..a75b05f 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -35,6 +35,8 @@ #include "skl-sst-dsp.h" #include "skl-sst-ipc.h" +static struct skl_dmic_info skl_dmic_data; + /* * initialize the PCI registers */ @@ -397,6 +399,10 @@ static int skl_machine_device_register(struct skl *skl, void *driver_data) platform_device_put(pdev); return -EIO; } + + if (mach->pdata) + dev_set_drvdata(&pdev->dev, mach->pdata); + skl->i2s_dev = pdev; return 0; @@ -666,6 +672,8 @@ static int skl_probe(struct pci_dev *pci, pci_set_drvdata(skl->pci, ebus); + skl_dmic_data.dmic_num = skl_get_ep_dmic(skl); + /* check if dsp is there */ if (ebus->ppcap) { err = skl_machine_device_register(skl, @@ -789,7 +797,7 @@ static struct sst_acpi_mach sst_skl_devdata[] = { { "INT343B", "skl_nau88l25_ssm4567_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, { "MX98357A", "skl_nau88l25_max98357a_i2s", "intel/dsp_fw_release.bin", - NULL, NULL, NULL }, + NULL, NULL, &skl_dmic_data}, {} }; diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index 4b4b387..889ec30 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -90,6 +90,11 @@ struct skl_dma_params { u8 stream_tag; }; +/* to pass dmic data */ +struct skl_dmic_info { + u32 dmic_num; +}; + struct skl_dsp_ops { int id; struct skl_dsp_loader_ops (*loader_ops)(void); @@ -108,6 +113,7 @@ void skl_nhlt_free(struct nhlt_acpi_table *addr); struct nhlt_specific_cfg *skl_get_ep_blob(struct skl *skl, u32 instance, u8 link_type, u8 s_fmt, u8 no_ch, u32 s_rate, u8 dirn); +int skl_get_ep_dmic(struct skl *skl); int skl_nhlt_update_topology_bin(struct skl *skl); int skl_init_dsp(struct skl *skl); int skl_free_dsp(struct skl *skl); -- 1.9.1

1 0

[alsa-devel] [PATCH] ALSA: firewire-lib: change a member of event structure to suppress sparse wanings to bool type
by Takashi Sakamoto 18 May '16

18 May '16

Commit a9c4284bf5a9 ("ALSA: firewire-lib: add context information to tracepoints") adds new members to tracepoint events of this module, to represent context information. One of the members is bool type and this causes sparse warnings. 16:1: warning: expression using sizeof bool 60:1: warning: expression using sizeof bool 16:1: warning: odd constant _Bool cast (ffffffffffffffff becomes 1) 60:1: warning: odd constant _Bool cast (ffffffffffffffff becomes 1) This commit suppresses the warnings, by changing type of the member to 'unsigned int'. Additionally, this commit applies '!!' idiom to get 0/1 from 'in_interrupt()'. Fixes: a9c4284bf5a9 ("ALSA: firewire-lib: add context information to tracepoints") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream-trace.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h index 1622579..9c04faf 100644 --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -26,7 +26,7 @@ TRACE_EVENT(in_packet, __field(u32, cip_header1) __field(unsigned int, payload_quadlets) __field(unsigned int, packet_index) - __field(bool, irq) + __field(unsigned int, irq) __field(unsigned int, index) ), TP_fast_assign( @@ -39,7 +39,7 @@ TRACE_EVENT(in_packet, __entry->cip_header1 = cip_header[1]; __entry->payload_quadlets = payload_quadlets; __entry->packet_index = s->packet_index; - __entry->irq = in_interrupt(); + __entry->irq = !!in_interrupt(); __entry->index = index; ), TP_printk( @@ -70,7 +70,7 @@ TRACE_EVENT(out_packet, __field(u32, cip_header1) __field(unsigned int, payload_quadlets) __field(unsigned int, packet_index) - __field(bool, irq) + __field(unsigned int, irq) __field(unsigned int, index) ), TP_fast_assign( @@ -83,7 +83,7 @@ TRACE_EVENT(out_packet, __entry->cip_header1 = be32_to_cpu(cip_header[1]); __entry->payload_quadlets = payload_length / 4; __entry->packet_index = s->packet_index; - __entry->irq = in_interrupt(); + __entry->irq = !!in_interrupt(); __entry->index = index; ), TP_printk( -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: twl6040: Disconnect AUX output pads on digital mute
by Peter Ujfalusi 18 May '16

18 May '16

Disconnect also the path to AUXL from the HF path during digital_mute to avoid pop noise leakage to Line-out pads. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- include/linux/mfd/twl6040.h | 1 + sound/soc/codecs/twl6040.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index a7c50e54f3e0..8015db974157 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -134,6 +134,7 @@ #define TWL6040_HFDACENA (1 << 0) #define TWL6040_HFPGAENA (1 << 1) #define TWL6040_HFDRVENA (1 << 4) +#define TWL6040_HFSWENA (1 << 6) /* VIBCTLL/R (0x18/0x1A) fields */ diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 7a744b581cc1..1f7081043566 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -987,9 +987,9 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i if (mute) { /* Power down drivers and DACs */ hflctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA | - TWL6040_HFDRVENA); + TWL6040_HFDRVENA | TWL6040_HFSWENA); hfrctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA | - TWL6040_HFDRVENA); + TWL6040_HFDRVENA | TWL6040_HFSWENA); } twl6040_reg_write(twl6040, TWL6040_REG_HFLCTL, hflctl); -- 2.8.2

1 0

[alsa-devel] [PATCH v7 0/3] ASoC: cygnus: Add audio support for Broadcom Cygnus SoC
by Simran Rai 18 May '16

18 May '16

Hi, This patchset contains audio support for Broadcom's Cygnus SoC. It contains DT bindings and core audio driver. The audio driver supports both capture and playback of Audio PCM samples over I2S/TDM interface and provides playback support over SPDIF interface. This patchset is derived from a previously submitted patchset: http://lkml.iu.edu/hypermail/linux/kernel/1503.3/05434.html This patchset has been tested on Cygnus wireless audio bcm958305K board. It is based on v4.6-rc1 and is available from github: repo: https://github.com/Broadcom/cygnus-linux/tree/cygnus-sound-v7 Changes from v6: - DT bindings acknowledged by Rob Herring Changes from v5: - Fix code style, e.g. change "if" statements to "switch" statements - Fix SPDIF output enable register field - Set BUFFER_PAIR_ENABLE for both mono, stereo and TDM modes - Reflect PCM bit formats for SPDIF, SSP and TDM as supported by hardware Changes from v4: - Fix power suspend function and add power resume function - Move clock initialization code from audio driver to clock framework Changes from v3: - Fix the subject lines to match the style for the subsystem Changes from v2: - Split patchset 2/2 from v2 into patchsets 2/3 and 3/3. - Remove SND_SOC_CYGNUS_DIAG. Diagnostics can be performed using standard kernel trace infrastructure. - Fix interrupt handler. Acknowledge only those interrupts that are handledby ISR. - Modify configure_vco() and the pll_macro_entry() struct to make it better readable. The functionality did not change. - Remove casts on macros - Remove surround sound channel grouping from the driver. Changes from v1: - Address code review comments. Fix print format of type size_t and pointer. Simran Rai (3): ASoC: cygnus: Add DT bindings for Broadcom Cygnus audio ASoC: cygnus: Add Cygnus audio DAI driver ASoC: cygnus: Add Cygnus audio DMA driver .../bindings/sound/brcm,cygnus-audio.txt | 67 + sound/soc/bcm/Kconfig | 9 + sound/soc/bcm/Makefile | 5 + sound/soc/bcm/cygnus-pcm.c | 861 +++++++++++ sound/soc/bcm/cygnus-ssp.c | 1529 ++++++++++++++++++++ sound/soc/bcm/cygnus-ssp.h | 139 ++ 6 files changed, 2610 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt create mode 100644 sound/soc/bcm/cygnus-pcm.c create mode 100644 sound/soc/bcm/cygnus-ssp.c create mode 100644 sound/soc/bcm/cygnus-ssp.h -- 1.9.1

1 3

Re: [alsa-devel] [PATCH v7 0/3] ASoC: cygnus: Add audio support for Broadcom Cygnus SoC
by Florian Fainelli 17 May '16

17 May '16

On 05/17/2016 12:46 PM, Simran Rai wrote: > From: Simran <ssimran(a)lbrmn-ssimran-lnxub64.ric.broadcom.com> Please fix your git email address and resubmit. -- Florian

1 0

[alsa-devel] Imx6 i2s master driver without i2c
by nick83ola 17 May '16

17 May '16

Hello Alsa dev! Anyone have an example of an i2s only driver for imx6 solo? I need a driver without i2c....

2 16

[alsa-devel] [PATCH] ASoC: hdac_hdmi: remove ununsed variable 'timeout'
by Colin King 17 May '16

17 May '16

From: Colin Ian King <colin.king(a)canonical.com> Fix build warning by removing unused variable timeout Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/hdac_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 3733297..181cd3b 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1718,7 +1718,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdac = &edev->hdac; struct hdac_bus *bus = hdac->bus; - unsigned long timeout; struct hdac_ext_bus *ebus = hbus_to_ebus(bus); struct hdac_ext_link *hlink = NULL; int err; -- 2.8.1

2 1

[alsa-devel] [PATCH] sound: oss: Use setup_timer and mod_timer.
by Muhammad Falak R Wani 17 May '16

17 May '16

The function setup_timer combines the initialization of a timer with the initialization of the timer's function and data fields. The mulitiline code for timer initialization is now replaced with function setup_timer. Also, quoting the mod_timer() function comment: -> mod_timer() is a more efficient way to update the expire field of an active timer (if the timer is inactive it will be activated). Use setup_timer() and mod_timer() to setup and arm a timer, making the code compact and aid readablity. Signed-off-by: Muhammad Falak R Wani <falakreyaz(a)gmail.com> --- sound/oss/waveartist.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index b36ea47..0b8d0de 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c @@ -1414,11 +1414,9 @@ attach_waveartist(struct address_info *hw, const struct waveartist_mixer_info *m else { #ifdef CONFIG_ARCH_NETWINDER if (machine_is_netwinder()) { - init_timer(&vnc_timer); - vnc_timer.function = vnc_slider_tick; - vnc_timer.expires = jiffies; - vnc_timer.data = nr_waveartist_devs; - add_timer(&vnc_timer); + setup_timer(&vnc_timer, vnc_slider_tick, + nr_waveartist_devs); + mod_timer(&vnc_timer, jiffies); vnc_configure_mixer(devc, 0); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: nau8825: Export I2C module alias information
by Javier Martinez Canillas 17 May '16

17 May '16

The I2C driver has an i2c_device_id array but that information isn't exported to the module using the MODULE_DEVICE_TABLE() macro. So the module autoloading won't work if the I2C device is registered using OF or legacy board files due missing alias information in the module. The issue was found using Kieran Bingham's coccinelle semantic patch: https://lkml.org/lkml/2016/5/10/520 Signed-off-by: Javier Martinez Canillas <javier(a)osg.samsung.com> --- sound/soc/codecs/nau8825.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 81fc97b07751..e988f89ef715 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1493,6 +1493,7 @@ static const struct i2c_device_id nau8825_i2c_ids[] = { { "nau8825", 0 }, { } }; +MODULE_DEVICE_TABLE(i2c, nau8825_i2c_ids); #ifdef CONFIG_OF static const struct of_device_id nau8825_of_ids[] = { -- 2.5.5

1 0

[alsa-devel] [PATCH] alsa-lib:Make snd_atomic_write_* truly atomic
by Andreas x Larsson 17 May '16

17 May '16

Under some usecases a race condition appears inside the snd_atomic_write_* functions. The 'begin' and 'end' variables are updated with the ++ operator which is not atomic but needs to be. This can be achieved with the gcc atomic_* built-ins. Combined with __ATOMIC_SEQ_CST as the memory model, memory barriers are introduced so those can also be removed from the code. Signed-off-by: Andreas x Larsson <andrelan(a)axis.com> Signed-off-by: Arvid Nihlgård Lindell <arvidnl(a)axis.com> --- alsa-lib/include/iatomic.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/alsa-lib/include/iatomic.h b/alsa-lib/include/iatomic.h index acdd3e2..7fafe20 100644 --- a/alsa-lib/include/iatomic.h +++ b/alsa-lib/include/iatomic.h @@ -140,14 +140,12 @@ static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w) static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w) { - w->begin++; - wmb(); + __atomic_add_fetch(&w->begin, 1,__ATOMIC_SEQ_CST); } static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w) { - wmb(); - w->end++; + __atomic_add_fetch(&w->end, 1, __ATOMIC_SEQ_CST); } static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) -- 2.1.4

3 14

[alsa-devel] [PATCH v2 0/5] ASoC: rockchip: Fix audio on Veyron.
by Enric Balletbo i Serra 17 May '16

17 May '16

Hi all, This patch series adds support and fixes the audio support for Veyron devices. With these patches I'm able to playback from speakers and headphones, and record from the microphone on a Veyron Jerry Chromebook. Patches from 1/5 to 3/5 should go through the Mark Brown ASoC tree. Patches 4/5 and 5/5 should go through the Heiko Stuebner rockchip tree. Changes since v1: - Improve log messages trying to explain better the issues (suggested by Mark Brown) - Remove patches from John Keeping as are already cherry-picked. - https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/commit/?h=fo… - https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/commit/?h=fo… Enric Balletbo i Serra (5): ASoC: rockchip-max98090: Fix NULL pointer dereference while accessing to jack. ASoC: rockchip-max98090: Fix the Headset Mic route. ASoC: rockchip-max98090: Fix jack detection and event reporting. ARM: dts: rockchip: Add shared file for audio related nodes for veyron boards ARM: dts: rockchip: veyron: Add analog audio codecs. arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 102 ++++++++++++++++++++++ arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 + sound/soc/rockchip/rockchip_max98090.c | 65 ++++++++------ 3 files changed, 140 insertions(+), 28 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi -- 2.1.0

4 11

[alsa-devel] BUG since "ASoC: simple-card: Add pm callbacks to platform driver"
by Geert Uytterhoeven 17 May '16

17 May '16

Hi Peter, Mark, Liam, With today's sound-asoc/for-next, I'm seeing on r8a7791/koelsch and sh73a0/kzm9g: kernel BUG at drivers/base/regmap/regcache.c:347! Internal error: Oops - BUG: 0 [#1] SMP ARM Modules linked in: CPU: 0 PID: 20 Comm: kworker/0:1 Not tainted 4.6.0-koelsch-07135-g1481dd77fa7d01cb #2621 Hardware name: Generic R8A7791 (Flattened Device Tree) Workqueue: events soc_resume_deferred task: ef512100 ti: ef5a6000 task.ti: ef5a6000 PC is at regcache_sync+0xc/0x118 LR is at ak4642_resume+0x20/0x28 pc : [<c04932a4>] lr : [<c05bd34c>] psr: 60000153 sp : ef5a7ee0 ip : ee7ea62c fp : 00000008 r10: 00000000 r9 : ee7ebd0c r8 : ee7ebd18 r7 : ee7ebc10 r6 : ee7ebcb8 r5 : ee7ebd08 r4 : eefc5800 r3 : 00000000 r2 : eefc5814 r1 : 001c001b r0 : eefc5800 Flags: nZCv IRQs on FIQs off Mode SVC_32 ISA ARM Segment kernel Control: 30c5387d Table: 6eaee540 DAC: fffffffd Process kworker/0:1 (pid: 20, stack limit = 0xef5a6210) Stack: (0xef5a7ee0 to 0xef5a8000) 7ee0: eefc5600 c05ae878 ef588100 ee7ebd08 ef9bdf00 00000000 ef9c4400 c023341c 7f00: ef588100 ee7ebd08 ef588100 ef9bdf00 ef9bdf00 ef5a6000 ef9bdf24 c0e02100 7f20: ef588118 c0233ae0 ef512100 ef59ae00 00000000 ef588100 c0233838 00000000 7f40: 00000000 00000000 00000000 c0237b58 00000001 00000000 ef43b040 ef588100 7f60: 00000000 00000000 dead4ead ffffffff ffffffff ef5a7f74 ef5a7f74 00000000 7f80: 00000000 dead4ead ffffffff ffffffff ef5a7f90 ef5a7f90 ef5a7fac ef59ae00 7fa0: c0237a80 00000000 00000000 c0206b68 00000000 00000000 00000000 00000000 7fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 7fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ef5a7ff4 00000000 [<c04932a4>] (regcache_sync) from [<ee7ebd08>] (0xee7ebd08) Code: c0978f0f e590312c e3530000 1a000000 (e7f001f2) I've bisected this to commit 7c3767115a04bc7aa87bdbd3352d1801d4bbeea4 Author: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon May 9 13:38:10 2016 +0300 ASoC: simple-card: Add pm callbacks to platform driver Set snd_soc_pm_ops for the pm ops to make sure that the ASoC level of PM operations are going to happen. This is needed to get suspend/resume working correctly when the audio is using simple-card. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Reverting it fixes the problem for me. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

2 3

[alsa-devel] [PATCH v2] ASoC: rsnd: open 31bit of SSICKR mask
by Kuninori Morimoto 17 May '16

17 May '16

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> SSICKR (Gen2) / BRGCKR (Gen3) 31bit mask should be opened, because BRGB (= for 48kHz) might select it. Special thanks Yokoyama-san Reported-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v1 -> v2 - removed #define DEBUG (^o^) sound/soc/sh/rcar/adg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 606399d..0891014 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -522,7 +522,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, } } - rsnd_mod_bset(adg_mod, SSICKR, 0x00FF0000, ckr); + rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr); rsnd_mod_write(adg_mod, BRRA, rbga); rsnd_mod_write(adg_mod, BRRB, rbgb); -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: rsnd: open 31bit of SSICKR mask
by Kuninori Morimoto 17 May '16

17 May '16

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> SSICKR (Gen2) / BRGCKR (Gen3) 31bit mask should be opened, because BRGB (= for 48kHz) might select it. Special thanks Yokoyama-san Reported-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/adg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 606399d..061deb7 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -7,6 +7,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ +#define DEBUG #include <linux/clk-provider.h> #include "rsnd.h" @@ -522,7 +523,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, } } - rsnd_mod_bset(adg_mod, SSICKR, 0x00FF0000, ckr); + rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr); rsnd_mod_write(adg_mod, BRRA, rbga); rsnd_mod_write(adg_mod, BRRB, rbgb); -- 1.9.1

1 1

[alsa-devel] Bug report: Sound skipping/stuttering every 5-20 minutes
by darknessdescends＠tutanota.com 16 May '16

16 May '16

My sound skips/stutters for about half a second (certainly no more than 1 second) on average every 5-20 minutes. I initially had no sound on this computer with Ubuntu 14.04, which is probably because Ubuntu 14.04 has an outdated version of Alsa. I then tested with a live disc of Ubuntu 16.04 (before official release date), which did give me sound. At this point, I installed the the latest version of Alsa onto Ubuntu 14.04 from here (because 16.04 wasn't officially released at the time and I didn't want to take chances with an unstable system): https://wiki.ubuntu.com/Audio/UpgradingAlsa/DKMS Sound immediately worked with the latest version of Alsa's driver (March 24, 2016 at the time) on Ubuntu 14.04. However, it came with a cost: this stuttering problem. I then retested with the live disc of Ubuntu 16.04 (this time after the official release date), which also produced sound but with the exact same stuttering problem. I found that on Ubuntu 14.04, the stuttering problem remains unfixed since the March 24, 2016 release of the Alsa daily driver until at least the version I have installed in this bug report. These facts strongly suggest an Alsa problem: 1. The problem does not occur at all on Windows, thus ruling out the possibility of a hardware problem. 2. I had no sound at all before installing the Alsa daily drivers, but did have stuttering sound after installing them. 3. The problem persists on Ubuntu 16.04, which suggests the problem is specific to the driver rather than the operating system. 4. The problem occurs whether playing a locally stored media file with a media player installed on my computer or watching an online video, thus ruling out the possibility that the problem is due to a single browser or plugin issue. 5. Is my hardware too new? Probably not. Here are the results of running "grep "Codec:" /proc/asound/card*/codec*": /proc/asound/card0/codec#0:Codec: Realtek ALC891 /proc/asound/card1/codec#0:Codec: Nvidia Generic The fact that my card is identified by vendor and chip name rather than ID as specified at https://wiki.ubuntu.com/Audio/HDAGeneric suggests that my hardware is supported. By the way, I'm using the Realtek, not the Nvidia HDMI. I've tried disabling all unnecessary channels under alsamixer, but that didn't fix the problem. I tried all 3 potential fixes at https://wiki.ubuntu.com/Audio/PositionReporting, but none worked either. I commented my /etc/modprobe.d/alsa-base.conf and /etc/pulse/default.pa files appropriately to show what I tried (I know at least alsa-base.conf is uploaded). I really appreciate the effort you developers put in to supporting sound on Linux. I hope my bug report will help fix this problem for a lot of users on Skylake systems. More information and attached files can be found here (I filed a bug report with Ubuntu before I found out about Alsa's developer mailing list): https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1580744

1 0

[alsa-devel] [GIT PULL]: Update sst audio firmware for Skylake
by Vinod Koul 16 May '16

16 May '16

Hello Linux firmware maintainers, Please PULL to receive the updated version of Skylake audio firmware version 927. This contains off fixes for system wake and wov module handler. The following changes since commit 8afadbe553017bec1e442b5a9fba859b54fd33fb: ath10k: QCA9377 hw1.0: add firmware and board files (2016-05-03 13:15:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/firmware.git skl for you to fetch changes up to 40d7ffa911fe52d63a12a4cc51231580f81a5fcf: linux-firmware: intel: Update Skylake audio firmware (2016-05-05 12:06:56 +0530) ---------------------------------------------------------------- Vinod Koul (1): linux-firmware: intel: Update Skylake audio firmware WHENCE | 4 ++-- intel/dsp_fw_release.bin | 2 +- intel/dsp_fw_release_v927.bin | Bin 0 -> 233472 bytes 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 intel/dsp_fw_release_v927.bin -- ~Vinod

2 1

[alsa-devel] Porting WM8904 codec to new board - trying to get ALSA aplay going
by Nounou Dadoun 16 May '16

16 May '16

Not sure whether this should go to the dev or users list (or somewhere in between) so I'll start off trying both. I'm trying to port a wm8904 audio driver/codec to a new board and the new board uses a device tree configuration which is new to both me and our project. The target arm board uses a linux 3-10 kernel, I have the wm8904 on the i2c bus and configured the Sound in the device tree to use an i2s controller. The codec and platform driver are modprobed on startup. I've made a lot of progress, I (finally!) have the codec loading/modprobed properly and the platform driver probed and successful (up to a point), so I have in the serial log: [ 6.766524] snd_soc_card_avigilon sound.3: wm8904-hifi <-> 6000a000.i2s mapping ok And at the console: # aplay -l **** List of PLAYBACK Hardware Devices **** card 0: AVIGILONWM8904 [AVIGILON-WM8904], device 0: WM8904-STREAM wm8904-hifi-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 # ls /proc/asound/ AVIGILONWM8904 card0 cards devices pcm timers version # cat /proc/asound/cards 0 [AVIGILONWM8904 ]: AVIGILON-WM8904 - AVIGILON-WM8904 AVIGILON-WM8904 But when I try to play a wave file, I get (no sound and): # aplay -v audiocheck.net_sin_220Hz_0dBFS_10s.wav Playing WAVE 'audiocheck.net_sin_220Hz_0dBFS_10s.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Mono aplay: set_params:1297: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: S16_LE SUBFORMAT: STD SAMPLE_BITS: 16 FRAME_BITS: 16 CHANNELS: 1 RATE: 44100 PERIOD_TIME: (46439 46440) PERIOD_SIZE: 2048 PERIOD_BYTES: 4096 PERIODS: 11 BUFFER_TIME: (510839 510840) BUFFER_SIZE: 22528 BUFFER_BYTES: 45056 TICK_TIME: 0 # But (encouragingly) when I try this, I get my trace statement from the platform driver: [ 3794.140675] Calling avigilon_board_startup in the serial log. >From the canonical/generic platform driver file, the soc_snd_probe probe routine seems to be doing a bunch of dai link configuration and other stuff (including reading values out of the device tree) which I'm not currently doing in my equivalent probe routine. (And which I haven't been able to find any documentation for.) So a few questions: Am I correct in assuming that the " Unable to install hw params " error indicates that something is missing at the board probe level? Any suggestions about what's necessary to get it going? Is there any documentation about what the board probe should be doing to set up the hardware for playback properly? Is the board startup routine required to do anything? (It didn't in the non-device tree implementation which I'm taking it from.) Any other useful hints or pointers? Is there a question which I should be asking which I'm not? Thanks in advance for any assistance which you might be able to provide, my progress to date has involved a lot of trial and error and has been much slower than I would like! ... N Nou Dadoun Senior Firmware Developer, Security Specialist Office: 604.629.5182 ext 2632 Support: 888.281.5182 | avigilon.com Follow Twitter | Follow LinkedIn This email, including any files attached hereto (the "email"), contains privileged and confidential information and is only for the intended addressee(s). If this email has been sent to you in error, such sending does not constitute waiver of privilege and we request that you kindly delete the email and notify the sender. Any unauthorized use or disclosure of this email is prohibited. Avigilon and certain other trade names used herein are the registered and/or unregistered trademarks of Avigilon Corporation and/or its affiliates in Canada and other jurisdictions worldwide.

1 0

[alsa-devel] ALSA Device Driver Programming
by Fredrick Cantabery 16 May '16

16 May '16

First off, let me state that I hope that I am not inappropriately infringing upon anyone's time and hope this post is proper for the audience. Language Acoustics is a startup loudspeaker company who is trying to trying to develop an ALSA compliant sound card driver to support various hardware devices in Linux on an x86 based platform. The sound devices will be multi-channel with both analog and digital inputs and outputs. This has proven to be a difficult hurdle for us and we are reaching out to you to see if you might know someone who might be able to assist in the development effort. We view this as a freelance opportunity for someone but could be interested in other alternative partnerships if someone has interest. Experience in sample rate conversion and the JACK audio connection kit would be highly desirable as well. Thank you for time and consideration. Rick Cantabery Owner, Language Acoustics

1 0

[alsa-devel] ADAU1761 default register value problem
by Ricard Wanderlof 16 May '16

16 May '16

Hi Lars, A while ago I posted a question to the list regarding the default values set up for the ADAU1761 (and similar CODECs), but I didn't get a response. I really need to try and figure out a way forward here though so I'll bring this up again. The problem I have is that the driver assumes that the CODEC has been initialized with the default register settings when the system boots. However, if the system has not been power cycled but just rebooted, this is not necessarily the case, as the CODEC has no external reset pin but derives its reset signal internally from the power level. Furthermore, if the system upon reboot tries to set a register value to one of the default settings (for example as the result of a hw_params() call), then the regcache mechanism will disregard the write as it assumes the default value is already set, which is not necessarily the case. As I see it the solution to this problem is simply not to assume anything about the register settings, so that the first write to a given register always takes effect. I can work on a patch to accomplish this, however, since so much work apparently has been laid down in getting the default values into the driver in the first place, I'm assuming there's something more to the story that I'm missing, so I'd like to get a better grip on this before I dive in. /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 6

[alsa-devel] [PATCH v3] ASoC: MAX9860: new driver
by Peter Rosin 16 May '16

16 May '16

This is a driver for the MAX9860 Mono Audio Voice Codec. https://datasheets.maximintegrated.com/en/ds/MAX9860.pdf This driver does not support sidetone since the DVST register field is backwards with the mute near the maximum level instead of the minimum. Signed-off-by: Peter Rosin <peda(a)axentia.se> --- .../devicetree/bindings/sound/max9860.txt | 28 + MAINTAINERS | 7 + sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/max9860.c | 761 +++++++++++++++++++++ sound/soc/codecs/max9860.h | 162 +++++ 6 files changed, 966 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/max9860.txt create mode 100644 sound/soc/codecs/max9860.c create mode 100644 sound/soc/codecs/max9860.h New in v3: - The updated bindings file went missing in v2. Sorry for the confusion. New in v2: - Add comment about fall through when Integer Clock Mode is not possible. - Drop export of max9860_probe. - Ignore clk docs and read the mclk rate w/o enabling the clock. - Manage the DVDDIO supply. Cheers, Peter diff --git a/Documentation/devicetree/bindings/sound/max9860.txt b/Documentation/devicetree/bindings/sound/max9860.txt new file mode 100644 index 000000000000..e0d4e95e31b3 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/max9860.txt @@ -0,0 +1,28 @@ +MAX9860 Mono Audio Voice Codec + +Required properties: + + - compatible : "maxim,max9860" + + - reg : the I2C address of the device + + - AVDD-supply, DVDD-supply and DVDDIO-supply : power supplies for + the device, as covered in bindings/regulator/regulator.txt + + - clock-names : Required element: "mclk". + + - clocks : A clock specifier for the clock connected as MCLK. + +Examples: + + max9860: max9860@10 { + compatible = "maxim,max9860"; + reg = <0x10>; + + AVDD-supply = <&reg_1v8>; + DVDD-supply = <&reg_1v8>; + DVDDIO-supply = <&reg_3v0>; + + clock-names = "mclk"; + clocks = <&pck2>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index a727d9959ecd..0803396b10f4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7000,6 +7000,13 @@ F: Documentation/devicetree/bindings/i2c/max6697.txt F: drivers/hwmon/max6697.c F: include/linux/platform_data/max6697.h +MAX9860 MONO AUDIO VOICE CODEC DRIVER +M: Peter Rosin <peda(a)axentia.se> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/sound/max9860.txt +F: sound/soc/codecs/max9860* + MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS M: Krzysztof Kozlowski <k.kozlowski(a)samsung.com> L: linux-pm(a)vger.kernel.org diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 7ef3a0c16478..241a23c9aa9f 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -83,6 +83,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98925 if I2C select SND_SOC_MAX98926 if I2C select SND_SOC_MAX9850 if I2C + select SND_SOC_MAX9860 if I2C select SND_SOC_MAX9768 if I2C select SND_SOC_MAX9877 if I2C select SND_SOC_MC13783 if MFD_MC13XXX @@ -534,6 +535,11 @@ config SND_SOC_MAX98926 config SND_SOC_MAX9850 tristate +config SND_SOC_MAX9860 + tristate "Maxim MAX9860 Mono Audio Voice Codec" + depends on I2C + select REGMAP_I2C + config SND_SOC_PCM1681 tristate "Texas Instruments PCM1681 CODEC" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 185a712a7fe7..e435f4df1787 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -78,6 +78,7 @@ snd-soc-max9867-objs := max9867.o snd-soc-max98925-objs := max98925.o snd-soc-max98926-objs := max98926.o snd-soc-max9850-objs := max9850.o +snd-soc-max9860-objs := max9860.o snd-soc-mc13783-objs := mc13783.o snd-soc-ml26124-objs := ml26124.o snd-soc-nau8825-objs := nau8825.o @@ -287,6 +288,7 @@ obj-$(CONFIG_SND_SOC_MAX9867) += snd-soc-max9867.o obj-$(CONFIG_SND_SOC_MAX98925) += snd-soc-max98925.o obj-$(CONFIG_SND_SOC_MAX98926) += snd-soc-max98926.o obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o +obj-$(CONFIG_SND_SOC_MAX9860) += snd-soc-max9860.o obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o diff --git a/sound/soc/codecs/max9860.c b/sound/soc/codecs/max9860.c new file mode 100644 index 000000000000..ee30832b0afb --- /dev/null +++ b/sound/soc/codecs/max9860.c @@ -0,0 +1,761 @@ +/* + * Driver for the MAX9860 Mono Audio Voice Codec + * + * https://datasheets.maximintegrated.com/en/ds/MAX9860.pdf + * + * The driver does not support sidetone since the DVST register field is + * backwards with the mute near the maximum level instead of the minimum. + * + * Author: Peter Rosin <peda(a)axentia.s> + * Copyright 2016 Axentia Technologies + * + * 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. + * + * 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. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <linux/i2c.h> +#include <linux/regulator/consumer.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/pcm_params.h> +#include <sound/tlv.h> + +#include "max9860.h" + +struct max9860_priv { + struct regmap *regmap; + struct regulator *dvddio; + struct notifier_block dvddio_nb; + u8 psclk; + unsigned long pclk_rate; + int fmt; +}; + +static int max9860_dvddio_event(struct notifier_block *nb, + unsigned long event, void *data) +{ + struct max9860_priv *max9860 = container_of(nb, struct max9860_priv, + dvddio_nb); + if (event & REGULATOR_EVENT_DISABLE) { + regcache_mark_dirty(max9860->regmap); + regcache_cache_only(max9860->regmap, true); + } + + return 0; +} + +static const struct reg_default max9860_reg_defaults[] = { + { MAX9860_PWRMAN, 0x00 }, + { MAX9860_INTEN, 0x00 }, + { MAX9860_SYSCLK, 0x00 }, + { MAX9860_AUDIOCLKHIGH, 0x00 }, + { MAX9860_AUDIOCLKLOW, 0x00 }, + { MAX9860_IFC1A, 0x00 }, + { MAX9860_IFC1B, 0x00 }, + { MAX9860_VOICEFLTR, 0x00 }, + { MAX9860_DACATTN, 0x00 }, + { MAX9860_ADCLEVEL, 0x00 }, + { MAX9860_DACGAIN, 0x00 }, + { MAX9860_MICGAIN, 0x00 }, + { MAX9860_MICADC, 0x00 }, + { MAX9860_NOISEGATE, 0x00 }, +}; + +static bool max9860_readable(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX9860_INTRSTATUS ... MAX9860_MICGAIN: + case MAX9860_MICADC ... MAX9860_PWRMAN: + case MAX9860_REVISION: + return true; + } + + return false; +} + +static bool max9860_writeable(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX9860_INTEN ... MAX9860_MICGAIN: + case MAX9860_MICADC ... MAX9860_PWRMAN: + return true; + } + + return false; +} + +static bool max9860_volatile(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX9860_INTRSTATUS: + case MAX9860_MICREADBACK: + return true; + } + + return false; +} + +static bool max9860_precious(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX9860_INTRSTATUS: + return true; + } + + return false; +} + +const struct regmap_config max9860_regmap = { + .reg_bits = 8, + .val_bits = 8, + + .readable_reg = max9860_readable, + .writeable_reg = max9860_writeable, + .volatile_reg = max9860_volatile, + .precious_reg = max9860_precious, + + .max_register = MAX9860_MAX_REGISTER, + .reg_defaults = max9860_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(max9860_reg_defaults), + .cache_type = REGCACHE_RBTREE, +}; + +static const DECLARE_TLV_DB_SCALE(dva_tlv, -9100, 100, 1); +static const DECLARE_TLV_DB_SCALE(dvg_tlv, 0, 600, 0); +static const DECLARE_TLV_DB_SCALE(adc_tlv, -1200, 100, 0); +static const DECLARE_TLV_DB_RANGE(pam_tlv, + 0, MAX9860_PAM_MAX - 1, TLV_DB_SCALE_ITEM(-2000, 2000, 1), + MAX9860_PAM_MAX, MAX9860_PAM_MAX, TLV_DB_SCALE_ITEM(3000, 0, 0)); +static const DECLARE_TLV_DB_SCALE(pgam_tlv, 0, 100, 0); +static const DECLARE_TLV_DB_SCALE(anth_tlv, -7600, 400, 1); +static const DECLARE_TLV_DB_SCALE(agcth_tlv, -1800, 100, 0); + +static const char * const agchld_text[] = { + "AGC Disabled", "50ms", "100ms", "400ms" +}; + +static SOC_ENUM_SINGLE_DECL(agchld_enum, MAX9860_MICADC, + MAX9860_AGCHLD_SHIFT, agchld_text); + +static const char * const agcsrc_text[] = { + "Left ADC", "Left/Right ADC" +}; + +static SOC_ENUM_SINGLE_DECL(agcsrc_enum, MAX9860_MICADC, + MAX9860_AGCSRC_SHIFT, agcsrc_text); + +static const char * const agcatk_text[] = { + "3ms", "12ms", "50ms", "200ms" +}; + +static SOC_ENUM_SINGLE_DECL(agcatk_enum, MAX9860_MICADC, + MAX9860_AGCATK_SHIFT, agcatk_text); + +static const char * const agcrls_text[] = { + "78ms", "156ms", "312ms", "625ms", + "1.25s", "2.5s", "5s", "10s" +}; + +static SOC_ENUM_SINGLE_DECL(agcrls_enum, MAX9860_MICADC, + MAX9860_AGCRLS_SHIFT, agcrls_text); + +static const char * const filter_text[] = { + "Disabled", + "Elliptical HP 217Hz notch (16kHz)", + "Butterworth HP 500Hz (16kHz)", + "Elliptical HP 217Hz notch (8kHz)", + "Butterworth HP 500Hz (8kHz)", + "Butterworth HP 200Hz (48kHz)" +}; + +static SOC_ENUM_SINGLE_DECL(avflt_enum, MAX9860_VOICEFLTR, + MAX9860_AVFLT_SHIFT, filter_text); + +static SOC_ENUM_SINGLE_DECL(dvflt_enum, MAX9860_VOICEFLTR, + MAX9860_DVFLT_SHIFT, filter_text); + +static const struct snd_kcontrol_new max9860_controls[] = { +SOC_SINGLE_TLV("Master Playback Volume", MAX9860_DACATTN, + MAX9860_DVA_SHIFT, MAX9860_DVA_MUTE, 1, dva_tlv), +SOC_SINGLE_TLV("DAC Gain Volume", MAX9860_DACGAIN, + MAX9860_DVG_SHIFT, MAX9860_DVG_MAX, 0, dvg_tlv), +SOC_DOUBLE_TLV("Line Capture Volume", MAX9860_ADCLEVEL, + MAX9860_ADCLL_SHIFT, MAX9860_ADCRL_SHIFT, MAX9860_ADCxL_MIN, 1, + adc_tlv), + +SOC_ENUM("AGC Hold Time", agchld_enum), +SOC_ENUM("AGC/Noise Gate Source", agcsrc_enum), +SOC_ENUM("AGC Attack Time", agcatk_enum), +SOC_ENUM("AGC Release Time", agcrls_enum), + +SOC_SINGLE_TLV("Noise Gate Threshold Volume", MAX9860_NOISEGATE, + MAX9860_ANTH_SHIFT, MAX9860_ANTH_MAX, 0, anth_tlv), +SOC_SINGLE_TLV("AGC Signal Threshold Volume", MAX9860_NOISEGATE, + MAX9860_AGCTH_SHIFT, MAX9860_AGCTH_MIN, 1, agcth_tlv), + +SOC_SINGLE_TLV("Mic PGA Volume", MAX9860_MICGAIN, + MAX9860_PGAM_SHIFT, MAX9860_PGAM_MIN, 1, pgam_tlv), +SOC_SINGLE_TLV("Mic Preamp Volume", MAX9860_MICGAIN, + MAX9860_PAM_SHIFT, MAX9860_PAM_MAX, 0, pam_tlv), + +SOC_ENUM("ADC Filter", avflt_enum), +SOC_ENUM("DAC Filter", dvflt_enum), +}; + +static const struct snd_soc_dapm_widget max9860_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("MICL"), +SND_SOC_DAPM_INPUT("MICR"), + +SND_SOC_DAPM_ADC("ADCL", NULL, MAX9860_PWRMAN, MAX9860_ADCLEN_SHIFT, 0), +SND_SOC_DAPM_ADC("ADCR", NULL, MAX9860_PWRMAN, MAX9860_ADCREN_SHIFT, 0), + +SND_SOC_DAPM_AIF_OUT("AIFOUTL", "Capture", 0, SND_SOC_NOPM, 0, 0), +SND_SOC_DAPM_AIF_OUT("AIFOUTR", "Capture", 1, SND_SOC_NOPM, 0, 0), + +SND_SOC_DAPM_AIF_IN("AIFINL", "Playback", 0, SND_SOC_NOPM, 0, 0), +SND_SOC_DAPM_AIF_IN("AIFINR", "Playback", 1, SND_SOC_NOPM, 0, 0), + +SND_SOC_DAPM_DAC("DAC", NULL, MAX9860_PWRMAN, MAX9860_DACEN_SHIFT, 0), + +SND_SOC_DAPM_OUTPUT("OUT"), + +SND_SOC_DAPM_SUPPLY("Supply", SND_SOC_NOPM, 0, 0, + NULL, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_REGULATOR_SUPPLY("AVDD", 0, 0), +SND_SOC_DAPM_REGULATOR_SUPPLY("DVDD", 0, 0), +SND_SOC_DAPM_CLOCK_SUPPLY("mclk"), +}; + +static const struct snd_soc_dapm_route max9860_dapm_routes[] = { + { "ADCL", NULL, "MICL" }, + { "ADCR", NULL, "MICR" }, + { "AIFOUTL", NULL, "ADCL" }, + { "AIFOUTR", NULL, "ADCR" }, + + { "DAC", NULL, "AIFINL" }, + { "DAC", NULL, "AIFINR" }, + { "OUT", NULL, "DAC" }, + + { "Supply", NULL, "AVDD" }, + { "Supply", NULL, "DVDD" }, + { "Supply", NULL, "mclk" }, + + { "DAC", NULL, "Supply" }, + { "ADCL", NULL, "Supply" }, + { "ADCR", NULL, "Supply" }, +}; + +static int max9860_dai_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9860_priv *max9860 = snd_soc_codec_get_drvdata(codec); + + switch (max9860->fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + case SND_SOC_DAIFMT_CBS_CFS: + return 0; + + default: + return -EINVAL; + } +} + +static int max9860_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 max9860_priv *max9860 = snd_soc_codec_get_drvdata(codec); + u8 master; + u8 ifc1a = 0; + u8 ifc1b = 0; + u8 sysclk = 0; + unsigned long n; + int ret; + + dev_dbg(codec->dev, "hw_params %u Hz, %u channels\n", + params_rate(params), + params_channels(params)); + + if (params_channels(params) == 2) + ifc1b |= MAX9860_ST; + + switch (max9860->fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + master = 0; + break; + case SND_SOC_DAIFMT_CBM_CFM: + master = MAX9860_MASTER; + break; + default: + return -EINVAL; + } + ifc1a |= master; + + if (master) { + if (params_width(params) * params_channels(params) > 48) + ifc1b |= MAX9860_BSEL_64X; + else + ifc1b |= MAX9860_BSEL_48X; + } + + switch (max9860->fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + ifc1a |= MAX9860_DDLY; + ifc1b |= MAX9860_ADLY; + break; + case SND_SOC_DAIFMT_LEFT_J: + ifc1a |= MAX9860_WCI; + break; + case SND_SOC_DAIFMT_DSP_A: + if (params_width(params) != 16) { + dev_err(codec->dev, + "DSP_A works for 16 bits per sample only.\n"); + return -EINVAL; + } + ifc1a |= MAX9860_DDLY | MAX9860_WCI | MAX9860_HIZ | MAX9860_TDM; + ifc1b |= MAX9860_ADLY; + break; + case SND_SOC_DAIFMT_DSP_B: + if (params_width(params) != 16) { + dev_err(codec->dev, + "DSP_B works for 16 bits per sample only.\n"); + return -EINVAL; + } + ifc1a |= MAX9860_WCI | MAX9860_HIZ | MAX9860_TDM; + break; + default: + return -EINVAL; + } + + switch (max9860->fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_NB_IF: + switch (max9860->fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: + return -EINVAL; + } + ifc1a ^= MAX9860_WCI; + break; + case SND_SOC_DAIFMT_IB_IF: + switch (max9860->fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: + return -EINVAL; + } + ifc1a ^= MAX9860_WCI; + /* fall through */ + case SND_SOC_DAIFMT_IB_NF: + ifc1a ^= MAX9860_DBCI; + ifc1b ^= MAX9860_ABCI; + break; + default: + return -EINVAL; + } + + dev_dbg(codec->dev, "IFC1A %02x\n", ifc1a); + ret = regmap_write(max9860->regmap, MAX9860_IFC1A, ifc1a); + if (ret) { + dev_err(codec->dev, "Failed to set IFC1A: %d\n", ret); + return ret; + } + dev_dbg(codec->dev, "IFC1B %02x\n", ifc1b); + ret = regmap_write(max9860->regmap, MAX9860_IFC1B, ifc1b); + if (ret) { + dev_err(codec->dev, "Failed to set IFC1B: %d\n", ret); + return ret; + } + + /* + * Check if Integer Clock Mode is possible, but avoid it in slave mode + * since we then do not know if lrclk is derived from pclk and the + * datasheet mentions that the frequencies have to match exactly in + * order for this to work. + */ + if (params_rate(params) == 8000 || params_rate(params) == 16000) { + if (master) { + switch (max9860->pclk_rate) { + case 12000000: + sysclk = MAX9860_FREQ_12MHZ; + break; + case 13000000: + sysclk = MAX9860_FREQ_13MHZ; + break; + case 19200000: + sysclk = MAX9860_FREQ_19_2MHZ; + break; + default: + /* + * Integer Clock Mode not possible. Leave + * sysclk at zero and fall through to the + * code below for PLL mode. + */ + break; + } + + if (sysclk && params_rate(params) == 16000) + sysclk |= MAX9860_16KHZ; + } + } + + /* + * Largest possible n: + * 65536 * 96 * 48kHz / 10MHz -> 30199 + * Smallest possible n: + * 65536 * 96 * 8kHz / 20MHz -> 2517 + * Both fit nicely in the available 15 bits, no need to apply any mask. + */ + n = DIV_ROUND_CLOSEST_ULL(65536ULL * 96 * params_rate(params), + max9860->pclk_rate); + + if (!sysclk) { + /* PLL mode */ + if (params_rate(params) > 24000) + sysclk |= MAX9860_16KHZ; + + if (!master) + n |= 1; /* trigger rapid pll lock mode */ + } + + sysclk |= max9860->psclk; + dev_dbg(codec->dev, "SYSCLK %02x\n", sysclk); + ret = regmap_write(max9860->regmap, + MAX9860_SYSCLK, sysclk); + if (ret) { + dev_err(codec->dev, "Failed to set SYSCLK: %d\n", ret); + return ret; + } + dev_dbg(codec->dev, "N %lu\n", n); + ret = regmap_write(max9860->regmap, + MAX9860_AUDIOCLKHIGH, n >> 8); + if (ret) { + dev_err(codec->dev, "Failed to set NHI: %d\n", ret); + return ret; + } + ret = regmap_write(max9860->regmap, + MAX9860_AUDIOCLKLOW, n & 0xff); + if (ret) { + dev_err(codec->dev, "Failed to set NLO: %d\n", ret); + return ret; + } + + if (!master) { + dev_dbg(codec->dev, "Enable PLL\n"); + ret = regmap_update_bits(max9860->regmap, MAX9860_AUDIOCLKHIGH, + MAX9860_PLL, MAX9860_PLL); + if (ret) { + dev_err(codec->dev, "Failed to enable PLL: %d\n", ret); + return ret; + } + } + + return 0; +} + +static int max9860_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9860_priv *max9860 = snd_soc_codec_get_drvdata(codec); + + max9860->fmt = fmt; + return 0; +} + +static const struct snd_soc_dai_ops max9860_dai_ops = { + .startup = max9860_dai_startup, + .hw_params = max9860_hw_params, + .set_fmt = max9860_set_fmt, +}; + +static struct snd_soc_dai_driver max9860_dai = { + .name = "max9860-hifi", + .playback = { + .stream_name = "Playback", + .channels_min = 1, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 8000, + .rate_max = 48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 8000, + .rate_max = 48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + }, + .ops = &max9860_dai_ops, + .symmetric_rates = 1, +}; + +static int max9860_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + struct max9860_priv *max9860 = dev_get_drvdata(codec->dev); + int ret; + + switch (level) { + case SND_SOC_BIAS_ON: + case SND_SOC_BIAS_PREPARE: + break; + + case SND_SOC_BIAS_STANDBY: + ret = regmap_update_bits(max9860->regmap, MAX9860_PWRMAN, + MAX9860_SHDN, MAX9860_SHDN); + if (ret) { + dev_err(codec->dev, "Failed to remove SHDN: %d\n", ret); + return ret; + } + break; + + case SND_SOC_BIAS_OFF: + ret = regmap_update_bits(max9860->regmap, MAX9860_PWRMAN, + MAX9860_SHDN, 0); + if (ret) { + dev_err(codec->dev, "Failed to request SHDN: %d\n", + ret); + return ret; + } + break; + } + + return 0; +} + +static struct snd_soc_codec_driver max9860_codec_driver = { + .set_bias_level = max9860_set_bias_level, + .idle_bias_off = true, + + .controls = max9860_controls, + .num_controls = ARRAY_SIZE(max9860_controls), + .dapm_widgets = max9860_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max9860_dapm_widgets), + .dapm_routes = max9860_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(max9860_dapm_routes), +}; + +#ifdef CONFIG_PM +static int max9860_suspend(struct device *dev) +{ + struct max9860_priv *max9860 = dev_get_drvdata(dev); + int ret; + + ret = regmap_update_bits(max9860->regmap, MAX9860_SYSCLK, + MAX9860_PSCLK, MAX9860_PSCLK_OFF); + if (ret) { + dev_err(dev, "Failed to disable clock: %d\n", ret); + return ret; + } + + regulator_disable(max9860->dvddio); + + return 0; +} + +static int max9860_resume(struct device *dev) +{ + struct max9860_priv *max9860 = dev_get_drvdata(dev); + int ret; + + ret = regulator_enable(max9860->dvddio); + if (ret) { + dev_err(dev, "Failed to enable DVDDIO: %d\n", ret); + return ret; + } + + regcache_cache_only(max9860->regmap, false); + ret = regcache_sync(max9860->regmap); + if (ret) { + dev_err(dev, "Failed to sync cache: %d\n", ret); + return ret; + } + + ret = regmap_update_bits(max9860->regmap, MAX9860_SYSCLK, + MAX9860_PSCLK, max9860->psclk); + if (ret) { + dev_err(dev, "Failed to enable clock: %d\n", ret); + return ret; + } + + return 0; +} +#endif + +const struct dev_pm_ops max9860_pm_ops = { + SET_RUNTIME_PM_OPS(max9860_suspend, max9860_resume, NULL) +}; + +static int max9860_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct device *dev = &i2c->dev; + struct max9860_priv *max9860; + int ret; + struct clk *mclk; + unsigned long mclk_rate; + int i; + int intr; + + max9860 = devm_kzalloc(dev, sizeof(struct max9860_priv), GFP_KERNEL); + if (!max9860) + return -ENOMEM; + + max9860->dvddio = devm_regulator_get(dev, "DVDDIO"); + if (IS_ERR(max9860->dvddio)) { + ret = PTR_ERR(max9860->dvddio); + dev_err(dev, "Failed to get DVDDIO supply: %d\n", ret); + return ret; + } + + max9860->dvddio_nb.notifier_call = max9860_dvddio_event; + + ret = regulator_register_notifier(max9860->dvddio, &max9860->dvddio_nb); + if (ret) + dev_err(dev, "Failed to register DVDDIO notifier: %d\n", ret); + + ret = regulator_enable(max9860->dvddio); + if (ret != 0) { + dev_err(dev, "Failed to enable DVDDIO: %d\n", ret); + return ret; + } + + max9860->regmap = devm_regmap_init_i2c(i2c, &max9860_regmap); + if (IS_ERR(max9860->regmap)) { + ret = PTR_ERR(max9860->regmap); + goto err_regulator; + } + + dev_set_drvdata(dev, max9860); + + /* + * mclk has to be in the 10MHz to 60MHz range. + * psclk is used to scale mclk into pclk so that + * pclk is in the 10MHz to 20MHz range. + */ + mclk = clk_get(dev, "mclk"); + + if (IS_ERR(mclk)) { + ret = PTR_ERR(mclk); + dev_err(dev, "Failed to get MCLK: %d\n", ret); + goto err_regulator; + } + + mclk_rate = clk_get_rate(mclk); + clk_put(mclk); + + if (mclk_rate > 60000000 || mclk_rate < 10000000) { + dev_err(dev, "Bad mclk %luHz (needs 10MHz - 60MHz)\n", + mclk_rate); + ret = -EINVAL; + goto err_regulator; + } + if (mclk_rate >= 40000000) + max9860->psclk = 3; + else if (mclk_rate >= 20000000) + max9860->psclk = 2; + else + max9860->psclk = 1; + max9860->pclk_rate = mclk_rate >> (max9860->psclk - 1); + max9860->psclk <<= MAX9860_PSCLK_SHIFT; + dev_dbg(dev, "mclk %lu pclk %lu\n", mclk_rate, max9860->pclk_rate); + + regcache_cache_bypass(max9860->regmap, true); + for (i = 0; i < max9860_regmap.num_reg_defaults; ++i) { + ret = regmap_write(max9860->regmap, + max9860_regmap.reg_defaults[i].reg, + max9860_regmap.reg_defaults[i].def); + if (ret) { + dev_err(dev, "Failed to initialize register %u: %d\n", + max9860_regmap.reg_defaults[i].reg, ret); + goto err_regulator; + } + } + regcache_cache_bypass(max9860->regmap, false); + + ret = regmap_read(max9860->regmap, MAX9860_INTRSTATUS, &intr); + if (ret) { + dev_err(dev, "Failed to clear INTRSTATUS: %d\n", ret); + goto err_regulator; + } + + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + pm_runtime_idle(dev); + + ret = snd_soc_register_codec(dev, &max9860_codec_driver, + &max9860_dai, 1); + if (ret) { + dev_err(dev, "Failed to register CODEC: %d\n", ret); + goto err_pm; + } + + return 0; + +err_pm: + pm_runtime_disable(dev); +err_regulator: + regulator_disable(max9860->dvddio); + return ret; +} + +static int max9860_remove(struct i2c_client *i2c) +{ + struct device *dev = &i2c->dev; + struct max9860_priv *max9860 = dev_get_drvdata(dev); + + snd_soc_unregister_codec(dev); + pm_runtime_disable(dev); + regulator_disable(max9860->dvddio); + return 0; +} + +static const struct i2c_device_id max9860_i2c_id[] = { + { "max9860", }, + { } +}; +MODULE_DEVICE_TABLE(i2c, max9860_i2c_id); + +static const struct of_device_id max9860_of_match[] = { + { .compatible = "maxim,max9860", }, + { } +}; +MODULE_DEVICE_TABLE(of, max9860_of_match); + +static struct i2c_driver max9860_i2c_driver = { + .probe = max9860_probe, + .remove = max9860_remove, + .id_table = max9860_i2c_id, + .driver = { + .name = "max9860", + .of_match_table = max9860_of_match, + .pm = &max9860_pm_ops, + }, +}; + +module_i2c_driver(max9860_i2c_driver); + +MODULE_DESCRIPTION("ASoC MAX9860 Mono Audio Voice Codec driver"); +MODULE_AUTHOR("Peter Rosin <peda(a)axentia.se>"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/max9860.h b/sound/soc/codecs/max9860.h new file mode 100644 index 000000000000..22041bd67a7d --- /dev/null +++ b/sound/soc/codecs/max9860.h @@ -0,0 +1,162 @@ +/* + * Driver for the MAX9860 Mono Audio Voice Codec + * + * Author: Peter Rosin <peda(a)axentia.s> + * Copyright 2016 Axentia Technologies + * + * 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. + * + * 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. + */ + +#ifndef _SND_SOC_MAX9860 +#define _SND_SOC_MAX9860 + +#define MAX9860_INTRSTATUS 0x00 +#define MAX9860_MICREADBACK 0x01 +#define MAX9860_INTEN 0x02 +#define MAX9860_SYSCLK 0x03 +#define MAX9860_AUDIOCLKHIGH 0x04 +#define MAX9860_AUDIOCLKLOW 0x05 +#define MAX9860_IFC1A 0x06 +#define MAX9860_IFC1B 0x07 +#define MAX9860_VOICEFLTR 0x08 +#define MAX9860_DACATTN 0x09 +#define MAX9860_ADCLEVEL 0x0a +#define MAX9860_DACGAIN 0x0b +#define MAX9860_MICGAIN 0x0c +#define MAX9860_RESERVED 0x0d +#define MAX9860_MICADC 0x0e +#define MAX9860_NOISEGATE 0x0f +#define MAX9860_PWRMAN 0x10 +#define MAX9860_REVISION 0xff + +#define MAX9860_MAX_REGISTER 0xff + +/* INTRSTATUS */ +#define MAX9860_CLD 0x80 +#define MAX9860_SLD 0x40 +#define MAX9860_ULK 0x20 + +/* MICREADBACK */ +#define MAX9860_NG 0xe0 +#define MAX9860_AGC 0x1f + +/* INTEN */ +#define MAX9860_ICLD 0x80 +#define MAX9860_ISLD 0x40 +#define MAX9860_IULK 0x20 + +/* SYSCLK */ +#define MAX9860_PSCLK 0x30 +#define MAX9860_PSCLK_OFF 0x00 +#define MAX9860_PSCLK_SHIFT 4 +#define MAX9860_FREQ 0x06 +#define MAX9860_FREQ_NORMAL 0x00 +#define MAX9860_FREQ_12MHZ 0x02 +#define MAX9860_FREQ_13MHZ 0x04 +#define MAX9860_FREQ_19_2MHZ 0x06 +#define MAX9860_16KHZ 0x01 + +/* AUDIOCLKHIGH */ +#define MAX9860_PLL 0x80 +#define MAX9860_NHI 0x7f + +/* AUDIOCLKLOW */ +#define MAX9860_NLO 0xff + +/* IFC1A */ +#define MAX9860_MASTER 0x80 +#define MAX9860_WCI 0x40 +#define MAX9860_DBCI 0x20 +#define MAX9860_DDLY 0x10 +#define MAX9860_HIZ 0x08 +#define MAX9860_TDM 0x04 + +/* IFC1B */ +#define MAX9860_ABCI 0x20 +#define MAX9860_ADLY 0x10 +#define MAX9860_ST 0x08 +#define MAX9860_BSEL 0x07 +#define MAX9860_BSEL_OFF 0x00 +#define MAX9860_BSEL_64X 0x01 +#define MAX9860_BSEL_48X 0x02 +#define MAX9860_BSEL_PCLK_2 0x04 +#define MAX9860_BSEL_PCLK_4 0x05 +#define MAX9860_BSEL_PCLK_8 0x06 +#define MAX9860_BSEL_PCLK_16 0x07 + +/* VOICEFLTR */ +#define MAX9860_AVFLT 0xf0 +#define MAX9860_AVFLT_SHIFT 4 +#define MAX9860_AVFLT_COUNT 6 +#define MAX9860_DVFLT 0x0f +#define MAX9860_DVFLT_SHIFT 0 +#define MAX9860_DVFLT_COUNT 6 + +/* DACATTN */ +#define MAX9860_DVA 0xfe +#define MAX9860_DVA_SHIFT 1 +#define MAX9860_DVA_MUTE 0x5e + +/* ADCLEVEL */ +#define MAX9860_ADCRL 0xf0 +#define MAX9860_ADCRL_SHIFT 4 +#define MAX9860_ADCLL 0x0f +#define MAX9860_ADCLL_SHIFT 0 +#define MAX9860_ADCxL_MIN 15 + +/* DACGAIN */ +#define MAX9860_DVG 0x60 +#define MAX9860_DVG_SHIFT 5 +#define MAX9860_DVG_MAX 3 +#define MAX9860_DVST 0x1f +#define MAX9860_DVST_SHIFT 0 +#define MAX9860_DVST_MIN 31 + +/* MICGAIN */ +#define MAX9860_PAM 0x60 +#define MAX9860_PAM_SHIFT 5 +#define MAX9860_PAM_MAX 3 +#define MAX9860_PGAM 0x1f +#define MAX9860_PGAM_SHIFT 0 +#define MAX9860_PGAM_MIN 20 + +/* MICADC */ +#define MAX9860_AGCSRC 0x80 +#define MAX9860_AGCSRC_SHIFT 7 +#define MAX9860_AGCSRC_COUNT 2 +#define MAX9860_AGCRLS 0x70 +#define MAX9860_AGCRLS_SHIFT 4 +#define MAX9860_AGCRLS_COUNT 8 +#define MAX9860_AGCATK 0x0c +#define MAX9860_AGCATK_SHIFT 2 +#define MAX9860_AGCATK_COUNT 4 +#define MAX9860_AGCHLD 0x03 +#define MAX9860_AGCHLD_OFF 0x00 +#define MAX9860_AGCHLD_SHIFT 0 +#define MAX9860_AGCHLD_COUNT 4 + +/* NOISEGATE */ +#define MAX9860_ANTH 0xf0 +#define MAX9860_ANTH_SHIFT 4 +#define MAX9860_ANTH_MAX 15 +#define MAX9860_AGCTH 0x0f +#define MAX9860_AGCTH_SHIFT 0 +#define MAX9860_AGCTH_MIN 15 + +/* PWRMAN */ +#define MAX9860_SHDN 0x80 +#define MAX9860_DACEN 0x08 +#define MAX9860_DACEN_SHIFT 3 +#define MAX9860_ADCLEN 0x02 +#define MAX9860_ADCLEN_SHIFT 1 +#define MAX9860_ADCREN 0x01 +#define MAX9860_ADCREN_SHIFT 0 + +#endif /* _SND_SOC_MAX9860 */ -- 2.1.4

3 2

[alsa-devel] [PATCH 1/2] ASoC: wm8985: add device tree binding for WM8985
by Petr Kulhavy 16 May '16

16 May '16

Add device tree binding for the WM8985 codec driver. Signed-off-by: Petr Kulhavy <petr(a)barix.com> --- Documentation/devicetree/bindings/sound/wm8985.txt | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/wm8985.txt diff --git a/Documentation/devicetree/bindings/sound/wm8985.txt b/Documentation/devicetree/bindings/sound/wm8985.txt new file mode 100644 index 000000000000..788d64766257 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/wm8985.txt @@ -0,0 +1,36 @@ +Wolfson Microelectronics WM8985 and WM8758 audio codecs + +These devices support both I2C and SPI (configured with pin strapping +on the board). + +Required properties: + + - compatible : "wlf,wm8985" or "wlf,wm8758" + + - reg : the I2C address of the device for I2C, the chip select + number for SPI. + +Pins on the device for linking into audio routes: + + * LIN : left microphone pre-amp negative input + * LIP : left microphone pre-amp positive input + * RIN : right microphone pre-amp negative input + * RIP : right microphone pre-amp positive input + * L2 : left line input / secondary pre-amp positive input + * R2 : right line input / secondary pre-amp positive input + * AUXL : left auxiliary input (WM8985 only) + * AUXR : right auxiliary input (WM8985 only) + + * HPL : left headphone / line output (the LOUT1 pin) + * HPR : right headphone / line output (the ROUT1 pin) + * SPKL : left headphone / line output (the LOUT2 pin) + * SPKR : right headphone / line output (the ROUT2 pin) + * Mic Bias : microphone bias + + +Example: + +wm8758: audio-codec@1a { + compatible = "wlf,wm8758"; + reg = <0x1a>; +}; -- 1.9.1

3 3

[alsa-devel] ERROR messages when PROBE_DEFER ?
by Ricard Wanderlof 16 May '16

16 May '16

In sound/soc/soc-core.c:snd_bind_dai_link() (and a couple of other places), there are a number of dev_err printouts followed by return -EPROBE_DEFER. Should these really be ERROR messages, as a probe deferral is not an error? Admittedly, if there really is a problem, it's nice to get some information about it, so perhaps the error level should be relaxed somewhat? A case in point would be a SOC machine driver which needs a GPIO which is not loaded until after the kernel has booted. /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

1 0

[alsa-devel] [GIT PULL] ASoC updates for v4.7
by Mark Brown 16 May '16

16 May '16

The following changes since commit af9cc93c0dee5fc1f9fa32cd9d79a456738a21be: Merge tag 'asoc-fix-v4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus (2016-04-27 17:30:49 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.7 for you to fetch changes up to 515511a7920c69aebf7f5fef0cb8e1df6767f34c: Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next (2016-05-13 14:27:16 +0100) The diffstat looks terrible because it picks up a couple of -rcs from Linus as well as the actual new changes. ---------------------------------------------------------------- ASoC: Updates for v4.7 The updates this time around are almost all driver code: - Further slow progress on the topology code. - Substantial updates and improvements for the da7219, es8328, fsl-ssi Intel and rcar drivers. ---------------------------------------------------------------- Adam Borowski (1): perf/x86/amd: Set the size of event map array to PERF_COUNT_HW_MAX Adam Thomson (9): ASoC: da7219: Update PLL ranges and dividers to improve locking ASoC: da7219: Disallow unsupported 32KHz clock setting in set_dai_sysclk() ASoC: da7218: Update PLL ranges and dividers to improve locking ASoC: da7219: Add initial ACPI id for device ASoC: da7213: Add DAI DAPM event to control DAI clocks ASoC: da7213: Add checking of SRM lock status before enabling DAI ASoC: da7213: Default PC counter to free-running when DAI disabled ASoC: da7213: Update PLL ranges to improve locking at frequency boundary ASoC: da7213: Allow PLL disable/bypass when using 32KHz sysclk Adrian Hunter (1): mmc: sdhci-acpi: Reduce Baytrail eMMC/SD/SDIO hangs Alex Deucher (4): Revert "drm/amdgpu: disable runtime pm on PX laptops without dGPU power control" drm/amdgpu: print a message if ATPX dGPU power control is missing drm/radeon: make sure vertical front porch is at least 1 drm/amdgpu: make sure vertical front porch is at least 1 Alex Thorlton (1): x86/platform/UV: Bring back the call to map_low_mmrs in uv_system_init Alexander Duyck (2): net: Disable segmentation if checksumming is not supported vxlan: Add checksum check to the features check function Alexander Kurz (1): ARM: mach-imx: sdhci-esdhc-imx: initialize DMA mask Alexander Potapenko (1): lib/stackdepot.c: allow the stack trace hash to be zero Alexander Shishkin (1): perf/x86/intel/pt: Don't die on VMXON Alexandre Bounine (1): rapidio/mport_cdev: fix uapi type definitions Alexei Starovoitov (3): bpf: fix refcnt overflow bpf: fix check_map_func_compatibility logic samples/bpf: fix trace_output example Alexey Brodkin (2): ARC: support generic per-device coherent dma mem ARC: add support for reserved memory defined by device tree Ananth N Mavinakayanahalli (1): Ananth has moved Andi Kleen (2): perf/x86/intel: Add model number for Skylake Server to perf perf/x86: Add model numbers for Kabylake CPUs Andrea Arcangeli (1): mm: thp: kvm: fix memory corruption in KVM with THP enabled Andreas Larsson (1): MAINTAINERS: net: Change maintainer for GRETH 10/100/1G Ethernet MAC device driver Andrew Gabbasov (1): udf: Fix conversion of 'dstring' fields to UTF8 Andrey Ryabinin (1): kcov: don't profile branches in kcov Andy Gross (2): Revert "dts: msm8974: Add blsp2_bam dma node" Revert "dts: msm8974: Add dma channels for blsp2_i2c1 node" Andy Lutomirski (1): Revert "x86/mm/32: Set NX in __supported_pte_mask before enabling paging" Anna-Maria Gleixner (1): net: mvneta: Remove superfluous SMP function call Anton Blanchard (1): powerpc: Fix bad inline asm constraint in create_zero_mask() Antonio Quartulli (2): batman-adv: fix DAT candidate selection (must use vid) batman-adv: B.A.T.M.A.N V - make sure iface is reactivated upon NETDEV_UP event Arnaud Mouiche (6): ASoC: fsl_ssi: Real hardware channels max number is 32 ASoC: fsl_ssi: The IPG/5 limitation concerns the bitclk, not the sysclk. ASoC: fsl_ssi: Save a dev reference for dev_err() purpose. ASoC: fsl_ssi: Fix samples being dropped at Playback startup ASoC: fsl_ssi: Fix channel slipping in Playback at startup ASoC: fsl_ssi: Fix channel slipping on capture (or playback) restart in full duplex. Arnd Bergmann (7): Merge tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/.../agross/linux into fixes Merge tag 'samsung-fixes-4.6' of git://git.kernel.org/.../krzk/linux into fixes Merge tag 'omap-for-v4.6/fixes-rc5-signed' of git://git.kernel.org/.../tmlind/linux-omap into fixes Merge tag 'renesas-fixes2-for-v4.6' of git://git.kernel.org/.../horms/renesas into fixes ARM: davinci: only use NVMEM when available net/smscx5xx: use the device tree for mac address byteswap: try to avoid __builtin_constant_p gcc bug Ashish Samant (1): fuse: Fix return value from fuse_get_user_pages() Ashutosh Dixit (1): misc: mic: Fix for double fetch security bug in VOP driver Atsushi Kumagai (2): kexec: update VMCOREINFO for compound_order/dtor kexec: export OFFSET(page.compound_head) to find out compound tail page Ayala Beker (1): iwlwifi: mvm: avoid to WARN about gscan capabilities Azael Avalos (1): toshiba_acpi: Fix regression caused by hotkey enabling value Babu Moger (1): sparc/PCI: Fix for panic while enabling SR-IOV Bard Liao (1): ASoC: rt5645: polling jd status in all conditions Bert Kenward (1): MAINTAINERS: net: update sfc maintainers Bin Liu (1): Revert "usb: musb: musb_host: Enable HCD_BH flag to handle urb return in bottom half" Boqun Feng (1): locking/lockdep: Fix ->irq_context calculation Borislav Petkov (1): sparc/defconfigs: Remove CONFIG_IPV6_PRIVACY Brijesh Singh (1): ata: add AMD Seattle platform driver Caleb Crome (1): ASoC: fsl_ssi: add CCSR_SSI_SOR to volatile register list Charles Keepax (9): ASoC: wm_adsp: Fix some subtle races on compressed stream ASoC: wm_adsp: Show avail in bytes to match other messages ASoC: cs47l24: Fix a couple of small whitespace errors ASoC: cs47l24: Add support for audio trace firmware ASoC: wm_adsp: Factor out fetching of stream errors from the DSP ASoC: wm_adsp: Improve DSP error handling ASoC: wm_adsp: Add support for TLV based binary controls ASoC: wm_adsp: Move compr_attach/attached functions ASoC: wm_adsp: Detach compressed stream on free Charmaine Lee (2): drm/vmwgfx: Enable SVGA_3D_CMD_DX_SET_PREDICATION drm/vmwgfx: use vmw_cmd_dx_cid_check for query commands. Chen Yu (1): x86/tsc: Read all ratio bits from MSR_PLATFORM_INFO Chen-Yu Tsai (1): mmc: sunxi: Disable eMMC HS-DDR (MMC_CAP_1_8V_DDR) for Allwinner A80 Chris Wilson (1): drm/i915: Avoid stalling on pending flips for legacy cursor updates Christoph Hellwig (1): IB/iser: Fix max_sectors calculation Christophe Jaillet (1): ps3_gelic: fix memcpy parameter Chunyu Hu (1): tracing: Don't display trigger file for events that can't be enabled Colin Ian King (1): net: dsa: mv88e6xxx: fix uninitialized error return Craig Gallek (1): soreuseport: Fix TCP listener hash collision Dan Carpenter (4): md/raid0: fix uninitialized variable bug firmware: qemu_fw_cfg.c: potential unintialized variable virtio: Silence uninitialized variable warning ASoC: hdac_hdmi: Potential NULL deref in hdac_hdmi_get_spk_alloc() Dan Streetman (1): mm/zswap: provide unique zpool name Dan Williams (2): libnvdimm, pfn: fix memmap reservation sizing nfit: fix translation of command status results Daniel Baluta (1): iio: imu: mpu6050: Fix name/chip_id when using ACPI Dave Airlie (6): Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de:/git/lst/linux into drm-fixes Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes drm/amdgpu: set metadata pointer to NULL after freeing. Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2016-05-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes Dave Gerlach (1): ARM: OMAP3: Fix external abort on 36xx waking from off mode idle David Ahern (1): net: ipv6: Delete host routes on an ifdown David Rivshin (5): drivers: net: cpsw: fix parsing of phy-handle DT property in dual_emac config drivers: net: cpsw: fix segfault in case of bad phy-handle drivers: net: cpsw: don't ignore phy-mode if phy-handle is used dt: cpsw: phy-handle, phy_id, and fixed-link are mutually exclusive drivers: net: cpsw: use of_phy_connect() in fixed-link case David S. Miller (19): sparc: Write up preadv2/pwritev2 syscalls. Merge branch 'bridge-mdb-fixes' Merge branch 'macsec-fixes' Merge branch 'mlx5-fixes' ipv6: Revert optional address flusing on ifdown. Revert "ipv6: Revert optional address flusing on ifdown." Merge branch 'bnxt_en-fixes' sparc64: Fix bootup regressions on some Kconfig combinations. Merge tag 'wireless-drivers-for-davem-2016-04-25' of git://git.kernel.org/.../kvalo/wireless-drivers Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Merge tag 'mac80211-for-davem-2016-04-27' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'gre-lwt-fixes' Merge branch 'pegasus-sizes' Merge branch 'cpsw-phy-handle-fixes' Merge branch 'bpf-fixes' Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'mlx5-fixes' Merge branch 'tunnel-csum-and-sg-offloads' Merge branch 'rds-fixes' Dean Luick (1): IB/hfi1: Use kernel default llseek for ui device Dharageswari.R (2): ASoC: Intel: Skylake: Fix the NULL pointer exception in dsp_clean up ASoC: Intel: Skylake: Prevent sending Set DMA Control IPC if the widget is "On" Dmitry V. Levin (1): parisc: fix a bug when syscall number of tracee is __NR_Linux_syscalls Doug Ledford (1): IB/core: Fix oops in ib_cache_gid_set_default_gid Elad Raz (3): switchdev: Adding complete operation to deferred switchdev ops bridge: mdb: Common function for mdb entry translation bridge: mdb: Marking port-group as offloaded Eli Cohen (1): net/mlx5_core: Remove static from local variable Eric Dumazet (1): net/mlx4_en: fix spurious timestamping callbacks Eric Engestrom (3): Documentation: dt: arc: fix spelling mistakes Documentation: networking: fix spelling mistakes MAINTAINERS: fix Rajendra Nayak's address Eric W. Biederman (1): propogate_mnt: Handle the first propogated copy being a slave Evgeny Voevodin (1): ARCv2: Enable LOCKDEP Fabio Estevam (3): ASoC: fsl_sai: Introduce a compatible string for MX6UL ASoC: fsl_sai: Allow setting the SAI MCLK direction MAINTAINERS: Add myself as reviewer of FSL/NXP SoC sound drivers Flora Cui (2): drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail drm/amdgpu: disable vm interrupts with vm_fault_stop=2 Florian Fainelli (1): net: macb: Probe MDIO bus before registering netdev Florian Meier (1): ASoC: pcm5102a: Add support for PCM5102A codec Florian Westphal (1): RDMA/nes: don't leak skb if carrier down Frank Rowand (1): .mailmap: add Frank Rowand Franklin S Cooper Jr (2): ARM: dts: am33xx: Fix GPMC dma properties ARM: dts: am437x: Fix GPMC dma properties Gal Pressman (1): net/mlx5: Unmap only the relevant IO memory mapping Geert Uytterhoeven (2): ARM: shmobile: timer: Fix preset_lpj leading to too short delays arm64: dts: r8a7795: Don't disable referenced optional scif clock Gerald Schaefer (2): s390/mm: fix asce_bits handling with dynamic pagetable levels numa: fix /proc/<pid>/numa_maps for THP Greg Kroah-Hartman (3): Merge tag 'iio-fixes-for-4.6c' of git://git.kernel.org/.../jic23/iio into staging-linus Merge tag 'usb-serial-4.6-rc6' of git://git.kernel.org/.../johan/usb-serial into usb-linus Merge tag 'iio-fixes-for-4.6d' of git://git.kernel.org/.../jic23/iio into staging-linus Grygorii Strashko (1): MAINTAINERS: net: add entry for TI Ethernet Switch drivers Gustavo Padovan (1): drm/virtio: send vblank event after crtc updates H. Nikolaus Schaller (2): Input: twl6040-vibra - fix atomic schedule panic ARM: dts: omap5: fix range of permitted wakeup pinmux registers Hamish Martin (1): tipc: only process unicast on intended node Hans Verkuil (2): [media] davinci_vpfe: Revert "staging: media: davinci_vpfe: remove,unnecessary ret variable" [media] v4l2-dv-timings.h: fix polarity for 4k formats Hans de Goede (1): ARM: dts: sun8i-q8-common: Do not set constraints on dc1sw regulator Hariprasad S (1): RDMA/iw_cxgb4: Fix bar2 virt addr calculation for T4 chips Heikki Krogerus (1): device property: Avoid potential dereferences of invalid pointers Heinrich Schuchardt (2): ASoC: fsl: imx-pcm-fiq: use correct format specifier ASoC: au1x: use correct format specifier Horia Geant? (1): crypto: talitos - fix AEAD tcrypt tests Howard Cochran (1): writeback: Fix performance regression in wb_over_bg_thresh() Hugh Dickins (2): huge pagecache: mmap_sem is unlocked when truncation splits pmd mm, cma: prevent nr_isolated_* counters from going negative Ilya Dryomov (3): libceph: make authorizer destruction independent of ceph_auth_client rbd: fix rbd map vs notify races rbd: report unsupported features to syslog Imre Deak (2): drm/i915: Fix system resume if PCI device remained enabled drm/i915/ddi: Fix eDP VDD handling during booting and suspend/resume Ingo Molnar (1): Merge tag 'efi-urgent' of git://git.kernel.org/.../mfleming/efi into efi/urgent Ivan Babrou (1): net: dummy: remove note about being Y by default Ivaylo Dimitrov (2): ARM: dts: omap3: Fix ISP syscon register offset ARM: dts: omap3-n900: Specify peripherals LDO regulators initial mode James Liao (1): Revert "soc: mediatek: SCPSYS: Fix double enabling of regulators" James Morse (2): ARM: cpuidle: Pass on arm_cpuidle_suspend()'s return value kcov: don't trace the code coverage code Jan Beulich (1): xen/evtchn: fix ring resize when binding new events Jann Horn (1): bpf: fix double-fdput in replace_map_fd_with_map_ptr() Jasem Mutlaq (1): USB: serial: cp210x: add Straizona Focusers device ids Jason Baron (1): mm: update min_free_kbytes from khugepaged after core initialization Jason Gunthorpe (1): IB/security: Restrict use of the write() interface Javier Martinez Canillas (2): i2c: exynos5: Fix possible ABBA deadlock by keeping I2C clock prepared ASoC: cs42l56: Use IS_ENABLED() instead of checking for built-in or module Jean-Philippe Brucker (2): ARM: 8571/1: nommu: fix PMSAv7 setup ARM: 8572/1: nommu: change memory reserve for the vectors Jeeja KP (4): ASoC: Intel: Bxtn: Add Broxton DSP support ASoC: Intel: Skylake: Suspend PCMs when marked as active suspend ASoC: Intel: Boards: remove ignore_suspend for WoV streams ASoC: Intel: Skylake: Fix memory leak in nhlt init Jim Lodes (1): ASoC: davinci-mcasp: Fix overwriting of ahclkx Jiri Benc (5): cxgbi: fix uninitialized flowi6 gre: do not assign header_ops in collect metadata mode gre: build header correctly for collect metadata tunnels gre: reject GUE and FOU in collect metadata mode gre: do not pull header in ICMP error processing Johan Hovold (1): Revert "USB / PM: Allow USB devices to remain runtime-suspended when sleeping" Johannes Berg (1): mac80211: fix statistics leak if dev_alloc_name() fails Johannes Weiner (1): mm: memcontrol: let v2 cgroups follow changes in system swappiness John Keeping (11): ASoC: rockchip: Revert "ASoC: rockchip: i2s: remove unused variables" ASoC: rockchip: Revert "ASoC: rockchip: i2s: separate capture and playback" ASoC: es8328: Move clock setup to hw_params ASoC: es8328: Fix ADC format setup ASoC: es8328: Fix mask for VMIDSEL ASoC: es8328: Use single R/W for regmap ASoC: es8328: Move sample size setup to hw_params ASoC: es8328: Support more sample formats ASoC: es8328: Support more sample rates ASoC: es8328: Set symmetric rates ASoC: dapm: deprecate MICBIAS widget type John Lin (1): ASoC: rt5645: Add dmi_system_id "Google Setzer" John Paul Adrian Glaubitz (2): sparc: Implement and wire up modalias_show for vio. sparc: Implement and wire up vio_hotplug for vio. Jon Cooper (1): sfc: disable RSS when unsupported Jonas Eymann (1): crypto: talitos - fix crash in talitos_cra_init() Joonas Lahtinen (1): ASoC: Intel: Fix printk formatting Joonsoo Kim (1): lib/stackdepot: avoid to return 0 handle Jose Abreu (2): ASoC: dwc: Unmask I2S interrupts only for enabled channels ASoC: dwc: Use fifo depth to program FCR Josh Boyer (1): x86/efi-bgrt: Switch all pr_err() to pr_notice() for invalid BGRT Jubin John (1): IB/rdmavt: Fix send scheduling Jyri Sarha (3): ALSA: pcm: add IEC958 channel status helper for hw_params ALSA: pcm: Allow 32 bit sample format in IEC958 channel status helper ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders K. Y. Srinivasan (1): Drivers: hv: vmbus: Fix signaling logic in hv_need_to_signal_on_read() Kalle Valo (1): Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/.../iwlwifi/iwlwifi-fixes Kan Liang (1): perf/x86/intel: Fix incorrect lbr_sel_mask value Keerthy (2): ARM: dts: dra7: Correct clock tree for sys_32k_ck ARM: DRA7: clockdomain: Implement timer workaround for errata i874 Keith Busch (1): x86/apic: Handle zero vector gracefully in clear_vector_irq() Kevin Hilman (7): Merge tag 'v4.6-soc-fixes' of https://github.com/mbgg/linux-mediatek into fixes Merge tag 'omap-for-v4.6/fixes-rc2-v2-signed' of git://git.kernel.org/.../tmlind/linux-omap into fixes Merge tag 'renesas-fixes-for-v4.6' of git://git.kernel.org/.../horms/renesas into fixes Merge tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/.../tmlind/linux-omap into fixes Merge tag 'imx-fixes-4.6' of git://git.kernel.org/.../shawnguo/linux into fixes Merge tag 'omap-for-v4.6/dt-ti81xx-signed' of git://git.kernel.org/.../tmlind/linux-omap into fixes Merge tag 'sunxi-fixes-for-4.6' of https://git.kernel.org/.../mripard/linux into fixes Khalid Aziz (1): sparc64: recognize and support Sonoma CPU type Kirill A. Shutemov (1): thp: keep huge zero page pinned until tlb flush Knut Wohlrab (1): Input: zforce_ts - fix dual touch recognition Konstantin Khlebnikov (2): mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA check mm/memory-failure: fix race with compound page split/merge Krzysztof Kozlowski (3): iio: ak8975: Fix NULL pointer exception on early interrupt ARM: EXYNOS: Properly skip unitialized parent clock in power domain on mailmap: fix Krzysztof Kozlowski's misspelled name Laszlo Ersek (1): efi: Fix out-of-bounds read in variable_matches() Leo Yan (2): thermal: hisilicon: increase temperature resolution thermal: use %d to print S32 parameters Linus Lüssing (1): batman-adv: Fix broadcast/ogm queue limit on a removed interface Linus Torvalds (66): Merge branch 'linus' of git://git.kernel.org/.../herbert/crypto-2.6 devpts: more pty driver interface cleanups Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc Merge git://git.kernel.org/.../davem/net Merge tag 'platform-drivers-x86-v4.6-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86 Merge tag 'nios2-v4.6-fix' of git://git.kernel.org/.../lftan/nios2 Merge tag 'arc-4.6-rc6-fixes' of git://git.kernel.org/.../vgupta/arc Merge branch 'i2c/for-current' of git://git.kernel.org/.../wsa/linux Merge branch 'for-4.6-fixes' of git://git.kernel.org/.../tj/cgroup Merge branch 'for-4.6-fixes' of git://git.kernel.org/.../tj/wq Merge branch 'for-linus' of git://git.kernel.org/.../s390/linux Merge branch 'for-linus' of git://git.kernel.org/.../sage/ceph-client Merge tag 'sound-4.6-rc6' of git://git.kernel.org/.../tiwai/sound Merge tag 'media/v4.6-4' of git://git.kernel.org/.../mchehab/linux-media Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'locking-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 branch 'akpm' (patches from Andrew) Merge tag 'for-linus' of git://git.kernel.org/.../dledford/rdma Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge tag 'mmc-v4.6-rc4' of git://git.linaro.org/people/ulf.hansson/mmc Merge tag 'pm+acpi-4.6-rc6' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'edac_fix_for_4.6' of git://git.kernel.org/.../bp/bp Merge tag 'powerpc-4.6-4' of git://git.kernel.org/.../powerpc/linux Merge branch 'fixes' of git://git.kernel.org/.../evalenti/linux-soc-thermal Linux 4.6-rc6 Merge git://git.kernel.org/.../davem/sparc Merge git://git.kernel.org/.../davem/net Merge tag 'gpio-v4.6-4' of git://git.kernel.org/.../linusw/linux-gpio Merge branch 'for_linus' of git://git.kernel.org/.../jack/linux-fs Merge tag 'md/4.6-rc6-fix' of git://git.kernel.org/.../shli/md Minimal fix-up of bad hashing behavior of hash_64() Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/.../clk/linux Merge branch 'for-linus' of git://git.kernel.org/.../jikos/hid Merge branch 'for-linus' of git://git.kernel.org/.../mszeredi/fuse Merge git://git.kernel.org/.../davem/net Merge tag 'trace-fixes-v4.6-rc6' of git://git.kernel.org/.../rostedt/linux-trace Merge tag 'for-linus-4.6-rc6-tag' of git://git.kernel.org/.../xen/tip Merge branch 'for-linus' of git://git.kernel.org/.../jmorris/linux-security Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'for_linus' of git://git.kernel.org/.../mst/vhost Merge branch 'for-linus' of git://git.kernel.org/.../ebiederm/user-namespace Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc Merge tag 'asm-generic-4.6' of git://git.kernel.org/.../arnd/asm-generic Merge branch 'libnvdimm-fixes' of git://git.kernel.org/.../nvdimm/nvdimm mailmap: add John Paul Adrian Glaubitz Merge branch 'akpm' (patches from Andrew) Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge tag 'powerpc-4.6-5' of git://git.kernel.org/.../powerpc/linux Merge tag 'arc-4.6-rc7-fixes' of git://git.kernel.org/.../vgupta/arc Merge branch 'parisc-4.6-5' of git://git.kernel.org/.../deller/parisc-linux Merge branch 'efi-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 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'pm+acpi-4.6-rc7' of git://git.kernel.org/.../rafael/linux-pm Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'for-linus' of git://git.kernel.dk/linux-block Merge tag 'for-linus' of git://git.kernel.org/.../dledford/rdma Merge branch 'for-4.6-fixes' of git://git.kernel.org/.../tj/libata Merge tag 'media/v4.6-5' of git://git.kernel.org/.../mchehab/linux-media Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm Merge tag 'usb-4.6-rc7' of git://git.kernel.org/.../gregkh/usb Merge tag 'staging-4.6-rc7' of git://git.kernel.org/.../gregkh/staging Merge tag 'char-misc-4.6-rc7' of git://git.kernel.org/.../gregkh/char-misc Linux 4.6-rc7 Linus Walleij (2): Revert "gpio: rcar: Add Runtime PM handling for interrupts" Revert "gpio: rcar: Fine-grained Runtime PM support" Lothar Waßmann (1): clk: imx6q: fix typo in CAN clock definition Lucas Stach (1): drm/etnaviv: don't move linear memory window on 3D cores without MC2.0 Lyude (1): drm/dp/mst: Restore primary hub guid on resume Majd Dibbiny (2): net/mlx5_core: Add ConnectX-5 to list of supported devices net/mlx5: Add pci shutdown callback Manish Chopra (1): qlcnic: Update version to 5.3.64 Maor Gottlieb (1): net/mlx5_core: Fix soft lockup in steering error flow Marcelo Ricardo Leitner (1): net: fix net_gso_ok for new GSO types. Marek Lindner (1): batman-adv: init neigh node last seen field Marek Szyprowski (2): [media] media: exynos4-is: fix deadlock on driver probe [media] media: s3c-camif: fix deadlock on driver probe() Marek Vasut (2): iio:adc:at91-sama5d2: Repair crash on module removal net: stmmac: socfpga: Remove re-registration of reset controller Mark Brown (18): Merge branch 'topic/dmaengine' of git://git.kernel.org/.../broonie/sound into asoc-bcm2835 Merge branch 'topic/hda' of git://git.kernel.org/.../broonie/sound into asoc-hdmi Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel Merge branch 'topic/arizona' of git://git.kernel.org/.../broonie/sound into asoc-adsp ASoC: da7129: Add missing include of acpi.h Merge branch 'topic/dai-link' of git://git.kernel.org/.../broonie/sound into asoc-intel Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/fsl-ssi', 'asoc/fix/rockchip' and 'asoc/fix/rt286' into asoc-linus Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next Merge remote-tracking branch 'asoc/topic/imx' into asoc-next Merge remote-tracking branch 'asoc/topic/intel' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm5102' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4624', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next Merge remote-tracking branches 'asoc/topic/bcm2835', 'asoc/topic/cs42l56', 'asoc/topic/da7213', 'asoc/topic/da7218' and 'asoc/topic/da7219' into asoc-next Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dwc' into asoc-next Merge remote-tracking branches 'asoc/topic/es8328', 'asoc/topic/find-dai', 'asoc/topic/fsl', 'asoc/topic/fsl-sai' and 'asoc/topic/fsl-ssi' into asoc-next Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next Martin Schwidefsky (1): s390/sclp_ctl: fix potential information leak with /dev/sclp Masahiro Yamada (1): arm64: dts: uniphier: fix I2C nodes of PH1-LD20 Mathias Krause (1): proc: prevent accessing /proc/<PID>/environ until it's ready Matt Fleming (1): MAINTAINERS: Remove asterisk from EFI directory names Matt Ranostay (1): iio: imu: mpu6050: fix possible NULL dereferences Matthew Finlay (3): net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue net/mlx5e: Implement a mlx5e workqueue net/mlx5e: Use workqueue for vxlan ops Matthias Reichl (4): ASoC: bcm2835: add 24bit support ASoC: bcm2835: setup clock only if CPU is clock master ASoC: dmaengine_pcm: Add support for packed transfers ASoC: bcm2835: Add S16_LE support via packed DMA transfers Matti Gottlieb (1): iwlwifi: mvm: fix accessing Null pointer during fw dump collection Mauro Carvalho Chehab (1): [media] media-device: fix builds when USB or PCI is compiled as module Mengdong Lin (3): ASoC: Change DAI link's be_id to a generic id ASoC: Export snd_soc_find_dai() ASoC: Add kerneldoc comments for snd_soc_find_dai Michael Chan (3): bnxt_en: Don't fallback to INTA on VF. bnxt_en: Limit RX BD pages to be no bigger than 32K. bnxt_en: Divide a page into 32K buffers for the aggregation ring if necessary. Michael Ellerman (1): i2c: cpm: Fix build break due to incompatible pointer types Michael Neuling (2): cxl: Keep IRQ mappings on context teardown cxl: Poll for outstanding IRQs when detaching a context Michal Schmidt (1): cxgb3: fix out of bounds read Michał Pecio (1): md/raid0: remove empty line printk from dump_zones Mika Kahola (1): drm/i915: Fix eDP low vswing for Broadwell Mika Westerberg (1): i2c: ismt: Add Intel DNV PCI ID Mike Manning (1): USB: serial: cp210x: add ID for Link ECU Mike Marciniszyn (1): IB/hfi1: Fix missing lock/unlock in verbs drain callback Miklos Szeredi (1): fuse: update mailing list in MAINTAINERS Mimi Zohar (1): ima: fix the string representation of the LSM/IMA hook enumeration ordering Minchan Kim (3): mm: vmscan: reclaim highmem zone if buffer_heads is over limit mm: call swap_slot_free_notify() with page lock held mm/hwpoison: fix wrong num_poisoned_pages accounting Mitko Haralanov (4): IB/hfi1: Prevent NULL pointer deferences in caching code IB/hfi1: Fix deadlock caused by locking with wrong scope IB/hfi1: Prevent unpinning of wrong pages IB/hfi1: Don't attempt to free resources if initialization failed Mousumi Jana (1): ASoC: Intel: Skylake: Fix memory leak during init instance Nazar Mokrynskyi (1): HID: Fix boot delay for Creative SB Omni Surround 5.1 with quirk Neil Armstrong (1): net: ethernet: davinci_emac: Fix devioctl while in fixed link Neil Horman (1): netem: Segment GSO packets on enqueue Nick Dyer (1): Input: atmel_mxt_ts - use mxt_acquire_irq in mxt_soft_reset Nicolas Dichtel (1): ipv6/ila: fix nlsize calculation for lwtunnel Nishanth Menon (3): ARM: OMAP: DRA7: wakeupgen: Skip SAR save for wakeupgen ARM: OMAP: DRA7: Provide proper class to omap2_set_globals_tap ARM: OMAP: Catch callers of revision information prior to it being populated Oleksij Rempel (1): ath9k: ar5008_hw_cmn_spur_mitigate: add missing mask_m & mask_p initialisation Oren Givon (1): iwlwifi: add device IDs for the 8265 device Paolo Abeni (2): ipv4/fib: don't warn when primary address is missing if in_dev is dead ip_tunnel: fix preempt warning in ip tunnel creation/updating Pardha Saradhi K (1): ASoC: Intel: Skylake: Add more SSP DAIs Peter Rosin (1): ASoC: atmel_ssc_dai: read DSP mode A data on rising edges of bclk Peter Ujfalusi (5): ASoC: davinci-mcasp: Do not allow multiple streams in one direction ASoC: davinci-mcasp: Use defines for clkdiv IDs ASoC: davinci-mcasp: Change __davinci_mcasp_set_clkdiv() first parameter ASoC: davinci-mcasp: Restructure the davinci_mcasp_calc_clk_div() ASoC: davinci-mcasp: Calculate AUXCLK divider when setting up master clocks Peter Zijlstra (5): perf/core: Make sysctl_perf_cpu_time_max_percent conform to documentation lockdep: Fix lock_chain::base size nohz/full, sched/rt: Fix missed tick-reenabling bug in sched_can_stop_tick() perf/core: Fix perf_event_open() vs. execve() race perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs Petko Manolov (2): pegasus: fixes URB buffer allocation size; pegasus: fixes reported packet length Petr Kulhavy (2): ASoC: davinci-mcbsp: add binding for McBSP ASoC: Davinci: McBSP: add device tree support for McBSP Philipp Zabel (4): ASoC: hdmi-codec: Add ELD control ASoC: hdmi-codec: Add ELD control gpu: ipu-v3: Fix imx-ipuv3-crtc module autoloading modpost: fix module autoloading for OF devices with generic compatible property Ping Cheng (2): HID: wacom: Add support for DTK-1651 HID: wacom: add missed stylus_in_proximity line back Prarit Bhargava (1): ACPICA: Dispatcher: Update thread ID for recursive method calls Rafael J. Wysocki (6): Revert "cpufreq: governor: Fix negative idle_time when configured with CONFIG_HZ_PERIODIC" Merge branch 'pm-cpufreq-fixes' cpufreq: intel_pstate: Fix HWP on boot CPU after system resume intel_pstate: Fix intel_pstate_get() Merge branches 'acpica-fixes' and 'device-properties-fixes' Merge branches 'pm-opp-fixes', 'pm-cpufreq-fixes' and 'pm-cpuidle-fixes' Ramesh Babu (1): ASoC: Intel: Add Broxton-P machine driver Rana Shahout (1): net/mlx5e: Fix MLX5E_100BASE_T define Randy Dunlap (1): ASoC: intel: add function stub when ACPI is not enabled Ricardo Ribalda Delgado (2): [media] media: vb2: Fix regression on poll() for RW mode [media] vb2-memops: Fix over allocation of frame vectors Richard Fitzgerald (6): ASoC: arizona: Do not create OUT4R widget for CS47L24/WM1831 ASoC: arizona: Prefer lower FRATIO in pseudo-fractional mode ASoC: arizona: No need to update_bits when writing AEC clock control ASoC: wm_adsp: free memory when unloaded or closed ASoC: arizona: call wm_adsp2_remove when codec driver is removed ASoC: wm_adsp: factor out freeing of alg regions Richard Leitner (1): iio: ak8975: fix maybe-uninitialized warning Roger Quadros (1): ARM: dts: am57xx-beagle-x15: remove extcon_usb1 Romain Perier (1): nios2: memset: use the right constraint modifier for the %4 output operand Roman Pen (1): workqueue: fix ghost PENDING flag while doing MQ IO Ross Lagerwall (3): xen: Fix page <-> pfn conversion on 32 bit systems xen/balloon: Fix crash when ballooning on x86 32 bit PAE xen/qspinlock: Don't kick CPU if IRQ is not initialized Rui Salvaterra (1): powerpc: wire up preadv2 and pwritev2 syscalls Russell King (1): maintainers: update rmk's email address(es) Sabrina Dubroca (9): macsec: add missing NULL check after kmalloc macsec: take rtnl lock before for_each_netdev macsec: don't put a NULL rxsa macsec: fix rx_sa refcounting with decrypt callback macsec: add consistency check to netlink dumps macsec: fix memory leaks around rx_handler (un)registration macsec: fix SA leak if initialization fails macsec: add missing macsec prefix in uapi macsec: fix netlink attribute validation Saeed Mahameed (3): net/mlx5e: Device's mtu field is u16 and not int net/mlx5e: Fix minimum MTU net/mlx5e: Use vport MTU rather than physical port MTU Sagi Grimberg (3): IB/core: Don't drain non-existent rq queue-pair IB/mlx5: Expose correct max_sge_rd limit MAINTAINERS: Update iser/isert maintainer contact info Sakari Ailus (2): [media] videobuf2-core: Check user space planes array in dqbuf [media] videobuf2-v4l2: Verify planes array in buffer dequeueing Sara Sharon (1): iwlwifi: 8000: fix MODULE_FIRMWARE input Sascha Hauer (1): ARM: SoCFPGA: Fix secondary CPU startup in thumb2 kernel Sebastian Ott (1): s390/pci: fix use after free in dma_init Sergei Shtylyov (2): pxa168_eth: fix mdiobus_scan() error check macb: fix mdiobus_scan() error check Shaohua Li (2): MD: make bio mergeable raid5: delete unnecessary warnning Shashank Sharma (1): drm/i915: Fake HDMI live status Shreyas NC (1): ASoC: Intel: Skylake: Use UUID in binary format Sinclair Yeh (1): drm/vmwgfx: Fix order of operation Sjoerd Simons (2): ARM: dts: r8a7791: Don't disable referenced optional clocks Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins" Sowmini Varadhan (3): sparc/pci: Refactor dev_archdata initialization into pci_init_dev_archdata RDS:TCP: Synchronize rds_tcp_accept_one with rds_send_xmit when resetting t_sock RDS: TCP: Synchronize accept() and connect() paths on t_conn_lock. Srinivas Kandagatla (3): libahci: save port map for forced port map ata: ahci-platform: Add ports-implemented DT bindings. ARM: dts: apq8064: add ahci ports-implemented mask Srinivas Pandruvada (2): perf/x86/intel/rapl: Add missing Haswell model cpufreq: intel_pstate: Fix processing for turbo activation ratio Stanislav Meduna (1): nvmem: mxs-ocotp: fix buffer overflow in read Stanislaw Gruszka (1): myri10ge: fix sleeping with bh disabled Stephen Boyd (2): Merge tag 'imx-clk-fixes-4.6' of git://git.kernel.org/.../shawnguo/linux into clk-fixes ASoC: ak4642: Remove CLK_IS_ROOT Stephen Rothwell (1): ASoC: Intel: fix up for DAI link's be_id change Steve Capper (1): mm: exclude HugeTLB pages from THP page_mapped() logic Steve Wise (3): iw_cxgb4: initialize ibdev.iwcm->ifname for port mapping iw_cxgb3: initialize ibdev.iwcm->ifname for port mapping iw_cxgb4: handle draining an idle qp Subhransu S. Prusty (9): ALSA: hda - add helper to get channels from cap bits ASoC: hdac_hdmi: parse eld for channel map capability ASoC: hdac_hdmi: Add multichannel support ASoC: skl_rt286: Fix to support hdmi channel map support ASoC: Intel: boards: Update skl_nau88l25_max98357a driver to support chmap ASoC: Intel: boards: Update skl_nau88l25_ssm4567 driver to support chmap ASoC: hdac_hdmi: Register chmap controls and ops ASoC: Intel: Skylake: Add multichannel support for HDMI ASoC: Intel: Skylake: Update channel map based on runtime params Sudeep Holla (2): drivers: firmware: psci: unify enable-method binding on ARM {64,32}-bit systems cpufreq: st: enable selective initialization based on the platform Sven Eckelmann (5): batman-adv: Check skb size before using encapsulated ETH+VLAN header batman-adv: Deactivate TO_BE_ACTIVATED hardif on shutdown batman-adv: Reduce refcnt of removed router when updating route batman-adv: Fix reference counting of vlan object for tt_local_entry batman-adv: Fix reference counting of hardif_neigh_node object for neigh_node Tal Shorer (1): usb: musb: gadget: nuke endpoint before setting its descriptor to NULL Tanmay Jagdale (1): i2c: xlp9xx: add support for Broadcom Vulcan Tejun Heo (2): cgroup, cpuset: replace cpuset_post_attach_flush() with cgroup_subsys->post_attach callback memcg: relocate charge moving from ->attach to ->post_attach Tim Bingham (1): net: Implement net_dbg_ratelimited() for CONFIG_DYNAMIC_DEBUG case Timur Tabi (1): net: phy: at803x: only the AT8030 needs a hardware reset on link change Tomi Valkeinen (2): ARM: dts: omap5-board-common: fix ldo1_reg and ldo4_reg ranges ARM: dts: omap5-cm-t54: fix ldo1_reg and ldo4_reg ranges Tony Lindgren (4): ARM: dts: Add clocks for dm814x ADPLL Merge branch 'fixes-rc2' into omap-for-v4.6/fixes Merge tag 'for-v4.6-rc/omap-fixes-b' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.6/fixes Revert "ARM: OMAP: Catch callers of revision information prior to it being populated" Tony Luck (1): EDAC: i7core, sb_edac: Don't return NOTIFY_BAD from mce_decoder callback Ville Syrjälä (2): drm/i915: Make RPS EI/thresholds multiple of 25 on SNB-BDW gpiolib-acpi: Duplicate con_id string when adding it to the crs lookup list Vineet Gupta (3): ARC: Add missing io barriers to io{read,write}{16,32}be() ARC: Fix PAE40 boot failures due to PTE truncation ARC: support HIGHMEM even without PAE40 Vinod Koul (6): ASoC: Intel: Atom: fix boot warning ASoC: rt298: fix null deref on acpi driver data ASoC: rt298: Add DMI match for Broxton-P reference platform ALSA: hdac: add link pm and ref counting ASoC: Intel: Skylake: add link management ASoC: hdac_hdmi: add link management Viresh Kumar (1): PM / OPP: Remove useless check Vitaly Prosyak (1): drm/radeon: fix vertical bars appear on monitor (v2) Vladimir Murzin (1): ARM: 8573/1: domain: move {set,get}_domain under config guard Vladimir Zapolskiy (2): usb: musb: jz4740: fix error check of usb_get_phy() rapidio: fix potential NULL pointer dereference Vladis Dronov (1): [media] usbvision: revert commit 588afcc1 Vlastimil Babka (2): mm: wake kcompactd before kswapd's short sleep mm: fix kcompactd hang during memory offlining Wang Shanker (1): net: l2tp: fix reversed udp6 checksum flags Wang YanQing (1): x86/sysfb_efi: Fix valid BAR address range check Woojung Huh (2): lan78xx: fix statistics counter error lan78xx: workaround of forced 100 Full/Half duplex mode error Xishi Qiu (1): Documentation/sysctl/vm.txt: update numa_zonelist_order description Yakir Yang (1): i2c: rk3x: add support for rk3228 Yang Shi (1): mm: thp: correct split_huge_pages file permission Yury Norov (1): asm-generic: use compat version for preadv2 and pwritev2 cpaul(a)redhat.com (1): drm/dp/mst: Get validated port ref in drm_dp_update_payload_part1() xuejiufei (1): ocfs2/dlm: return zero if deref_done message is successfully handled .mailmap | 5 + .../devicetree/bindings/arc/archs-pct.txt | 2 +- Documentation/devicetree/bindings/arc/pct.txt | 2 +- Documentation/devicetree/bindings/arm/cpus.txt | 1 - .../devicetree/bindings/ata/ahci-platform.txt | 4 + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 4 +- Documentation/devicetree/bindings/net/cpsw.txt | 6 +- .../devicetree/bindings/sound/davinci-mcbsp.txt | 51 +++ .../devicetree/bindings/sound/fsl-sai.txt | 9 +- .../devicetree/bindings/sound/pcm5102a.txt | 13 + Documentation/networking/altera_tse.txt | 6 +- Documentation/networking/ipvlan.txt | 6 +- Documentation/networking/pktgen.txt | 6 +- Documentation/networking/vrf.txt | 2 +- Documentation/networking/xfrm_sync.txt | 6 +- Documentation/sysctl/vm.txt | 19 +- MAINTAINERS | 77 ++-- Makefile | 4 +- arch/arc/Kconfig | 15 + arch/arc/include/asm/io.h | 27 +- arch/arc/include/asm/irqflags-arcv2.h | 36 +- arch/arc/include/asm/mmzone.h | 43 ++ arch/arc/include/asm/page.h | 15 +- arch/arc/include/asm/pgtable.h | 13 +- arch/arc/kernel/entry-arcv2.S | 10 +- arch/arc/kernel/entry-compact.S | 3 + arch/arc/mm/init.c | 58 ++- arch/arm/boot/dts/am33xx.dtsi | 2 +- arch/arm/boot/dts/am4372.dtsi | 2 +- arch/arm/boot/dts/am57xx-beagle-x15.dts | 17 - arch/arm/boot/dts/dm814x-clocks.dtsi | 243 ++++++++++-- arch/arm/boot/dts/dra62x-clocks.dtsi | 26 ++ arch/arm/boot/dts/dra7xx-clocks.dtsi | 18 +- arch/arm/boot/dts/omap3-n900.dts | 9 + arch/arm/boot/dts/omap34xx.dtsi | 2 +- arch/arm/boot/dts/omap5-board-common.dtsi | 4 +- arch/arm/boot/dts/omap5-cm-t54.dts | 4 +- arch/arm/boot/dts/omap5.dtsi | 2 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 14 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 1 + arch/arm/boot/dts/r8a7791-porter.dts | 14 +- arch/arm/boot/dts/r8a7791.dtsi | 5 +- arch/arm/boot/dts/sun8i-q8-common.dtsi | 2 - arch/arm/include/asm/domain.h | 11 + arch/arm/kernel/head-nommu.S | 2 +- arch/arm/kvm/mmu.c | 2 +- arch/arm/mach-davinci/board-mityomapl138.c | 5 + arch/arm/mach-davinci/common.c | 5 + arch/arm/mach-exynos/pm_domains.c | 2 +- .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 5 +- arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- arch/arm/mach-omap2/io.c | 3 +- arch/arm/mach-omap2/omap-wakeupgen.c | 7 + arch/arm/mach-omap2/pm34xx.c | 23 +- arch/arm/mach-shmobile/timer.c | 28 +- arch/arm/mach-socfpga/headsmp.S | 1 + arch/arm/mm/nommu.c | 15 +- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 1 - .../boot/dts/socionext/uniphier-ph1-ld20-ref.dts | 1 - .../boot/dts/socionext/uniphier-ph1-ld20.dtsi | 20 +- arch/nios2/lib/memset.c | 2 +- arch/parisc/kernel/syscall.S | 2 +- arch/powerpc/include/asm/systbl.h | 2 + arch/powerpc/include/asm/unistd.h | 2 +- arch/powerpc/include/asm/word-at-a-time.h | 2 +- arch/powerpc/include/uapi/asm/unistd.h | 2 + arch/s390/include/asm/mmu.h | 2 +- arch/s390/include/asm/mmu_context.h | 28 +- arch/s390/include/asm/pgalloc.h | 4 +- arch/s390/include/asm/processor.h | 2 +- arch/s390/include/asm/tlbflush.h | 9 +- arch/s390/mm/init.c | 3 +- arch/s390/mm/mmap.c | 6 +- arch/s390/mm/pgalloc.c | 85 ++-- arch/s390/pci/pci_dma.c | 16 +- arch/sparc/configs/sparc32_defconfig | 1 - arch/sparc/configs/sparc64_defconfig | 1 - arch/sparc/include/asm/spitfire.h | 1 + arch/sparc/include/uapi/asm/unistd.h | 4 +- arch/sparc/kernel/cherrs.S | 14 +- arch/sparc/kernel/cpu.c | 6 + arch/sparc/kernel/cpumap.c | 1 + arch/sparc/kernel/fpu_traps.S | 11 +- arch/sparc/kernel/head_64.S | 32 +- arch/sparc/kernel/misctrap.S | 12 +- arch/sparc/kernel/pci.c | 42 +- arch/sparc/kernel/setup_64.c | 7 +- arch/sparc/kernel/spiterrs.S | 18 +- arch/sparc/kernel/systbls_32.S | 2 +- arch/sparc/kernel/systbls_64.S | 4 +- arch/sparc/kernel/utrap.S | 3 +- arch/sparc/kernel/vio.c | 18 + arch/sparc/kernel/vmlinux.lds.S | 4 + arch/sparc/kernel/winfixup.S | 3 +- arch/sparc/mm/init_64.c | 3 + arch/x86/events/amd/core.c | 2 +- arch/x86/events/amd/iommu.c | 1 + arch/x86/events/intel/core.c | 3 + arch/x86/events/intel/lbr.c | 6 +- arch/x86/events/intel/pt.c | 75 +++- arch/x86/events/intel/pt.h | 3 + arch/x86/events/intel/rapl.c | 1 + arch/x86/include/asm/perf_event.h | 4 + arch/x86/kernel/apic/vector.c | 3 +- arch/x86/kernel/apic/x2apic_uv_x.c | 4 +- arch/x86/kernel/head_32.S | 6 - arch/x86/kernel/sysfb_efi.c | 14 +- arch/x86/kernel/tsc_msr.c | 2 +- arch/x86/kvm/mmu.c | 4 +- arch/x86/kvm/vmx.c | 4 + arch/x86/mm/setup_nx.c | 5 +- arch/x86/platform/efi/efi-bgrt.c | 18 +- arch/x86/xen/spinlock.c | 6 + drivers/acpi/acpica/dsmethod.c | 3 + drivers/acpi/nfit.c | 5 +- drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 1 + drivers/ata/ahci_platform.c | 3 + drivers/ata/ahci_seattle.c | 210 ++++++++++ drivers/ata/libahci.c | 1 + drivers/base/power/opp/core.c | 3 - drivers/base/property.c | 2 +- drivers/block/rbd.c | 52 ++- drivers/clk/imx/clk-imx6q.c | 2 +- drivers/cpufreq/cpufreq.c | 26 +- drivers/cpufreq/cpufreq_governor.c | 8 +- drivers/cpufreq/intel_pstate.c | 31 +- drivers/cpufreq/sti-cpufreq.c | 4 + drivers/cpuidle/cpuidle-arm.c | 2 +- drivers/crypto/talitos.c | 87 +++-- drivers/edac/i7core_edac.c | 2 +- drivers/edac/sb_edac.c | 2 +- drivers/firmware/efi/vars.c | 37 +- drivers/firmware/psci.c | 2 +- drivers/firmware/qemu_fw_cfg.c | 2 +- drivers/gpio/gpio-rcar.c | 65 +--- drivers/gpio/gpiolib-acpi.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 4 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 +- drivers/gpu/drm/drm_dp_mst_topology.c | 20 + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 31 +- drivers/gpu/drm/i915/i915_drv.c | 32 +- drivers/gpu/drm/i915/i915_reg.h | 9 +- drivers/gpu/drm/i915/intel_ddi.c | 22 +- drivers/gpu/drm/i915/intel_display.c | 3 + drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_hdmi.c | 12 +- drivers/gpu/drm/radeon/atombios_encoders.c | 4 + drivers/gpu/drm/radeon/evergreen.c | 154 +++++++- drivers/gpu/drm/radeon/evergreen_reg.h | 46 +++ drivers/gpu/drm/ttm/ttm_bo.c | 17 +- drivers/gpu/drm/virtio/virtgpu_display.c | 12 + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 10 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 6 +- drivers/gpu/ipu-v3/ipu-common.c | 7 +- drivers/hid/hid-ids.h | 1 + drivers/hid/usbhid/hid-quirks.c | 1 + drivers/hid/wacom_wac.c | 6 + drivers/hv/ring_buffer.c | 26 +- drivers/i2c/busses/Kconfig | 4 +- drivers/i2c/busses/i2c-cpm.c | 4 +- drivers/i2c/busses/i2c-exynos5.c | 24 +- drivers/i2c/busses/i2c-ismt.c | 2 + drivers/i2c/busses/i2c-rk3x.c | 1 + drivers/iio/adc/at91-sama5d2_adc.c | 2 + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 30 +- drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 3 +- drivers/iio/magnetometer/ak8975.c | 6 +- drivers/infiniband/core/cache.c | 3 +- drivers/infiniband/core/ucm.c | 4 + drivers/infiniband/core/ucma.c | 3 + drivers/infiniband/core/uverbs_main.c | 5 + drivers/infiniband/core/verbs.c | 3 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 + drivers/infiniband/hw/cxgb4/cq.c | 2 +- drivers/infiniband/hw/cxgb4/provider.c | 2 + drivers/infiniband/hw/cxgb4/qp.c | 24 +- drivers/infiniband/hw/mlx5/main.c | 6 +- drivers/infiniband/hw/nes/nes_nic.c | 3 - drivers/infiniband/hw/qib/qib_file_ops.c | 5 + drivers/infiniband/sw/rdmavt/qp.c | 4 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 14 +- drivers/input/misc/twl6040-vibra.c | 16 +- drivers/input/touchscreen/atmel_mxt_ts.c | 28 +- drivers/input/touchscreen/zforce_ts.c | 4 +- drivers/md/md.c | 2 + drivers/md/raid0.c | 2 +- drivers/md/raid5.c | 2 - drivers/media/media-device.c | 8 +- drivers/media/platform/exynos4-is/media-dev.c | 13 +- drivers/media/platform/s3c-camif/camif-core.c | 12 +- drivers/media/usb/usbvision/usbvision-video.c | 7 - drivers/media/v4l2-core/videobuf2-core.c | 20 +- drivers/media/v4l2-core/videobuf2-memops.c | 2 +- drivers/media/v4l2-core/videobuf2-v4l2.c | 20 +- drivers/misc/cxl/context.c | 7 + drivers/misc/cxl/cxl.h | 2 + drivers/misc/cxl/irq.c | 1 - drivers/misc/cxl/native.c | 31 ++ drivers/misc/mic/vop/vop_vringh.c | 5 + drivers/mmc/host/Kconfig | 1 + drivers/mmc/host/sdhci-acpi.c | 81 ++++ drivers/mmc/host/sunxi-mmc.c | 5 + drivers/net/Kconfig | 5 +- drivers/net/dsa/mv88e6xxx.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 53 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 13 + drivers/net/ethernet/cadence/macb.c | 34 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 3 +- drivers/net/ethernet/marvell/mvneta.c | 6 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 106 +++-- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 48 +-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 25 +- drivers/net/ethernet/mellanox/mlx5/core/port.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/uar.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 40 ++ drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 50 ++- drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 11 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- drivers/net/ethernet/sfc/ef10.c | 15 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 50 +-- drivers/net/ethernet/ti/cpsw.c | 67 ++-- drivers/net/ethernet/ti/cpsw.h | 1 + drivers/net/ethernet/ti/davinci_emac.c | 5 +- drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 2 +- drivers/net/macsec.c | 65 ++-- drivers/net/phy/at803x.c | 40 +- drivers/net/usb/lan78xx.c | 44 ++- drivers/net/usb/pegasus.c | 10 +- drivers/net/usb/smsc75xx.c | 12 +- drivers/net/usb/smsc95xx.c | 12 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 8 +- drivers/net/wireless/ath/ath9k/ar9002_phy.c | 5 - drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 26 +- drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 10 + drivers/nvdimm/pmem.c | 13 +- drivers/nvmem/mxs-ocotp.c | 4 +- drivers/platform/x86/toshiba_acpi.c | 2 +- drivers/rapidio/devices/rio_mport_cdev.c | 119 +++--- drivers/s390/char/sclp_ctl.c | 12 +- drivers/scsi/cxgbi/libcxgbi.c | 1 + drivers/soc/mediatek/mtk-scpsys.c | 11 +- drivers/staging/media/davinci_vpfe/vpfe_video.c | 54 ++- drivers/staging/rdma/hfi1/TODO | 2 +- drivers/staging/rdma/hfi1/file_ops.c | 91 ++--- drivers/staging/rdma/hfi1/mmu_rb.c | 40 +- drivers/staging/rdma/hfi1/mmu_rb.h | 3 +- drivers/staging/rdma/hfi1/qp.c | 2 + drivers/staging/rdma/hfi1/user_exp_rcv.c | 11 +- drivers/staging/rdma/hfi1/user_sdma.c | 33 +- drivers/thermal/hisi_thermal.c | 4 +- drivers/thermal/thermal_core.c | 2 +- drivers/tty/pty.c | 18 +- drivers/tty/tty_io.c | 6 +- drivers/usb/core/port.c | 6 - drivers/usb/core/usb.c | 8 +- drivers/usb/musb/jz4740.c | 4 +- drivers/usb/musb/musb_gadget.c | 6 +- drivers/usb/musb/musb_host.c | 2 +- drivers/usb/serial/cp210x.c | 4 + drivers/virtio/virtio_ring.c | 2 +- drivers/xen/balloon.c | 16 + drivers/xen/evtchn.c | 20 +- fs/ceph/mds_client.c | 6 +- fs/devpts/inode.c | 53 +-- fs/fuse/file.c | 2 +- fs/ocfs2/dlm/dlmmaster.c | 2 + fs/pnode.c | 25 +- fs/proc/base.c | 3 +- fs/proc/task_mmu.c | 33 +- fs/udf/super.c | 4 +- fs/udf/udfdecl.h | 2 +- fs/udf/unicode.c | 16 +- include/acpi/acpi_bus.h | 4 +- include/linux/bpf.h | 3 +- include/linux/ceph/auth.h | 10 +- include/linux/ceph/osd_client.h | 1 - include/linux/cgroup-defs.h | 1 + include/linux/cpuset.h | 6 - include/linux/devpts_fs.h | 6 +- include/linux/hash.h | 20 +- include/linux/huge_mm.h | 5 + include/linux/if_ether.h | 5 + include/linux/lockdep.h | 8 +- include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 6 + include/linux/mlx5/device.h | 11 + include/linux/mlx5/driver.h | 7 +- include/linux/mlx5/port.h | 6 +- include/linux/mlx5/vport.h | 2 + include/linux/mm.h | 4 + include/linux/net.h | 10 +- include/linux/netdevice.h | 2 +- include/linux/of.h | 2 +- include/linux/page-flags.h | 22 ++ include/linux/swap.h | 4 + include/linux/tty_driver.h | 4 +- include/media/videobuf2-core.h | 8 + include/net/switchdev.h | 4 + include/net/vxlan.h | 4 +- include/rdma/ib.h | 16 + include/sound/dmaengine_pcm.h | 12 + include/sound/hdaudio_ext.h | 13 + include/sound/hdmi-codec.h | 100 +++++ include/sound/pcm_iec958.h | 2 + include/sound/soc-dapm.h | 3 +- include/sound/soc.h | 5 +- include/uapi/asm-generic/unistd.h | 4 +- include/uapi/linux/if_macsec.h | 4 +- include/{ => uapi}/linux/rio_mport_cdev.h | 144 +++---- include/uapi/linux/swab.h | 24 +- include/uapi/linux/v4l2-dv-timings.h | 30 +- include/xen/page.h | 4 +- kernel/bpf/inode.c | 7 +- kernel/bpf/syscall.c | 24 +- kernel/bpf/verifier.c | 77 ++-- kernel/cgroup.c | 7 +- kernel/cpuset.c | 4 +- kernel/events/core.c | 55 ++- kernel/kcov.c | 3 +- kernel/kexec_core.c | 7 +- kernel/locking/lockdep.c | 37 +- kernel/locking/lockdep_proc.c | 2 + kernel/sched/core.c | 29 +- kernel/trace/trace_events.c | 9 +- kernel/workqueue.c | 29 ++ lib/stackdepot.c | 10 +- mm/compaction.c | 14 +- mm/huge_memory.c | 16 +- mm/memcontrol.c | 37 +- mm/memory-failure.c | 10 +- mm/memory.c | 51 ++- mm/migrate.c | 8 +- mm/page-writeback.c | 6 +- mm/page_alloc.c | 2 +- mm/page_io.c | 6 +- mm/swap.c | 5 + mm/vmscan.c | 30 +- mm/zswap.c | 8 +- net/batman-adv/bat_v.c | 12 + net/batman-adv/distributed-arp-table.c | 17 +- net/batman-adv/hard-interface.c | 6 +- net/batman-adv/originator.c | 17 +- net/batman-adv/routing.c | 9 + net/batman-adv/send.c | 6 + net/batman-adv/soft-interface.c | 8 +- net/batman-adv/translation-table.c | 42 +- net/batman-adv/types.h | 7 + net/bridge/br_mdb.c | 124 +++--- net/bridge/br_multicast.c | 8 +- net/bridge/br_private.h | 4 +- net/ceph/auth.c | 8 +- net/ceph/auth_none.c | 71 ++-- net/ceph/auth_none.h | 3 +- net/ceph/auth_x.c | 21 +- net/ceph/auth_x.h | 1 + net/ceph/osd_client.c | 6 +- net/core/dev.c | 2 +- net/ipv4/fib_frontend.c | 6 +- net/ipv4/inet_hashtables.c | 2 + net/ipv4/ip_gre.c | 30 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv6/addrconf.c | 48 +-- net/ipv6/ila/ila_lwt.c | 3 +- net/l2tp/l2tp_core.c | 4 +- net/mac80211/iface.c | 4 +- net/rds/tcp.c | 3 +- net/rds/tcp.h | 4 + net/rds/tcp_connect.c | 8 + net/rds/tcp_listen.c | 54 ++- net/sched/sch_netem.c | 61 ++- net/switchdev/switchdev.c | 6 + net/tipc/node.c | 5 + samples/bpf/trace_output_kern.c | 1 - scripts/mod/file2alias.c | 69 ++-- security/integrity/ima/ima_policy.c | 4 +- sound/core/pcm_dmaengine.c | 11 +- sound/core/pcm_iec958.c | 65 +++- sound/hda/ext/hdac_ext_bus.c | 3 + sound/hda/ext/hdac_ext_controller.c | 66 ++++ sound/hda/local.h | 10 + sound/soc/atmel/atmel_ssc_dai.c | 4 +- sound/soc/au1x/dbdma2.c | 4 +- sound/soc/bcm/bcm2835-i2s.c | 27 +- sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/ak4642.c | 4 +- sound/soc/codecs/arizona.c | 32 +- sound/soc/codecs/cs42l56.c | 2 +- sound/soc/codecs/cs47l24.c | 46 ++- sound/soc/codecs/da7213.c | 99 ++++- sound/soc/codecs/da7213.h | 35 +- sound/soc/codecs/da7218.c | 32 +- sound/soc/codecs/da7218.h | 21 +- sound/soc/codecs/da7219.c | 38 +- sound/soc/codecs/da7219.h | 20 +- sound/soc/codecs/es8328.c | 194 ++++++--- sound/soc/codecs/es8328.h | 23 +- sound/soc/codecs/hdac_hdmi.c | 195 +++++++++- sound/soc/codecs/hdmi-codec.c | 432 +++++++++++++++++++++ sound/soc/codecs/pcm5102a.c | 69 ++++ sound/soc/codecs/rt298.c | 19 +- sound/soc/codecs/rt5645.c | 16 +- sound/soc/codecs/wm5102.c | 4 + sound/soc/codecs/wm5110.c | 6 + sound/soc/codecs/wm_adsp.c | 292 ++++++++++---- sound/soc/codecs/wm_adsp.h | 1 + sound/soc/davinci/Kconfig | 6 +- sound/soc/davinci/davinci-i2s.c | 80 ++-- sound/soc/davinci/davinci-mcasp.c | 92 +++-- sound/soc/davinci/davinci-mcasp.h | 5 + sound/soc/dwc/designware_i2s.c | 14 +- sound/soc/fsl/fsl_sai.c | 24 +- sound/soc/fsl/fsl_ssi.c | 81 +++- sound/soc/fsl/imx-pcm-fiq.c | 2 +- sound/soc/intel/Kconfig | 16 + sound/soc/intel/atom/sst-atom-controls.c | 2 +- sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/broadwell.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 353 +++++++++++++++++ sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/intel/boards/haswell.c | 2 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 87 ++++- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 86 +++- sound/soc/intel/boards/skl_rt286.c | 59 ++- sound/soc/intel/common/sst-acpi.h | 9 + sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +- sound/soc/intel/skylake/Makefile | 2 +- sound/soc/intel/skylake/bxt-sst.c | 328 ++++++++++++++++ sound/soc/intel/skylake/skl-messages.c | 122 +++++- sound/soc/intel/skylake/skl-nhlt.c | 15 +- sound/soc/intel/skylake/skl-pcm.c | 119 +++++- sound/soc/intel/skylake/skl-sst-dsp.c | 2 - sound/soc/intel/skylake/skl-sst-dsp.h | 15 +- sound/soc/intel/skylake/skl-sst.c | 13 +- sound/soc/intel/skylake/skl-topology.c | 27 +- sound/soc/intel/skylake/skl-topology.h | 2 +- sound/soc/intel/skylake/skl-tplg-interface.h | 2 +- sound/soc/intel/skylake/skl.c | 39 +- sound/soc/intel/skylake/skl.h | 6 +- sound/soc/rockchip/rockchip_i2s.c | 87 +++-- sound/soc/soc-core.c | 14 +- sound/soc/soc-generic-dmaengine-pcm.c | 57 +-- 461 files changed, 7248 insertions(+), 2394 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.txt create mode 100644 Documentation/devicetree/bindings/sound/pcm5102a.txt create mode 100644 arch/arc/include/asm/mmzone.h create mode 100644 drivers/ata/ahci_seattle.c create mode 100644 include/sound/hdmi-codec.h rename include/{ => uapi}/linux/rio_mport_cdev.h (74%) create mode 100644 sound/soc/codecs/hdmi-codec.c create mode 100644 sound/soc/codecs/pcm5102a.c create mode 100644 sound/soc/intel/boards/bxt_rt298.c create mode 100644 sound/soc/intel/skylake/bxt-sst.c

2 5

[alsa-devel] [PATCH] ASoC: hdac_hdmi: Remove the unused 'timeout' variable
by Fabio Estevam 16 May '16

16 May '16

From: Fabio Estevam <fabio.estevam(a)nxp.com> Commit b2047e996cd88d3 ("ASoC: hdac_hdmi: add link management") introuduced the following build warning: sound/soc/codecs/hdac_hdmi.c:1721:16: warning: unused variable 'timeout' [-Wunused-variable] Remove the unused 'timeout' variable. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/codecs/hdac_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 3733297..181cd3b 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1718,7 +1718,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdac = &edev->hdac; struct hdac_bus *bus = hdac->bus; - unsigned long timeout; struct hdac_ext_bus *ebus = hbus_to_ebus(bus); struct hdac_ext_link *hlink = NULL; int err; -- 1.9.1

1 0