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

[alsa-devel] Potential Audio miniconference at LPC/KS
by Mark Brown 24 Oct '16

24 Oct '16

Hi, As in previous years we're trying to organize an audio miniconference so we can get together and talk through issues, especially design decisons, face to face. This year we're trying a slightly different tack and trying to organize this as part of the workshops day at Kernel Summit and Linux Plumbers in Santa Fe the week 31st October to 4th November (I'm writing this offline so don't have the exact date for the workshop day, sorry). There is a wiki page with an initial list of proposed topics here: http://wiki.linuxplumbersconf.org/2016:workshops In order to get this workshop approved we're going to need both a clear set of things to discuss and visible interest from attendees so if people could both follow up here and add to the wiki with suggestions of topics that'd be especially appreciated. Thanks, Mark

4 14

[alsa-devel] [PATCH 0/7] ALSA: Add rewinds disabled, delays, max_inflight_bytes
by Subhransu S. Prusty 21 Oct '16

21 Oct '16

Set of patches to fix issues with delays, hw_ptr fuzziness [1] and increased buffering w/ DSPs 1. Rewinds can be disabled when data written in ring buffer will never be validated. This allow for new HDaudio SPIB DMA functionality(allow fetch up to the application pointer, no rewind supported) 2. Report max in-flight bytes to avoid problems with stale data (like late wake-ups, rewinds) 3. add new estimate for USB startup delay. [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2015-June/093646.html Pierre-Louis Bossart (6): ALSA: core: let low-level driver or userspace disable rewinds ALSA: core: add .update_appl_ptr callback for pcm ops ALSA: core: add report of max inflight bytes ALSA: hda: add default value for max_inflight_bytes ALSA: usb: no_period_wake and max_inflight_bytes report ALSA: usb: take startup delay into account Ramesh Babu (1): ALSA: pcm: avoid mmap of control data if .update_appl_ptr is implemented include/sound/pcm.h | 4 +++ include/uapi/sound/asound.h | 6 ++-- sound/core/pcm_lib.c | 26 ++++++++++++++++++ sound/core/pcm_native.c | 51 +++++++++++++++++++++++++++++++++- sound/pci/hda/hda_controller.c | 1 + sound/usb/card.h | 1 + sound/usb/pcm.c | 62 +++++++++++++++++++++++++++++++++++++----- 7 files changed, 141 insertions(+), 10 deletions(-) -- 1.9.1

6 29

[alsa-devel] [PATCH 0/2 v2][resend] DesignWare HDMI I2S suport
by Kuninori Morimoto 17 Oct '16

17 Oct '16

Hi Archit, Mark Cc Thierry, Russell These are resend of v2 of DesignWare HDMI I2S support patches. (I added drm-bridge maintainer Archit on To:) It will use ALSA SoC hdmi-codec driver, but we can't use it as-is at this point. 1) patch tidyup hdmi-codec driver to enable dw-hdmi I2S support. 2) patch is based on it. Difficult is that these 2 patches are under different maintainer. 1) Mark ? 2) Archit ? Kuninori Morimoto (2): 1) ASoC: hdmi-codec: enable multi probe for same device 2) drm: bridge: add DesignWare HDMI I2S audio support drivers/gpu/drm/bridge/Kconfig | 8 ++++++++ drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/dw-hdmi-audio.h | 7 +++++++ drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/bridge/dw-hdmi.c | 22 ++++++++++++++++++-- drivers/gpu/drm/bridge/dw-hdmi.h | 21 +++++++++++++++++++ sound/soc/codecs/hdmi-codec.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 251 insertions(+), 5 deletions(-) -- 1.9.1

2 5

[alsa-devel] [PATCH] ASoC: topology: Reenable use from userspace
by Mark Brown 11 Oct '16

11 Oct '16

We had inserted a #error into the topology UAPI code to ensure that the ABI was not adopted by userspace while final review and testing was ongoing. Since we are now comfortable that the ABI is suitable for production remove the #error, future changes will include provision for backwards compatibility. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Are we OK with this? Looking for some acks and reviews... include/uapi/sound/asoc.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 247c50b..51b8066 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -18,12 +18,6 @@ #include <linux/types.h> #include <sound/asound.h> -#ifndef __KERNEL__ -#error This API is an early revision and not enabled in the current -#error kernel release, it will be enabled in a future kernel version -#error with incompatible changes to what is here. -#endif - /* * Maximum number of channels topology kcontrol can represent. */ -- 2.6.1

4 6

[alsa-devel] [PATCH v2] ASoC: cs4270: fix DAPM stream name mismatch
by murray foster 07 Oct '16

07 Oct '16

Mismatching stream names in DAPM route and widget definitions are causing compilation errors. Fixing these names allows the cs4270 driver to compile and function. Signed-off-by: Murray Foster <mrafoster(a)gmail.com> --- Changes in v2: - Remove the 's' typo at the beginning of the codec driver. sound/soc/codecs/cs4270.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index e07807d..3670086 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -148,11 +148,11 @@ SND_SOC_DAPM_OUTPUT("AOUTR"), }; static const struct snd_soc_dapm_route cs4270_dapm_routes[] = { - { "Capture", NULL, "AINA" }, - { "Capture", NULL, "AINB" }, + { "Capture", NULL, "AINL" }, + { "Capture", NULL, "AINR" }, - { "AOUTA", NULL, "Playback" }, - { "AOUTB", NULL, "Playback" }, + { "AOUTL", NULL, "Playback" }, + { "AOUTR", NULL, "Playback" }, }; /** -- 2.4.9

4 5

[alsa-devel] [PATCH v3] clk: x86: Add Atom PMC platform clocks
by Irina Tirdea 06 Oct '16

06 Oct '16

The BayTrail and CherryTrail platforms provide platform clocks through their Power Management Controller (PMC). The SoC supports up to 6 clocks (PMC_PLT_CLK[5:0]) with a frequency of either 19.2 MHz (PLL) or 25 MHz (XTAL) for BayTrail an a frequency of 19.2 MHz (XTAL) for CherryTrail. These clocks are available for general system use, where appropriate, and each have Control & Frequency register fields associated with them. For example, the usage for platform clocks suggested in the datasheet is the following: PLT_CLK[2:0] - Camera PLT_CLK[3] - Audio Codec PLT_CLK[4] - PLT_CLK[5] - COMMs Signed-off-by: Irina Tirdea <irina.tirdea(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- Notes: Submitting this patch through the clock tree as requested by Mark Brown. This patch specifically enables the audio MCLK required by Baytrail CR devices (support already merged in Mark's tree) Changes from v2: - move clk platform data structures to a separate include file - store clk_hw pointer for the fixed rate clocks Changes from v1: - register the clk device as child of pmc device - pass iomem pointer from pmc driver to clk driver to avoid using pmc_atom_read()/write() and use readl/writel API instead - use devm_clk_hw_register/clkdev_hw_create instead of clk_register/clkdev_create arch/x86/Kconfig | 1 + arch/x86/include/asm/pmc_atom.h | 3 + arch/x86/platform/atom/pmc_atom.c | 78 +++++- drivers/clk/x86/Makefile | 1 + drivers/clk/x86/clk-byt-plt.c | 381 ++++++++++++++++++++++++++++++ include/linux/platform_data/clk-byt-plt.h | 31 +++ 6 files changed, 492 insertions(+), 3 deletions(-) create mode 100644 drivers/clk/x86/clk-byt-plt.c create mode 100644 include/linux/platform_data/clk-byt-plt.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2a1f0ce..3e603a8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2744,6 +2744,7 @@ config X86_DMA_REMAP config PMC_ATOM def_bool y depends on PCI + select COMMON_CLK config VMD depends on PCI_MSI diff --git a/arch/x86/include/asm/pmc_atom.h b/arch/x86/include/asm/pmc_atom.h index aa8744c..2d310cf 100644 --- a/arch/x86/include/asm/pmc_atom.h +++ b/arch/x86/include/asm/pmc_atom.h @@ -50,6 +50,9 @@ BIT_ORED_DEDICATED_IRQ_GPSC | \ BIT_SHARED_IRQ_GPSS) +/* Platform clock control registers */ +#define PMC_CLK_CTL_0 0x60 + /* The timers acumulate time spent in sleep state */ #define PMC_S0IR_TMR 0x80 #define PMC_S0I1_TMR 0x84 diff --git a/arch/x86/platform/atom/pmc_atom.c b/arch/x86/platform/atom/pmc_atom.c index 964ff4f..b353893 100644 --- a/arch/x86/platform/atom/pmc_atom.c +++ b/arch/x86/platform/atom/pmc_atom.c @@ -21,6 +21,8 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/platform_data/clk-byt-plt.h> #include <asm/pmc_atom.h> @@ -37,6 +39,11 @@ struct pmc_reg_map { const struct pmc_bit_map *pss; }; +struct pmc_data { + const struct pmc_reg_map *map; + const struct pmc_clk *clks; +}; + struct pmc_dev { u32 base_addr; void __iomem *regmap; @@ -50,6 +57,29 @@ struct pmc_dev { static struct pmc_dev pmc_device; static u32 acpi_base_addr; +static const struct pmc_clk byt_clks[] = { + { + .name = "xtal", + .freq = 25000000, + .parent_name = NULL, + }, + { + .name = "pll", + .freq = 19200000, + .parent_name = "xtal", + }, + {}, +}; + +static const struct pmc_clk cht_clks[] = { + { + .name = "xtal", + .freq = 19200000, + .parent_name = NULL, + }, + {}, +}; + static const struct pmc_bit_map d3_sts_0_map[] = { {"LPSS1_F0_DMA", BIT_LPSS1_F0_DMA}, {"LPSS1_F1_PWM1", BIT_LPSS1_F1_PWM1}, @@ -169,6 +199,16 @@ static const struct pmc_reg_map cht_reg_map = { .pss = cht_pss_map, }; +static const struct pmc_data byt_data = { + .map = &byt_reg_map, + .clks = byt_clks, +}; + +static const struct pmc_data cht_data = { + .map = &cht_reg_map, + .clks = cht_clks, +}; + static inline u32 pmc_reg_read(struct pmc_dev *pmc, int reg_offset) { return readl(pmc->regmap + reg_offset); @@ -382,10 +422,36 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc) } #endif /* CONFIG_DEBUG_FS */ +static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap, + const struct pmc_data *pmc_data) +{ + struct platform_device *clkdev; + struct pmc_clk_data *clk_data; + + clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); + if (!clk_data) + return -ENOMEM; + + clk_data->base = pmc_regmap + PMC_CLK_CTL_0; + clk_data->clks = pmc_data->clks; + + clkdev = platform_device_register_data(&pdev->dev, "clk-byt-plt", -1, + clk_data, sizeof(*clk_data)); + if (IS_ERR(clkdev)) { + kfree(clk_data); + return PTR_ERR(clkdev); + } + + kfree(clk_data); + + return 0; +} + static int pmc_setup_dev(struct pci_dev *pdev, const struct pci_device_id *ent) { struct pmc_dev *pmc = &pmc_device; - const struct pmc_reg_map *map = (struct pmc_reg_map *)ent->driver_data; + const struct pmc_data *data = (struct pmc_data *)ent->driver_data; + const struct pmc_reg_map *map = data->map; int ret; /* Obtain ACPI base address */ @@ -414,6 +480,12 @@ static int pmc_setup_dev(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) dev_warn(&pdev->dev, "debugfs register failed\n"); + /* Register platform clocks - PMC_PLT_CLK [5:0] */ + ret = pmc_setup_clks(pdev, pmc->regmap, data); + if (ret) + dev_warn(&pdev->dev, "platform clocks register failed: %d\n", + ret); + pmc->init = true; return ret; } @@ -424,8 +496,8 @@ static int pmc_setup_dev(struct pci_dev *pdev, const struct pci_device_id *ent) * used by pci_match_id() call below. */ static const struct pci_device_id pmc_pci_ids[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_VLV_PMC), (kernel_ulong_t)&byt_reg_map }, - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_CHT_PMC), (kernel_ulong_t)&cht_reg_map }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_VLV_PMC), (kernel_ulong_t)&byt_data }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_CHT_PMC), (kernel_ulong_t)&cht_data }, { 0, }, }; diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile index 0478138..cbdc8cc 100644 --- a/drivers/clk/x86/Makefile +++ b/drivers/clk/x86/Makefile @@ -1,2 +1,3 @@ clk-x86-lpss-objs := clk-lpt.o obj-$(CONFIG_X86_INTEL_LPSS) += clk-x86-lpss.o +obj-$(CONFIG_PMC_ATOM) += clk-byt-plt.o diff --git a/drivers/clk/x86/clk-byt-plt.c b/drivers/clk/x86/clk-byt-plt.c new file mode 100644 index 0000000..9dbf4b0 --- /dev/null +++ b/drivers/clk/x86/clk-byt-plt.c @@ -0,0 +1,381 @@ +/* + * Intel Atom platform clocks driver for BayTrail and CherryTrail SoC. + * + * Copyright (C) 2016, Intel Corporation + * Author: Irina Tirdea <irina.tirdea(a)intel.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include <linux/clk-provider.h> +#include <linux/err.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/clkdev.h> +#include <linux/platform_data/clk-byt-plt.h> + +#define PLT_CLK_NAME_BASE "pmc_plt_clk_" +#define PLT_CLK_DRIVER_NAME "clk-byt-plt" + +#define PMC_CLK_CTL_SIZE 4 +#define PMC_CLK_NUM 6 +#define PMC_MASK_CLK_CTL GENMASK(1, 0) +#define PMC_MASK_CLK_FREQ BIT(2) +#define PMC_CLK_CTL_GATED_ON_D3 0x0 +#define PMC_CLK_CTL_FORCE_ON 0x1 +#define PMC_CLK_CTL_FORCE_OFF 0x2 +#define PMC_CLK_CTL_RESERVED 0x3 +#define PMC_CLK_FREQ_XTAL 0x0 /* 25 MHz */ +#define PMC_CLK_FREQ_PLL 0x4 /* 19.2 MHz */ + +struct clk_plt_fixed { + struct clk_hw *clk; + struct clk_lookup *lookup; +}; + +struct clk_plt { + struct clk_hw hw; + void __iomem *reg; + struct clk_lookup *lookup; + spinlock_t lock; +}; + +#define to_clk_plt(_hw) container_of(_hw, struct clk_plt, hw) + +struct clk_plt_data { + struct clk_plt_fixed **parents; + u8 nparents; + struct clk_plt *clks[PMC_CLK_NUM]; +}; + +static inline int plt_reg_to_parent(int reg) +{ + switch (reg & PMC_MASK_CLK_FREQ) { + case PMC_CLK_FREQ_XTAL: + return 0; /* index 0 in parents[] */ + case PMC_CLK_FREQ_PLL: + return 1; /* index 1 in parents[] */ + } + + return 0; +} + +static inline int plt_parent_to_reg(int index) +{ + switch (index) { + case 0: /* index 0 in parents[] */ + return PMC_CLK_FREQ_XTAL; + case 1: /* index 0 in parents[] */ + return PMC_CLK_FREQ_PLL; + } + + return PMC_CLK_FREQ_XTAL; +} + +static inline int plt_reg_to_enabled(int reg) +{ + switch (reg & PMC_MASK_CLK_CTL) { + case PMC_CLK_CTL_GATED_ON_D3: + case PMC_CLK_CTL_FORCE_ON: + return 1; /* enabled */ + case PMC_CLK_CTL_FORCE_OFF: + case PMC_CLK_CTL_RESERVED: + default: + return 0; /* disabled */ + } +} + +static void plt_clk_reg_update(struct clk_plt *clk, u32 mask, u32 val) +{ + u32 orig, tmp; + unsigned long flags = 0; + + spin_lock_irqsave(&clk->lock, flags); + + orig = readl(clk->reg); + + tmp = orig & ~mask; + tmp |= val & mask; + + if (tmp != orig) + writel(tmp, clk->reg); + + spin_unlock_irqrestore(&clk->lock, flags); +} + +static int plt_clk_set_parent(struct clk_hw *hw, u8 index) +{ + struct clk_plt *clk = to_clk_plt(hw); + + plt_clk_reg_update(clk, PMC_MASK_CLK_FREQ, plt_parent_to_reg(index)); + + return 0; +} + +static u8 plt_clk_get_parent(struct clk_hw *hw) +{ + struct clk_plt *clk = to_clk_plt(hw); + u32 value; + + value = readl(clk->reg); + + return plt_reg_to_parent(value); +} + +static int plt_clk_enable(struct clk_hw *hw) +{ + struct clk_plt *clk = to_clk_plt(hw); + + plt_clk_reg_update(clk, PMC_MASK_CLK_CTL, PMC_CLK_CTL_FORCE_ON); + + return 0; +} + +static void plt_clk_disable(struct clk_hw *hw) +{ + struct clk_plt *clk = to_clk_plt(hw); + + plt_clk_reg_update(clk, PMC_MASK_CLK_CTL, PMC_CLK_CTL_FORCE_OFF); +} + +static int plt_clk_is_enabled(struct clk_hw *hw) +{ + struct clk_plt *clk = to_clk_plt(hw); + u32 value; + + value = readl(clk->reg); + + return plt_reg_to_enabled(value); +} + +static const struct clk_ops plt_clk_ops = { + .enable = plt_clk_enable, + .disable = plt_clk_disable, + .is_enabled = plt_clk_is_enabled, + .get_parent = plt_clk_get_parent, + .set_parent = plt_clk_set_parent, + .determine_rate = __clk_mux_determine_rate, +}; + +static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id, + void __iomem *base, + const char **parent_names, + int num_parents) +{ + struct clk_plt *pclk; + struct clk_init_data init; + int ret; + + pclk = devm_kzalloc(&pdev->dev, sizeof(*pclk), GFP_KERNEL); + if (!pclk) + return ERR_PTR(-ENOMEM); + + init.name = kasprintf(GFP_KERNEL, "%s%d", PLT_CLK_NAME_BASE, id); + init.ops = &plt_clk_ops; + init.flags = 0; + init.parent_names = parent_names; + init.num_parents = num_parents; + + pclk->hw.init = &init; + pclk->reg = base + id * PMC_CLK_CTL_SIZE; + spin_lock_init(&pclk->lock); + + ret = devm_clk_hw_register(&pdev->dev, &pclk->hw); + if (ret) + goto err_free_init; + + pclk->lookup = clkdev_hw_create(&pclk->hw, init.name, NULL); + if (!pclk->lookup) { + ret = -ENOMEM; + goto err_free_init; + } + + kfree(init.name); + + return pclk; + +err_free_init: + kfree(init.name); + return ERR_PTR(ret); +} + +static void plt_clk_unregister(struct clk_plt *pclk) +{ + clkdev_drop(pclk->lookup); +} + +static struct clk_plt_fixed *plt_clk_register_fixed_rate(struct platform_device *pdev, + const char *name, + const char *parent_name, + unsigned long fixed_rate) +{ + struct clk_plt_fixed *pclk; + int ret = 0; + + pclk = devm_kzalloc(&pdev->dev, sizeof(*pclk), GFP_KERNEL); + if (!pclk) + return ERR_PTR(-ENOMEM); + + pclk->clk = clk_hw_register_fixed_rate(&pdev->dev, name, parent_name, + 0, fixed_rate); + if (IS_ERR(pclk->clk)) + return ERR_CAST(pclk->clk); + + pclk->lookup = clkdev_hw_create(pclk->clk, name, NULL); + if (!pclk->lookup) { + ret = -ENOMEM; + goto err_clk_unregister; + } + + return pclk; + +err_clk_unregister: + clk_hw_unregister_fixed_rate(pclk->clk); + return ERR_PTR(ret); +} + +static void plt_clk_unregister_fixed_rate(struct clk_plt_fixed *pclk) +{ + clkdev_drop(pclk->lookup); + clk_hw_unregister_fixed_rate(pclk->clk); +} + +static const char **plt_clk_register_parents(struct platform_device *pdev, + struct clk_plt_data *data, + const struct pmc_clk *clks) +{ + const char **parent_names; + int i, err; + + data->nparents = 0; + while (clks[data->nparents].name) + data->nparents++; + + data->parents = devm_kzalloc(&pdev->dev, + sizeof(*data->parents) * data->nparents, + GFP_KERNEL); + if (!data->parents) { + err = -ENOMEM; + goto err_out; + } + + parent_names = kcalloc(data->nparents, sizeof(*parent_names), + GFP_KERNEL); + if (!parent_names) { + err = -ENOMEM; + goto err_out; + } + + for (i = 0; i < data->nparents; i++) { + data->parents[i] = + plt_clk_register_fixed_rate(pdev, clks[i].name, + clks[i].parent_name, + clks[i].freq); + if (IS_ERR(data->parents[i])) { + err = PTR_ERR(data->parents[i]); + goto err_unreg; + } + parent_names[i] = kstrdup_const(clks[i].name, GFP_KERNEL); + } + + return parent_names; + +err_unreg: + for (i--; i >= 0; i--) { + plt_clk_unregister_fixed_rate(data->parents[i]); + kfree_const(parent_names[i]); + } + kfree(parent_names); +err_out: + data->nparents = 0; + return ERR_PTR(err); +} + +static void plt_clk_unregister_parents(struct clk_plt_data *data) +{ + int i; + + for (i = 0; i < data->nparents; i++) + plt_clk_unregister_fixed_rate(data->parents[i]); +} + +static int plt_clk_probe(struct platform_device *pdev) +{ + struct clk_plt_data *data; + int i, err; + const char **parent_names; + const struct pmc_clk_data *pmc_data; + + pmc_data = dev_get_platdata(&pdev->dev); + if (!pmc_data || !pmc_data->clks) + return -EINVAL; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + parent_names = plt_clk_register_parents(pdev, data, pmc_data->clks); + if (IS_ERR(parent_names)) + return PTR_ERR(parent_names); + + for (i = 0; i < PMC_CLK_NUM; i++) { + data->clks[i] = plt_clk_register(pdev, i, pmc_data->base, + parent_names, data->nparents); + if (IS_ERR(data->clks[i])) { + err = PTR_ERR(data->clks[i]); + goto err_unreg_clk_plt; + } + } + + for (i = 0; i < data->nparents; i++) + kfree_const(parent_names[i]); + kfree(parent_names); + + dev_set_drvdata(&pdev->dev, data); + return 0; + +err_unreg_clk_plt: + for (i--; i >= 0; i--) + plt_clk_unregister(data->clks[i]); + plt_clk_unregister_parents(data); + for (i = 0; i < data->nparents; i++) + kfree_const(parent_names[i]); + kfree(parent_names); + return err; +} + +static int plt_clk_remove(struct platform_device *pdev) +{ + struct clk_plt_data *data; + int i; + + data = dev_get_drvdata(&pdev->dev); + if (!data) + return 0; + + for (i = 0; i < PMC_CLK_NUM; i++) + plt_clk_unregister(data->clks[i]); + plt_clk_unregister_parents(data); + return 0; +} + +static struct platform_driver plt_clk_driver = { + .driver = { + .name = PLT_CLK_DRIVER_NAME, + }, + .probe = plt_clk_probe, + .remove = plt_clk_remove, +}; +module_platform_driver(plt_clk_driver); + +MODULE_DESCRIPTION("Intel Atom platform clocks driver"); +MODULE_AUTHOR("Irina Tirdea <irina.tirdea(a)intel.com>"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/platform_data/clk-byt-plt.h b/include/linux/platform_data/clk-byt-plt.h new file mode 100644 index 0000000..e6bca9c --- /dev/null +++ b/include/linux/platform_data/clk-byt-plt.h @@ -0,0 +1,31 @@ +/* + * Intel Atom platform clocks for BayTrail and CherryTrail SoC. + * + * Copyright (C) 2016, Intel Corporation + * Author: Irina Tirdea <irina.tirdea(a)intel.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#ifndef __CLK_BYT_PLT_H +#define __CLK_BYT_PLT_H + +struct pmc_clk { + const char *name; + unsigned long freq; + const char *parent_name; +}; + +struct pmc_clk_data { + void __iomem *base; + const struct pmc_clk *clks; +}; + +#endif /* __CLK_BYT_PLT_H */ -- 1.9.1

