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/creative-zenxfi2/lcd-zenxfi2.c | |
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/creative-zenxfi2/lcd-zenxfi2.c')
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c index 6f2adc43ae..63b033a8a9 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c | |||
@@ -37,8 +37,8 @@ static unsigned lcd_yuv_options = 0; | |||
37 | static void setup_parameters(void) | 37 | static void setup_parameters(void) |
38 | { | 38 | { |
39 | imx233_lcdif_reset(); | 39 | imx233_lcdif_reset(); |
40 | imx233_lcdif_set_lcd_databus_width(HW_LCDIF_CTRL__LCD_DATABUS_WIDTH_18_BIT); | 40 | imx233_lcdif_set_lcd_databus_width(BV_LCDIF_CTRL_LCD_DATABUS_WIDTH__18_BIT); |
41 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_18_BIT); | 41 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__18_BIT); |
42 | imx233_lcdif_set_timings(2, 2, 3, 3); | 42 | imx233_lcdif_set_timings(2, 2, 3, 3); |
43 | imx233_lcdif_enable_underflow_recover(true); | 43 | imx233_lcdif_enable_underflow_recover(true); |
44 | } | 44 | } |
@@ -120,7 +120,7 @@ static void lcd_write_reg(uint32_t reg, uint32_t data) | |||
120 | { | 120 | { |
121 | uint32_t old_reg = reg; | 121 | uint32_t old_reg = reg; |
122 | /* get back to 18-bit word length */ | 122 | /* get back to 18-bit word length */ |
123 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_18_BIT); | 123 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__18_BIT); |
124 | reg = encode_16_to_18(reg); | 124 | reg = encode_16_to_18(reg); |
125 | data = encode_16_to_18(data); | 125 | data = encode_16_to_18(data); |
126 | 126 | ||
@@ -208,11 +208,11 @@ void lcd_init_device(void) | |||
208 | setup_lcdif_clock(); | 208 | setup_lcdif_clock(); |
209 | 209 | ||
210 | // reset device | 210 | // reset device |
211 | __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 211 | BF_SET(LCDIF_CTRL1, RESET); |
212 | mdelay(50); | 212 | mdelay(50); |
213 | __REG_CLR(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 213 | BF_CLR(LCDIF_CTRL1, RESET); |
214 | mdelay(10); | 214 | mdelay(10); |
215 | __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 215 | BF_SET(LCDIF_CTRL1, RESET); |
216 | 216 | ||
217 | lcd_init_seq(); | 217 | lcd_init_seq(); |
218 | #ifdef HAVE_LCD_ENABLE | 218 | #ifdef HAVE_LCD_ENABLE |
@@ -283,7 +283,7 @@ void lcd_update_rect(int x, int y, int w, int h) | |||
283 | lcd_write_reg(0x201, 0); | 283 | lcd_write_reg(0x201, 0); |
284 | lcd_write_reg(0x202, 0); | 284 | lcd_write_reg(0x202, 0); |
285 | imx233_lcdif_wait_ready(); | 285 | imx233_lcdif_wait_ready(); |
286 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_16_BIT); | 286 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__16_BIT); |
287 | imx233_lcdif_set_byte_packing_format(0xf); /* two pixels per 32-bit word */ | 287 | imx233_lcdif_set_byte_packing_format(0xf); /* two pixels per 32-bit word */ |
288 | imx233_lcdif_set_data_format(false, false, false); /* RGB565, don't care, don't care */ | 288 | imx233_lcdif_set_data_format(false, false, false); /* RGB565, don't care, don't care */ |
289 | 289 | ||