1. 17 1月, 2011 1 次提交
    • A
      ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code · 7322ce21
      Alexander Sverdlin 提交于
      Changelog:
      1. I2S module of EP93xx should be feed by 32bit DMA transfers. This is
      hardware limitation and that's the way original Cirrus's driver worked.
      This will fix distorted sound playback and make capture actually work in
      present ep93xx drivers.
      
      I've found, that author of code, on which modern ep93xx-i2s.c and
      ep93xx-pcm.c are based, had faced this problem also in 2007:
      http://blog.gmane.org/gmane.linux.ports.arm.cirrus/month=20070101/page=3
      
      Now SoC code uses his developments, but not overcomes the hardware
      issues. Some details from EP93xx users guide:
      
      Both I2S transmitter and receiver have similar 16x32bit FIFO, where they
      store 8 samples for both left and right channels. The FIFO is always
      32bit wide and should be properly aligned if you use samples of other
      width. Transmitter and receiver have configuration registers for
      selection of I2S word length (16, 24, 32). They are I2STXWrdLen and
      I2SRXWrdLen.
      
      Yes, EP93xx DMA can do byte, word and quad-word transfers. The width for
      transfers to and from peripherals is selected by particular module
      configuration. Lucky AC97 module has such configuration: AC97RXCRx
      registers, bit CM (Compact mode enable) switches between 16 and 32 bit
      samples. AC97TXCRx registers have the same bits for transmitters.
      ep93xx-ac97.c enables this compact mode and so has all the rights to use
      S16_LE format.
      No one has found such a configuration in I2S module until now in any
      Cirrus manuals. I2S module always feeds it's 32bit wide FIFO with 32bit
      samples consecutively for left and right channels. You cannot use 32-bit
      DMA transfers to transfer two 16-bit samples.
      
      So we can use two formats for AC97, but should remove all but S32_LE for
      I2S. Always using 32 bit chunks is not a problem for I2S, the codec I
      use uses less bits too (24), it's permitted by I2S standard.
      
      In proposed patch formats list shortened to just S32_LE, this makes all
      the DMA transactions right, while ALSA will do all sample format
      translation for us.
      
      2. Incorrect setting of LRCLK (2 times slower) in original ep93xx-i2s.c
      masks the first problem.
      
      DMA takes two 16 bit samples instead of one, overall sound speed seems
      to be normal, but you get actually 4000 sampling rate instead of
      requested 8000 and therefore some noise... This is also the reason why
      the capture function not worked at all in this driver...
      
      If we take a look into I2S specification, we will figure that LRCLK MUST
      be equal to sample rate, if we are talking about stereo (in mono too,
      but it's not our case at all).
      
      In proposed patch SCLK and LRCLK rates are corrected, assuming we always
      send 32 bits * 2 channels to codec.
      Signed-off-by: NAlexander Sverdlin <subaparts@yandex.ru>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      7322ce21
  2. 09 12月, 2010 1 次提交
  3. 12 8月, 2010 1 次提交
    • L
      ASoC: multi-component - ASoC Multi-Component Support · f0fba2ad
      Liam Girdwood 提交于
      This patch extends the ASoC API to allow sound cards to have more than one
      CODEC and more than one platform DMA controller. This is achieved by dividing
      some current ASoC structures that contain both driver data and device data into
      structures that only either contain device data or driver data. i.e.
      
       struct snd_soc_codec    --->  struct snd_soc_codec (device data)
                                +->  struct snd_soc_codec_driver (driver data)
      
       struct snd_soc_platform --->  struct snd_soc_platform (device data)
                                +->  struct snd_soc_platform_driver (driver data)
      
       struct snd_soc_dai      --->  struct snd_soc_dai (device data)
                                +->  struct snd_soc_dai_driver (driver data)
      
       struct snd_soc_device   --->  deleted
      
      This now allows ASoC to be more tightly aligned with the Linux driver model and
      also means that every ASoC codec, platform and (platform) DAI is a kernel
      device. ASoC component private data is now stored as device private data.
      
      The ASoC sound card struct snd_soc_card has also been updated to store lists
      of it's components rather than a pointer to a codec and platform. The PCM
      runtime struct soc_pcm_runtime now has pointers to all its components.
      
      This patch adds DAPM support for ASoC multi-component and removes struct
      snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
      or runtime PCM level basis rather than using snd_soc_socdev.
      
      Other notable multi-component changes:-
      
       * Stream operations now de-reference less structures.
       * close_delayed work() now runs on a DAI basis rather than looping all DAIs
         in a card.
       * PM suspend()/resume() operations can now handle N CODECs and Platforms
         per sound card.
       * Added soc_bind_dai_link() to bind the component devices to the sound card.
       * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
         DAI link components.
       * sysfs entries can now be registered per component per card.
       * snd_soc_new_pcms() functionailty rolled into dai_link_probe().
       * snd_soc_register_codec() now does all the codec list and mutex init.
      
      This patch changes the probe() and remove() of the CODEC drivers as follows:-
      
       o Make CODEC driver a platform driver
       o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
       o Removed all static codec pointers (drivers now support > 1 codec dev)
       o snd_soc_register_pcms() now done by core.
       o snd_soc_register_dai() folded into snd_soc_register_codec().
      
      CS4270 portions:
      Acked-by: NTimur Tabi <timur@freescale.com>
      
      Some TLV320aic23 and Cirrus platform fixes.
      Signed-off-by: NRyan Mallon <ryan@bluewatersys.com>
      
      TI CODEC and OMAP fixes
      Signed-off-by: NPeter Ujfalusi <peter.ujfalusi@nokia.com>
      Signed-off-by: NJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      
      Samsung platform and misc fixes :-
      Signed-off-by: NChanwoo Choi <cw00.choi@samsung.com>
      Signed-off-by: NJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
      Reviewed-by: NJassi Brar <jassi.brar@samsung.com>
      Signed-off-by: NSeungwhan Youn <sw.youn@samsung.com>
      
      MPC8610 and PPC fixes.
      Signed-off-by: NTimur Tabi <timur@freescale.com>
      
      i.MX fixes and some core fixes.
      Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
      
      J4740 platform fixes:-
      Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
      
      CC: Tony Lindgren <tony@atomide.com>
      CC: Nicolas Ferre <nicolas.ferre@atmel.com>
      CC: Kevin Hilman <khilman@deeprootsystems.com>
      CC: Sascha Hauer <s.hauer@pengutronix.de>
      CC: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
      CC: Kuninori Morimoto <morimoto.kuninori@renesas.com>
      CC: Daniel Gloeckner <dg@emlix.com>
      CC: Manuel Lauss <mano@roarinelk.homelinux.net>
      CC: Mike Frysinger <vapier.adi@gmail.com>
      CC: Arnaud Patard <apatard@mandriva.com>
      CC: Wan ZongShun <mcuos.com@gmail.com>
      Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      f0fba2ad
  4. 07 6月, 2010 1 次提交