iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
fba9569924
linux/sound/soc/samsung
History
Linus Torvalds fba9569924 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
  dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
  dmaengine/ep93xx_dma: add module.h include
  pch_dma: Reduce wasting memory
  pch_dma: Fix suspend issue
  dma/timberdale: free_irq() on an error path
  dma: shdma: transfer based runtime PM
  dmaengine: shdma: protect against the IRQ handler
  dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
  dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
  dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
  dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
  serial: sh-sci: don't filter on DMA device, use only channel ID
  ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
  ASoC: Samsung: Update DMA interface
  spi/s3c64xx: Merge dma control code
  spi/s3c64xx: Add support DMA engine API
  ARM: SAMSUNG: Remove S3C-PL330-DMA driver
  ARM: S5P64X0: Use generic DMA PL330 driver
  ARM: S5PC100: Use generic DMA PL330 driver
  ARM: S5PV210: Use generic DMA PL330 driver
  ...

Fix up fairly trivial conflicts in
 - arch/arm/mach-exynos4/{Kconfig,clock.c}
 - arch/arm/mach-s5p64x0/dma.c
2011-11-04 18:02:25 -07:00
..
ac97.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2011-11-04 18:02:25 -07:00
dma.c ASoC: Samsung: Update DMA interface 2011-09-14 11:10:04 +05:30
dma.h ASoC: Samsung: Update DMA interface 2011-09-14 11:10:04 +05:30
goni_wm8994.c ASoC: Convert Goni to data based DAPM init 2011-10-11 14:30:19 +01:00
h1940_uda1380.c ASoC: Convert H1940 to table based init 2011-10-10 11:07:26 +01:00
i2s-regs.h ASoC: SAMSUNG: Add idma related register definition 2011-06-26 12:05:23 +01:00
i2s.c ASoC: samsung: Add __devexit_p at necessary places 2011-10-02 19:58:44 +01:00
i2s.h
idma.c ASoC: SAMSUNG: Add I2S0 internal dma driver 2011-08-12 09:48:26 +09:00
idma.h ASoC: SAMSUNG: Add I2S0 internal dma driver 2011-08-12 09:48:26 +09:00
jive_wm8750.c ASoC: Convert Jive to table based init 2011-10-10 11:10:44 +01:00
Kconfig ASoC: samsung: WM8994 depends on MFD_WM8994 2011-10-03 15:39:58 +01:00
ln2440sbc_alc650.c ASoC: SAMSUNG: Clean-up header includes 2011-01-11 11:28:33 +00:00
Makefile ASoC: SAMSUNG: Add I2S0 internal dma driver 2011-08-12 09:48:26 +09:00
neo1973_wm8753.c ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
pcm.c ASoC: samsung: Add __devexit_p at necessary places 2011-10-02 19:58:44 +01:00
pcm.h
regs-i2s-v2.h
rx1950_uda1380.c ASoC: Convert RX1950 to table based init 2011-10-10 11:07:30 +01:00
s3c24xx_simtec_hermes.c ASoC: Convert Simtec machines to table based DAPM init 2011-10-10 11:06:22 +01:00
s3c24xx_simtec_tlv320aic23.c ASoC: Convert Simtec machines to table based DAPM init 2011-10-10 11:06:22 +01:00
s3c24xx_simtec.c ASoC: Staticise simtec_audio_resume() 2011-10-03 14:15:23 +01:00
s3c24xx_simtec.h
s3c24xx_uda134x.c ASoC: samsung: Fix checking return value of clk_get 2011-09-16 00:05:57 +01:00
s3c24xx-i2s.c ASoC: samsung: Add __devexit_p at necessary places 2011-10-02 19:58:44 +01:00
s3c24xx-i2s.h
s3c2412-i2s.c ASoC: samsung: Add __devexit_p at necessary places 2011-10-02 19:58:44 +01:00
s3c2412-i2s.h
s3c-i2s-v2.c ASoC: samsung: s3c-i2s-v2.c needs module.h 2011-10-03 21:34:12 +01:00
s3c-i2s-v2.h
smartq_wm8987.c ASoC: Convert SmartQ to table based init 2011-10-10 11:07:33 +01:00
smdk2443_wm9710.c ASoC: SAMSUNG: Clean-up header includes 2011-01-11 11:28:33 +00:00
smdk_spdif.c Merge branch 'for-2.6.38' into for-2.6.39 2011-01-19 11:22:54 +00:00
smdk_wm8580.c ASoC: Convert SMDK WM8580 to table based DAPM init 2011-10-10 11:07:36 +01:00
smdk_wm8580pcm.c ASoC: Update SMDKs for WM8580 -codec removal 2011-08-10 00:17:48 +09:00
smdk_wm8994.c ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
smdk_wm8994pcm.c ASoC: SAMSUNG: Add WM8994 PCM Machine driver 2011-06-26 12:05:12 +01:00
smdk_wm9713.c ASoC: SAMSUNG: Clean-up header includes 2011-01-11 11:28:33 +00:00
spdif.c ASoC: Staticise samsung_spdif_dai 2011-10-02 19:58:45 +01:00
spdif.h
speyside_wm8962.c ASoC: Use dai_fmt in speyside_wm8962 2011-09-28 13:22:33 +01:00
speyside.c ASoC: Add line loads to the list of supported detections for Speyside 2011-09-19 18:30:59 +01:00