aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/alchemy/Platform22
-rw-r--r--drivers/video/au1100fb.c22
2 files changed, 6 insertions, 38 deletions
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
index fa1bdd1aea15..b3afcdd8d77a 100644
--- a/arch/mips/alchemy/Platform
+++ b/arch/mips/alchemy/Platform
@@ -5,32 +5,14 @@ platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/common/
5 5
6 6
7# 7#
8# AMD Alchemy Pb1100 eval board 8# AMD Alchemy Db1000/Db1500/Pb1500/Db1100/Pb1100 eval boards
9#
10platform-$(CONFIG_MIPS_PB1100) += alchemy/devboards/
11load-$(CONFIG_MIPS_PB1100) += 0xffffffff80100000
12
13#
14# AMD Alchemy Pb1500 eval board
15#
16platform-$(CONFIG_MIPS_PB1500) += alchemy/devboards/
17load-$(CONFIG_MIPS_PB1500) += 0xffffffff80100000
18
19#
20# AMD Alchemy Pb1550 eval board
21#
22platform-$(CONFIG_MIPS_PB1550) += alchemy/devboards/
23load-$(CONFIG_MIPS_PB1550) += 0xffffffff80100000
24
25#
26# AMD Alchemy Db1000/Db1500/Db1100 eval boards
27# 9#
28platform-$(CONFIG_MIPS_DB1000) += alchemy/devboards/ 10platform-$(CONFIG_MIPS_DB1000) += alchemy/devboards/
29cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 11cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
30load-$(CONFIG_MIPS_DB1000) += 0xffffffff80100000 12load-$(CONFIG_MIPS_DB1000) += 0xffffffff80100000
31 13
32# 14#
33# AMD Alchemy Db1200/Pb1200/Db1550/Db1300 eval boards 15# AMD Alchemy Db1200/Pb1200/Db1550/Pb1550/Db1300 eval boards
34# 16#
35platform-$(CONFIG_MIPS_DB1235) += alchemy/devboards/ 17platform-$(CONFIG_MIPS_DB1235) += alchemy/devboards/
36cflags-$(CONFIG_MIPS_DB1235) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 18cflags-$(CONFIG_MIPS_DB1235) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index ddabaa867b0d..700cac067b46 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -111,30 +111,16 @@ static int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
111 switch (blank_mode) { 111 switch (blank_mode) {
112 112
113 case VESA_NO_BLANKING: 113 case VESA_NO_BLANKING:
114 /* Turn on panel */ 114 /* Turn on panel */
115 fbdev->regs->lcd_control |= LCD_CONTROL_GO; 115 fbdev->regs->lcd_control |= LCD_CONTROL_GO;
116#ifdef CONFIG_MIPS_PB1100
117 if (fbdev->panel_idx == 1) {
118 au_writew(au_readw(PB1100_G_CONTROL)
119 | (PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
120 PB1100_G_CONTROL);
121 }
122#endif
123 au_sync(); 116 au_sync();
124 break; 117 break;
125 118
126 case VESA_VSYNC_SUSPEND: 119 case VESA_VSYNC_SUSPEND:
127 case VESA_HSYNC_SUSPEND: 120 case VESA_HSYNC_SUSPEND:
128 case VESA_POWERDOWN: 121 case VESA_POWERDOWN:
129 /* Turn off panel */ 122 /* Turn off panel */
130 fbdev->regs->lcd_control &= ~LCD_CONTROL_GO; 123 fbdev->regs->lcd_control &= ~LCD_CONTROL_GO;
131#ifdef CONFIG_MIPS_PB1100
132 if (fbdev->panel_idx == 1) {
133 au_writew(au_readw(PB1100_G_CONTROL)
134 & ~(PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
135 PB1100_G_CONTROL);
136 }
137#endif
138 au_sync(); 124 au_sync();
139 break; 125 break;
140 default: 126 default: