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

[alsa-devel] [PATCH] ASoC: sgtl5000: Use devm_ functions
by Himangi Saraogi 09 Jul '14

09 Jul '14

This patch introduces the use of managed interfaces like devm_kzalloc, devm_kstrdup and devm_regulator_register and does avay with the calls to the functions to free the allocated memory in ldo_regulator_register and ldo_regulator_remove. The ldo_regulator_remove function is completely removed as it is no longer required. ldo_regulator_register is called from a probe function and on failure its value is returned as the result. Signed-off-by: Himangi Saraogi <himangi774(a)gmail.com> --- To send to: Liam Girdwood <lgirdwood(a)gmail.com>,Mark Brown <broonie(a)kernel.org>,Jaroslav Kysela <perex(a)perex.cz>,Takashi Iwai <tiwai(a)suse.de>,alsa-devel@alsa-project.org,linux-kernel@vger.kernel.org sound/soc/codecs/sgtl5000.c | 46 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 249fadb..0efd6d6 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -841,14 +841,15 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); struct regulator_config config = { }; - ldo = kzalloc(sizeof(struct ldo_regulator), GFP_KERNEL); + ldo = devm_kzalloc(codec->dev, sizeof(struct ldo_regulator), + GFP_KERNEL); if (!ldo) return -ENOMEM; - ldo->desc.name = kstrdup(dev_name(codec->dev), GFP_KERNEL); + ldo->desc.name = devm_kstrdup(codec->dev, dev_name(codec->dev), + GFP_KERNEL); if (!ldo->desc.name) { - kfree(ldo); dev_err(codec->dev, "failed to allocate decs name memory\n"); return -ENOMEM; } @@ -865,35 +866,17 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, config.driver_data = ldo; config.init_data = init_data; - ldo->dev = regulator_register(&ldo->desc, &config); + ldo->dev = devm_regulator_register(codec->dev, &ldo->desc, &config); if (IS_ERR(ldo->dev)) { int ret = PTR_ERR(ldo->dev); dev_err(codec->dev, "failed to register regulator\n"); - kfree(ldo->desc.name); - kfree(ldo); - return ret; } sgtl5000->ldo = ldo; return 0; } - -static int ldo_regulator_remove(struct snd_soc_codec *codec) -{ - struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); - struct ldo_regulator *ldo = sgtl5000->ldo; - - if (!ldo) - return 0; - - regulator_unregister(ldo->dev); - kfree(ldo->desc.name); - kfree(ldo); - - return 0; -} #else static int ldo_regulator_register(struct snd_soc_codec *codec, struct regulator_init_data *init_data, @@ -902,11 +885,6 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, dev_err(codec->dev, "this setup needs regulator support in the kernel\n"); return -EINVAL; } - -static int ldo_regulator_remove(struct snd_soc_codec *codec) -{ - return 0; -} #endif /* @@ -1278,23 +1256,17 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); if (ret) - goto err_ldo_remove; + return ret; ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); if (ret) - goto err_ldo_remove; + return ret; /* wait for all power rails bring up */ udelay(10); return 0; - -err_ldo_remove: - if (!external_vddd) - ldo_regulator_remove(codec); - return ret; - } static int sgtl5000_probe(struct snd_soc_codec *codec) @@ -1359,8 +1331,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) err: regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); - ldo_regulator_remove(codec); - return ret; } @@ -1372,8 +1342,6 @@ static int sgtl5000_remove(struct snd_soc_codec *codec) regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies), sgtl5000->supplies); - ldo_regulator_remove(codec); - return 0; } -- 1.9.1

5 11

[alsa-devel] [PATCH 1/2] ASoC: samsung: Update sound-card name for Snow
by Tushar Behera 09 Jul '14

09 Jul '14

