1. 27 3月, 2013 1 次提交
  2. 15 2月, 2013 1 次提交
  3. 13 2月, 2013 1 次提交
  4. 12 2月, 2013 2 次提交
  5. 11 2月, 2013 1 次提交
  6. 08 2月, 2013 2 次提交
  7. 07 2月, 2013 4 次提交
  8. 05 2月, 2013 11 次提交
  9. 04 2月, 2013 1 次提交
  10. 31 1月, 2013 5 次提交
  11. 30 1月, 2013 3 次提交
  12. 29 1月, 2013 6 次提交
  13. 28 1月, 2013 2 次提交
    • S
      ASoC: fsl: fix snd-soc-imx-pcm module build · 1927661b
      Shawn Guo 提交于
      When building modules with CONFIG_SND_IMX_SOC=m in imx_v6_v7_defconfig,
      we will see the following link error.
      
        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
      
      The module snd-soc-imx-pcm is designed to link imx-pcm.o with
      imx-pcm-dma.o or imx-pcm-fiq.o depending on if option SND_SOC_IMX_PCM_DMA
      or SND_SOC_IMX_PCM_FIQ is enabled.  Both imx-pcm-dma and imx-pcm-fiq
      register their own module_platform_driver.  However, these two options
      are not mutually exclusive and can be enabled together.  And that's
      why we see above multiple init_module definition error.
      
      Instead of having both imx-pcm-dma and imx-pcm-fiq register their
      own platform_driver, we should do only once in imx-pcm.c.  Using
      platform_device_id to distinguish between imx-pcm-dma and imx-pcm-fiq,
      we can run-time call imx-pcm-dma/fiq specific initialization in .probe
      hook to have module snd-soc-imx-pcm work for both cases.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      1927661b
    • S
      Revert "ASoC: fsl: fix multiple definition of init_module" · 93d7b762
      Shawn Guo 提交于
      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: NShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      93d7b762