aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/cchips
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 00:42:57 -0400
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 00:42:57 -0400
commit6d75e650f1d0d59fd97c7629f0903ef18e8dfb7b (patch)
tree71753efdb503c351079e7ece10229a87cf263901 /arch/sh/cchips
parentd95fb13c960ae19e9fd4a95807eb68fa20caf537 (diff)
sh: Move hd64461.h to a more sensible location.
With the I/O rework for hd64461 we're down to a single header, so move it by itself and get rid of the directory. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/cchips')
-rw-r--r--arch/sh/cchips/hd6446x/hd64461/io.c11
-rw-r--r--arch/sh/cchips/hd6446x/hd64461/setup.c3
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/sh/cchips/hd6446x/hd64461/io.c b/arch/sh/cchips/hd6446x/hd64461/io.c
index ac3062671db7..f77f18f2ba7f 100644
--- a/arch/sh/cchips/hd6446x/hd64461/io.c
+++ b/arch/sh/cchips/hd6446x/hd64461/io.c
@@ -1,11 +1,10 @@
1/* 1/*
2 * $Id: io.c,v 1.6 2004/03/16 00:07:50 lethal Exp $
3 * Copyright (C) 2000 YAEGASHI Takeshi 2 * Copyright (C) 2000 YAEGASHI Takeshi
4 * Typical I/O routines for HD64461 system. 3 * Typical I/O routines for HD64461 system.
5 */ 4 */
6 5
7#include <asm/io.h> 6#include <asm/io.h>
8#include <asm/hd64461/hd64461.h> 7#include <asm/hd64461.h>
9 8
10#define MEM_BASE (CONFIG_HD64461_IOBASE - HD64461_STBCR) 9#define MEM_BASE (CONFIG_HD64461_IOBASE - HD64461_STBCR)
11 10
@@ -144,13 +143,13 @@ void hd64461_outsl(unsigned long port, const void *buffer, unsigned long count)
144 while(count--) *addr=*buf++; 143 while(count--) *addr=*buf++;
145} 144}
146 145
147unsigned short hd64461_readw(unsigned long addr) 146unsigned short hd64461_readw(void __iomem *addr)
148{ 147{
149 return *(volatile unsigned short*)(MEM_BASE+addr); 148 return ctrl_inw(MEM_BASE+(unsigned long __force)addr);
150} 149}
151 150
152void hd64461_writew(unsigned short b, unsigned long addr) 151void hd64461_writew(unsigned short b, void __iomem *addr)
153{ 152{
154 *(volatile unsigned short*)(MEM_BASE+addr) = b; 153 ctrl_outw(b, MEM_BASE+(unsigned long __force)addr);
155} 154}
156 155
diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c
index ad126016720f..6c961273a23a 100644
--- a/arch/sh/cchips/hd6446x/hd64461/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64461/setup.c
@@ -14,8 +14,7 @@
14 14
15#include <asm/io.h> 15#include <asm/io.h>
16#include <asm/irq.h> 16#include <asm/irq.h>
17 17#include <asm/hd64461.h>
18#include <asm/hd64461/hd64461.h>
19 18
20static void disable_hd64461_irq(unsigned int irq) 19static void disable_hd64461_irq(unsigned int irq)
21{ 20{