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
     

10 Jan, 2012

1 commit

  • 979ecef5b   Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    clock management changes for i.MX

    Another simple series related to clock management, this time only for
    imx.

    * tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: mxs: select HAVE_CLK_PREPARE for clock
    clk: add config option HAVE_CLK_PREPARE into Kconfig
    ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
    video: mxsfb: convert to clk_prepare/clk_unprepare
    serial: mxs-auart: convert to clk_prepare/clk_unprepare
    net: flexcan: convert to clk_prepare/clk_unprepare
    mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
    mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
    dma: mxs-dma: convert to clk_prepare/clk_unprepare
    net: fec: add clk_prepare/clk_unprepare
    ARM: mxs: convert platform code to clk_prepare/clk_unprepare
    clk: add helper functions clk_prepare_enable and clk_disable_unprepare

    Fix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to
    commit 0ebafefcaa7a ("net: fec: add clk_prepare/clk_unprepare") clashing
    trivially with commit e163cc97f9ac ("net/fec: fix the .remove code").

    Linus Torvalds
     

29 Dec, 2011

1 commit

28 Dec, 2011

2 commits

22 Dec, 2011

2 commits

20 Dec, 2011

2 commits

11 Dec, 2011

3 commits

02 Dec, 2011

1 commit

24 Nov, 2011

1 commit

23 Nov, 2011

1 commit

  • 85e7652d8   ASoC: Constify snd_soc_dai_ops structs ... Browse Code »

    Commit 1ee46ebd("ASoC: Make the DAI ops constant in the DAI structure")
    introduced the possibility to have constant DAI ops structures, yet this is
    barley used in both existing drivers and also new drivers being submitted,
    although none of them modifies its DAI ops structure. The later is not
    surprising since existing drivers are often used as templates for new drivers.
    So this patch just constifies all existing snd_soc_dai_ops structs to eliminate
    the issue altogether.

    The patch was generated with the following coccinelle semantic patch:
    //
    @@
    identifier ops;
    @@
    -struct snd_soc_dai_ops ops =
    +const struct snd_soc_dai_ops ops =
    { ... };
    //

    Signed-off-by: Lars-Peter Clausen
    Signed-off-by: Mark Brown

    Lars-Peter Clausen
     

22 Oct, 2011

1 commit

  • 226d0f22d   ASoC: keep pointer to resource so it can be freed ... Browse Code »

    Add a new variable for storing resources accessed subsequent to the one
    accessed using request_mem_region, so the one accessed using
    request_mem_region can be released if needed.

    The resource variable names are also changed to be more descriptive.

    This code is also missing some calls to iounmap.

    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @r@
    expression E, E1;
    identifier f;
    statement S1,S2,S3;
    @@

    if (E == NULL)
    {
    ... when != if (E == NULL || ...) S1 else S2
    when != E = E1
    *E->f
    ... when any
    return ...;
    }
    else S3
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Mark Brown

    Julia Lawall
     

20 Sep, 2011

1 commit

  • 76067540c   ASoC: mxs-saif: add record function ... Browse Code »

    1. add different clkmux mode handling
    SAIF can use two instances to implement full duplex (playback &
    recording) and record saif may work on EXTMASTER mode which is
    using other saif's BITCLK&LRCLK.

    The clkmux mode could be set in pdata->init() in mach-specific code.
    For generic saif driver, it only needs to know who is his master
    and the master id is also provided in mach-specific code.

    2. support playback and capture simutaneously however the sample
    rates can not be different due to hw limitation.

    Signed-off-by: Dong Aisheng
    Acked-by: Wolfram Sang
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Dong Aisheng
     

23 Aug, 2011

3 commits

  • 78a262c87   ASoC: mxs-sgtl5000: add record function ... Browse Code »

    Signed-off-by: Dong Aisheng
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Dong Aisheng
     
  • 0bb98ba2b   sound/soc/mxs/mxs-saif.c: add missing kfree ... Browse Code »

    Move the test on pdev->id before the kzalloc to avoid requiring kfree when
    the test fails. This fix was suggested by Wolfram Sang.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @@
    identifier x;
    expression E1!=0,E2,E3,E4;
    statement S;
    iterator I;
    @@

    (
    if (...) { ... when != kfree(x)
    when != x = E3
    when != E3 = x
    * return ...;
    }
    ... when != x = E2
    when != I(...,x,...) S
    if (...) { ... when != x = E4
    kfree(x); ... return ...; }
    )
    //

    Signed-off-by: Julia Lawall
    Acked-by: Dong Aisheng
    Reviewed-by: Wolfram Sang
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Julia Lawall
     
  • bbe8ff5e2   ASoC: mxs-saif: clear clk gate first before register setting ... Browse Code »

    Saif needs clear clk gate first before writing registers or the write
    will not success.

    The original xx_get_mclk function clear clk gate after mclk setting
    that may cause the former mclk setting unwork, then the real output
    mclk maybe inaccurate.
    Placing the clear before setting mclk to avoid such an issue.

    We also have to clear clk gate in startup instead of in prepare function.

    Signed-off-by: Dong Aisheng
    Acked-by: Liam Girdwood
    Signed-off-by: Mark Brown

    Dong Aisheng
     

28 Jul, 2011

4 commits