Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv32242/drivers/video
Modified Files:
au1100fb.c
Log Message:
Replaced readl/writel type of macros with au_readl/au_writel since
we need to enable software byte swapping in BE mode, but register
accesses should not be swapped. The Pb1x00 boards are now mostly BE
safe, but some external peripherals (external to the SOC) are not yet
usable in BE mode. USB has not been tested in BE mode either.
Index: au1100fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/au1100fb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- au1100fb.c 19 Apr 2002 19:11:07 -0000 1.6
+++ au1100fb.c 1 May 2002 18:00:31 -0000 1.7
@@ -316,7 +316,7 @@
//printk("turn on panel\n");
#ifdef CONFIG_MIPS_PB1100
p_lcd_reg->lcd_control |= LCD_CONTROL_GO;
- writew(readw(PB1100_G_CONTROL) | p_lcd->mode_backlight,
+ au_writew(au_readw(PB1100_G_CONTROL) | p_lcd->mode_backlight,
PB1100_G_CONTROL);
au_sync();
#endif
@@ -329,7 +329,7 @@
//printk("turn off panel\n");
#ifdef CONFIG_MIPS_PB1100
p_lcd_reg->lcd_control &= ~LCD_CONTROL_GO;
- writew(readw(PB1100_G_CONTROL) & ~p_lcd->mode_backlight,
+ au_writew(au_readw(PB1100_G_CONTROL) & ~p_lcd->mode_backlight,
PB1100_G_CONTROL);
au_sync();
#endif
@@ -474,7 +474,7 @@
#ifdef CONFIG_MIPS_PB1100
/* turn on panel */
- writew(readw(PB1100_G_CONTROL) | p_lcd->mode_backlight,
+ au_writew(au_readw(PB1100_G_CONTROL) | p_lcd->mode_backlight,
PB1100_G_CONTROL);
p_lcd_reg->lcd_control |= LCD_CONTROL_GO;
#endif
@@ -555,9 +555,9 @@
/* set freqctrl now to allow more time to stabilize */
/* zero-out out LCD bits */
- sys_clksrc = readl(SYS_CLKSRC) & ~0x000003e0;
+ sys_clksrc = au_readl(SYS_CLKSRC) & ~0x000003e0;
sys_clksrc |= p_lcd->mode_toyclksrc;
- writel(sys_clksrc, SYS_CLKSRC);
+ au_writel(sys_clksrc, SYS_CLKSRC);
/* FIXME add check to make sure auxpll is what is expected! */
au1100_setmode();
|