diff options
Diffstat (limited to 'drivers/video/hitfb.c')
-rw-r--r-- | drivers/video/hitfb.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index 4cc6b454265e..c6ac0dcd8854 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c | |||
@@ -28,10 +28,8 @@ | |||
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
29 | #include <asm/hd64461/hd64461.h> | 29 | #include <asm/hd64461/hd64461.h> |
30 | 30 | ||
31 | #ifdef MACH_HP600 | ||
32 | #include <asm/cpu/dac.h> | 31 | #include <asm/cpu/dac.h> |
33 | #include <asm/hp6xx/hp6xx.h> | 32 | #include <asm/hp6xx/hp6xx.h> |
34 | #endif | ||
35 | 33 | ||
36 | #define WIDTH 640 | 34 | #define WIDTH 640 |
37 | 35 | ||
@@ -192,12 +190,6 @@ int hitfb_blank(int blank_mode, struct fb_info *info) | |||
192 | unsigned short v; | 190 | unsigned short v; |
193 | 191 | ||
194 | if (blank_mode) { | 192 | if (blank_mode) { |
195 | #ifdef MACH_HP600 | ||
196 | sh_dac_disable(DAC_LCD_BRIGHTNESS); | ||
197 | v = fb_readw(HD64461_GPBDR); | ||
198 | v |= HD64461_GPBDR_LCDOFF; | ||
199 | fb_writew(v, HD64461_GPBDR); | ||
200 | #endif | ||
201 | v = fb_readw(HD64461_LDR1); | 193 | v = fb_readw(HD64461_LDR1); |
202 | v &= ~HD64461_LDR1_DON; | 194 | v &= ~HD64461_LDR1_DON; |
203 | fb_writew(v, HD64461_LDR1); | 195 | fb_writew(v, HD64461_LDR1); |
@@ -213,12 +205,7 @@ int hitfb_blank(int blank_mode, struct fb_info *info) | |||
213 | v = fb_readw(HD64461_STBCR); | 205 | v = fb_readw(HD64461_STBCR); |
214 | v &= ~HD64461_STBCR_SLCDST; | 206 | v &= ~HD64461_STBCR_SLCDST; |
215 | fb_writew(v, HD64461_STBCR); | 207 | fb_writew(v, HD64461_STBCR); |
216 | #ifdef MACH_HP600 | 208 | |
217 | sh_dac_enable(DAC_LCD_BRIGHTNESS); | ||
218 | v = fb_readw(HD64461_GPBDR); | ||
219 | v &= ~HD64461_GPBDR_LCDOFF; | ||
220 | fb_writew(v, HD64461_GPBDR); | ||
221 | #endif | ||
222 | v = fb_readw(HD64461_LDR1); | 209 | v = fb_readw(HD64461_LDR1); |
223 | v |= HD64461_LDR1_DON; | 210 | v |= HD64461_LDR1_DON; |
224 | fb_writew(v, HD64461_LDR1); | 211 | fb_writew(v, HD64461_LDR1); |