Snow sound-card driver supports multiple boards with different audio codecs. Updating the sound card name per board basis would provide some more information to the end-user. Signed-off-by: Tushar Behera <tushar.b(a)samsung.com> --- Documentation/devicetree/bindings/sound/snow.txt | 4 ++++ sound/soc/samsung/snow.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/snow.txt b/Documentation/devicetree/bindings/sound/snow.txt index e0b7a82..6df74f1 100644 --- a/Documentation/devicetree/bindings/sound/snow.txt +++ b/Documentation/devicetree/bindings/sound/snow.txt @@ -8,11 +8,15 @@ Required properties: - samsung,i2s-controller: The phandle of the Samsung I2S controller - samsung,audio-codec: The phandle of the audio codec +Optional: +- samsung,model: The name of the sound-card + Example: sound { compatible = "google,snow-audio-max98095"; + samsung,model = "Snow-I2S-MAX98095"; samsung,i2s-controller = <&i2s0>; samsung,audio-codec = <&max98095>; }; diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 8bbd348..0acf5d0 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -92,6 +92,9 @@ static int snow_probe(struct platform_device *pdev) card->dev = &pdev->dev; + /* Update card-name if provided through DT, else use default name */ + snd_soc_of_parse_card_name(card, "samsung,model"); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); -- 1.7.9.5

2 3

[alsa-devel] [PATCH 0/2] add rockchip i2s driver
by jianqun 09 Jul '14

09 Jul '14

From: Jianqun Xu <xjq(a)rock-chips.com> This patch is to add driver for I2S controller in RK3xxx SoCs. Jianqun Xu (2): ASoC: dt-bindings: add rockchip i2s bindings ASoC: add driver for Rockchip RK3xxx I2S controller .../devicetree/bindings/sound/rockchip-i2s.txt | 45 ++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/rockchip/Kconfig | 16 + sound/soc/rockchip/Makefile | 6 + sound/soc/rockchip/i2s.h | 222 +++++++ sound/soc/rockchip/pcm.h | 14 + sound/soc/rockchip/rockchip_i2s.c | 622 ++++++++++++++++++++ sound/soc/rockchip/rockchip_pcm.c | 64 ++ 9 files changed, 991 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.txt create mode 100644 sound/soc/rockchip/Kconfig create mode 100644 sound/soc/rockchip/Makefile create mode 100644 sound/soc/rockchip/i2s.h create mode 100644 sound/soc/rockchip/pcm.h create mode 100644 sound/soc/rockchip/rockchip_i2s.c create mode 100644 sound/soc/rockchip/rockchip_pcm.c -- 1.7.9.5

5 17

[alsa-devel] [PATCH] ASoC: cs42l56: Move ADC/PCM Swap to DAPM
by Brian Austin 08 Jul '14

08 Jul '14