3 5

[alsa-devel] [PATCH 0/6] Arizona FLL fixes and Clocking Improvements
by Charles Keepax 04 Oct '16

04 Oct '16

Hi, The first 3 patches in this series fix some small issues with the FLL configuration in the driver. The second 3 patches add support for requesting the input clocks for the CODEC through the clock framework. This is some what of an intermediate step until all the clocking itself in the CODEC can be brought under the clock framework but as there are machine drivers that want to be merged now with source clocks that require gating and difficult to resolve issues between the SPI and clock framework an intermediate solution seems warranted. Whilst the two halfs of this series do fairly different things, I have sent them as once series as they touch a lot of the same code, so this seemed the simpler approach to pushing them both through. The series is based of Mark's ASoC for-next tree. Thanks, Charles Charles Keepax (5): ASoC: arizona: Correct handling of FLL theta in synchroniser mode ASoC: arizona: Allow specification of base for arizona_is_enabled_fll ASoC: arizona: Avoid changing SYNC_ENA whilst the FLL_ENA is set ASoC: arizona: Add gating for clock when used for direct MCLK ASoC: arizona: Add gating for source clocks of the FLLs Sylwester Nawrocki (1): mfd: arizona: Add gating of external MCLKn clocks drivers/mfd/arizona-core.c | 30 +++++++++- include/linux/mfd/arizona/core.h | 9 +++ sound/soc/codecs/arizona.c | 124 +++++++++++++++++++++++++++++++++++---- sound/soc/codecs/arizona.h | 2 + sound/soc/codecs/cs47l24.c | 6 +- sound/soc/codecs/wm5102.c | 9 ++- sound/soc/codecs/wm5110.c | 10 +++- sound/soc/codecs/wm8997.c | 9 ++- sound/soc/codecs/wm8998.c | 6 +- 9 files changed, 179 insertions(+), 26 deletions(-) -- 2.1.4

