1. 15 11月, 2010 1 次提交
    • J
      ASoC: Add optional name_prefix for codec kcontrol, widget and route names · ead9b919
      Jarkko Nikula 提交于
      There is a need to prefix codec kcontrol, widget and internal route names in
      an ASoC machine that has multiple codecs with conflicting names. The name
      collision would occur when codec drivers try to registering kcontrols with
      the same name or when building audio paths.
      
      This patch introduces optional prefix_map into struct snd_soc_card. With it
      machine drivers can specify a unique name prefix to each codec that have
      conflicting names with anothers. Prefix to codec is matched with codec
      name.
      
      Following example illustrates a machine that has two same codec instances.
      Name collision from kcontrol registration is avoided by specifying a name
      prefix "foo" for the second codec. As the codec widget names are prefixed
      then second audio map for that codec shows a prefixed widget name.
      
      static const struct snd_soc_dapm_route map0[] = {
      	{"Spk", NULL, "MONO"},
      };
      
      static const struct snd_soc_dapm_route map1[] = {
      	{"Vibra", NULL, "foo MONO"},
      };
      
      static struct snd_soc_prefix_map codec_prefix[] = {
      	{
      		.dev_name = "codec.2",
      		.name_prefix = "foo",
      	},
      };
      
      static struct snd_soc_card card = {
      	...
      	.prefix_map = codec_prefix,
      	.num_prefixes = ARRAY_SIZE(codec_prefix),
      };
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      ead9b919
  2. 11 11月, 2010 3 次提交
    • D
      ASoC: soc-cache: Add support for rbtree based register caching · a7f387d5
      Dimitris Papastamos 提交于
      This patch adds support for rbtree compression when storing the
      register cache.  It does this by not adding any uninitialized registers
      (those whose value is 0).  If any of those registers is written
      with a nonzero value they get added into the rbtree.
      
      Consider a sample device with a large sparse register map.  The
      register indices are between [0, 0x31ff].  An array of 12800 registers
      is thus created each of which is 2 bytes.  This results in a 25kB
      region.  This array normally lives outside soc-core, normally in the
      driver itself.  The original soc-core code would kmemdup this region
      resulting in 50kB total memory.  When using the rbtree compression
      technique and __devinitconst on the original array the figures are
      as follows.  For this typical device, you might have 100 initialized
      registers, that is registers that are nonzero by default.  We build
      an rbtree with 100 nodes, each of which is 24 bytes.  This results
      in ~2kB of memory.  Assuming that the target arch can freeup the
      memory used by the initial __devinitconst array, we end up using
      about ~2kB bytes of actual memory.  The memory footprint will increase
      as uninitialized registers get written and thus new nodes created in
      the rbtree.  In practice, most of those registers are never changed.
      If the target arch can't freeup the __devinitconst array, we end up
      using a total of ~27kB.  The difference between the rbtree and the LZO
      caching techniques, is that if using the LZO technique the size of
      the cache will increase slower as more uninitialized registers get
      changed.
      Signed-off-by: NDimitris Papastamos <dp@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      a7f387d5
    • D
      ASoC: soc-cache: Add support for LZO register caching · cc28fb8e
      Dimitris Papastamos 提交于
      This patch adds support for LZO compression when storing the register
      cache.  The initial register defaults cache is marked as __devinitconst
      and the only change required for a driver to use LZO compression is
      to set the compress_type member in codec->driver to SND_SOC_LZO_COMPRESSION.
      
      For a typical device whose register map would normally occupy 25kB or 50kB
      by using the LZO compression technique, one can get down to ~5-7kB.  There
      might be a performance penalty associated with each individual read/write
      due to decompressing/compressing the underlying cache, however that should not
      be noticeable.  These memory benefits depend on whether the target architecture
      can get rid of the memory occupied by the original register defaults cache
      which is marked as __devinitconst.  Nevertheless there will be some memory
      gain even if the target architecture can't get rid of the original register
      map, this should be around ~30-32kB instead of 50kB.
      Signed-off-by: NDimitris Papastamos <dp@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      cc28fb8e
    • D
      ASoC: soc-cache: Add support for flat register caching · 7a30a3db
      Dimitris Papastamos 提交于
      This patch introduces the new caching API and migrates the
      old caching interface into the new one.  The flat register caching
      technique does not use compression at all and it is equivalent to
      the old caching technique.  One can still access codec->reg_cache
      directly but this is not advised as that will not be portable
      across different caching strategies.
      
      None of the existing drivers need to be changed to adapt to this
      caching technique.  There should be no noticeable overhead associated
      with using the new caching API.
      Signed-off-by: NDimitris Papastamos <dp@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      7a30a3db
  3. 06 11月, 2010 3 次提交
    • J
      ASoC: Move pop time from DAPM context to sound card · 3a45b867
      Jarkko Nikula 提交于
      Based on discussion the dapm_pop_time in debugsfs should be per card rather
      than per device. Single pop time value for entire card is cleaner when the
      DAPM sequencing is extended to cross-device paths.
      
      debugfs/asoc/{card->name}/{codec dir}/dapm_pop_time
      ->
      debugfs/asoc/{card->name}/dapm_pop_time
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      3a45b867
    • J
      ASoC: Add sound card directory under debugfs/asoc/ · a6052154
      Jarkko Nikula 提交于
      There will be need to have sound card specific debugfs entries. This patch
      introduces a new debugfs/asoc/{card->name}/ directory but does not add yet
      any entries there.
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      a6052154
    • L
      ASoC: Decouple DAPM from CODECs · ce6120cc
      Liam Girdwood 提交于
      Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
      required when developing ASoC further. Such as for other ASoC components to
      have DAPM widgets or when extending DAPM to handle cross-device paths.
      
      This patch decouples DAPM related variables from struct snd_soc_codec and
      moves them to new struct snd_soc_dapm_context that is used to encapsulate
      DAPM context of a device. ASoC core and API of DAPM functions are modified
      to use DAPM context instead of codec.
      
      This patch does not change current functionality and a large part of changes
      come because of structure and internal API changes.
      
      Core implementation is from Liam Girdwood <lrg@slimlogic.co.uk> with some
      minor core changes, codecs and machine driver conversions from
      Jarkko Nikula <jhnikula@gmail.com>.
      Signed-off-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
      Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
      Cc: Manuel Lauss <manuel.lauss@googlemail.com>
      Cc: Mike Frysinger <vapier.adi@gmail.com>
      Cc: Cliff Cai <cliff.cai@analog.com>
      Cc: Kevin Hilman <khilman@deeprootsystems.com>
      Cc: Ryan Mallon <ryan@bluewatersys.com>
      Cc: Timur Tabi <timur@freescale.com>
      Cc: Sascha Hauer <s.hauer@pengutronix.de>
      Cc: Lars-Peter Clausen <lars@metafoo.de>
      Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
      Cc: Wan ZongShun <mcuos.com@gmail.com>
      Cc: Eric Miao <eric.y.miao@gmail.com>
      Cc: Jassi Brar <jassi.brar@samsung.com>
      Cc: Daniel Gloeckner <dg@emlix.com>
      Cc: Kuninori Morimoto <morimoto.kuninori@renesas.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      ce6120cc
  4. 04 11月, 2010 1 次提交
  5. 13 10月, 2010 1 次提交
    • M
      ASoC: don't register AC97 devices twice · 0562f788
      Mika Westerberg 提交于
      With generic AC97 ASoC glue driver (codec/ac97.c), we get following warning when
      the device is registered (slightly stripped the backtrace):
      
      kobject (c5a863e8): tried to init an initialized object, something is seriously
                          wrong.
      [<c00254fc>] (unwind_backtrace+0x0/0xec)
      [<c014fad0>] (kobject_init+0x38/0x70)
      [<c0171e94>] (device_initialize+0x20/0x70)
      [<c017267c>] (device_register+0xc/0x18)
      [<bf20db70>] (snd_soc_instantiate_cards+0x924/0xacc [snd_soc_core])
      [<bf20e0d0>] (snd_soc_register_platform+0x16c/0x198 [snd_soc_core])
      [<c0175304>] (platform_drv_probe+0x18/0x1c)
      [<c0174454>] (driver_probe_device+0xb0/0x16c)
      [<c017456c>] (__driver_attach+0x5c/0x7c)
      [<c0173cec>] (bus_for_each_dev+0x48/0x78)
      [<c0173600>] (bus_add_driver+0x98/0x214)
      [<c0174834>] (driver_register+0xa4/0x130)
      [<c001f410>] (do_one_initcall+0xd0/0x1a4)
      [<c0062ddc>] (sys_init_module+0x12b0/0x1454)
      
      This happens because the generic AC97 glue driver creates its codec->ac97 via
      calling snd_ac97_mixer(). snd_ac97_mixer() provides own version of
      snd_device.register which handles the device registration when
      snd_card_register() is called.
      
      To avoid registering the AC97 device twice, we add a new flag to the
      snd_soc_codec: ac97_created which tells whether the AC97 device was created by
      SoC subsystem.
      Signed-off-by: NMika Westerberg <mika.westerberg@iki.fi>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      0562f788
  6. 08 10月, 2010 1 次提交
  7. 31 8月, 2010 1 次提交
  8. 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
  9. 17 5月, 2010 1 次提交
  10. 11 5月, 2010 1 次提交
  11. 10 5月, 2010 1 次提交
  12. 07 5月, 2010 1 次提交
  13. 17 4月, 2010 1 次提交
    • M
      ASoC: Add indirection for CODEC private data · b2c812e2
      Mark Brown 提交于
      One of the features of the multi CODEC work is that it embeds a struct
      device in the CODEC to provide diagnostics via a sysfs class rather than
      via the device tree, at which point it's much better to use the struct
      device private data rather than having two places to store it. Provide
      an accessor function to allow this change to be made more easily, and
      update all the CODEC drivers are updated.
      
      To ensure use of the accessor the private data structure member is
      renamed, meaning that if code developed with older an older core that
      still uses private_data is merged it will fail to build.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      b2c812e2
  14. 06 4月, 2010 1 次提交
  15. 23 3月, 2010 1 次提交
  16. 20 3月, 2010 1 次提交
  17. 04 3月, 2010 1 次提交
  18. 26 2月, 2010 1 次提交
  19. 22 2月, 2010 1 次提交
  20. 17 2月, 2010 2 次提交
  21. 04 2月, 2010 2 次提交
  22. 25 1月, 2010 1 次提交
  23. 21 1月, 2010 1 次提交
    • M
      ASoC: Support turning off bias when the CODEC is idle · a96ca338
      Mark Brown 提交于
      Currently ASoC always maintains the bias of the CODEC while the system
      is active.  With older mobile CODECs this is required since the outputs
      are referenced to a non-zero voltage and enabling or disabling this
      voltage without audible pops or clicks in the output takes too long to
      do when starting or stopping audio.
      
      As a result of features such as ground referenced outputs and class D
      speaker drivers current generation devices are able to power on and off
      much more quickly without these system level issues so provide a new
      flag idle_bias_off in snd_soc_codec which will cause the core to turn
      off the CODEC bias.  The distinction between STANDBY and OFF is still
      maintained.  This is partly for consistency but also allows for
      potential future extensions such as per-machine overrides or deferring
      the bias removal.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
      a96ca338
  24. 05 12月, 2009 1 次提交
  25. 26 11月, 2009 1 次提交
  26. 13 11月, 2009 2 次提交
  27. 04 11月, 2009 1 次提交
  28. 15 10月, 2009 1 次提交
  29. 01 10月, 2009 1 次提交
    • P
      ASoC: add support for multiple cards/codecs in debugfs · 88439ac7
      Peter Ujfalusi 提交于
      In order to support multiple codecs on the same system in the debugfs
      the directory hierarchy need to be changed by adding directory per codec
      under the asoc direcorty:
      
      debugfs/asoc/{dev_name(socdev->dev)}-{codec->name}/codec_reg
                                                        /dapm_pop_time
                                                        /dapm/{widgets}
      
      With the original implementation only the debugfs files are only
      created for the first codec, other codecs loaded later would fail to
      create the debugfs files (since they are already exist).
      Furthermore in this situation any of the codecs has been removed, would
      cause the debugfs entries to disappear, regardless if the codec, which
      created them are still loaded (the one which loaded first).
      Signed-off-by: NPeter Ujfalusi <peter.ujfalusi@nokia.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      88439ac7
  30. 07 9月, 2009 1 次提交
  31. 22 8月, 2009 1 次提交
    • M
      ASoC: Add DAPM widget power decision debugfs files · 79fb9387
      Mark Brown 提交于
      Currently when built with DEBUG DAPM will dump information about
      the power state decisions it is taking for each widget to dmesg.
      This isn't an ideal way of getting the information - it requires
      a kernel build to turn it on and off and for large hub CODECs the
      volume of information is so large as to be illegible. When the
      output goes to the console it can also cause a noticable impact
      on performance simply to print it out.
      
      Improve the situation by adding a dapm directory to our debugfs
      tree containing a file per widget with the same information in
      it. This still requires a decision to build with debugfs support
      but is easier to navigate and much less intrusive.
      
      In addition to the previously displayed information active streams
      are also shown in these files.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      79fb9387
  32. 03 8月, 2009 2 次提交