summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-12-191-2/+2
|\
| * sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-131-2/+2
* | Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-12-1519-19/+0
|\ \
| * \ Merge branch 'platform/remove_owner' of git://git.kernel.org/pub/scm/linux/ke...Greg Kroah-Hartman2014-11-0419-19/+0
| |\ \
| | * | ASoC: fsl: drop owner assignment from platform_driversWolfram Sang2014-10-2019-19/+0
* | | | Merge tag 'asoc-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...Takashi Iwai2014-12-0810-40/+39
|\ \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-----. \ \ \ Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-card', 'asoc...Mark Brown2014-12-086-26/+28
| |\ \ \ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | ASoC: fsl_ssi: fix error path in probeJiada Wang2014-12-041-1/+1
| | | | | * | | ASoC: fsl_ssi: Fix module unboundFabio Estevam2014-12-041-9/+2
| | | | | * | | ASoC: fsl_ssi: Remove comment about SSI running only in slave modeFabio Estevam2014-11-181-2/+0
| | | | |/ / /
| | | * | | | ASoC: fsl-asoc-card: Add slot_width setting for cpu-daiNicolin Chen2014-11-251-0/+12
| | | * | | | ASoC: fsl-asoc-card: Don't bypass settings if cpu-dai is MasterNicolin Chen2014-10-281-1/+6
| | | |/ / /
| | * | | | ASoC: eukrea-tlv320: Fix of_node_put() call with uninitialized objectTakashi Iwai2014-10-201-1/+1
| | * | | | ASoC: fsl: eukrea-tlv320: Delete unneeded test before of_node_putFabio Estevam2014-10-201-2/+1
| | * | | | ASoC: fsl: imx-spdif: Delete unneeded test before of_node_putFabio Estevam2014-10-201-2/+1
| | * | | | ASoC: fsl: imx-sgtl5000: Delete unneeded test before of_node_putFabio Estevam2014-10-201-4/+2
| | * | | | ASoC: fsl: imx-wm8962: Delete unneeded test before of_node_putFabio Estevam2014-10-201-4/+2
| | |/ / /
| | | | |
| | \ \ \
| *-. | | | Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/...Mark Brown2014-12-084-9/+4
| |\ \| | |
| | * | | | ASoC: Rename snd_soc_dai_driver struct ac97_control field to bus_controlLars-Peter Clausen2014-11-183-4/+4
| | * | | | ASoC: mpc5200_dma: Don't overwrite ac97 device private_dataLars-Peter Clausen2014-11-181-3/+0
| | * | | | ASoC: mpc5200_psc_ac97: Remove unused on-stack snd_ac97 deviceLars-Peter Clausen2014-11-181-2/+0
| | |/ / /
| * | | / ASoC: fsl_esai: Use dynamic slot width as defaultNicolin Chen2014-11-251-5/+7
| | |_|/ | |/| |
* | | | Merge branch 'for-linus' into test/usb-resumeTakashi Iwai2014-11-201-0/+26
|\| | |
| | \ \
| | \ \
| *-. \ \ Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/cs41l51', 'asoc/fix...Mark Brown2014-11-171-0/+26
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | | * ASoC: fsl_asrc: Add reg_defaults for regmap to fix kernel dumpNicolin Chen2014-10-281-0/+26
| | |/
* | / ALSA: pcm: Add snd_pcm_stop_xrun() helperTakashi Iwai2014-11-091-8/+1
|/ /
* / ASoC: fsl: use strncpy() to prevent copying of over-long namesDaniel Mack2014-10-222-2/+2
|/
*-. Merge remote-tracking branches 'asoc/fix/88pm860x', 'asoc/fix/fsl', 'asoc/fix...Mark Brown2014-10-081-1/+2
|\ \
| | * ASoC: imx-es8328: Fix missing return code in imx_es8328_probe()Takashi Iwai2014-10-071-0/+1
| |/ |/|
| * ASoC: imx-es8328: Fix of_node_put() call with uninitialized objectTakashi Iwai2014-10-081-1/+1
|/
*---. Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/...Mark Brown2014-10-061-1/+0
|\ \ \
| | | * ASoC: fsl_spdif: Remove unused includes of linux/clk-private.hTomeu Vizoso2014-10-031-1/+0
| | |/
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge remote-tracking branches 'asoc/topic/fsl-easi', 'asoc/topic/fsl-sai', '...Mark Brown2014-10-063-27/+121
|\ \ \ \ \ \ | | | | | |/ | | | | |/|
| | | * | | ASoC: fsl_ssi: Remove unneeded 'i2s-slave' propertyFabio Estevam2014-09-301-3/+0
| | | * | | ASoC: fsl_ssi: refine ipg clock usage in this moduleShengjiu Wang2014-09-171-8/+45
| | | * | | ASoC: fsl-ssi: Support for SND_SOC_DAIFMT_CBM_CFSFabio Falzoi2014-08-071-5/+28
| | | |/ /
| | * | | ASoC: fsl-sai: using 'lsb-first' property instead of 'big-endian-data'.Xiubo Li2014-09-012-4/+4
| | * | | Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/bro...Mark Brown2014-09-019-19/+843
| | |\ \ \
| | * | | | ASoC: fsl_sai: Set SYNC bit of TCR2 to Asynchronous ModeNicolin Chen2014-08-171-2/+1
| | * | | | ASoC: fsl_sai: Make Synchronous and Asynchronous modes exclusiveNicolin Chen2014-08-171-0/+7
| | * | | | ASoC: fsl_sai: Add asynchronous mode supportNicolin Chen2014-08-172-4/+30
| | * | | | ASoC: fsl_sai: Set SYNC bit of TCR2 to Asynchronous ModeNicolin Chen2014-08-171-2/+1
| | * | | | ASoC: fsl_sai: Initialize with software resetNicolin Chen2014-08-172-2/+8
| | | |/ / | | |/| |
| * / | | ASoC: fsl_esai: refine esai for TDM supportShengjiu Wang2014-08-132-7/+15
| |/ / /
| | | |
| \ \ \
*-. \ \ \ Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/dmic', 'asoc...Mark Brown2014-10-061-3/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| | * | | ASoC: fsl: Do not force codecs selection by SND_SOC_FSL_ASOC_CARDFabio Estevam2014-10-011-3/+0
| | |/ /
* | | | Merge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-nextMark Brown2014-10-0610-26/+858
|\ \ \ \
| * \ \ \ Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/bro...Mark Brown2014-09-019-19/+843
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | ASoC: fsl-sai: Convert to use regmap framework's endianness method.Xiubo Li2014-08-272-6/+1
| | * | | ASoC: fsl-spdif: Convert to use regmap framework's endianness method.Xiubo Li2014-08-271-4/+1