aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-05-22Merge remote-tracking branches 'asoc/topic/rt5651', 'asoc/topic/samsung', ↵Mark Brown41-550/+625
'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/sta350' and 'asoc/topic/tlv320dac33' into asoc-next
2014-05-22Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', ↵Mark Brown60-812/+10018
'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/rt5640' and 'asoc/topic/rt5645' into asoc-next
2014-05-22Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', ↵Mark Brown31-431/+745
'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/mc13783' and 'asoc/topic/multicodec' into asoc-next
2014-05-22Merge remote-tracking branches 'asoc/topic/devm', 'asoc/topic/fsl', ↵Mark Brown13-838/+977
'asoc/topic/fsl-esai', 'asoc/topic/fsl-sai', 'asoc/topic/fsl-spdif' and 'asoc/topic/fsl-ssi' into asoc-next
2014-05-22Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' ↵Mark Brown28-308/+2103
and 'asoc/topic/davinci' into asoc-next
2014-05-22Merge remote-tracking branches 'asoc/topic/ad1980', 'asoc/topic/adsp', ↵Mark Brown11-43/+194
'asoc/topic/ak4104', 'asoc/topic/ak4642', 'asoc/topic/alc5623', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/cache' into asoc-next
2014-05-22Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-nextMark Brown1-0/+2
2014-05-22Merge remote-tracking branch 'asoc/topic/pcm' into asoc-nextMark Brown1-0/+7
2014-05-22Merge remote-tracking branch 'asoc/topic/enum' into asoc-nextMark Brown17-76/+58
2014-05-22Merge remote-tracking branch 'asoc/topic/dt' into asoc-nextMark Brown2-27/+55
2014-05-22Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-nextMark Brown16-102/+1
2014-05-22Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown2-119/+58
2014-05-22Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown6-81/+29
2014-05-22Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown68-848/+2659
2014-05-22Merge remote-tracking branch 'asoc/fix/max98090' into asoc-linusMark Brown1-1/+30
2014-05-22Merge tag 'asoc-v3.15-rc5-intel' into asoc-linusMark Brown11-59/+126
ASoC: Intel fixes for v3.15 This is a relatively large batch of fixes for the newly added Haswell/Baytrail drivers from Intel. It's a bit larger than is good for this point in the cycle but it's all for a newly added driver so not so worrying as it might otherwise be. Some of it's integration problems, some of it's the sort of problem usually turned up in stress tests. # gpg: Signature made Wed 14 May 2014 12:40:27 BST using RSA key ID 7EA229BD # gpg: Good signature from "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>"
2014-05-22Merge tag 'asoc-v3.15-rc5-drivers' into asoc-linusMark Brown6-16/+34
ASoC: Driver fixes for v3.15 A small set of driver fixes, nothing remarkable in itself or of any relevance outside of the driver. # gpg: Signature made Wed 14 May 2014 12:49:57 BST using RSA key ID 7EA229BD # gpg: Good signature from "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>"
2014-05-22Merge tag 'asoc-v3.15-rc5-core' into asoc-linusMark Brown3-11/+11
ASoC: Core fixes for v3.15 A few things here: - Fix the creation of spurious CODEC<->CODEC links which caused DAPM to have audio paths which shouldn't be present causing spurious powerups and potential audible issues for users. - Ensure the suspend->off transition doesn't have spurious transitions to prepare added to the sequence. - Fix incorrect skipping of PCM suspension for active audio streams. - Remove Timur Tabi from the CS4270 maintainers, Cirrus are now doing this and Timur no longer has the boards that he was using. # gpg: Signature made Wed 14 May 2014 12:59:19 BST using RSA key ID 7EA229BD # gpg: Good signature from "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>" # gpg: aka "Mark Brown <[email protected]>"
2014-05-22ASoC: samsung: Add devm_clk_get to pcm.cTushar Behera1-6/+2
clk_get in probe function can be safely replaced with devm_clk_get. Signed-off-by: Tushar Behera <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-22ASoC: samsung: Use devm_snd_soc_register_componentTushar Behera7-54/+15
Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Tushar Behera <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-22ASoC: samsung: Use devm_snd_soc_register_platformTushar Behera10-32/+6
Replaced snd_soc_register_platform with devm_snd_soc_register_platform in samsung_asoc_dma_platform_register(). This makes the function samsung_asoc_dma_platform_unregister() redundant. This is removed and all its users are updated. Signed-off-by: Tushar Behera <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-22ASoC: samsung: Use devm_snd_soc_register_cardTushar Behera7-97/+21
Replace snd_soc_register_card with devm_snd_soc_register_card. With this change, we can delete the empty remove functions. Signed-off-by: Tushar Behera <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: neo1973_wm8753: Automatically disconnected non-connected pinsLars-Peter Clausen1-7/+1
The DAPM routes for this board are complete, hence we can let the core take care of disconnecting non-connected pins rather than doing it manually. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: samsung: Allow setting OP_CLK of the IIS Multi Audio InterfaceSylwester Nawrocki2-0/+5
This patch adds support for setting source clock of the "Core CLK" of the IIS Multi Audio Interface. Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: pxa: remove mach header dependencyArnd Bergmann4-4/+5
As we are moving the mmp platform towards multiplatform support, we have to stop including platform header files. This changes the pxa-ssp sound driver file to no longer depend on mach/hardware.h and mach/dma.h. The code using the definitions from those headers is actually gone already, the only thing that was still being used was the pxa_dma_desc typedef, which we can easily work around by using the normal 'struct pxa_dma_desc' name. The pxa2xx-dma driver still uses this header, so we include it explicitly there, which is ok because that is only used on pxa, not on mmp. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Xia Kaixu <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: alc5623: Add device tree bindingAndrew Lunn3-1/+46
Let the ALC5623 codec be instantiated from DT. Add a simple binding for the additional control register and the jack detect register. Also, add a prompt to the Kconfig entry for this CODEC, so that it can be selected. Since kirkwood-t5325.c will no longer be used, we need to be able to enable the CODEC in the mvebu_v5_defconfig etc. Signed-off-by: Andrew Lunn <[email protected]> Acked-by: Jason Cooper <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Move fsl_ssi_set_dai_sysclk above fsl_ssi_hw_paramsSascha Hauer1-94/+96
fsl_ssi_set_dai_sysclk will be called from fsl_ssi_hw_params in the next patch. Move up to avoid forward declaration and to keep the next patch more readable. No functional change. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Transmit enable synchronizationMarkus Pargmann2-0/+2
When the fsl-ssi unit is used in i2s slave mode, it is possible that the SSI unit starts transmitting data on the wrong channel. This happens because the SSI does not synchronize with the left-right-clock by default. This patch enables transmit enable synchronization. Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Remove unnecessary variables from ssi_privateMarkus Pargmann1-53/+64
There are some variables defined in struct fsl_ssi_private that describe states that are also described by other variables. This patch adds some helper functions that return exactly the same information based on available variables. This helps to clean up struct fsl_ssi_private and remove them from the probe function. It also removes some not really used variables (new_binding, name). Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Cleanup probe functionMarkus Pargmann1-60/+53
Reorder the probe function to be able to move the second imx-specific block to the seperate imx probe function. The patch also removes some comments/variables/code that are not used anymore or could be simply replaced by other variables. Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Remove useless DMA codeMarkus Pargmann1-37/+3
Simplify dma DT property handling. fsl,ssi-dma-events is not used anymore. It passes invalid data to imx_pcm_dma_params_init_data() which copies some data into an imx dma struct. This struct is never used in imx-dma or imx-sdma because of generic OF DMA handling. The "fsl,ssi-dma-events" is not used anywhere in dts files. Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Move imx-specific probe to seperate functionMarkus Pargmann1-82/+103
Move imx specific probe code to a seperate function. It reduces the size of the probe() function and makes the code and error handling easier to understand. Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Use dev_name for DAI driver structMarkus Pargmann1-8/+3
Instead of creating a name using string manipulation functions, we can simply use the device name for the DAI driver struct. Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Move debugging to seperate fileMarkus Pargmann4-236/+232
Move all code that is only used for debugging to a seperate file. This makes it easier to see what functions are used for debugging only. Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: fsl-ssi: Fix register values when disablingMarkus Pargmann1-5/+35
The bits we have to clear when disabling are different when the other stream is still active. This patch fixes the calculation of new register values after disabling one stream. It also adds a more detailed description of the new register value calculation. Signed-off-by: Markus Pargmann <[email protected]> Tested-By: Michael Grzeschik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: mop500_ab8500: Replace instances of rtd->codec->card with rtd->cardLars-Peter Clausen1-1/+1
No need to go via the CODEC to get a pointer to the card. This will help to eventually remove the card field from the snd_soc_codec struct. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: omap: Replace instances of rtd->codec->card with rtd->cardLars-Peter Clausen3-7/+5
No need to go via the CODEC to get a pointer to the card. This will help to eventually remove the card field from the snd_soc_codec struct. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-20ASoC: ad1980: Replace goto loop with do-while loopLars-Peter Clausen1-20/+19
Using a proper do-while loop here instead of a open-coded goto loop is both cleaner and shorter. Also fixes the following warnings from smatch: sound/soc/codecs/ad1980.c:213 ad1980_reset() info: loop could be replaced with if statement. sound/soc/codecs/ad1980.c:212 ad1980_reset() info: ignoring unreachable code. sound/soc/codecs/ad1980.c:215 ad1980_reset() info: ignoring unreachable code. While we are at it also change retry_cnt to unsigned int, using u16 for a on-stack loop counter doesn't make that much sense. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-19ASoC: Intel: Fix pcm stream context restore crashKevin Strasser1-1/+3
In some cases the pcm stream is closed while context has been scheduled to be restored, causing a null pointer deref panic. Cancel work to ensure stream does not get freed while work is still active/pending. Also, restoring the pcm context can be safely skipped after the stream has been stopped. Check if pcm stream is still running before restoring stream context to help pending work finish more quickly in stream close path. Signed-off-by: Kevin Strasser <[email protected]> Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-19ASoC: rt5645: Fix updating wrong register for T5645_AIF2 caseAxel Lin1-2/+2
This looks like a copy-paste bug, fix it. Signed-off-by: Axel Lin <[email protected]> Tested-by: Oder Chiou <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-19ASoC: Remove needless snd_soc_dapm_enable_pin() from machine driver initsJarkko Nikula15-96/+0
ALSA SoC core marks widgets as connected by default when they are initialized in snd_soc_dapm_new_control() so there is no need to call snd_soc_dapm_enable_pin() from machine driver init functions. Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-19ASoC: Remove needless snd_soc_dapm_sync() from machine driver initsJarkko Nikula3-6/+1
ALSA SoC core takes care of calling snd_soc_dapm_sync() at the end snd_soc_instantiate_card() so there is no need to call it from machine driver init functions. Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-19ASoC: rt5651: Do not use rtd->codecLars-Peter Clausen1-2/+1
rtd->codec does not necessarily point to the CODEC instance for which the callback was called (e.g. for CODEC<->CODEC or multi-CODEC links). Use dai->codec instead. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-19ASoC: cs42xx8: Do not use rtd->codecLars-Peter Clausen1-2/+1
rtd->codec does not necessarily point to the CODEC instance for which the callback was called (e.g. for CODEC<->CODEC or multi-CODEC links). Use dai->codec instead. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Brian Austin <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-16ASoC: max98090: Move microphone bias voltage setting to probe functionJarkko Nikula1-7/+3
Microphone bias level configuration register can configure voltage between 2.2 V and 2.8 V but doesn't manage is voltage on or off. Microphone bias on/off state is controlled by "MICBIAS" DAPM widget. Therefore there is no need to update bias voltage conditionally depending on jack state each time when codec goes to SND_SOC_BIAS_ON state and setting can be moved to max98090_probe() as driver currently doesn't support other levels than 2.8 V. Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-16ASoC: max98090: Make sure we configure BCLK in one placeLiam Girdwood2-3/+6
BCL is being configured in two places producing a warning message. Make sure we only configure BCLK once and when we are master. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-16ASoC: max98090: Add ACPI probing supportJarkko Nikula1-2/+26
Add ACPI ID for MAX98090 and ACPI 5 I2C device probing support. Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-16ASoC: max98090: Mark cache as dirty prior to restoringLiam Girdwood1-0/+2
Make sure the cache is fully flushed at resume time. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-16ASoC: max98090: Reset codec on resumeLiam Girdwood1-0/+23
Make sure we reset codec and clear any IRQs on resume. This matches the init sequence in probe. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2014-05-16ASoC: max98090: Fix reset at resume timeLiam Girdwood1-0/+3
Reset needs to wait 20ms before other codec IO is performed. This wait was not being performed. Fix this by making sure the reset register is not restored with the cache, but use the manual reset method in resume with the wait. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
Powered by cgit, Gruvboxed by Blaster4385.