Eric Lee / smarc-fsl-linux-kernel

13 Jan, 2012

1 commit

  • a429638ca   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
    ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
    ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
    ALSA: usb-audio: add Yamaha MOX6/MOX8 support
    ALSA: virtuoso: add S/PDIF input support for all Xonars
    ALSA: ice1724 - Support for ooAoo SQ210a
    ALSA: ice1724 - Allow card info based on model only
    ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
    ALSA: hdspm - Provide unique driver id based on card serial
    ASoC: Dynamically allocate the rtd device for a non-empty release()
    ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
    ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
    ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
    ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
    ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
    ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
    ALSA: hda/cirrus - support for iMac12,2 model
    ASoC: cx20442: add bias control over a platform provided regulator
    ALSA: usb-audio - Avoid flood of frame-active debug messages
    ALSA: snd-usb-us122l: Delete calls to preempt_disable
    mfd: Put WM8994 into cache only mode when suspending
    ...

    Fix up trivial conflicts in:
    - arch/arm/mach-s3c64xx/mach-crag6410.c:
    renamed speyside_wm8962 to tobermory, added littlemill right
    next to it
    - drivers/base/regmap/{regcache.c,regmap.c}:
    duplicate diff that had already come in with other changes in
    the regmap tree

    Linus Torvalds
     

11 Jan, 2012

3 commits

  • d6b245079   Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc into topic/asoc Browse Code »
    Takashi Iwai
     
  • e48b46ba1   ASoC: twl6040 - Add method to query optimum PDM_DL1 gain ... Browse Code »

    The DL1 PDM interface adds a little gain depending on the output device.
    Add a method to retrieve the gain value for machine driver usage.

    Signed-off-by: Liam Girdwood

    Liam Girdwood
     
  • 269d43013   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (40 commits)
    regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config
    regulator: max8925: fix enabled/disabled judgement mistake
    regulator: add regulator_bulk_force_disable function
    regulator: pass regulator_register of_node in fixed voltage driver
    regulator: add regulator_force_disable() definition for !CONFIG_REGULATOR
    regulator: Enable supply regulator if child rail is enabled.
    regulator: mc13892: Convert to devm_kzalloc()
    regulator: mc13783: Convert to devm_kzalloc()
    regulator: Fix checking return value of create_regulator
    regulator: Fix the error handling if create_regulator fails
    regulator: Export regulator_is_supported_voltage()
    regulator: mc13892: add device tree probe support
    regulator: mc13892: remove the unnecessary prefix from regulator name
    regulator: Convert wm831x regulator drivers to devm_kzalloc()
    regulator: da9052: Staticize non-exported symbols
    regulator: Replace kzalloc with devm_kzalloc and if-else with a switch-case for da9052-regulator
    regulator: Update da9052-regulator for DT changes
    regulator: DA9052/53 Regulator support
    regulator: pass device_node to of_get_regulator_init_data()
    regulator: If a single voltage is set with device tree then set apply_uV
    ...

    Linus Torvalds
     

09 Jan, 2012

1 commit

  • f75a8ff67   ASoC: cx20442: add bias control over a platform provided regulator ... Browse Code »
    86

    Now that a regulator device for controlling the codec chip reset state
    over a platform agnostic regulator API is available on the only board
    using this driver so far, extend the driver with a bias control function
    which will request virtual power to the codec chip from that virtual
    regulator, and will supersede the present implementation existing at the
    sound card level.

    Thanks to the regulator sharing mechanism, both the old (the sound card)
    and the new (the codec) implementations should coexist smoothly until
    the sound card file is updated. For this to work as expected, update the
    sound card .set_bias_level callback to not touch codec->dapm.bias_level.

    While extending the cx20442 structure, drop unused control_type member.

    Created against linxu-3.2-rc6, tested on top of patch 1/4 "ARM: OMAP1:
    ams-delta: set up a regulator over the modem reset GPIO pin".

    Signed-off-by: Janusz Krzysztofik
    Acked-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Janusz Krzysztofik
     

04 Jan, 2012

1 commit

02 Jan, 2012

19 commits

30 Dec, 2011

1 commit

29 Dec, 2011

9 commits

27 Dec, 2011

4 commits

24 Dec, 2011

1 commit