1 files changed, 11 insertions, 10 deletions

diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
index a99260f105..3fd63de623 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
@@ -73,7 +73,7 @@ static void setup_lcd_pins(bool use_lcdif)
     imx233_pinctrl_acquire(1, 21, "lcd cs");
     imx233_pinctrl_acquire(1, 23, "lcd enable");
     imx233_pinctrl_acquire(1, 25, "lcd vsync");
-    imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data");
+    //imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data");
     if(use_lcdif)
     {
         imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */
@@ -113,10 +113,10 @@ static void setup_lcd_pins_i80(bool i80)
         imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */
         imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */
         /* lcd_{rs,wr,cs,enable} */
-        imx233_pinctrl_enable_gpio_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true);
-        imx233_pinctrl_set_gpio_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true);
+        HW_PINCTRL_DOEn_SET(1) = (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23);
+        HW_PINCTRL_DOUTn_SET(1) = (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23);
 
-        imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, false); /* lcd_d{0-17} */
+        HW_PINCTRL_DOEn_CLR(1) = 0x3ffff; /* lcd_d{0-17} */
         HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} as GPIO */
         imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */
         imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */
@@ -125,7 +125,8 @@ static void setup_lcd_pins_i80(bool i80)
     }
     else
     {
-        imx233_pinctrl_set_gpio_mask(1, (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23), true);
+        HW_PINCTRL_DOUTn_SET(1) = (1 << 19) | (1 << 20) | (1 << 21) | (1 << 23);
+
         imx233_pinctrl_set_drive(1, 19, PINCTRL_DRIVE_4mA); /* lcd_rs */
         imx233_pinctrl_set_drive(1, 20, PINCTRL_DRIVE_4mA); /* lcd_wr */
         imx233_pinctrl_set_drive(1, 21, PINCTRL_DRIVE_4mA); /* lcd_cs */
@@ -133,7 +134,7 @@ static void setup_lcd_pins_i80(bool i80)
         imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */
         imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */
         imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */
-        imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, false); /* lcd_d{0-17} */
+        HW_PINCTRL_DOEn_CLR(1) = 0x3ffff; /* lcd_d{0-17} */
         HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} as lcd_d{0-15} */
         imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */
         imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */
@@ -182,7 +183,7 @@ static uint32_t i80_read_register(uint32_t data_out)
     imx233_pinctrl_set_gpio(1, 19, true); /* lcd_rs */
     imx233_pinctrl_set_gpio(1, 23, true); /* lcd_enable */
     imx233_pinctrl_set_gpio(1, 20, true); /* lcd_wr */
-    imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, true); /* lcd_d{0-17} */
+    HW_PINCTRL_DOEn_SET(1) = 0x3ffff; /* lcd_d{0-17} */
     udelay(2);
     imx233_pinctrl_set_gpio(1, 19, false); /* lcd_rs */
     udelay(1);
@@ -190,11 +191,11 @@ static uint32_t i80_read_register(uint32_t data_out)
     udelay(1);
     imx233_pinctrl_set_gpio(1, 20, false); /* lcd_wr */
     udelay(1);
-    imx233_pinctrl_set_gpio_mask(1, data_out & 0x3ffff, true); /* lcd_d{0-17} */
+    HW_PINCTRL_DOUTn_SET(1) = data_out & 0x3ffff; /* lcd_d{0-17} */
     udelay(1);
     imx233_pinctrl_set_gpio(1, 20, true); /* lcd_wr */
     udelay(3);
-    imx233_pinctrl_enable_gpio_mask(1, 0x3ffff, false); /* lcd_d{0-17} */
+    HW_PINCTRL_DOUTn_CLR(1) = 0x3ffff; /* lcd_d{0-17} */
     udelay(2);
     imx233_pinctrl_set_gpio(1, 23, false); /* lcd_enable */
     udelay(1);
@@ -204,7 +205,7 @@ static uint32_t i80_read_register(uint32_t data_out)
     udelay(3);
     imx233_pinctrl_set_gpio(1, 23, false); /* lcd_enable */
     udelay(2);
-    uint32_t data_in = imx233_pinctrl_get_gpio_mask(1, 0x3ffff); /* lcd_d{0-17} */
+    uint32_t data_in = HW_PINCTRL_DINn(1) & 0x3ffff; /* lcd_d{0-17} */
     udelay(1);
     imx233_pinctrl_set_gpio(1, 23, true); /* lcd_enable */
     udelay(1);