diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 14:34:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 14:34:41 +0900 |
| commit | c053784454550cf750399caa65482b31ffbe3c57 (patch) | |
| tree | 0bdee3ae367c204bbfef91dbfd087ba384869c9d /drivers/sh | |
| parent | 9eb79bb3f54ce1843d579ef42ded61e0c607e850 (diff) | |
| download | linux-c053784454550cf750399caa65482b31ffbe3c57.tar.gz | |
sh: maple: 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>
Diffstat (limited to 'drivers/sh')
| -rw-r--r-- | drivers/sh/maple/maple.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c index 4e8f57d4131f..1e20604257af 100644 --- a/drivers/sh/maple/maple.c +++ b/drivers/sh/maple/maple.c @@ -94,9 +94,9 @@ EXPORT_SYMBOL_GPL(maple_driver_unregister); /* set hardware registers to enable next round of dma */ static void maple_dma_reset(void) { - ctrl_outl(MAPLE_MAGIC, MAPLE_RESET); + __raw_writel(MAPLE_MAGIC, MAPLE_RESET); /* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */ - ctrl_outl(1, MAPLE_TRIGTYPE); + __raw_writel(1, MAPLE_TRIGTYPE); /* * Maple system register * bits 31 - 16 timeout in units of 20nsec @@ -105,9 +105,9 @@ static void maple_dma_reset(void) * bits 3 - 0 delay (in 1.3ms) between VBLANK and start of DMA * max delay is 11 */ - ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED); - ctrl_outl(virt_to_phys(maple_sendbuf), MAPLE_DMAADDR); - ctrl_outl(1, MAPLE_ENABLE); + __raw_writel(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED); + __raw_writel(virt_to_phys(maple_sendbuf), MAPLE_DMAADDR); + __raw_writel(1, MAPLE_ENABLE); } /** @@ -130,7 +130,7 @@ EXPORT_SYMBOL_GPL(maple_getcond_callback); static int maple_dma_done(void) { - return (ctrl_inl(MAPLE_STATE) & 1) == 0; + return (__raw_readl(MAPLE_STATE) & 1) == 0; } static void maple_release_device(struct device *dev) @@ -275,7 +275,7 @@ static void maple_send(void) return; /* disable DMA */ - ctrl_outl(0, MAPLE_ENABLE); + __raw_writel(0, MAPLE_ENABLE); if (!list_empty(&maple_sentq)) goto finish; @@ -450,7 +450,7 @@ static void maple_vblank_handler(struct work_struct *work) if (!maple_dma_done()) return; - ctrl_outl(0, MAPLE_ENABLE); + __raw_writel(0, MAPLE_ENABLE); if (!list_empty(&maple_sentq)) goto finish; @@ -636,7 +636,7 @@ static void maple_dma_handler(struct work_struct *work) if (!maple_dma_done()) return; - ctrl_outl(0, MAPLE_ENABLE); + __raw_writel(0, MAPLE_ENABLE); if (!list_empty(&maple_sentq)) { list_for_each_entry_safe(mq, nmq, &maple_sentq, list) { mdev = mq->dev; @@ -796,7 +796,7 @@ static int __init maple_bus_init(void) int retval, i; struct maple_device *mdev[MAPLE_PORTS]; - ctrl_outl(0, MAPLE_ENABLE); + __raw_writel(0, MAPLE_ENABLE); retval = device_register(&maple_bus); if (retval) |