drivers/savagefb: use mdelay instead of udelay
Long delays need to use mdelay on architectures such as ARM that cannot compute long timeouts in udelay. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
This commit is contained in:
Родитель
d399099cbb
Коммит
f5c3ac242d
|
@ -1351,7 +1351,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r
|
||||||
/* following part not present in X11 driver */
|
/* following part not present in X11 driver */
|
||||||
cr67 = vga_in8(0x3d5, par) & 0xf;
|
cr67 = vga_in8(0x3d5, par) & 0xf;
|
||||||
vga_out8(0x3d5, 0x50 | cr67, par);
|
vga_out8(0x3d5, 0x50 | cr67, par);
|
||||||
udelay(10000);
|
mdelay(10);
|
||||||
vga_out8(0x3d4, 0x67, par);
|
vga_out8(0x3d4, 0x67, par);
|
||||||
/* end of part */
|
/* end of part */
|
||||||
vga_out8(0x3d5, reg->CR67 & ~0x0c, par);
|
vga_out8(0x3d5, reg->CR67 & ~0x0c, par);
|
||||||
|
@ -1904,11 +1904,11 @@ static int savage_init_hw(struct savagefb_par *par)
|
||||||
vga_out8(0x3d4, 0x66, par);
|
vga_out8(0x3d4, 0x66, par);
|
||||||
cr66 = vga_in8(0x3d5, par);
|
cr66 = vga_in8(0x3d5, par);
|
||||||
vga_out8(0x3d5, cr66 | 0x02, par);
|
vga_out8(0x3d5, cr66 | 0x02, par);
|
||||||
udelay(10000);
|
mdelay(10);
|
||||||
|
|
||||||
vga_out8(0x3d4, 0x66, par);
|
vga_out8(0x3d4, 0x66, par);
|
||||||
vga_out8(0x3d5, cr66 & ~0x02, par); /* clear reset flag */
|
vga_out8(0x3d5, cr66 & ~0x02, par); /* clear reset flag */
|
||||||
udelay(10000);
|
mdelay(10);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1918,11 +1918,11 @@ static int savage_init_hw(struct savagefb_par *par)
|
||||||
vga_out8(0x3d4, 0x3f, par);
|
vga_out8(0x3d4, 0x3f, par);
|
||||||
cr3f = vga_in8(0x3d5, par);
|
cr3f = vga_in8(0x3d5, par);
|
||||||
vga_out8(0x3d5, cr3f | 0x08, par);
|
vga_out8(0x3d5, cr3f | 0x08, par);
|
||||||
udelay(10000);
|
mdelay(10);
|
||||||
|
|
||||||
vga_out8(0x3d4, 0x3f, par);
|
vga_out8(0x3d4, 0x3f, par);
|
||||||
vga_out8(0x3d5, cr3f & ~0x08, par); /* clear reset flags */
|
vga_out8(0x3d5, cr3f & ~0x08, par); /* clear reset flags */
|
||||||
udelay(10000);
|
mdelay(10);
|
||||||
|
|
||||||
/* Savage ramdac speeds */
|
/* Savage ramdac speeds */
|
||||||
par->numClocks = 4;
|
par->numClocks = 4;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче