diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:06:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:06:51 -0400 |
| commit | 3c3762957818dc902222733a8184f23102e24472 (patch) | |
| tree | 97a17d0923d87108715af32f83a526d24e65fb80 /sound | |
| parent | e9f29c9a56ca06d0effa557823a737cbe7ec09f7 (diff) | |
| parent | 63111a3a70fb4d80e3b54ed75f13795e98f7a467 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (32 commits)
sh: intc: switch irq_desc iteration to new active IRQ iterator.
sh: fix up cpu hotplug IRQ migration for irq_data changes.
sh: oprofile: Make sure the backtrace op is available for timer-fallback.
sh64: oprofile: Fix up kernel stack pointer size mismatch.
sh: oprofile: Fix up and extend op_name_from_perf_id().
sh: lockless get_user_pages_fast()
sh64: _PAGE_SPECIAL support.
sound: sh: ctrl_in/outX to __raw_read/writeX conversion.
sh: disable deprecated genirq support.
sh: update show_interrupts() for irq_data chip lookup.
sh: intc: irq_data conversion.
sh64: irq_data conversion.
sh64: update for IRQ flag handling naming changes.
rtc: rtc-rs5c313: ctrl_in/outX to __raw_read/writeX conversion.
sh: mach-se: irq_data conversion.
input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion.
input: jornada680_kbd: ctrl_in/outX to __raw_read/writeX conversion.
sh: hd64461: irq_data conversion.
sh: mach-x3proto: irq_data conversion.
sh: mach-systemh: irq_data conversion.
...
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/sh/aica.c | 2 | ||||
| -rw-r--r-- | sound/soc/sh/sh7760-ac97.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/sh/aica.c b/sound/sh/aica.c index a0df401ebb9f..94c6ea7fa7c2 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c | |||
| @@ -188,7 +188,7 @@ static void spu_reset(void) | |||
| 188 | spu_memset(0, 0, 0x200000 / 4); | 188 | spu_memset(0, 0, 0x200000 / 4); |
| 189 | /* Put ARM7 in endless loop */ | 189 | /* Put ARM7 in endless loop */ |
| 190 | local_irq_save(flags); | 190 | local_irq_save(flags); |
| 191 | ctrl_outl(0xea000002, SPU_MEMORY_BASE); | 191 | __raw_writel(0xea000002, SPU_MEMORY_BASE); |
| 192 | local_irq_restore(flags); | 192 | local_irq_restore(flags); |
| 193 | spu_enable(); | 193 | spu_enable(); |
| 194 | } | 194 | } |
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index b897f7b96d89..f8e0ab82ef59 100644 --- a/sound/soc/sh/sh7760-ac97.c +++ b/sound/soc/sh/sh7760-ac97.c | |||
| @@ -52,8 +52,8 @@ static int __init sh7760_ac97_init(void) | |||
| 52 | unsigned short ipsel; | 52 | unsigned short ipsel; |
| 53 | 53 | ||
| 54 | /* enable both AC97 controllers in pinmux reg */ | 54 | /* enable both AC97 controllers in pinmux reg */ |
| 55 | ipsel = ctrl_inw(IPSEL); | 55 | ipsel = __raw_readw(IPSEL); |
| 56 | ctrl_outw(ipsel | (3 << 10), IPSEL); | 56 | __raw_writew(ipsel | (3 << 10), IPSEL); |
| 57 | 57 | ||
| 58 | ret = -ENOMEM; | 58 | ret = -ENOMEM; |
| 59 | sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1); | 59 | sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1); |