1. 28 4月, 2012 1 次提交
  2. 27 4月, 2012 10 次提交
  3. 26 4月, 2012 1 次提交
  4. 25 4月, 2012 5 次提交
  5. 24 4月, 2012 4 次提交
  6. 23 4月, 2012 1 次提交
    • L
      ASoC: dapm: Fix x86_64 build warning. · c97f3bdd
      Liam Girdwood 提交于
      Fixes the following build warning on x86_64.
      
      In file included from include/trace/ftrace.h:567:0,
                       from include/trace/define_trace.h:86,
                       from include/trace/events/asoc.h:410,
                       from sound/soc/soc-core.c:45:
      include/trace/events/asoc.h: In function 'ftrace_raw_event_snd_soc_dapm_output_path':
      include/trace/events/asoc.h:246:1: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
      include/trace/events/asoc.h: In function 'ftrace_raw_event_snd_soc_dapm_input_path':
      include/trace/events/asoc.h:275:1: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
      Signed-off-by: NLiam Girdwood <lrg@ti.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      c97f3bdd
  7. 19 4月, 2012 4 次提交
  8. 18 4月, 2012 2 次提交
  9. 17 4月, 2012 9 次提交
    • A
      ASoC: da7210: Add support for PLL and SRM · 570aa7ba
      Ashish Chavan 提交于
      Current DA7210 driver does support PLL mode fully. It uses fixed
      value of input master clock and PLL mode is enabled and disabled based
      on the sampling frequency being used for playback or recording. It also
      doesn't support Sample Rate Measurement feature of DA7210 hardware.
      
      This patch adds full support for PLL and SRM. Basically following three
      modes of operation are possible for DA7210 hardware,
      
      (1) I2S SLAVE mode with PLL bypassed
      (2) I2S SLAVE mode with PLL enabled
      (3) I2S Master mode with PLL enabled
      
      This patch adds support for all three modes. Also, in case of SLAVE mode
      with PLL, it supports SRM (Sample Rate Measurement) feature of the chip.
      
      Actually this patch was submitted earlier and received some review
      comments, but after that the driver got update by other patches. Because
      of that, I am considering this as new patch and not versioning it based
      of previous patches. This version tries to take care of all review
      comments received for earlier submissions.
      Signed-off-by: NAshish Chavan <ashish.chavan@kpitcummins.com>
      Signed-off-by: NDavid Dajun Chen <dchen@diasemi.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      570aa7ba
    • M
      ASoC: Use dai_fmt in Speyside · 26e67811
      Mark Brown 提交于
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      26e67811
    • M
      ASoC: Merge tag 'v3.4-rc3' into for-3.5 · d5efccd5
      Mark Brown 提交于
      Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
      annoyingly with the new development that's going on for Tegra so merge
      it up to resolve those conflicts.
      
      Conflicts:
      	sound/soc/soc-core.c
      	sound/soc/tegra/tegra_i2s.c
      	sound/soc/tegra/tegra_spdif.c
      d5efccd5
    • F
      ASoC: soc-dapm: Use '%llx' with 'u64' type. · 516541a0
      Fabio Estevam 提交于
      Fix the following build warning:
      
      sound/soc/soc-dapm.c: In function 'snd_soc_dai_link_event':
      sound/soc/soc-dapm.c:2913: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'u64'
      
      '%llx' should be used with 'u64' type.
      Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      516541a0
    • M
      ASoC: core: Support transparent CODEC<->CODEC DAI links · c74184ed
      Mark Brown 提交于
      Rather than having the user half start a stream but avoid any DMA to
      trigger data flow on links which don't pass through the CPU create a
      DAPM route between the two DAI widgets using a hw_params configuration
      provided by the machine driver with the new 'params' member of the
      dai_link struct.  If no configuration is provided in the dai_link then
      use the old style even for CODEC<->CODEC links to avoid breaking
      systems.
      
      This greatly simplifies the userspace usage of such links, making them
      as simple as analogue connections with the stream configuration being
      completely transparent to them.
      
      This is achieved by defining a new dai_link widget type which is created
      when CODECs are linked and triggering the configuration of the link via
      the normal PCM operations from there.  It is expected that the bias
      level callbacks will be used for clock configuration.
      
      Currently only the DAI format, rate and channel count can be configured
      and currently the only DAI operations which can be called are hw_params
      and digital_mute().  This corresponds well to the majority of CODEC
      drivers which only use other callbacks for constraint setting but there
      is obviously much room for extension here.  We can't simply call
      hw_params() on startup as things like the system clocking configuration
      may change at runtime and in future it will be desirable to offer some
      configurability of the link parameters.
      
      At present we are also restricted to a single DAPM link for the entire
      DAI.  Once we have better support for channel mapping it would also be
      desirable to extend this feature so that we can propagate per-channel
      power state over the link.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@ti.com>
      c74184ed
    • M
      ASoC: core: Bind DAIs to CODECs at registration time · 054880fe
      Mark Brown 提交于
      We should always have a CODEC already there when registering a CODEC DAI
      and for CODEC<->CODEC links a dai_link will have two CODECs so it's much
      simpler to do things at registration time.
      
      This results in a slight change in the error handling for failed CODEC
      DAI registrations but practically speaking these are never supposed to
      fail so there shouldn't be much issue. The change is that we don't fail
      the overall CODEC registration if the DAI registration fails; this seems
      more robust anyway as we may not need to use a given DAI in a particular
      system.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      054880fe
    • M
      ASoC: core: Flip master for CODECs in the CPU slot of a CODEC<->CODEC link · f04209a7
      Mark Brown 提交于
      When two CODEC DAIs are linked directly to each other then if we give the
      same master mode settings to both devices things won't work as either
      neither will drive or they'll drive against each other. Flip the settings
      for the DAI in the CPU slot of the DAI link.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      f04209a7
    • M
      ASoC: dapm: Allow DAI widgets to be routed through · 1eee1b38
      Mark Brown 提交于
      In order to allow CODEC<->CODEC links to function we will need to allow
      DAPM paths to be created that pass through DAIs rather than only ones
      that are source or sunk at the DAI.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@ti.com>
      1eee1b38
    • M
      ASoC: core: Return -ENOTSUPP instead of -EINVAL if mute is not supported · 04570c62
      Mark Brown 提交于
      This helps us ignore errors in callers if the operation failed due to not
      being available as opposed to an error.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NLiam Girdwood <lrg@ti.com>
      04570c62
  10. 16 4月, 2012 3 次提交
    • L
      Linux 3.4-rc3 · e816b57a
      Linus Torvalds 提交于
      e816b57a
    • L
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 9a8e5d41
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "Nothing too disasterous, the biggest thing being the removal of the
        regulator support for vcore in the AMBA driver; only one SoC was using
        this and it got broken during the last merge window, which then
        started causing problems for other people.  Mutual agreement was
        reached for it to be removed."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7386/1: jump_label: fixup for rename to static_key
        ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE
        ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU
        ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus
        ARM: 7383/1: nommu: populate vectors page from paging_init
        ARM: 7381/1: nommu: fix typo in mm/Kconfig
        ARM: 7380/1: DT: do not add a zero-sized memory property
        ARM: 7379/1: DT: fix atags_to_fdt() second call site
        ARM: 7366/3: amba: Remove AMBA level regulator support
        ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
        ARM: 7368/1: fault.c: correct how the tsk->[maj|min]_flt gets incremented
      9a8e5d41
    • L
      x86-32: fix up strncpy_from_user() sign error · 12e993b8
      Linus Torvalds 提交于
      The 'max' range needs to be unsigned, since the size of the user address
      space is bigger than 2GB.
      
      We know that 'count' is positive in 'long' (that is checked in the
      caller), so we will truncate 'max' down to something that fits in a
      signed long, but before we actually do that, that comparison needs to be
      done in unsigned.
      
      Bug introduced in commit 92ae03f2 ("x86: merge 32/64-bit versions of
      'strncpy_from_user()' and speed it up").  On x86-64 you can't trigger
      this, since the user address space is much smaller than 63 bits, and on
      x86-32 it works in practice, since you would seldom hit the strncpy
      limits anyway.
      
      I had actually tested the corner-cases, I had only tested them on
      x86-64.  Besides, I had only worried about the case of a pointer *close*
      to the end of the address space, rather than really far away from it ;)
      
      This also changes the "we hit the user-specified maximum" to return
      'res', for the trivial reason that gcc seems to generate better code
      that way.  'res' and 'count' are the same in that case, so it really
      doesn't matter which one we return.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      12e993b8