diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 15:53:50 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 15:53:50 +0900 |
| commit | 48ccb2ceec6fb1d46d1bc92dadc602d4341a0149 (patch) | |
| tree | 5242f572316c3a0efd56cfbb4539c4e753fa32f7 | |
| parent | 1e5cefd01af079d8efadfde78c045be15e6c1b23 (diff) | |
| download | op-kernel-dev-48ccb2ceec6fb1d46d1bc92dadc602d4341a0149.zip op-kernel-dev-48ccb2ceec6fb1d46d1bc92dadc602d4341a0149.tar.gz | |
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.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 a0df401..94c6ea7 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -188,7 +188,7 @@ static void spu_reset(void) spu_memset(0, 0, 0x200000 / 4); /* Put ARM7 in endless loop */ local_irq_save(flags); - ctrl_outl(0xea000002, SPU_MEMORY_BASE); + __raw_writel(0xea000002, SPU_MEMORY_BASE); local_irq_restore(flags); spu_enable(); } diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index b897f7b..f8e0ab8 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) unsigned short ipsel; /* enable both AC97 controllers in pinmux reg */ - ipsel = ctrl_inw(IPSEL); - ctrl_outw(ipsel | (3 << 10), IPSEL); + ipsel = __raw_readw(IPSEL); + __raw_writew(ipsel | (3 << 10), IPSEL); ret = -ENOMEM; sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1); |
