[brcm63xx] shared DMA zone is twice smaller on 6338

[openwrt.git] / target / linux / s3c24xx / patches-2.6.30 / 090-sound.patch

diff --git a/target/linux/s3c24xx/patches-2.6.30/090-sound.patch b/target/linux/s3c24xx/patches-2.6.30/090-sound.patch
index ff86a29..2bfef44 100644 (file)
--- a/target/linux/s3c24xx/patches-2.6.30/090-sound.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/090-sound.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.30-rc6/sound/soc/s3c24xx/Kconfig
-===================================================================
---- linux-2.6.30-rc6.orig/sound/soc/s3c24xx/Kconfig    2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/sound/soc/s3c24xx/Kconfig 2009-05-18 19:08:35.000000000 +0200
-@@ -42,10 +42,20 @@
+--- a/sound/soc/s3c24xx/Kconfig
++++ b/sound/soc/s3c24xx/Kconfig
+@@ -42,10 +42,20 @@ config SND_S3C24XX_SOC_JIVE_WM8750

        tristate "SoC I2S Audio support for Jive"
        depends on SND_S3C24XX_SOC && MACH_JIVE
        select SND_SOC_WM8750
        tristate "SoC I2S Audio support for Jive"
        depends on SND_S3C24XX_SOC && MACH_JIVE
        select SND_SOC_WM8750


@@ -23,11 +21,9 @@ Index: linux-2.6.30-rc6/sound/soc/s3c24xx/Kconfig
  config SND_S3C24XX_SOC_SMDK2443_WM9710
        tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
        depends on SND_S3C24XX_SOC && MACH_SMDK2443
  config SND_S3C24XX_SOC_SMDK2443_WM9710
        tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
        depends on SND_S3C24XX_SOC && MACH_SMDK2443

-Index: linux-2.6.30-rc6/sound/soc/s3c24xx/Makefile
-===================================================================
---- linux-2.6.30-rc6.orig/sound/soc/s3c24xx/Makefile   2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/sound/soc/s3c24xx/Makefile        2009-05-18 19:08:35.000000000 +0200
-@@ -19,9 +19,11 @@
+--- a/sound/soc/s3c24xx/Makefile
++++ b/sound/soc/s3c24xx/Makefile
+@@ -19,9 +19,11 @@ snd-soc-neo1973-wm8753-objs := neo1973_w

  snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o
  snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o
  snd-soc-s3c24xx-uda134x-objs := s3c24xx_uda134x.o
  snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o
  snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o
  snd-soc-s3c24xx-uda134x-objs := s3c24xx_uda134x.o


@@ -39,11 +35,9 @@ Index: linux-2.6.30-rc6/sound/soc/s3c24xx/Makefile
  obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
  obj-$(CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o
 +obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
  obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
  obj-$(CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o
 +obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o

-Index: linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-i2s.c
-===================================================================
---- linux-2.6.30-rc6.orig/sound/soc/s3c24xx/s3c24xx-i2s.c      2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-i2s.c   2009-05-18 19:08:35.000000000 +0200
-@@ -284,11 +284,14 @@
+--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
++++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
+@@ -284,11 +284,14 @@ static int s3c24xx_i2s_trigger(struct sn

        case SNDRV_PCM_TRIGGER_START:
        case SNDRV_PCM_TRIGGER_RESUME:
        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
        case SNDRV_PCM_TRIGGER_START:
        case SNDRV_PCM_TRIGGER_RESUME:
        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:


@@ -63,7 +57,7 @@ Index: linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-i2s.c
  
                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
                        s3c24xx_snd_rxctrl(1);
  
                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
                        s3c24xx_snd_rxctrl(1);

-@@ -308,7 +311,6 @@
+@@ -308,7 +311,6 @@ static int s3c24xx_i2s_trigger(struct sn

                break;
        }
  
                break;
        }
  


@@ -71,11 +65,9 @@ Index: linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-i2s.c
        return ret;
  }
  
        return ret;
  }
  

-Index: linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-pcm.c
-===================================================================
---- linux-2.6.30-rc6.orig/sound/soc/s3c24xx/s3c24xx-pcm.c      2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-pcm.c   2009-05-18 19:08:35.000000000 +0200
-@@ -75,11 +75,18 @@
+--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
++++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
+@@ -75,11 +75,18 @@ static void s3c24xx_pcm_enqueue(struct s

  {
        struct s3c24xx_runtime_data *prtd = substream->runtime->private_data;
        dma_addr_t pos = prtd->dma_pos;
  {
        struct s3c24xx_runtime_data *prtd = substream->runtime->private_data;
        dma_addr_t pos = prtd->dma_pos;


@@ -95,7 +87,7 @@ Index: linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-pcm.c
                unsigned long len = prtd->dma_period;
  
                pr_debug("dma_loaded: %d\n", prtd->dma_loaded);
                unsigned long len = prtd->dma_period;
  
                pr_debug("dma_loaded: %d\n", prtd->dma_loaded);

-@@ -123,7 +130,7 @@
+@@ -123,7 +130,7 @@ static void s3c24xx_audio_buffdone(struc

                snd_pcm_period_elapsed(substream);
  
        spin_lock(&prtd->lock);
                snd_pcm_period_elapsed(substream);
  
        spin_lock(&prtd->lock);


@@ -104,7 +96,7 @@ Index: linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-pcm.c
                prtd->dma_loaded--;
                s3c24xx_pcm_enqueue(substream);
        }
                prtd->dma_loaded--;
                s3c24xx_pcm_enqueue(substream);
        }

-@@ -164,6 +171,11 @@
+@@ -164,6 +171,11 @@ static int s3c24xx_pcm_hw_params(struct 

                        printk(KERN_ERR "failed to get dma channel\n");
                        return ret;
                }
                        printk(KERN_ERR "failed to get dma channel\n");
                        return ret;
                }


@@ -116,7 +108,7 @@ Index: linux-2.6.30-rc6/sound/soc/s3c24xx/s3c24xx-pcm.c
        }
  
        s3c2410_dma_set_buffdone_fn(prtd->params->channel,
        }
  
        s3c2410_dma_set_buffdone_fn(prtd->params->channel,

-@@ -218,24 +230,17 @@
+@@ -218,24 +230,17 @@ static int s3c24xx_pcm_prepare(struct sn

         * sync to pclk, half-word transfers to the IIS-FIFO. */
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                s3c2410_dma_devconfig(prtd->params->channel,
         * sync to pclk, half-word transfers to the IIS-FIFO. */
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                s3c2410_dma_devconfig(prtd->params->channel,