1. 21 Jan, 2014 1 commit
  2. 08 Sep, 2013 1 commit
  3. 30 Aug, 2013 1 commit
  4. 29 Aug, 2013 1 commit
  5. 22 Aug, 2013 1 commit
  6. 18 Aug, 2013 1 commit
  7. 06 Aug, 2013 1 commit
  8. 31 Jul, 2013 1 commit
    • Fabio Estevam's avatar
      ASoC: fsl: Fix module build · 3f1a91aa
      Fabio Estevam authored
      Building imx_v6_v7_defconfig with all audio drivers as modules results in
      the folowing build error:
      ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
      ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
      ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
      ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
      ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
      ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
      Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also
      built as modules and by using 'IS_ENABLED' to cover the module case.
      Reported-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
  9. 18 Jul, 2013 1 commit
  10. 16 Jul, 2013 1 commit
  11. 12 Jun, 2013 1 commit
  12. 15 May, 2013 1 commit
  13. 17 Apr, 2013 1 commit
  14. 28 Jan, 2013 1 commit
    • Shawn Guo's avatar
      Revert "ASoC: fsl: fix multiple definition of init_module" · 93d7b762
      Shawn Guo authored
      This reverts commit 25b8d314
      While the commit fixes multiple init_module definition error with
      module build, it breaks build when both imx-pcm-fiq and imx-pcm-dma
      are built in as below.
        LD      sound/soc/fsl/snd-soc-fsl-ssi.o
        LD      sound/soc/fsl/snd-soc-fsl-utils.o
        LD      sound/soc/fsl/snd-soc-imx-ssi.o
        LD      sound/soc/fsl/snd-soc-imx-audmux.o
        LD      sound/soc/fsl/snd-soc-imx-pcm-fiq.o
        LD      sound/soc/fsl/snd-soc-imx-pcm-dma.o
        LD      sound/soc/fsl/snd-soc-eukrea-tlv320.o
        LD      sound/soc/fsl/snd-soc-imx-sgtl5000.o
        LD      sound/soc/fsl/snd-soc-imx-mc13783.o
        LD      sound/soc/fsl/built-in.o
      sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_free':
      imx-pcm.c:(.text+0x464): multiple definition of `imx_pcm_free'
      sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x1a8): first defined here
      sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `snd_imx_pcm_mmap':
      imx-pcm.c:(.text+0x35c): multiple definition of `snd_imx_pcm_mmap'
      sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0xa0): first defined here
      sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_new':
      imx-pcm.c:(.text+0x3dc): multiple definition of `imx_pcm_new'
      sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x120): first defined here
      make[4]: *** [sound/soc/fsl/built-in.o] Error 1
      Let's revert the commit and find a proper fix for multiple init_module
      definition error later.
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
  15. 12 Jan, 2013 1 commit
    • Shawn Guo's avatar
      ASoC: fsl: fix multiple definition of init_module · 25b8d314
      Shawn Guo authored
      With commit f2818d07
       (ASoC: fsl: fix miscompilation of snd-soc-imx-pcm),
      we will see the following build error when building modules with
      CONFIG_SND_IMX_SOC=m in imx_v6_v7_defconfig.
        CC [M]  sound/soc/fsl/phycore-ac97.o
        LD [M]  sound/soc/fsl/snd-soc-fsl-ssi.o
        LD [M]  sound/soc/fsl/snd-soc-fsl-utils.o
        LD [M]  sound/soc/fsl/snd-soc-imx-ssi.o
        LD [M]  sound/soc/fsl/snd-soc-imx-audmux.o
        LD [M]  sound/soc/fsl/snd-soc-imx-pcm.o
      sound/soc/fsl/imx-pcm-dma.o: In function `init_module':
      imx-pcm-dma.c:(.init.text+0x0): multiple definition of `init_module'
      sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.init.text+0x0): first defined here
      sound/soc/fsl/imx-pcm-dma.o: In function `cleanup_module':
      imx-pcm-dma.c:(.exit.text+0x0): multiple definition of `cleanup_module'
      sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.exit.text+0x0): first defined here
      make[4]: *** [sound/soc/fsl/snd-soc-imx-pcm.o] Error 1
      Instead of using bool for SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA
      to fix the original issue, we should completely remove SND_SOC_IMX_PCM
      and have imx-pcm.o statically linked with imx-pcm-fiq.o or imx-pcm-dma.o.
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
  16. 27 Nov, 2012 1 commit
    • Lothar Waßmann's avatar
      ASoC: fsl: fix miscompilation of snd-soc-imx-pcm · f2818d07
      Lothar Waßmann authored
      Hi Mark,
      thanks your insisting on a better description for the patch, I found a
      more appropriate solution for the problem:
      Compiling the SoC Audio driver for Freescale i.MX as a module
      (CONFIG_SND_SOC_IMX_PCM=m) results in a non-functional sound driver
      indicated by the error message:
      | imx-sgtl5000 sound.1: platform imx-pcm-audio not registered
      | imx-sgtl5000 sound.1: snd_soc_register_card failed (-517)
      | platform sound.1: Driver imx-sgtl5000 requests probe deferral
      instead of the message:
      | imx-sgtl5000 sound.1:  sgtl5000 <-> 63fcc000.ssi mapping ok
      that is to be expected upon loading the snd-soc-imx-pcm.ko module.
      The build log reveals, that the file imx-pcm-dma.o (or imx-pcm-fiq.o
      depending on the kernel configuration), which should be linked
      together with imx-pcm.o into snd-imx-pcm.ko, is not being compiled in
      this case.
      The make rules for these files shows that the target object imx-pcm.o
      is assigned to the variable snd-soc-imx-pcm-y while
      imx-pcm-{dma,fiq}.o are added to to
      snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_DMA) and
      snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_FIQ) which resolve to
      snd-soc-imx-pcm-m in this case.
      According to Documentation/kbuild/modules.txt:
      |When the module is built from multiple sources, an additional line is
      |needed listing the files:
      |        <module_name>-y := <src1>.o <src2>.o ...
      Thus the type of the config variables CONFIG_SND_SOC_IMX_PCM_DMA and
      CONFIG_SND_SOC_IMX_PCM_FIQ should be 'bool' instead of 'tristate' to
      resolve to 'y' when selected.
      Signed-off-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
  17. 24 Oct, 2012 1 commit
  18. 22 Oct, 2012 1 commit
  19. 22 Sep, 2012 1 commit
  20. 18 May, 2012 1 commit
  21. 04 Apr, 2012 2 commits
  22. 01 Apr, 2012 5 commits
  23. 20 Aug, 2010 1 commit
  24. 12 Aug, 2010 1 commit
    • Liam Girdwood's avatar
      ASoC: multi-component - ASoC Multi-Component Support · f0fba2ad
      Liam Girdwood authored
      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: default avatarTimur Tabi <timur@freescale.com>
      Some TLV320aic23 and Cirrus platform fixes.
      Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>
      TI CODEC and OMAP fixes
      Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
      Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
      Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
      Samsung platform and misc fixes :-
      Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
      Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Reviewed-by: default avatarJassi Brar <jassi.brar@samsung.com>
      Signed-off-by: default avatarSeungwhan Youn <sw.youn@samsung.com>
      MPC8610 and PPC fixes.
      Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
      i.MX fixes and some core fixes.
      Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      J4740 platform fixes:-
      Signed-off-by: default avatarLars-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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
  25. 30 Jun, 2009 2 commits
  26. 26 May, 2009 5 commits
  27. 24 May, 2009 1 commit
  28. 04 May, 2009 1 commit
  29. 27 Apr, 2009 1 commit
  30. 23 Jan, 2009 1 commit