summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown2014-10-061-1/+1
|\
| * ASoC: rx51: Use snd_soc_dapm_to_codec() instead of dapm->codecLars-Peter Clausen2014-09-291-1/+1
| | | | | | | | | | | | | | | | | | The CODEC struct in the snd_soc_dapm_context struct is deprecated and scheduled for removal. Use the snd_soc_dapm_to_codec() function instead. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* | ASoC: omap-twl4030: Fix typo in 2nd dai link's platform_namePeter Ujfalusi2014-08-291-1/+1
|/ | | | | | | | | | The platform_name should be omap-mcasp3 for the 2nd link which is used for voice connection. Reported-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie+linaro@kernel.org> Cc: stable@vger.kernel.org
*---. Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/oom' and ↵Mark Brown2014-08-043-30/+13
|\ \ \ | | | | | | | | | | | | 'asoc/topic/pxa' into asoc-next
| * | | ASoC: omap-dmic: Use devm_clk_getHimangi Saraogi2014-07-141-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces the use of managed interfaces like devm_clk_get and does away with the clk_puts in the probe and remove functions. A label is also done away with. Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| * | | ASoC: omap-dmic: Use devm_snd_soc_register_componentManish Badarkhe2014-07-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| * | | ASoC: omap-mcbsp: Use devm_snd_soc_register_componentManish Badarkhe2014-07-091-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| * | | ASoC: omap-pcm: Include omap-pcm.hLars-Peter Clausen2014-06-211-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omap_pcm_platform_register() is declared in omap-pcm.h and defined in omap-pcm.c. To make sure that the function signature matches for both omap-pcm.c should include omap-pcm.h Fixes the following warning from sparse: sound/soc/omap/omap-pcm.c:235:5: warning: symbol 'omap_pcm_platform_register' was not declared. Should it be static? Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
* | | ASoC: Move card field form platform/codec to componentLars-Peter Clausen2014-07-221-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Both the snd_soc_codec and snd_soc_platform struct do have a pointer to the parent card and both handle this pointer in mostly the same way. This patch moves the card field to the component level which will allow further code consolidation between platforms and CODECS. Since there are only a handful of users of the snd_soc_codec struct's card field (and none of the snd_soc_platform's) these are update in this patch as well, which allows it to be removed from the snd_soc_codec struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
* | ASoC: Fix wrong argument for card remove callbacksTakashi Iwai2014-06-033-4/+3
|/ | | | | | | | | | | The commit [e1d4d3c8: ASoC: free jack GPIOs before the sound card is freed] introduced snd_soc_card remove callbacks to a few drivers, but they are implemented with a wrong argument type. The callback should receive snd_soc_card pointer instead of snd_soc_pcm_runtime. Fixes: e1d4d3c854f2 ('ASoC: free jack GPIOs before the sound card is freed') Acked-by: Mark Brown <broonie@linaro.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ASoC: free jack GPIOs before the sound card is freedStephen Warren2014-06-033-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the same change as commit fb6b8e71448a "ASoC: tegra: free jack GPIOs before the sound card is freed", but applied to all other ASoC machine drivers where code inspection indicates the same problem exists. That commit's description is: ========== snd_soc_jack_add_gpios() schedules a work queue item to poll the GPIO to generate an initial jack status report. If sound card initialization fails, that work item needs to be cancelled, so it doesn't run after the card has been freed. Specifically, freeing the card calls snd_jack_dev_free() which calls snd_jack_dev_disconnect() which sets jack->input_dev = NULL, and input_dev is used by snd_jack_report(), which is called from the work queue item. snd_soc_jack_free_gpios() cancels the work item. The Tegra ASoC machine drivers do call this function in the platform driver remove() callback. However, this happens after the sound card is freed, at least when the card is freed due to errors late during snd_soc_instantiate_card(). This leaves a window where the work item can execute after the card is freed. In next-20140522, sound card initialization does fail for unrelated reasons, and hits the problem described above. To solve this, fix the Tegra ASoC machine drivers to clean up the Jack GPIOs during the snd_soc_card's .remove() callback, which is executed before the overall card object is freed. also, guard the cleanup call based on whether we actually setup up the GPIOs in the first place. Ideally, we'd do the cleanup in a struct snd_soc_dai_link .fini/remove function to match where the GPIOs get set up. However, there is no such callback. ========== Note that I have not even compile-tested this in most cases, since most of the drivers rely on specific mach-* support I don't have enabled, and don't support COMPILE_TEST. Testing by the relevant board maintainers would be useful. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
*-. Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into ↵Mark Brown2014-06-035-34/+4
|\ \ | | | | | | | | | asoc-next
| * | ASoC: omap-pcm: Move omap-pcm under include/soundJyri Sarha2014-05-265-34/+4
| | | | | | | | | | | | | | | | | | | | | | | | Make including the omap-pcm.h outside sound/soc/omap more convenient. Signed-off-by: Jyri Sarha <jsarha@ti.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', ↵Mark Brown2014-05-2216-122/+235
|\ \ \ \ | | |/ / | | | / | | |/ | |/| 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/rt5640' and 'asoc/topic/rt5645' into asoc-next
| | * ASoC: omap: Replace instances of rtd->codec->card with rtd->cardLars-Peter Clausen2014-05-203-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 <lars@metafoo.de> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: Amstrad E3 needs TTY support for codecArnd Bergmann2014-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cx20442 codec driver used here requires the TTY layer to be enabled, or we get a link error: sound/built-in.o: In function `cx20442_codec_remove': cx20442.c:398: undefined reference to `tty_hangup' sound/built-in.o: In function `ams_delta_remove': ams-delta.c:613: undefined reference to `tty_unregister_ldisc' sound/built-in.o: In function `ams_delta_cx20442_init': ams-delta.c:559: undefined reference to `tty_register_ldisc' This adds the missing dependency in the E3 configuration, there was already one for the codec. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: RX-51 audio needs I2CArnd Bergmann2014-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The codec requires I2C to be enabled, so any other option that selects it should also depend on I2C. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: Add DT supportSebastian Reichel2014-05-011-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds device tree support to the Nokia N900 audio driver and adds documentation for the DT binding. Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: Add some error messagesSebastian Reichel2014-05-011-3/+13
| | | | | | | | | | | | | | | | | | | | | Add more error messages making it easier to identify problems. Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: get GPIO numbers via gpiod APISebastian Reichel2014-05-011-35/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update the driver to get GPIO numbers from the devm gpiod API instead of requesting hardcoded GPIO numbers. Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: omap_mcbsp_st_add_controls: add id parameterSebastian Reichel2014-05-013-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is a preparation for DT based booting where the McBSP id is set to -1 for all McBSP instances. Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: Use devm_snd_soc_register_cardSebastian Reichel2014-04-291-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the rx51 ASoC module to use devm_snd_soc_register_card. Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: Add module aliasSebastian Reichel2014-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add module alias to support driver autoloading. Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: Use static const char * const arraysSebastian Reichel2014-04-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Mark the array and the string const by using "static const char * const foo[]" instead of "static const char* foo[]". Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-hdmi: Remove excess curly bracketPeter Ujfalusi2014-04-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the error added by commit: ASoC: omap-hdmi: Bind the platform driver to the dai driver when loading Reported-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-pcm: Drop the platform driver init codePeter Ujfalusi2014-04-181-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | The omap-pcm no longer need to be a platform driver since all cpu_dai will bind the platform to it's own device which we can use. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-hdmi-card: Use the same name for platform as the cpu_daiPeter Ujfalusi2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: rx51: Use the same name for platform as the cpu_daiPeter Ujfalusi2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: osk5912: Use the same name for platform as the cpu_daiPeter Ujfalusi2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap3pandora: Use the same name for platform as the cpu_daiPeter Ujfalusi2014-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: n810: Use the same name for platform as the cpu_daiPeter Ujfalusi2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: ams-delta: Use the same name for platform as the cpu_daiPeter Ujfalusi2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: am3517evm: Use the same name for platform as the cpu_daiPeter Ujfalusi2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-twl4030: Use the same name/node for platform as the cpu_daiPeter Ujfalusi2014-04-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same name/node for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-abe-twl6040: Use the cpu_dai node to specify the platform driverPeter Ujfalusi2014-04-181-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the platform driver is registered with the cpu_dai's device we can use the same node for it instead of the hardwired name. We can also remove the cpu_dai_name and platform_name from the dai_link struct since we only support DT boot on OMAP4/5 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-hdmi: Bind the platform driver to the dai driver when loadingPeter Ujfalusi2014-04-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Use the same device for the platform driver when registering as the dai driver. This will enable us to clean up some DT booted cases. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-dmic: Bind the platform driver to the dai driver when loadingPeter Ujfalusi2014-04-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use the same device for the platform driver when registering as the dai driver. This will enable us to clean up some DT booted cases. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-dmic: Assign the dai DMA data at earlier timePeter Ujfalusi2014-04-181-1/+3
| | | | | | | | | | | | | | | | | | | | | Assign the dai dma data at dai driver probe time, not in startup. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-mcbsp: Bind the platform driver to the dai driver when loadingPeter Ujfalusi2014-04-181-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Use the same device for the platform driver when registering as the dai driver. This will enable us to clean up some DT booted cases. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-mcbsp: Assign the dai DMA data at earlier timePeter Ujfalusi2014-04-181-3/+4
| | | | | | | | | | | | | | | | | | | | | Assign the dai dma data at dai driver probe time, not in startup. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-mcpdm: Bind the platform driver to the dai driver when loadingPeter Ujfalusi2014-04-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Use the same device for the platform driver when registering as the dai driver. This will enable us to clean up some DT booted cases. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap-mcpdm: Assign the dai DMA data at earlier timePeter Ujfalusi2014-04-181-3/+5
| | | | | | | | | | | | | | | | | | | | | Assign the dai dma data at dai driver probe time, not in startup. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' ↵Mark Brown2014-05-225-105/+73
|\ \ \ \ | | |/ / | |/| / | | |/ and 'asoc/topic/davinci' into asoc-next
| | * ASoC: omap-pcm: Support for binding the platform driver to dai devicesPeter Ujfalusi2014-04-182-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new calls it is going to be possible to bind the platform driver to a dai device which makes it easier for us in a long run to handle DT boots, and opens the possibility to move machine driver to generic simple card. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap3pandora: Convert to table based DAPM setupLars-Peter Clausen2014-04-141-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use table based setup to register the controls and DAPM widgets and routes. This on one hand makes the code a bit shorter and cleaner and on the other hand the board level DAPM elements get registered in the card's DAPM context rather than in the CODEC's DAPM context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: omap: rx51: Convert to table based control and DAPM setupLars-Peter Clausen2014-04-141-40/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use table based setup to register the controls and DAPM widgets and routes. This on one hand makes the code a bit shorter and cleaner and on the other hand the board level DAPM elements get registered in the card's DAPM context rather than in the CODEC's DAPM context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
| | * ASoC: ams-delta: Convert to table based DAPM and control setupLars-Peter Clausen2014-04-141-43/+21
| |/ | | | | | | | | | | | | | | | | | | Use table based setup to register the controls and DAPM widgets and routes. This on one hand makes the code a bit shorter and cleaner and on the other hand the board level DAPM elements get registered in the card's DAPM context rather than in the CODEC's DAPM context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
* | ASoC: Remove needless snd_soc_dapm_enable_pin() from machine driver initsJarkko Nikula2014-05-191-2/+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 <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
*-. Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' ↵Mark Brown2014-03-231-2/+1
|\ \ | | | | | | | | | into asoc-next
| | * ASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the cardLars-Peter Clausen2014-03-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Machine level DAPM widgets and routes should be registered in the card's DAPM context, rather than in the CODEC's context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
OpenPOWER on IntegriCloud