aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-10-27 02:53:50 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-10-27 02:53:50 -0400
commit48ccb2ceec6fb1d46d1bc92dadc602d4341a0149 (patch)
tree5242f572316c3a0efd56cfbb4539c4e753fa32f7
parent1e5cefd01af079d8efadfde78c045be15e6c1b23 (diff)
sound: sh: ctrl_in/outX to __raw_read/writeX conversion.
The ctrl_xxx routines are deprecated, switch over to the __raw_xxx versions. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--sound/sh/aica.c2
-rw-r--r--sound/soc/sh/sh7760-ac97.c4
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);