diff options
| author | Mirko Vogt <mirko@openwrt.org> | 2008-12-12 11:58:53 +0000 |
|---|---|---|
| committer | Mirko Vogt <mirko@openwrt.org> | 2008-12-12 11:58:53 +0000 |
| commit | fac7f7f84f3771c5247c7fdee825c092077984f5 (patch) | |
| tree | 54644c1229434d7ee13c5872bda4129e34337fc0 /target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch | |
| parent | a34279723a9cf0796f9261f2fb90bea18cd95711 (diff) | |
| download | master-187ad058-fac7f7f84f3771c5247c7fdee825c092077984f5.tar.gz master-187ad058-fac7f7f84f3771c5247c7fdee825c092077984f5.tar.bz2 master-187ad058-fac7f7f84f3771c5247c7fdee825c092077984f5.zip | |
changed Makefile and profiles, added patches for kernel 2.6.24
(stable-branch of Openmoko)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13613 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch')
| -rw-r--r-- | target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch new file mode 100644 index 0000000000..c97396e2b6 --- /dev/null +++ b/target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch @@ -0,0 +1,75 @@ +From 148a1026b1975e3a50981cf7df3d4aae2b34611e Mon Sep 17 00:00:00 2001 +From: mokopatches <mokopatches@openmoko.org> +Date: Sun, 13 Apr 2008 07:23:53 +0100 +Subject: [PATCH] iis-suspend.patch + +--- + sound/soc/s3c24xx/s3c24xx-i2s.c | 38 ++++++++++++++++++++++++++++++++++++++ + 1 files changed, 38 insertions(+), 0 deletions(-) + +diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c +index fe30e0d..4d74cc0 100644 +--- a/sound/soc/s3c24xx/s3c24xx-i2s.c ++++ b/sound/soc/s3c24xx/s3c24xx-i2s.c +@@ -76,6 +76,10 @@ static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { + struct s3c24xx_i2s_info { + void __iomem *regs; + struct clk *iis_clk; ++ u32 iiscon; ++ u32 iismod; ++ u32 iisfcon; ++ u32 iispsr; + }; + static struct s3c24xx_i2s_info s3c24xx_i2s; + +@@ -406,6 +410,38 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev) + return 0; + } + ++#ifdef CONFIG_PM ++int s3c24xx_i2s_suspend(struct platform_device *pdev, ++ struct snd_soc_cpu_dai *cpu_dai) ++{ ++ s3c24xx_i2s.iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ s3c24xx_i2s.iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); ++ s3c24xx_i2s.iispsr = readl(s3c24xx_i2s.regs + S3C2410_IISPSR); ++ ++ clk_disable(s3c24xx_i2s.iis_clk); ++ ++ return 0; ++} ++ ++int s3c24xx_i2s_resume(struct platform_device *pdev, ++ struct snd_soc_cpu_dai *cpu_dai) ++{ ++ clk_enable(s3c24xx_i2s.iis_clk); ++ ++ writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ writel(s3c24xx_i2s.iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ writel(s3c24xx_i2s.iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(s3c24xx_i2s.iispsr, s3c24xx_i2s.regs + S3C2410_IISPSR); ++ ++ return 0; ++} ++#else ++#define s3c24xx_i2s_suspend NULL ++#define s3c24xx_i2s_resume NULL ++#endif ++ ++ + #define S3C24XX_I2S_RATES \ + (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \ + SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ +@@ -416,6 +452,8 @@ struct snd_soc_cpu_dai s3c24xx_i2s_dai = { + .id = 0, + .type = SND_SOC_DAI_I2S, + .probe = s3c24xx_i2s_probe, ++ .suspend = s3c24xx_i2s_suspend, ++ .resume = s3c24xx_i2s_resume, + .playback = { + .channels_min = 2, + .channels_max = 2, +-- +1.5.6.5 + |