diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-02-20 12:23:38 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-02-20 12:23:38 +0000 |
| commit | 210c9450c17721fea5855aad45be875cbf18e8fa (patch) | |
| tree | 9b41abc6bc624be901b4408f22488e3c5c9ddfca /meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch | |
| parent | 7fdad729b213c2da4299aa2c03d4b677bf244a9b (diff) | |
| download | openembedded-core-210c9450c17721fea5855aad45be875cbf18e8fa.tar.gz openembedded-core-210c9450c17721fea5855aad45be875cbf18e8fa.tar.bz2 openembedded-core-210c9450c17721fea5855aad45be875cbf18e8fa.tar.xz openembedded-core-210c9450c17721fea5855aad45be875cbf18e8fa.zip | |
linux-openmoko: Add input subsys -> APM bridge and tweak power driver key events
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3831 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch')
| -rw-r--r-- | meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch b/meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch new file mode 100644 index 000000000..fffc685a4 --- /dev/null +++ b/meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch @@ -0,0 +1,73 @@ +Index: linux-2.6.22/sound/soc/s3c24xx/s3c24xx-pcm.c +=================================================================== +--- linux-2.6.22.orig/sound/soc/s3c24xx/s3c24xx-pcm.c 2007-11-09 16:28:43.000000000 +0000 ++++ linux-2.6.22/sound/soc/s3c24xx/s3c24xx-pcm.c 2007-11-09 16:33:05.000000000 +0000 +@@ -49,7 +49,9 @@ + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_MMAP | +- SNDRV_PCM_INFO_MMAP_VALID, ++ SNDRV_PCM_INFO_MMAP_VALID | ++ SNDRV_PCM_INFO_PAUSE | ++ SNDRV_PCM_INFO_RESUME, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_U16_LE | + SNDRV_PCM_FMTBIT_U8 | +@@ -176,28 +178,6 @@ + } + } + +- /* channel needs configuring for mem=>device, increment memory addr, +- * sync to pclk, half-word transfers to the IIS-FIFO. */ +- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { +- s3c2410_dma_devconfig(prtd->params->channel, +- S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC | +- S3C2410_DISRCC_APB, prtd->params->dma_addr); +- +- s3c2410_dma_config(prtd->params->channel, +- prtd->params->dma_size, +- S3C2410_DCON_SYNC_PCLK | +- S3C2410_DCON_HANDSHAKE); +- } else { +- s3c2410_dma_config(prtd->params->channel, +- prtd->params->dma_size, +- S3C2410_DCON_HANDSHAKE | +- S3C2410_DCON_SYNC_PCLK); +- +- s3c2410_dma_devconfig(prtd->params->channel, +- S3C2410_DMASRC_HW, 0x3, +- prtd->params->dma_addr); +- } +- + s3c2410_dma_set_buffdone_fn(prtd->params->channel, + s3c24xx_audio_buffdone); + +@@ -246,6 +226,28 @@ + if (!prtd->params) + return 0; + ++ /* channel needs configuring for mem=>device, increment memory addr, ++ * sync to pclk, half-word transfers to the IIS-FIFO. */ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ s3c2410_dma_devconfig(prtd->params->channel, ++ S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC | ++ S3C2410_DISRCC_APB, prtd->params->dma_addr); ++ ++ s3c2410_dma_config(prtd->params->channel, ++ prtd->params->dma_size, ++ S3C2410_DCON_SYNC_PCLK | ++ S3C2410_DCON_HANDSHAKE); ++ } else { ++ s3c2410_dma_config(prtd->params->channel, ++ prtd->params->dma_size, ++ S3C2410_DCON_HANDSHAKE | ++ S3C2410_DCON_SYNC_PCLK); ++ ++ s3c2410_dma_devconfig(prtd->params->channel, ++ S3C2410_DMASRC_HW, 0x3, ++ prtd->params->dma_addr); ++ } ++ + /* flush the DMA channel */ + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); + prtd->dma_loaded = 0; |