Commit 48ccb2ce authored by Paul Mundt's avatar Paul Mundt

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 1e5cefd0
...@@ -188,7 +188,7 @@ static void spu_reset(void) ...@@ -188,7 +188,7 @@ static void spu_reset(void)
spu_memset(0, 0, 0x200000 / 4); spu_memset(0, 0, 0x200000 / 4);
/* Put ARM7 in endless loop */ /* Put ARM7 in endless loop */
local_irq_save(flags); local_irq_save(flags);
ctrl_outl(0xea000002, SPU_MEMORY_BASE); __raw_writel(0xea000002, SPU_MEMORY_BASE);
local_irq_restore(flags); local_irq_restore(flags);
spu_enable(); spu_enable();
} }
......
...@@ -52,8 +52,8 @@ static int __init sh7760_ac97_init(void) ...@@ -52,8 +52,8 @@ static int __init sh7760_ac97_init(void)
unsigned short ipsel; unsigned short ipsel;
/* enable both AC97 controllers in pinmux reg */ /* enable both AC97 controllers in pinmux reg */
ipsel = ctrl_inw(IPSEL); ipsel = __raw_readw(IPSEL);
ctrl_outw(ipsel | (3 << 10), IPSEL); __raw_writew(ipsel | (3 << 10), IPSEL);
ret = -ENOMEM; ret = -ENOMEM;
sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1); sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment