summaryrefslogtreecommitdiffstats
path: root/sound
Commit message (Collapse)AuthorAgeFilesLines
*---. Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and ↵Mark Brown2015-02-0928-463/+211
|\ \ \ | | | | | | | | | | | | 'asoc/topic/davinci' into asoc-next
| | | * ASoC: davinci-mcasp: Fix DIT only McASP instance supportPeter Ujfalusi2015-02-021-33/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the McASP instances in DM646x line of DMSoC only supports DIT mode. This means that the given IP does not have support for rx and all the rx related resources are missing, like irq and DMA request. The driver should not fail if any or all of the RX resource is missing when the op_mode is set to DIT mode. Since RX is not possible in DIT mode, we can just ignore the rx resources when the McASP is used in DIT mode. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * ASoC: davicni-mcasp: Mark the common irq line as sharedPeter Ujfalusi2015-02-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On DA830 devices McASP0,1 and 2 shares a single combined interrupt request line. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * ASoC: davinci-evm: Do not include davinci-pcm.h and davinci-i2s.hPeter Ujfalusi2015-02-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need for them to be included. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * ASoC: davinci-evm: Do not include edma headersPeter Ujfalusi2015-02-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The machine driver has no business with the underlying dma. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * ASoC: davinci: fix DM365_EVM codec selectionArnd Bergmann2015-01-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An earlier bug fix of mine made the SND_DM365_VOICE_CODEC symbol tristate to avoid creating an undefined reference from the davinci-vcif.c driver to the davinci_soc_platform_register function that may be in a module. However, this may now lead to a different error on randconfig kernels: "warning: SND_DM365_VOICE_CODEC creates inconsistent choice state" This happens because we now have a choice statement with one bool and one tristate option, and the latter might not support being set to 'y' because of dependencies. This new change turns the other option into 'tristate' as well, which avoids the problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is") Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * ASoC: davinci-mcasp: Support for combined tx/rx interrupt linePeter Ujfalusi2014-12-301-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some SoC, like da850/OMAP-L138 uses one common interrupt request for TX/RX events. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: Export snd_soc_runtime_set_dai_fmt()Lars-Peter Clausen2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export snd_soc_runtime_set_dai_fmt() so it can be used in modules. Fixes: ce64c8b9cf5b ("ASoC: Add helper function for changing the DAI link format") Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: mop500_ab8500: Use snd_soc_runtime_set_dai_fmt()Lars-Peter Clausen2015-01-071-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use snd_soc_runtime_set_dai_fmt() to configure the format for the DAI link rather than configuring each DAI individually. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: omap-twl4030: Use snd_soc_runtime_set_dai_fmt()Lars-Peter Clausen2015-01-071-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use snd_soc_runtime_set_dai_fmt() to configure the format for the DAI link rather than configuring each DAI individually. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: Add helper function for changing the DAI link formatLars-Peter Clausen2015-01-071-56/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some setups it is necessary to change the DAI link format at runtime. This patch factors out the code that does the initial static DAI link format configuration into a separate helper function which can be used board drivers as well. This allows board drivers that have to change the DAI link format at runtime to reuse it instead of having to manually change the format on all DAIs. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: migor: Use static DAI format setupLars-Peter Clausen2015-01-061-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: smdk_wm8994pcm: Use static DAI format setupLars-Peter Clausen2015-01-061-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: smdk_wm8570pcm: Use static DAI format setupLars-Peter Clausen2015-01-061-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: smdk_wm8580: Use static DAI format setupLars-Peter Clausen2015-01-061-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: smartq_wm8987: Use static DAI format setupLars-Peter Clausen2015-01-061-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: s3c24xx_uda134x: Use static DAI format setupLars-Peter Clausen2015-01-061-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: s3c24xx_simtec: Use static DAI format setupLars-Peter Clausen2015-01-061-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: rx1950_uda1380: Use static DAI format setupLars-Peter Clausen2015-01-061-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: neo1973_wm8753: Use static DAI format setupLars-Peter Clausen2015-01-061-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: jive_wm8750: Use static DAI format setupLars-Peter Clausen2015-01-061-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: h1940_uda1380: Use static DAI format setupLars-Peter Clausen2015-01-061-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: goni_wm8994: Use static DAI format setupLars-Peter Clausen2015-01-061-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: zylonite: Use static DAI format setupLars-Peter Clausen2015-01-061-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: raumfeld: Use static DAI format setupLars-Peter Clausen2015-01-061-27/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: ams-delta: Use static DAI format setupLars-Peter Clausen2015-01-061-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: mxs-sgtl5000: Use static DAI format setupLars-Peter Clausen2015-01-061-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: wm1133-ev1: Use static DAI format setupLars-Peter Clausen2015-01-061-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: mx27vis-aci32x4: Use static DAI format setupLars-Peter Clausen2015-01-061-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: eureka-tlv320: Use static DAI format setupLars-Peter Clausen2015-01-061-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: db1200: Use static DAI format setupLars-Peter Clausen2015-01-061-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: sam9g20_wm8731: Use static DAI format setupLars-Peter Clausen2015-01-061-28/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Set the dai_fmt field in the dai_link struct instead of manually calling snd_soc_dai_fmt(). This makes the code cleaner and shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | ASoC: cs42l73: Constify struct regmap_config and snd_soc_codec_driverKrzysztof Kozlowski2015-01-051-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | The regmap_config struct may be const because it is not modified by the driver and regmap_init() accepts pointer to const. Make struct snd_soc_codec_driver const as well (snd_soc_register_codec() accepts pointer to const). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| |
| \
| \
| \
| \
| \
*-----. \ Merge remote-tracking branches 'asoc/topic/bt-sco', 'asoc/topic/cs35l32', ↵Mark Brown2015-02-094-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'asoc/topic/cs42l52' and 'asoc/topic/cs42l56' into asoc-next
| | | | * | ASoC: cs42l56: Constify struct regmap_config and snd_soc_codec_driverKrzysztof Kozlowski2015-01-051-2/+2
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regmap_config struct may be const because it is not modified by the driver and regmap_init() accepts pointer to const. Make struct snd_soc_codec_driver const as well (snd_soc_register_codec() accepts pointer to const). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | ASoC: cs42l52: Constify struct regmap_config and snd_soc_codec_driverKrzysztof Kozlowski2015-01-051-2/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regmap_config struct may be const because it is not modified by the driver and regmap_init() accepts pointer to const. Make struct snd_soc_codec_driver const as well (snd_soc_register_codec() accepts pointer to const). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | ASoC: cs35l32: Constify struct regmap_config and snd_soc_codec_driverKrzysztof Kozlowski2015-01-051-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regmap_config struct may be const because it is not modified by the driver and regmap_init() accepts pointer to const. Make struct snd_soc_codec_driver const as well (snd_soc_register_codec() accepts pointer to const). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | ASoC: Fix typo in bt-sco.cMasanari Iida2015-01-151-1/+1
| |/ | | | | | | | | | | | | This patch fix spelling typo in bt-sco.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| |
| \
| \
| \
| \
| \
*-----. \ Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/alc5632', ↵Mark Brown2015-02-098-62/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next
| | | | * | ASoC: au1x: Remove unnecessary snd_pcm_lib_preallocate_free_for_all()Lars-Peter Clausen2015-01-052-12/+0
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ALSA core takes care that all preallocated memory is freed when the PCM itself is freed. There is no need to do this manually in the driver. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | ASoC: atmel-pcm-dma: won't check direction when configure dmaBo Shen2015-02-021-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As DMA framework request DMA using direction only in prep_slave function, (The At91 xdma driver has adapted to this request). So won't check direction when do DMA configuration. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | ASoC: atmel_ssc_dai: only clean PDC when using PDCBo Shen2015-01-301-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only using PDC, it needs to clean PDC registers. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | ASoC: atmel_ssc_dai: refactor the startup and shutdownBo Shen2015-01-301-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In startup function, enable ssc clock and in shutdown function, disable clock. And also remove disable ssc in shutdown function, as ssc is disabled in prepare function. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | ASoC: atmel_ssc_dai: Support SND_SOC_DAIFMT_CBM_CFS on I2SPeter Rosin2015-01-301-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Rosin <peda@axentia.se> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | ASoC: atmel_ssc_dai: remove clock pin commentsBo Shen2015-01-271-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the clock can be get from TK/RK pin, so remove the comments. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | Merge branch 'fix/atmel' of ↵Mark Brown2015-01-271-14/+4
| | | |\ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-atmel
| | | * | | Asoc: sam9x5_wm8731: depend on ARCH_AT91 instead of SOC_AT91SAM9X5Alexandre Belloni2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SOC_AT91SAM9X5 option is going to be removed, only depend on ARCH_AT91 like for the other drivers. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * | | ASoC: atmel: sam9g20_wm8731: remove useless includeAlexandre Belloni2015-01-061-1/+0
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A mach/ header is included but never used. Simply remove it. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * | | ASoC: alc5632: Constify struct regmap_config and snd_soc_codec_driverKrzysztof Kozlowski2015-01-051-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regmap_config struct may be const because it is not modified by the driver and regmap_init() accepts pointer to const. Make struct snd_soc_codec_driver const as well (snd_soc_register_codec() accepts pointer to const). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | | ASoC: ad193x: Don't power down DAC in CODEC probeLars-Peter Clausen2015-01-121-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DAC powerdown bit is managed by DAPM. Manually powering down the DAC in the CODEC probe function may cause unnecessary power state transitions which can lead to click and pop noises. So leave the DAC powerdown bit in its default poweron-reset state and let DAPM do all the management. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
OpenPOWER on IntegriCloud