diff options
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c')
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c index bc669d1a60..253f37eef6 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c | |||
@@ -48,36 +48,36 @@ static void setup_lcd_pins(bool use_lcdif) | |||
48 | /* WARNING | 48 | /* WARNING |
49 | * the B1P22 pins is used to gate the speaker! Do NOT drive | 49 | * the B1P22 pins is used to gate the speaker! Do NOT drive |
50 | * them as lcd_dotclk and lcd_hsync or it will break audio */ | 50 | * them as lcd_dotclk and lcd_hsync or it will break audio */ |
51 | imx233_pinctrl_acquire_pin(1, 18, "lcd reset"); | 51 | imx233_pinctrl_acquire(1, 18, "lcd reset"); |
52 | imx233_pinctrl_acquire_pin(1, 19, "lcd rs"); | 52 | imx233_pinctrl_acquire(1, 19, "lcd rs"); |
53 | imx233_pinctrl_acquire_pin(1, 20, "lcd wr"); | 53 | imx233_pinctrl_acquire(1, 20, "lcd wr"); |
54 | imx233_pinctrl_acquire_pin(1, 21, "lcd cs"); | 54 | imx233_pinctrl_acquire(1, 21, "lcd cs"); |
55 | imx233_pinctrl_acquire_pin(1, 23, "lcd enable"); | 55 | imx233_pinctrl_acquire(1, 23, "lcd enable"); |
56 | imx233_pinctrl_acquire_pin(1, 25, "lcd vsync"); | 56 | imx233_pinctrl_acquire(1, 25, "lcd vsync"); |
57 | imx233_pinctrl_acquire_pin_mask(1, 0x3ffff, "lcd data"); | 57 | imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); |
58 | if(use_lcdif) | 58 | if(use_lcdif) |
59 | { | 59 | { |
60 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ | 60 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ |
61 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ | 61 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_MAIN); /* lcd_cs */ |
62 | imx233_set_pin_function(1, 23, PINCTRL_FUNCTION_MAIN); /* lcd_enable */ | 62 | imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_MAIN); /* lcd_enable */ |
63 | imx233_set_pin_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ | 63 | imx233_pinctrl_set_function(1, 18, PINCTRL_FUNCTION_MAIN); /* lcd_reset */ |
64 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ | 64 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_MAIN); /* lcd_rs */ |
65 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ | 65 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_MAIN); /* lcd_d16 */ |
66 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ | 66 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_MAIN); /* lcd_d17 */ |
67 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ | 67 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_MAIN); /* lcd_wr */ |
68 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ | 68 | HW_PINCTRL_MUXSELn_CLR(2) = 0xffffffff; /* lcd_d{0-15} */ |
69 | } | 69 | } |
70 | else | 70 | else |
71 | { | 71 | { |
72 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ | 72 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ |
73 | imx233_enable_gpio_output_mask(1, 0x2bfffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,enable,vsync} */ | 73 | imx233_pinctrl_enable_gpio_mask(1, 0x2bfffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,enable,vsync} */ |
74 | imx233_set_pin_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ | 74 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ |
75 | imx233_set_pin_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ | 75 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ |
76 | imx233_set_pin_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ | 76 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |
77 | imx233_set_pin_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ | 77 | imx233_pinctrl_set_function(1, 20, PINCTRL_FUNCTION_GPIO); /* lcd_wr */ |
78 | imx233_set_pin_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ | 78 | imx233_pinctrl_set_function(1, 21, PINCTRL_FUNCTION_GPIO); /* lcd_cs */ |
79 | imx233_set_pin_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ | 79 | imx233_pinctrl_set_function(1, 23, PINCTRL_FUNCTION_GPIO); /* lcd_enable */ |
80 | imx233_set_pin_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ | 80 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_GPIO); /* lcd_vsync */ |
81 | } | 81 | } |
82 | } | 82 | } |
83 | 83 | ||