4 17

[alsa-devel] [PATCH 1/2] ASoC: wm9712: Convert to regmap
by Lars-Peter Clausen 04 Oct '16

04 Oct '16

Currently the wm9712 driver still uses custom snd_soc_codec_driver IO callbacks. This has been deprecated for a while, so convert the wm9712 driver to use regmap for its IO. Tested-by: Marek Vasut <marex(a)denx.de> Acked-by: Marek Vasut <marex(a)denx.de> Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/wm9712.c | 143 +++++++++++++++++++++++++--------------------- 2 files changed, 79 insertions(+), 65 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c67667b..f472254 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1057,6 +1057,7 @@ config SND_SOC_WM9705 config SND_SOC_WM9712 tristate + select REGMAP_AC97 config SND_SOC_WM9713 tristate diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 557709e..d2d0d2b 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/device.h> +#include <linux/regmap.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/ac97_codec.h> @@ -32,31 +33,66 @@ struct wm9712_priv { struct mutex lock; }; -static unsigned int ac97_read(struct snd_soc_codec *codec, - unsigned int reg); -static int ac97_write(struct snd_soc_codec *codec, - unsigned int reg, unsigned int val); +static const struct reg_default wm9712_reg_defaults[] = { + { 0x02, 0x8000 }, + { 0x04, 0x8000 }, + { 0x06, 0x8000 }, + { 0x08, 0x0f0f }, + { 0x0a, 0xaaa0 }, + { 0x0c, 0xc008 }, + { 0x0e, 0x6808 }, + { 0x10, 0xe808 }, + { 0x12, 0xaaa0 }, + { 0x14, 0xad00 }, + { 0x16, 0x8000 }, + { 0x18, 0xe808 }, + { 0x1a, 0x3000 }, + { 0x1c, 0x8000 }, + { 0x20, 0x0000 }, + { 0x22, 0x0000 }, + { 0x26, 0x000f }, + { 0x28, 0x0605 }, + { 0x2a, 0x0410 }, + { 0x2c, 0xbb80 }, + { 0x2e, 0xbb80 }, + { 0x32, 0xbb80 }, + { 0x34, 0x2000 }, + { 0x4c, 0xf83e }, + { 0x4e, 0xffff }, + { 0x50, 0x0000 }, + { 0x52, 0x0000 }, + { 0x56, 0xf83e }, + { 0x58, 0x0008 }, + { 0x5c, 0x0000 }, + { 0x60, 0xb032 }, + { 0x62, 0x3e00 }, + { 0x64, 0x0000 }, + { 0x76, 0x0006 }, + { 0x78, 0x0001 }, + { 0x7a, 0x0000 }, +}; -/* - * WM9712 register cache - */ -static const u16 wm9712_reg[] = { - 0x6174, 0x8000, 0x8000, 0x8000, /* 6 */ - 0x0f0f, 0xaaa0, 0xc008, 0x6808, /* e */ - 0xe808, 0xaaa0, 0xad00, 0x8000, /* 16 */ - 0xe808, 0x3000, 0x8000, 0x0000, /* 1e */ - 0x0000, 0x0000, 0x0000, 0x000f, /* 26 */ - 0x0405, 0x0410, 0xbb80, 0xbb80, /* 2e */ - 0x0000, 0xbb80, 0x0000, 0x0000, /* 36 */ - 0x0000, 0x2000, 0x0000, 0x0000, /* 3e */ - 0x0000, 0x0000, 0x0000, 0x0000, /* 46 */ - 0x0000, 0x0000, 0xf83e, 0xffff, /* 4e */ - 0x0000, 0x0000, 0x0000, 0xf83e, /* 56 */ - 0x0008, 0x0000, 0x0000, 0x0000, /* 5e */ - 0xb032, 0x3e00, 0x0000, 0x0000, /* 66 */ - 0x0000, 0x0000, 0x0000, 0x0000, /* 6e */ - 0x0000, 0x0000, 0x0000, 0x0006, /* 76 */ - 0x0001, 0x0000, 0x574d, 0x4c12, /* 7e */ +static bool wm9712_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case AC97_REC_GAIN: + return true; + default: + return regmap_ac97_default_volatile(dev, reg); + } +} + +static const struct regmap_config wm9712_regmap_config = { + .reg_bits = 16, + .reg_stride = 2, + .val_bits = 16, + .max_register = 0x7e, + .cache_type = REGCACHE_RBTREE, + + .volatile_reg = wm9712_volatile_reg, + + .reg_defaults = wm9712_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(wm9712_reg_defaults), }; #define HPL_MIXER 0x0 @@ -488,35 +524,13 @@ static const struct snd_soc_dapm_route wm9712_audio_map[] = { static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg) { - struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec); - u16 *cache = codec->reg_cache; - - if (reg == AC97_RESET || reg == AC97_GPIO_STATUS || - reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 || - reg == AC97_REC_GAIN) - return soc_ac97_ops->read(wm9712->ac97, reg); - else { - reg = reg >> 1; - - if (reg >= (ARRAY_SIZE(wm9712_reg))) - return -EIO; - - return cache[reg]; - } + return snd_soc_read(codec, reg); } static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int val) { - struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec); - u16 *cache = codec->reg_cache; - - soc_ac97_ops->write(wm9712->ac97, reg, val); - reg = reg >> 1; - if (reg < (ARRAY_SIZE(wm9712_reg))) - cache[reg] = val; - - return 0; + return snd_soc_write(codec, reg, val); } static int ac97_prepare(struct snd_pcm_substream *substream, @@ -619,8 +633,7 @@ static int wm9712_set_bias_level(struct snd_soc_codec *codec, static int wm9712_soc_resume(struct snd_soc_codec *codec) { struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec); - int i, ret; - u16 *cache = codec->reg_cache; + int ret; ret = snd_ac97_reset(wm9712->ac97, true, WM9712_VENDOR_ID, WM9712_VENDOR_ID_MASK); @@ -629,15 +642,8 @@ static int wm9712_soc_resume(struct snd_soc_codec *codec) snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); - if (ret == 0) { - /* Sync reg_cache with the hardware after cold reset */ - for (i = 2; i < ARRAY_SIZE(wm9712_reg) << 1; i += 2) { - if (i == AC97_INT_PAGING || i == AC97_POWERDOWN || - (i > 0x58 && i != 0x5c)) - continue; - soc_ac97_ops->write(wm9712->ac97, i, cache[i>>1]); - } - } + if (ret == 0) + regcache_sync(codec->component.regmap); return ret; } @@ -645,6 +651,7 @@ static int wm9712_soc_resume(struct snd_soc_codec *codec) static int wm9712_soc_probe(struct snd_soc_codec *codec) { struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec); + struct regmap *regmap; int ret; wm9712->ac97 = snd_soc_new_ac97_codec(codec, WM9712_VENDOR_ID, @@ -655,16 +662,28 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) return ret; } + regmap = regmap_init_ac97(wm9712->ac97, &wm9712_regmap_config); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + goto err_free_ac97_codec; + } + + snd_soc_codec_init_regmap(codec, regmap); + /* set alc mux to none */ ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000); return 0; +err_free_ac97_codec: + snd_soc_free_ac97_codec(wm9712->ac97); + return ret; } static int wm9712_soc_remove(struct snd_soc_codec *codec) { struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec); + snd_soc_codec_exit_regmap(codec); snd_soc_free_ac97_codec(wm9712->ac97); return 0; } @@ -673,14 +692,8 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm9712 = { .probe = wm9712_soc_probe, .remove = wm9712_soc_remove, .resume = wm9712_soc_resume, - .read = ac97_read, - .write = ac97_write, .set_bias_level = wm9712_set_bias_level, .suspend_bias_off = true, - .reg_cache_size = ARRAY_SIZE(wm9712_reg), - .reg_word_size = sizeof(u16), - .reg_cache_step = 2, - .reg_cache_default = wm9712_reg, .component_driver = { .controls = wm9712_snd_ac97_controls, -- 2.1.4

