summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/imx233/creative-zenxfi2
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-06-16 16:32:03 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2013-06-16 16:32:03 +0200
commit8517cf8bed758120bdf95b5880d17ac277d21d74 (patch)
tree51035567dfde15e2cf1591a91ba548091bfae83e /firmware/target/arm/imx233/creative-zenxfi2
parent0fa014a6fe7be43a827d4f4c7da63f1113e226c0 (diff)
downloadrockbox-8517cf8bed758120bdf95b5880d17ac277d21d74.tar.gz
rockbox-8517cf8bed758120bdf95b5880d17ac277d21d74.tar.bz2
rockbox-8517cf8bed758120bdf95b5880d17ac277d21d74.zip
imx233: rewrite lcdif using the new register headers
Change-Id: I94329a65a7c6a4127fa05b77b9a7a291f8a50013
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi2')
-rw-r--r--firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c14
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;
static void setup_parameters(void)
{
imx233_lcdif_reset();
- imx233_lcdif_set_lcd_databus_width(HW_LCDIF_CTRL__LCD_DATABUS_WIDTH_18_BIT);
- imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_18_BIT);
+ imx233_lcdif_set_lcd_databus_width(BV_LCDIF_CTRL_LCD_DATABUS_WIDTH__18_BIT);
+ imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__18_BIT);
imx233_lcdif_set_timings(2, 2, 3, 3);
imx233_lcdif_enable_underflow_recover(true);
}
@@ -120,7 +120,7 @@ static void lcd_write_reg(uint32_t reg, uint32_t data)
{
uint32_t old_reg = reg;
/* get back to 18-bit word length */
- imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_18_BIT);
+ imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__18_BIT);
reg = encode_16_to_18(reg);
data = encode_16_to_18(data);
@@ -208,11 +208,11 @@ void lcd_init_device(void)
setup_lcdif_clock();
// reset device
- __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET;
+ BF_SET(LCDIF_CTRL1, RESET);
mdelay(50);
- __REG_CLR(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET;
+ BF_CLR(LCDIF_CTRL1, RESET);
mdelay(10);
- __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RESET;
+ BF_SET(LCDIF_CTRL1, RESET);
lcd_init_seq();
#ifdef HAVE_LCD_ENABLE
@@ -283,7 +283,7 @@ void lcd_update_rect(int x, int y, int w, int h)
lcd_write_reg(0x201, 0);
lcd_write_reg(0x202, 0);
imx233_lcdif_wait_ready();
- imx233_lcdif_set_word_length(HW_LCDIF_CTRL__WORD_LENGTH_16_BIT);
+ imx233_lcdif_set_word_length(BV_LCDIF_CTRL_WORD_LENGTH__16_BIT);
imx233_lcdif_set_byte_packing_format(0xf); /* two pixels per 32-bit word */
imx233_lcdif_set_data_format(false, false, false); /* RGB565, don't care, don't care */