diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2010-05-19 00:42:55 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2010-05-19 00:42:55 +0000 |
commit | 3356effcdf024a0bdc57c0e00e2d325774e8b3b3 (patch) | |
tree | 9aae7e7e55cb1759ec4ddbdcab175c18932a6030 | |
parent | 54c649697b3959d8f74888bd7ec9af0206f7670c (diff) | |
download | rockbox-3356effcdf024a0bdc57c0e00e2d325774e8b3b3.tar.gz rockbox-3356effcdf024a0bdc57c0e00e2d325774e8b3b3.zip |
Gigabeat S: Wrong thing messing with IPU_CONF. No fiddling is needed just yet.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26155 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c index fbcd54059e..d567de8dbb 100644 --- a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c | |||
@@ -215,7 +215,6 @@ void lcd_sleep(void) | |||
215 | return; | 215 | return; |
216 | 216 | ||
217 | IPU_IDMAC_CHA_EN &= ~(1ul << MAIN_LCD_IDMAC_CHANNEL); | 217 | IPU_IDMAC_CHA_EN &= ~(1ul << MAIN_LCD_IDMAC_CHANNEL); |
218 | IPU_IPU_CONF &= ~IPU_IPU_CONF_ADC_EN; | ||
219 | lcd_enable(false); | 218 | lcd_enable(false); |
220 | lcd_set_power(false); | 219 | lcd_set_power(false); |
221 | _backlight_lcd_sleep(); | 220 | _backlight_lcd_sleep(); |
@@ -230,7 +229,6 @@ void lcd_enable(bool state) | |||
230 | { | 229 | { |
231 | if (!lcd_powered) | 230 | if (!lcd_powered) |
232 | lcd_set_power(true); | 231 | lcd_set_power(true); |
233 | IPU_IPU_CONF |= IPU_IPU_CONF_ADC_EN; | ||
234 | IPU_IDMAC_CHA_EN |= 1ul << MAIN_LCD_IDMAC_CHANNEL; | 232 | IPU_IDMAC_CHA_EN |= 1ul << MAIN_LCD_IDMAC_CHANNEL; |
235 | sleep(HZ/50); | 233 | sleep(HZ/50); |
236 | lcd_on = true; | 234 | lcd_on = true; |