diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 16:20:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 16:20:10 -0400 |
commit | c6799ade4ae04b53a5f677e5289116155ff01574 (patch) | |
tree | 3601b5e2387e39d62c207e4268c6cc5c68f2a364 /sound/soc/pxa/pxa2xx-i2s.c | |
parent | b7405e16435f710edfae6ba32bef4ca20d3de145 (diff) | |
parent | 5cd47155155a32e5b944ac9fc3f3dc578e429aa0 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (82 commits)
[ARM] Add comments marking in-use ptrace numbers
[ARM] Move syscall saving out of the way of utrace
[ARM] 4360/1: S3C24XX: regs-udc.h remove unused macro
[ARM] 4358/1: S3C24XX: mach-qt2410.c: remove linux/mmc/protocol.h header
[ARM] mm 10: allow memory type to be specified with ioremap
[ARM] mm 9: add additional device memory types
[ARM] mm 8: define mem_types table L1 bit 4 to be for ARMv6
[ARM] iop: add missing parens in macro
[ARM] mm 7: remove duplicated __ioremap() prototypes
ARM: OMAP: fix OMAP1 mpuio suspend/resume oops
ARM: OMAP: MPUIO wake updates
ARM: OMAP: speed up gpio irq handling
ARM: OMAP: plat-omap changes for 2430 SDP
ARM: OMAP: gpio object shrinkage, cleanup
ARM: OMAP: /sys/kernel/debug/omap_gpio
ARM: OMAP: Implement workaround for GPIO wakeup bug in OMAP2420 silicon
ARM: OMAP: Enable 24xx GPIO autoidling
[ARM] 4318/2: DSM-G600 Board Support
[ARM] 4227/1: minor head.S fixups
[ARM] 4328/1: Move i.MX UART regs to driver
...
Diffstat (limited to 'sound/soc/pxa/pxa2xx-i2s.c')
-rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 575a6137c040..50c5c83f67db 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
@@ -149,7 +149,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, | |||
149 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx); | 149 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx); |
150 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm); | 150 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm); |
151 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk); | 151 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk); |
152 | pxa_set_cken(CKEN8_I2S, 1); | 152 | pxa_set_cken(CKEN_I2S, 1); |
153 | pxa_i2s_wait(); | 153 | pxa_i2s_wait(); |
154 | 154 | ||
155 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | 155 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) |
@@ -234,7 +234,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream) | |||
234 | if (SACR1 & (SACR1_DREC | SACR1_DRPL)) { | 234 | if (SACR1 & (SACR1_DREC | SACR1_DRPL)) { |
235 | SACR0 &= ~SACR0_ENB; | 235 | SACR0 &= ~SACR0_ENB; |
236 | pxa_i2s_wait(); | 236 | pxa_i2s_wait(); |
237 | pxa_set_cken(CKEN8_I2S, 0); | 237 | pxa_set_cken(CKEN_I2S, 0); |
238 | } | 238 | } |
239 | } | 239 | } |
240 | 240 | ||