sound fixes for 3.12-rc7
Subsystems (6)
Linus,
please pull sound fixes for v3.12-rc7 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.12
The topmost commit is d7f8761b6614d2d3695dd57d27d0b2f952777648
----------------------------------------------------------------
sound fixes for 3.12-rc7
The pending last-minute ASoC fixes, all of which are driver-local (tlv320aic3x, rcar, pcm1681, pcm1792a, omap, fsl) and should be pretty safe to apply.
I hoped the rc6 pull request would have been the last one, but it happens always so. All good small fixes, so it'd be nice to be in 3.12.
Thanks!
Takashi, the dörrmatta
----------------------------------------------------------------
Axel Lin (3):
ASoC: pcm1681: Fix max_register setting
ASoC: pcm1681: Fix max_register setting
ASoC: pcm1792a: Fix max_register setting
Guenter Roeck (1):
ASoC: fsl_ssi: Fix irq_of_parse_and_map() return value check
Jarkko Nikula (1):
ASoC: omap: Fix incorrect ARM dependency
Kuninori Morimoto (1):
ASoC: rcar: fixup generation checker
Mark Brown (1):
ALSA: Add MAINTAINERS entry for dmaengine helpers
Peter Ujfalusi (1):
ASoC: tlv320aic3x: Connect 'Left Line1R Mux' and 'Right Line1L Mux'
Philippe Rétornaz (2):
ASoC: fsl: Fix sound on mx31moboard
ASoC: fsl: imx-ssi: fix probe on imx31
--- MAINTAINERS | 7 +++++++ include/sound/rcar_snd.h | 1 + sound/soc/codecs/pcm1681.c | 2 +- sound/soc/codecs/pcm1792a.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 4 ++++ sound/soc/fsl/fsl_ssi.c | 2 +- sound/soc/fsl/imx-mc13783.c | 2 +- sound/soc/fsl/imx-ssi.c | 23 ++++++++++++----------- sound/soc/fsl/imx-ssi.h | 2 ++ sound/soc/omap/Kconfig | 4 ++-- sound/soc/sh/rcar/rsnd.h | 4 ++-- 11 files changed, 34 insertions(+), 19 deletions(-)
MAINTAINERS +7 -0
@@ -7822,6 +7822,13 @@ F: Documentation/sound/alsa/soc/ F: sound/soc/ F: include/sound/soc* +SOUND - DMAENGINE HELPERS +M: Lars-Peter Clausen <[email protected]> +S: Supported +F: include/sound/dmaengine_pcm.h +F: sound/core/pcm_dmaengine.c +F: sound/soc/soc-generic-dmaengine-pcm.c + SPARC + UltraSPARC (sparc/sparc64) M: "David S. Miller" <[email protected]> L: [email protected]
include/sound/rcar_snd.h +1 -0
@@ -68,6 +68,7 @@ struct rsnd_scu_platform_info {* * A : generation */ +#define RSND_GEN_MASK (0xF << 0)#define RSND_GEN1 (1 << 0)/* fixme */ #define RSND_GEN2 (2 << 0)/* fixme */
sound/soc/codecs/pcm1681.c +1 -1
@@ -270,7 +270,7 @@ MODULE_DEVICE_TABLE(of, pcm1681_dt_ids);static const struct regmap_config pcm1681_regmap = { .reg_bits =8 , .val_bits =8 , - .max_register =ARRAY_SIZE (pcm1681_reg_defaults) +1 , + .max_register =0x13 , .reg_defaults = pcm1681_reg_defaults, .num_reg_defaults =ARRAY_SIZE (pcm1681_reg_defaults), .writeable_reg = pcm1681_writeable_reg,
sound/soc/codecs/pcm1792a.c +1 -1
@@ -188,7 +188,7 @@ MODULE_DEVICE_TABLE(of, pcm1792a_of_match);static const struct regmap_config pcm1792a_regmap = { .reg_bits =8 , .val_bits =8 , - .max_register =24 , + .max_register =23 , .reg_defaults = pcm1792a_reg_defaults, .num_reg_defaults =ARRAY_SIZE (pcm1792a_reg_defaults), .writeable_reg = pcm1792a_writeable_reg,
sound/soc/codecs/tlv320aic3x.c +4 -0
@@ -674,6 +674,8 @@ static const struct snd_soc_dapm_route intercon[] = {/* Left Input */ {"Left Line1L Mux", "single-ended", "LINE1L"}, {"Left Line1L Mux", "differential", "LINE1L"}, + {"Left Line1R Mux", "single-ended", "LINE1R"}, + {"Left Line1R Mux", "differential", "LINE1R"}, {"Left Line2L Mux", "single-ended", "LINE2L"}, {"Left Line2L Mux", "differential", "LINE2L"},
@@ -690,6 +692,8 @@ static const struct snd_soc_dapm_route intercon[] = {/* Right Input */ {"Right Line1R Mux", "single-ended", "LINE1R"}, {"Right Line1R Mux", "differential", "LINE1R"}, + {"Right Line1L Mux", "single-ended", "LINE1L"}, + {"Right Line1L Mux", "differential", "LINE1L"}, {"Right Line2R Mux", "single-ended", "LINE2R"}, {"Right Line2R Mux", "differential", "LINE2R"},
sound/soc/fsl/fsl_ssi.c +1 -1
@@ -936,7 +936,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) ssi_private->ssi_phys = res.start; ssi_private->irq =irq_of_parse_and_map (np,0 ); -if (ssi_private->irq ==NO_IRQ ) { +if (ssi_private->irq ==0 ) {dev_err (&pdev->dev,"no irq for node %s\n" , np->full_name);return -ENXIO ; }
sound/soc/fsl/imx-mc13783.c +1 -1
@@ -112,7 +112,7 @@ static int imx_mc13783_probe(struct platform_device *pdev)return ret; } -if (machine_is_mx31_3ds ()) { +if (machine_is_mx31_3ds () ||machine_is_mx31moboard ()) { imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4, IMX_AUDMUX_V2_PTCR_SYN, IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) |
sound/soc/fsl/imx-ssi.c +12 -11
@@ -600,19 +600,17 @@ static int imx_ssi_probe(struct platform_device *pdev) ssi->fiq_params.dma_params_rx = &ssi->dma_params_rx; ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx; - ret =imx_pcm_fiq_init (pdev, &ssi->fiq_params); -if (ret) - goto failed_pcm_fiq; + ssi->fiq_init =imx_pcm_fiq_init (pdev, &ssi->fiq_params); + ssi->dma_init =imx_pcm_dma_init (pdev); - ret =imx_pcm_dma_init (pdev); -if (ret) - goto failed_pcm_dma; +if (ssi->fiq_init && ssi->dma_init) { + ret = ssi->fiq_init; + goto failed_pcm; + }return 0 ; -failed_pcm_dma: -imx_pcm_fiq_exit (pdev); -failed_pcm_fiq: +failed_pcm:snd_soc_unregister_component (&pdev->dev); failed_register:release_mem_region (res->start,resource_size (res));
@@ -628,8 +626,11 @@ static int imx_ssi_remove(struct platform_device *pdev)struct resource *res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );struct imx_ssi *ssi =platform_get_drvdata (pdev); -imx_pcm_dma_exit (pdev); -imx_pcm_fiq_exit (pdev); +if (!ssi->dma_init) +imx_pcm_dma_exit (pdev); + +if (!ssi->fiq_init) +imx_pcm_fiq_exit (pdev);snd_soc_unregister_component (&pdev->dev);
sound/soc/fsl/imx-ssi.h +2 -0
@@ -211,6 +211,8 @@ struct imx_ssi {struct imx_dma_data filter_data_rx;struct imx_pcm_fiq_params fiq_params; +int fiq_init; +int dma_init;int enabled; };
sound/soc/omap/Kconfig +2 -2
@@ -1,6 +1,6 @@ config SND_OMAP_SOC tristate "SoC Audio for the Texas Instruments OMAP chips" - depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST) + depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST) select SND_DMAENGINE_PCM config SND_OMAP_SOC_DMIC
@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810 config SND_OMAP_SOC_RX51 tristate "SoC Audio support for Nokia RX-51" - depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) + depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) select SND_OMAP_SOC_MCBSP select SND_SOC_TLV320AIC3X select SND_SOC_TPA6130A2
sound/soc/sh/rcar/rsnd.h +2 -2
@@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv,void __iomem *rsnd_gen_reg_get (struct rsnd_priv *priv,struct rsnd_mod *mod,enum rsnd_reg reg); -#define rsnd_is_gen1 (s) ((s)->info->flags & RSND_GEN1) -#define rsnd_is_gen2 (s) ((s)->info->flags & RSND_GEN2) +#define rsnd_is_gen1 (s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1) +#define rsnd_is_gen2 (s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)/* * R-Car ADG