aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/ati
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/ati')
-rw-r--r--src/drivers/ati/ragexl/atyfb.h2
-rw-r--r--src/drivers/ati/ragexl/fb.h2
-rw-r--r--src/drivers/ati/ragexl/xlinit.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/ati/ragexl/atyfb.h b/src/drivers/ati/ragexl/atyfb.h
index 94f31fe86e..df8dd3dd44 100644
--- a/src/drivers/ati/ragexl/atyfb.h
+++ b/src/drivers/ati/ragexl/atyfb.h
@@ -104,7 +104,7 @@ struct fb_info_aty {
struct fb_info_aty *next;
unsigned long ati_regbase_phys;
#endif
- unsigned long ati_regbase;
+ u8 *ati_regbase;
#if 0
unsigned long frame_buffer_phys;
#endif
diff --git a/src/drivers/ati/ragexl/fb.h b/src/drivers/ati/ragexl/fb.h
index 48d0f0172f..f112d0e575 100644
--- a/src/drivers/ati/ragexl/fb.h
+++ b/src/drivers/ati/ragexl/fb.h
@@ -124,7 +124,7 @@ struct fb_fix_screeninfo {
u16 ypanstep; /* zero if no hardware panning */
u16 ywrapstep; /* zero if no hardware ywrap */
u32 line_length; /* length of a line in bytes */
- unsigned long mmio_start; /* Start of Memory Mapped I/O */
+ u8 *mmio_start; /* Start of Memory Mapped I/O */
/* (physical address) */
u32 mmio_len; /* Length of Memory Mapped I/O */
u32 accel; /* Type of acceleration available */
diff --git a/src/drivers/ati/ragexl/xlinit.c b/src/drivers/ati/ragexl/xlinit.c
index 41cea72a04..19291809af 100644
--- a/src/drivers/ati/ragexl/xlinit.c
+++ b/src/drivers/ati/ragexl/xlinit.c
@@ -537,13 +537,13 @@ static void ati_ragexl_init(struct device *dev)
#endif /* CONFIG_CONSOLE_BTEXT */
#if USE_AUX_REG==0
- info->ati_regbase = res->base+0x7ff000+0xc00;
+ info->ati_regbase = res2mmio(res, 0x7ff000+0xc00, 0);
#else
/* Fix this to look for the correct index. */
//if (dev->resource_list && dev->resource_list->next)
res = dev->resource_list->next->next;
if(res->flags & IORESOURCE_MEM) {
- info->ati_regbase = res->base+0x400; //using auxiliary register
+ info->ati_regbase = res2mmio(res, 0x400, 0); //using auxiliary register
}
#endif
@@ -553,7 +553,7 @@ static void ati_ragexl_init(struct device *dev)
#endif
#if 0
- printk(BIOS_DEBUG, "ati_regbase = 0x%08x, frame_buffer = 0x%08x\n", info->ati_regbase, info->frame_buffer);
+ printk(BIOS_DEBUG, "ati_regbase = 0x%p, frame_buffer = 0x%08x\n", info->ati_regbase, info->frame_buffer);
#endif
chip_id = aty_ld_le32(CONFIG_CHIP_ID, info);