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-zenxfi3/lcd-zenxfi3.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-zenxfi3/lcd-zenxfi3.c')
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c index 17fab032bf..668f1f7c1a 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.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_16_BIT); | 40 | imx233_lcdif_set_lcd_databus_width(BV_LCDIF_CTRL_LCD_DATABUS_WIDTH__16_BIT); |
41 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_16_BIT); | 41 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__16_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 | } |
@@ -182,11 +182,11 @@ void lcd_init_device(void) | |||
182 | setup_lcdif_clock(); | 182 | setup_lcdif_clock(); |
183 | 183 | ||
184 | // reset device | 184 | // reset device |
185 | __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 185 | BF_SET(LCDIF_CTRL1, RESET); |
186 | mdelay(50); | 186 | mdelay(50); |
187 | __REG_CLR(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 187 | BF_CLR(LCDIF_CTRL1, RESET); |
188 | mdelay(10); | 188 | mdelay(10); |
189 | __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET; | 189 | BF_SET(LCDIF_CTRL1, RESET); |
190 | 190 | ||
191 | lcd_init_seq(); | 191 | lcd_init_seq(); |
192 | #ifdef HAVE_LCD_ENABLE | 192 | #ifdef HAVE_LCD_ENABLE |
@@ -258,7 +258,7 @@ void lcd_update_rect(int x, int y, int w, int h) | |||
258 | lcd_write_reg(0x22, 0); | 258 | lcd_write_reg(0x22, 0); |
259 | 259 | ||
260 | imx233_lcdif_wait_ready(); | 260 | imx233_lcdif_wait_ready(); |
261 | imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_16_BIT); | 261 | imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__16_BIT); |
262 | imx233_lcdif_set_byte_packing_format(0xf); /* two pixels per 32-bit word */ | 262 | imx233_lcdif_set_byte_packing_format(0xf); /* two pixels per 32-bit word */ |
263 | imx233_lcdif_set_data_format(false, false, false); /* RGB565, don't care, don't care */ | 263 | imx233_lcdif_set_data_format(false, false, false); /* RGB565, don't care, don't care */ |
264 | 264 | ||