diff options
-rw-r--r-- | firmware/target/arm/ipod/lcd-color_nano.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/lcd-gray.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/ata-c200_e200.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c index 3471372d33..501c20d5c8 100644 --- a/firmware/target/arm/ipod/lcd-color_nano.c +++ b/firmware/target/arm/ipod/lcd-color_nano.c | |||
@@ -106,7 +106,7 @@ void lcd_init_device(void) | |||
106 | GPIOB_ENABLE |= 0x4; /* B02 enable */ | 106 | GPIOB_ENABLE |= 0x4; /* B02 enable */ |
107 | GPIOB_ENABLE |= 0x8; /* B03 enable */ | 107 | GPIOB_ENABLE |= 0x8; /* B03 enable */ |
108 | outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ | 108 | outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ |
109 | outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */ | 109 | GPO32 |= 0x2000000; /* D01 =1 */ |
110 | 110 | ||
111 | DEV_EN |= 0x20000; /* PWM enable */ | 111 | DEV_EN |= 0x20000; /* PWM enable */ |
112 | 112 | ||
diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c index c375d95ea6..55f10270b7 100644 --- a/firmware/target/arm/ipod/lcd-gray.c +++ b/firmware/target/arm/ipod/lcd-gray.c | |||
@@ -171,7 +171,7 @@ void lcd_init_device(void) | |||
171 | GPIOB_ENABLE |= 0x4; /* B02 enable */ | 171 | GPIOB_ENABLE |= 0x4; /* B02 enable */ |
172 | GPIOB_ENABLE |= 0x8; /* B03 enable */ | 172 | GPIOB_ENABLE |= 0x8; /* B03 enable */ |
173 | outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ | 173 | outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ |
174 | outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */ | 174 | GPO32 |= 0x2000000; /* D01 =1 */ |
175 | 175 | ||
176 | DEV_EN |= 0x20000; /* PWM enable */ | 176 | DEV_EN |= 0x20000; /* PWM enable */ |
177 | #endif | 177 | #endif |
diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c index a8e1651280..c9f97c0d48 100644 --- a/firmware/target/arm/sandisk/ata-c200_e200.c +++ b/firmware/target/arm/sandisk/ata-c200_e200.c | |||
@@ -529,7 +529,7 @@ static void sd_card_mux(int card_no) | |||
529 | #ifdef SANSA_E200 | 529 | #ifdef SANSA_E200 |
530 | if (card_no == 0) | 530 | if (card_no == 0) |
531 | { | 531 | { |
532 | outl(inl(0x70000080) | 0x4, 0x70000080); | 532 | GPO32 |= 0x4; |
533 | 533 | ||
534 | GPIOA_ENABLE &= ~0x7a; | 534 | GPIOA_ENABLE &= ~0x7a; |
535 | GPIOA_OUTPUT_EN &= ~0x7a; | 535 | GPIOA_OUTPUT_EN &= ~0x7a; |
@@ -541,7 +541,7 @@ static void sd_card_mux(int card_no) | |||
541 | } | 541 | } |
542 | else | 542 | else |
543 | { | 543 | { |
544 | outl(inl(0x70000080) & ~0x4, 0x70000080); | 544 | GPO32 &= ~0x4; |
545 | 545 | ||
546 | GPIOD_ENABLE &= ~0x1f; | 546 | GPIOD_ENABLE &= ~0x1f; |
547 | GPIOD_OUTPUT_EN &= ~0x1f; | 547 | GPIOD_OUTPUT_EN &= ~0x1f; |
@@ -554,7 +554,7 @@ static void sd_card_mux(int card_no) | |||
554 | #else /* SANSA_C200 */ | 554 | #else /* SANSA_C200 */ |
555 | if (card_no == 0) | 555 | if (card_no == 0) |
556 | { | 556 | { |
557 | outl(inl(0x70000080) | 0x4, 0x70000080); | 557 | GPO32 |= 0x4; |
558 | 558 | ||
559 | GPIOD_ENABLE &= ~0x1f; | 559 | GPIOD_ENABLE &= ~0x1f; |
560 | GPIOD_OUTPUT_EN &= ~0x1f; | 560 | GPIOD_OUTPUT_EN &= ~0x1f; |
@@ -566,7 +566,7 @@ static void sd_card_mux(int card_no) | |||
566 | } | 566 | } |
567 | else | 567 | else |
568 | { | 568 | { |
569 | outl(inl(0x70000080) & ~0x4, 0x70000080); | 569 | GPO32 &= ~0x4; |
570 | 570 | ||
571 | GPIOA_ENABLE &= ~0x7a; | 571 | GPIOA_ENABLE &= ~0x7a; |
572 | GPIOA_OUTPUT_EN &= ~0x7a; | 572 | GPIOA_OUTPUT_EN &= ~0x7a; |
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c index 189741e41b..5bd14c2ece 100644 --- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | |||
@@ -371,7 +371,7 @@ void lcd_init_device(void) | |||
371 | lcd_init_gpio(); | 371 | lcd_init_gpio(); |
372 | /* Controller init */ | 372 | /* Controller init */ |
373 | outl((inl(0x70000084) | (1 << 28)), 0x70000084); | 373 | outl((inl(0x70000084) | (1 << 28)), 0x70000084); |
374 | outl((inl(0x70000080) & ~(1 << 28)), 0x70000080); | 374 | GPO32 &= ~(1 << 28); |
375 | DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); | 375 | DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); |
376 | outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); | 376 | outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); |
377 | outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020); | 377 | outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020); |
@@ -419,9 +419,9 @@ void lcd_init_device(void) | |||
419 | 419 | ||
420 | /* LCD init */ | 420 | /* LCD init */ |
421 | /* Pull RESET low, then high to reset driver IC */ | 421 | /* Pull RESET low, then high to reset driver IC */ |
422 | outl((inl(0x70000080) & ~(1 << 28)), 0x70000080); | 422 | GPO32 &= ~(1 << 28); |
423 | udelay(10000); | 423 | udelay(10000); |
424 | outl((inl(0x70000080) | (1 << 28)), 0x70000080); | 424 | GPO32 |= (1 << 28); |
425 | udelay(10000); | 425 | udelay(10000); |
426 | 426 | ||
427 | lcd_display_on(); | 427 | lcd_display_on(); |