1. 12 Dec, 2011 5 commits
  2. 11 Dec, 2011 4 commits
  3. 10 Dec, 2011 2 commits
  4. 09 Dec, 2011 7 commits
  5. 08 Dec, 2011 7 commits
  6. 07 Dec, 2011 9 commits
  7. 06 Dec, 2011 6 commits
    • Mark Brown's avatar
      Merge branch 'for-3.2' into for-3.3 · 21abbb02
      Mark Brown authored
      21abbb02
    • Axel Lin's avatar
      ASoC: Fix build dependency for SND_SOC_JZ4740_CODEC · f8f626f5
      Axel Lin authored
      Currently SND_SOC_JZ4740_CODEC depends on SOC_JZ4740 but SOC_JZ4740 is not
      defined in any Kconfig. Thus the codec driver will not be built when select
      "Build all ASoC CODEC drivers".
      (Unless it is selected by SND_JZ4740_SOC_QI_LB60).
      Remove the dependency with SOC_JZ4740, then this code driver can be built when
      select "Build all ASoC CODEC drivers".
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      f8f626f5
    • Axel Lin's avatar
      ASoC: Include linux/io.h for jz4740 codec · 68bfcafa
      Axel Lin authored
      Include linux/io.h to fix below build errors:
      
        CC      sound/soc/codecs/jz4740.o
      sound/soc/codecs/jz4740.c: In function 'jz4740_codec_read':
      sound/soc/codecs/jz4740.c:82: error: implicit declaration of function 'readl'
      sound/soc/codecs/jz4740.c: In function 'jz4740_codec_write':
      sound/soc/codecs/jz4740.c:92: error: implicit declaration of function 'writel'
      sound/soc/codecs/jz4740.c: In function 'jz4740_codec_probe':
      sound/soc/codecs/jz4740.c:373: error: implicit declaration of function 'ioremap'
      sound/soc/codecs/jz4740.c:373: warning: assignment makes pointer from integer without a cast
      sound/soc/codecs/jz4740.c:393: error: implicit declaration of function 'iounmap'
      make[3]: *** [sound/soc/codecs/jz4740.o] Error 1
      make[2]: *** [sound/soc/codecs] Error 2
      make[1]: *** [sound/soc] Error 2
      make: *** [sound] Error 2
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      68bfcafa
    • Mark Brown's avatar
      ASoC: Don't fail if we can't read the IRQ type in WM8903 · 6664ee11
      Mark Brown authored
      If we fail to read the IRQ type from the interrupt controller don't
      fail, just assume a value and solider on - we may fail later when we try
      to request the IRQ but it's possible we'll succeed.
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      6664ee11
    • Stephen Warren's avatar
      ASoC: WM8903: Add device tree binding · 5d680b3a
      Stephen Warren authored
      Document the device tree binding for the WM8903 codec, and modify the
      driver to extract platform data from the device tree, if present.
      
      Based on work by John Bonesio, but significantly reworked since then.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      5d680b3a
    • Stephen Warren's avatar
      ASoC: WM8903: Get default irq_active_low from IRQ controller · 9d35f3e1
      Stephen Warren authored
      If the WM8903 is hooked up to an interrupt, set the irq_active_low flag
      in the default platform data based on the IRQ's IRQ_TYPE. Map IRQ_TYPE_NONE
      (a lack of explicit configuration/restriction) to irq_active_low = false;
      the previous default.
      
      This code is mainly added to support device tree interrupt bindings,
      although will work perfectly well in a non device tree system too.
      
      Any interrupt controller that supports only a single IRQ_TYPE could
      set each IRQ's type based on that restriction. This applies equally
      with and without device tree. To cater for interrupt controllers
      that don't do this, for which irqd_get_trigger_type() will return
      IRQ_TYPE_NONE, the platform data irq_active_low field may be used
      in systems that don't use device tree.
      
      With device tree, every IRQ must have some IRQ_TYPE set.
      
      Controllers that support DT and multiple IRQ_TYPEs must define the
      interrupts property (as used in interrupt source nodes) such that it
      defines the IRQ_TYPE to use. When the core DT setup code initializes
      wm8903->irq, the interrupts property will be parsed, and as a side-
      effect, set the IRQ's IRQ_TYPE for the WM8903 probe() function to read.
      
      Controllers that support DT and a single IRQ_TYPE could arrange to
      set the IRQ_TYPE somehow during their initialization, or hard-code
      it during the processing of the child interrupts property.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      9d35f3e1