aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/time.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 07:05:35 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-29 05:15:13 -0400
commit454eeb2dd7bd0418451ea33a606d0fa50aa36718 (patch)
treeb03b762b590343c1c90e83efbec3819c32a95bfb /arch/sparc/kernel/time.c
parent98261dd1a393777f4400d8ad5a29e97cb30e5422 (diff)
sparc: Convert remaining sbus_ioremap() and sbus_iounmap() users.
Use of_ioremap() and of_iounmap() instead. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/time.c')
-rw-r--r--arch/sparc/kernel/time.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 0762f5db1924..a713bb43db84 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -28,6 +28,7 @@
28#include <linux/pci.h> 28#include <linux/pci.h>
29#include <linux/ioport.h> 29#include <linux/ioport.h>
30#include <linux/profile.h> 30#include <linux/profile.h>
31#include <linux/of.h>
31#include <linux/of_device.h> 32#include <linux/of_device.h>
32 33
33#include <asm/oplib.h> 34#include <asm/oplib.h>
@@ -260,7 +261,7 @@ static inline void sun4_clock_probe(void)
260 if( idprom->id_machtype == (SM_SUN4 | SM_4_330) ) { 261 if( idprom->id_machtype == (SM_SUN4 | SM_4_330) ) {
261 sp_clock_typ = MSTK48T02; 262 sp_clock_typ = MSTK48T02;
262 r.start = sun4_clock_physaddr; 263 r.start = sun4_clock_physaddr;
263 mstk48t02_regs = sbus_ioremap(&r, 0, 264 mstk48t02_regs = of_ioremap(&r, 0,
264 sizeof(struct mostek48t02), NULL); 265 sizeof(struct mostek48t02), NULL);
265 mstk48t08_regs = NULL; /* To catch weirdness */ 266 mstk48t08_regs = NULL; /* To catch weirdness */
266 intersil_clock = NULL; /* just in case */ 267 intersil_clock = NULL; /* just in case */
@@ -274,7 +275,7 @@ static inline void sun4_clock_probe(void)
274 sp_clock_typ = INTERSIL; 275 sp_clock_typ = INTERSIL;
275 r.start = sun4_clock_physaddr; 276 r.start = sun4_clock_physaddr;
276 intersil_clock = (struct intersil *) 277 intersil_clock = (struct intersil *)
277 sbus_ioremap(&r, 0, sizeof(*intersil_clock), "intersil"); 278 of_ioremap(&r, 0, sizeof(*intersil_clock), "intersil");
278 mstk48t02_regs = 0; /* just be sure */ 279 mstk48t02_regs = 0; /* just be sure */
279 mstk48t08_regs = NULL; /* ditto */ 280 mstk48t08_regs = NULL; /* ditto */
280 /* initialise the clock */ 281 /* initialise the clock */