3 5

[alsa-devel] [RFC PATCH v2 0/2] support DP MST audio
by libin.yang＠linux.intel.com 01 Oct '16

01 Oct '16

From: Libin Yang <libin.yang(a)linux.intel.com> This patchset starts to support DP MST audio. This patchset is based on drm-intel-nightly on git://anongit.freedesktop.org/drm-intel Libin Yang (2): ALSA: hda - add DP mst verb support ALSA: hda - add DP mst audio support sound/pci/hda/hda_codec.c | 77 +++++++++++++++- sound/pci/hda/hda_codec.h | 3 + sound/pci/hda/patch_hdmi.c | 216 ++++++++++++++++++++++++++++++++++----------- 3 files changed, 241 insertions(+), 55 deletions(-) -- 1.9.1

3 5

[alsa-devel] [GIT PULL] ASoC updates for v4.9
by Mark Brown 30 Sep '16

30 Sep '16

The following changes since commit 08895a8b6b06ed2323cd97a36ee40a116b3db8ed: Linux 4.8-rc8 (2016-09-25 18:47:13 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.9 for you to fetch changes up to 513e43efafe329dad7b5794583b67ac898dcbdca: Merge remote-tracking branches 'asoc/topic/tpa6130a2', 'asoc/topic/ux500', 'asoc/topic/wm8960', 'asoc/topic/wm8962' and 'asoc/topic/wm8991' into asoc-next (2016-09-29 12:44:49 -0700) ---------------------------------------------------------------- ASoC: Updates for v4.9 Apart from the cleanups done by Morimoto-san this has very much been a driver focused release with very little generic change: - A big factoring out of the simple-card code to allow it to be shared more with the rcar generic card from Kuninori Morimoto. - Removal of some operations duplicated on the CODEC level, again by Kuninori Morimoto. - Lots more machine support for x86 systems. - New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663. ---------------------------------------------------------------- Adam Thomson (9): ASoC: da7213: Improve driver efficiency with regards to MCLK usage ASoC: da7213: Refactor sysclk(), pll() functions to improve handling ASoC: da7213: Improve 32KHz mode PLL locking ASoC: da7219: Make more efficient use of MCLK within driver ASoC: da7218: Remove 32KHz PLL mode from driver ASoC: da7218: Improve driver efficiency with regards to MCLK usage ASoC: da7219: Support HP detect procedure when MCLK not present ASoC: da7219: Reset codec gracefully, if still active ASoC: da7219: Disable AAD if codec is not a wake-up source Arnaud Pouliquen (2): ASoC: sti: suppress inappropriate DT fields ASoC: sti: suppress inappropriate fields for sti sound card Arnd Bergmann (3): ASoC: rockchip: use SPI dependency for rt5514 ASoC: rt5663: refine error handling ASoC: cq93vc: duplicated callback function goes to component Axel Lin (4): ASoC: cs53l30: Constify cs53l30_mclk_coeffs and cs53l30_mclkx_coeffs tables ASoC: cs53l30: Constify cs53l30_mclk_coeffs and cs53l30_mclkx_coeffs tables ASoC: cs42l73: Constify cs42l73_mclk_coeffs and cs42l73_mclkx_coeffs tables ASoC: nau8810: Fix memory leak in nau8810_eq_put error path Baoyou Xie (3): ASoC: atmel-pdmic: mark symbols static where possible ASoC: mediatek: mark symbols static where possible ASoC: fix W=1 build warnings Bard Liao (1): ASoC: add rt5663 codec driver Bhaktipriya Shridhar (1): ASoC: tlv320dac33: Remove deprecated create_singlethread_workqueue Charles Keepax (13): ASoC: arizona: Connect ASRCs to both clock domains ASoC: arizona: Correct handling of FLL theta in synchroniser mode ASoC: arizona: Allow specification of base for arizona_is_enabled_fll ASoC: arizona: Avoid changing SYNC_ENA whilst the FLL_ENA is set ASoC: wm_adsp: Separate concept of booted and running ASoC: wm_adsp: Move control cache sync out of preloader ASoC: arizona: Attach SYSCLK to DSP preloaders ASoC: wm_adsp: Make DSP preloader a supply widget ASoC: wm_adsp: Use usleep_range for short delay ASoC: wm_adsp: Put DSP into low power state between loading and running ASoC: wm_adsp: Allow preloader to do the final shutdown of the DSP ASoC: arizona: Add debug prints for output power up/down times ASoC: arizona: Add output power up/down delays for speaker path Chen-Yu Tsai (3): ASoC: dapm: Fix possible uninitialized variable in snd_soc_dapm_get_volsw() ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel ASoC: dapm: Fix kcontrol creation for output driver widget Cheng-Yi Chiang (1): ASoC: rockchip: Support headset button function on rk3399 Christophe JAILLET (1): ASoC: omap-pcm: off-by-one in 'omap_pcm_limit_supported_formats' Colin Ian King (13): ASoC: Intel: sst: fix ix spelling mistake: "capablities" -> "capabilites" ASoC: tas5086: fix typo: "Inavlid" -> "Invalid" ASoC: wm8962: fix spelling mistake "mesurement" -> "measurement" ASoC: hdac_hdmi: fix spelling mistake "montior" -> "monitor" ASoC: fsl_esai: fix spelling mistake "Transmition" -> "Transmission" ASoC: ux500: fix spelling mistake "Unsopported" -> "Unsupported" ASoC: Intel: sst: fix to spelling mistake: "susupend" -> "suspend" ASoC: Intel: Skylake: add missing \n to end of dev_* messages ASoC: max98926: add missing \n to end of dev_err/dev_dbg messages ASoC: samsung: add missing \n to end of pr_err messages ASoC: Intel: atom: add missing \n to end of dev_err/dev_dbg messages ASoC: Intel: remove status, it is shadowing status of a higher scope ASoC: Intel: Skylake: fix memory leak of module on error exit path Danny Milosavljevic (3): ASoC: sun4i-codec: Rename some sun7i-only registers ASoC: sun4i-codec: Add custom regmap configs ASoC: sun4i-codec: Rename sun4i_codec_widgets for consistency Dharageswari R (6): ASoC: Intel: Skylake: modify snd_skl_get_module_info args ASoC: Intel: Skylake: Unload all the loadable modules ASoC: Intel: Skylake: Add module instance id generation APIs ASoC: Intel: Skylake: Use private instance id of modules in IPC ASoC: Intel: Skylake: Update to use instance ids generated ASoC: Intel: Skylake: Add table for module id for quick ref Fabio Estevam (4): ASoC: fsl_sai: Use 'np' variable ASoC: fsl_asrc: Propagate the real error code ASoC: fsl_asrc: Remove unneeded driver registration message ASoC: fsl_asrc: Use np variable Guneshwor Singh (2): ALSA - hda: Add support for parsing new HDA capabilities ALSA - hda: Add support for link audio time reporting Harsha Priya (1): ASoC: Intel: Atom: Fix message handling during drop stream Hsin-Yu Chao (1): ASoC: da7219: software reset codec at probe Irina Tirdea (2): ASoC: Intel: bytcr_rt5640: add MCLK support AsoC: Intel: Add quirks for MinnowBoard MAX Jaswinder Jassal (1): ASoC: core: fix shift used for second item in snd_soc_get_enum_double Jeeja KP (2): ASoC: Intel: Skylake: Fix DMA control config size ASoC: dpcm: Don't apply symmetry for BE with hw param fixup John Hsu (3): ASoC: nau8810: Add driver for Nuvoton codec chip NAU88C10 ASoC: nau8810: fix compile warning in loopback switch control ASoC: nau8825: fix bug in FLL parameter John Keeping (2): ASoC: rt5677: Add ACPI support ASoC: Intel: boards: Add bdw-rt5677 machine driver Julia Lawall (5): ASoC: use of_property_read_bool ASoC: constify snd_soc_codec_driver structures ASoC: constify snd_pcm_ops structures ASoC: ac97: constify gpio_chip structures ASoC: constify gpio_chip structures Kranthi G (1): ASoC: Intel: Skylake: add support for tplg manifest load Kuninori Morimoto (203): ASoC: simple-card: use asoc_simple_card_parse_clk() ASoC: rsrc-card: use asoc_simple_card_parse_clk() ASoC: simple-card-utils: add asoc_simple_card_parse_clk() ASoC: simple-card-utils: add asoc_simple_card_parse_dai() ASoC: simple-card: use asoc_simple_card_parse_dai() ASoC: rsrc-card: use asoc_simple_card_parse_dai() ASoC: simple-card: remove asoc_simple_card_sub_parse_of() ASoC: hdmi-codec: enable multi probe for same device ASoC: codec duplicated callback function goes to component on sun4i-codec ASoC: codec duplicated callback function goes to component on pistachio-internal-dac ASoC: remove codec duplicated callback function ASoC: codec duplicated callback function goes to component on wm8985 ASoC: codec duplicated callback function goes to component on wm8978 ASoC: codec duplicated callback function goes to component on wm8974 ASoC: codec duplicated callback function goes to component on wm8903 ASoC: codec duplicated callback function goes to component on wm8804 ASoC: codec duplicated callback function goes to component on wm8776 ASoC: codec duplicated callback function goes to component on wm8770 ASoC: codec duplicated callback function goes to component on wm8753 ASoC: codec duplicated callback function goes to component on wm8750 ASoC: codec duplicated callback function goes to component on wm8741 ASoC: codec duplicated callback function goes to component on wm8737 ASoC: codec duplicated callback function goes to component on wm8731 ASoC: codec duplicated callback function goes to component on wm8728 ASoC: codec duplicated callback function goes to component on wm8711 ASoC: codec duplicated callback function goes to component on wm8580 ASoC: codec duplicated callback function goes to component on wm8523 ASoC: codec duplicated callback function goes to component on wm8510 ASoC: codec duplicated callback function goes to component on tlv320aic3x ASoC: codec duplicated callback function goes to component on tlv320aic31xx ASoC: codec duplicated callback function goes to component on tlv320aic23 ASoC: codec duplicated callback function goes to component on tfa9879 ASoC: codec duplicated callback function goes to component on tas5720 ASoC: codec duplicated callback function goes to component on tas571x ASoC: codec duplicated callback function goes to component on tas5086 ASoC: codec duplicated callback function goes to component on tas2552 ASoC: codec duplicated callback function goes to component on sti-sas ASoC: codec duplicated callback function goes to component on sta350 ASoC: codec duplicated callback function goes to component on sta32x ASoC: codec duplicated callback function goes to component on ssm4567 ASoC: codec duplicated callback function goes to component on ssm2602 ASoC: codec duplicated callback function goes to component on spdif_transmitter ASoC: codec duplicated callback function goes to component on spdif_receiver ASoC: codec duplicated callback function goes to component on sgtl5000 ASoC: codec duplicated callback function goes to component on rt5631 ASoC: codec duplicated callback function goes to component on rt5616 ASoC: codec duplicated callback function goes to component on pcm512x ASoC: codec duplicated callback function goes to component on pcm3168a ASoC: codec duplicated callback function goes to component on pcm179x ASoC: codec duplicated callback function goes to component on pcm1681 ASoC: codec duplicated callback function goes to component on max9860 ASoC: codec duplicated callback function goes to component on inno_rk3036 ASoC: codec duplicated callback function goes to component on gtm601 ASoC: codec duplicated callback function goes to component on es8328 ASoC: codec duplicated callback function goes to component on cs53l30 ASoC: codec duplicated callback function goes to component on cs4349 ASoC: codec duplicated callback function goes to component on cs42xx8 ASoC: codec duplicated callback function goes to component on cs42l73 ASoC: codec duplicated callback function goes to component on cs42l56 ASoC: codec duplicated callback function goes to component on cs42l52 ASoC: codec duplicated callback function goes to component on cs42l51 ASoC: codec duplicated callback function goes to component on cs4271 ASoC: codec duplicated callback function goes to component on cs4270 ASoC: codec duplicated callback function goes to component on cs4265 ASoC: codec duplicated callback function goes to component on cs35l33 ASoC: codec duplicated callback function goes to component on cs35l32 ASoC: codec duplicated callback function goes to component on bt-sco ASoC: codec duplicated callback function goes to component on ak5386 ASoC: codec duplicated callback function goes to component on ak4642 ASoC: codec duplicated callback function goes to component on ak4613 ASoC: codec duplicated callback function goes to component on ak4554 ASoC: codec duplicated callback function goes to component on ak4104 ASoC: codec duplicated callback function goes to component on adau7002 ASoC: codec duplicated callback function goes to component on adau1701 ASoC: codec duplicated callback function goes to component on ac97 ASoC: codec duplicated callback function goes to component on ad1980 ASoC: codec duplicated callback function goes to component on ad73311 ASoC: codec duplicated callback function goes to component on adau1373 ASoC: codec duplicated callback function goes to component on ad1836 ASoC: codec duplicated callback function goes to component on ad193x ASoC: codec duplicated callback function goes to component on 88pm860x-codec ASoC: codec duplicated callback function goes to component on atmel-classd ASoC: codec duplicated callback function goes to component on atmel-pdmic ASoC: codec duplicated callback function goes to component on ab8500-codec ASoC: codec duplicated callback function goes to component on adau1761 ASoC: codec duplicated callback function goes to component on adau1781 ASoC: codec duplicated callback function goes to component on adau1977 ASoC: codec duplicated callback function goes to component on adav80x ASoC: codec duplicated callback function goes to component on ads117x ASoC: codec duplicated callback function goes to component on ak4535 ASoC: codec duplicated callback function goes to component on ak4641 ASoC: codec duplicated callback function goes to component on ak4671 ASoC: codec duplicated callback function goes to component on alc5632 ASoC: codec duplicated callback function goes to component on cs47l24 ASoC: codec duplicated callback function goes to component on cx20442 ASoC: codec duplicated callback function goes to component on da7210 ASoC: codec duplicated callback function goes to component on da7213 ASoC: codec duplicated callback function goes to component on da7218 ASoC: codec duplicated callback function goes to component on da7219 ASoC: codec duplicated callback function goes to component on da732x ASoC: codec duplicated callback function goes to component on da9055 ASoC: codec duplicated callback function goes to component on dmic ASoC: codec duplicated callback function goes to component on hdmi-codec ASoC: codec duplicated callback function goes to component on isabelle ASoC: codec duplicated callback function goes to component on jz4740 ASoC: codec duplicated callback function goes to component on lm49453 ASoC: codec duplicated callback function goes to component on wm98088 ASoC: codec duplicated callback function goes to component on wm98095 ASoC: codec duplicated callback function goes to component on wm98357a ASoC: codec duplicated callback function goes to component on wm9850 ASoC: codec duplicated callback function goes to component on wm9867 ASoC: codec duplicated callback function goes to component on max98925 ASoC: codec duplicated callback function goes to component on max98926 ASoC: codec duplicated callback function goes to component on mc13783 ASoC: codec duplicated callback function goes to component on ml26124 ASoC: codec duplicated callback function goes to component on nau8825 ASoC: codec duplicated callback function goes to component on pcm3008 ASoC: codec duplicated callback function goes to component on rt286 ASoC: codec duplicated callback function goes to component on rt298 ASoC: codec duplicated callback function goes to component on rt5514 ASoC: codec duplicated callback function goes to component on rt5640 ASoC: codec duplicated callback function goes to component on rt5645 ASoC: codec duplicated callback function goes to component on rt5651 ASoC: codec duplicated callback function goes to component on rt5659 ASoC: codec duplicated callback function goes to component on rt5670 ASoC: codec duplicated callback function goes to component on rt5677 ASoC: codec duplicated callback function goes to component on si476x ASoC: codec duplicated callback function goes to component on sn95031 ASoC: codec duplicated callback function goes to component on ssm2518 ASoC: codec duplicated callback function goes to component on sta529 ASoC: codec duplicated callback function goes to component on stac9766 ASoC: codec duplicated callback function goes to component on tlv320aic26 ASoC: codec duplicated callback function goes to component on tlv320aic32x4 ASoC: codec duplicated callback function goes to component on tlv320dac33 ASoC: codec duplicated callback function goes to component on twl4030 ASoC: codec duplicated callback function goes to component on twl6040 ASoC: codec duplicated callback function goes to component on uda134x ASoC: codec duplicated callback function goes to component on uda1380 ASoC: codec duplicated callback function goes to component on wl1273 ASoC: codec duplicated callback function goes to component on wm0010 ASoC: codec duplicated callback function goes to component on wm1250-ev1 ASoC: codec duplicated callback function goes to component on wm2000 ASoC: codec duplicated callback function goes to component on wm2200 ASoC: codec duplicated callback function goes to component on wm5100 ASoC: codec duplicated callback function goes to component on wm5102 ASoC: codec duplicated callback function goes to component on wm5110 ASoC: codec duplicated callback function goes to component on wm8350 ASoC: codec duplicated callback function goes to component on wm8400 ASoC: codec duplicated callback function goes to component on wm8727 ASoC: codec duplicated callback function goes to component on wm8782 ASoC: codec duplicated callback function goes to component on wm8900 ASoC: codec duplicated callback function goes to component on wm8940 ASoC: codec duplicated callback function goes to component on wm8955 ASoC: codec duplicated callback function goes to component on wm8961 ASoC: codec duplicated callback function goes to component on wm8971 ASoC: codec duplicated callback function goes to component on wm8983 ASoC: codec duplicated callback function goes to component on wm8988 ASoC: codec duplicated callback function goes to component on wm8990 ASoC: codec duplicated callback function goes to component on wm8991 ASoC: codec duplicated callback function goes to component on wm8995 ASoC: codec duplicated callback function goes to component on wm8996 ASoC: codec duplicated callback function goes to component on wm8997 ASoC: codec duplicated callback function goes to component on wm8998 ASoC: codec duplicated callback function goes to component on wm9081 ASoC: codec duplicated callback function goes to component on wm9705 ASoC: codec duplicated callback function goes to component on wm9712 ASoC: codec duplicated callback function goes to component on wm9713 ASoC: lpass-platform: don't use snd_soc_pcm_set_drvdata() ASoC: remove snd_soc_pcm_set/get_drvdata() ASoC: simple-card-utils: add asoc_simple_card_init_dai() ASoC: simple-card: use asoc_simple_card_init_dai() ASoC: simple-card-utils: add asoc_simple_card_canonicalize_dailink() ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() ASoC: rsrc-card: use asoc_simple_card_init_dai() ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() ASoC: simple-card-utils: add asoc_simple_card_canonicalize_cpu() ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() ASoC: simple-card-utils: add asoc_simple_card_clean_reference() ASoC: simple-card: use asoc_simple_card_clean_reference() ASoC: rsrc-card: use asoc_simple_card_clean_reference() ASoC: rsrc-card: remove board specific compatible ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase1 ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase2 ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase3 ASoC: simple-scu-card: remove unused definitions ASoC: simple-scu-card: is GPL v2 ASoC: simple-scu-card: tidyup codec daifmt handling method ASoC: simple-scu-card: tidyup asoc_simple_card_parse_links() method ASoC: simple-scu-card: depends on CONFIG_OF ASoC: simple-scu-card: add 2 CPU 1 Codec example ASoC: simple-scu-card: code sync: move asoc_simple_card_of_match ASoC: simple-scu-card: code sync: tidyup TDM setting position ASoC: simple-card: call of_node_put() for dai_link ASoC: simple-card: tidyup mclk-fs of_property_read_u32() usage ASoC: simple-card: code sync: tidyup simple_priv_to_xxx() macro ASoC: simple-card: code sync: use simple_priv_to_props() macro ASoC: simple-card: is GPL v2 ASoC: simple-card: code sync: tidyup white line ASoC: simple-card: code sync: use tag ASoC: simple-card: code sync: rename num_link to num ASoC: simple-card: use kzalloc() for dai_props / dai_link ASoC: rsnd: add SNDRV_PCM_TRIGGER_SUSPEND/RESUME Marcel Ziswiler (1): ASoC: tegra: add tegra sgtl5000 machine driver Marcus Cooper (2): ASoC: sunxi: Add bindings for sun6i to SPDIF ASoC: sunxi: compatibility for sun6i to SPDIF Marek Vasut (6): ASoC: fsl_asrc: use flat regmap cache ASoC: fsl_esai: use flat regmap cache ASoC: fsl_spdif: use flat regmap cache ASoC: fsl_ssi: use flat regmap cache ASoC: fsl_ssi: Remove .num_reg_defaults_raw from regmap_config ASoC: trivial: system spelling fix Mark Brown (30): Merge branch 'fix/simple' of git://git.kernel.org/.../broonie/sound into asoc-simple Merge branch 'topic/hda-link-time' of git://git.kernel.org/.../tiwai/sound into asoc-intel Merge branch 'topic/rt5640' of git://git.kernel.org/.../broonie/sound into asoc-intel Merge branch 'fix/omap' of git://git.kernel.org/.../broonie/sound into asoc-omap Merge branch 'topic/simple' of git://git.kernel.org/.../broonie/sound into asoc-rcar Merge tag 'asoc-fix-v4.8-rc4' into asoc-arizona Merge branch 'topic/rt5663' of git://git.kernel.org/.../broonie/sound into asoc-rt5660 ASoC: hdac_hdmi: Drop use of audio component framework to read ELD Merge branch 'topic/codec-component' of git://git.kernel.org/.../broonie/sound into asoc-sunxi Merge branch 'fix/da7219' of git://git.kernel.org/.../broonie/sound into asoc-da7219 ASoC: fsl: Fix lockups with recent cache changes Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/da7219', 'asoc/fix/nau8825', 'asoc/fix/rt5514' and 'asoc/fix/shift' into asoc-linus Merge remote-tracking branch 'asoc/fix/tpa6130a2' into asoc-linus Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/intel' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/codec-component' into asoc-next Merge remote-tracking branches 'asoc/topic/cs35l30', 'asoc/topic/cs42l73', 'asoc/topic/cs53l30' and 'asoc/topic/da7213' into asoc-next Merge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/da7219' and 'asoc/topic/dpcm' into asoc-next Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/fsl', 'asoc/topic/gpio-chip' and 'asoc/topic/hdmi' into asoc-next Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/max9867', 'asoc/topic/max98926' and 'asoc/topic/mtk' into asoc-next Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc/topic/omap' and 'asoc/topic/platform-drvdata' into asoc-next Merge remote-tracking branches 'asoc/topic/qcom', 'asoc/topic/rockchip' and 'asoc/topic/rt5616' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/rt5660', 'asoc/topic/rt5677' and 'asoc/topic/samsung' into asoc-next Merge remote-tracking branches 'asoc/topic/sgtl5000', 'asoc/topic/simple', 'asoc/topic/stac9766', 'asoc/topic/sti' and 'asoc/topic/sunxi' into asoc-next Merge remote-tracking branches 'asoc/topic/tas5086', 'asoc/topic/tegra', 'asoc/topic/tlv320aic31xx', 'asoc/topic/tlv320dac33' and 'asoc/topic/topology' into asoc-next Merge remote-tracking branches 'asoc/topic/tpa6130a2', 'asoc/topic/ux500', 'asoc/topic/wm8960', 'asoc/topic/wm8962' and 'asoc/topic/wm8991' into asoc-next Markus Elfring (1): ASoC: max98371: Delete unnecessary assignment for the field "owner" Mengdong Lin (3): ASoC: topology: ABI - Add the types for BE DAI ASoC: topology: Add support for configuring existing BE DAIs ASoC: topology: ABI - Add sig_bits to stream caps Nariman Poushin (1): ASoC: arizona: Don't change the FLLn_GAIN before entering FREERUN Nicolas Iooss (2): ASoC: simple-card-utils: add __printf attribute ASoC: Intel: Atom: add a missing star in a memcpy call Nicolin Chen (5): ASoC: cs53l30: Do not ignore errors if mclk is specified ASoC: rt5659: Add mclk controls ASoC: tegra_rt5640: Correct a copy and paste typo in the comments ASoC: rt5659: Enable IRQ output for GPIO1 pin ASoC: rt5659: Fix incorrect register addresses Nikita Yushchenko (5): ASoC: tpa6130a2: fix volume setting when no stream is running ASoC: simple-card: add support for aux devices ASoC: tpa6130a2: unmerge power enable error path from power disable path ASoC: tlv320aic31xx: add explicit support for tlv320dac31xx ASoC: tlv320aic31xx: do not declare support for mono DAI Oder Chiou (2): ASoC: rt5514: make the volume TLV to match the units 0.01dB ASoC: rt5660: add rt5660 codec driver Peter Meerwald-Stadler (2): ASoC: dapm: Fix typos in comment ASoC: atmel-pdmic: Fix typos in comments and error messages Peter Robinson (1): ASoC: sunxi: depend on ARCH_SUNXI Peter Ujfalusi (2): ASoC: omap-mcbsp: Enable TX/RX under and overflow interrupts ASoC: davinci-mcasp: off-by-one in davinci_mcasp_hw_rule_format() Pierre-Louis Bossart (17): ASoC: rt5640: add internal clock source support ASoC: Intel: bytcr-rt5640: add Asus T100TAF quirks ASoC: Intel: bytcr_rt5640: quirk for mono speaker ASoC: Intel: bytcr_rt5640: enable differential mic quirk ASoC: Intel: Atom: auto-detection of Baytrail-CR ASoC: Intel: Atom: add definitions for modem/SSP0 interface ASoC: Intel: atom: enable configuration of SSP0 ASoC: Intel: bytcr_rt5640: add SSP2_AIF2 routing ASoC: Intel: bytcr_rt56040: additional routing quirks ASoC: Intel: bytcr_rt5640: fix dai/clock setup for SSP0 routing ASoC: Intel: bytcr_rt5640: default routing and quirks on Baytrail-CR ASoC: Intel: bytcr_rt5640: add IN3 map ASoC: Intel: bytcr_rt5640: Add quirk for Teclast X98 Air 3G tablet ASoC: Intel: bytcr_rt5640: log quirks ASoC: Intel: atom: fix 0-day warnings ASoC: Intel: bytcr_rt5640: quirk for Acer Aspire SWS-012 ASoC: Intel: Atom: fix IOSF_MBI dependency Ramesh Babu (2): ASoC: Intel: Skylake: Add library loading IPCs ASoC: Intel: Skylake: Add library loading support Randy Li (1): ASoC: exynos: organize the asoc audio into a menu Richard Fitzgerald (1): ASoC: arizona: Wait for resume before enabling FLL Richard Leitner (1): ASoC: sgtl5000: add headphone and LINEOUT mute controls Samaga Krishna (1): ASoC: Intel: Skylake: Add 32bit support Sandeep Tayal (1): ASoC: hdac_hdmi: use audio component framework to read ELD Senthilnathan Veppur (2): ASoC: Intel: Skylake: add additional args to module parsing ASoC: Intel: Skylake: Add module processing domain support Shreyas NC (4): ASoC: uapi: Intel: Skylake: Define vendor specific tokens ASoC: Intel: Skylake: Parse vendor tokens to build module data ASoC: Intel: Skylake: Remove dfw config and associated structures ASoC: Intel: Skylake: Parse manifest data Srinivas Kandagatla (2): ASoC: qcom: apq8016-sbc: add board specific dapm mic widgets ASoC: qcom: apq8016-sbc: add support to routing via DT Sugar Zhang (2): ASoC: rockchip: i2s: restore register during runtime_suspend/resume cycle ASoC: rockchip: spdif: restore register during runtime_suspend/resume cycle Sylwester Nawrocki (15): ASoC: dwc: Drop DMA channel names assignment ASoC: samsung: Drop usage of struct s3c_dma_params from i2s.c ASoC: samsung: Drop usage of struct s3c_dma_params from s3c24xx-i2s.c ASoC: samsung: Drop usage of struct s3c_dma_params from s3c2412-i2s.c ASoC: samsung: Drop usage of struct s3c_dma_params from ac97.c ASoC: samsung: Drop usage of struct s3c_dma_params from spdif.c ASoC: samsung: Drop usage of of struct s3c_dma_params from pcm.c ASoC: samsung: Remove unused now unused struct s3c_dma_params ASoC: L3 bus: Add default gpio ops ARM: S3C24XX: Specify audio codec platform_data for mini2440 board ASoC: uda134x: Optionally initialize L3 ops to default GPIO ops ASoC: s3c24xx_uda134x: Remove unused power() callback ASoC: s3c24xx_uda134x: Drop initialization of codec's platform data ASoC: samsung: Convert s3c24xx_uda134x to use devm_snd_soc_register_card() ASoC: samsung: s3c24xx_uda134x: debug/error trace cleanup Takashi Sakamoto (11): ASoC: rt5616: add static qualifier for file local symbols ASoC: sst-bxt-da7219_max98357a: fix obsoleted initializers for array ASoC: sst-bxt-rt298: fix obsoleted initializers for array ASOC: tpa6130a2: add static qualifier for file local symbols ASoC: wm8991: fix wrong usage of DECLARE_TLV_DB_LINEAR() ASoC: wm8991: remove unused variable ASoC: stac9766: fix wrong usage of DECLARE_TLV_DB_LINEAR() ASoC: da7219: fix inappropriate condition statement ASoC: max9867: remove usage of obsoleted TLV-related macro ASoC: rt5616: remove usage of obsoleted TLV-related macro ASoC: wm8960: remove usage of obsoleted TLV-related macro Vinod Koul (13): ASoC: Intel: Skylake: Move modules query to runtime ASoC: Intel: Skylake: modify skl_get_dsp_ops() ASoC: Intel: Skylake: split fw and dsp initialization ASoC: Intel: Skylake: Parse UUIDs once ASoC: Intel: Bxt: Parse UUIDs once ASoC: Intel: Skylake: Fix a comment style ALSA: hda - move bus_parse_capabilities to core ALSA: convert users to core bus_parse_capabilities ALSA - Ext hda: remove bus_parse_capabilities ASoC: Intel: Skylake: Populate modules after loading ASoC: Intel: Skylake: remove module id query at runtime ASoC: Intel: Skylake: check manifest size ASoC: Intel: Skylake: Fix the inverted logic check Vishal Thanki (1): ASoC: ak4104: Limit the supported sample rates Wei Yongjun (6): ASoC: atmel-pdmic: add missing clk_disable_unprepare() on error in atmel_pdmic_cpu_dai_startup() ASoC: topology: Fix error return code in soc_tplg_dapm_widget_create() ASoC: omap-abe-twl6040: Use devm_snd_soc_register_card() ASoC: samsung: i2s: Add missing clk_disable_unprepare() on error in samsung_i2s_probe() ASoC: sti: fix missing clk_disable_unprepare() on error in uni_player_start() ASoC: rt5663: fix sparse warnings Wonjoon Lee (1): ASoC: rk3399_gru_sound: fix recording pop at first attempt Xing Zheng (2): ASoC: rockchip: Add machine driver for RK3399 GRU Boards ASoC: rockchip: Add support rt5514 dsp summy dailink Yong Zhi (1): ASoC: Intel: Add DMIC channel constraint for bxt machine kbuild test robot (2): ASoC: Intel: Skylake: fix noderef.cocci warnings ASoC: rt5663: fix platform_no_drv_owner.cocci warnings 彭东林 (1): ASoC: dpcm: print dai_link name of BE other than FE. .../devicetree/bindings/sound/nau8810.txt | 16 + .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt | 42 + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 30 + .../bindings/sound/renesas,rsrc-card.txt | 75 - .../bindings/sound/rockchip,rk3399-gru-sound.txt | 22 + Documentation/devicetree/bindings/sound/rt5659.txt | 3 + Documentation/devicetree/bindings/sound/rt5660.txt | 47 + Documentation/devicetree/bindings/sound/rt5663.txt | 30 + .../devicetree/bindings/sound/simple-card.txt | 37 + .../devicetree/bindings/sound/simple-scu-card.txt | 110 + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 52 +- .../bindings/sound/sunxi,sun4i-spdif.txt | 3 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 9 +- arch/arm/mach-s3c24xx/mach-mini2440.c | 19 + include/sound/da7219.h | 2 + include/sound/hda_register.h | 36 + include/sound/hdaudio.h | 13 + include/sound/hdaudio_ext.h | 12 - include/sound/l3.h | 15 +- include/sound/rt5660.h | 31 + include/sound/s3c24xx_uda134x.h | 1 - include/sound/simple_card_utils.h | 35 + include/sound/soc.h | 19 - include/uapi/sound/Kbuild | 1 + include/uapi/sound/asoc.h | 35 +- include/uapi/sound/snd_sst_tokens.h | 214 ++ sound/hda/ext/hdac_ext_controller.c | 91 +- sound/hda/ext/hdac_ext_stream.c | 46 +- sound/hda/hdac_controller.c | 75 + sound/pci/hda/hda_controller.c | 203 +- sound/pci/hda/hda_controller.h | 3 + sound/pci/hda/hda_intel.c | 17 + sound/soc/amd/acp-pcm-dma.c | 2 +- sound/soc/atmel/atmel-classd.c | 6 +- sound/soc/atmel/atmel-pcm-pdc.c | 2 +- sound/soc/atmel/atmel-pdmic.c | 20 +- sound/soc/codecs/88pm860x-codec.c | 14 +- sound/soc/codecs/Kconfig | 18 + sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ab8500-codec.c | 24 +- sound/soc/codecs/ac97.c | 10 +- sound/soc/codecs/ad1836.c | 14 +- sound/soc/codecs/ad193x.c | 14 +- sound/soc/codecs/ad1980.c | 14 +- sound/soc/codecs/ad73311.c | 10 +- sound/soc/codecs/adau1373.c | 14 +- sound/soc/codecs/adau1701.c | 15 +- sound/soc/codecs/adau1761.c | 14 +- sound/soc/codecs/adau1781.c | 14 +- sound/soc/codecs/adau1977.c | 14 +- sound/soc/codecs/adau7002.c | 10 +- sound/soc/codecs/adav80x.c | 14 +- sound/soc/codecs/ads117x.c | 10 +- sound/soc/codecs/ak4104.c | 15 +- sound/soc/codecs/ak4535.c | 14 +- sound/soc/codecs/ak4554.c | 10 +- sound/soc/codecs/ak4613.c | 14 +- sound/soc/codecs/ak4641.c | 14 +- sound/soc/codecs/ak4642.c | 14 +- sound/soc/codecs/ak4671.c | 14 +- sound/soc/codecs/ak5386.c | 10 +- sound/soc/codecs/alc5632.c | 14 +- sound/soc/codecs/arizona.c | 78 +- sound/soc/codecs/arizona.h | 17 +- sound/soc/codecs/bt-sco.c | 10 +- sound/soc/codecs/cq93vc.c | 6 +- sound/soc/codecs/cs35l32.c | 15 +- sound/soc/codecs/cs35l33.c | 15 +- sound/soc/codecs/cs4265.c | 15 +- sound/soc/codecs/cs4270.c | 14 +- sound/soc/codecs/cs4271.c | 14 +- sound/soc/codecs/cs42l51.c | 14 +- sound/soc/codecs/cs42l52.c | 15 +- sound/soc/codecs/cs42l56.c | 15 +- sound/soc/codecs/cs42l73.c | 19 +- sound/soc/codecs/cs42xx8.c | 14 +- sound/soc/codecs/cs4349.c | 15 +- sound/soc/codecs/cs47l24.c | 26 +- sound/soc/codecs/cs53l30.c | 23 +- sound/soc/codecs/cx20442.c | 10 +- sound/soc/codecs/da7210.c | 15 +- sound/soc/codecs/da7213.c | 145 +- sound/soc/codecs/da7213.h | 12 +- sound/soc/codecs/da7218.c | 49 +- sound/soc/codecs/da7218.h | 2 - sound/soc/codecs/da7219-aad.c | 108 +- sound/soc/codecs/da7219-aad.h | 11 +- sound/soc/codecs/da7219.c | 95 +- sound/soc/codecs/da7219.h | 8 + sound/soc/codecs/da732x.c | 14 +- sound/soc/codecs/da9055.c | 15 +- sound/soc/codecs/dmic.c | 10 +- sound/soc/codecs/es8328.c | 14 +- sound/soc/codecs/gtm601.c | 10 +- sound/soc/codecs/hdac_hdmi.c | 2 +- sound/soc/codecs/hdmi-codec.c | 79 +- sound/soc/codecs/inno_rk3036.c | 14 +- sound/soc/codecs/isabelle.c | 14 +- sound/soc/codecs/jz4740.c | 14 +- sound/soc/codecs/l3.c | 71 +- sound/soc/codecs/lm49453.c | 14 +- sound/soc/codecs/max98088.c | 14 +- sound/soc/codecs/max98095.c | 14 +- sound/soc/codecs/max98357a.c | 10 +- sound/soc/codecs/max98371.c | 1 - sound/soc/codecs/max9850.c | 14 +- sound/soc/codecs/max9860.c | 14 +- sound/soc/codecs/max9867.c | 19 +- sound/soc/codecs/max98925.c | 14 +- sound/soc/codecs/max98926.c | 20 +- sound/soc/codecs/mc13783.c | 14 +- sound/soc/codecs/ml26124.c | 14 +- sound/soc/codecs/nau8810.c | 884 ++++++ sound/soc/codecs/nau8810.h | 281 ++ sound/soc/codecs/nau8825.c | 16 +- sound/soc/codecs/pcm1681.c | 14 +- sound/soc/codecs/pcm179x.c | 14 +- sound/soc/codecs/pcm3008.c | 10 +- sound/soc/codecs/pcm3168a.c | 14 +- sound/soc/codecs/pcm512x.c | 14 +- sound/soc/codecs/rt286.c | 14 +- sound/soc/codecs/rt298.c | 14 +- sound/soc/codecs/rt5514-spi.c | 2 +- sound/soc/codecs/rt5514.c | 20 +- sound/soc/codecs/rt5514.h | 4 +- sound/soc/codecs/rt5616.c | 23 +- sound/soc/codecs/rt5631.c | 14 +- sound/soc/codecs/rt5640.c | 17 +- sound/soc/codecs/rt5640.h | 1 + sound/soc/codecs/rt5645.c | 14 +- sound/soc/codecs/rt5651.c | 14 +- sound/soc/codecs/rt5659.c | 41 +- sound/soc/codecs/rt5659.h | 7 +- sound/soc/codecs/rt5660.c | 1353 ++++++++ sound/soc/codecs/rt5660.h | 847 ++++++ sound/soc/codecs/rt5663.c | 3218 ++++++++++++++++++++ sound/soc/codecs/rt5663.h | 1121 +++++++ sound/soc/codecs/rt5670.c | 14 +- sound/soc/codecs/rt5677.c | 69 +- sound/soc/codecs/sgtl5000.c | 17 +- sound/soc/codecs/si476x.c | 10 +- sound/soc/codecs/sn95031.c | 14 +- sound/soc/codecs/spdif_receiver.c | 10 +- sound/soc/codecs/spdif_transmitter.c | 10 +- sound/soc/codecs/ssm2518.c | 14 +- sound/soc/codecs/ssm2602.c | 14 +- sound/soc/codecs/ssm4567.c | 14 +- sound/soc/codecs/sta32x.c | 14 +- sound/soc/codecs/sta350.c | 14 +- sound/soc/codecs/sta529.c | 6 +- sound/soc/codecs/stac9766.c | 14 +- sound/soc/codecs/sti-sas.c | 8 +- sound/soc/codecs/tas2552.c | 14 +- sound/soc/codecs/tas5086.c | 16 +- sound/soc/codecs/tas571x.c | 14 +- sound/soc/codecs/tas5720.c | 14 +- sound/soc/codecs/tfa9879.c | 15 +- sound/soc/codecs/tlv320aic23.c | 14 +- sound/soc/codecs/tlv320aic26.c | 14 +- sound/soc/codecs/tlv320aic31xx.c | 218 +- sound/soc/codecs/tlv320aic31xx.h | 2 + sound/soc/codecs/tlv320aic32x4.c | 14 +- sound/soc/codecs/tlv320aic3x.c | 14 +- sound/soc/codecs/tlv320dac33.c | 31 +- sound/soc/codecs/tpa6130a2.c | 49 +- sound/soc/codecs/twl4030.c | 14 +- sound/soc/codecs/twl6040.c | 14 +- sound/soc/codecs/uda134x.c | 17 +- sound/soc/codecs/uda1380.c | 14 +- sound/soc/codecs/wl1273.c | 14 +- sound/soc/codecs/wm0010.c | 12 +- sound/soc/codecs/wm1250-ev1.c | 13 +- sound/soc/codecs/wm2000.c | 16 +- sound/soc/codecs/wm2200.c | 16 +- sound/soc/codecs/wm5100.c | 18 +- sound/soc/codecs/wm5102.c | 27 +- sound/soc/codecs/wm5110.c | 28 +- sound/soc/codecs/wm8350.c | 16 +- sound/soc/codecs/wm8400.c | 16 +- sound/soc/codecs/wm8510.c | 16 +- sound/soc/codecs/wm8523.c | 16 +- sound/soc/codecs/wm8580.c | 16 +- sound/soc/codecs/wm8711.c | 16 +- sound/soc/codecs/wm8727.c | 12 +- sound/soc/codecs/wm8728.c | 16 +- sound/soc/codecs/wm8731.c | 16 +- sound/soc/codecs/wm8737.c | 16 +- sound/soc/codecs/wm8741.c | 12 +- sound/soc/codecs/wm8750.c | 16 +- sound/soc/codecs/wm8753.c | 16 +- sound/soc/codecs/wm8770.c | 16 +- sound/soc/codecs/wm8776.c | 16 +- sound/soc/codecs/wm8782.c | 12 +- sound/soc/codecs/wm8804.c | 10 +- sound/soc/codecs/wm8900.c | 16 +- sound/soc/codecs/wm8903.c | 18 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8940.c | 16 +- sound/soc/codecs/wm8955.c | 16 +- sound/soc/codecs/wm8960.c | 7 +- sound/soc/codecs/wm8961.c | 16 +- sound/soc/codecs/wm8962.c | 6 +- sound/soc/codecs/wm8971.c | 16 +- sound/soc/codecs/wm8974.c | 16 +- sound/soc/codecs/wm8978.c | 16 +- sound/soc/codecs/wm8983.c | 16 +- sound/soc/codecs/wm8985.c | 16 +- sound/soc/codecs/wm8988.c | 14 +- sound/soc/codecs/wm8990.c | 16 +- sound/soc/codecs/wm8991.c | 44 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm8994.c | 2 +- sound/soc/codecs/wm8995.c | 14 +- sound/soc/codecs/wm8996.c | 18 +- sound/soc/codecs/wm8997.c | 16 +- sound/soc/codecs/wm8998.c | 26 +- sound/soc/codecs/wm9081.c | 16 +- sound/soc/codecs/wm9090.c | 2 +- sound/soc/codecs/wm9705.c | 16 +- sound/soc/codecs/wm9712.c | 16 +- sound/soc/codecs/wm9713.c | 16 +- sound/soc/codecs/wm_adsp.c | 88 +- sound/soc/codecs/wm_adsp.h | 7 +- sound/soc/davinci/davinci-mcasp.c | 2 +- sound/soc/dwc/designware_i2s.c | 2 - sound/soc/fsl/fsl_asrc.c | 12 +- sound/soc/fsl/fsl_asrc_dma.c | 2 +- sound/soc/fsl/fsl_esai.c | 8 +- sound/soc/fsl/fsl_sai.c | 6 +- sound/soc/fsl/fsl_spdif.c | 2 +- sound/soc/fsl/fsl_ssi.c | 2 +- sound/soc/generic/Kconfig | 8 + sound/soc/generic/Makefile | 2 + sound/soc/generic/simple-card-utils.c | 141 + sound/soc/generic/simple-card.c | 305 +- sound/soc/generic/simple-scu-card.c | 345 +++ sound/soc/img/pistachio-internal-dac.c | 14 +- sound/soc/intel/Kconfig | 12 + sound/soc/intel/atom/sst-atom-controls.c | 32 +- sound/soc/intel/atom/sst-atom-controls.h | 6 + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/intel/atom/sst/sst.c | 5 +- sound/soc/intel/atom/sst/sst_acpi.c | 97 +- sound/soc/intel/atom/sst/sst_ipc.c | 3 + sound/soc/intel/atom/sst/sst_pvt.c | 14 +- sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bdw-rt5677.c | 347 +++ sound/soc/intel/boards/bxt_da7219_max98357a.c | 75 +- sound/soc/intel/boards/bxt_rt298.c | 14 +- sound/soc/intel/boards/bytcr_rt5640.c | 507 ++- sound/soc/intel/common/sst-acpi.c | 1 + sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +- sound/soc/intel/skylake/bxt-sst.c | 118 +- sound/soc/intel/skylake/skl-messages.c | 67 +- sound/soc/intel/skylake/skl-pcm.c | 60 +- sound/soc/intel/skylake/skl-sst-cldma.c | 4 +- sound/soc/intel/skylake/skl-sst-dsp.h | 18 +- sound/soc/intel/skylake/skl-sst-ipc.c | 41 +- sound/soc/intel/skylake/skl-sst-ipc.h | 12 +- sound/soc/intel/skylake/skl-sst-utils.c | 176 +- sound/soc/intel/skylake/skl-sst.c | 49 +- sound/soc/intel/skylake/skl-topology.c | 918 +++++- sound/soc/intel/skylake/skl-topology.h | 15 +- sound/soc/intel/skylake/skl-tplg-interface.h | 95 +- sound/soc/intel/skylake/skl.c | 6 +- sound/soc/intel/skylake/skl.h | 2 + sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 5 +- sound/soc/omap/mcbsp.c | 3 +- sound/soc/omap/omap-abe-twl6040.c | 14 +- sound/soc/omap/omap-pcm.c | 2 +- sound/soc/qcom/apq8016_sbc.c | 20 + sound/soc/qcom/lpass-platform.c | 16 +- sound/soc/qcom/lpass.h | 2 + sound/soc/rockchip/Kconfig | 12 + sound/soc/rockchip/Makefile | 2 + sound/soc/rockchip/rk3399_gru_sound.c | 397 +++ sound/soc/rockchip/rockchip_i2s.c | 10 +- sound/soc/rockchip/rockchip_spdif.c | 12 +- sound/soc/samsung/Kconfig | 57 +- sound/soc/samsung/ac97.c | 34 +- sound/soc/samsung/dma.h | 20 +- sound/soc/samsung/dmaengine.c | 31 - sound/soc/samsung/i2s.c | 56 +- sound/soc/samsung/idma.c | 1 - sound/soc/samsung/pcm.c | 26 +- sound/soc/samsung/s3c-i2s-v2.c | 3 +- sound/soc/samsung/s3c-i2s-v2.h | 4 +- sound/soc/samsung/s3c2412-i2s.c | 24 +- sound/soc/samsung/s3c24xx-i2s.c | 24 +- sound/soc/samsung/s3c24xx_uda134x.c | 134 +- sound/soc/samsung/smdk_wm8580pcm.c | 1 - sound/soc/samsung/smdk_wm8994pcm.c | 1 - sound/soc/samsung/spdif.c | 12 +- sound/soc/sh/Kconfig | 6 - sound/soc/sh/rcar/Makefile | 3 - sound/soc/sh/rcar/core.c | 4 + sound/soc/sh/rcar/rsrc-card.c | 486 --- sound/soc/sh/rcar/ssi.c | 2 +- sound/soc/soc-ac97.c | 2 +- sound/soc/soc-core.c | 15 +- sound/soc/soc-dapm.c | 23 +- sound/soc/soc-ops.c | 2 +- sound/soc/soc-pcm.c | 13 +- sound/soc/soc-topology.c | 115 +- sound/soc/soc-utils.c | 2 +- sound/soc/sti/sti_uniperif.c | 130 +- sound/soc/sti/uniperif.h | 28 +- sound/soc/sti/uniperif_player.c | 83 +- sound/soc/sti/uniperif_reader.c | 46 +- sound/soc/sunxi/Kconfig | 1 + sound/soc/sunxi/sun4i-codec.c | 60 +- sound/soc/sunxi/sun4i-spdif.c | 17 +- sound/soc/tegra/Kconfig | 11 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra_rt5640.c | 2 +- sound/soc/tegra/tegra_sgtl5000.c | 212 ++ sound/soc/ux500/ux500_msp_dai.c | 6 +- 318 files changed, 15145 insertions(+), 3112 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/nau8810.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt delete mode 100644 Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt create mode 100644 Documentation/devicetree/bindings/sound/rt5660.txt create mode 100644 Documentation/devicetree/bindings/sound/rt5663.txt create mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt create mode 100644 include/sound/rt5660.h create mode 100644 include/uapi/sound/snd_sst_tokens.h create mode 100644 sound/soc/codecs/nau8810.c create mode 100644 sound/soc/codecs/nau8810.h create mode 100644 sound/soc/codecs/rt5660.c create mode 100644 sound/soc/codecs/rt5660.h create mode 100644 sound/soc/codecs/rt5663.c create mode 100644 sound/soc/codecs/rt5663.h create mode 100644 sound/soc/generic/simple-scu-card.c create mode 100644 sound/soc/intel/boards/bdw-rt5677.c create mode 100644 sound/soc/rockchip/rk3399_gru_sound.c delete mode 100644 sound/soc/sh/rcar/rsrc-card.c create mode 100644 sound/soc/tegra/tegra_sgtl5000.c

2 1