The Swap controls for ADC/PCM paths should be in the DAPM domain. Signed-off-by: Brian Austin <brian.austin(a)cirrus.com> --- sound/soc/codecs/cs42l56.c | 64 +++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index fdc4bd2..e5ef223 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -318,24 +318,32 @@ static const struct soc_enum adca_swap_enum = ARRAY_SIZE(left_swap_text), left_swap_text, swap_values); +static const struct snd_kcontrol_new adca_swap_mux = + SOC_DAPM_ENUM("Route", adca_swap_enum); static const struct soc_enum pcma_swap_enum = SOC_VALUE_ENUM_SINGLE(CS42L56_CHAN_MIX_SWAP, 4, 3, ARRAY_SIZE(left_swap_text), left_swap_text, swap_values); +static const struct snd_kcontrol_new pcma_swap_mux = + SOC_DAPM_ENUM("Route", pcma_swap_enum); static const struct soc_enum adcb_swap_enum = SOC_VALUE_ENUM_SINGLE(CS42L56_CHAN_MIX_SWAP, 2, 3, ARRAY_SIZE(right_swap_text), right_swap_text, swap_values); +static const struct snd_kcontrol_new adcb_swap_mux = + SOC_DAPM_ENUM("Route", adcb_swap_enum); static const struct soc_enum pcmb_swap_enum = SOC_VALUE_ENUM_SINGLE(CS42L56_CHAN_MIX_SWAP, 6, 3, ARRAY_SIZE(right_swap_text), right_swap_text, swap_values); +static const struct snd_kcontrol_new pcmb_swap_mux = + SOC_DAPM_ENUM("Route", pcmb_swap_enum); static const struct snd_kcontrol_new hpa_switch = SOC_DAPM_SINGLE("Switch", CS42L56_PWRCTL_2, 6, 1, 1); @@ -467,11 +475,6 @@ static const struct snd_kcontrol_new cs42l56_snd_controls[] = { SOC_SINGLE("ADCA Invert", CS42L56_MISC_ADC_CTL, 2, 1, 1), SOC_SINGLE("ADCB Invert", CS42L56_MISC_ADC_CTL, 3, 1, 1), - SOC_ENUM("PCMA Swap", pcma_swap_enum), - SOC_ENUM("PCMB Swap", pcmb_swap_enum), - SOC_ENUM("ADCA Swap", adca_swap_enum), - SOC_ENUM("ADCB Swap", adcb_swap_enum), - SOC_DOUBLE("HPF Switch", CS42L56_HPF_CTL, 5, 7, 1, 1), SOC_DOUBLE("HPF Freeze Switch", CS42L56_HPF_CTL, 4, 6, 1, 1), SOC_ENUM("HPFA Corner Freq", hpfa_freq_enum), @@ -570,6 +573,16 @@ static const struct snd_soc_dapm_widget cs42l56_dapm_widgets[] = { SND_SOC_DAPM_ADC("ADCA", NULL, CS42L56_PWRCTL_1, 1, 1), SND_SOC_DAPM_ADC("ADCB", NULL, CS42L56_PWRCTL_1, 2, 1), + SND_SOC_DAPM_MUX("ADCA Swap Mux", SND_SOC_NOPM, 0, 0, + &adca_swap_mux), + SND_SOC_DAPM_MUX("ADCB Swap Mux", SND_SOC_NOPM, 0, 0, + &adcb_swap_mux), + + SND_SOC_DAPM_MUX("PCMA Swap Mux", SND_SOC_NOPM, 0, 0, + &pcma_swap_mux), + SND_SOC_DAPM_MUX("PCMB Swap Mux", SND_SOC_NOPM, 0, 0, + &pcmb_swap_mux), + SND_SOC_DAPM_DAC("DACA", NULL, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_DAC("DACB", NULL, SND_SOC_NOPM, 0, 0), @@ -607,8 +620,19 @@ static const struct snd_soc_dapm_route cs42l56_audio_map[] = { {"Digital Output Mux", NULL, "ADCA"}, {"Digital Output Mux", NULL, "ADCB"}, - {"ADCB", NULL, "ADCB Mux"}, - {"ADCA", NULL, "ADCA Mux"}, + {"ADCB", NULL, "ADCB Swap Mux"}, + {"ADCA", NULL, "ADCA Swap Mux"}, + + {"ADCA Swap Mux", NULL, "ADCA"}, + {"ADCB Swap Mux", NULL, "ADCB"}, + + {"DACA", "Left", "ADCA Swap Mux"}, + {"DACA", "LR 2", "ADCA Swap Mux"}, + {"DACA", "Right", "ADCA Swap Mux"}, + + {"DACB", "Left", "ADCB Swap Mux"}, + {"DACB", "LR 2", "ADCB Swap Mux"}, + {"DACB", "Right", "ADCB Swap Mux"}, {"ADCA Mux", NULL, "AIN3A"}, {"ADCA Mux", NULL, "AIN2A"}, @@ -633,30 +657,32 @@ static const struct snd_soc_dapm_route cs42l56_audio_map[] = { {"PGAB Input Mux", NULL, "AIN2B"}, {"PGAB Input Mux", NULL, "AIN3B"}, - {"LOB", NULL, "Lineout Right"}, - {"LOA", NULL, "Lineout Left"}, - - {"Lineout Right", "Switch", "LINEOUTB Input Mux"}, - {"Lineout Left", "Switch", "LINEOUTA Input Mux"}, + {"LOB", "Switch", "LINEOUTB Input Mux"}, + {"LOA", "Switch", "LINEOUTA Input Mux"}, {"LINEOUTA Input Mux", "PGAA", "PGAA"}, {"LINEOUTB Input Mux", "PGAB", "PGAB"}, {"LINEOUTA Input Mux", "DACA", "DACA"}, {"LINEOUTB Input Mux", "DACB", "DACB"}, - {"HPA", NULL, "Headphone Left"}, - {"HPB", NULL, "Headphone Right"}, - - {"Headphone Right", "Switch", "HPB Input Mux"}, - {"Headphone Left", "Switch", "HPA Input Mux"}, + {"HPA", "Switch", "HPB Input Mux"}, + {"HPB", "Switch", "HPA Input Mux"}, {"HPA Input Mux", "PGAA", "PGAA"}, {"HPB Input Mux", "PGAB", "PGAB"}, {"HPA Input Mux", "DACA", "DACA"}, {"HPB Input Mux", "DACB", "DACB"}, - {"DACB", NULL, "HiFi Playback"}, - {"DACA", NULL, "HiFi Playback"}, + {"DACA", NULL, "PCMA Swap Mux"}, + {"DACB", NULL, "PCMB Swap Mux"}, + + {"PCMB Swap Mux", "Left", "HiFi Playback"}, + {"PCMB Swap Mux", "LR 2", "HiFi Playback"}, + {"PCMB Swap Mux", "Right", "HiFi Playback"}, + + {"PCMA Swap Mux", "Left", "HiFi Playback"}, + {"PCMA Swap Mux", "LR 2", "HiFi Playback"}, + {"PCMA Swap Mux", "Right", "HiFi Playback"}, }; -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/1] ASoC: core: Fix trivial typo
by Sachin Kamat 08 Jul '14

08 Jul '14

Replaced providing with provided. Signed-off-by: Sachin Kamat <sachin.kamat(a)samsung.com> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c32d8399e770..c5ce67483abc 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4396,7 +4396,7 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card, ret = of_property_read_string_index(np, propname, 0, &card->name); /* - * EINVAL means the property does not exist. This is fine providing + * EINVAL means the property does not exist. This is fine provided * card->name was previously set, which is checked later in * snd_soc_register_card. */ -- 1.7.9.5

2 2

[alsa-devel] [PATCH 00/13] Remove mach-kirkwood and mach-dove
by Andrew Lunn 08 Jul '14

08 Jul '14

This patchset removes arch/arm/mach-kirkwood and arch/arm/mach-dove. These SoCs are now supported in arch/arm/mach-mvebu using device tree. Change the dependencies for a number of drivers, either to use ARCH_MVEBU where the drivers are generic, or MACH_KIRKWOOD and MACH_DOVE where the drivers are specific to a SoC. Andrew Lunn (13): ARM: Kirkwood: Remove mach-kirkwood ARM: Dove: Remove mach-dove sound: ASoC: kirkwood: Remove unused drivers sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD and ARCH_DOVE dependency cpuidle: kirkwood: Replace ARCH_KIRKWOOD dependency ata: Remove ARCH_KIRKWOOD and ARCH_DOVE dependency thermal: Replace ARCH_KIRKWOOD and ARCH_DOVE dependency leds: Replace ARCH_KIRKWOOD dependency PCI: Remove ARCH_KIRKWOOD and ARCH_DOVE dependency phy: Replace ARCH_KIRKWOOD and ARCH_DOVE dependency rtc: Remove ARCH_KIRKWOOD and ARCH_DOVE dependency watchdog: Remove ARCH_KIRKWOOD and ARCH_DOVE dependency Remove ARCH_DOVE dependency arch/arm/Kconfig | 32 - arch/arm/Kconfig.debug | 10 +- arch/arm/Makefile | 2 - arch/arm/boot/dts/Makefile | 5 +- arch/arm/configs/dove_defconfig | 146 ----- arch/arm/configs/kirkwood_defconfig | 181 ------ arch/arm/mach-dove/Kconfig | 25 - arch/arm/mach-dove/Makefile | 5 - arch/arm/mach-dove/Makefile.boot | 3 - arch/arm/mach-dove/cm-a510.c | 97 --- arch/arm/mach-dove/common.c | 411 ------------ arch/arm/mach-dove/common.h | 49 -- arch/arm/mach-dove/dove-db-setup.c | 103 --- arch/arm/mach-dove/include/mach/bridge-regs.h | 57 -- arch/arm/mach-dove/include/mach/dove.h | 190 ------ arch/arm/mach-dove/include/mach/entry-macro.S | 33 - arch/arm/mach-dove/include/mach/hardware.h | 19 - arch/arm/mach-dove/include/mach/irqs.h | 96 --- arch/arm/mach-dove/include/mach/pm.h | 72 --- arch/arm/mach-dove/include/mach/uncompress.h | 36 -- arch/arm/mach-dove/irq.c | 178 ------ arch/arm/mach-dove/mpp.c | 162 ----- arch/arm/mach-dove/mpp.h | 196 ------ arch/arm/mach-dove/pcie.c | 220 ------- arch/arm/mach-kirkwood/Kconfig | 111 ---- arch/arm/mach-kirkwood/Makefile | 14 - arch/arm/mach-kirkwood/Makefile.boot | 3 - arch/arm/mach-kirkwood/board-dt.c | 223 ------- arch/arm/mach-kirkwood/common.c | 746 ---------------------- arch/arm/mach-kirkwood/common.h | 74 --- arch/arm/mach-kirkwood/d2net_v2-setup.c | 231 ------- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 86 --- arch/arm/mach-kirkwood/include/mach/entry-macro.S | 34 - arch/arm/mach-kirkwood/include/mach/hardware.h | 14 - arch/arm/mach-kirkwood/include/mach/irqs.h | 65 -- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 142 ---- arch/arm/mach-kirkwood/include/mach/uncompress.h | 46 -- arch/arm/mach-kirkwood/irq.c | 82 --- arch/arm/mach-kirkwood/lacie_v2-common.c | 114 ---- arch/arm/mach-kirkwood/lacie_v2-common.h | 16 - arch/arm/mach-kirkwood/mpp.c | 43 -- arch/arm/mach-kirkwood/mpp.h | 348 ---------- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 422 ------------ arch/arm/mach-kirkwood/openrd-setup.c | 255 -------- arch/arm/mach-kirkwood/pcie.c | 296 --------- arch/arm/mach-kirkwood/pm.c | 76 --- arch/arm/mach-kirkwood/pm.h | 26 - arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 89 --- arch/arm/mach-kirkwood/rd88f6281-setup.c | 128 ---- arch/arm/mach-kirkwood/t5325-setup.c | 216 ------- arch/arm/mach-kirkwood/ts219-setup.c | 142 ---- arch/arm/mach-kirkwood/ts41x-setup.c | 186 ------ arch/arm/mach-kirkwood/tsx1x-common.c | 113 ---- arch/arm/mach-kirkwood/tsx1x-common.h | 7 - arch/arm/mm/Kconfig | 2 +- drivers/ata/Kconfig | 4 +- drivers/cpuidle/Kconfig.arm | 2 +- drivers/leds/Kconfig | 4 +- drivers/mmc/host/Kconfig | 2 +- drivers/pci/host/Kconfig | 2 +- drivers/phy/Kconfig | 2 +- drivers/rtc/Kconfig | 2 +- drivers/thermal/Kconfig | 4 +- drivers/watchdog/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 19 +- sound/soc/kirkwood/Makefile | 4 - sound/soc/kirkwood/kirkwood-openrd.c | 109 ---- sound/soc/kirkwood/kirkwood-t5325.c | 116 ---- 68 files changed, 20 insertions(+), 6930 deletions(-) delete mode 100644 arch/arm/configs/dove_defconfig delete mode 100644 arch/arm/configs/kirkwood_defconfig delete mode 100644 arch/arm/mach-dove/Kconfig delete mode 100644 arch/arm/mach-dove/Makefile delete mode 100644 arch/arm/mach-dove/Makefile.boot delete mode 100644 arch/arm/mach-dove/cm-a510.c delete mode 100644 arch/arm/mach-dove/common.c delete mode 100644 arch/arm/mach-dove/common.h delete mode 100644 arch/arm/mach-dove/dove-db-setup.c delete mode 100644 arch/arm/mach-dove/include/mach/bridge-regs.h delete mode 100644 arch/arm/mach-dove/include/mach/dove.h delete mode 100644 arch/arm/mach-dove/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-dove/include/mach/hardware.h delete mode 100644 arch/arm/mach-dove/include/mach/irqs.h delete mode 100644 arch/arm/mach-dove/include/mach/pm.h delete mode 100644 arch/arm/mach-dove/include/mach/uncompress.h delete mode 100644 arch/arm/mach-dove/irq.c delete mode 100644 arch/arm/mach-dove/mpp.c delete mode 100644 arch/arm/mach-dove/mpp.h delete mode 100644 arch/arm/mach-dove/pcie.c delete mode 100644 arch/arm/mach-kirkwood/Kconfig delete mode 100644 arch/arm/mach-kirkwood/Makefile delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot delete mode 100644 arch/arm/mach-kirkwood/board-dt.c delete mode 100644 arch/arm/mach-kirkwood/common.c delete mode 100644 arch/arm/mach-kirkwood/common.h delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h delete mode 100644 arch/arm/mach-kirkwood/irq.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h delete mode 100644 arch/arm/mach-kirkwood/mpp.c delete mode 100644 arch/arm/mach-kirkwood/mpp.h delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c delete mode 100644 arch/arm/mach-kirkwood/pcie.c delete mode 100644 arch/arm/mach-kirkwood/pm.c delete mode 100644 arch/arm/mach-kirkwood/pm.h delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Cc: Daniel Lezcano <daniel.lezcano(a)linaro.org> Cc: Rafael J. Wysocki <rjw(a)rjwysocki.net> Cc: linux-pm(a)vger.kernel.org Cc: Tejun Heo <tj(a)kernel.org> Cc: linux-ide(a)vger.kernel.org Cc: Zhang Rui <rui.zhang(a)intel.com> Cc: linux-pm(a)vger.kernel.org Cc: Bryan Wu <cooloney(a)gmail.com> Cc: Richard Purdie <rpurdie(a)rpsys.net> Cc: linux-leds(a)vger.kernel.org Cc: Bjorn Helgaas <bhelgaas(a)google.com> Cc: linux-pci(a)vger.kernel.org Cc: Kishon Vijay Abraham I <kishon(a)ti.com> Cc: Alessandro Zummo <a.zummo(a)towertech.it> Cc: rtc-linux(a)googlegroups.com Cc: Wim Van Sebroeck <wim(a)iguana.be> Cc: linux-watchdog(a)vger.kernel.org -- 2.0.0

7 27

[alsa-devel] [PATCH] ASoC: omap-dmic: Use devm_snd_soc_register_component
by Manish Badarkhe 08 Jul '14

08 Jul '14

Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish(a)gmail.com> --- :100644 100644 6925d71... 011e30e... M sound/soc/omap/omap-dmic.c sound/soc/omap/omap-dmic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 6925d71..011e30e 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -490,7 +490,7 @@ static int asoc_dmic_probe(struct platform_device *pdev) } - ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component, + ret = devm_snd_soc_register_component(&pdev->dev, &omap_dmic_component, &omap_dmic_dai, 1); if (ret) goto err_put_clk; @@ -510,7 +510,6 @@ static int asoc_dmic_remove(struct platform_device *pdev) { struct omap_dmic *dmic = platform_get_drvdata(pdev); - snd_soc_unregister_component(&pdev->dev); clk_put(dmic->fclk); return 0; -- 1.7.10.4

2 2

[alsa-devel] [PATCH] ASoC: omap-hdmi: Use devm_snd_soc_register_component
by Manish Badarkhe 08 Jul '14

08 Jul '14

Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish(a)gmail.com> --- :100644 100644 eb9c392... 1dc95b5... M sound/soc/omap/omap-hdmi.c sound/soc/omap/omap-hdmi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index eb9c392..1dc95b5 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -322,7 +322,7 @@ static int omap_hdmi_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, hdmi_data); - ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, + ret = devm_snd_soc_register_component(&pdev->dev, &omap_hdmi_component, &omap_hdmi_dai, 1); if (ret) @@ -335,8 +335,6 @@ static int omap_hdmi_remove(struct platform_device *pdev) { struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); - if (hdmi_data == NULL) { dev_err(&pdev->dev, "cannot obtain HDMi data\n"); return -ENODEV; -- 1.7.10.4

2 2

[alsa-devel] [PATCH 1/2] ALSA: hda - fix a typo by changing mute_led_nid to cap_mute_led_nid
by Hui Wang 08 Jul '14

08 Jul '14

BugLink: https://bugs.launchpad.net/bugs/1329580 Cc: David Henningsson <david.henningsson(a)canonical.com> Cc: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 327413e..73b1759 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3529,7 +3529,7 @@ static void alc269_fixup_hp_cap_mic_mute_hook(struct hda_codec *codec, struct alc_spec *spec = codec->spec; unsigned int pinval, enable, disable; - pinval = snd_hda_codec_get_pin_target(codec, spec->mute_led_nid); + pinval = snd_hda_codec_get_pin_target(codec, spec->cap_mute_led_nid); pinval &= ~AC_PINCTL_VREFEN; enable = pinval | AC_PINCTL_VREF_80; disable = pinval | AC_PINCTL_VREF_HIZ; -- 1.8.1.2

2 2

[alsa-devel] [PATCH] USB-Audio: Add second S/PDIF device on Phiree U2
by Anssi Hannula 08 Jul '14

08 Jul '14

Phiree U2 has an unusual configuration. It only has S/PDIF output, but there are still two devices presented: - device 0: PCM audio, subject to volume control - device 1: non-PCM data (passthrough), not subject to volume control It looks like the AES bits are set according to the selected device, since outputting PCM data via device 1 will not work (silence). Currently only the device 0 is shown via the "iec958" alias, and the second device is not accessible via hinted aliases. Simply provide access to both of these devices via the "iec958" alias. Reported-by: touc @ XBMC forum Signed-off-by: Anssi Hannula <anssi.hannula(a)iki.fi> --- This isn't really the optimal solution, but is probably one of the simplest (except maybe just using device 1 as the only iec958 device). I guess the kernel driver (or even config rules with sufficient @func support) could select the appropriate device according to AES0, but not sure if that is worth the effort? Also, I'm not 100% sure if this is actually uncommon or if we just hide it in on other such devices. src/conf/cards/USB-Audio.conf | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index ce3ae01..77a48b9 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -52,6 +52,11 @@ USB-Audio.pcm.iec958_device { "USB Device 0x46d:0x992" 999 } +# Second iec958 device number, if any. +USB-Audio.pcm.iec958_2_device { + "PHIREE U2" 1 # 0 = PCM S/PDIF, 1 = non-PCM S/PDIF +} + # If a device requires non-standard definitions for front, surround40, # surround51, surround71 or iec958, they can be defined here. @@ -422,4 +427,39 @@ USB-Audio.pcm.iec958.0 { } } +USB-Audio.pcm.iec958.1 { + @args [ CARD AES0 AES1 AES2 AES3 ] + @args.CARD { type string } + @args.AES0 { type integer } + @args.AES1 { type integer } + @args.AES2 { type integer } + @args.AES3 { type integer } + @func refer + name { + @func concat + strings [ + "cards.USB-Audio." + { @func card_name card $CARD } + ".pcm.iec958_2:CARD=" $CARD + ",AES0=" $AES0 ",AES1=" $AES1 ",AES2=" $AES2 ",AES3=" $AES3 + ] + } + default { + # FIXME: we cannot set the AES parameters + type hw + card $CARD + device { + @func refer + name { + @func concat + strings [ + "cards.USB-Audio.pcm.iec958_2_device." + { @func card_name card $CARD } + ] + } + default 999 + } + } +} + # vim: ft=alsaconf -- 1.8.4.5

2 1