summaryrefslogtreecommitdiff
path: root/meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-21 14:42:55 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-21 14:42:55 +0000
commita3d63a9291a2b6ed35e98fa864051efd14ebb06e (patch)
tree25e56747938db6d5899f64981be892b01260ba18 /meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch
parente5444b0d8560b605bf37887cdd3ba3f961c00df7 (diff)
downloadopenembedded-core-a3d63a9291a2b6ed35e98fa864051efd14ebb06e.tar.gz
openembedded-core-a3d63a9291a2b6ed35e98fa864051efd14ebb06e.tar.bz2
openembedded-core-a3d63a9291a2b6ed35e98fa864051efd14ebb06e.tar.xz
openembedded-core-a3d63a9291a2b6ed35e98fa864051efd14ebb06e.zip
linux-openmoko: switch to 2.6.24 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4293 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.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch b/meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch
deleted file mode 100644
index fffc685a4..000000000
--- a/meta/packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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;