summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
Commit message (Expand)AuthorAgeFilesLines
*-. Merge remote-tracking branches 'asoc/topic/tdm-slot', 'asoc/topic/tegra', 'as...Mark Brown2015-02-047-41/+9
|\ \
| * | ASoC: fsl: Remove fsl_asoc_xlate_tdm_slot_mask()Lars-Peter Clausen2015-01-143-31/+0
| * | ASoC: fsl: Update set_tdm_slot() semanticsLars-Peter Clausen2015-01-146-11/+11
| * | ASoC: mc13783: Update set_tdm_slot() semanticsLars-Peter Clausen2015-01-141-2/+1
| |/
| |
| \
| \
| \
*---. \ Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'aso...Mark Brown2015-02-043-13/+5
|\ \ \ \ | | | |/
| | * | ASoC: fsl: imx-spdif: Set the card owner fieldFabio Estevam2015-01-141-0/+1
| | * | ASoC: fsl_ssi: Change irq type to 'int'Fabio Estevam2015-01-141-1/+1
| | |/
| * | ASoC: fsl_spdif: Use dev_name() for registering the irqFabio Estevam2014-12-301-12/+3
| |/
| |
| \
| \
| \
*---. \ Merge remote-tracking branches 'asoc/topic/doc', 'asoc/topic/dwc', 'asoc/topi...Mark Brown2015-02-046-11/+7
|\ \ \ \ | | |_|/ | |/| |
| | | * ASoC: fsl_asrc: Use dev_name() for registering the irqFabio Estevam2014-12-302-5/+1
| | |/ | |/|
| | * Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fslMark Brown2015-01-081-1/+1
| | |\
| | * | ASoC: fsl_spdif: Make error message conciseFabio Estevam2015-01-081-1/+1
| | * | ASoC: fsl_esai: Make error message conciseFabio Estevam2015-01-081-1/+1
| | * | ASoC: fsl_sai: Make error message conciseFabio Estevam2015-01-081-1/+1
| | * | ASoC: fsl_asrc: Make error message conciseFabio Estevam2015-01-081-1/+1
| | * | ASoC: fsl_ssi: Make error message conciseFabio Estevam2015-01-081-1/+1
| |/ /
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'as...Mark Brown2015-02-043-39/+6
|\ \ \ \ | | |/ / | |/| |
| | * | ASoC: wm1133-ev1: Use static DAI format setupLars-Peter Clausen2015-01-061-10/+2
| | * | ASoC: mx27vis-aci32x4: Use static DAI format setupLars-Peter Clausen2015-01-061-10/+2
| | * | ASoC: eureka-tlv320: Use static DAI format setupLars-Peter Clausen2015-01-061-19/+2
| |/ /
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge remote-tracking branches 'asoc/fix/adi', 'asoc/fix/compress', 'asoc/fix...Mark Brown2015-01-262-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | | * ASoC: fsl: imx-wm8962: Set the card owner fieldFabio Estevam2015-01-141-0/+1
| | |/ | |/|
| | * ASoC: fsl_ssi: Fix irq error checkFabio Estevam2015-01-081-2/+2
| |/
* | ASoC: fsl_esai: Fix incorrect xDC field width of xCCR registersAurelien BOUIN2014-12-301-1/+1
|/
* Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-12-181-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-1419-19/+0
|\ \
| * \ Merge branch 'platform/remove_owner' of git://git.kernel.org/pub/scm/linux/ke...Greg Kroah-Hartman2014-11-0319-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-171-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
|/ /
OpenPOWER on IntegriCloud