1. 27 Nov, 2012 3 commits
    • 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>
      f2818d07
    • Lothar Waßmann's avatar
    • Lothar Waßmann's avatar
      ASoC: fsl: fix miscompilation of snd-soc-imx-pcm · 20dd9e5e
      Lothar Waßmann authored
      Due to a broken make rule, sound/soc/fsl/imx-pcm-dma.c or
      sound/soc/fsl/imx-pcm-fiq.c (whatever is selected via Kconfig) will
      not be compiled into imx-pcm.o when building as module, i.e.:
      CONFIG_SND_SOC_IMX_PCM=m
      CONFIG_SND_SOC_IMX_PCM_DMA=m
      resulting in a non-functional sound driver.
      
      This gives the error messages:
      | 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
      when loading the driver instead of what's to be expected:
      | imx-sgtl5000 sound.1:  sgtl5000 <-> 63fcc000.ssi mapping ok
      Signed-off-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      20dd9e5e
  2. 26 Nov, 2012 3 commits
  3. 25 Nov, 2012 1 commit
  4. 24 Nov, 2012 4 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 194d9831
      Linus Torvalds authored
      Pull sound build error fix from Takashi Iwai:
       "Only a single commit for fixing the build error without CONFIG_PM in
        hda driver."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix build without CONFIG_PM
      194d9831
    • Takashi Iwai's avatar
      ALSA: hda - Fix build without CONFIG_PM · d846b174
      Takashi Iwai authored
      I forgot this again...  codec->in_pm is in #ifdef CONFIG_PM
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      d846b174
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2654ad44
      Linus Torvalds authored
      Pull x86 arch fixes from Peter Anvin:
       "Here is a collection of fixes for 3.7-rc7.  This is a superset of
        tglx' earlier pull request."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix ordering of CFI directives and recent ASM_CLAC additions
        x86, microcode, AMD: Add support for family 16h processors
        x86-32: Export kernel_stack_pointer() for modules
        x86-32: Fix invalid stack address while in softirq
        x86, efi: Fix processor-specific memcpy() build error
        x86: remove dummy long from EFI stub
        x86, mm: Correct vmflag test for checking VM_HUGETLB
        x86, amd: Disable way access filter on Piledriver CPUs
        x86/mce: Do not change worker's running cpu in cmci_rediscover().
        x86/ce4100: Fix PCI configuration register access for devices without interrupts
        x86/ce4100: Fix reboot by forcing the reboot method to be KBD
        x86/ce4100: Fix pm_poweroff
        MAINTAINERS: Update email address for Robert Richter
        x86, microcode_amd: Change email addresses, MAINTAINERS entry
        MAINTAINERS: Change Boris' email address
        EDAC: Change Boris' email address
        x86, AMD: Change Boris' email address
      2654ad44
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 · 35f95d22
      Linus Torvalds authored
      Pull MTD fixes from David Woodhouse:
       "The most important part of this is that it fixes a regression in
        Samsung NAND chip detection, introduced by some rework which went into
        3.7.  The initial fix wasn't quite complete, so it's in two parts.  In
        fact the first part is committed twice (Artem committed his own copy
        of the same patch) and I've merged Artem's tree into mine which
        already had that fix.
      
        I'd have recommitted that to make it somewhat cleaner, but figured by
        this point in the release cycle it was better to merge *exactly* the
        commits which have been in linux-next.
      
        If I'd recommitted, I'd also omit the sparse warning fix.  But it's
        there, and it's harmless — just marking one function as 'static' in
        onenand code.
      
        This also includes a couple more fixes for stable: an AB-BA deadlock
        in JFFS2, and an invalid range check in slram."
      
      * tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6:
        mtd: nand: fix Samsung SLC detection regression
        mtd: nand: fix Samsung SLC NAND identification regression
        jffs2: Fix lock acquisition order bug in jffs2_write_begin
        mtd: onenand: Make flexonenand_set_boundary static
        mtd: slram: invalid checking of absolute end address
        mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
        mtd: nand: fix Samsung SLC NAND identification regression
      35f95d22
  5. 23 Nov, 2012 29 commits