diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-16 16:32:03 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-16 16:32:03 +0200 |
commit | 8517cf8bed758120bdf95b5880d17ac277d21d74 (patch) | |
tree | 51035567dfde15e2cf1591a91ba548091bfae83e /firmware/target/arm/imx233/sansa-fuzeplus | |
parent | 0fa014a6fe7be43a827d4f4c7da63f1113e226c0 (diff) | |
download | rockbox-8517cf8bed758120bdf95b5880d17ac277d21d74.tar.gz rockbox-8517cf8bed758120bdf95b5880d17ac277d21d74.zip |
imx233: rewrite lcdif using the new register headers
Change-Id: I94329a65a7c6a4127fa05b77b9a7a291f8a50013
Diffstat (limited to 'firmware/target/arm/imx233/sansa-fuzeplus')
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c index 376673e675..cfb1a4e0a5 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c | |||
@@ -56,8 +56,8 @@ static enum lcd_kind_t | |||
56 | static void setup_parameters(void) | 56 | static void setup_parameters(void) |
57 | { | 57 | { |
58 | imx233_lcdif_reset(); | 58 | imx233_lcdif_reset(); |
59 | imx233_lcdif_set_lcd_databus_width(HW_LCDIF_CTRL__LCD_DATABUS_WIDTH_18_BIT); | 59 | imx233_lcdif_set_lcd_databus_width(BV_LCDIF_CTRL_LCD_DATABUS_WIDTH__18_BIT); |
60 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_18_BIT); | 60 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__18_BIT); |
61 | imx233_lcdif_set_timings(1, 2, 2, 2); | 61 | imx233_lcdif_set_timings(1, 2, 2, 2); |
62 | imx233_lcdif_enable_underflow_recover(true); | 62 | imx233_lcdif_enable_underflow_recover(true); |
63 | } | 63 | } |
@@ -218,7 +218,7 @@ static void lcd_write_reg(uint32_t reg, uint32_t data) | |||
218 | uint32_t old_reg = reg; | 218 | uint32_t old_reg = reg; |
219 | imx233_lcdif_wait_ready(); | 219 | imx233_lcdif_wait_ready(); |
220 | /* get back to 18-bit word length */ | 220 | /* get back to 18-bit word length */ |
221 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_18_BIT); | 221 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__18_BIT); |
222 | reg = encode_16_to_18(reg); | 222 | reg = encode_16_to_18(reg); |
223 | data = encode_16_to_18(data); | 223 | data = encode_16_to_18(data); |
224 | 224 | ||
@@ -398,11 +398,11 @@ void lcd_init_device(void) | |||
398 | break; | 398 | break; |
399 | } | 399 | } |
400 | // reset device | 400 | // reset device |
401 | __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 401 | BF_SET(LCDIF_CTRL1, RESET); |
402 | mdelay(50); | 402 | mdelay(50); |
403 | __REG_CLR(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 403 | BF_CLR(LCDIF_CTRL1, RESET); |
404 | mdelay(10); | 404 | mdelay(10); |
405 | __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 405 | BF_SET(LCDIF_CTRL1, RESET); |
406 | 406 | ||
407 | switch(lcd_kind) | 407 | switch(lcd_kind) |
408 | { | 408 | { |
@@ -578,7 +578,7 @@ void lcd_update_rect(int x, int y, int w, int h) | |||
578 | lcd_write_reg(0x21, y); | 578 | lcd_write_reg(0x21, y); |
579 | lcd_write_reg(0x22, 0); | 579 | lcd_write_reg(0x22, 0); |
580 | imx233_lcdif_wait_ready(); | 580 | imx233_lcdif_wait_ready(); |
581 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_16_BIT); | 581 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__16_BIT); |
582 | imx233_lcdif_set_byte_packing_format(0xf); /* two pixels per 32-bit word */ | 582 | imx233_lcdif_set_byte_packing_format(0xf); /* two pixels per 32-bit word */ |
583 | imx233_lcdif_set_data_format(false, false, false); /* RGB565, don't care, don't care */ | 583 | imx233_lcdif_set_data_format(false, false, false); /* RGB565, don't care, don't care */ |
584 | /* there are two cases here: | 584 | /* there are two cases here: |